diff --git a/src/main/java/com/minelittlepony/model/pony/ModelIllagerPony.java b/src/main/java/com/minelittlepony/model/pony/ModelIllagerPony.java index 5cce4923..4c309c33 100644 --- a/src/main/java/com/minelittlepony/model/pony/ModelIllagerPony.java +++ b/src/main/java/com/minelittlepony/model/pony/ModelIllagerPony.java @@ -70,7 +70,7 @@ public class ModelIllagerPony extends ModelPlayerPony { } } - public ModelRenderer getArmForSide(EnumHandSide side) { - return super.getArmForSide(side); + public ModelRenderer getArm(EnumHandSide side) { + return metadata.hasMagic() ? side == EnumHandSide.LEFT ? this.unicornArmLeft : this.unicornArmRight : this.getArmForSide(side); } } diff --git a/src/main/java/com/minelittlepony/renderer/RenderPonyEvoker.java b/src/main/java/com/minelittlepony/renderer/RenderPonyEvoker.java index 4a8ac9de..c0330819 100644 --- a/src/main/java/com/minelittlepony/renderer/RenderPonyEvoker.java +++ b/src/main/java/com/minelittlepony/renderer/RenderPonyEvoker.java @@ -29,7 +29,7 @@ public class RenderPonyEvoker extends RenderPonyMob { } protected void translateToHand(EnumHandSide p_191361_1_) { - ((ModelIllagerPony) this.getRenderer().getMainModel()).getArmForSide(p_191361_1_).postRender(0.0625F); + ((ModelIllagerPony) this.getRenderer().getMainModel()).getArm(p_191361_1_).postRender(0.0625F); } }); } diff --git a/src/main/java/com/minelittlepony/renderer/RenderPonyIllusionIllager.java b/src/main/java/com/minelittlepony/renderer/RenderPonyIllusionIllager.java index cccf68cf..4db154f3 100644 --- a/src/main/java/com/minelittlepony/renderer/RenderPonyIllusionIllager.java +++ b/src/main/java/com/minelittlepony/renderer/RenderPonyIllusionIllager.java @@ -31,7 +31,7 @@ public class RenderPonyIllusionIllager extends RenderPonyMob extends RenderLiving @Override public void doRender(T entity, double xPosition, double yPosition, double zPosition, float yaw, - float partialTicks) { + float partialTicks) { double yOrigin = yPosition; if (entity.isSneaking()) { yOrigin -= 0.125D; @@ -52,9 +52,7 @@ public abstract class RenderPonyMob extends RenderLiving this.playerModel.getModel().isSleeping = false; ResourceLocation loc = getEntityTexture(entity); - if (loc != null) { - this.playerModel.apply(MineLittlePony.getInstance().getManager().getPonyFromResourceRegistry(loc).metadata); - } + this.playerModel.apply(MineLittlePony.getInstance().getManager().getPonyFromResourceRegistry(loc).metadata); if (MineLittlePony.getConfig().showscale) { this.shadowSize = 0.4F; diff --git a/src/main/java/com/minelittlepony/renderer/RenderPonyVindicator.java b/src/main/java/com/minelittlepony/renderer/RenderPonyVindicator.java index 5a8cc3fb..232c2991 100644 --- a/src/main/java/com/minelittlepony/renderer/RenderPonyVindicator.java +++ b/src/main/java/com/minelittlepony/renderer/RenderPonyVindicator.java @@ -33,7 +33,7 @@ public class RenderPonyVindicator extends RenderPonyMob { @Override protected void translateToHand(EnumHandSide side) { - ((ModelIllagerPony) this.getRenderer().getMainModel()).getArmForSide(side).postRender(0.0625F); + ((ModelIllagerPony) this.getRenderer().getMainModel()).getArm(side).postRender(0.0625F); } }); } @@ -45,6 +45,7 @@ public class RenderPonyVindicator extends RenderPonyMob { @Override protected void preRenderCallback(EntityVindicator entitylivingbaseIn, float partialTickTime) { + super.preRenderCallback(entitylivingbaseIn, partialTickTime); GlStateManager.scale(0.9375F, 0.9375F, 0.9375F); }