Fixed armour stand rendering

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

@@ -2,8 +2,8 @@ package com.minelittlepony.client.model.entity;
 
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.entity.model.ArmorStandEntityModel;
+import net.minecraft.client.render.entity.model.BipedEntityModel;
 import net.minecraft.client.render.entity.state.ArmorStandEntityRenderState;
-import net.minecraft.entity.decoration.ArmorStandEntity;
 
 import com.minelittlepony.mson.util.PartUtil;
 
@@ -13,19 +13,20 @@ public class PonyArmourStandModel extends ArmorStandEntityModel {
     }
 
     @Override
-    public void setAngles(ArmorStandEntityRenderState state) {
+    public void copyTransforms(BipedEntityModel<ArmorStandEntityRenderState> model) {
-        super.setAngles(state);
+        if (model instanceof PonyArmourStandModel) {
-        leftArm.visible = true;
+            super.copyTransforms(model);
-        rightArm.visible = true;
+        } else {
-
+            PartUtil.copyAngles(head, model.head);
-        if (state.leftLegRotation.equals(ArmorStandEntity.DEFAULT_LEFT_LEG_ROTATION)) {
+            PartUtil.copyAngles(rightArm, model.rightArm);
-            PartUtil.copyAngles(leftArm, leftLeg);
+            PartUtil.copyAngles(leftArm, model.leftArm);
-            leftLeg.pitch *= -1;
+            PartUtil.copyAngles(rightArm, model.rightLeg);
-        }
+            PartUtil.copyAngles(leftLeg, model.leftLeg);
-
-        if (state.rightLegRotation.equals(ArmorStandEntity.DEFAULT_RIGHT_LEG_ROTATION)) {
-            PartUtil.copyAngles(rightArm, rightLeg);
-            rightLeg.pitch *= -1;
         }
     }
+
+    @Override
+    public void setAngles(ArmorStandEntityRenderState state) {
+        super.setAngles(state);
+    }
 }

src/main/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java

@@ -4,7 +4,6 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.*;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.Box;
-import net.minecraft.util.math.Vec3d;
 
 import com.minelittlepony.api.model.RenderPass;
 import com.minelittlepony.client.render.entity.state.PonyRenderState;
@@ -21,18 +20,8 @@ public final class DebugBoundingBoxRenderer {
             return;
         }
 
-        Vec3d offset = state.positionOffset;
-
         stack.push();
-        stack.translate(-offset.x, -offset.y, -offset.z);
+        VertexRendering.drawBox(stack, matrices.getBuffer(RenderLayer.getLines()), getBoundingBox(state).offset(-state.x, -state.y, -state.z), 1, 1, 0, 1);
-
-        double x = -state.x;
-        double y = -state.y;
-        double z = -state.z;
-
-        VertexConsumer vertices = matrices.getBuffer(RenderLayer.getLines());
-
-        VertexRendering.drawBox(stack, vertices, getBoundingBox(state).offset(x, y, z), 1, 1, 0, 1);
         stack.pop();
     }
 

src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java

@@ -101,23 +101,9 @@ public class PlayerPonyRenderer
 
     @Override
     public void render(PlayerEntityRenderState state, MatrixStack stack, VertexConsumerProvider vertices, int light) {
-        // EntityModelFeatures: We have to force it to use our models otherwise EMF overrides it and breaks pony rendering
         shadowRadius = ((PlayerPonyRenderState)state).attributes.size.shadowSize();
         super.render(state, stack, vertices, light);
         DebugBoundingBoxRenderer.render((PlayerPonyRenderState)state, stack, vertices);
-
-        // Translate the shadow position after everything is done
-        // (shadows are drawn after us)
-        /*
-        if (!entity.hasVehicle() && !entity.isSleeping()) {
-            float yaw = MathHelper.lerpAngleDegrees(tickDelta, entity.prevBodyYaw, entity.bodyYaw);
-            float l = entity.getWidth() / 2 * manager.getScaleFactor();
-
-            stack.multiply(RotationAxis.NEGATIVE_Y.rotationDegrees(yaw));
-            stack.translate(0, 0, -l);
-            stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(yaw));
-        }
-        */
     }
 
     @Override

