separate yaw and pitch in the rotation manager

Author: beanbag44

src/main/java/com/lambda/mixin/entity/EntityMixin.java

@@ -22,8 +22,6 @@
 import com.lambda.event.events.EntityEvent;
 import com.lambda.event.events.PlayerEvent;
 import com.lambda.interaction.managers.rotating.RotationManager;
-import com.lambda.interaction.managers.rotating.RotationMode;
-import com.lambda.module.modules.player.RotationLock;
 import com.lambda.module.modules.render.NoRender;
 import com.lambda.util.math.Vec2d;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
@@ -149,17 +147,11 @@ private boolean modifyGetFlagGlowing(boolean original) {
 
     @WrapWithCondition(method = "changeLookDirection", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;setYaw(F)V"))
     private boolean wrapSetYaw(Entity instance, float yaw) {
-        return (instance != Lambda.getMc().player ||
-                RotationLock.INSTANCE.isDisabled() ||
-                RotationLock.INSTANCE.getRotationConfig().getRotationMode() != RotationMode.Lock ||
-                RotationLock.getYawMode() == RotationLock.Mode.None);
+        return RotationManager.getLockYaw() == null;
     }
 
     @WrapWithCondition(method = "changeLookDirection", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;setPitch(F)V"))
     private boolean wrapSetPitch(Entity instance, float yaw) {
-        return (instance != Lambda.getMc().player ||
-                RotationLock.INSTANCE.isDisabled() ||
-                RotationLock.INSTANCE.getRotationConfig().getRotationMode() != RotationMode.Lock ||
-                RotationLock.getPitchMode() == RotationLock.Mode.None);
+        return RotationManager.getLockPitch() == null;
     }
 }

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

@@ -29,8 +29,8 @@ import com.lambda.interaction.construction.simulation.result.results.BreakResult
 import com.lambda.interaction.construction.simulation.result.results.GenericResult
 import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.interaction.managers.hotbar.HotbarManager
+import com.lambda.interaction.managers.rotating.IRotationRequest.Companion.rotationRequest
 import com.lambda.interaction.managers.rotating.RotationManager
-import com.lambda.interaction.managers.rotating.RotationRequest
 import com.lambda.interaction.managers.rotating.visibilty.lookAtBlock
 import com.lambda.interaction.material.ContainerSelection.Companion.selectContainer
 import com.lambda.interaction.material.StackSelection
@@ -108,7 +108,7 @@ class BreakSim private constructor(simInfo: SimInfo)
         if (shape.boundingBoxes.map { it.offset(pos) }.any { it.contains(pov) }) {
             val currentCast = RotationManager.activeRotation.rayCast(buildConfig.blockReach, pov)
             currentCast?.blockResult?.let { blockHit ->
-                val rotationRequest = RotationRequest(lookAtBlock(pos)?.rotation ?: return, this)
+                val rotationRequest = lookAtBlock(pos)?.rotation?.let { rotationRequest { rotation(it) } } ?: return
                 val breakContext = BreakContext(
                     blockHit,
                     rotationRequest,
@@ -127,7 +127,7 @@ class BreakSim private constructor(simInfo: SimInfo)
         val validHits = scanShape(pov, shape, pos, Direction.entries.toSet(), null) ?: return
 
         val bestHit = buildConfig.pointSelection.select(validHits) ?: return
-        val rotationRequest = RotationRequest(bestHit.rotation, this)
+        val rotationRequest = rotationRequest { rotation(bestHit.rotation) }
 
         val breakContext = BreakContext(
             bestHit.hit.blockResult ?: return,

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

@@ -27,10 +27,10 @@ import com.lambda.interaction.construction.simulation.result.BuildResult
 import com.lambda.interaction.construction.simulation.result.results.GenericResult
 import com.lambda.interaction.construction.simulation.result.results.InteractResult
 import com.lambda.interaction.construction.verify.TargetState
+import com.lambda.interaction.managers.rotating.IRotationRequest.Companion.rotationRequest
 import com.lambda.interaction.managers.rotating.Rotation
 import com.lambda.interaction.managers.rotating.Rotation.Companion.rotation
 import com.lambda.interaction.managers.rotating.RotationManager
-import com.lambda.interaction.managers.rotating.RotationRequest
 import com.lambda.interaction.managers.rotating.visibilty.PlaceDirection
 import com.lambda.interaction.managers.rotating.visibilty.VisibilityChecker.CheckedHit
 import com.lambda.interaction.managers.rotating.visibilty.lookInDirection
@@ -137,7 +137,7 @@ class InteractSim private constructor(simInfo: InteractSimInfo)
 
 		        val interactContext = InteractContext(
 			        hitResult,
-			        RotationRequest(checkedHit.rotation, this@InteractSim),
+			        rotationRequest { rotation(checkedHit.rotation) },
 			        swapStack.inventoryIndex,
 			        pos,
 			        state,
@@ -197,7 +197,7 @@ class InteractSim private constructor(simInfo: InteractSimInfo)
 
             val interactContext = InteractContext(
                 hitResult,
-                RotationRequest(rotationRequest, this@InteractSim),
+                rotationRequest { rotation(rotationRequest) },
                 swapStack.inventoryIndex,
                 pos,
                 state,

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

@@ -18,20 +18,18 @@
 package com.lambda.interaction.construction.simulation.context
 
 import com.lambda.context.Automated
-import com.lambda.graphics.esp.ShapeScope
 import com.lambda.graphics.mc.TransientRegionESP
-import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.managers.LogContext
 import com.lambda.interaction.managers.LogContext.Companion.LogContextBuilder
 import com.lambda.interaction.managers.LogContext.Companion.getLogContextBuilder
 import com.lambda.interaction.managers.rotating.RotationRequest
+import com.lambda.interaction.material.StackSelection
 import com.lambda.threading.runSafe
 import com.lambda.util.BlockUtils.emptyState
 import net.minecraft.block.BlockState
 import net.minecraft.block.FallingBlock
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
-import net.minecraft.util.math.Box
 import java.awt.Color
 import kotlin.math.sqrt
 
@@ -74,7 +72,6 @@ data class BreakContext(
         group("Break Context") {
             text(blockPos.getLogContextBuilder())
             text(hitResult.getLogContextBuilder())
-            text(rotationRequest.getLogContextBuilder())
             value("Hotbar Index", hotbarIndex)
             value("Instant Break", instantBreak)
             value("Cached State", cachedState)

src/main/kotlin/com/lambda/interaction/construction/simulation/context/InteractContext.kt

@@ -72,7 +72,6 @@ data class InteractContext(
         group("Place Context") {
             text(blockPos.getLogContextBuilder())
             text(hitResult.getLogContextBuilder())
-            text(rotationRequest.getLogContextBuilder())
             value("Hotbar Index", hotbarIndex)
             value("Cached State", cachedState)
             value("Expected State", expectedState)

src/main/kotlin/com/lambda/interaction/construction/simulation/result/Contextual.kt

@@ -22,7 +22,6 @@ import com.lambda.interaction.construction.simulation.context.BreakContext
 import com.lambda.interaction.construction.simulation.context.BuildContext
 import com.lambda.interaction.construction.simulation.context.InteractContext
 import com.lambda.interaction.managers.hotbar.HotbarManager
-import com.lambda.interaction.managers.rotating.Rotation.Companion.dist
 import com.lambda.interaction.managers.rotating.RotationManager
 import com.lambda.threading.runSafe
 import com.lambda.util.BlockUtils
@@ -51,7 +50,7 @@ interface Contextual : ComparableResult<Rank> {
                     ActionConfig.SortMode.Tool,
                     ActionConfig.SortMode.Closest -> it.sortDistance
                     ActionConfig.SortMode.Farthest -> -it.sortDistance
-                    ActionConfig.SortMode.Rotation -> it.rotationRequest.rotation.value?.dist(RotationManager.activeRotation)
+                    ActionConfig.SortMode.Rotation -> it.rotationRequest dist RotationManager.activeRotation
                     ActionConfig.SortMode.Random -> it.random
                 }
             }.thenByDescending {

src/main/kotlin/com/lambda/interaction/managers/breaking/BreakManager.kt

@@ -19,15 +19,11 @@ package com.lambda.interaction.managers.breaking
 
 import com.lambda.context.AutomatedSafeContext
 import com.lambda.context.SafeContext
-import com.lambda.event.Event
-import com.lambda.event.EventFlow.post
 import com.lambda.event.events.ConnectionEvent
 import com.lambda.event.events.EntityEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.events.WorldEvent
 import com.lambda.event.events.onDynamicRender
-import com.lambda.graphics.esp.ShapeScope
-
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.event.listener.UnsafeListener.Companion.listenUnsafe
 import com.lambda.graphics.renderer.esp.DynamicAABB
@@ -147,7 +143,6 @@ object BreakManager : Manager<BreakRequest>(
             }?.context?.itemSelection
             ?: StackSelection.EVERYTHING.select()
 
-    private val pendingBreakCount get() = activeInfos.count() + pendingActions.size
     override val blockedPositions
         get() = activeInfos.map { it.context.blockPos } + pendingActions.map { it.context.blockPos }
 
@@ -450,7 +445,6 @@ object BreakManager : Manager<BreakRequest>(
                     info.breakConfig.rotate
                 }?.let { info ->
                     val rotation = info.context.rotationRequest
-                    logger.debug("Requesting rotation", rotation)
                     rotation.submit(false)
                 }
 

src/main/kotlin/com/lambda/interaction/managers/hotbar/HotbarManager.kt

@@ -55,7 +55,7 @@ object HotbarManager : Manager<HotbarRequest>(
              },
     onClose = { checkResetSwap() }
 ), Logger {
-    var activeRequest: HotbarRequest? = null
+    private var activeRequest: HotbarRequest? = null
     @JvmStatic var activeSlot: Int = -1
 
     val serverSlot get() = runSafe {

src/main/kotlin/com/lambda/interaction/managers/rotating/Rotation.kt

@@ -115,6 +115,16 @@ data class Rotation(val yaw: Double, val pitch: Double) {
             return Rotation(yaw, pitch)
         }
 
+        fun Rotation.slerpYaw(targetYaw: Double, speed: Double): Double {
+            val yawDiff = wrap(targetYaw - yaw)
+            return yaw + yawDiff.coerceIn(-speed, speed)
+        }
+
+        fun Rotation.slerpPitch(targetPitch: Double, speed: Double): Double {
+            val pitchDiff = targetPitch - pitch
+            return (pitch + pitchDiff.coerceIn(-speed, speed)).coerceIn(-90.0, 90.0)
+        }
+
         fun Rotation.slerp(other: Rotation, speed: Double): Rotation {
             val yawDiff = wrap(other.yaw - yaw)
             val pitchDiff = other.pitch - pitch