From da1faaac90c6ef1efb0126d3f82971807918f37c Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 28 May 2015 15:08:49 -0400 Subject: [PATCH] Fix item rendering textures being incorrect --- .../chisel/api/rendering/RenderBlocksCTM.java | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java b/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java index 06be57d3..e9dea23a 100644 --- a/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java @@ -181,6 +181,8 @@ public class RenderBlocksCTM extends RenderBlocks { protected float[][] blumap = new float[3][3]; protected int bx, by, bz; + + private boolean inWorld = false; @Override public boolean renderStandardBlock(Block block, int x, int y, int z) { @@ -190,7 +192,9 @@ public class RenderBlocksCTM extends RenderBlocks { tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F); tessellator.addTranslation(x, y, z); + inWorld = true; boolean res = super.renderStandardBlock(block, x, y, z); + inWorld = false; tessellator.addTranslation(-x, -y, -z); return res; @@ -329,8 +333,8 @@ public class RenderBlocksCTM extends RenderBlocks { @Override public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) { - if (rendererOld != null && rendererOld.hasOverrideBlockTexture()) { - IIcon i = rendererOld.overrideBlockTexture; + if (!inWorld || (rendererOld != null && rendererOld.hasOverrideBlockTexture())) { + IIcon i = rendererOld.hasOverrideBlockTexture() ? rendererOld.overrideBlockTexture : icon; tessellator.addVertexWithUV(renderMinX, renderMaxY, renderMinZ, i.getMinU(), i.getMinV()); tessellator.addVertexWithUV(renderMinX, renderMinY, renderMinZ, i.getMinU(), i.getMaxV()); @@ -361,8 +365,8 @@ public class RenderBlocksCTM extends RenderBlocks { @Override public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon) { - if (rendererOld != null && rendererOld.hasOverrideBlockTexture()) { - IIcon i = rendererOld.overrideBlockTexture; + if (!inWorld || (rendererOld != null && rendererOld.hasOverrideBlockTexture())) { + IIcon i = rendererOld.hasOverrideBlockTexture() ? rendererOld.overrideBlockTexture : icon; tessellator.addVertexWithUV(renderMaxX, renderMaxY, renderMaxZ, i.getMaxU(), i.getMinV()); tessellator.addVertexWithUV(renderMaxX, renderMinY, renderMaxZ, i.getMaxU(), i.getMaxV()); @@ -393,8 +397,8 @@ public class RenderBlocksCTM extends RenderBlocks { @Override public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) { - if (rendererOld != null && rendererOld.hasOverrideBlockTexture()) { - IIcon i = rendererOld.overrideBlockTexture; + if (!inWorld || (rendererOld != null && rendererOld.hasOverrideBlockTexture())) { + IIcon i = rendererOld.hasOverrideBlockTexture() ? rendererOld.overrideBlockTexture : icon; tessellator.addVertexWithUV(renderMaxX, renderMaxY, renderMinZ, i.getMaxU(), i.getMinV()); tessellator.addVertexWithUV(renderMaxX, renderMinY, renderMinZ, i.getMaxU(), i.getMaxV()); @@ -425,8 +429,8 @@ public class RenderBlocksCTM extends RenderBlocks { @Override public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon) { - if (rendererOld != null && rendererOld.hasOverrideBlockTexture()) { - IIcon i = rendererOld.overrideBlockTexture; + if (!inWorld || (rendererOld != null && rendererOld.hasOverrideBlockTexture())) { + IIcon i = rendererOld.hasOverrideBlockTexture() ? rendererOld.overrideBlockTexture : icon; tessellator.addVertexWithUV(renderMinX, renderMaxY, renderMaxZ, i.getMinU(), i.getMinV()); tessellator.addVertexWithUV(renderMinX, renderMinY, renderMaxZ, i.getMinU(), i.getMaxV()); @@ -457,8 +461,8 @@ public class RenderBlocksCTM extends RenderBlocks { @Override public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon) { - if (rendererOld != null && rendererOld.hasOverrideBlockTexture()) { - IIcon i = rendererOld.overrideBlockTexture; + if (!inWorld || (rendererOld != null && rendererOld.hasOverrideBlockTexture())) { + IIcon i = rendererOld.hasOverrideBlockTexture() ? rendererOld.overrideBlockTexture : icon; tessellator.addVertexWithUV(renderMinX, renderMinY, renderMaxZ, i.getMinU(), i.getMaxV()); tessellator.addVertexWithUV(renderMinX, renderMinY, renderMinZ, i.getMinU(), i.getMinV()); @@ -489,8 +493,8 @@ public class RenderBlocksCTM extends RenderBlocks { @Override public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon) { - if (rendererOld != null && rendererOld.hasOverrideBlockTexture()) { - IIcon i = rendererOld.overrideBlockTexture; + if (!inWorld || (rendererOld != null && rendererOld.hasOverrideBlockTexture())) { + IIcon i = rendererOld.hasOverrideBlockTexture() ? rendererOld.overrideBlockTexture : icon; tessellator.addVertexWithUV(renderMinX, renderMaxY, renderMinZ, i.getMinU(), i.getMinV()); tessellator.addVertexWithUV(renderMinX, renderMaxY, renderMaxZ, i.getMinU(), i.getMaxV());