src/main/java/com/minelittlepony/client/render/entity/PonyStandRenderer.java

@@ -10,14 +10,14 @@ import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.decoration.ArmorStandEntity;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.*;
-import net.minecraft.util.math.RotationAxis;
 
 import org.jetbrains.annotations.Nullable;
 
 import com.minelittlepony.api.model.ModelAttributes.Mode;
 import com.minelittlepony.api.pony.Pony;
 import com.minelittlepony.api.pony.PonyData;
+import com.minelittlepony.api.pony.meta.SizePreset;
 import com.minelittlepony.client.model.ModelType;
 import com.minelittlepony.client.model.entity.PonyArmourStandModel;
 import com.minelittlepony.client.model.entity.race.EarthPonyModel;
@@ -58,13 +58,40 @@ public class PonyStandRenderer extends LivingEntityRenderer<ArmorStandEntity, Po
     public void updateRenderState(ArmorStandEntity entity, State state, float tickDelta) {
         super.updateRenderState(entity, state, tickDelta);
         BipedEntityRenderer.updateBipedRenderState(entity, state.ponyState, tickDelta);
+        state.yaw = MathHelper.lerpAngleDegrees(tickDelta, entity.prevYaw, entity.getYaw());
+        state.marker = entity.isMarker();
+        state.small = entity.isSmall();
+        state.showArms = true;
+        state.showBasePlate = entity.shouldShowBasePlate();
+        state.bodyRotation = entity.getBodyRotation();
+        state.headRotation = entity.getHeadRotation();
+        state.leftArmRotation = entity.getLeftArmRotation();
+        state.rightArmRotation = entity.getRightArmRotation();
+        state.leftLegRotation = entity.getLeftLegRotation();
+        state.rightLegRotation = entity.getRightLegRotation();
+        state.timeSinceLastHit = (float)(entity.getWorld().getTime() - entity.lastHitTime) + tickDelta;
+
+        if (state.leftLegRotation.equals(ArmorStandEntity.DEFAULT_LEFT_LEG_ROTATION)) {
+            state.leftLegRotation = new EulerAngle(-state.leftArmRotation.getPitch(), state.leftArmRotation.getYaw(), state.leftArmRotation.getRoll());
+        }
+
+        if (state.rightLegRotation.equals(ArmorStandEntity.DEFAULT_RIGHT_LEG_ROTATION)) {
+            state.rightLegRotation = new EulerAngle(-state.rightArmRotation.getPitch(), state.rightArmRotation.getYaw(), state.rightArmRotation.getRoll());
+        }
+
         context.manager.updateState(entity, state.ponyState, Mode.OTHER);
+        state.ponyState.baby = state.small;
+        state.ponyState.attributes.size = state.small ? SizePreset.FOAL : SizePreset.NORMAL;
+        state.ponyState.equippedHeadStack = state.equippedHeadStack;
         state.pitch = MathHelper.RADIANS_PER_DEGREE * entity.getHeadRotation().getPitch();
         state.yawDegrees = MathHelper.RADIANS_PER_DEGREE * entity.getHeadRotation().getYaw();
     }
 
     @Override
     protected void setupTransforms(State state, MatrixStack matrices, float animationProgress, float bodyYaw) {
+
+        context.manager.setupTransforms(state.ponyState, matrices, animationProgress, bodyYaw);
+
         matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(180 - animationProgress));
         if (state.timeSinceLastHit < 5) {
             matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(MathHelper.sin(state.timeSinceLastHit / 1.5F * (float) Math.PI) * 3.0F));
