override configs properly in modules

Author: beanbag44

src/main/kotlin/com/lambda/module/modules/combat/AutoTotem.kt

@@ -55,7 +55,7 @@ object AutoTotem : Module(
     private val minPlayerDistance by setting("Player Distance", 64, 32..128, 4, "Set the distance to detect players to swap") { players }.group(Group.General)
     private val friends by setting("Friends", false, "Exclude friends from triggering player-based swaps") { players }.group(Group.General)
 
-    private val inventory = InventorySettings(this, Group.Inventory)
+    override val inventoryConfig = InventorySettings(this, Group.Inventory)
 
     init {
         listen<TickEvent.Pre> {

src/main/kotlin/com/lambda/module/modules/combat/CrystalAura.kt

@@ -117,7 +117,7 @@ object CrystalAura : Module(
     private val targeting = Targeting.Combat(this, Group.Targeting, 10.0)
 
     /* Rotation */
-    private val rotation = RotationSettings(this, Group.Rotation)
+    override val rotationConfig = RotationSettings(this, Group.Rotation)
 
     private val blueprint = mutableMapOf<BlockPos, Opportunity>()
     private var activeOpportunity: Opportunity? = null
@@ -483,7 +483,7 @@ object CrystalAura : Module(
          * Places the crystal on [blockPos]
          */
         fun place() = runSafe {
-            if (rotation.rotate && !lookAt(placeRotation).requestBy(this@CrystalAura).done)
+            if (rotationConfig.rotate && !lookAt(placeRotation).requestBy(this@CrystalAura).done)
                 return@runSafe
 
             val selection = selectStack { isItem(Items.END_CRYSTAL) }
@@ -515,7 +515,7 @@ object CrystalAura : Module(
          * @return Whether the delay passed, null if the interaction failed or no crystal found
          */
         fun explode() {
-            if (rotation.rotate && !lookAt(placeRotation).requestBy(this@CrystalAura).done) return
+            if (rotationConfig.rotate && !lookAt(placeRotation).requestBy(this@CrystalAura).done) return
 
             explodeTimer.runSafeIfPassed(explodeDelay.milliseconds) {
                 crystal?.let { crystal ->

src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt

@@ -17,7 +17,7 @@
 
 package com.lambda.module.modules.combat
 
-import com.lambda.config.groups.InteractSettings
+import com.lambda.config.groups.BuildSettings
 import com.lambda.config.groups.InteractionSettings
 import com.lambda.config.groups.RotationSettings
 import com.lambda.config.groups.Targeting
@@ -51,20 +51,20 @@ object KillAura : Module(
     tag = ModuleTag.COMBAT,
 ) {
     // Interact
-    private val interactionSettings = InteractionSettings(this, Group.Interaction, InteractionMask.Entity)
-    private val interactSettings = InteractSettings(this, listOf(Group.Interact))
-    private val swap by setting("Swap", true, "Swap to the item with the highest damage").group(Group.Interact)
-    private val attackMode by setting("Attack Mode", AttackMode.Cooldown).group(Group.Interact)
-    private val cooldownOffset by setting("Cooldown Offset", 0, -5..5, 1) { attackMode == AttackMode.Cooldown }.group(Group.Interact)
-    private val hitDelay1 by setting("Hit Delay 1", 2.0, 0.0..20.0, 1.0) { attackMode == AttackMode.Delay }.group(Group.Interact)
-    private val hitDelay2 by setting("Hit Delay 2", 6.0, 0.0..20.0, 1.0) { attackMode == AttackMode.Delay }.group(Group.Interact)
+    override val interactionConfig = InteractionSettings(this, Group.Interaction, InteractionMask.Entity)
+    override val buildConfig = BuildSettings(this, Group.Build)
+    private val swap by setting("Swap", true, "Swap to the item with the highest damage").group(Group.Build)
+    private val attackMode by setting("Attack Mode", AttackMode.Cooldown).group(Group.Build)
+    private val cooldownOffset by setting("Cooldown Offset", 0, -5..5, 1) { attackMode == AttackMode.Cooldown }.group(Group.Build)
+    private val hitDelay1 by setting("Hit Delay 1", 2.0, 0.0..20.0, 1.0) { attackMode == AttackMode.Delay }.group(Group.Build)
+    private val hitDelay2 by setting("Hit Delay 2", 6.0, 0.0..20.0, 1.0) { attackMode == AttackMode.Delay }.group(Group.Build)
 
     // Targeting
     private val targeting = Targeting.Combat(this, Group.Targeting)
 
     // Aiming
     private val rotate by setting("Rotate", true).group(Group.Aiming)
-    private val rotation = RotationSettings(this, Group.Aiming) { rotate }
+    override val rotationConfig = RotationSettings(this, Group.Aiming) { rotate }
 
     val target: LivingEntity?
         get() = targeting.target()
@@ -82,7 +82,7 @@ object KillAura : Module(
 
     enum class Group(override val displayName: String) : NamedEnum {
         Interaction("Interaction"),
-        Interact("Interact"),
+        Build("Build"),
         Targeting("Targeting"),
         Aiming("Aiming")
     }
@@ -128,18 +128,18 @@ object KillAura : Module(
         if (rotate) {
             val angle = RotationManager.activeRotation
 
-            if (interactionSettings.strictRayCast) {
-                val cast = angle.rayCast(interactionSettings.attackReach)
+            if (interactionConfig.strictRayCast) {
+                val cast = angle.rayCast(interactionConfig.attackReach)
                 if (cast?.entityResult?.entity != target) return
             }
 
             // Perform a raycast without checking the environment
-            angle.castBox(target.boundingBox, interactionSettings.attackReach) ?: return
+            angle.castBox(target.boundingBox, interactionConfig.attackReach) ?: return
         }
 
         // Attack
         interaction.attackEntity(player, target)
-        if (interactSettings.swingHand) player.swingHand(Hand.MAIN_HAND)
+        if (buildConfig.interactConfig.swingHand) player.swingHand(Hand.MAIN_HAND)
 
         lastAttackTime = System.currentTimeMillis()
         hitDelay = (hitDelay1..hitDelay2).random() * 50

src/main/kotlin/com/lambda/module/modules/debug/RotationTest.kt

@@ -29,7 +29,7 @@ object RotationTest : Module(
     name = "RotationTest",
     tag = ModuleTag.DEBUG,
 ) {
-    var rotation = RotationSettings(this)
+    override val rotationConfig = RotationSettings(this)
     var hitPos: HitResult? = null
 
     init {

src/main/kotlin/com/lambda/module/modules/player/AntiAim.kt

@@ -73,7 +73,7 @@ object AntiAim : Module(
     private val yawSpeed by setting("Yaw Speed", 30, 1..90, 1, "Yaw rotation degrees per tick", "°") { yaw != YawMode.None }.group(Group.General)
     private val pitchSpeed by setting("Pitch Speed", 30, 1..90, 1, "Pitch rotation degrees per tick", "°") { pitch != PitchMode.None }.group(Group.General)
 
-    private val rotation = RotationSettings(this, Group.Rotation)
+    override val rotationConfig = RotationSettings(this, Group.Rotation)
 
     private var currentYaw = 0.0f
     private var currentPitch = 0.0f

src/main/kotlin/com/lambda/module/modules/player/HighwayTools.kt

@@ -69,12 +69,12 @@ object HighwayTools : Module(
     private val distance by setting("Distance", -1, -1..1000000, 1, "Distance to build the highway/tunnel (negative for infinite)").group(Group.Structure)
     private val sliceSize by setting("Slice Size", 3, 1..5, 1, "Number of slices to build at once").group(Group.Structure)
 
-    private val build = BuildSettings(this, Group.Build)
-    private val rotation = RotationSettings(this, Group.Rotation)
-    private val interact = InteractionSettings(this, Group.Interaction, InteractionMask.Block)
-    private val inventory = InventorySettings(this, Group.Inventory)
-    private val hotbar = HotbarSettings(this, Group.Hotbar)
-    private val eat = EatSettings(this, Group.Eat)
+    override val buildConfig = BuildSettings(this, Group.Build)
+    override val rotationConfig = RotationSettings(this, Group.Rotation)
+    override val interactionConfig = InteractionSettings(this, Group.Interaction, InteractionMask.Block)
+    override val inventoryConfig = InventorySettings(this, Group.Inventory)
+    override val hotbarConfig = HotbarSettings(this, Group.Hotbar)
+    override val eatConfig = EatSettings(this, Group.Eat)
 
     private var octant = EightWayDirection.NORTH
     private var distanceMoved = 0
@@ -141,7 +141,7 @@ object HighwayTools : Module(
                 disable()
                 emptyStructure()
             }
-        }.build(collectDrops = build.collectDrops, lifeMaintenance = true)
+        }.build(collectDrops = buildConfig.collectDrops, lifeMaintenance = true)
             .run()
     }
 

src/main/kotlin/com/lambda/module/modules/player/InventoryTweaks.kt

@@ -46,7 +46,7 @@ object InventoryTweaks : Module(
 
     private val instantShulker by setting("Instant Shulker", true, description = "Right-click shulker boxes in your inventory to instantly place them and open them.").group(Group.General)
     private val instantEChest by setting("Instant Ender-Chest", true, description = "Right-click ender chests in your inventory to instantly place them and open them.").group(Group.General)
-    private val inventory = InventorySettings(this, Group.Inventory)
+    override val inventoryConfig  = InventorySettings(this, Group.Inventory)
     private var placedPos: BlockPos? = null
     private var placeAndOpen: Task<*>? = null
     private var lastBreak: Task<*>? = null

src/main/kotlin/com/lambda/module/modules/player/RotationLock.kt

@@ -45,8 +45,7 @@ object RotationLock : Module(
     private val pitchStep by setting("Pitch Step", 45.0, 1.0..90.0, 1.0) { pitchMode == RotationMode.Snap }.group(Group.General)
     private val customPitch by setting("Custom Pitch", 0.0, -90.0..90.0, 1.0) { pitchMode == RotationMode.Custom }.group(Group.General)
 
-    @JvmStatic val rotationSettings = RotationSettings(this, Group.Rotation)
-    private var rotationRequest: RotationRequest? = null
+    override val rotationConfig = RotationSettings(this, Group.Rotation)
 
     init {
         listen<TickEvent.Pre> {