From 40e5044b839a2c999b89ad41adfeada5b5e136c0 Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Sun, 2 Aug 2015 00:07:38 -0400 Subject: [PATCH] Fix armor --- .../java/com/minelittlepony/minelp/model/ModelPony.java | 2 +- .../minelp/model/pony/armor/pm_newPonyArmor.java | 6 ++++-- .../minelp/renderer/layer/LayerPonyArmor.java | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/minelittlepony/minelp/model/ModelPony.java b/src/main/java/com/minelittlepony/minelp/model/ModelPony.java index 46c2e71f..da72ec21 100644 --- a/src/main/java/com/minelittlepony/minelp/model/ModelPony.java +++ b/src/main/java/com/minelittlepony/minelp/model/ModelPony.java @@ -84,7 +84,7 @@ public abstract class ModelPony extends ModelPlayer { } } - private void setModelVisibilities(AbstractClientPlayer clientPlayer) { + protected void setModelVisibilities(AbstractClientPlayer clientPlayer) { ModelPlayer modelplayer = this; if (clientPlayer.isSpectator()) { diff --git a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_newPonyArmor.java b/src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_newPonyArmor.java index 6c5c8a8d..d733a25d 100644 --- a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_newPonyArmor.java +++ b/src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_newPonyArmor.java @@ -3,6 +3,7 @@ package com.minelittlepony.minelp.model.pony.armor; import com.minelittlepony.minelp.model.pony.pm_newPonyAdv; import com.minelittlepony.minelp.renderer.AniParams; +import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.entity.RenderManager; @@ -294,11 +295,12 @@ public class pm_newPonyArmor extends pm_newPonyAdv { this.renderDrop(itemrenderer, entity, this.bipedRightArm, 1.0F, -0.0625F, 0.8375F, 0.0625F); } + @Override + protected void setModelVisibilities(AbstractClientPlayer clientPlayer) {} + @Override public void setInvisible(boolean invisible) { super.setInvisible(invisible); - this.bipedLeftArm.showModel = invisible; - this.bipedRightArm.showModel = invisible; this.Bodypiece.showModel = invisible; extBody.showModel = invisible; for (ModelRenderer m : extHead) { diff --git a/src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonyArmor.java b/src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonyArmor.java index dbee2f40..b7be53d4 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonyArmor.java +++ b/src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonyArmor.java @@ -31,8 +31,7 @@ import net.minecraft.util.ResourceLocation; public class LayerPonyArmor implements LayerRenderer { - private static final ResourceLocation ENCHANTED_ITEM_GLINT_RES = new ResourceLocation( - "textures/misc/enchanted_item_glint.png"); + private static final ResourceLocation ENCHANTED_ITEM_GLINT_RES = new ResourceLocation("textures/misc/enchanted_item_glint.png"); private static final Map field_110859_k = Maps.newHashMap(); private static final Map ponyArmorMap = Maps.newHashMap();