@@ -77,13 +104,9 @@ public class PonyStandRenderer extends LivingEntityRenderer<ArmorStandEntity, Po
         return entity.isCustomNameVisible();
     }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
     @Override
     @Nullable
     protected RenderLayer getRenderLayer(State state, boolean showBody, boolean translucent, boolean showOutline) {
-        if (context.getModel() instanceof BipedEntityModel bipedModel) {
-            bipedModel.copyTransforms((BipedEntityModel)model);
-        }
         if (!state.marker) {
             return super.getRenderLayer(state, showBody, translucent, showOutline);
         }
@@ -130,6 +153,9 @@ public class PonyStandRenderer extends LivingEntityRenderer<ArmorStandEntity, Po
         @SuppressWarnings({"rawtypes", "unchecked"})
         @Override
         public void render(MatrixStack matrices, VertexConsumerProvider vertices, int light, PonyStandRenderer.State state, float limbAngle, float limbDistance) {
+            if (context.getModel() instanceof BipedEntityModel bipedModel) {
+                model.copyTransforms(bipedModel);
+            }
             ((FeatureRenderer)feature).render(matrices, vertices, light, state.ponyState, limbAngle, limbDistance);
         }
     }

src/main/java/com/minelittlepony/client/render/entity/SkeleponyRenderer.java

@@ -72,9 +72,7 @@ public class SkeleponyRenderer<T extends AbstractSkeletonEntity> extends PonyRen
         public void updateState(LivingEntity entity, PonyModel<?> model, Pony pony, ModelAttributes.Mode mode) {
             super.updateState(entity, model, pony, mode);
             isAttacking = entity instanceof HostileEntity h && h.isAttacking();
-            if (entity.getUuid().getLeastSignificantBits() % 3 == 0) {
+            race = entity.getUuid().getLeastSignificantBits() % 3 == 0 ? Race.EARTH : Race.UNICORN;
-                race = Race.EARTH;
-            }
         }
 
         @Override

src/main/java/com/minelittlepony/client/render/entity/feature/HeldItemFeature.java

@@ -27,6 +27,12 @@ public class HeldItemFeature<
         this.context = context;
     }
 
+    @Deprecated
+    @Override
+    public final void render(MatrixStack matrices, VertexConsumerProvider vertices, int light, PlayerEntityRenderState state, float limbAngle, float limbDistance) {
+        render(matrices, vertices, light, (S)state, limbAngle, limbDistance);
+    }
+
     public void render(MatrixStack matrices, VertexConsumerProvider vertices, int light, S state, float limbAngle, float limbDistance) {
         if (!state.leftHandStack.isEmpty() || !state.rightHandStack.isEmpty()) {
             M model = context.getEquineManager().getModels().body();
@@ -44,9 +50,4 @@ public class HeldItemFeature<
             matrices.pop();
         }
     }
-
-    @Override
-    public final void render(MatrixStack matrices, VertexConsumerProvider vertices, int light, PlayerEntityRenderState state, float limbAngle, float limbDistance) {
-        render(matrices, vertices, light, (S)state, limbAngle, limbDistance);
-    }
 }

src/main/java/com/minelittlepony/client/render/entity/state/PlayerPonyRenderState.java

@@ -1,5 +1,7 @@
 package com.minelittlepony.client.render.entity.state;
 
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.util.SkinTextures;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.Identifier;
@@ -19,6 +21,7 @@ public class PlayerPonyRenderState extends PonyRenderState {
 
     @Override
     public void updateState(LivingEntity entity, PonyModel<?> model, Pony pony, ModelAttributes.Mode mode) {
+        smallArms = ((ClientPlayerEntity)entity).getSkinTextures().model() == SkinTextures.Model.SLIM;
         super.updateState(entity, model, pony, mode);
         isPreviewModel = entity instanceof PreviewModel;
         wearabledTextures.clear();

src/main/java/com/minelittlepony/client/render/entity/state/PonyRenderState.java

@@ -82,11 +82,7 @@ public class PonyRenderState extends PlayerEntityRenderState implements PonyMode
 
     protected float getLegOutset() {
         float outset = attributes.isLyingDown ? 3.6F : attributes.isCrouching ? 1 : 5;
-
+        return smallArms ? Math.max(1, outset - 1) : outset;
-        if (smallArms) {
-            return Math.max(1, outset - 1);
-        }
-        return outset;
     }
 
     /**