cleanup

Author: beanbag44

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

@@ -33,7 +33,7 @@ class BreakSettings(
     c: Configurable,
     baseGroup: NamedEnum,
     vis: () -> Boolean = { true },
-) : BreakConfig, SettingGroup(c, c.settings.size) {
+) : BreakConfig, SettingGroup(c) {
     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 baseGroup: NamedEnum,
     vis: () -> Boolean = { true },
-) : BuildConfig, SettingGroup(c, c.settings.size) {
+) : BuildConfig, SettingGroup(c) {
     enum class Group(override val displayName: String) : NamedEnum {
         General("General"),
         Reach("Reach"),

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

@@ -25,7 +25,7 @@ class EatSettings(
     c: Configurable,
     baseGroup: NamedEnum,
     vis: () -> Boolean = { true }
-) : EatConfig, SettingGroup(c, c.settings.size) {
+) : EatConfig, SettingGroup(c) {
     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, SettingGroup(c, c.settings.size) {
+) : HotbarConfig, SettingGroup(c) {
     override val keepTicks by c.setting("Keep Ticks", 1, 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,
     baseGroup: NamedEnum,
     vis: () -> Boolean = { true }
-) : InteractConfig, SettingGroup(c, c.settings.size) {
+) : InteractConfig, SettingGroup(c) {
     override val rotate by c.setting("Rotate For Interact", true, "Rotates the player to look at the block when interacting", visibility = vis).group(baseGroup)
     override val swingHand by c.setting("Swing On Interact", true, "Swings the players hand after interacting", visibility = vis).group(baseGroup)
     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(baseGroup)

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

@@ -26,7 +26,7 @@ class InventorySettings(
     c: Configurable,
     baseGroup: NamedEnum,
     vis: () -> Boolean = { true }
-) : InventoryConfig, SettingGroup(c, c.settings.size) {
+) : InventoryConfig, SettingGroup(c) {
     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,
     baseGroup: NamedEnum,
     vis: () -> Boolean = { true }
-) : PlaceConfig, SettingGroup(c, c.settings.size) {
+) : PlaceConfig, SettingGroup(c) {
     override val rotateForPlace by c.setting("Rotate For Place", true, "Rotate towards block while placing", visibility = vis).group(baseGroup)
     override val airPlace by c.setting("Air Place", AirPlaceMode.None, "Allows for placing blocks without adjacent faces", visibility = vis).group(baseGroup)
     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(baseGroup)

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

@@ -32,7 +32,7 @@ class RotationSettings(
     c: Configurable,
     baseGroup: NamedEnum? = null,
     vis: () -> Boolean = { true }
-) : RotationConfig, SettingGroup(c, c.settings.size) {
+) : RotationConfig, SettingGroup(c) {
     override var rotationMode by c.setting("Mode", RotationMode.Sync, "How the player is being rotated on interaction", vis).group(baseGroup)
 
     /** How many ticks to keep the rotation before resetting */

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

@@ -31,7 +31,7 @@ private val KProperty0<*>.delegate
     }
 
 @Suppress("unchecked_cast")
-abstract class SettingGroup(val c: Configurable, val startIndex: Int) {
+abstract class SettingGroup(val c: Configurable) {
     @DslMarker
     annotation class SettingEditorDsl
 
@@ -54,14 +54,14 @@ abstract class SettingGroup(val c: Configurable, val startIndex: Int) {
     fun edit(
         vararg settings: KProperty0<*>,
         edits: BasicEditBuilder.() -> Unit
-    ) { BasicEditBuilder(settings.toSet() as Set<AbstractSetting<*>>).apply(edits) }
+    ) { BasicEditBuilder(settings.map { it.delegate } as List<AbstractSetting<*>>).apply(edits) }
 
     @SettingEditorDsl
     fun editWith(
         vararg settings: KProperty0<*>,
         other: KProperty0<*>,
         edits: BasicEditBuilder.(AbstractSetting<*>) -> Unit
-    ) { BasicEditBuilder(settings.toSet() as Set<AbstractSetting<*>>).edits(other.delegate as AbstractSetting<*>) }
+    ) { BasicEditBuilder(settings.map { it.delegate } as List<AbstractSetting<*>>).edits(other.delegate as AbstractSetting<*>) }
 
     @SettingEditorDsl
     internal inline fun <T : Any> editTyped(
@@ -80,10 +80,6 @@ abstract class SettingGroup(val c: Configurable, val startIndex: Int) {
     fun hide(vararg settings: KProperty0<*>) =
         (settings.map { it.delegate } as List<AbstractSetting<*>>).forEach { it.hidden = true }
 
-    @SettingEditorDsl
-    fun hideAll() =
-        c.settings.listIterator(startIndex).forEach { it.hidden = true }
-
     @SettingEditorDsl
     fun KProperty0<*>.insert(insert: KProperty0<*>, insertMode: InsertMode) {
         val delegate = insert.delegate as AbstractSetting<*>

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

@@ -54,7 +54,7 @@ abstract class Targeting(
     private val predicate: () -> Boolean = { true },
     private val defaultRange: Double,
     private val maxRange: Double,
-) : TargetingConfig, SettingGroup(owner, owner.settings.size) {
+) : TargetingConfig, SettingGroup(owner) {
 
     /**
      * The range within which entities can be targeted. This value is configurable and constrained