From 27e5f6a6247cde17b5906cc617e0bd74b4ab59bd Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Sat, 20 Feb 2016 01:58:58 -0500 Subject: [PATCH] Fix various rendering problems with new drawers --- build.gradle | 2 +- .../client/renderer/DrawersItemRenderer.java | 5 ++--- .../client/renderer/common/CommonDrawerRenderer.java | 7 +++++++ .../minecraft/storagedrawers/util/RenderHelperLL.java | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 4542fbc..f704878 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-1.9.0" +version = "1.7.10-1.9.1" group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "StorageDrawers" diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java index 8d6047e..d7e4b78 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java +++ b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java @@ -50,10 +50,9 @@ public class DrawersItemRenderer implements IItemRenderer if (renderType == ItemRenderType.INVENTORY) GL11.glRotatef(90, 0, 1, 0); - if (renderType == ItemRenderType.ENTITY) { + if (renderType == ItemRenderType.ENTITY) GL11.glRotatef(180, 0, 1, 0); - GL11.glRotatef(180, 1, 0, 0); - } + if (renderType == ItemRenderType.INVENTORY || renderType == ItemRenderType.ENTITY) GL11.glTranslatef(block.halfDepth ? -.75f : -.5f, -.5f, -.5f); diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonDrawerRenderer.java b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonDrawerRenderer.java index 72e166d..ca2ea62 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonDrawerRenderer.java +++ b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonDrawerRenderer.java @@ -5,6 +5,7 @@ import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.client.renderer.ModularBoxRenderer; import com.jaquadro.minecraft.storagedrawers.client.renderer.PanelBoxRenderer; import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; +import com.jaquadro.minecraft.storagedrawers.util.RenderHelperState; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -34,14 +35,18 @@ public class CommonDrawerRenderer RenderHelper renderHelper = RenderHelper.instance; if (world != null) renderHelper.setColorAndBrightness(world, block, x, y, z); + renderHelper.state.setRotateTransform(RenderHelper.ZNEG, direction); + renderHelper.state.setUVRotation(RenderHelper.YPOS, RenderHelperState.ROTATION_BY_FACE_FACE[RenderHelper.ZNEG][direction]); return renderHelper; } private void end () { RenderHelper renderHelper = RenderHelper.instance; + renderHelper.state.clearRotateTransform(); + renderHelper.state.clearUVRotation(RenderHelper.YPOS); } public void renderBasePass (IBlockAccess world, int x, int y, int z, BlockDrawersCustom block, int direction, IIcon iconSide, IIcon iconTrim, IIcon iconFront) { @@ -73,6 +78,7 @@ public class CommonDrawerRenderer renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconTrim); } else if (block.drawerCount == 4) { + renderHelper.state.flipTexture = true; renderHelper.setRenderBounds(trimWidth, trimWidth, depth + trimDepth, unit7, unit7, 1); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconFront); renderHelper.setRenderBounds(trimWidth, unit9, depth + trimDepth, unit7, 1 - trimWidth, 1); @@ -81,6 +87,7 @@ public class CommonDrawerRenderer renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconFront); renderHelper.setRenderBounds(unit9, unit9, depth + trimDepth, 1 - trimWidth, 1 - trimWidth, 1); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconFront); + renderHelper.state.flipTexture = false; renderHelper.setRenderBounds(trimWidth, unit7, depth + trimDepth, unit7, unit9, 1); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconTrim); diff --git a/src/com/jaquadro/minecraft/storagedrawers/util/RenderHelperLL.java b/src/com/jaquadro/minecraft/storagedrawers/util/RenderHelperLL.java index f316370..be89e5f 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/util/RenderHelperLL.java +++ b/src/com/jaquadro/minecraft/storagedrawers/util/RenderHelperLL.java @@ -205,7 +205,7 @@ public class RenderHelperLL maxX = state.renderMinX; } - if (face == RenderHelper.YNEG) + if (face == RenderHelper.ZNEG) setFaceZNegUV(icon, minX, state.renderMinY, maxX, state.renderMaxY); else setFaceZPosUV(icon, minX, state.renderMinY, maxX, state.renderMaxY); @@ -309,7 +309,7 @@ public class RenderHelperLL maxZ = state.renderMinZ; } - if (face == RenderHelper.YNEG) + if (face == RenderHelper.XNEG) setFaceXNegUV(icon, minZ, state.renderMinY, maxZ, state.renderMaxY); else setFaceXPosUV(icon, minZ, state.renderMinY, maxZ, state.renderMaxY);