keep yaw and pitch ordered the same everywhere

Author: beanbag44

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

@@ -143,25 +143,21 @@ object RotationManager : Manager<RotationRequest>(
 
     private fun acceptAndSetRequests(request: RotationRequest) =
         when (request) {
-            is IRotationRequest.Full -> {
-                if (request.rotation.value != null && requests.all { it?.overridable != false }) {
-                    pitchRequest = request
-                    yawRequest = request
-                    true
-                } else false
-            }
-            is IRotationRequest.Pitch -> {
-                if (request.pitch.value != null && pitchRequest?.overridable != false) {
-                    pitchRequest = request
-                    true
-                } else false
-            }
-            is IRotationRequest.Yaw -> {
-                if (request.yaw.value != null && yawRequest?.overridable != false) {
-                    yawRequest = request
-                    true
-                } else false
-            }
+            is IRotationRequest.Full ->
+                (request.rotation.value != null && requests.all { it?.overridable != false }).also { accepted ->
+                    if (accepted) {
+                        pitchRequest = request
+                        yawRequest = request
+                    }
+                }
+            is IRotationRequest.Yaw ->
+                (request.yaw.value != null && yawRequest?.overridable != false).also { accepted ->
+                    if (accepted) yawRequest = request
+                }
+            is IRotationRequest.Pitch ->
+                (request.pitch.value != null && pitchRequest?.overridable != false).also { accepted ->
+                    if (accepted) pitchRequest = request
+                }
             else -> false
         }
 
@@ -187,8 +183,8 @@ object RotationManager : Manager<RotationRequest>(
         runSafe {
             usingBaritoneRotation = true
             val request = IRotationRequest.Full(BaritoneManager) { Rotation(yaw, pitch) }
-            pitchRequest = request
             yawRequest = request
+            pitchRequest = request
             updateActiveRotation()
             changedThisTick = true
         }
@@ -285,35 +281,38 @@ object RotationManager : Manager<RotationRequest>(
         prevServerRotation = serverRotation
         serverRotation = activeRotation
 
-        if (pitchRequest?.rotationConfig?.rotationMode == RotationMode.Lock)
-            mc.player?.pitch = serverRotation.pitchF
         if (yawRequest?.rotationConfig?.rotationMode == RotationMode.Lock)
             mc.player?.yaw = serverRotation.yawF
+        if (pitchRequest?.rotationConfig?.rotationMode == RotationMode.Lock)
+            mc.player?.pitch = serverRotation.pitchF
     }
 
     /**
      * Updates the [activeRotation]. If [activeRequest] is null, the player's rotation is used.
      * Otherwise, the [serverRotation] is interpolated towards the [RotationRequest.target] rotation.
      */
     private fun SafeContext.updateActiveRotation() {
-        val newPitch = pitchRequest?.let { pitchRequest ->
-            val toPitch = if (pitchRequest.keepTicks >= 0)
-                pitchRequest.pitch.value ?: activeRotation.pitch
-            else player.rotation.pitch
-            serverRotation.slerpPitch(toPitch, pitchRequest.rotationConfig.turnSpeed)
-        } ?: player.rotation.pitch
         val newYaw = yawRequest?.let { yawRequest ->
             val toYaw = if (yawRequest.keepTicks >= 0)
                 yawRequest.yaw.value ?: activeRotation.yaw
             else player.rotation.yaw
             serverRotation.slerpYaw(toYaw, yawRequest.rotationConfig.turnSpeed)
         } ?: player.rotation.yaw
+
+        val newPitch = pitchRequest?.let { pitchRequest ->
+            val toPitch = if (pitchRequest.keepTicks >= 0)
+                pitchRequest.pitch.value ?: activeRotation.pitch
+            else player.rotation.pitch
+            serverRotation.slerpPitch(toPitch, pitchRequest.rotationConfig.turnSpeed)
+        } ?: player.rotation.pitch
+
         requests.forEach { request ->
             if (request == null) return@forEach
             if (request.keepTicks-- <= 0) {
                 request.decayTicks--
             }
         }
+
         activeRotation = Rotation(newYaw, newPitch)
     }
 
@@ -374,9 +373,9 @@ object RotationManager : Manager<RotationRequest>(
 
     @JvmStatic
     fun getRotationForVector(deltaTime: Double): Vec2d? = runSafe {
-        val pitch = activeRotation.pitchF.takeIf { pitchRequest != null && pitchRequest?.rotationConfig?.rotationMode != RotationMode.Silent }
         val yaw = activeRotation.yawF.takeIf { yawRequest != null && yawRequest?.rotationConfig?.rotationMode != RotationMode.Silent }
-        if (pitch == null && yaw == null) return@runSafe null
+        val pitch = activeRotation.pitchF.takeIf { pitchRequest != null && pitchRequest?.rotationConfig?.rotationMode != RotationMode.Silent }
+        if (yaw == null && pitch == null) return@runSafe null
 
         val rot = lerp(deltaTime, serverRotation, Rotation(yaw ?: player.yaw, pitch ?: player.pitch))
         return Vec2d(rot.yaw, rot.pitch)

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

@@ -53,26 +53,6 @@ interface IRotationRequest : Automated {
 
     fun updateRotation()
 
-    class Pitch(
-        automated: Automated,
-        val buildPitch: SafeContext.() -> Double
-    ) : RotationRequest(automated), PitchRot {
-        override val pitch = updatableLazy { runSafe { buildPitch() } }
-        override var keepTicks = rotationConfig.keepTicks
-        override var decayTicks = rotationConfig.decayTicks
-        override var age = 0
-
-        override val done get(): Boolean {
-            return abs(RotationManager.activeRotation.pitch - (pitch.value ?: return false)) <= 0.001
-        }
-
-        override fun dist(rotation: Rotation): Double {
-            return wrap((pitch.value ?: return Double.MAX_VALUE) - rotation.pitch)
-        }
-
-        override fun updateRotation() = pitch.update()
-    }
-
     class Yaw(
         automated: Automated,
         val buildYaw: SafeContext.() -> Double
@@ -96,6 +76,26 @@ interface IRotationRequest : Automated {
         override fun updateRotation() = yaw.update()
     }
 
+    class Pitch(
+        automated: Automated,
+        val buildPitch: SafeContext.() -> Double
+    ) : RotationRequest(automated), PitchRot {
+        override val pitch = updatableLazy { runSafe { buildPitch() } }
+        override var keepTicks = rotationConfig.keepTicks
+        override var decayTicks = rotationConfig.decayTicks
+        override var age = 0
+
+        override val done get(): Boolean {
+            return abs(RotationManager.activeRotation.pitch - (pitch.value ?: return false)) <= 0.001
+        }
+
+        override fun dist(rotation: Rotation): Double {
+            return wrap((pitch.value ?: return Double.MAX_VALUE) - rotation.pitch)
+        }
+
+        override fun updateRotation() = pitch.update()
+    }
+
     class Full(
         automated: Automated,
         val buildRotation: SafeContext.() -> Rotation
@@ -122,42 +122,42 @@ interface IRotationRequest : Automated {
         override fun updateRotation() = rotation.update()
     }
 
-    interface PitchRot : IRotationRequest { val pitch: UpdatableLazy<Double?> }
     interface YawRot : IRotationRequest { val yaw: UpdatableLazy<Double?> }
+    interface PitchRot : IRotationRequest { val pitch: UpdatableLazy<Double?> }
     interface FullRot : YawRot, PitchRot { val rotation: UpdatableLazy<Rotation?> }
 
     class RotationRequestBuilder {
         var pitchBuilder: (SafeContext.() -> Double)? = null
         var yawBuilder: (SafeContext.() -> Double)? = null
         var rotationBuilder: (SafeContext.() -> Rotation)? = null
 
-        @JvmName("pitchBuilder1")
+        @JvmName("yawBuilder1")
         @RotationRequestDsl
-        fun pitch(builder: SafeContext.() -> Double) { pitchBuilder = builder }
+        fun yaw(builder: SafeContext.() -> Double) { yawBuilder = builder }
 
-        @JvmName("pitchBuilder2")
+        @JvmName("yawBuilder2")
         @RotationRequestDsl
-        fun pitch(builder: SafeContext.() -> Float) { pitchBuilder = { builder().toDouble() } }
+        fun yaw(builder: SafeContext.() -> Float) { yawBuilder = { builder().toDouble() } }
 
         @RotationRequestDsl
-        fun pitch(pitch: Double) { pitchBuilder = { pitch } }
+        fun yaw(yaw: Double) { yawBuilder = { yaw } }
 
         @RotationRequestDsl
-        fun pitch(pitch: Float) { pitchBuilder = { pitch.toDouble() } }
+        fun yaw(yaw: Float) { yawBuilder = { yaw.toDouble() } }
 
-        @JvmName("yawBuilder1")
+        @JvmName("pitchBuilder1")
         @RotationRequestDsl
-        fun yaw(builder: SafeContext.() -> Double) { yawBuilder = builder }
+        fun pitch(builder: SafeContext.() -> Double) { pitchBuilder = builder }
 
-        @JvmName("yawBuilder2")
+        @JvmName("pitchBuilder2")
         @RotationRequestDsl
-        fun yaw(builder: SafeContext.() -> Float) { yawBuilder = { builder().toDouble() } }
+        fun pitch(builder: SafeContext.() -> Float) { pitchBuilder = { builder().toDouble() } }
 
         @RotationRequestDsl
-        fun yaw(yaw: Double) { yawBuilder = { yaw } }
+        fun pitch(pitch: Double) { pitchBuilder = { pitch } }
 
         @RotationRequestDsl
-        fun yaw(yaw: Float) { yawBuilder = { yaw.toDouble() } }
+        fun pitch(pitch: Float) { pitchBuilder = { pitch.toDouble() } }
 
         @RotationRequestDsl
         fun rotation(builder: SafeContext.() -> Rotation) { rotationBuilder = builder }
@@ -182,14 +182,14 @@ interface IRotationRequest : Automated {
         @RotationRequestDsl
         context(automated: Automated)
         private fun RotationRequestBuilder.build(): RotationRequest {
-            val pitchBuilder = pitchBuilder
             val yawBuilder = yawBuilder
+            val pitchBuilder = pitchBuilder
             val rotationBuilder = rotationBuilder
             return when {
                 rotationBuilder != null -> Full(automated, rotationBuilder)
-                pitchBuilder != null && yawBuilder != null -> Full(automated) { Rotation(pitchBuilder(), yawBuilder()) }
-                pitchBuilder != null -> Pitch(automated, pitchBuilder)
+                yawBuilder != null && pitchBuilder != null -> Full(automated) { Rotation(yawBuilder(), pitchBuilder()) }
                 yawBuilder != null -> Yaw(automated, yawBuilder)
+                pitchBuilder != null -> Pitch(automated, pitchBuilder)
                 else -> throw IllegalArgumentException("Must specify at least one rotation value to build a rotation request")
             }
         }