Advanced break place settings

Author: Avanatiker

common/src/main/kotlin/com/lambda/config/groups/BuildConfig.kt

@@ -3,13 +3,12 @@ package com.lambda.config.groups
 interface BuildConfig {
     val breakCoolDown: Int
     val placeCooldown: Int
-    val placeConfirmation: Boolean
     val breakConfirmation: Boolean
+    val placeConfirmation: Boolean
     val collectDrops: Boolean
     val breakWeakBlocks: Boolean
     val pathing: Boolean
     val breaksPerTick: Int
     val rotateForBreak: Boolean
     val rotateForPlace: Boolean
-    val swingHand: Boolean
 }

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

@@ -6,15 +6,42 @@ class BuildSettings(
     c: Configurable,
     vis: () -> Boolean = { true }
 ) : BuildConfig {
-    override val breakCoolDown by c.setting("Break Cooldown", 0, 0..1000, 1, "Delay between breaking blocks", " ms", vis)
-    override val placeCooldown by c.setting("Place Cooldown", 0, 0..1000, 1, "Delay between placing blocks", " ms", vis)
-    override val placeConfirmation by c.setting("Place Confirmation", false, "Wait for block placement confirmation", vis)
-    override val breakConfirmation by c.setting("Break Confirmation", false, "Wait for block break confirmation", vis)
-    override val collectDrops by c.setting("Collect All Drops", false, "Collect all drops when breaking blocks", vis)
-    override val breakWeakBlocks by c.setting("Break Weak Blocks", false, "Break blocks that dont have structural integrity (e.g: grass)", vis)
-    override val pathing by c.setting("Pathing", true, "Path to blocks", vis)
-    override val breaksPerTick by c.setting("Instant Breaks Per Tick", 10, 1..30, 1, "Maximum instant block breaks per tick", "", vis)
-    override val rotateForBreak by c.setting("Rotate For Break", false, "Rotate towards block while breaking", vis)
-    override val rotateForPlace by c.setting("Rotate For Place", true, "Rotate towards block while placing", vis)
-    override val swingHand by c.setting("Swing Hand", true, "Swing hand on interactions", vis)
+    enum class Page {
+        BREAK, PLACE, PATHING
+    }
+
+    val page by c.setting("Build Page", Page.BREAK, "Current page", vis)
+
+    override val breakCoolDown by c.setting("Break Cooldown", 0, 0..1000, 1, "Delay between breaking blocks", " ms") {
+        vis() && page == Page.BREAK
+    }
+    override val breakConfirmation by c.setting("Break Confirmation", false, "Wait for block break confirmation") {
+        vis() && page == Page.BREAK
+    }
+    override val breakWeakBlocks by c.setting("Break Weak Blocks", false, "Break blocks that dont have structural integrity (e.g: grass)") {
+        vis() && page == Page.BREAK
+    }
+    override val breaksPerTick by c.setting("Instant Breaks Per Tick", 10, 1..30, 1, "Maximum instant block breaks per tick") {
+        vis() && page == Page.BREAK
+    }
+    override val rotateForBreak by c.setting("Rotate For Break", false, "Rotate towards block while breaking") {
+        vis() && page == Page.BREAK
+    }
+
+    override val placeCooldown by c.setting("Place Cooldown", 0, 0..1000, 1, "Delay between placing blocks", " ms") {
+        vis() && page == Page.PLACE
+    }
+    override val placeConfirmation by c.setting("Place Confirmation", false, "Wait for block placement confirmation") {
+        vis() && page == Page.PLACE
+    }
+    override val collectDrops by c.setting("Collect All Drops", false, "Collect all drops when breaking blocks") {
+        vis() && page == Page.PLACE
+    }
+    override val rotateForPlace by c.setting("Rotate For Place", true, "Rotate towards block while placing") {
+        vis() && page == Page.PLACE
+    }
+
+    override val pathing by c.setting("Pathing", true, "Path to blocks") {
+        vis() && page == Page.PATHING
+    }
 }

common/src/main/kotlin/com/lambda/config/groups/InteractionConfig.kt

@@ -12,4 +12,5 @@ interface InteractionConfig {
     val resolution: Int
 
     val useRayCast: Boolean
+    val swingHand: Boolean
 }

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

@@ -10,4 +10,5 @@ class InteractionSettings(
     override val reach by c.setting("Reach", 4.9, 0.1..10.0, 0.1, "Players reach / range", " blocks", vis)
     override val useRayCast by c.setting("Raycast", false, "Verify hit vector with ray casting (for very strict ACs)", vis)
     override val resolution by c.setting("Resolution", 5, 1..20, 1, "How many raycast checks per surface (will be squared)") { vis() && useRayCast }
+    override val swingHand by c.setting("Swing Hand", true, "Swing hand on interactions", vis)
 }

common/src/main/kotlin/com/lambda/task/tasks/BreakBlock.kt

@@ -25,12 +25,12 @@ import net.minecraft.util.math.Direction
 
 class BreakBlock @Ta5kBuilder constructor(
     private val ctx: BreakContext,
-    private val rotationConfig: IRotationConfig = TaskFlow.rotation,
-    private val interactionConfig: InteractionConfig = TaskFlow.interact,
-    private val sides: Set<Direction> = emptySet(),
-    private var collectDrop: Boolean = TaskFlow.build.collectDrops,
-    private val rotate: Boolean = TaskFlow.build.rotateForBreak,
-    private val swingHand: Boolean = TaskFlow.build.swingHand,
+    private val rotationConfig: IRotationConfig,
+    private val interactionConfig: InteractionConfig,
+    private val sides: Set<Direction>,
+    private var collectDrop: Boolean,
+    private val rotate: Boolean,
+    private val swingHand: Boolean,
 ) : Task<ItemEntity?>() {
     val blockPos: BlockPos get() = ctx.result.blockPos
     private var beginState: BlockState? = null
@@ -111,15 +111,17 @@ class BreakBlock @Ta5kBuilder constructor(
             rotationConfig: IRotationConfig = TaskFlow.rotation,
             interactionConfig: InteractionConfig = TaskFlow.interact,
             sides: Set<Direction> = emptySet(),
-            collectDrop: Boolean = false,
-            rotate: Boolean = false,
+            collectDrop: Boolean = TaskFlow.build.collectDrops,
+            rotate: Boolean = TaskFlow.build.rotateForBreak,
+            swingHand: Boolean = TaskFlow.interact.swingHand,
         ) = BreakBlock(
             ctx,
             rotationConfig,
             interactionConfig,
             sides,
             collectDrop,
-            rotate
+            rotate,
+            swingHand
         )
     }
 }

common/src/main/kotlin/com/lambda/task/tasks/PlaceBlock.kt

@@ -101,7 +101,7 @@ class PlaceBlock @Ta5kBuilder constructor(
         @Ta5kBuilder
         fun placeBlock(
             ctx: PlaceContext,
-            swingHand: Boolean = TaskFlow.build.swingHand,
+            swingHand: Boolean = TaskFlow.interact.swingHand,
             rotate: Boolean = TaskFlow.build.rotateForPlace,
             waitForConfirmation: Boolean = TaskFlow.build.placeConfirmation,
         ) = PlaceBlock(ctx, swingHand, rotate, waitForConfirmation)