Rotation system fixes

Author: bladekt

common/src/main/kotlin/com/lambda/event/events/RotationEvent.kt

@@ -3,8 +3,8 @@ package com.lambda.event.events
 import com.lambda.event.Event
 import com.lambda.event.callback.Cancellable
 import com.lambda.event.callback.ICancellable
-import com.lambda.interaction.RotationManager
 import com.lambda.interaction.rotation.RotationContext
+import net.minecraft.client.input.Input
 
 abstract class RotationEvent : Event {
     /**
@@ -16,18 +16,15 @@ abstract class RotationEvent : Event {
      *
      * @property context The rotation context that listeners can set. Only one rotation can "win" each tick.
      */
-    class Update : RotationEvent(), ICancellable by Cancellable() {
-        // Always check if baritone wants to rotate as well
-        var context = RotationManager.BaritoneProcessor.baritoneContext
-    }
+    class Update(var context: RotationContext?) : RotationEvent(), ICancellable by Cancellable()
 
     /**
      * This event allows listeners to modify the yaw relative to which the movement input is going to be constructed
      *
      * @property strafeYaw The angle at which the player will move when pressing W
      * Changing this value will never force the anti cheat to flag you because RotationManager is designed to modify the key input instead
      */
-    class Strafe(var strafeYaw: Double) : RotationEvent()
+    class Strafe(var strafeYaw: Double, val input: Input) : RotationEvent()
 
     class Post(val context: RotationContext) : RotationEvent()
 }

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

@@ -1,7 +1,7 @@
 package com.lambda.interaction
 
-import baritone.utils.PlayerMovementInput
 import com.lambda.Lambda.mc
+import com.lambda.config.groups.IRotationConfig
 import com.lambda.config.groups.RotationSettings
 import com.lambda.core.Loadable
 import com.lambda.context.SafeContext
@@ -20,6 +20,7 @@ import com.lambda.threading.runSafe
 import com.lambda.util.math.MathUtils.lerp
 import com.lambda.util.math.MathUtils.toRadian
 import com.lambda.util.math.Vec2d
+import com.lambda.util.player.MovementUtils.handledByBaritone
 import com.lambda.util.primitives.extension.partialTicks
 import com.lambda.util.primitives.extension.rotation
 import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket
@@ -38,9 +39,12 @@ object RotationManager : Loadable {
 
     init {
         listener<TickEvent.Pre> {
-            RotationEvent.Update().post {
+            RotationEvent.Update(BaritoneProcessor.poolContext()).post {
                 rotate(context)
-                currentContext?.let { RotationEvent.Post(it).post() }
+
+                currentContext?.let {
+                    RotationEvent.Post(it).post()
+                }
             }
         }
 
@@ -83,7 +87,7 @@ object RotationManager : Loadable {
 
             val turnSpeed = context.config.turnSpeed * speedMultiplier
 
-            prevRotation
+            currentRotation
                 .slerp(rotationTo, turnSpeed)
                 .apply {
                     if (context.config.rotationMode != RotationMode.LOCK) return@apply
@@ -156,7 +160,13 @@ object RotationManager : Loadable {
     }
 
     object BaritoneProcessor {
-        var baritoneContext: RotationContext? = null; private set
+        private var baritoneContext: RotationContext? = null
+
+        fun poolContext(): RotationContext? {
+            val ctx = baritoneContext
+            baritoneContext = null
+            return ctx
+        }
 
         private val movementYawList = arrayOf(
             0.0, 45.0,
@@ -166,28 +176,23 @@ object RotationManager : Loadable {
         )
 
         init {
-            listener<TickEvent.Post> {
-                baritoneContext = null
-            }
-
             listener<MovementEvent.InputUpdate>(Int.MAX_VALUE) {
                 processPlayerMovement(it)
             }
         }
 
         @JvmStatic
-        fun handleBaritoneRotation(yaw: Float, pitch: Float) = runSafe {
-            baritoneContext = RotationContext(Rotation(yaw, pitch), Baritone.rotation)
+        fun handleBaritoneRotation(yaw: Float, pitch: Float) {
+            baritoneContext = RotationContext(Rotation(yaw, pitch), Baritone.rotation.apply {
+                if (rotationMode != RotationMode.SILENT) return@apply
+                rotationMode = RotationMode.SYNC
+            })
         }
 
         private fun SafeContext.processPlayerMovement(event: MovementEvent.InputUpdate) {
             val config = currentContext?.config ?: return
 
-            // No changes are needed, when we don't modify the yaw used to move the player
-            if (config.rotationMode == RotationMode.SILENT) return
-
             val input = event.input
-            val handledByBaritone = input is PlayerMovementInput
 
             // Sign it to remove previous speed modifier
             val signForward = sign(input.movementForward)
@@ -199,14 +204,12 @@ object RotationManager : Loadable {
             // Movement speed modifier
             val multiplier = if (event.slowDown) event.slowDownFactor else 1f
 
-            val modifyMovement = config.rotationMode == RotationMode.SYNC || handledByBaritone
-            if (!modifyMovement) return
-
-            val playerYaw = player.yaw.toDouble()
-            val baritoneYaw = if (handledByBaritone) baritoneContext?.rotation?.yaw else null
+            // No changes are needed, when we don't modify the yaw used to move the player
+            if (config.rotationMode == RotationMode.SILENT && !input.handledByBaritone && baritoneContext == null) return
 
             // The yaw relative to which the movement was constructed
-            val strafeEvent = RotationEvent.Strafe(baritoneYaw ?: playerYaw)
+            val baritoneYaw = baritoneContext?.rotation?.yaw
+            val strafeEvent = RotationEvent.Strafe(baritoneYaw ?: player.yaw.toDouble(), input)
             val movementYaw = strafeEvent.post().strafeYaw
 
             // Actual yaw used to move the player

common/src/main/kotlin/com/lambda/module/modules/movement/Speed.kt

@@ -6,7 +6,6 @@ import com.lambda.event.events.ClientEvent
 import com.lambda.event.events.MovementEvent
 import com.lambda.event.events.RotationEvent
 import com.lambda.event.listener.SafeListener.Companion.listener
-import com.lambda.interaction.RotationManager
 import com.lambda.interaction.rotation.Rotation
 import com.lambda.interaction.rotation.RotationContext
 import com.lambda.interaction.rotation.RotationMode
@@ -15,6 +14,7 @@ import com.lambda.module.tag.ModuleTag
 import com.lambda.util.Nameable
 import com.lambda.util.player.MovementUtils.addSpeed
 import com.lambda.util.player.MovementUtils.calcMoveYaw
+import com.lambda.util.player.MovementUtils.handledByBaritone
 import com.lambda.util.player.MovementUtils.isInputting
 import com.lambda.util.player.MovementUtils.motionY
 import com.lambda.util.player.MovementUtils.moveDelta
@@ -110,10 +110,10 @@ object Speed : Module(
         listener<RotationEvent.Update> { event ->
             if (mode != Mode.GRIM_STRAFE) return@listener
             if (!shouldWork() || !isInputting) return@listener
+            if (player.input.handledByBaritone) return@listener
 
             val input = newMovementInput()
-            val moveYaw = RotationManager.BaritoneProcessor.baritoneContext?.rotation?.yawF ?: player.yaw
-            val yaw = calcMoveYaw(moveYaw, input.roundedForward, input.roundedStrafing)
+            val yaw = calcMoveYaw(player.yaw, input.roundedForward, input.roundedStrafing)
             val rotation = Rotation(yaw, event.context?.rotation?.pitch ?: player.pitch.toDouble())
 
             event.context = RotationContext(rotation, rotationConfig)

common/src/main/kotlin/com/lambda/util/player/MovementUtils.kt

@@ -1,6 +1,5 @@
 package com.lambda.util.player
 
-import baritone.utils.PlayerMovementInput
 import com.lambda.context.SafeContext
 import com.lambda.interaction.RotationManager
 import com.lambda.util.math.MathUtils.random