diff --git a/src/main/scala/codechicken/multipart/BlockMultipart.scala b/src/main/scala/codechicken/multipart/BlockMultipart.scala index d4bd3b8..317ac77 100644 --- a/src/main/scala/codechicken/multipart/BlockMultipart.scala +++ b/src/main/scala/codechicken/multipart/BlockMultipart.scala @@ -257,10 +257,7 @@ class BlockMultipart extends Block(new Material(MapColor.stoneColor)) { override def getRenderBlockPass = 1 - override def canRenderInPass(pass: Int): Boolean = { - MultipartRenderer.pass = pass - return true - } + override def canRenderInPass(pass: Int): Boolean = true override def getPickBlock( hit: MovingObjectPosition, diff --git a/src/main/scala/codechicken/multipart/MultipartRenderer.scala b/src/main/scala/codechicken/multipart/MultipartRenderer.scala index eabfa07..53865ce 100644 --- a/src/main/scala/codechicken/multipart/MultipartRenderer.scala +++ b/src/main/scala/codechicken/multipart/MultipartRenderer.scala @@ -10,6 +10,8 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer import net.minecraft.tileentity.TileEntity import net.minecraft.world.IBlockAccess import net.minecraft.client.Minecraft +import net.minecraftforge.client.ForgeHooksClient +import net.minecraftforge.client.MinecraftForgeClient import cpw.mods.fml.relauncher.SideOnly import cpw.mods.fml.relauncher.Side import codechicken.lib.raytracer.ExtendedMOP @@ -23,7 +25,6 @@ object MultipartRenderer extends TileEntitySpecialRenderer with ISimpleBlockRenderingHandler { TileMultipart.renderID = RenderingRegistry.getNextAvailableRenderId - var pass: Int = 0 override def renderTileEntityAt( t: TileEntity, @@ -42,7 +43,7 @@ object MultipartRenderer state.useNormals = true val pos = new Vector3(x, y, z) - tmpart.renderDynamic(pos, f, pass) + tmpart.renderDynamic(pos, f, MinecraftForgeClient.getRenderPass) } override def getRenderId = TileMultipart.renderID @@ -85,7 +86,10 @@ object MultipartRenderer val state = CCRenderState.instance state.resetInstance() state.lightMatrix.locate(world, x, y, z) - val b = tmpart.renderStatic(new Vector3(x, y, z), pass) + val b = tmpart.renderStatic( + new Vector3(x, y, z), + ForgeHooksClient.getWorldRenderPass + ) state.lightMatrix.access = null b } diff --git a/src/main/scala/codechicken/multipart/TileMultipart.scala b/src/main/scala/codechicken/multipart/TileMultipart.scala index 615eeb4..379eaa8 100644 --- a/src/main/scala/codechicken/multipart/TileMultipart.scala +++ b/src/main/scala/codechicken/multipart/TileMultipart.scala @@ -562,7 +562,6 @@ trait TileMultipartClient extends TileMultipart { def randomDisplayTick(random: Random) {} override def shouldRenderInPass(pass: Int) = { - MultipartRenderer.pass = pass if (staticCache == null) updateRenderCache() hasDynamicParts }