fixed instamine with silent swap

Author: beanbag44

common/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt

@@ -41,7 +41,7 @@ data class BreakContext(
     override val checkedState: BlockState,
     override val targetState: TargetState,
     override var hotbarIndex: Int,
-    val instantBreak: Boolean,
+    var instantBreak: Boolean,
 ) : BuildContext {
     private val baseColor = Color(222, 0, 0, 25)
     private val sideColor = Color(222, 0, 0, 100)

common/src/main/kotlin/com/lambda/interaction/construction/simulation/BuildSimulator.kt

@@ -410,7 +410,7 @@ object BuildSimulator {
                     state,
                     targetState,
                     player.inventory.selectedSlot,
-                    instantBreakable(state, pos)
+                    instantBreakable(state, pos, build.breakSettings.breakThreshold)
                 )
                 acc.add(BreakResult.Break(pos, breakContext))
                 return acc
@@ -455,7 +455,7 @@ object BuildSimulator {
         val blockHit = bestHit.hit.blockResult ?: return acc
         val target = lookAt(bestHit.targetRotation, 0.001)
         val request = RotationRequest(target, rotation)
-        val instant = instantBreakable(state, pos)
+        val instant = instantBreakable(state, pos, build.breakSettings.breakThreshold)
 
         val breakContext = BreakContext(
             eye, blockHit, request, state, targetState, player.inventory.selectedSlot, instant
@@ -513,7 +513,8 @@ object BuildSimulator {
         if (toolPair == null) return acc
 
         breakContext.hotbarIndex = player.hotbar.indexOf(toolPair.first)
+        breakContext.instantBreak = instantBreakable(state, pos, toolPair.first, build.breakSettings.breakThreshold)
 	    acc.add(BreakResult.Break(pos, breakContext))
         return acc
     }
-}
+}

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

@@ -166,7 +166,8 @@ class BuildTask @Ta5kBuilder constructor(
                     .sorted()
                     .take(build.breakSettings.breaksPerTick)
 
-                if (instantResults.isNotEmpty()) {
+                instantResults.firstOrNull()?.let { firstInstant ->
+                    if (!hotbar.request(HotbarRequest(firstInstant.context.hotbarIndex)).done) return@onRotate
                     build.breakSettings.request(BreakRequest(instantResults.map { it.context }, build, rotation) { breaks++ })
                     return@onRotate
                 }

common/src/main/kotlin/com/lambda/util/BlockUtils.kt

@@ -235,13 +235,13 @@ object BlockUtils {
     fun SafeContext.fluidState(pos: BlockPos): FluidState = world.getFluidState(pos)
     fun SafeContext.blockEntity(pos: BlockPos) = world.getBlockEntity(pos)
 
-    fun SafeContext.instantBreakable(blockState: BlockState, blockPos: BlockPos): Boolean {
-        val ticksNeeded = 1 / blockState.calcBlockBreakingDelta(player, world, blockPos)
+    fun SafeContext.instantBreakable(blockState: BlockState, blockPos: BlockPos, breakThreshold: Float): Boolean {
+        val ticksNeeded = 1 / (blockState.calcBlockBreakingDelta(player, world, blockPos) / breakThreshold)
         return (ticksNeeded <= 1 && ticksNeeded != 0f) || player.isCreative
     }
 
-    fun SafeContext.instantBreakable(blockState: BlockState, blockPos: BlockPos, item: ItemStack): Boolean {
-        val ticksNeeded = 1 / blockState.calcItemBlockBreakingDelta(player, world, blockPos, item)
+    fun SafeContext.instantBreakable(blockState: BlockState, blockPos: BlockPos, item: ItemStack, breakThreshold: Float): Boolean {
+        val ticksNeeded = 1 / (blockState.calcItemBlockBreakingDelta(player, world, blockPos, item) / breakThreshold)
         return (ticksNeeded <= 1 && ticksNeeded != 0f) || player.isCreative
     }