fix baritone movement again lol and general cleanup

Author: beanbag44

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BreakSim.kt

@@ -129,7 +129,7 @@ class BreakSim private constructor(simInfo: ISimInfo)
         val validHits = scanShape(pov, shape, pos, Direction.entries.toSet(), preProcessing) ?: return
 
         val bestHit = buildConfig.pointSelection.select(validHits) ?: return
-        val target = lookAt(bestHit.targetRotation, 0.001)
+        val target = lookAt(bestHit.targetRotation)
         val rotationRequest = RotationRequest(target, this)
 
         val breakContext = BreakContext(

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/PlaceSim.kt

@@ -180,7 +180,7 @@ class PlaceSim private constructor(simInfo: ISimInfo)
 
             val rotationRequest = if (placeConfig.axisRotate && (targetState as? TargetState.State)?.blockState?.contains(Properties.ROTATION) != true)
                 lookInDirection(PlaceDirection.fromRotation(rotatePlaceTest.rotation))
-            else lookAt(rotatePlaceTest.rotation, 0.001)
+            else lookAt(rotatePlaceTest.rotation)
 
             val swapStack = getSwapStack() ?: return
             if (!swapStack.item.isEnabled(world.enabledFeatures)) {

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/PostProcessingSim.kt

@@ -151,7 +151,7 @@ class PostProcessingSim private constructor(simInfo: ISimInfo)
     ) {
         buildConfig.pointSelection.select(validHits)?.let { checkedHit ->
             val checkedResult = checkedHit.hit.blockResult ?: return
-            val rotationTarget = lookAt(checkedHit.targetRotation, 0.001)
+            val rotationTarget = lookAt(checkedHit.targetRotation)
             val context = InteractContext(
                 checkedResult,
                 RotationRequest(rotationTarget, this),

src/main/kotlin/com/lambda/interaction/request/rotating/RotationManager.kt

@@ -69,7 +69,7 @@ object RotationManager : RequestHandler<RotationRequest>(
     var activeRotation = Rotation.ZERO
     var serverRotation = Rotation.ZERO
     @JvmStatic var prevServerRotation = Rotation.ZERO
-    var baritoneRequest: RotationRequest? = null
+    private var usingBaritoneRotation = false
 
     var activeRequest: RotationRequest? = null
     private var changedThisTick = false
@@ -89,6 +89,7 @@ object RotationManager : RequestHandler<RotationRequest>(
         }
 
         listen<TickEvent.Post>(priority = Int.MIN_VALUE) {
+            usingBaritoneRotation = false
             activeRequest?.let { request ->
                 request.age++
             }
@@ -177,7 +178,8 @@ object RotationManager : RequestHandler<RotationRequest>(
     @JvmStatic
     fun handleBaritoneRotation(yaw: Float) {
         runSafe {
-            baritoneRequest = lookAt(Rotation(yaw, player.pitch)).requestBy(BaritoneManager)
+            activeRequest = lookAt(Rotation(yaw, player.pitch)).requestBy(BaritoneManager)
+            usingBaritoneRotation = true
         }
     }
 
@@ -188,7 +190,7 @@ object RotationManager : RequestHandler<RotationRequest>(
      */
     @JvmStatic
     fun redirectStrafeInputs(input: Input) = runSafe {
-        if (activeRequest == baritoneRequest) return@runSafe
+        if (usingBaritoneRotation) return@runSafe
 
         val movementYaw = movementYaw ?: return@runSafe
         val playerYaw = player.yaw
@@ -272,7 +274,7 @@ object RotationManager : RequestHandler<RotationRequest>(
         prevServerRotation = serverRotation
         serverRotation = activeRotation
 
-        if (activeRequest?.rotationMode == RotationMode.Lock) {
+        if (activeRequest?.rotationConfig?.rotationMode == RotationMode.Lock) {
             mc.player?.yaw = serverRotation.yawF
             mc.player?.pitch = serverRotation.pitchF
         }
@@ -285,19 +287,15 @@ object RotationManager : RequestHandler<RotationRequest>(
     private fun SafeContext.updateActiveRotation() {
         activeRotation = activeRequest?.let { active ->
             val rotationTo = if (active.keepTicks >= 0)
-                active.target.targetRotation.value
-                    ?: activeRotation // the same context gets used again && the rotation is null this tick
+                active.target.targetRotation.value ?: activeRotation // the same context gets used again && the rotation is null this tick
             else player.rotation
 
-            val speedMultiplier = if (active.keepTicks < 0) 1.0 else active.speedMultiplier
-            val turnSpeed = active.turnSpeed * speedMultiplier
-
             if (active.keepTicks-- <= 0) {
                 active.decayTicks--
             }
 
             // Important: do NOT wrap the result yaw; keep it continuous to match vanilla packets
-            serverRotation.slerp(rotationTo, turnSpeed)
+            serverRotation.slerp(rotationTo, active.rotationConfig.turnSpeed)
         } ?: player.rotation
 
         logger.debug("Active rotation set to $activeRotation", activeRequest)
@@ -313,45 +311,43 @@ object RotationManager : RequestHandler<RotationRequest>(
 
     @JvmStatic
     val lockRotation
-        get() = activeRequest?.let {
-            if (it.rotationMode == RotationMode.Lock && it.keepTicks > 0 && it.decayTicks > 0)
-                return@let activeRotation
-            else null
+        get() = activeRequest?.let { active ->
+            activeRotation.takeIf { active.rotationConfig.rotationMode == RotationMode.Lock && active.keepTicks > 0 && active.decayTicks > 0 }
         }
 
     @JvmStatic
     val headYaw
-        get() = if (activeRequest == null) null else activeRotation.yawF
+        get() = activeRotation.yawF.takeIf { activeRequest != null }
 
     @JvmStatic
     val headPitch
-        get() = if (activeRequest == null) null else activeRotation.pitchF
+        get() = activeRotation.pitchF.takeIf { activeRequest != null }
 
     @JvmStatic
     val handYaw
-        get() = if (activeRequest?.rotationMode == RotationMode.Lock) activeRotation.yawF else null
+        get() = activeRotation.yawF.takeIf { activeRequest?.rotationConfig?.rotationMode == RotationMode.Lock }
 
     @JvmStatic
     val handPitch
-        get() = if (activeRequest?.rotationMode == RotationMode.Lock) activeRotation.pitchF else null
+        get() = activeRotation.pitchF.takeIf { activeRequest?.rotationConfig?.rotationMode == RotationMode.Lock }
 
     @JvmStatic
     val movementYaw: Float?
         get() {
-            if (activeRequest == null || activeRequest?.rotationMode == RotationMode.Silent) return null
-            return activeRotation.yaw.toFloat()
+            return if (activeRequest == null || activeRequest?.rotationConfig?.rotationMode == RotationMode.Silent) null
+            else activeRotation.yaw.toFloat()
         }
 
     @JvmStatic
     val movementPitch: Float?
         get() {
-            if (activeRequest == null || activeRequest?.rotationMode == RotationMode.Silent) return null
-            return activeRotation.pitch.toFloat()
+            return if (activeRequest == null || activeRequest?.rotationConfig?.rotationMode == RotationMode.Silent) null
+            else activeRotation.pitch.toFloat()
         }
 
     @JvmStatic
     fun getRotationForVector(deltaTime: Double): Vec2d? {
-        if (activeRequest == null || activeRequest?.rotationMode == RotationMode.Silent) return null
+        if (activeRequest == null || activeRequest?.rotationConfig?.rotationMode == RotationMode.Silent) return null
 
         val rot = lerp(deltaTime, serverRotation, activeRotation)
         return Vec2d(rot.yaw, rot.pitch)

src/main/kotlin/com/lambda/interaction/request/rotating/RotationRequest.kt

@@ -27,32 +27,26 @@ import com.lambda.threading.runSafe
 data class RotationRequest(
     val target: RotationTarget,
     private val automated: Automated,
-    val rotationMode: RotationMode = automated.rotationConfig.rotationMode,
-    val turnSpeed: Double = automated.rotationConfig.turnSpeed,
     var keepTicks: Int = automated.rotationConfig.keepTicks,
     var decayTicks: Int = automated.rotationConfig.decayTicks,
-    val speedMultiplier: Double = 1.0
 ) : Request(), LogContext, Automated by automated {
     override val requestId = ++requestCount
 
     var age = 0
     override val nowOrNothing = false
 
     override val done: Boolean get() =
-        rotationMode == RotationMode.None || runSafe { target.verify() } == true
+        rotationConfig.rotationMode == RotationMode.None || runSafe { target.verify() } == true
 
     override fun submit(queueIfClosed: Boolean): RotationRequest =
         RotationManager.request(this, queueIfClosed)
 
     override fun getLogContextBuilder(): LogContextBuilder.() -> Unit = {
         group("Rotation Request") {
             value("Request ID", requestId)
-            value("Rotation Mode", rotationMode)
-            value("Turn Speed", turnSpeed)
+            value("Age", age)
             value("Keep Ticks", keepTicks)
             value("Decay Ticks", decayTicks)
-            value("Speed Multiplier", speedMultiplier)
-            value("Age", age)
         }
     }
 

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

@@ -46,7 +46,7 @@ annotation class RotationDsl
  * @return A [RotationTarget] instance.
  */
 @RotationDsl
-fun lookAt(angle: Rotation, maxAngleDistance: Double = 10.0) =
+fun lookAt(angle: Rotation, maxAngleDistance: Double = 0.001) =
     RotationTarget(null, {
         RotationManager.activeRotation dist angle < maxAngleDistance
     }) { angle }

src/main/kotlin/com/lambda/module/modules/player/RotationLock.kt

@@ -66,7 +66,7 @@ object RotationLock : Module(
                 RotationMode.None -> player.pitch.toDouble()
             }
 
-            RotationRequest(lookAt(Rotation(yaw, pitch), 0.001), this@RotationLock).submit()
+            RotationRequest(lookAt(Rotation(yaw, pitch)), this@RotationLock).submit()
         }
     }