diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java index e8ada5cc..f2f4f701 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java @@ -130,7 +130,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa @Override public IIcon getIcon(int side, int meta) { - return getType(meta).getIcon(MultipassBlockRenderer.getLayer()); + return TileType.get(meta >>> 16 & 0xFF).icons[MultipassBlockRenderer.getLayer()]; } @Override @@ -167,16 +167,10 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa @Override @SideOnly(Side.CLIENT) public int getRenderColor(int meta) { - final BlockType type = this.getType(meta); - if (!MultipassBlockRenderer.isRendering()) { - return type.color1.getColor(false); - } - - final int layer = MultipassBlockRenderer.getLayer(); - if (layer == 0) return 0xffffff; - if (layer == 1) return type.color1.getColor(false); - if (layer == 2) return type.color2.getColor(false); - return 0xffffff; + if (!MultipassBlockRenderer.isRendering()) { + return EnumFlowerColor.get(meta & 0xFF).getColor(false); + } + return colorMultiplier(meta); } @Override @@ -186,14 +180,14 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa @Override public int colorMultiplier(int meta) { - BlockType type = getType(meta); - if (MultipassBlockRenderer.getLayer() == 0) { + int layer = MultipassBlockRenderer.getLayer(); + if (layer == 0) { return 0xffffff; } - if (MultipassBlockRenderer.getLayer() == 1) { - return type.color1.getColor(false); + if (layer == 1) { + return EnumFlowerColor.get(meta & 0xFF).getColor(false); } - return type.color2.getColor(false); + return EnumFlowerColor.get(meta >>> 8 & 0xFF).getColor(false); } @Override @@ -214,6 +208,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa VerticalStripeBrick("verticalbrickstripe", "verticalStripedCeramicBricks"), VerticalLargeBrick("verticalbricklarge", "largeVerticalCeramicBricks"); + private static final TileType[] VALUES = values(); private final String id; private final String name; private final IIcon[] icons; @@ -225,7 +220,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } public static TileType get(int id) { - return values()[id % values().length]; + return VALUES[id % VALUES.length]; } public boolean canDouble() { diff --git a/src/main/java/binnie/core/block/MultipassBlockRenderer.java b/src/main/java/binnie/core/block/MultipassBlockRenderer.java index 76b5630e..cc277fd2 100644 --- a/src/main/java/binnie/core/block/MultipassBlockRenderer.java +++ b/src/main/java/binnie/core/block/MultipassBlockRenderer.java @@ -28,64 +28,45 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler { return MultipassBlockRenderer.rendering; } - private static int getPassesSafe(Block block) { - try { - return ((IMultipassBlock) block).getNumberOfPasses(); - } catch (Throwable t) { - return 1; - } - } - - private static int getColorSafe(Block block, int meta) { - try { - if (block instanceof IMultipassBlock) { - try { - java.lang.reflect.Method m = block.getClass().getMethod("colorMultiplier", int.class); - Object out = m.invoke(block, Integer.valueOf(meta)); - if (out instanceof Integer) { - return ((Integer) out).intValue(); - } - } catch (Throwable ignored) { - } - } - return block.getRenderColor(meta); - } catch (Throwable t) { - return 16777215; - } - } @Override public void renderInventoryBlock(Block block, int meta, int modelID, RenderBlocks renderer) { + IMultipassBlock multipassBlock = (IMultipassBlock) block; + int passes = multipassBlock.getNumberOfPasses(); + block.setBlockBoundsForItemRender(); renderer.setRenderBoundsFromBlock(block); GL11.glTranslatef(-0.5f, -0.5f, -0.5f); MultipassBlockRenderer.rendering = true; - MultipassBlockRenderer.layer = 0; - while (MultipassBlockRenderer.layer < getPassesSafe(block)) { - renderItem(block, renderer, meta); - MultipassBlockRenderer.layer++; + try { + for (int pass = 0; pass < passes; ++pass) { + MultipassBlockRenderer.layer = pass; + renderItem(block, multipassBlock, renderer, meta); + } + } finally { + MultipassBlockRenderer.layer = 0; + MultipassBlockRenderer.rendering = false; } - MultipassBlockRenderer.layer = 0; - MultipassBlockRenderer.rendering = false; } @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - boolean r = true; + IMultipassBlock multipassBlock = (IMultipassBlock) block; + int passes = multipassBlock.getNumberOfPasses(); + boolean rendered = true; + MultipassBlockRenderer.rendering = true; - MultipassBlockRenderer.layer = 0; - while (MultipassBlockRenderer.layer < getPassesSafe(block)) { - try { - r = renderer.renderStandardBlock(block, x, y, z); - } catch (Throwable t) { - return false; + try { + for (int pass = 0; pass < passes; ++pass) { + MultipassBlockRenderer.layer = pass; + rendered = renderer.renderStandardBlock(block, x, y, z); } - MultipassBlockRenderer.layer++; + return rendered; + } finally { + MultipassBlockRenderer.layer = 0; + MultipassBlockRenderer.rendering = false; } - MultipassBlockRenderer.layer = 0; - MultipassBlockRenderer.rendering = false; - return r; } @Override @@ -98,8 +79,8 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler { return BinnieCore.multipassRenderID; } - public void renderItem(Block block, RenderBlocks renderer, int meta) { - setColor(getColorSafe(block, meta)); + private void renderItem(Block block, IMultipassBlock multipassBlock, RenderBlocks renderer, int meta) { + setColor(multipassBlock.colorMultiplier(meta)); Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.setNormal(0.0f, -1.0f, 0.0f);