set player yaw and pitch through rotation manager to check it isn't locked

Author: beanbag44

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

@@ -25,7 +25,6 @@
 import net.minecraft.block.enums.CameraSubmersionType;
 import net.minecraft.client.render.Camera;
 import net.minecraft.entity.Entity;
-import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -42,6 +41,12 @@ public abstract class CameraMixin {
     @Shadow
     public abstract void setRotation(float yaw, float pitch);
 
+    @Shadow
+    public abstract float getPitch();
+
+    @Shadow
+    public abstract float getYaw();
+
     @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;
@@ -59,22 +64,23 @@ private void onUpdate(World area, Entity focusedEntity, boolean thirdPerson, boo
      *     );
      * }</pre>
      */
-    @Inject(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/Camera;setPos(DDD)V", shift = At.Shift.AFTER))
+    @Inject(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/Camera;setRotation(FF)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;
-        setRotation(rot.getYawF(), rot.getPitchF());
+        if (FreeLook.INSTANCE.isEnabled()) {
+            if (FreeLook.getEnableYaw()) setRotation(rot.getYawF(), getPitch());
+            if (FreeLook.getEnablePitch()) setRotation(getYaw(), rot.getPitchF());
+        } else setRotation(rot.getYawF(), rot.getPitchF());
     }
 
     /**
      * Allows camera to clip through blocks in third person
      */
     @Inject(method = "clipToSpace", at = @At("HEAD"), cancellable = true)
-    private void onClipToSpace(float desiredCameraDistance, CallbackInfoReturnable<Float> info) {
+    private void onClipToSpace(float distance, CallbackInfoReturnable<Float> cir) {
         if (CameraTweaks.INSTANCE.isEnabled() && CameraTweaks.getNoClipCam()) {
-            info.setReturnValue(desiredCameraDistance);
-        } else if (FreeLook.INSTANCE.isEnabled()) {
-            info.setReturnValue(desiredCameraDistance);
+            cir.setReturnValue(distance);
         }
     }
 
@@ -91,14 +97,12 @@ private void onClipToSpace(float desiredCameraDistance, CallbackInfoReturnable<F
      * }</pre>
      */
     @ModifyArg(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/Camera;clipToSpace(F)F"))
-    private float onDistanceUpdate(float desiredCameraDistance) {
+    private float onDistanceUpdate(float distance) {
         if (CameraTweaks.INSTANCE.isEnabled()) {
             return CameraTweaks.getCamDistance();
-        } else if (FreeLook.INSTANCE.isEnabled()) {
-            return 4.0F;
         }
 
-        return desiredCameraDistance;
+        return distance;
     }
 
     /**

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

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

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

@@ -74,6 +74,8 @@ object RotationManager : Manager<RotationRequest>(
 
     private var changedThisTick = false
 
+    private val IRotationRequest.overridable get() = age >= 1
+
     override fun load(): String {
         super.load()
 
@@ -161,7 +163,15 @@ object RotationManager : Manager<RotationRequest>(
             else -> false
         }
 
-    private val IRotationRequest.overridable get() = age >= 1
+    context(safeContext: SafeContext)
+    fun setPlayerYaw(yaw: Double) {
+        if (lockYaw == null) safeContext.player.yaw = yaw.toFloat()
+    }
+
+    context(safeContext: SafeContext)
+    fun setPlayerPitch(pitch: Double) {
+        if (lockPitch == null) safeContext.player.pitch = pitch.toFloat()
+    }
 
     /**
      * If the rotation has not been changed this tick, the [activeRequest]'s target rotation is updated, and

src/main/kotlin/com/lambda/module/modules/render/FreeLook.kt

@@ -21,6 +21,7 @@ import com.lambda.Lambda.mc
 import com.lambda.event.events.PlayerEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.managers.rotating.Rotation
+import com.lambda.interaction.managers.rotating.RotationManager
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.extension.rotation
@@ -32,8 +33,8 @@ object FreeLook : Module(
     description = "Allows you to look around freely while moving",
     tag = ModuleTag.PLAYER,
 ) {
-    val enableYaw by setting("Enable Yaw", false, "Don't effect pitch if enabled")
-    val enablePitch by setting("Enable Pitch", false, "Don't effect yaw if enabled")
+    @JvmStatic val enableYaw by setting("Enable Yaw", false, "Don't effect pitch if enabled")
+    @JvmStatic val enablePitch by setting("Enable Pitch", false, "Don't effect yaw if enabled")
     val togglePerspective by setting("Toggle Perspective", true, "Toggle perspective when enabling FreeLook")
 
     var camera: Rotation = Rotation.ZERO
@@ -73,8 +74,8 @@ object FreeLook : Module(
                 it.deltaPitch * SENSITIVITY_FACTOR
             )
 
-            if (enablePitch) player.pitch = camera.pitchF
-            if (enableYaw) player.yaw = camera.yawF
+            if (enableYaw) RotationManager.setPlayerYaw(camera.yaw)
+            if (enablePitch) RotationManager.setPlayerPitch(camera.pitch)
 
             it.cancel()
         }