tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixed Channels for Real.

Browse source
This commit is contained in:
AlgorithmX2 2014-02-09 16:53:11 -06:00
parent 9dd497fde4
commit a020e11849
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
parts/networking/PartCable.java
View file

@ -566,7 +566,7 @@ public class PartCable extends AEBasePart implements IPartCable
ico.setFlip( false, true ); ico.setFlip( false, true );
} }
Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 );
Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant );
rh.setTexture( defa, defa, defa, defa, defa, defa ); rh.setTexture( defa, defa, defa, defa, defa, defa );
renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer );
@ -635,7 +635,7 @@ public class PartCable extends AEBasePart implements IPartCable
ico.setFlip( false, true ); ico.setFlip( false, true );
} }
Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 );
Tessellator.instance.setColorOpaque_I( myColor.mediumVariant ); Tessellator.instance.setColorOpaque_I( myColor.mediumVariant );
rh.setTexture( defa, defa, defa, defa, defa, defa ); rh.setTexture( defa, defa, defa, defa, defa, defa );
renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer ); 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 defa = new TaughtIcon( getChannelTex( channels, false ).getIcon(), -0.2f );
IIcon defb = new TaughtIcon( getChannelTex( channels, true ).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 ); Tessellator.instance.setColorOpaque_I( myColor.mediumVariant );
rh.setTexture( defa, defa, defa, defa, defa, defa ); rh.setTexture( defa, defa, defa, defa, defa, defa );
renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer );
@ -740,7 +740,6 @@ public class PartCable extends AEBasePart implements IPartCable
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
protected void renderAllFaces(AEBaseBlock blk, int x, int y, int z, RenderBlocks renderer) 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.renderFaceXNeg( blk, x, y, z, blk.getRendererInstance().getTexture( ForgeDirection.WEST ) );
renderer.renderFaceXPos( blk, x, y, z, blk.getRendererInstance().getTexture( ForgeDirection.EAST ) ); renderer.renderFaceXPos( blk, x, y, z, blk.getRendererInstance().getTexture( ForgeDirection.EAST ) );
renderer.renderFaceZNeg( blk, x, y, z, blk.getRendererInstance().getTexture( ForgeDirection.NORTH ) ); renderer.renderFaceZNeg( blk, x, y, z, blk.getRendererInstance().getTexture( ForgeDirection.NORTH ) );

8
parts/networking/PartCableSmart.java
View file

@ -183,7 +183,7 @@ public class PartCableSmart extends PartCable
ico.setFlip( false, true ); ico.setFlip( false, true );
} }
Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 );
Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant );
rh.setTexture( defa, defa, defa, defa, defa, defa ); rh.setTexture( defa, defa, defa, defa, defa, defa );
renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer );
@ -242,7 +242,7 @@ public class PartCableSmart extends PartCable
renderer.uvRotateSouth = 3; renderer.uvRotateSouth = 3;
renderer.uvRotateEast = 3; renderer.uvRotateEast = 3;
Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 );
Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant );
rh.setTexture( defa, defa, offa, offa, offa, offa ); 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.setRenderBounds( 0, 5 / 16.0, 5 / 16.0, 16 / 16.0, 11 / 16.0, 11 / 16.0 );
renderer.renderStandardBlock( rh.getBlock(), x, y, z ); 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 ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant );
rh.setTexture( offa, offa, offa, offa, defa, defa ); 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.setRenderBounds( 5 / 16.0, 5 / 16.0, 0, 11 / 16.0, 11 / 16.0, 16 / 16.0 );
renderer.renderStandardBlock( rh.getBlock(), x, y, z ); 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 ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant );
rh.setTexture( offa, offa, defa, defa, offa, offa ); rh.setTexture( offa, offa, defa, defa, offa, offa );

8
parts/networking/PartDenseCable.java
View file

@ -269,7 +269,7 @@ public class PartDenseCable extends PartCable
IIcon defa = new TaughtIcon( getChannelTex( channels, false ).getIcon(), -0.2f ); IIcon defa = new TaughtIcon( getChannelTex( channels, false ).getIcon(), -0.2f );
IIcon defb = new TaughtIcon( getChannelTex( channels, true ).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 ); Tessellator.instance.setColorOpaque_I( myColor.mediumVariant );
rh.setTexture( defa, defa, defa, defa, defa, defa ); rh.setTexture( defa, defa, defa, defa, defa, defa );
renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer );
@ -345,7 +345,7 @@ public class PartDenseCable extends PartCable
renderer.uvRotateSouth = 3; renderer.uvRotateSouth = 3;
renderer.uvRotateEast = 3; renderer.uvRotateEast = 3;
Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 );
Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant );
rh.setTexture( defa, defa, offa, offa, offa, offa ); 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.setRenderBounds( 0, 3 / 16.0, 3 / 16.0, 16 / 16.0, 13 / 16.0, 13 / 16.0 );
renderer.renderStandardBlock( rh.getBlock(), x, y, z ); 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 ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant );
rh.setTexture( offa, offa, offa, offa, defa, defa ); 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.setRenderBounds( 3 / 16.0, 3 / 16.0, 0, 13 / 16.0, 13 / 16.0, 16 / 16.0 );
renderer.renderStandardBlock( rh.getBlock(), x, y, z ); 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 ); Tessellator.instance.setColorOpaque_I( getCableColor().mediumVariant );
rh.setTexture( offa, offa, defa, defa, offa, offa ); rh.setTexture( offa, offa, defa, defa, offa, offa );