From 6369cb2b651336e683873659129325ecb73ad326 Mon Sep 17 00:00:00 2001
From: Kam <KamronGaming@gmail.com>
Date: Sat, 21 Feb 2026 03:48:50 -0500
Subject: [PATCH] Better Animation Snapping

---
 .../noppes/npcs/AnimationMixinFunctions.java  | 40 ++++++++++++-------
 .../controllers/data/PlayerAbilityData.java   | 12 ------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/main/java/noppes/npcs/AnimationMixinFunctions.java b/src/main/java/noppes/npcs/AnimationMixinFunctions.java
index 4a6eb1db5..e5c6d2089 100644
--- a/src/main/java/noppes/npcs/AnimationMixinFunctions.java
+++ b/src/main/java/noppes/npcs/AnimationMixinFunctions.java
@@ -209,21 +209,31 @@ public class AnimationMixinFunctions {
         return null;
     }
 
-    public static void playerFullModel_head(Entity p_78088_1_, CallbackInfo callbackInfo) {
-        if (!DBCAddon.IsAvailable() && ClientCacheHandler.playerAnimations.containsKey(p_78088_1_.getUniqueID())) {
-            AnimationData animData = ClientCacheHandler.playerAnimations.get(p_78088_1_.getUniqueID());
-            if (animData != null && animData.isActive()) {
-                Frame frame = (Frame) animData.animation.currentFrame();
-                if (frame.frameParts.containsKey(EnumAnimationPart.FULL_MODEL)) {
-                    FramePart part = frame.frameParts.get(EnumAnimationPart.FULL_MODEL);
-                    part.interpolateOffset();
-                    part.interpolateAngles();
-                    float pi = 180 / (float) Math.PI;
-                    GL11.glTranslatef(part.prevPivots[0], -part.prevPivots[1], part.prevPivots[2]);
-                    GL11.glRotatef(part.prevRotations[0] * pi, 1, 0, 0);
-                    GL11.glRotatef(part.prevRotations[1] * pi, 0, 1, 0);
-                    GL11.glRotatef(part.prevRotations[2] * pi, 0, 0, 1);
-                }
+    public static void playerFullModel_head(Entity entity, CallbackInfo callbackInfo) {
+        if (!ClientCacheHandler.playerAnimations.containsKey(entity.getUniqueID())) return;
+
+        AnimationData animData = ClientCacheHandler.playerAnimations.get(entity.getUniqueID());
+        if (animData == null || !animData.isActive()) return;
+
+        // Snap body rotation to head so animations face the look direction
+        if (entity instanceof EntityLivingBase) {
+            EntityLivingBase living = (EntityLivingBase) entity;
+            living.renderYawOffset = living.rotationYaw;
+            living.prevRenderYawOffset = living.prevRotationYaw;
+        }
+
+        // FULL_MODEL GL transforms (non-DBC only)
+        if (!DBCAddon.IsAvailable()) {
+            Frame frame = (Frame) animData.animation.currentFrame();
+            if (frame.frameParts.containsKey(EnumAnimationPart.FULL_MODEL)) {
+                FramePart part = frame.frameParts.get(EnumAnimationPart.FULL_MODEL);
+                part.interpolateOffset();
+                part.interpolateAngles();
+                float pi = 180 / (float) Math.PI;
+                GL11.glTranslatef(part.prevPivots[0], -part.prevPivots[1], part.prevPivots[2]);
+                GL11.glRotatef(part.prevRotations[0] * pi, 1, 0, 0);
+                GL11.glRotatef(part.prevRotations[1] * pi, 0, 1, 0);
+                GL11.glRotatef(part.prevRotations[2] * pi, 0, 0, 1);
             }
         }
     }
diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerAbilityData.java b/src/main/java/noppes/npcs/controllers/data/PlayerAbilityData.java
index 1762a24c5..b8958d24a 100644
--- a/src/main/java/noppes/npcs/controllers/data/PlayerAbilityData.java
+++ b/src/main/java/noppes/npcs/controllers/data/PlayerAbilityData.java
@@ -298,7 +298,6 @@ public class PlayerAbilityData extends AbstractDataAbilities implements IPlayerA
             // Apply rotation and position locks after ability tick
             applyRotationControl(player);
             applyPositionLock(player);
-            applyAnimationRotationSync(player);
 
             // Sync lock state to client (only sends when flags change)
             syncAbilityStateIfNeeded(player);
@@ -846,17 +845,6 @@ public class PlayerAbilityData extends AbstractDataAbilities implements IPlayerA
         }
     }
 
-    private void applyAnimationRotationSync(EntityPlayer player) {
-        if (rotationLocked || currentAbility == null) return;
-        if (currentAbility.getPhase() == AbilityPhase.IDLE || currentAbility.getPhase() == AbilityPhase.DAZED)
-            return;
-
-        // TODO This is a temporary duct-tape solution to fix the animation not rotating with head rotation
-        if (!currentAbility.isRotationLockedForCurrentPhase() && player instanceof EntityPlayerMP) {
-            NoppesUtilPlayer.swingPlayerArm((EntityPlayerMP) player);
-        }
-    }
-
     // ═══════════════════════════════════════════════════════════════════
     // POSITION LOCKING (Player-specific application)
     // ═══════════════════════════════════════════════════════════════════