From 7366d8d07ad7c9197227bc3634a59cb8c310bb16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sat, 11 Jul 2015 19:55:54 +0200 Subject: [PATCH] Some more adjustments for 1.8. --- ...NetSplitterSide.png => netSplitter_side.png} | Bin .../{NetSplitterTop.png => netSplitter_top.png} | Bin .../netSplitter_on.png} | Bin src/main/scala/li/cil/oc/client/Textures.scala | 3 ++- .../renderer/block/ModelInitialization.scala | 5 +++++ .../renderer/block/NetSplitterModel.scala | 9 ++++++++- .../tileentity/NetSplitterRenderer.scala | 16 +++++++++------- 7 files changed, 24 insertions(+), 9 deletions(-) rename src/main/resources/assets/opencomputers/textures/blocks/{NetSplitterSide.png => netSplitter_side.png} (100%) rename src/main/resources/assets/opencomputers/textures/blocks/{NetSplitterTop.png => netSplitter_top.png} (100%) rename src/main/resources/assets/opencomputers/textures/blocks/{NetSplitterOn.png => overlay/netSplitter_on.png} (100%) diff --git a/src/main/resources/assets/opencomputers/textures/blocks/NetSplitterSide.png b/src/main/resources/assets/opencomputers/textures/blocks/netSplitter_side.png similarity index 100% rename from src/main/resources/assets/opencomputers/textures/blocks/NetSplitterSide.png rename to src/main/resources/assets/opencomputers/textures/blocks/netSplitter_side.png diff --git a/src/main/resources/assets/opencomputers/textures/blocks/NetSplitterTop.png b/src/main/resources/assets/opencomputers/textures/blocks/netSplitter_top.png similarity index 100% rename from src/main/resources/assets/opencomputers/textures/blocks/NetSplitterTop.png rename to src/main/resources/assets/opencomputers/textures/blocks/netSplitter_top.png diff --git a/src/main/resources/assets/opencomputers/textures/blocks/NetSplitterOn.png b/src/main/resources/assets/opencomputers/textures/blocks/overlay/netSplitter_on.png similarity index 100% rename from src/main/resources/assets/opencomputers/textures/blocks/NetSplitterOn.png rename to src/main/resources/assets/opencomputers/textures/blocks/overlay/netSplitter_on.png diff --git a/src/main/scala/li/cil/oc/client/Textures.scala b/src/main/scala/li/cil/oc/client/Textures.scala index 24a1a5e6c..624df6b7e 100644 --- a/src/main/scala/li/cil/oc/client/Textures.scala +++ b/src/main/scala/li/cil/oc/client/Textures.scala @@ -144,7 +144,8 @@ object Textures { val Cable = L("cable") val CableCap = L("cableCap") val GenericTop = L("generic_top", load = false) - val NetSplitter = L("netSplitter") + val NetSplitterSide = L("netSplitter_side") + val NetSplitterTop = L("netSplitter_top") val RackFront = L("serverRack_front", load = false) val RackSide = L("serverRack_side", load = false) diff --git a/src/main/scala/li/cil/oc/client/renderer/block/ModelInitialization.scala b/src/main/scala/li/cil/oc/client/renderer/block/ModelInitialization.scala index 3766b7f99..463682427 100644 --- a/src/main/scala/li/cil/oc/client/renderer/block/ModelInitialization.scala +++ b/src/main/scala/li/cil/oc/client/renderer/block/ModelInitialization.scala @@ -29,6 +29,8 @@ import scala.collection.mutable object ModelInitialization { final val CableBlockLocation = new ModelResourceLocation(Settings.resourceDomain + ":" + Constants.BlockName.Cable, "normal") final val CableItemLocation = new ModelResourceLocation(Settings.resourceDomain + ":" + Constants.BlockName.Cable, "inventory") + final val NetSplitterBlockLocation = new ModelResourceLocation(Settings.resourceDomain + ":" + Constants.BlockName.NetSplitter, "normal") + final val NetSplitterItemLocation = new ModelResourceLocation(Settings.resourceDomain + ":" + Constants.BlockName.NetSplitter, "inventory") final val PrintBlockLocation = new ModelResourceLocation(Settings.resourceDomain + ":" + Constants.BlockName.Print, "normal") final val PrintItemLocation = new ModelResourceLocation(Settings.resourceDomain + ":" + Constants.BlockName.Print, "inventory") final val RobotBlockLocation = new ModelResourceLocation(Settings.resourceDomain + ":" + Constants.BlockName.Robot, "normal") @@ -45,6 +47,7 @@ object ModelInitialization { MinecraftForge.EVENT_BUS.register(this) registerModel(Constants.BlockName.Cable, CableBlockLocation, CableItemLocation) + registerModel(Constants.BlockName.NetSplitter, NetSplitterBlockLocation, NetSplitterItemLocation) registerModel(Constants.BlockName.Print, PrintBlockLocation, PrintItemLocation) registerModel(Constants.BlockName.Robot, RobotBlockLocation, RobotItemLocation) registerModel(Constants.BlockName.RobotAfterimage, RobotAfterimageBlockLocation, RobotAfterimageItemLocation) @@ -137,6 +140,8 @@ object ModelInitialization { registry.putObject(CableBlockLocation, CableModel) registry.putObject(CableItemLocation, CableModel) + registry.putObject(NetSplitterBlockLocation, NetSplitterModel) + registry.putObject(NetSplitterItemLocation, NetSplitterModel) registry.putObject(PrintBlockLocation, PrintModel) registry.putObject(PrintItemLocation, PrintModel) registry.putObject(RobotBlockLocation, RobotModel) diff --git a/src/main/scala/li/cil/oc/client/renderer/block/NetSplitterModel.scala b/src/main/scala/li/cil/oc/client/renderer/block/NetSplitterModel.scala index f6575df67..9a6d41ff9 100644 --- a/src/main/scala/li/cil/oc/client/renderer/block/NetSplitterModel.scala +++ b/src/main/scala/li/cil/oc/client/renderer/block/NetSplitterModel.scala @@ -23,7 +23,14 @@ object NetSplitterModel extends SmartBlockModelBase with ISmartItemModel { override def handleItemState(stack: ItemStack) = new ItemModel(stack) - protected def splitterTexture = Array.fill(6)(Textures.getSprite(Textures.Block.NetSplitter)) + protected def splitterTexture = Array( + Textures.getSprite(Textures.Block.NetSplitterTop), + Textures.getSprite(Textures.Block.NetSplitterTop), + Textures.getSprite(Textures.Block.NetSplitterSide), + Textures.getSprite(Textures.Block.NetSplitterSide), + Textures.getSprite(Textures.Block.NetSplitterSide), + Textures.getSprite(Textures.Block.NetSplitterSide) + ) protected final val BaseModel = { val faces = mutable.ArrayBuffer.empty[BakedQuad] diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/NetSplitterRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/NetSplitterRenderer.scala index 35e14b4dd..c09061dbf 100644 --- a/src/main/scala/li/cil/oc/client/renderer/tileentity/NetSplitterRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/NetSplitterRenderer.scala @@ -16,20 +16,22 @@ object NetSplitterRenderer extends TileEntitySpecialRenderer { val splitter = tileEntity.asInstanceOf[tileentity.NetSplitter] if (splitter.openSides.contains(!splitter.isInverted)) { - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS) - - RenderState.disableLighting() + RenderState.pushAttrib() + RenderState.disableEntityLighting() RenderState.makeItBlend() - GL11.glPushMatrix() + RenderState.pushMatrix() GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5) GL11.glScaled(1.0025, -1.0025, 1.0025) GL11.glTranslatef(-0.5f, -0.5f, -0.5f) bindTexture(TextureMap.locationBlocksTexture) + val t = Tessellator.getInstance val r = t.getWorldRenderer + + Textures.Block.bind() r.startDrawingQuads() val sideActivity = Textures.getSprite(Textures.Block.NetSplitterOn) @@ -78,10 +80,10 @@ object NetSplitterRenderer extends TileEntitySpecialRenderer { t.draw() - RenderState.enableLighting() + RenderState.enableEntityLighting() - GL11.glPopMatrix() - GL11.glPopAttrib() + RenderState.popMatrix() + RenderState.popAttrib() } RenderState.checkError(getClass.getName + ".renderTileEntityAt: leaving")