setPlayerRotation in RotationManager

Author: beanbag44

src/main/java/com/lambda/mixin/render/CameraMixin.java

@@ -47,6 +47,12 @@ public abstract class CameraMixin {
     @Shadow
     public abstract float getYaw();
 
+    @Shadow
+    public float yaw;
+
+    @Shadow
+    public float pitch;
+
     @Inject(method = "update", at = @At("TAIL"))
     private void onUpdate(World area, Entity focusedEntity, boolean thirdPerson, boolean inverseView, float tickProgress, CallbackInfo ci) {
         if (!Freecam.INSTANCE.isEnabled()) return;
@@ -64,18 +70,21 @@ private void onUpdate(World area, Entity focusedEntity, boolean thirdPerson, boo
      *     );
      * }</pre>
      */
-    @Inject(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/Camera;setRotation(FF)V", shift = At.Shift.AFTER))
+    @Inject(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/Camera;setPos(DDD)V", shift = At.Shift.AFTER))
     private void injectQuickPerspectiveSwap(World area, Entity focusedEntity, boolean thirdPerson, boolean inverseView, float tickProgress, CallbackInfo ci) {
         var rot = RotationManager.getLockRotation();
         if (rot == null) return;
         if (FreeLook.INSTANCE.isEnabled()) {
-            if (FreeLook.getEnableYaw()) setRotation(rot.getYawF(), getPitch());
-            if (FreeLook.getEnablePitch()) setRotation(getYaw(), rot.getPitchF());
+            var newYaw = yaw;
+            var newPitch = pitch;
+            if (FreeLook.getEnableYaw()) newYaw = rot.getYawF();
+            if (FreeLook.getEnablePitch()) newPitch = rot.getPitchF();
+            setRotation(newYaw, newPitch);
         } else setRotation(rot.getYawF(), rot.getPitchF());
     }
 
     /**
-     * Allows camera to clip through blocks in third person
+     * Allows the camera to clip through blocks in third person
      */
     @Inject(method = "clipToSpace", at = @At("HEAD"), cancellable = true)
     private void onClipToSpace(float distance, CallbackInfoReturnable<Float> cir) {

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

@@ -95,10 +95,8 @@ data class Rotation(val yaw: Double, val pitch: Double) {
         var Entity.rotation
             get() = Rotation(yaw, pitch)
             set(value) {
-                runSafe {
-                    RotationManager.setPlayerYaw(value.yaw)
-                    RotationManager.setPlayerPitch(value.pitch)
-                }
+                yaw = value.yawF
+                pitch = value.pitchF
             }
 
         fun wrap(deg: Double) = wrapDegrees(deg)

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

@@ -173,6 +173,12 @@ object RotationManager : Manager<RotationRequest>(
         if (lockPitch == null) safeContext.player.pitch = pitch.toFloat()
     }
 
+    context(safeContext: SafeContext)
+    fun setPlayerRotation(rotation: Rotation) {
+        setPlayerYaw(rotation.yaw)
+        setPlayerPitch(rotation.pitch)
+    }
+
     /**
      * If the rotation has not been changed this tick, the [activeRequest]'s target rotation is updated, and
      * likewise the [activeRotation]. The [activeRequest] is then updated, ticking the [RotationRequest.keepTicks]