From a020e11849eb8122c8ea1d4543d222d4930f6d74 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Sun, 9 Feb 2014 16:53:11 -0600 Subject: [PATCH] Fixed Channels for Real. --- parts/networking/PartCable.java | 7 +++---- parts/networking/PartCableSmart.java | 8 ++++---- parts/networking/PartDenseCable.java | 8 ++++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/parts/networking/PartCable.java b/parts/networking/PartCable.java index 099e770a..3d33b34a 100644 --- a/parts/networking/PartCable.java +++ b/parts/networking/PartCable.java @@ -566,7 +566,7 @@ public class PartCable extends AEBasePart implements IPartCable ico.setFlip( false, true ); } - Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); + Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant ); rh.setTexture( defa, defa, defa, defa, defa, defa ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer ); @@ -635,7 +635,7 @@ public class PartCable extends AEBasePart implements IPartCable ico.setFlip( false, true ); } - Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); + Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); Tessellator.instance.setColorOpaque_I( myColor.mediumVariant ); rh.setTexture( defa, defa, defa, defa, defa, defa ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer ); @@ -689,7 +689,7 @@ public class PartCable extends AEBasePart implements IPartCable IIcon defa = new TaughtIcon( getChannelTex( channels, false ).getIcon(), -0.2f ); IIcon defb = new TaughtIcon( getChannelTex( channels, true ).getIcon(), -0.2f ); - Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); + Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); Tessellator.instance.setColorOpaque_I( myColor.mediumVariant ); rh.setTexture( defa, defa, defa, defa, defa, defa ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer ); @@ -740,7 +740,6 @@ public class PartCable extends AEBasePart implements IPartCable @SideOnly(Side.CLIENT) protected void renderAllFaces(AEBaseBlock blk, int x, int y, int z, RenderBlocks renderer) { - renderer.enableAO = true; renderer.renderFaceXNeg( blk, x, y, z, blk.getRendererInstance().getTexture( ForgeDirection.WEST ) ); renderer.renderFaceXPos( blk, x, y, z, blk.getRendererInstance().getTexture( ForgeDirection.EAST ) ); renderer.renderFaceZNeg( blk, x, y, z, blk.getRendererInstance().getTexture( ForgeDirection.NORTH ) ); diff --git a/parts/networking/PartCableSmart.java b/parts/networking/PartCableSmart.java index 5a7702da..9df1bd1f 100644 --- a/parts/networking/PartCableSmart.java +++ b/parts/networking/PartCableSmart.java @@ -183,7 +183,7 @@ public class PartCableSmart extends PartCable ico.setFlip( false, true ); } - Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); + Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant ); rh.setTexture( defa, defa, defa, defa, defa, defa ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer ); @@ -242,7 +242,7 @@ public class PartCableSmart extends PartCable renderer.uvRotateSouth = 3; renderer.uvRotateEast = 3; - Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); + Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant ); rh.setTexture( defa, defa, offa, offa, offa, offa ); @@ -269,7 +269,7 @@ public class PartCableSmart extends PartCable renderer.setRenderBounds( 0, 5 / 16.0, 5 / 16.0, 16 / 16.0, 11 / 16.0, 11 / 16.0 ); renderer.renderStandardBlock( rh.getBlock(), x, y, z ); - Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); + Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant ); rh.setTexture( offa, offa, offa, offa, defa, defa ); @@ -290,7 +290,7 @@ public class PartCableSmart extends PartCable renderer.setRenderBounds( 5 / 16.0, 5 / 16.0, 0, 11 / 16.0, 11 / 16.0, 16 / 16.0 ); renderer.renderStandardBlock( rh.getBlock(), x, y, z ); - Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); + Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant ); rh.setTexture( offa, offa, defa, defa, offa, offa ); diff --git a/parts/networking/PartDenseCable.java b/parts/networking/PartDenseCable.java index d6897faa..86212e2a 100644 --- a/parts/networking/PartDenseCable.java +++ b/parts/networking/PartDenseCable.java @@ -269,7 +269,7 @@ public class PartDenseCable extends PartCable IIcon defa = new TaughtIcon( getChannelTex( channels, false ).getIcon(), -0.2f ); IIcon defb = new TaughtIcon( getChannelTex( channels, true ).getIcon(), -0.2f ); - Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); + Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); Tessellator.instance.setColorOpaque_I( myColor.mediumVariant ); rh.setTexture( defa, defa, defa, defa, defa, defa ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer ); @@ -345,7 +345,7 @@ public class PartDenseCable extends PartCable renderer.uvRotateSouth = 3; renderer.uvRotateEast = 3; - Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); + Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant ); rh.setTexture( defa, defa, offa, offa, offa, offa ); @@ -372,7 +372,7 @@ public class PartDenseCable extends PartCable renderer.setRenderBounds( 0, 3 / 16.0, 3 / 16.0, 16 / 16.0, 13 / 16.0, 13 / 16.0 ); renderer.renderStandardBlock( rh.getBlock(), x, y, z ); - Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); + Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant ); rh.setTexture( offa, offa, offa, offa, defa, defa ); @@ -393,7 +393,7 @@ public class PartDenseCable extends PartCable renderer.setRenderBounds( 3 / 16.0, 3 / 16.0, 0, 13 / 16.0, 13 / 16.0, 16 / 16.0 ); renderer.renderStandardBlock( rh.getBlock(), x, y, z ); - Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); + Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant ); rh.setTexture( offa, offa, defa, defa, offa, offa );