misc small bug fixes and confirm break timeout

Author: beanbag44

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

@@ -29,6 +29,7 @@ interface BuildConfig {
     val breakThreshold: Float
     val rotateForBreak: Boolean
     val breakConfirmation: Boolean
+    val breakTimeout: Int
     val maxPendingBreaks: Int
     val breaksPerTick: Int
     val breakWeakBlocks: Boolean

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

@@ -40,6 +40,7 @@ class BuildSettings(
     override val breakThreshold by c.setting("Break Threshold", 1.0f, 0.1f..1.0f, 0.1f, "The amount broken, between 0.0 and 1.0, a block should be considered broken") { vis() && page == Page.BREAK }
     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 breakTimeout by c.setting("Break Timeout", 10, 1..30, 1, "Timeout for breaking in ticks", unit = "ticks") { 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 }

common/src/main/kotlin/com/lambda/module/modules/player/PacketMineTaskRewrite.kt

@@ -71,11 +71,8 @@ object PacketMineTaskRewrite : Module(
     ) { page == Page.General }
     private val interactionDelay by setting(
         "Interact Delay",
-        0,
-        0..5,
-        1,
+        false,
         "The delay between interacting with blocks",
-        "ticks"
     ) { page == Page.General }
     private val swingHand by setting(
         "Swing Hand",

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

@@ -61,11 +61,12 @@ class PacketBreakBlock @Ta5kBuilder constructor(
     private val breakingTexture: Boolean = true,
     private val sounds: Boolean = true,
     private val particles: Boolean = true,
+    private val obeyInteractionDelays: Boolean = false,
     private val collectDrop: Boolean = false,
+    private val rotate: Boolean = TaskFlowModule.build.rotateForBreak,
     private val rotation: RotationConfig = TaskFlowModule.rotation,
     private val interact: InteractionConfig = TaskFlowModule.interact,
     private val sides: Set<Direction> = Direction.entries.toSet(),
-    private val rotate: Boolean = TaskFlowModule.build.rotateForBreak,
 ) : Task<ItemEntity?>() {
     override val name get() = "Packet breaking ${ctx.result.blockPos.toShortString()}"
 
@@ -93,6 +94,7 @@ class PacketBreakBlock @Ta5kBuilder constructor(
     private var soundCooldown = 0.0f
 
     private var pendingConfirmation = false
+    private var pendingConfirmationStartTimestamp = 0L
 
     enum class State {
         BREAKING, COLLECTING
@@ -128,33 +130,43 @@ class PacketBreakBlock @Ta5kBuilder constructor(
         }
 
         listen<TickEvent.Pre> {
-            side = mc.crosshairTarget?.blockResult?.side ?: ctxSide
+            mc.crosshairTarget?.blockResult?.side?.let { currentBlockHitSide ->
+                side = currentBlockHitSide
+            }
 
-            drop?.let { itemDrop ->
-                if (!collectDrop) {
-                    breakBlock()
-                    success(itemDrop)
-                    return@listen
-                }
+            if (pendingConfirmation) {
+                drop?.let { itemDrop ->
+                    if (!collectDrop) {
+                        breakBlock()
+                        success(itemDrop)
+                        return@listen
+                    }
 
-                if (!world.entities.contains(itemDrop)) {
-                    BaritoneUtils.cancel()
-                    success(itemDrop)
-                    return@listen
-                }
+                    if (!world.entities.contains(itemDrop)) {
+                        BaritoneUtils.cancel()
+                        success(itemDrop)
+                        return@listen
+                    }
 
-                if (player.hotbarAndStorage.none { it.isEmpty }) {
-                    player.currentScreenHandler.inventorySlots.firstOrNull {
-                        it.stack.item.block in TaskFlowModule.inventory.disposables
-                    }?.let {
-                        clickSlot(it.id, 1, SlotActionType.THROW)
+                    if (player.hotbarAndStorage.none { it.isEmpty }) {
+                        player.currentScreenHandler.inventorySlots.firstOrNull {
+                            it.stack.item.block in TaskFlowModule.inventory.disposables
+                        }?.let {
+                            clickSlot(it.id, 1, SlotActionType.THROW)
+                        }
+                        return@listen
                     }
+
+                    BaritoneUtils.setGoalAndPath(GoalBlock(itemDrop.blockPos))
                     return@listen
+                } ?: run {
+                    BaritoneUtils.cancel()
+                    if (getPendingTime() >= TaskFlowModule.build.breakTimeout
+                    ) {
+                        failure("Packet break timed out.")
+                    }
                 }
-
-                BaritoneUtils.setGoalAndPath(GoalBlock(itemDrop.blockPos))
-                return@listen
-            } ?: BaritoneUtils.cancel()
+            }
 
             if (pendingConfirmation) return@listen
 
@@ -166,7 +178,7 @@ class PacketBreakBlock @Ta5kBuilder constructor(
                         player, world, blockPos, toolStack!!
                     )
                     val previousBreakDelta = currentBlockState.calcItemBlockBreakingDelta(
-                        player, world, blockPos, toolStack!!
+                        player, world, blockPos, previousToolStack!!
                     )
                     val multiplier = currentBreakDelta / previousBreakDelta
                     progress *= multiplier
@@ -337,6 +349,7 @@ class PacketBreakBlock @Ta5kBuilder constructor(
     private fun SafeContext.onBlockBreak() {
         if (internalBreakConfirmation) {
             pendingConfirmation = true
+            pendingConfirmationStartTimestamp = System.currentTimeMillis()
         } else {
             breakBlock()
             success(null)
@@ -367,6 +380,9 @@ class PacketBreakBlock @Ta5kBuilder constructor(
         )
     }
 
+    private fun getPendingTime() =
+        System.currentTimeMillis() - pendingConfirmationStartTimestamp
+
     private fun SafeContext.swing() =
         player.swingHand(player.activeHand)