Move breaking into build task. Item pickup strategy still missing

Avanatiker · Avanatiker · commit 4d63c7997dad · 2025-02-07T02:11:09.000+01:00
diff --git a/common/src/main/kotlin/com/lambda/config/groups/BuildConfig.kt b/common/src/main/kotlin/com/lambda/config/groups/BuildConfig.kt
@@ -24,11 +24,12 @@ interface BuildConfig {
     val pathing: Boolean
     val stayInRange: Boolean
     val collectDrops: Boolean
+    val maxPendingInteractions: Int
+    val interactionTimeout: Int
 
     // Breaking
     val rotateForBreak: Boolean
     val breakConfirmation: Boolean
-    val maxPendingBreaks: Int
     val breaksPerTick: Int
     val breakWeakBlocks: Boolean
     val forceSilkTouch: Boolean
@@ -37,7 +38,5 @@ interface BuildConfig {
     // Placing
     val rotateForPlace: Boolean
     val placeConfirmation: Boolean
-    val placeTimeout: Int
-    val maxPendingPlacements: Int
     val placementsPerTick: Int
 }
diff --git a/common/src/main/kotlin/com/lambda/config/groups/BuildSettings.kt b/common/src/main/kotlin/com/lambda/config/groups/BuildSettings.kt
@@ -34,11 +34,11 @@ class BuildSettings(
     override val pathing by c.setting("Pathing", true, "Path to blocks") { vis() && page == Page.General }
     override val stayInRange by c.setting("Stay In Range", true, "Stay in range of blocks") { vis() && page == Page.General && pathing }
     override val collectDrops by c.setting("Collect All Drops", false, "Collect all drops when breaking blocks") { vis() && page == Page.General }
+    override val maxPendingInteractions by c.setting("Max Pending Interactions", 1, 1..10, 1, "Dont wait for this many interactions for the server response") { vis() && page == Page.General }
 
     // Breaking
     override val rotateForBreak by c.setting("Rotate For Break", true, "Rotate towards block while breaking") { vis() && page == Page.Break }
     override val breakConfirmation by c.setting("Break Confirmation", false, "Wait for block break confirmation") { vis() && page == Page.Break }
-    override val maxPendingBreaks by c.setting("Max Pending Breaks", 1, 1..10, 1, "Maximum pending block breaks") { vis() && page == Page.Break }
     override val breaksPerTick by c.setting("Instant Breaks Per Tick", 5, 1..30, 1, "Maximum instant block breaks per tick") { 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 forceSilkTouch by c.setting("Force Silk Touch", false, "Force silk touch when breaking blocks") { vis() && page == Page.Break }
@@ -47,7 +47,7 @@ class BuildSettings(
     // Placing
     override val rotateForPlace by c.setting("Rotate For Place", true, "Rotate towards block while placing") { vis() && page == Page.Place }
     override val placeConfirmation by c.setting("Place Confirmation", true, "Wait for block placement confirmation") { vis() && page == Page.Place }
-    override val placeTimeout by c.setting("Place Timeout", 10, 1..30, 1, "Timeout for block placement in ticks", unit = " ticks") { vis() && page == Page.Place && placeConfirmation }
-    override val maxPendingPlacements by c.setting("Max Pending Places", 1, 1..10, 1, "Maximum pending block places") { vis() && page == Page.Place }
     override val placementsPerTick by c.setting("Instant Places Per Tick", 1, 1..30, 1, "Maximum instant block places per tick") { vis() && page == Page.Place }
+
+    override val interactionTimeout by c.setting("Interaction Timeout", 10, 1..30, 1, "Timeout for block breaks in ticks", unit = " ticks") { vis() && (page == Page.Place && placeConfirmation || page == Page.Break && breakConfirmation) }
 }
diff --git a/common/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt b/common/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt
@@ -17,15 +17,21 @@
 
 package com.lambda.interaction.construction.context
 
+import com.lambda.config.groups.BuildConfig
 import com.lambda.context.SafeContext
+import com.lambda.graphics.renderer.esp.DirectionMask
+import com.lambda.graphics.renderer.esp.DirectionMask.exclude
+import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.interaction.request.rotation.RotationRequest
+import com.lambda.threading.runSafe
 import com.lambda.util.world.raycast.RayCastUtils.distanceTo
 import net.minecraft.block.BlockState
 import net.minecraft.util.Hand
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 import net.minecraft.util.math.Vec3d
+import java.awt.Color
 
 data class BreakContext(
     override val pov: Vec3d,
@@ -35,6 +41,19 @@ data class BreakContext(
     override var hand: Hand,
     val instantBreak: Boolean,
 ) : BuildContext {
+    override val targetState = TargetState.Air
+    private val baseColor = Color(222, 0, 0, 25)
+    private val sideColor = Color(222, 0, 0, 100)
+
+    override fun interact(swingHand: Boolean) {
+        runSafe {
+            if (interaction.updateBlockBreakingProgress(result.blockPos, result.side)) {
+                if (player.isCreative) interaction.blockBreakingCooldown = 0
+                if (swingHand) player.swingHand(hand)
+            }
+        }
+    }
+
     override val expectedPos: BlockPos
         get() = result.blockPos
 
@@ -59,7 +78,10 @@ data class BreakContext(
         }
     }
 
-    override fun SafeContext.buildRenderer() {
+    override fun shouldRotate(config: BuildConfig) = config.rotateForBreak
 
+    override fun SafeContext.buildRenderer() {
+        withState(checkedState, expectedPos, baseColor, DirectionMask.ALL.exclude(result.side))
+        withState(checkedState, expectedPos, sideColor, result.side)
     }
 }
diff --git a/common/src/main/kotlin/com/lambda/interaction/construction/context/BuildContext.kt b/common/src/main/kotlin/com/lambda/interaction/construction/context/BuildContext.kt
@@ -17,7 +17,9 @@
 
 package com.lambda.interaction.construction.context
 
+import com.lambda.config.groups.BuildConfig
 import com.lambda.interaction.construction.result.Drawable
+import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.interaction.request.rotation.RotationRequest
 import net.minecraft.block.BlockState
 import net.minecraft.util.Hand
@@ -30,14 +32,19 @@ interface BuildContext : Comparable<BuildContext>, Drawable {
     val result: BlockHitResult
     val distance: Double
     val expectedState: BlockState
+    val targetState: TargetState
     val expectedPos: BlockPos
     val checkedState: BlockState
     val hand: Hand
     val rotation: RotationRequest
 
+    fun interact(swingHand: Boolean)
+
     override fun compareTo(other: BuildContext): Int {
         return compareBy<BuildContext> {
             it.distance
         }.compare(this, other)
     }
+
+    fun shouldRotate(config: BuildConfig): Boolean
 }
diff --git a/common/src/main/kotlin/com/lambda/interaction/construction/context/PlaceContext.kt b/common/src/main/kotlin/com/lambda/interaction/construction/context/PlaceContext.kt
@@ -17,6 +17,7 @@
 
 package com.lambda.interaction.construction.context
 
+import com.lambda.config.groups.BuildConfig
 import com.lambda.context.SafeContext
 import com.lambda.graphics.renderer.esp.DirectionMask
 import com.lambda.graphics.renderer.esp.DirectionMask.exclude
@@ -42,16 +43,15 @@ data class PlaceContext(
     override val checkedState: BlockState,
     override val hand: Hand,
     override val expectedPos: BlockPos,
-    val targetState: TargetState,
+    override val targetState: TargetState,
     val sneak: Boolean,
     val insideBlock: Boolean,
     val primeDirection: Direction?,
 ) : BuildContext {
-    var placeTick = 0L
     private val baseColor = Color(35, 188, 254, 25)
     private val sideColor = Color(35, 188, 254, 100)
 
-    fun place(swingHand: Boolean) {
+    override fun interact(swingHand: Boolean) {
         runSafe {
             val actionResult = interaction.interactBlock(
                 player, hand, result
@@ -65,7 +65,6 @@ data class PlaceContext(
                 if (!player.getStackInHand(hand).isEmpty && interaction.hasCreativeInventory()) {
                     mc.gameRenderer.firstPersonRenderer.resetEquipProgress(hand)
                 }
-                placeTick = mc.uptimeInTicks
             } else {
                 warn("Internal interaction failed with $actionResult")
             }
@@ -95,4 +94,6 @@ data class PlaceContext(
         withState(expectedState, expectedPos, baseColor, DirectionMask.ALL.exclude(result.side.opposite))
         withState(expectedState, expectedPos, sideColor, result.side.opposite)
     }
+
+    override fun shouldRotate(config: BuildConfig) = config.rotateForPlace
 }
diff --git a/common/src/main/kotlin/com/lambda/interaction/construction/result/BreakResult.kt b/common/src/main/kotlin/com/lambda/interaction/construction/result/BreakResult.kt
@@ -43,18 +43,12 @@ sealed class BreakResult : BuildResult() {
      */
     data class Break(
         override val blockPos: BlockPos,
-        val context: BreakContext,
-    ) : Drawable, Resolvable, BreakResult() {
+        override val context: BreakContext,
+    ) : Drawable, Contextual, BreakResult() {
         override val rank = Rank.BREAK_SUCCESS
-        private val color = Color(222, 0, 0, 100)
-
-        var collectDrop = false
-        override val pausesParent get() = collectDrop
-
-        override fun resolve() = BreakBlock(context, collectDrop)
 
         override fun SafeContext.buildRenderer() {
-            withPos(context.expectedPos, color, context.result.side)
+            with(context) { buildRenderer() }
         }
 
         override fun compareTo(other: ComparableResult<Rank>): Int {
diff --git a/common/src/main/kotlin/com/lambda/interaction/construction/result/BuildResult.kt b/common/src/main/kotlin/com/lambda/interaction/construction/result/BuildResult.kt
@@ -42,6 +42,10 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
     open val pausesParent = false
     override val name: String get() = "${this::class.simpleName} at ${blockPos.toShortString()}"
 
+    interface Contextual {
+        val context: BuildContext
+    }
+
     /**
      * The build action is done.
      */
@@ -197,7 +201,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
     ) : Drawable, Resolvable, BuildResult() {
         override val name: String get() = "Wrong item ($currentItem) for ${blockPos.toShortString()} need ${neededItem.name.string}"
         override val rank = Rank.WRONG_ITEM
-        private val color = Color(3, 252, 169, 100)
+        private val color = Color(3, 252, 169, 25)
 
         override val pausesParent get() = true
 
@@ -233,7 +237,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
     ) : Drawable, Resolvable, BuildResult() {
         override val name: String get() = "Wrong stack for $blockPos need $neededStack."
         override val rank = Rank.WRONG_ITEM
-        private val color = Color(3, 252, 169, 100)
+        private val color = Color(3, 252, 169, 25)
 
         override val pausesParent get() = true
 
@@ -269,7 +273,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
     ) : Navigable, Drawable, BuildResult() {
         override val name: String get() = "Out of reach at $blockPos."
         override val rank = Rank.OUT_OF_REACH
-        private val color = Color(252, 3, 207, 100)
+        private val color = Color(252, 3, 207, 25)
 
         val distance: Double by lazy {
             misses.minOfOrNull { pov.distanceTo(it) } ?: 0.0
diff --git a/common/src/main/kotlin/com/lambda/interaction/construction/result/PlaceResult.kt b/common/src/main/kotlin/com/lambda/interaction/construction/result/PlaceResult.kt
@@ -42,10 +42,14 @@ sealed class PlaceResult : BuildResult() {
      */
     data class Place(
         override val blockPos: BlockPos,
-        val context: PlaceContext,
-    ) : PlaceResult() {
+        override val context: PlaceContext,
+    ) : Contextual, Drawable, PlaceResult() {
         override val rank = Rank.PLACE_SUCCESS
 
+        override fun SafeContext.buildRenderer() {
+            with(context) { buildRenderer() }
+        }
+
         override fun compareTo(other: ComparableResult<Rank>): Int {
             return when (other) {
                 is Place -> context.compareTo(other.context)
diff --git a/common/src/main/kotlin/com/lambda/interaction/request/rotation/RotationManager.kt b/common/src/main/kotlin/com/lambda/interaction/request/rotation/RotationManager.kt
@@ -98,7 +98,7 @@ object RotationManager : RequestHandler<RotationRequest>(), Loadable {
 
             // Update the current rotation
             prevRotation = currentRotation
-            currentRotation = targetRotation.fixSensitivity(prevRotation)
+            currentRotation = targetRotation/*.fixSensitivity(prevRotation)*/
 
             // Handle LOCK mode
             if (currentRequest?.mode == RotationMode.Lock) {
diff --git a/common/src/main/kotlin/com/lambda/interaction/request/rotation/visibilty/VisibilityChecker.kt b/common/src/main/kotlin/com/lambda/interaction/request/rotation/visibilty/VisibilityChecker.kt
@@ -136,7 +136,7 @@ object VisibilityChecker {
         scan: SurfaceScan = SurfaceScan.DEFAULT,
         check: (Direction, Vec3d) -> Unit,
     ) {
-        val margin = 0.1
+        val margin = 0.01
 
         excludedSides.forEach { side ->
             if (excludedSides.isNotEmpty() && side !in excludedSides) return@forEach
diff --git a/common/src/main/kotlin/com/lambda/task/Task.kt b/common/src/main/kotlin/com/lambda/task/Task.kt
@@ -317,7 +317,7 @@ abstract class Task<Result> : Nameable, Muteable {
         buildString { appendTaskTree(this@Task) }
 
     private fun StringBuilder.appendTaskTree(task: Task<*>, level: Int = 0) {
-        appendLine("${" ".repeat(level * 4)}${task.name}" + if (task !is RootTask) " ${task.duration} [${task.state.display}]" else "")
+        appendLine("${" ".repeat(level * 4)}${task.name}" + if (task !is RootTask) " [${task.state.display}] ${task.duration}" else "")
         if (!TaskFlowModule.showAllEntries && (task.state == State.COMPLETED || task.state == State.CANCELLED)) return
         task.subTasks.forEach {
             if (!TaskFlowModule.showAllEntries && task is RootTask && (it.state == State.COMPLETED || it.state == State.CANCELLED)) return@forEach
diff --git a/common/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt b/common/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt
diff --git a/common/src/main/kotlin/com/lambda/util/collections/LimitedDecayQueue.kt b/common/src/main/kotlin/com/lambda/util/collections/LimitedDecayQueue.kt
