Baritone movement fix, surface scan for rotation dsl

Author: blade1234567

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

@@ -291,7 +291,7 @@ object BuildSimulator {
                     eye,
                     blockHit,
                     RotationRequest(
-                        lookAtBlock(blockHit.blockPos, setOf(blockHit.side), interact), rotation
+                        lookAtBlock(blockHit.blockPos, setOf(blockHit.side), config = interact), rotation
                     ),
                     eye.distanceTo(blockHit.pos),
                     resultState,

common/src/main/kotlin/com/lambda/interaction/request/rotation/RotationManager.kt

@@ -21,10 +21,7 @@ import com.lambda.Lambda
 import com.lambda.context.SafeContext
 import com.lambda.core.Loadable
 import com.lambda.event.EventFlow.post
-import com.lambda.event.events.ConnectionEvent
-import com.lambda.event.events.PacketEvent
-import com.lambda.event.events.PlayerPacketEvent
-import com.lambda.event.events.RotationEvent
+import com.lambda.event.events.*
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.event.listener.UnsafeListener.Companion.listenUnsafe
 import com.lambda.interaction.request.RequestHandler
@@ -197,7 +194,13 @@ object RotationManager : RequestHandler<RotationRequest>(), Loadable {
 
         @JvmStatic
         fun handleBaritoneRotation(yaw: Float, pitch: Float) {
-            lookAt(Rotation(yaw, pitch)).requestBy(Baritone.rotation)
+            baritoneContext = lookAt(Rotation(yaw, pitch)).requestBy(Baritone.rotation)
+        }
+
+        init {
+            listenUnsafe<TickEvent.Pre> {
+                baritoneContext = null
+            }
         }
 
         @JvmStatic

common/src/main/kotlin/com/lambda/interaction/request/rotation/visibilty/RotationTargets.kt

@@ -19,6 +19,7 @@ package com.lambda.interaction.request.rotation.visibilty
 
 import com.lambda.config.groups.InteractionConfig
 import com.lambda.context.SafeContext
+import com.lambda.interaction.construction.verify.SurfaceScan
 import com.lambda.interaction.request.rotation.Rotation
 import com.lambda.interaction.request.rotation.Rotation.Companion.dist
 import com.lambda.interaction.request.rotation.RotationManager
@@ -75,7 +76,7 @@ fun lookAtHit(
     config: InteractionConfig = TaskFlowModule.interact,
 ): RotationTarget? {
     return when (hit) {
-        is BlockHitResult -> lookAtBlock(hit.blockPos, setOf(hit.side), config)
+        is BlockHitResult -> lookAtBlock(hit.blockPos, setOf(hit.side), SurfaceScan.DEFAULT, config)
         is EntityHitResult -> lookAtEntity(hit.entity as? LivingEntity ?: return null, config)
         else -> null
     }
@@ -101,6 +102,7 @@ fun lookAtEntity(
             config.attackReach,
             player.eyePos,
             ALL_SIDES,
+            SurfaceScan.DEFAULT,
             InteractionMask.ENTITY,
             config
         ) { requestedHit.verifyHit(hit) }?.targetRotation
@@ -119,6 +121,7 @@ fun lookAtEntity(
 fun lookAtBlock(
     pos: BlockPos,
     sides: Set<Direction> = ALL_SIDES,
+    surfaceScan: SurfaceScan = SurfaceScan.DEFAULT,
     config: InteractionConfig = TaskFlowModule.interact,
 ): RotationTarget {
     val requestedHit = blockHit(pos, sides, config.interactReach)
@@ -129,6 +132,7 @@ fun lookAtBlock(
             config.interactReach,
             player.eyePos,
             sides,
+            surfaceScan,
             InteractionMask.BLOCK,
             config
         ) { requestedHit.verifyHit(hit) }?.targetRotation

common/src/main/kotlin/com/lambda/interaction/request/rotation/visibilty/VisibilityChecker.kt

@@ -20,13 +20,15 @@ package com.lambda.interaction.request.rotation.visibilty
 import com.lambda.config.groups.InteractionConfig
 import com.lambda.config.groups.InteractionSettings
 import com.lambda.context.SafeContext
+import com.lambda.interaction.construction.processing.PreprocessingStep
 import com.lambda.interaction.construction.verify.ScanMode
 import com.lambda.interaction.construction.verify.SurfaceScan
 import com.lambda.interaction.request.rotation.*
 import com.lambda.interaction.request.rotation.Rotation.Companion.rotationTo
 import com.lambda.util.extension.component6
 import com.lambda.util.math.distSq
 import com.lambda.util.world.raycast.InteractionMask
+import net.minecraft.entity.LivingEntity
 import net.minecraft.util.hit.EntityHitResult
 import net.minecraft.util.hit.HitResult
 import net.minecraft.util.math.Box
@@ -58,6 +60,7 @@ object VisibilityChecker {
         reach: Double,
         eye: Vec3d,
         sides: Set<Direction>,
+        scan: SurfaceScan,
         targetType: InteractionMask,
         interaction: InteractionConfig,
         verify: CheckedHit.() -> Boolean
@@ -71,7 +74,7 @@ object VisibilityChecker {
         }
 
         return interaction.pointSelection.select(
-            collectHitsFor(boxes, reach, eye, sides, SurfaceScan.DEFAULT, targetType, interaction, verify)
+            collectHitsFor(boxes, reach, eye, sides, scan, targetType, interaction, verify)
         )
     }
 
@@ -119,6 +122,38 @@ object VisibilityChecker {
         }
     }
 
+    private fun SafeContext.collectHitsInternal(
+        boxes: List<Box>,
+        reach: Double,
+        eye: Vec3d,
+        sides: Set<Direction>,
+        scan: SurfaceScan,
+        targetType: InteractionMask,
+        entity: LivingEntity?,
+        interaction: InteractionConfig,
+        verify: CheckedHit.() -> Boolean,
+    ) = mutableListOf<CheckedHit>().apply {
+        val reachSq = interaction.scanReach.pow(2)
+
+        boxes.forEach { box ->
+            val visible = visibleSides(box, eye, interaction.checkSideVisibility)
+
+            scanSurfaces(box, visible.intersect(sides), interaction.resolution, scan) { _, vec ->
+                if (eye distSq vec > reachSq) return@scanSurfaces
+
+                val newRotation = eye.rotationTo(vec)
+
+                val mask = if (interaction.strictRayCast || entity == null) InteractionMask.BOTH else targetType
+                val hit = newRotation.rayCast(reach, eye, mask = mask) ?: return@scanSurfaces
+
+                val checked = CheckedHit(hit, newRotation, reach)
+                if (!checked.verify()) return@scanSurfaces
+
+                add(checked)
+            }
+        }
+    }
+
     /**
      * Scans the surfaces of a given box, optionally excluding specific sides,
      * and executes a callback for each point calculated based on the scanning parameters.
@@ -243,5 +278,9 @@ object VisibilityChecker {
 
     val ALL_SIDES = Direction.entries.toSet()
 
-    class CheckedHit(val hit: HitResult, val targetRotation: Rotation, val reach: Double)
+    class CheckedHit(
+        val hit: HitResult,
+        val targetRotation: Rotation,
+        val reach: Double
+    )
 }

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

@@ -100,7 +100,7 @@ class BreakBlock @Ta5kBuilder constructor(
             } ?: BaritoneUtils.cancel()
 
             if (rotate && !ctx.instantBreak && state == State.BREAKING) {
-                lookAtBlock(blockPos, sides, interact).let {
+                lookAtBlock(blockPos, sides, config = interact).let {
                     if (it.requestBy(rotation).done) {
                         hitBlock(ctx.result.side)
                     }

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

@@ -83,7 +83,7 @@ class OpenContainer @Ta5kBuilder constructor(
         listen<TickEvent.Pre> {
             if (state != State.SCOPING) return@listen
 
-            val target = lookAtBlock(blockPos, sides, interact)
+            val target = lookAtBlock(blockPos, sides, config = interact)
             if (rotate && !target.requestBy(rotation).done) return@listen
 
             val hitResult = target.hit?.hitIfValid()?.blockResult ?: return@listen