fix rotation render accuracy and potentially other issues

Author: beanbag44

common/src/main/java/com/lambda/mixin/entity/LivingEntityMixin.java

@@ -127,7 +127,7 @@ private float rotBody(LivingEntity entity) {
             return entity.getYaw();
         }
 
-        Float yaw = RotationManager.getRenderYaw();
+        Float yaw = RotationManager.getHeadYaw();
         return (yaw == null) ? entity.getYaw() : yaw;
     }
 
@@ -158,7 +158,7 @@ private float rotHead(LivingEntity entity) {
             return entity.getYaw();
         }
 
-        Float yaw = RotationManager.getRenderYaw();
+        Float yaw = RotationManager.getHeadYaw();
         return (yaw == null) ? entity.getYaw() : yaw;
     }
 }

common/src/main/java/com/lambda/mixin/entity/PlayerEntityMixin.java

@@ -42,7 +42,7 @@ private float injectHeadYaw(PlayerEntity instance) {
             return instance.getYaw();
         }
 
-        Float yaw = RotationManager.getRenderYaw();
+        Float yaw = RotationManager.getHeadYaw();
         return (yaw != null) ? yaw : instance.getYaw();
     }
 

common/src/main/java/com/lambda/mixin/render/LivingEntityRendererMixin.java

@@ -17,40 +17,16 @@
 
 package com.lambda.mixin.render;
 
-import com.lambda.Lambda;
 import com.lambda.interaction.request.rotating.RotationManager;
-import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.LivingEntityRenderer;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Objects;
 
 @Mixin(LivingEntityRenderer.class)
 public class LivingEntityRendererMixin<T extends LivingEntity> {
-    @Unique
-    private Float lambda$pitch = null;
-
-    @Inject(method = "render(Lnet/minecraft/entity/LivingEntity;FFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", at = @At("HEAD"))
-    private void injectRender(T livingEntity, float f, float g, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, CallbackInfo ci) {
-        Float rotationPitch = RotationManager.getRenderPitch();
-
-        this.lambda$pitch = null;
-
-        if (livingEntity != Lambda.getMc().player || rotationPitch == null) {
-            return;
-        }
-
-        this.lambda$pitch = rotationPitch;
-    }
-
     /**
      * Uses the current rotation render pitch
      * <pre>{@code
@@ -63,6 +39,9 @@ private void injectRender(T livingEntity, float f, float g, MatrixStack matrixSt
      */
     @Redirect(method = "render(Lnet/minecraft/entity/LivingEntity;FFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/MathHelper;lerp(FFF)F", ordinal = 0), require = 0)
     private float injectRotationPitch(float g, float f, float s) {
-        return Objects.requireNonNullElseGet(lambda$pitch, () -> MathHelper.lerp(g, f, s));
+        Float headPitch = RotationManager.getHeadPitch();
+        if (headPitch != null) {
+            return MathHelper.lerp(g, RotationManager.INSTANCE.getPrevServerRotation().getPitchF(), headPitch);
+        } else return MathHelper.lerp(g, f, s);
     }
 }

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

@@ -36,6 +36,7 @@ import com.lambda.interaction.request.rotating.visibilty.lookAt
 import com.lambda.module.modules.client.Baritone
 import com.lambda.threading.runGameScheduled
 import com.lambda.threading.runSafe
+import com.lambda.util.extension.partialTicks
 import com.lambda.util.extension.rotation
 import com.lambda.util.math.MathUtils.toRadian
 import com.lambda.util.math.Vec2d
@@ -160,48 +161,46 @@ object RotationManager : RequestHandler<RotationRequest>(
         activeRequest = null
     }
 
+    private val smoothRotation
+        get() = lerp(mc.partialTicks, serverRotation, activeRotation)
+
     @JvmStatic
     val lockRotation
-        get() =
-            if (activeRequest?.mode == RotationMode.Lock) activeRotation else null
+        get() = if (activeRequest?.mode == RotationMode.Lock) smoothRotation else null
 
     @JvmStatic
-    val renderYaw
-        get() =
-            if (activeRequest == null) null else activeRotation.yaw.toFloat()
+    val headYaw
+        get() = if (activeRequest == null) null else activeRotation.yawF
 
     @JvmStatic
-    val renderPitch
-        get() =
-            if (activeRequest == null) null else activeRotation.pitch.toFloat()
+    val headPitch
+        get() = if (activeRequest == null) null else activeRotation.pitchF
 
     @JvmStatic
     val handYaw
-        get() =
-            if (activeRequest?.mode == RotationMode.Lock) activeRotation.yaw.toFloat() else null
+        get() = if (activeRequest?.mode == RotationMode.Lock) activeRotation.yawF else null
 
     @JvmStatic
     val handPitch
-        get() =
-            if (activeRequest?.mode == RotationMode.Lock) activeRotation.pitch.toFloat() else null
+        get() = if (activeRequest?.mode == RotationMode.Lock) activeRotation.pitchF else null
 
     @JvmStatic
     val movementYaw: Float?
         get() {
-            if (activeRequest?.mode == RotationMode.Silent) return null
+            if (activeRequest == null || activeRequest?.mode == RotationMode.Silent) return null
             return activeRotation.yaw.toFloat()
         }
 
     @JvmStatic
     val movementPitch: Float?
         get() {
-            if (activeRequest?.mode == RotationMode.Silent) return null
+            if (activeRequest == null || activeRequest?.mode == RotationMode.Silent) return null
             return activeRotation.pitch.toFloat()
         }
 
     @JvmStatic
     fun getRotationForVector(deltaTime: Double): Vec2d? {
-        if (activeRequest?.mode == RotationMode.Silent) return null
+        if (activeRequest == null || activeRequest?.mode == RotationMode.Silent) return null
 
         val rot = lerp(deltaTime, serverRotation, activeRotation)
         return Vec2d(rot.yaw, rot.pitch)