complete builder and setting builder extension functions

Author: beanbag44

src/main/kotlin/com/lambda/config/AbstractSetting.kt

@@ -33,6 +33,7 @@ import com.lambda.context.SafeContext
 import com.lambda.gui.Layout
 import com.lambda.threading.runSafe
 import com.lambda.util.Communication.info
+import com.lambda.util.Describable
 import com.lambda.util.Nameable
 import com.lambda.util.NamedEnum
 import com.lambda.util.extension.CommandBuilder
@@ -94,13 +95,14 @@ import kotlin.reflect.KProperty
  * @property visibility A function that determines whether the setting is visible.
  */
 abstract class AbstractSetting<T : Any>(
+    override var name: String,
     internal val defaultValue: T,
     val type: Type,
-    val description: String,
-    val visibility: () -> Boolean,
-) : Jsonable, Nameable, Layout {
+    override var description: String,
+    var visibility: () -> Boolean,
+) : Jsonable, Nameable, Describable, Layout {
     private val listeners = mutableListOf<ValueListener<T>>()
-    val groups: MutableList<List<NamedEnum>> = mutableListOf()
+    var groups: MutableList<List<NamedEnum>> = mutableListOf()
 
     var value by Delegates.observable(defaultValue) { _, from, to ->
         listeners.forEach {

src/main/kotlin/com/lambda/config/Configurable.kt

@@ -59,7 +59,7 @@ import java.awt.Color
 abstract class Configurable(
     private val configuration: Configuration,
 ) : Jsonable, Nameable {
-    val settings = mutableSetOf<AbstractSetting<*>>()
+    val settings = mutableListOf<AbstractSetting<*>>()
 
     init {
         registerConfigurable()

src/main/kotlin/com/lambda/config/groups/BreakSettings.kt

@@ -33,7 +33,7 @@ class BreakSettings(
     c: Configurable,
     groupPath: List<NamedEnum> = emptyList(),
     vis: () -> Boolean = { true },
-) : BreakConfig {
+) : BreakConfig, SettingGroup(c, c.settings.size) {
     enum class Group(override val displayName: String) : NamedEnum {
         General("General"),
         Cosmetic("Cosmetic")

src/main/kotlin/com/lambda/config/groups/BuildSettings.kt

@@ -26,7 +26,7 @@ class BuildSettings(
     c: Configurable,
     vararg groupPath: NamedEnum,
     vis: () -> Boolean = { true },
-) : BuildConfig {
+) : BuildConfig, SettingGroup(c, c.settings.size) {
     enum class Group(override val displayName: String) : NamedEnum {
         General("General"),
         Break("Break"),

src/main/kotlin/com/lambda/config/groups/EatSettings.kt

@@ -19,14 +19,13 @@ package com.lambda.config.groups
 
 import com.lambda.config.Configurable
 import com.lambda.util.NamedEnum
-import net.minecraft.item.Item
 import net.minecraft.item.Items
 
 class EatSettings(
     c: Configurable,
     baseGroup: NamedEnum,
     vis: () -> Boolean = { true }
-) : EatConfig {
+) : EatConfig, SettingGroup(c, c.settings.size) {
     val nutritiousFoodDefaults = listOf(Items.APPLE, Items.BAKED_POTATO, Items.BEEF, Items.BEETROOT, Items.BEETROOT_SOUP, Items.BREAD, Items.CARROT, Items.CHICKEN, Items.CHORUS_FRUIT, Items.COD, Items.COOKED_BEEF, Items.COOKED_CHICKEN, Items.COOKED_COD, Items.COOKED_MUTTON, Items.COOKED_PORKCHOP, Items.COOKED_RABBIT, Items.COOKED_SALMON, Items.COOKIE, Items.DRIED_KELP, Items.ENCHANTED_GOLDEN_APPLE, Items.GOLDEN_APPLE, Items.GOLDEN_CARROT, Items.HONEY_BOTTLE, Items.MELON_SLICE, Items.MUSHROOM_STEW, Items.MUTTON, Items.POISONOUS_POTATO, Items.PORKCHOP, Items.POTATO, Items.PUFFERFISH, Items.PUMPKIN_PIE, Items.RABBIT, Items.RABBIT_STEW, Items.ROTTEN_FLESH, Items.SALMON, Items.SPIDER_EYE, Items.SUSPICIOUS_STEW, Items.SWEET_BERRIES, Items.GLOW_BERRIES, Items.TROPICAL_FISH)
     val resistanceFoodDefaults = listOf(Items.ENCHANTED_GOLDEN_APPLE)
     val regenerationFoodDefaults = listOf(Items.ENCHANTED_GOLDEN_APPLE, Items.GOLDEN_APPLE)

src/main/kotlin/com/lambda/config/groups/HotbarSettings.kt

@@ -26,7 +26,7 @@ class HotbarSettings(
     c: Configurable,
     baseGroup: NamedEnum,
     vis: () -> Boolean = { true }
-) : HotbarConfig {
+) : HotbarConfig, SettingGroup(c, c.settings.size) {
     override val keepTicks by c.setting("Keep Ticks", 3, 0..20, 1, "The number of ticks to keep the current hotbar selection active", " ticks", visibility = vis).group(baseGroup)
     override val swapDelay by c.setting("Swap Delay", 0, 0..3, 1, "The number of ticks delay before allowing another hotbar selection swap", " ticks", visibility = vis).group(baseGroup)
     override val swapsPerTick by c.setting("Swaps Per Tick", 3, 1..10, 1, "The number of hotbar selection swaps that can take place each tick") { swapDelay <= 0 && vis() }.group(baseGroup)

src/main/kotlin/com/lambda/config/groups/InteractSettings.kt

@@ -26,7 +26,7 @@ class InteractSettings(
     c: Configurable,
     groupPath: List<NamedEnum> = emptyList(),
     vis: () -> Boolean = { true }
-) : InteractConfig {
+) : InteractConfig, SettingGroup(c, c.settings.size) {
     override val rotate by c.setting("Rotate For Interact", true, "Rotates the player to look at the block when interacting", visibility = vis).group(groupPath)
     override val swingHand by c.setting("Swing On Interact", true, "Swings the players hand after interacting", visibility = vis).group(groupPath)
     override val interactStageMask by c.setting("Interact Stage Mask", setOf(TickEvent.Input.Post), description = "The sub-tick timing at which interact actions are performed", visibility = vis).group(groupPath)

src/main/kotlin/com/lambda/config/groups/InteractionSettings.kt

@@ -28,7 +28,7 @@ class InteractionSettings(
     baseGroup: NamedEnum,
     private val usage: InteractionMask,
     vis: () -> Boolean = { true },
-) : InteractionConfig {
+) : InteractionConfig, SettingGroup(c, c.settings.size) {
     // Reach
     private val useDefaultReach by c.setting("Default Reach", true, "Whether to use vanilla interaction ranges", vis).group(baseGroup)
     private val attackReachSetting = if (usage.entity) c.setting("Attack Reach", DEFAULT_ATTACK_REACH, 1.0..10.0, 0.01, "Maximum entity interaction distance") { vis() && !useDefaultReach }.group(baseGroup) else null

src/main/kotlin/com/lambda/config/groups/InventorySettings.kt

@@ -26,7 +26,7 @@ class InventorySettings(
     c: Configurable,
     baseGroup: NamedEnum,
     vis: () -> Boolean = { true }
-) : InventoryConfig {
+) : InventoryConfig, SettingGroup(c, c.settings.size) {
     enum class Group(override val displayName: String) : NamedEnum {
         Container("Container"),
         Access("Access")

src/main/kotlin/com/lambda/config/groups/PlaceSettings.kt

@@ -28,7 +28,7 @@ class PlaceSettings(
     c: Configurable,
     groupPath: List<NamedEnum> = emptyList(),
     vis: () -> Boolean = { true }
-) : PlaceConfig {
+) : PlaceConfig, SettingGroup(c, c.settings.size) {
     override val rotateForPlace by c.setting("Rotate For Place", true, "Rotate towards block while placing", visibility = vis).group(groupPath)
     override val airPlace by c.setting("Air Place", AirPlaceMode.None, "Allows for placing blocks without adjacent faces", visibility = vis).group(groupPath)
     override val axisRotateSetting by c.setting("Axis Rotate", true, "Overrides the Rotate For Place setting and rotates the player on each axis to air place rotational blocks") { vis() && airPlace.isEnabled }.group(groupPath)