From 794c3ca0304ed7c33555383c6cdd388392fa41a2 Mon Sep 17 00:00:00 2001 From: bombcar Date: Tue, 2 Jan 2024 13:07:44 -0600 Subject: [PATCH] fix the rest --- .../microblock/HollowMicroblock.scala | 6 +++--- .../scala/codechicken/microblock/ItemSaw.scala | 16 ++++++++-------- .../multipart/MultipartRenderer.scala | 12 +++++++----- .../codechicken/multipart/TCuboidPart.scala | 13 ++++++------- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/main/scala/codechicken/microblock/HollowMicroblock.scala b/src/main/scala/codechicken/microblock/HollowMicroblock.scala index e345d90..de24efc 100644 --- a/src/main/scala/codechicken/microblock/HollowMicroblock.scala +++ b/src/main/scala/codechicken/microblock/HollowMicroblock.scala @@ -76,9 +76,9 @@ trait HollowMicroblockClient val state = CCRenderState.instance state.reset() state.setPipeline( - new Translation(x, y, z), - new IconTransformation(renderBlocks.overrideBlockTexture) - ) + new Translation(x, y, z), + new IconTransformation(renderBlocks.overrideBlockTexture) + ) renderHollow( null, 0, diff --git a/src/main/scala/codechicken/microblock/ItemSaw.scala b/src/main/scala/codechicken/microblock/ItemSaw.scala index 795ae25..7557ba8 100644 --- a/src/main/scala/codechicken/microblock/ItemSaw.scala +++ b/src/main/scala/codechicken/microblock/ItemSaw.scala @@ -112,17 +112,17 @@ object ItemSawRenderer extends IItemRenderer { ) case _ => return } - // TODO: update to use a thread local copy - CCRenderState.instance().reset() - CCRenderState.instance().useNormals = true - CCRenderState.instance().pullLightmap() + val state = CCRenderState.instance + state.reset() + state.useNormals = true + state.pullLightmap() CCRenderState.changeTexture("microblock:textures/items/saw.png") - CCRenderState.instance().startDrawing() + state.startDrawing() handle.render(t) holder.render(t) - CCRenderState.instance().draw() + state.draw() GL11.glDisable(GL11.GL_CULL_FACE) - CCRenderState.instance().startDrawing() + state.startDrawing() blade.render( t, new UVTranslation( @@ -130,7 +130,7 @@ object ItemSawRenderer extends IItemRenderer { (item.getItem.asInstanceOf[Saw].getCuttingStrength(item) - 1) * 4 / 64d ) ) - CCRenderState.instance().draw() + state.draw() GL11.glEnable(GL11.GL_CULL_FACE) } } diff --git a/src/main/scala/codechicken/multipart/MultipartRenderer.scala b/src/main/scala/codechicken/multipart/MultipartRenderer.scala index e99f110..b3d4e89 100644 --- a/src/main/scala/codechicken/multipart/MultipartRenderer.scala +++ b/src/main/scala/codechicken/multipart/MultipartRenderer.scala @@ -36,9 +36,10 @@ object MultipartRenderer if (tmpart.partList.isEmpty) return - CCRenderState.instance().reset() - CCRenderState.instance().pullLightmap() - CCRenderState.instance().useNormals = true + val state = CCRenderState.instance + state.reset() + state.pullLightmap() + state.useNormals = true val pos = new Vector3(x, y, z) tmpart.renderDynamic(pos, f, pass) @@ -81,8 +82,9 @@ object MultipartRenderer return false } - CCRenderState.instance().reset() - CCRenderState.instance().lightMatrix.locate(world, x, y, z) + val state = CCRenderState.instance + state.reset() + state.lightMatrix.locate(world, x, y, z) return tmpart.renderStatic(new Vector3(x, y, z), pass) } diff --git a/src/main/scala/codechicken/multipart/TCuboidPart.scala b/src/main/scala/codechicken/multipart/TCuboidPart.scala index 2bf44d5..349faac 100644 --- a/src/main/scala/codechicken/multipart/TCuboidPart.scala +++ b/src/main/scala/codechicken/multipart/TCuboidPart.scala @@ -31,13 +31,12 @@ trait TCuboidPart extends TMultiPart { @SideOnly(Side.CLIENT) override def drawBreaking(renderBlocks: RenderBlocks) { - CCRenderState.instance().reset() - CCRenderState - .instance() - .setPipeline( - new Translation(x, y, z), - new IconTransformation(renderBlocks.overrideBlockTexture) - ) + val state = CCRenderState.instance + state.reset() + state.setPipeline( + new Translation(x, y, z), + new IconTransformation(renderBlocks.overrideBlockTexture) + ) BlockRenderer.renderCuboid(getBounds, 0) } }