From 3cc128ef2fc13a0738afc34184c32812e940eb2d Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sat, 6 Jul 2019 18:29:28 +0200
Subject: [PATCH] Fixed: Dual weilding causes ponies to break the laws of
 physics

---
 .../client/model/AbstractPonyModel.java       | 46 ++++++++++++-------
 .../client/model/races/ModelUnicorn.java      |  4 --
 .../minelittlepony/model/ModelAttributes.java |  6 +++
 3 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
index af2d5a73..9f513caa 100644
--- a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
+++ b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
@@ -81,7 +81,10 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
 
             rightLeg.rotationPointY = FRONT_LEG_RP_Y_NOTSNEAK;
             leftLeg.rotationPointY = FRONT_LEG_RP_Y_NOTSNEAK;
-            animateBreathing(ticks);
+
+            if (!attributes.isSleeping) {
+                animateBreathing(ticks);
+            }
 
             if (attributes.isSwimming) {
                 head.setRotationPoint(0, -2, -2);
@@ -388,16 +391,24 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
     protected void alignArmForAction(Cuboid arm, ArmPose pose, ArmPose complement, boolean both, float swing, float reflect) {
         switch (pose) {
             case ITEM:
-                float swag = 1;
-                if (!isFlying() && both) {
-                    swag -= (float)Math.pow(swing, 2);
-                }
-                float mult = 1 - swag/2;
-                arm.pitch = arm.pitch * mult - (PI / 10) * swag;
-                arm.roll = -reflect * (PI / 15);
-                if (attributes.isCrouching) {
-                    arm.rotationPointX -= reflect * 2;
+                arm.yaw = 0;
+
+                if ((!both || reflect == (attributes.isLeftHanded ? 1 : -1)) && complement != ArmPose.BLOCK) {
+                    float swag = 1;
+                    if (!isFlying() && both) {
+                        swag -= (float)Math.pow(swing, 2);
+                    }
+
+                    float mult = 1 - swag/2;
+                    arm.pitch = arm.pitch * mult - (PI / 10) * swag;
+                    arm.roll = -reflect * (PI / 15);
+
+                    if (attributes.isCrouching) {
+                        arm.rotationPointX -= reflect * 2;
+                    }
                 }
+
+                break;
             case EMPTY:
                 arm.yaw = 0;
                 break;
@@ -482,19 +493,22 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
      *                    Used in animations together with {@code swing} and {@code move}.
      */
     protected void animateBreathing(float ticks) {
-        if (attributes.isSleeping) {
-            return;
-        }
-
         float cos = MathHelper.cos(ticks * 0.09F) * 0.05F + 0.05F;
         float sin = MathHelper.sin(ticks * 0.067F) * 0.05F;
 
-        if (rightArmPose != ArmPose.EMPTY) {
+        boolean animateLeft =
+                (leftArmPose != ArmPose.EMPTY && (leftArmPose != rightArmPose || attributes.isLeftHanded))
+                && rightArmPose != ArmPose.BLOCK;
+        boolean animateRight =
+                (rightArmPose != ArmPose.EMPTY && (leftArmPose != rightArmPose || !attributes.isLeftHanded))
+                && leftArmPose != ArmPose.BLOCK;
+
+        if (animateRight) {
             rightArm.roll += cos;
             rightArm.pitch += sin;
         }
 
-        if (leftArmPose != ArmPose.EMPTY) {
+        if (animateLeft) {
             leftArm.roll += cos;
             leftArm.pitch += sin;
         }
diff --git a/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java b/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java
index db6f6616..69e9f3c8 100644
--- a/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java
+++ b/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java
@@ -90,10 +90,6 @@ public class ModelUnicorn<T extends LivingEntity> extends ModelEarthPony<T> impl
 
     @Override
     protected void animateBreathing(float ticks) {
-        if (attributes.isSleeping) {
-            return;
-        }
-
         if (canCast()) {
             float cos = MathHelper.cos(ticks * 0.09F) * 0.05F + 0.05F;
             float sin = MathHelper.sin(ticks * 0.067F) * 0.05F;
diff --git a/src/main/java/com/minelittlepony/model/ModelAttributes.java b/src/main/java/com/minelittlepony/model/ModelAttributes.java
index efea2b36..9d9232ed 100644
--- a/src/main/java/com/minelittlepony/model/ModelAttributes.java
+++ b/src/main/java/com/minelittlepony/model/ModelAttributes.java
@@ -3,6 +3,7 @@ package com.minelittlepony.model;
 import com.minelittlepony.pony.IPony;
 import com.minelittlepony.util.math.MathUtil;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.util.AbsoluteHand;
 import net.minecraft.util.math.Vec3d;
 
 import java.util.UUID;
@@ -30,6 +31,10 @@ public class ModelAttributes<T extends LivingEntity> {
      * True if the pony is crouching.
      */
     public boolean isCrouching;
+    /**
+     * True if the entity is left-handed.
+     */
+    public boolean isLeftHanded;
     /**
      * True if the model is sitting as in boats.
      */
@@ -94,5 +99,6 @@ public class ModelAttributes<T extends LivingEntity> {
         hasHeadGear = pony.isWearingHeadgear(entity);
         isSitting = pony.isRidingInteractive(entity);
         interpolatorId = entity.getUuid();
+        isLeftHanded = entity.getMainHand() == AbsoluteHand.LEFT;
     }
 }