From fdc0171abe0e7ee86770c0ad3faac4be3f90b2d0 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 2 Jul 2015 00:01:26 -0400 Subject: [PATCH] Fix chisel using its own render pass variable --- .../com/cricketcraft/chisel/block/BlockMultiLayerBase.java | 5 ++--- .../chisel/client/render/RendererMultiLayer.java | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayerBase.java b/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayerBase.java index 2461dbc3..1ff637ef 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayerBase.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayerBase.java @@ -4,12 +4,12 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import net.minecraftforge.client.ForgeHooksClient; import com.cricketcraft.chisel.client.render.RendererMultiLayer; public abstract class BlockMultiLayerBase extends Block { - public int currentPass; public Block base; public IIcon icon; String iconFile; @@ -43,8 +43,7 @@ public abstract class BlockMultiLayerBase extends Block { @Override public boolean canRenderInPass(int pass) { - currentPass = pass; - + ForgeHooksClient.setRenderPass(pass); return pass == 1 || pass == 0; } diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java b/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java index 1bfba74d..1d059d5c 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java @@ -9,7 +9,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.world.IBlockAccess; - +import net.minecraftforge.client.MinecraftForgeClient; import static org.lwjgl.opengl.GL11.*; public class RendererMultiLayer implements ISimpleBlockRenderingHandler { @@ -52,7 +52,7 @@ public class RendererMultiLayer implements ISimpleBlockRenderingHandler { return false; BlockMultiLayerBase block = (BlockMultiLayerBase) blck; - if (block.currentPass == 0) { + if (MinecraftForgeClient.getRenderPass() == 0) { if (block.icon != null) { renderer.overrideBlockTexture = block.icon; renderer.renderStandardBlock(block, x, y, z);