From 06013f79e27dfbc6e803fd6d258c8c109b338aa4 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Wed, 27 Aug 2014 23:44:24 -0400 Subject: [PATCH] Simplify rendering --- .../storagedrawers/block/BlockDrawers.java | 6 +++--- .../client/renderer/DrawersRenderer.java | 16 ++++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index d2ede9d..3c9d559 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -271,7 +271,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH TileEntityDrawers tile = getTileEntity(world, x, y, z); if (tile.getLevel() > 1) dropBlockAsItem(world, x, y, z, new ItemStack(ModItems.upgrade, 1, tile.getLevel())); - + if (tile != null) { for (int i = 0; i < tile.getDrawerCount(); i++) { while (tile.getItemCount(i) > 0) { @@ -403,9 +403,9 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH TileEntityDrawers tile = getTileEntity(blockAccess, x, y, z); if (tile == null || side == tile.getDirection()) { if (drawerCount == 2) - return (level > 0) ? iconOverlay[level] : iconFront2[meta]; + return (level > 0) ? iconOverlayH[level] : iconFront2[meta]; else - return (level > 0) ? iconOverlay[level] : iconFront4[meta]; + return (level > 0) ? iconOverlayCross[level] : iconFront4[meta]; } switch (side) { diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java index bd5f356..5b5ac76 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java +++ b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java @@ -83,8 +83,8 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler } boxRenderer.setUnit(0); - for (int i = 0; i < 6; i++) - boxRenderer.setIcon(block.getIcon(world, x, y, z, i), i); + //for (int i = 0; i < 6; i++) + // boxRenderer.setIcon(block.getIcon(world, x, y, z, i), i); boxRenderer.setInteriorIcon(block.getIcon(world, x, y, z, side), ForgeDirection.OPPOSITES[side]); renderInterior(block, x, y, z, side, renderer); @@ -115,7 +115,9 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler break; } - if (block.drawerCount == 2) { + boxRenderer.renderExterior(renderer, block, x, y, z, xMin, 0, zMin, xMax, 1, zMax, 0, ModularBoxRenderer.sideCut[side]); + + /*if (block.drawerCount == 2) { boxRenderer.renderExterior(renderer, block, x, y, z, xMin, 0, zMin, xMax, .5, zMax, 0, ModularBoxRenderer.sideCut[side]); boxRenderer.renderExterior(renderer, block, x, y, z, xMin, .5, zMin, xMax, 1, zMax, 0, ModularBoxRenderer.sideCut[side]); } @@ -136,7 +138,7 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler boxRenderer.renderExterior(renderer, block, x, y, z, xMin, .5, .5, xMax, 1, 1, 0, ModularBoxRenderer.sideCut[side]); break; } - } + }*/ } private void renderInterior (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) { @@ -163,7 +165,9 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler break; } - if (block.drawerCount == 2) { + boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit, zMin, xMax, 1 - unit, zMax, 0, ModularBoxRenderer.sideCut[side]); + + /*if (block.drawerCount == 2) { boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit, zMin, xMax, unit * 7, zMax, 0, ModularBoxRenderer.sideCut[side]); boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit * 9, zMin, xMax, 1 - unit, zMax, 0, ModularBoxRenderer.sideCut[side]); } @@ -184,7 +188,7 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit * 9, .5 + unit, xMax, 1 - unit, 1 - unit, 0, ModularBoxRenderer.sideCut[side]); break; } - } + }*/ } @Override