From 1b328f134880aeced5cc0cce5f1c3496d6249686 Mon Sep 17 00:00:00 2001 From: Cricket Date: Tue, 23 Jun 2015 10:54:15 -0400 Subject: [PATCH] Fixes #341 --- .../client/render/RendererLayeredGlow.java | 25 +------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererLayeredGlow.java b/src/main/java/com/cricketcraft/chisel/client/render/RendererLayeredGlow.java index 63617417..59e5c32e 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererLayeredGlow.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/RendererLayeredGlow.java @@ -12,7 +12,6 @@ import com.cricketcraft.chisel.block.BlockCarvableGlow; import com.cricketcraft.chisel.config.Configurations; import com.cricketcraft.chisel.utils.GeneralClient; import com.cricketcraft.ctmlib.Drawing; -import com.cricketcraft.ctmlib.RenderBlocksCTM; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -39,32 +38,10 @@ public class RendererLayeredGlow implements ISimpleBlockRenderingHandler { public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { Tessellator.instance.setColorOpaque_I(Configurations.configColors[world.getBlockMetadata(x, y, z)]); Tessellator.instance.setBrightness(0xF000F0); - BlockCarvableGlow glow = (BlockCarvableGlow) block; - if(glow.hasSubmapManager()){ - renderer.overrideBlockTexture = glow.getGlowTexture(); - getContext(renderer, glow, world).renderBlockAllFaces(glow, x, y, z); - } else { - Drawing.renderAllFaces(renderer, block, x, y, z, ((BlockCarvableGlow) block).getGlowTexture()); - } + Drawing.renderAllFaces(renderer, block, x, y, z, ((BlockCarvableGlow) block).getGlowTexture()); renderer.renderStandardBlock(block, x, y, z); return true; } - - private RenderBlocks getContext(RenderBlocks rendererOld, BlockCarvableGlow block, IBlockAccess world) { - if (!rendererOld.hasOverrideBlockTexture() && block != null) { - RenderBlocks rb = block.getSubmapManager().createRenderContext(rendererOld, block, world); - if (rb != null && rb != rendererOld) { - rb.blockAccess = world; - if (rb instanceof RenderBlocksCTM) { - RenderBlocksCTM rbctm = (RenderBlocksCTM) rb; - rbctm.manager = rbctm.manager == null ? block.getSubmapManager() : rbctm.manager; - rbctm.rendererOld = rbctm.rendererOld == null ? rendererOld : rbctm.rendererOld; - } - return rb; - } - } - return rendererOld; - } @Override public boolean shouldRender3DInInventory(int modelId) {