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

Fixed Cable Rendering Glitch.

Browse source
This commit is contained in:
AlgorithmX2 2014-01-29 21:17:59 -06:00
parent 6fe45c11f7
commit 4be835d27f
2 changed files with 24 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
parts/networking/PartCable.java
View file

@ -95,7 +95,8 @@ public class PartCable extends AEBasePart implements IPartCable
return CableBusTextures.MECable_Yellow.getIcon(); return CableBusTextures.MECable_Yellow.getIcon();
default: default:
} }
return is.getIconIndex(); return AEApi.instance().parts().partCableGlass.item( AEColor.Transparent ).getIconIndex(
AEApi.instance().parts().partCableGlass.stack( AEColor.Transparent, 1 ) );
} }
public Icon getTexture(AEColor c) public Icon getTexture(AEColor c)
@ -141,7 +142,8 @@ public class PartCable extends AEBasePart implements IPartCable
return CableBusTextures.MECovered_Yellow.getIcon(); return CableBusTextures.MECovered_Yellow.getIcon();
default: default:
} }
return AEApi.instance().parts().partCableCovered.item( AEColor.Transparent ).getIconIndex( AEApi.instance().parts().partCableCovered.stack( AEColor.Transparent, 1 ) ); return AEApi.instance().parts().partCableCovered.item( AEColor.Transparent ).getIconIndex(
AEApi.instance().parts().partCableCovered.stack( AEColor.Transparent, 1 ) );
} }
public Icon getSmartTexture(AEColor c) public Icon getSmartTexture(AEColor c)

49
parts/networking/PartDenseCable.java
View file

@ -192,40 +192,31 @@ public class PartDenseCable extends PartCable
boolean isGlass = false; boolean isGlass = false;
AEColor myColor = getCableColor(); AEColor myColor = getCableColor();
/* /*
* ( ghh != null && ccph != null && ghh.getCableConnectionType( of ) == * ( ghh != null && ccph != null && ghh.getCableConnectionType( of ) == AECableType.GLASS && ccph.getPart(
* AECableType.GLASS && ccph.getPart( of.getOpposite() ) == null ) { * of.getOpposite() ) == null ) { isGlass = true; rh.setTexture( getGlassTexture( myColor = ccph.getColor() ) );
* isGlass = true; rh.setTexture( getGlassTexture( myColor = * } else if ( ccph == null && ghh != null && ghh.getCableConnectionType( of ) != AECableType.GLASS ) {
* ccph.getColor() ) ); } else if ( ccph == null && ghh != null && * rh.setTexture( getSmartTexture( myColor ) ); switch (of) { case DOWN: rh.setBounds( 3, 0, 3, 13, 4, 13 );
* ghh.getCableConnectionType( of ) != AECableType.GLASS ) { * break; case EAST: rh.setBounds( 12, 3, 3, 16, 13, 13 ); break; case NORTH: rh.setBounds( 3, 3, 0, 13, 13, 4
* rh.setTexture( getSmartTexture( myColor ) ); switch (of) { case DOWN: * ); break; case SOUTH: rh.setBounds( 3, 3, 12, 13, 13, 16 ); break; case UP: rh.setBounds( 3, 12, 3, 13, 16,
* rh.setBounds( 3, 0, 3, 13, 4, 13 ); break; case EAST: rh.setBounds( * 13 ); break; case WEST: rh.setBounds( 0, 3, 3, 4, 13, 13 ); break; default: return; } rh.renderBlock( x, y,
* 12, 3, 3, 16, 13, 13 ); break; case NORTH: rh.setBounds( 3, 3, 0, 13, * z, renderer );
* 13, 4 ); break; case SOUTH: rh.setBounds( 3, 3, 12, 13, 13, 16 );
* break; case UP: rh.setBounds( 3, 12, 3, 13, 16, 13 ); break; case
* WEST: rh.setBounds( 0, 3, 3, 4, 13, 13 ); break; default: return; }
* rh.renderBlock( x, y, z, renderer );
* *
* if ( true ) { setSmartConnectionRotations( of, renderer ); Icon defa * if ( true ) { setSmartConnectionRotations( of, renderer ); Icon defa = new TaughtIcon( getChannelTex(
* = new TaughtIcon( getChannelTex( channels, false ).getIcon(), -0.2f * channels, false ).getIcon(), -0.2f ); Icon defb = new TaughtIcon( getChannelTex( channels, true ).getIcon(),
* ); Icon defb = new TaughtIcon( getChannelTex( channels, true * -0.2f );
* ).getIcon(), -0.2f );
* *
* if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST ) { * if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST ) { AEBaseBlock blk = (AEBaseBlock)
* AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); FlipableIcon ico = * rh.getBlock(); FlipableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); ico.setFlip(
* blk.getRendererInstance().getTexture( ForgeDirection.EAST ); * false, true ); }
* ico.setFlip( false, true ); }
* *
* Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); * Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.instance.setColorOpaque_I(
* Tessellator.instance.setColorOpaque_I( myColor.mediumVariant ); * myColor.mediumVariant ); rh.setTexture( defa, defa, defa, defa, defa, defa ); renderAllFaces( (AEBaseBlock)
* rh.setTexture( defa, defa, defa, defa, defa, defa ); renderAllFaces( * rh.getBlock(), x, y, z, renderer );
* (AEBaseBlock) rh.getBlock(), x, y, z, renderer );
* *
* Tessellator.instance.setColorOpaque_I( myColor.whiteVariant ); * Tessellator.instance.setColorOpaque_I( myColor.whiteVariant ); rh.setTexture( defb, defb, defb, defb, defb,
* rh.setTexture( defb, defb, defb, defb, defb, defb ); renderAllFaces( * defb ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer );
* (AEBaseBlock) rh.getBlock(), x, y, z, renderer );
* *
* renderer.uvRotateBottom = renderer.uvRotateEast = * renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth =
* renderer.uvRotateNorth = renderer.uvRotateSouth =
* renderer.uvRotateTop = renderer.uvRotateWest = 0; } * renderer.uvRotateTop = renderer.uvRotateWest = 0; }
* *
* rh.setTexture( getTexture( getCableColor() ) ); } * rh.setTexture( getTexture( getCableColor() ) ); }