From 1d40648e478fd6f1105d0b659bef229dcb918aa4 Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Wed, 9 Mar 2016 17:07:40 -0500 Subject: [PATCH] Fix some things --- .../com/voxelmodpack/hdskins/gui/RenderPlayerModel.java | 6 +++--- .../brohoof/minelittlepony/renderer/RenderPonySkeleton.java | 4 ++-- .../minelittlepony/renderer/layer/LayerHeldPonyItem.java | 6 +----- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java index f2623aab..450e85c3 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java @@ -41,14 +41,14 @@ public class RenderPlayerModel extends RenderLiving } @Override - public void doRender(EntityPlayerModel par1Entity, double par2, double par4, double par6, float par8, float par9) { + public void doRender(M par1Entity, double par2, double par4, double par6, float par8, float par9) { GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); - this.doRender(par1Entity, par2, par4, par6, par8, par9); + super.doRender(par1Entity, par2, par4, par6, par8, par9); popAttrib(); pushMatrix(); scale(1.0F, -1.0F, 1.0F); GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); - this.doRender(par1Entity, par2, par4, par6, par8, par9); + super.doRender(par1Entity, par2, par4, par6, par8, par9); popAttrib(); popMatrix(); } diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java b/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java index 7df286bf..5362d463 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java @@ -21,8 +21,8 @@ public class RenderPonySkeleton extends RenderPonyMob { addLayer(new LayerBipedArmor(this) { @Override protected void initArmor() { - this.field_177189_c = PMAPI.skeleton.getArmor().modelArmor; - this.field_177186_d = PMAPI.skeleton.getArmor().modelArmorChestplate; + this.modelLeggings = PMAPI.skeleton.getArmor().modelArmor; + this.modelArmor = PMAPI.skeleton.getArmor().modelArmorChestplate; } }); } diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerHeldPonyItem.java b/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerHeldPonyItem.java index 272cd541..70fcba15 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerHeldPonyItem.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerHeldPonyItem.java @@ -119,14 +119,10 @@ public class LayerHeldPonyItem implements LayerRenderer { scale(2, 2, 2); - model.getItemCameraTransforms().applyTransform(ItemCameraTransforms.TransformType.THIRD_PERSON); applyTransform(model.getItemCameraTransforms(), TransformType.THIRD_PERSON); RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); scale(1.1, 1.1, 1.1); - if (model.isGui3d()) { - // disabling textures for items messes up bounds - disableTexture2D(); - } + translate(0, .01, .01); renderItem.renderItem(drop, model); translate(.01, -.01, -.02);