From 46baf9ea60bc0ec09e19ffd4530e9ed2f91daa21 Mon Sep 17 00:00:00 2001 From: brad-c Date: Thu, 5 Sep 2013 21:59:43 +0800 Subject: [PATCH] Issue 24: Fused Quartz doesn't have breaking particles. --- .../enderio/material/BlockFusedQuartz.java | 12 +++++++++--- .../enderio/material/FusedQuartzRenderer.java | 9 +++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/common/crazypants/enderio/material/BlockFusedQuartz.java b/common/crazypants/enderio/material/BlockFusedQuartz.java index 56b42094..dc6b8720 100644 --- a/common/crazypants/enderio/material/BlockFusedQuartz.java +++ b/common/crazypants/enderio/material/BlockFusedQuartz.java @@ -29,7 +29,8 @@ public class BlockFusedQuartz extends Block implements ITileEntityProvider { return result; } - Icon itemIcon; + //Icon itemIcon; + Icon realBlockIcon; private BlockFusedQuartz() { super(ModObject.blockFusedQuartz.id, Material.glass); @@ -84,8 +85,13 @@ public class BlockFusedQuartz extends Block implements ITileEntityProvider { @Override public void registerIcons(IconRegister iconRegister) { - blockIcon = iconRegister.registerIcon("enderio:fusedQuartz"); - itemIcon = iconRegister.registerIcon("enderio:fusedQuartzItem"); +// blockIcon = iconRegister.registerIcon("enderio:fusedQuartz"); +// itemIcon = iconRegister.registerIcon("enderio:fusedQuartzItem"); + + //This little oddity is so the standard rendering used for items and breaking effects + //uses the item texture, while the custom renderer uses 'realBlockIcon' to render the 'non-frame' part of the block. + realBlockIcon = iconRegister.registerIcon("enderio:fusedQuartz"); + blockIcon = iconRegister.registerIcon("enderio:fusedQuartzItem"); } @Override diff --git a/common/crazypants/enderio/material/FusedQuartzRenderer.java b/common/crazypants/enderio/material/FusedQuartzRenderer.java index 71268088..359956e6 100644 --- a/common/crazypants/enderio/material/FusedQuartzRenderer.java +++ b/common/crazypants/enderio/material/FusedQuartzRenderer.java @@ -38,8 +38,8 @@ public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler { static int renderPass; @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - renderer.setOverrideBlockTexture(EnderIO.blockFusedQuartz.itemIcon); + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + renderer.setOverrideBlockTexture(EnderIO.blockFusedQuartz.getIcon(0, 0)); renderer.renderBlockAsItem(Block.glass, 0, 1); renderer.clearOverrideBlockTexture(); } @@ -65,8 +65,9 @@ public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler { } renderFrame(blockAccess, x, y, z, tecb, false); } else { - + renderer.setOverrideBlockTexture(EnderIO.blockFusedQuartz.realBlockIcon); renderer.renderStandardBlock(block, x, y, z); + renderer.clearOverrideBlockTexture(); } return true; } @@ -82,7 +83,7 @@ public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler { } private void renderFrame(IBlockAccess blockAccess, int x, int y, int z, TileEntityCustomBlock tecb, boolean forceAllEdges) { - Icon texture = EnderIO.blockFusedQuartz.itemIcon; + Icon texture = EnderIO.blockFusedQuartz.getIcon(0, 0); for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { if (tecb != null && tecb.getSourceBlockId() > 0) { texture = tecb.getSourceBlock().getIcon(face.ordinal(), tecb.getSourceBlockMetadata());