Piglins are ponified \0/

src/main/java/com/minelittlepony/client/model/entity/PiglinPonyModel.java

@@ -2,40 +2,59 @@ package com.minelittlepony.client.model.entity;
 
 import net.minecraft.entity.mob.HostileEntity;
 import net.minecraft.entity.mob.PiglinEntity;
+import net.minecraft.util.math.MathHelper;
 
-import com.minelittlepony.client.model.entity.race.AlicornModel;
+import com.minelittlepony.client.render.EquineRenderManager;
+import com.minelittlepony.pony.IPony;
 
-public class PiglinPonyModel extends AlicornModel<HostileEntity> {
+public class PiglinPonyModel extends ZomponyModel<HostileEntity> {
 
-    private boolean isPegasus;
+    private PiglinEntity.Activity activity;
-
-    public PiglinPonyModel() {
-        super(false);
-    }
 
     @Override
-    public void animateModel(HostileEntity entity, float move, float swing, float ticks) {
+    public void updateLivingState(HostileEntity entity, IPony pony, EquineRenderManager.Mode mode) {
-        isPegasus = entity.getUuid().getLeastSignificantBits() % 30 == 0;
+        super.updateLivingState(entity, pony, mode);
+        leftArmPose = ArmPose.EMPTY;
+        rightArmPose = entity.getMainHandStack().isEmpty() ? ArmPose.EMPTY : ArmPose.ITEM;
 
         if (entity instanceof PiglinEntity) {
             PiglinEntity piglinEntity = (PiglinEntity)entity;
-            PiglinEntity.Activity activity = piglinEntity.getActivity();
+            activity = piglinEntity.getActivity();
-
-            leftArmPose = ArmPose.EMPTY;
-            rightArmPose = ArmPose.EMPTY;
 
             if (activity == PiglinEntity.Activity.CROSSBOW_HOLD) {
                 rightArmPose = ArmPose.CROSSBOW_HOLD;
             } else if (activity == PiglinEntity.Activity.CROSSBOW_CHARGE) {
-                rightArmPose = ArmPose.BOW_AND_ARROW;
+                rightArmPose = ArmPose.CROSSBOW_CHARGE;
             } else if (activity == PiglinEntity.Activity.ADMIRING_ITEM) {
                 leftArmPose = ArmPose.ITEM;
             }
+        } else {
+            activity = PiglinEntity.Activity.DEFAULT;
         }
     }
 
     @Override
-    public boolean canFly() {
+    public void setAngles(HostileEntity entity, float move, float swing, float ticks, float headYaw, float headPitch) {
-        return isPegasus;
+        super.setAngles(entity, move, swing, ticks, headYaw, headPitch);
+
+        if (activity == PiglinEntity.Activity.ADMIRING_ITEM) {
+            leftArm.yaw = 0.5F;
+            leftArm.pitch = -1.9F;
+            leftArm.pivotY += 4;
+            leftArm.pivotZ += 3;
+            leftArm.pivotX += 2;
+            head.pitch = MathHelper.sin(ticks / 12) / 6 + 0.5F;
+            head.yaw = 0;
+
+            head.roll = MathHelper.sin(ticks / 10) / 3F;
+
+
+            helmet.copyPositionAndRotation(head);
+        }
+    }
+
+    @Override
+    protected boolean isZombified(HostileEntity entity) {
+        return !(entity instanceof PiglinEntity);
     }
 }

src/main/java/com/minelittlepony/client/model/entity/ZomponyModel.java

@@ -17,6 +17,7 @@ public class ZomponyModel<Zombie extends HostileEntity> extends AlicornModel<Zom
 
     @Override
     public void animateModel(Zombie entity, float move, float swing, float ticks) {
+        super.animateModel(entity, move, swing, ticks);
         isPegasus = entity.getUuid().getLeastSignificantBits() % 30 == 0;
     }
 
@@ -24,7 +25,7 @@ public class ZomponyModel<Zombie extends HostileEntity> extends AlicornModel<Zom
     protected void rotateLegs(float move, float swing, float ticks, Zombie entity) {
         super.rotateLegs(move, swing, ticks, entity);
 
-        if (rightArmPose == ArmPose.EMPTY) {
+        if (isZombified(entity)) {
             if (islookAngleRight(move)) {
                 rotateArmHolding(rightArm, 1, getSwingAmount(), ticks);
                 ((MsonPart)rightArm).shift(0.5F, 1.5F, 3);
@@ -35,6 +36,10 @@ public class ZomponyModel<Zombie extends HostileEntity> extends AlicornModel<Zom
         }
     }
 
+    protected boolean isZombified(Zombie entity) {
+        return rightArmPose == ArmPose.EMPTY;
+    }
+
     public boolean islookAngleRight(float move) {
         return MathHelper.sin(move / 20) < 0;
     }