diff --git a/li/cil/oc/client/ComputerRenderer.scala b/li/cil/oc/client/ComputerRenderer.scala index 4be7afcfc..bee4f4e7e 100644 --- a/li/cil/oc/client/ComputerRenderer.scala +++ b/li/cil/oc/client/ComputerRenderer.scala @@ -36,7 +36,7 @@ object ComputerRenderer extends TileEntitySpecialRenderer { GL11.glTranslatef(-0.5f, 0.5f, 0.501f) GL11.glScalef(1, -1, 1) - setTexture(frontOn) + bindTexture(frontOn) val t = Tessellator.instance t.startDrawingQuads() t.addVertexWithUV(0, 1, 0, 0, 1) @@ -49,6 +49,4 @@ object ComputerRenderer extends TileEntitySpecialRenderer { GL11.glPopAttrib() } } - - private def setTexture(resource: ResourceLocation) = bindTexture(resource) } \ No newline at end of file diff --git a/li/cil/oc/client/gui/Computer.scala b/li/cil/oc/client/gui/Computer.scala index 87a932198..fe6c09750 100644 --- a/li/cil/oc/client/gui/Computer.scala +++ b/li/cil/oc/client/gui/Computer.scala @@ -46,7 +46,7 @@ class Computer(inventory: InventoryPlayer, val tileEntity: tileentity.Computer) override def drawGuiContainerBackgroundLayer(dt: Float, mouseX: Int, mouseY: Int) = { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F) - setTexture(background) + mc.renderEngine.bindTexture(background) drawTexturedModalRect(x, y, 0, 0, xSize, ySize) } @@ -59,7 +59,7 @@ class Computer(inventory: InventoryPlayer, val tileEntity: tileentity.Computer) GL11.glEnable(GL11.GL_BLEND) GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA) GL11.glColor4f(1, 1, 1, 0.25f) - setTexture(icon) + mc.renderEngine.bindTexture(icon) val t = Tessellator.instance t.startDrawingQuads() t.addVertexWithUV(slot.xDisplayPosition, slot.yDisplayPosition + 16, zLevel, 0, 1) @@ -69,7 +69,4 @@ class Computer(inventory: InventoryPlayer, val tileEntity: tileentity.Computer) t.draw() GL11.glPopAttrib() } - - private def setTexture(value: ResourceLocation) = - mc.renderEngine.bindTexture(value) } \ No newline at end of file diff --git a/li/cil/oc/client/gui/Screen.scala b/li/cil/oc/client/gui/Screen.scala index d2a3018d1..0eb9f1820 100644 --- a/li/cil/oc/client/gui/Screen.scala +++ b/li/cil/oc/client/gui/Screen.scala @@ -128,7 +128,7 @@ object Screen { GL11.glNewList(displayLists.get, GL11.GL_COMPILE) - setTexture(borders) + textureManager.get.bindTexture(borders) // Top border (left corner, middle bar, right corner). drawBorder( @@ -189,7 +189,4 @@ object Screen { t.addVertexWithUV(x, y, 0, u1d, v1d) t.draw() } - - private def setTexture(value: ResourceLocation) = - textureManager.get.bindTexture(value) } \ No newline at end of file