From 61d79900dbd01c03e13a4dff4158ab57230d11b5 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Tue, 11 Feb 2014 20:31:08 -0600 Subject: [PATCH] Adjusted ItemStack render for all cables. --- parts/networking/PartCableCovered.java | 28 +++++++++++++-- parts/networking/PartCableSmart.java | 47 +++++++++++++++++++++----- parts/networking/PartDenseCable.java | 45 +++++++++++++++++++----- 3 files changed, 100 insertions(+), 20 deletions(-) diff --git a/parts/networking/PartCableCovered.java b/parts/networking/PartCableCovered.java index ddc8461b..07ff61f7 100644 --- a/parts/networking/PartCableCovered.java +++ b/parts/networking/PartCableCovered.java @@ -104,9 +104,33 @@ public class PartCableCovered extends PartCable { GL11.glTranslated( -0.2, -0.3, 0.0 ); - rh.setTexture( getTexture( getCableColor() ) ); rh.setBounds( 5.0f, 5.0f, 2.0f, 11.0f, 11.0f, 14.0f ); - rh.renderInventoryBox( renderer ); + float offu = 0; + float offv = 9; + + OffsetIcon main = new OffsetIcon( getTexture( getCableColor() ), offu, offv ); + + for (ForgeDirection side : EnumSet.of( ForgeDirection.UP, ForgeDirection.DOWN )) + { + rh.renderInventoryFace( main, side, renderer ); + } + + offu = 9; + offv = 0; + main = new OffsetIcon( getTexture( getCableColor() ), offu, offv ); + + for (ForgeDirection side : EnumSet.of( ForgeDirection.EAST, ForgeDirection.WEST )) + { + rh.renderInventoryFace( main, side, renderer ); + } + + main = new OffsetIcon( getTexture( getCableColor() ), 0, 0 ); + + for (ForgeDirection side : EnumSet.of( ForgeDirection.SOUTH, ForgeDirection.NORTH )) + { + rh.renderInventoryFace( main, side, renderer ); + } + rh.setTexture( null ); } diff --git a/parts/networking/PartCableSmart.java b/parts/networking/PartCableSmart.java index 9df1bd1f..b417cf09 100644 --- a/parts/networking/PartCableSmart.java +++ b/parts/networking/PartCableSmart.java @@ -66,17 +66,46 @@ public class PartCableSmart extends PartCable { GL11.glTranslated( -0.2, -0.3, 0.0 ); - rh.setTexture( getTexture( getCableColor() ) ); - rh.setBounds( 5.0f, 5.0f, 2.0f, 11.0f, 11.0f, 14.0f ); - rh.renderInventoryBox( renderer ); + float offu = 0; + float offv = 9; - rh.setTexture( getChannelTex( 4, false ).getIcon() ); - rh.setBounds( 5.0f, 5.0f, 2.0f, 11.0f, 11.0f, 14.0f ); - rh.renderInventoryBox( renderer ); + OffsetIcon main = new OffsetIcon( getTexture( getCableColor() ), offu, offv ); + OffsetIcon ch1 = new OffsetIcon( getChannelTex( 4, false ).getIcon(), offu, offv ); + OffsetIcon ch2 = new OffsetIcon( getChannelTex( 4, true ).getIcon(), offu, offv ); - rh.setTexture( getChannelTex( 4, true ).getIcon() ); - rh.setBounds( 5.0f, 5.0f, 2.0f, 11.0f, 11.0f, 14.0f ); - rh.renderInventoryBox( renderer ); + for (ForgeDirection side : EnumSet.of( ForgeDirection.UP, ForgeDirection.DOWN )) + { + rh.setBounds( 5.0f, 5.0f, 2.0f, 11.0f, 11.0f, 14.0f ); + rh.renderInventoryFace( main, side, renderer ); + rh.renderInventoryFace( ch1, side, renderer ); + rh.renderInventoryFace( ch2, side, renderer ); + } + + offu = 9; + offv = 0; + main = new OffsetIcon( getTexture( getCableColor() ), offu, offv ); + ch1 = new OffsetIcon( getChannelTex( 4, false ).getIcon(), offu, offv ); + ch2 = new OffsetIcon( getChannelTex( 4, true ).getIcon(), offu, offv ); + + for (ForgeDirection side : EnumSet.of( ForgeDirection.EAST, ForgeDirection.WEST )) + { + rh.setBounds( 5.0f, 5.0f, 2.0f, 11.0f, 11.0f, 14.0f ); + rh.renderInventoryFace( main, side, renderer ); + rh.renderInventoryFace( ch1, side, renderer ); + rh.renderInventoryFace( ch2, side, renderer ); + } + + main = new OffsetIcon( getTexture( getCableColor() ), 0, 0 ); + ch1 = new OffsetIcon( getChannelTex( 4, false ).getIcon(), 0, 0 ); + ch2 = new OffsetIcon( getChannelTex( 4, true ).getIcon(), 0, 0 ); + + for (ForgeDirection side : EnumSet.of( ForgeDirection.SOUTH, ForgeDirection.NORTH )) + { + rh.setBounds( 5.0f, 5.0f, 2.0f, 11.0f, 11.0f, 14.0f ); + rh.renderInventoryFace( main, side, renderer ); + rh.renderInventoryFace( ch1, side, renderer ); + rh.renderInventoryFace( ch2, side, renderer ); + } rh.setTexture( null ); } diff --git a/parts/networking/PartDenseCable.java b/parts/networking/PartDenseCable.java index 8d09bd53..df845638 100644 --- a/parts/networking/PartDenseCable.java +++ b/parts/networking/PartDenseCable.java @@ -79,18 +79,45 @@ public class PartDenseCable extends PartCable public void renderInventory(IPartRenderHelper rh, RenderBlocks renderer) { GL11.glTranslated( -0.2, -0.3, 0.0 ); + rh.setBounds( 4.0f, 4.0f, 2.0f, 12.0f, 12.0f, 14.0f ); - rh.setTexture( getTexture( getCableColor() ) ); - rh.setBounds( 2.0f, 2.0f, 2.0f, 13.0f, 13.0f, 14.0f ); - rh.renderInventoryBox( renderer ); + float offu = 0; + float offv = 9; - rh.setTexture( getChannelTex( 4, false ).getIcon() ); - rh.setBounds( 2.0f, 2.0f, 2.0f, 13.0f, 13.0f, 14.0f ); - rh.renderInventoryBox( renderer ); + OffsetIcon main = new OffsetIcon( getTexture( getCableColor() ), offu, offv ); + OffsetIcon ch1 = new OffsetIcon( getChannelTex( 4, false ).getIcon(), offu, offv ); + OffsetIcon ch2 = new OffsetIcon( getChannelTex( 4, true ).getIcon(), offu, offv ); - rh.setTexture( getChannelTex( 4, true ).getIcon() ); - rh.setBounds( 2.0f, 2.0f, 2.0f, 13.0f, 13.0f, 14.0f ); - rh.renderInventoryBox( renderer ); + for (ForgeDirection side : EnumSet.of( ForgeDirection.UP, ForgeDirection.DOWN )) + { + rh.renderInventoryFace( main, side, renderer ); + rh.renderInventoryFace( ch1, side, renderer ); + rh.renderInventoryFace( ch2, side, renderer ); + } + + offu = 9; + offv = 0; + main = new OffsetIcon( getTexture( getCableColor() ), offu, offv ); + ch1 = new OffsetIcon( getChannelTex( 4, false ).getIcon(), offu, offv ); + ch2 = new OffsetIcon( getChannelTex( 4, true ).getIcon(), offu, offv ); + + for (ForgeDirection side : EnumSet.of( ForgeDirection.EAST, ForgeDirection.WEST )) + { + rh.renderInventoryFace( main, side, renderer ); + rh.renderInventoryFace( ch1, side, renderer ); + rh.renderInventoryFace( ch2, side, renderer ); + } + + main = new OffsetIcon( getTexture( getCableColor() ), 0, 0 ); + ch1 = new OffsetIcon( getChannelTex( 4, false ).getIcon(), 0, 0 ); + ch2 = new OffsetIcon( getChannelTex( 4, true ).getIcon(), 0, 0 ); + + for (ForgeDirection side : EnumSet.of( ForgeDirection.SOUTH, ForgeDirection.NORTH )) + { + rh.renderInventoryFace( main, side, renderer ); + rh.renderInventoryFace( ch1, side, renderer ); + rh.renderInventoryFace( ch2, side, renderer ); + } rh.setTexture( null ); }