diff --git a/src/main/scala/codechicken/microblock/HollowMicroblock.scala b/src/main/scala/codechicken/microblock/HollowMicroblock.scala index de24efc..716bd94 100644 --- a/src/main/scala/codechicken/microblock/HollowMicroblock.scala +++ b/src/main/scala/codechicken/microblock/HollowMicroblock.scala @@ -74,8 +74,8 @@ trait HollowMicroblockClient override def drawBreaking(renderBlocks: RenderBlocks) { val state = CCRenderState.instance - state.reset() - state.setPipeline( + state.resetInstance() + state.setPipelineInstance( new Translation(x, y, z), new IconTransformation(renderBlocks.overrideBlockTexture) ) diff --git a/src/main/scala/codechicken/microblock/ItemMicroPart.scala b/src/main/scala/codechicken/microblock/ItemMicroPart.scala index 147835a..012cc31 100644 --- a/src/main/scala/codechicken/microblock/ItemMicroPart.scala +++ b/src/main/scala/codechicken/microblock/ItemMicroPart.scala @@ -172,15 +172,15 @@ object ItemMicroPartRenderer extends IItemRenderer { GL11.glTranslatef(-0.5f, -0.5f, -0.5f) TextureUtils.bindAtlas(0) val state = CCRenderState.instance - state.reset() + state.resetInstance() state.useNormals = true - state.pullLightmap() - state.startDrawing() + state.pullLightmapInstance() + state.startDrawingInstance() val part = mcrClass.create(true, getMaterialID(item)).asInstanceOf[MicroblockClient] part.setShape(size, mcrClass.itemSlot) part.render(new Vector3(0.5, 0.5, 0.5).subtract(part.getBounds.center), -1) - state.draw() + state.drawInstance() GL11.glPopMatrix() } diff --git a/src/main/scala/codechicken/microblock/ItemSaw.scala b/src/main/scala/codechicken/microblock/ItemSaw.scala index 7557ba8..fa5af8e 100644 --- a/src/main/scala/codechicken/microblock/ItemSaw.scala +++ b/src/main/scala/codechicken/microblock/ItemSaw.scala @@ -113,16 +113,16 @@ object ItemSawRenderer extends IItemRenderer { case _ => return } val state = CCRenderState.instance - state.reset() + state.resetInstance() state.useNormals = true - state.pullLightmap() + state.pullLightmapInstance() CCRenderState.changeTexture("microblock:textures/items/saw.png") - state.startDrawing() + state.startDrawingInstance() handle.render(t) holder.render(t) - state.draw() + state.drawInstance() GL11.glDisable(GL11.GL_CULL_FACE) - state.startDrawing() + state.startDrawingInstance() blade.render( t, new UVTranslation( @@ -130,7 +130,7 @@ object ItemSawRenderer extends IItemRenderer { (item.getItem.asInstanceOf[Saw].getCuttingStrength(item) - 1) * 4 / 64d ) ) - state.draw() + state.drawInstance() GL11.glEnable(GL11.GL_CULL_FACE) } } diff --git a/src/main/scala/codechicken/microblock/MicroblockRender.scala b/src/main/scala/codechicken/microblock/MicroblockRender.scala index 51803f4..e9df131 100644 --- a/src/main/scala/codechicken/microblock/MicroblockRender.scala +++ b/src/main/scala/codechicken/microblock/MicroblockRender.scala @@ -44,12 +44,12 @@ object MicroblockRender { glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA) // TODO: update to use a thread local copy TextureUtils.bindAtlas(0) - state.reset() + state.resetInstance() state.alphaOverride = 80 state.useNormals = true - state.startDrawing() + state.startDrawingInstance() part.render(Vector3.zero, -1) - state.draw() + state.drawInstance() glDisable(GL_BLEND) glDepthMask(true) @@ -67,7 +67,7 @@ object MicroblockRender { faces: Int ) { val localFace = face.get() - CCRenderState.instance().setModel(localFace) + CCRenderState.instance().setModelInstance(localFace) for (s <- 0 until 6 if (faces & 1 << s) == 0) { localFace.loadCuboidFace(c, s) mat.renderMicroFace(pos, pass, c) diff --git a/src/main/scala/codechicken/multipart/MultipartRenderer.scala b/src/main/scala/codechicken/multipart/MultipartRenderer.scala index b3d4e89..fd07bd7 100644 --- a/src/main/scala/codechicken/multipart/MultipartRenderer.scala +++ b/src/main/scala/codechicken/multipart/MultipartRenderer.scala @@ -37,8 +37,8 @@ object MultipartRenderer return val state = CCRenderState.instance - state.reset() - state.pullLightmap() + state.resetInstance() + state.pullLightmapInstance() state.useNormals = true val pos = new Vector3(x, y, z) @@ -83,7 +83,7 @@ object MultipartRenderer } val state = CCRenderState.instance - state.reset() + state.resetInstance() 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 349faac..4b2fafa 100644 --- a/src/main/scala/codechicken/multipart/TCuboidPart.scala +++ b/src/main/scala/codechicken/multipart/TCuboidPart.scala @@ -32,8 +32,8 @@ trait TCuboidPart extends TMultiPart { @SideOnly(Side.CLIENT) override def drawBreaking(renderBlocks: RenderBlocks) { val state = CCRenderState.instance - state.reset() - state.setPipeline( + state.resetInstance() + state.setPipelineInstance( new Translation(x, y, z), new IconTransformation(renderBlocks.overrideBlockTexture) )