use original rotation request from break context and ignore if keep ticks is <= 0

Author: beanbag44

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

@@ -22,7 +22,7 @@ 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.visibilty.RotationTarget
+import com.lambda.interaction.request.rotation.RotationRequest
 import com.lambda.util.world.raycast.RayCastUtils.distanceTo
 import net.minecraft.block.BlockState
 import net.minecraft.client.network.ClientPlayerInteractionManager
@@ -38,7 +38,7 @@ import java.awt.Color
 data class BreakContext(
     override val pov: Vec3d,
     override val result: BlockHitResult,
-    val rotation: RotationTarget,
+    override val rotation: RotationRequest,
     override var checkedState: BlockState,
     override val targetState: TargetState,
     override var hotbarIndex: Int,
@@ -64,7 +64,7 @@ data class BreakContext(
     override fun compareTo(other: BuildContext): Int {
         return when (other) {
             is BreakContext -> compareBy<BreakContext> {
-                it.rotation.angleDistance
+                it.rotation.target.angleDistance
             }.compare(this, other)
 
             else -> 1

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

@@ -21,6 +21,7 @@ import com.lambda.config.groups.BuildConfig
 import com.lambda.interaction.construction.result.Drawable
 import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.interaction.material.container.MaterialContainer
+import com.lambda.interaction.request.rotation.RotationRequest
 import net.minecraft.block.BlockState
 import net.minecraft.item.ItemStack
 import net.minecraft.util.hit.BlockHitResult
@@ -30,6 +31,7 @@ import net.minecraft.util.math.Vec3d
 interface BuildContext : Comparable<BuildContext>, Drawable {
     val pov: Vec3d
     val result: BlockHitResult
+    val rotation: RotationRequest
     val distance: Double
     val expectedState: BlockState
     val targetState: TargetState

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

@@ -35,7 +35,7 @@ import java.awt.Color
 data class PlaceContext(
     override val pov: Vec3d,
     override val result: BlockHitResult,
-    val rotation: RotationRequest,
+    override val rotation: RotationRequest,
     override val distance: Double,
     override val expectedState: BlockState,
     override val checkedState: BlockState,

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

@@ -40,10 +40,11 @@ import com.lambda.interaction.request.rotation.Rotation.Companion.rotationTo
 import com.lambda.interaction.request.rotation.RotationConfig
 import com.lambda.interaction.request.rotation.RotationManager
 import com.lambda.interaction.request.rotation.RotationRequest
-import com.lambda.interaction.request.rotation.visibilty.*
 import com.lambda.interaction.request.rotation.visibilty.VisibilityChecker.CheckedHit
 import com.lambda.interaction.request.rotation.visibilty.VisibilityChecker.getVisibleSurfaces
 import com.lambda.interaction.request.rotation.visibilty.VisibilityChecker.scanSurfaces
+import com.lambda.interaction.request.rotation.visibilty.lookAt
+import com.lambda.interaction.request.rotation.visibilty.lookAtBlock
 import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.threading.runSafe
 import com.lambda.util.BlockUtils
@@ -454,10 +455,13 @@ object BuildSimulator {
         /* the player is buried inside the block */
         if (boxes.any { it.contains(eye) }) {
             currentCast?.blockResult?.let { blockHit ->
+                val rotationRequest = RotationRequest(
+                    lookAtBlock(pos, config = interact), rotation
+                )
                 val breakContext = BreakContext(
                     eye,
                     blockHit,
-                    lookAtBlock(pos, config = interact),
+                    rotationRequest,
                     state,
                     targetState,
                     player.inventory.selectedSlot,
@@ -505,10 +509,11 @@ object BuildSimulator {
         val bestHit = interact.pointSelection.select(validHits) ?: return acc
         val blockHit = bestHit.hit.blockResult ?: return acc
         val target = lookAt(bestHit.targetRotation, 0.001)
+        val request = RotationRequest(target, rotation)
         val instant = instantBreakable(state, pos, build.breakSettings.breakThreshold)
 
         val breakContext = BreakContext(
-            eye, blockHit, target, state, targetState, player.inventory.selectedSlot, instant
+            eye, blockHit, request, state, targetState, player.inventory.selectedSlot, instant
         )
 
         if (gamemode.isCreative) {

common/src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt

@@ -266,7 +266,9 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
         rotation = breakingInfos
             .firstOrNull { it?.breakConfig?.rotateForBreak == true }
             ?.let { info ->
-                info.rotationConfig.request(RotationRequest(info.context.rotation, info.rotationConfig))
+                // If the simulation cant find a valid rotation to break the block, the existing break context stays and the keep ticks deplete until
+                if (info.context.rotation.keepTicks <= 0) null
+                else info.rotationConfig.request(info.context.rotation)
             }
     }
 
@@ -560,7 +562,13 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
 
         fun simulate(player: ClientPlayerEntity) {
             val result = context.expectedPos
-                .toStructure(context.targetState)
+                .toStructure(
+                    if (!context.checkedState.fluidState.isEmpty) {
+                        TargetState.State(context.checkedState.fluidState.blockState)
+                    } else {
+                        TargetState.Air
+                    }
+                )
                 .toBlueprint()
                 .simulate(player.eyePos, interactionConfig, rotationConfig, inventoryConfig, buildConfig)
                 .firstOrNull()