fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduces visibility of internal fields/methods

Browse Source 
Reduces the visibility of all fields to private and create setters/getters
when necessary. Exceptions are fields with GuiSync as these need to be
public.

Reduces the visibility of internal methods to private/protected/default when possible.
This commit is contained in:
yueh
2015-10-08 15:42:42 +02:00
parent f054bd699b
commit e94a0cfccf
497 changed files with 7865 additions and 6908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/networking/PartCable.java
+81 -68
View File
@@ -62,7 +62,6 @@ import appeng.client.texture.IAESprite;
import appeng.client.texture.TaughtIcon;
import appeng.items.parts.ItemMultiPart;
import appeng.me.GridAccessException;
import appeng.me.helpers.AENetworkProxy;
import appeng.parts.AEBasePart;
import appeng.util.Platform;
@@ -70,17 +69,17 @@ import appeng.util.Platform;
public class PartCable extends AEBasePart implements IPartCable
{
final int[] channelsOnSide = { 0, 0, 0, 0, 0, 0 };
private final int[] channelsOnSide = { 0, 0, 0, 0, 0, 0 };
EnumSet<AEPartLocation> connections = EnumSet.noneOf( AEPartLocation.class );
boolean powered = false;
private EnumSet<AEPartLocation> connections = EnumSet.noneOf( AEPartLocation.class );
private boolean powered = false;
public PartCable( final ItemStack is )
{
super( is );
this.proxy.setFlags( GridFlags.PREFERRED );
this.proxy.setIdlePowerUsage( 0.0 );
this.proxy.myColor = AEColor.values()[( (ItemMultiPart) is.getItem() ).variantOf( is.getItemDamage() )];
this.getProxy().setFlags( GridFlags.PREFERRED );
this.getProxy().setIdlePowerUsage( 0.0 );
this.getProxy().setColor( AEColor.values()[( (ItemMultiPart) is.getItem() ).variantOf( is.getItemDamage() )] );
}
@Override
@@ -92,7 +91,7 @@ public class PartCable extends AEBasePart implements IPartCable
@Override
public AEColor getCableColor()
{
return this.proxy.myColor;
return this.getProxy().getColor();
}
@Override
@@ -131,7 +130,7 @@ public class PartCable extends AEBasePart implements IPartCable
try
{
hasPermission = this.proxy.getSecurity().hasPermission( who, SecurityPermissions.BUILD );
hasPermission = this.getProxy().getSecurity().hasPermission( who, SecurityPermissions.BUILD );
}
catch( final GridAccessException e )
{
@@ -157,13 +156,13 @@ public class PartCable extends AEBasePart implements IPartCable
public void setValidSides(
final EnumSet<EnumFacing> sides )
{
this.proxy.setValidSides( sides );
this.getProxy().setValidSides( sides );
}
@Override
public boolean isConnected( final EnumFacing side )
{
return this.connections.contains( AEPartLocation.fromFacing( side ) );
return this.getConnections().contains( AEPartLocation.fromFacing( side ) );
}
public void markForUpdate()
@@ -181,11 +180,11 @@ public class PartCable extends AEBasePart implements IPartCable
final IGridNode n = this.getGridNode();
if( n != null )
{
this.connections = n.getConnectedSides();
this.setConnections( n.getConnectedSides() );
}
else
{
this.connections.clear();
this.getConnections().clear();
}
}
@@ -230,7 +229,7 @@ public class PartCable extends AEBasePart implements IPartCable
}
}
for( final AEPartLocation of : this.connections )
for( final AEPartLocation of : this.getConnections() )
{
switch( of )
{
@@ -263,7 +262,7 @@ public class PartCable extends AEBasePart implements IPartCable
{
GL11.glTranslated( -0.0, -0.0, 0.3 );
rh.setTexture( this.getTexture( this.getCableColor(),renderer ) );
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
rh.setBounds( 6.0f, 6.0f, 2.0f, 10.0f, 10.0f, 14.0f );
rh.renderInventoryBox( renderer );
rh.setTexture( null );
@@ -271,7 +270,7 @@ public class PartCable extends AEBasePart implements IPartCable
public IAESprite getTexture( final AEColor c, final ModelGenerator renderer )
{
return this.getGlassTexture( c,renderer );
return this.getGlassTexture( c, renderer );
}
public IAESprite getGlassTexture( final AEColor c, final ModelGenerator renderer )
@@ -319,12 +318,6 @@ public class PartCable extends AEBasePart implements IPartCable
return renderer.getIcon( glassCableStack );
}
@Override
public AENetworkProxy getProxy()
{
return this.proxy;
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
@@ -345,9 +338,9 @@ public class PartCable extends AEBasePart implements IPartCable
break;
}
}
else if( this.connections.contains( dir ) )
else if( this.getConnections().contains( dir ) )
{
final TileEntity te = this.tile.getWorld().getTileEntity( pos.offset( dir.getFacing() ) );
final TileEntity te = this.getTile().getWorld().getTileEntity( pos.offset( dir.getFacing() ) );
final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
final IGridHost gh = te instanceof IGridHost ? (IGridHost) te : null;
if( partHost == null && gh != null && gh.getCableConnectionType( dir ) != AECableType.GLASS )
@@ -363,11 +356,11 @@ public class PartCable extends AEBasePart implements IPartCable
}
else
{
rh.setTexture( this.getTexture( this.getCableColor(),renderer ) );
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
}
final IPartHost ph = this.getHost();
for( final AEPartLocation of : EnumSet.complementOf( this.connections ) )
for( final AEPartLocation of : EnumSet.complementOf( this.getConnections() ) )
{
final IPart bp = ph.getPart( of );
if( bp instanceof IGridHost )
@@ -403,7 +396,7 @@ public class PartCable extends AEBasePart implements IPartCable
}
}
if( this.connections.size() != 2 || !this.nonLinear( this.connections ) || useCovered || requireDetailed )
if( this.getConnections().size() != 2 || !this.nonLinear( this.getConnections() ) || useCovered || requireDetailed )
{
if( useCovered )
{
@@ -416,7 +409,7 @@ public class PartCable extends AEBasePart implements IPartCable
rh.renderBlock( pos, renderer );
}
for( final AEPartLocation of : this.connections )
for( final AEPartLocation of : this.getConnections() )
{
this.renderGlassConnection( pos, rh, renderer, of );
}
@@ -426,7 +419,7 @@ public class PartCable extends AEBasePart implements IPartCable
final IAESprite def = this.getTexture( this.getCableColor(), renderer );
rh.setTexture( def );
for( final AEPartLocation of : this.connections )
for( final AEPartLocation of : this.getConnections() )
{
rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of.getFacing(), of.getFacing().getOpposite() ) ) );
switch( of )
@@ -437,13 +430,13 @@ public class PartCable extends AEBasePart implements IPartCable
break;
case EAST:
case WEST:
renderer.uvRotateEast = renderer.uvRotateWest = 1;
renderer.uvRotateBottom = renderer.uvRotateTop = 1;
renderer.setUvRotateEast( renderer.setUvRotateWest( 1 ) );
renderer.setUvRotateBottom( renderer.setUvRotateTop( 1 ) );
renderer.setRenderBounds( 0, 6 / 16.0, 6 / 16.0, 16 / 16.0, 10 / 16.0, 10 / 16.0 );
break;
case NORTH:
case SOUTH:
renderer.uvRotateNorth = renderer.uvRotateSouth = 1;
renderer.setUvRotateNorth( renderer.setUvRotateSouth( 1 ) );
renderer.setRenderBounds( 6 / 16.0, 6 / 16.0, 0, 10 / 16.0, 10 / 16.0, 16 / 16.0 );
break;
default:
@@ -498,7 +491,7 @@ public class PartCable extends AEBasePart implements IPartCable
final IReadOnlyCollection<IGridConnection> set = part.getGridNode().getConnections();
for( final IGridConnection gc : set )
{
if( this.proxy.getNode().hasFlag( GridFlags.DENSE_CAPACITY ) && gc.getOtherSide( this.proxy.getNode() ).hasFlag( GridFlags.DENSE_CAPACITY ) )
if( this.getProxy().getNode().hasFlag( GridFlags.DENSE_CAPACITY ) && gc.getOtherSide( this.getProxy().getNode() ).hasFlag( GridFlags.DENSE_CAPACITY ) )
{
sideOut |= ( gc.getUsedChannels() / 4 ) << ( 4 * thisSide.ordinal() );
}
@@ -516,8 +509,8 @@ public class PartCable extends AEBasePart implements IPartCable
final AEPartLocation side = gc.getDirection( n );
if( side != AEPartLocation.INTERNAL )
{
final boolean isTier2a = this.proxy.getNode().hasFlag( GridFlags.DENSE_CAPACITY );
final boolean isTier2b = gc.getOtherSide( this.proxy.getNode() ).hasFlag( GridFlags.DENSE_CAPACITY );
final boolean isTier2a = this.getProxy().getNode().hasFlag( GridFlags.DENSE_CAPACITY );
final boolean isTier2b = gc.getOtherSide( this.getProxy().getNode() ).hasFlag( GridFlags.DENSE_CAPACITY );
if( isTier2a && isTier2b )
{
@@ -534,7 +527,7 @@ public class PartCable extends AEBasePart implements IPartCable
try
{
if( this.proxy.getEnergy().isNetworkPowered() )
if( this.getProxy().getEnergy().isNetworkPowered() )
{
cs |= ( 1 << AEPartLocation.INTERNAL.ordinal() );
}
@@ -554,7 +547,7 @@ public class PartCable extends AEBasePart implements IPartCable
final int cs = data.readByte();
final int sideOut = data.readInt();
final EnumSet<AEPartLocation> myC = this.connections.clone();
final EnumSet<AEPartLocation> myC = this.getConnections().clone();
final boolean wasPowered = this.powered;
this.powered = false;
boolean channelsChanged = false;
@@ -564,10 +557,10 @@ public class PartCable extends AEBasePart implements IPartCable
if( d != AEPartLocation.INTERNAL )
{
final int ch = ( sideOut >> ( d.ordinal() * 4 ) ) & 0xF;
if( ch != this.channelsOnSide[d.ordinal()] )
if( ch != this.getChannelsOnSide( d.ordinal() ) )
{
channelsChanged = true;
this.channelsOnSide[d.ordinal()] = ch;
this.setChannelsOnSide( d.ordinal(), ch );
}
}
@@ -584,16 +577,16 @@ public class PartCable extends AEBasePart implements IPartCable
final int id = 1 << d.ordinal();
if( id == ( cs & id ) )
{
this.connections.add( d );
this.getConnections().add( d );
}
else
{
this.connections.remove( d );
this.getConnections().remove( d );
}
}
}
return !myC.equals( this.connections ) || wasPowered != this.powered || channelsChanged;
return !myC.equals( this.getConnections() ) || wasPowered != this.powered || channelsChanged;
}
@Override
@@ -645,7 +638,7 @@ public class PartCable extends AEBasePart implements IPartCable
final AEColoredItemDefinition coveredCable = AEApi.instance().definitions().parts().cableCovered();
final ItemStack coveredCableStack = coveredCable.stack( AEColor.Transparent, 1 );
return renderer.getIcon( coveredCableStack );
return renderer.getIcon( coveredCableStack );
}
protected boolean nonLinear( final EnumSet<AEPartLocation> sides )
@@ -654,9 +647,9 @@ public class PartCable extends AEBasePart implements IPartCable
}
@SideOnly( Side.CLIENT )
public void renderGlassConnection( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer, final AEPartLocation of )
private void renderGlassConnection( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer, final AEPartLocation of )
{
final TileEntity te = this.tile.getWorld().getTileEntity( pos.offset( of.getFacing() ) );
final TileEntity te = this.getTile().getWorld().getTileEntity( pos.offset( of.getFacing() ) );
final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
final IGridHost gh = te instanceof IGridHost ? (IGridHost) te : null;
@@ -730,9 +723,9 @@ public class PartCable extends AEBasePart implements IPartCable
}
@SideOnly( Side.CLIENT )
public void renderCoveredConnection( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer, final int channels, final AEPartLocation of )
protected void renderCoveredConnection( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer, final int channels, final AEPartLocation of )
{
final TileEntity te = this.tile.getWorld().getTileEntity( pos.offset( of.getFacing() ) );
final TileEntity te = this.getTile().getWorld().getTileEntity( pos.offset( of.getFacing() ) );
final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
final IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null;
@@ -811,9 +804,9 @@ public class PartCable extends AEBasePart implements IPartCable
}
@SideOnly( Side.CLIENT )
public void renderSmartConnection( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer, final int channels, final AEPartLocation of )
protected void renderSmartConnection( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer, final int channels, final AEPartLocation of )
{
final TileEntity te = this.tile.getWorld().getTileEntity( pos.offset( of.getFacing() ) );
final TileEntity te = this.getTile().getWorld().getTileEntity( pos.offset( of.getFacing() ) );
final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
final IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null;
AEColor myColor = this.getCableColor();
@@ -874,7 +867,7 @@ public class PartCable extends AEBasePart implements IPartCable
rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon, secondIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
}
@@ -931,7 +924,7 @@ public class PartCable extends AEBasePart implements IPartCable
rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon, secondIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
}
}
@@ -977,7 +970,7 @@ public class PartCable extends AEBasePart implements IPartCable
final IParts parts = AEApi.instance().definitions().parts();
final ItemStack smartCableStack = parts.cableSmart().stack( AEColor.Transparent, 1 );
return renderer.getIcon(smartCableStack );
return renderer.getIcon( smartCableStack );
}
@SideOnly( Side.CLIENT )
@@ -987,27 +980,27 @@ public class PartCable extends AEBasePart implements IPartCable
{
case UP:
case DOWN:
renderer.uvRotateTop = 0;
renderer.uvRotateBottom = 0;
renderer.uvRotateSouth = 3;
renderer.uvRotateEast = 3;
renderer.setUvRotateTop( 0 );
renderer.setUvRotateBottom( 0 );
renderer.setUvRotateSouth( 3 );
renderer.setUvRotateEast( 3 );
break;
case NORTH:
case SOUTH:
renderer.uvRotateTop = 3;
renderer.uvRotateBottom = 3;
renderer.uvRotateNorth = 1;
renderer.uvRotateSouth = 2;
renderer.uvRotateWest = 1;
renderer.setUvRotateTop( 3 );
renderer.setUvRotateBottom( 3 );
renderer.setUvRotateNorth( 1 );
renderer.setUvRotateSouth( 2 );
renderer.setUvRotateWest( 1 );
break;
case EAST:
case WEST:
renderer.uvRotateEast = 2;
renderer.uvRotateWest = 1;
renderer.uvRotateBottom = 2;
renderer.uvRotateTop = 1;
renderer.uvRotateSouth = 3;
renderer.uvRotateNorth = 0;
renderer.setUvRotateEast( 2 );
renderer.setUvRotateWest( 1 );
renderer.setUvRotateBottom( 2 );
renderer.setUvRotateTop( 1 );
renderer.setUvRotateSouth( 3 );
renderer.setUvRotateNorth( 0 );
break;
default:
break;
@@ -1058,7 +1051,7 @@ public class PartCable extends AEBasePart implements IPartCable
@SideOnly( Side.CLIENT )
protected void renderAllFaces( final AEBaseBlock blk, final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setBounds( (float) renderer.renderMinX * 16.0f, (float) renderer.renderMinY * 16.0f, (float) renderer.renderMinZ * 16.0f, (float) renderer.renderMaxX * 16.0f, (float) renderer.renderMaxY * 16.0f, (float) renderer.renderMaxZ * 16.0f );
rh.setBounds( (float) renderer.getRenderMinX() * 16.0f, (float) renderer.getRenderMinY() * 16.0f, (float) renderer.getRenderMinZ() * 16.0f, (float) renderer.getRenderMaxX() * 16.0f, (float) renderer.getRenderMaxY() * 16.0f, (float) renderer.getRenderMaxZ() * 16.0f );
rh.renderFace( pos, blk.getRendererInstance().getTexture( AEPartLocation.WEST ), EnumFacing.WEST, renderer );
rh.renderFace( pos, blk.getRendererInstance().getTexture( AEPartLocation.EAST ), EnumFacing.EAST, renderer );
rh.renderFace( pos, blk.getRendererInstance().getTexture( AEPartLocation.NORTH ), EnumFacing.NORTH, renderer );
@@ -1066,4 +1059,24 @@ public class PartCable extends AEBasePart implements IPartCable
rh.renderFace( pos, blk.getRendererInstance().getTexture( AEPartLocation.DOWN ), EnumFacing.DOWN, renderer );
rh.renderFace( pos, blk.getRendererInstance().getTexture( AEPartLocation.UP ), EnumFacing.UP, renderer );
}
int getChannelsOnSide( int i )
{
return this.channelsOnSide[i];
}
void setChannelsOnSide( int i, int channels )
{
this.channelsOnSide[i] = channels;
}
EnumSet<AEPartLocation> getConnections()
{
return this.connections;
}
void setConnections( final EnumSet<AEPartLocation> connections )
{
this.connections = connections;
}
}
src/main/java/appeng/parts/networking/PartCableCovered.java
+12 -12
View File
@@ -84,15 +84,15 @@ public class PartCableCovered extends PartCable
final IGridNode n = this.getGridNode();
if( n != null )
{
this.connections = n.getConnectedSides();
this.setConnections( n.getConnectedSides() );
}
else
{
this.connections.clear();
this.getConnections().clear();
}
}
for( final AEPartLocation of : this.connections )
for( final AEPartLocation of : this.getConnections() )
{
switch( of )
{
@@ -167,11 +167,11 @@ public class PartCableCovered extends PartCable
{
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
final EnumSet<AEPartLocation> sides = this.connections.clone();
final EnumSet<AEPartLocation> sides = this.getConnections().clone();
boolean hasBuses = false;
final IPartHost ph = this.getHost();
for( final AEPartLocation of : EnumSet.complementOf( this.connections ) )
for( final AEPartLocation of : EnumSet.complementOf( this.getConnections() ) )
{
final IPart bp = ph.getPart( of );
if( bp instanceof IGridHost )
@@ -215,9 +215,9 @@ public class PartCableCovered extends PartCable
if( sides.size() != 2 || !this.nonLinear( sides ) || hasBuses )
{
for( final AEPartLocation of : this.connections )
for( final AEPartLocation of : this.getConnections() )
{
this.renderCoveredConnection( pos, rh, renderer, this.channelsOnSide[of.ordinal()], of );
this.renderCoveredConnection( pos, rh, renderer, this.getChannelsOnSide( of.ordinal() ), of );
}
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
@@ -228,7 +228,7 @@ public class PartCableCovered extends PartCable
{
final IAESprite def = this.getTexture( this.getCableColor(), renderer );
final IAESprite off = new OffsetIcon( def, 0, -12 );
for( final AEPartLocation of : this.connections )
for( final AEPartLocation of : this.getConnections() )
{
switch( of )
{
@@ -240,14 +240,14 @@ public class PartCableCovered extends PartCable
case EAST:
case WEST:
rh.setTexture( off, off, off, off, def, def );
renderer.uvRotateEast = renderer.uvRotateWest = 1;
renderer.uvRotateBottom = renderer.uvRotateTop = 1;
renderer.setUvRotateEast( renderer.setUvRotateWest( 1 ) );
renderer.setUvRotateBottom( renderer.setUvRotateTop( 1 ) );
renderer.setRenderBounds( 0, 5 / 16.0, 5 / 16.0, 16 / 16.0, 11 / 16.0, 11 / 16.0 );
break;
case NORTH:
case SOUTH:
rh.setTexture( off, off, def, def, off, off );
renderer.uvRotateNorth = renderer.uvRotateSouth = 1;
renderer.setUvRotateNorth( renderer.setUvRotateSouth( 1 ) );
renderer.setRenderBounds( 5 / 16.0, 5 / 16.0, 0, 11 / 16.0, 11 / 16.0, 16 / 16.0 );
break;
default:
@@ -257,7 +257,7 @@ public class PartCableCovered extends PartCable
rh.renderBlockCurrentBounds( pos, renderer );
}
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
rh.setTexture( null );
}
}
src/main/java/appeng/parts/networking/PartCableSmart.java
+28 -28
View File
@@ -87,15 +87,15 @@ public class PartCableSmart extends PartCable
final IGridNode n = this.getGridNode();
if( n != null )
{
this.connections = n.getConnectedSides();
this.setConnections( n.getConnectedSides() );
}
else
{
this.connections.clear();
this.getConnections().clear();
}
}
for( final AEPartLocation of : this.connections )
for( final AEPartLocation of : this.getConnections() )
{
switch( of )
{
@@ -184,11 +184,11 @@ public class PartCableSmart extends PartCable
{
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
final EnumSet<AEPartLocation> sides = this.connections.clone();
final EnumSet<AEPartLocation> sides = this.getConnections().clone();
boolean hasBuses = false;
final IPartHost ph = this.getHost();
for( final AEPartLocation of : EnumSet.complementOf( this.connections ) )
for( final AEPartLocation of : EnumSet.complementOf( this.getConnections() ) )
{
final IPart bp = ph.getPart( of );
if( bp instanceof IGridHost )
@@ -228,8 +228,8 @@ public class PartCableSmart extends PartCable
rh.renderBlock( pos, renderer );
this.setSmartConnectionRotations( of, renderer );
final IAESprite firstIcon = new TaughtIcon( this.getChannelTex( this.channelsOnSide[of.ordinal()], false ).getIcon(), -0.2f );
final IAESprite secondIcon = new TaughtIcon( this.getChannelTex( this.channelsOnSide[of.ordinal()], true ).getIcon(), -0.2f );
final IAESprite firstIcon = new TaughtIcon( this.getChannelTex( this.getChannelsOnSide( of.ordinal() ), false ).getIcon(), -0.2f );
final IAESprite secondIcon = new TaughtIcon( this.getChannelTex( this.getChannelsOnSide( of.ordinal() ), true ).getIcon(), -0.2f );
if( of == AEPartLocation.EAST || of == AEPartLocation.WEST )
{
@@ -247,7 +247,7 @@ public class PartCableSmart extends PartCable
rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon, secondIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
}
@@ -256,9 +256,9 @@ public class PartCableSmart extends PartCable
if( sides.size() != 2 || !this.nonLinear( sides ) || hasBuses )
{
for( final AEPartLocation of : this.connections )
for( final AEPartLocation of : this.getConnections() )
{
this.renderSmartConnection( pos, rh, renderer, this.channelsOnSide[of.ordinal()], of );
this.renderSmartConnection( pos, rh, renderer, this.getChannelsOnSide( of.ordinal() ), of );
}
rh.setTexture( this.getCoveredTexture( this.getCableColor(), renderer ) );
@@ -269,13 +269,13 @@ public class PartCableSmart extends PartCable
{
AEPartLocation selectedSide = AEPartLocation.INTERNAL;
for( final AEPartLocation of : this.connections )
for( final AEPartLocation of : this.getConnections() )
{
selectedSide = of;
break;
}
final int channels = this.channelsOnSide[selectedSide.ordinal()];
final int channels = this.getChannelsOnSide( selectedSide.ordinal() );
final IAESprite def = this.getTexture( this.getCableColor(), renderer );
final IAESprite off = new OffsetIcon( def, 0, -12 );
@@ -293,10 +293,10 @@ public class PartCableSmart extends PartCable
rh.setTexture( def, def, off, off, off, off );
rh.renderBlockCurrentBounds( pos, renderer );
renderer.uvRotateTop = 0;
renderer.uvRotateBottom = 0;
renderer.uvRotateSouth = 3;
renderer.uvRotateEast = 3;
renderer.setUvRotateTop( 0 );
renderer.setUvRotateBottom( 0 );
renderer.setUvRotateSouth( 3 );
renderer.setUvRotateEast( 3 );
renderer.setBrightness( 15 << 20 | 15 << 4 );
@@ -311,12 +311,12 @@ public class PartCableSmart extends PartCable
case EAST:
case WEST:
rh.setTexture( off, off, off, off, def, def );
renderer.uvRotateEast = 2;
renderer.uvRotateWest = 1;
renderer.uvRotateBottom = 2;
renderer.uvRotateTop = 1;
renderer.uvRotateSouth = 0;
renderer.uvRotateNorth = 0;
renderer.setUvRotateEast( 2 );
renderer.setUvRotateWest( 1 );
renderer.setUvRotateBottom( 2 );
renderer.setUvRotateTop( 1 );
renderer.setUvRotateSouth( 0 );
renderer.setUvRotateNorth( 0 );
final AEBaseBlock blk = (AEBaseBlock) rh.getBlock();
final FlippableIcon ico = blk.getRendererInstance().getTexture( AEPartLocation.EAST );
@@ -347,11 +347,11 @@ public class PartCableSmart extends PartCable
case NORTH:
case SOUTH:
rh.setTexture( off, off, def, def, off, off );
renderer.uvRotateTop = 3;
renderer.uvRotateBottom = 3;
renderer.uvRotateNorth = 1;
renderer.uvRotateSouth = 2;
renderer.uvRotateWest = 1;
renderer.setUvRotateTop( 3 );
renderer.setUvRotateBottom( 3 );
renderer.setUvRotateNorth( 1 );
renderer.setUvRotateSouth( 2 );
renderer.setUvRotateWest( 1 );
renderer.setRenderBounds( 5 / 16.0, 5 / 16.0, 0, 11 / 16.0, 11 / 16.0, 16 / 16.0 );
rh.renderBlockCurrentBounds( pos, renderer );
@@ -370,7 +370,7 @@ public class PartCableSmart extends PartCable
}
}
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
rh.setTexture( null );
}
}
src/main/java/appeng/parts/networking/PartDenseCable.java
+45 -45
View File
@@ -62,7 +62,7 @@ public class PartDenseCable extends PartCable
{
super( is );
this.proxy.setFlags( GridFlags.DENSE_CAPACITY, GridFlags.PREFERRED );
this.getProxy().setFlags( GridFlags.DENSE_CAPACITY, GridFlags.PREFERRED );
}
@Override
@@ -91,15 +91,15 @@ public class PartDenseCable extends PartCable
final IGridNode n = this.getGridNode();
if( n != null )
{
this.connections = n.getConnectedSides();
this.setConnections( n.getConnectedSides() );
}
else
{
this.connections.clear();
this.getConnections().clear();
}
}
for( final AEPartLocation of : this.connections )
for( final AEPartLocation of : this.getConnections() )
{
if( this.isDense( of ) )
{
@@ -219,10 +219,10 @@ public class PartDenseCable extends PartCable
{
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
final EnumSet<AEPartLocation> sides = this.connections.clone();
final EnumSet<AEPartLocation> sides = this.getConnections().clone();
boolean hasBuses = false;
for( final AEPartLocation of : this.connections )
for( final AEPartLocation of : this.getConnections() )
{
if( !this.isDense( of ) )
{
@@ -232,19 +232,19 @@ public class PartDenseCable extends PartCable
if( sides.size() != 2 || !this.nonLinear( sides ) || hasBuses )
{
for( final AEPartLocation of : this.connections )
for( final AEPartLocation of : this.getConnections() )
{
if( this.isDense( of ) )
{
this.renderDenseConnection( pos, rh, renderer, this.channelsOnSide[of.ordinal()], of );
this.renderDenseConnection( pos, rh, renderer, this.getChannelsOnSide( of.ordinal() ), of );
}
else if( this.isSmart( of ) )
{
this.renderSmartConnection( pos, rh, renderer, this.channelsOnSide[of.ordinal()], of );
this.renderSmartConnection( pos, rh, renderer, this.getChannelsOnSide( of.ordinal() ), of );
}
else
{
this.renderCoveredConnection( pos, rh, renderer, this.channelsOnSide[of.ordinal()], of );
this.renderCoveredConnection( pos, rh, renderer, this.getChannelsOnSide( of.ordinal() ), of );
}
}
@@ -256,13 +256,13 @@ public class PartDenseCable extends PartCable
{
AEPartLocation selectedSide = AEPartLocation.INTERNAL;
for( final AEPartLocation of : this.connections )
for( final AEPartLocation of : this.getConnections() )
{
selectedSide = of;
break;
}
final int channels = this.channelsOnSide[selectedSide.ordinal()];
final int channels = this.getChannelsOnSide( selectedSide.ordinal() );
final IAESprite def = this.getTexture( this.getCableColor(), renderer );
final IAESprite off = new OffsetIcon( def, 0, -12 );
@@ -280,10 +280,10 @@ public class PartDenseCable extends PartCable
rh.setTexture( def, def, off, off, off, off );
rh.renderBlockCurrentBounds( pos, renderer );
renderer.uvRotateTop = 0;
renderer.uvRotateBottom = 0;
renderer.uvRotateSouth = 3;
renderer.uvRotateEast = 3;
renderer.setUvRotateTop( 0 );
renderer.setUvRotateBottom( 0 );
renderer.setUvRotateSouth( 3 );
renderer.setUvRotateEast( 3 );
renderer.setBrightness( 15 << 20 | 15 << 4 );
@@ -298,12 +298,12 @@ public class PartDenseCable extends PartCable
case EAST:
case WEST:
rh.setTexture( off, off, off, off, def, def );
renderer.uvRotateEast = 2;
renderer.uvRotateWest = 1;
renderer.uvRotateBottom = 2;
renderer.uvRotateTop = 1;
renderer.uvRotateSouth = 0;
renderer.uvRotateNorth = 0;
renderer.setUvRotateEast( 2 );
renderer.setUvRotateWest( 1 );
renderer.setUvRotateBottom( 2 );
renderer.setUvRotateTop( 1 );
renderer.setUvRotateSouth( 0 );
renderer.setUvRotateNorth( 0 );
final AEBaseBlock blk = (AEBaseBlock) rh.getBlock();
final FlippableIcon ico = blk.getRendererInstance().getTexture( AEPartLocation.EAST );
@@ -331,11 +331,11 @@ public class PartDenseCable extends PartCable
case NORTH:
case SOUTH:
rh.setTexture( off, off, def, def, off, off );
renderer.uvRotateTop = 3;
renderer.uvRotateBottom = 3;
renderer.uvRotateNorth = 1;
renderer.uvRotateSouth = 2;
renderer.uvRotateWest = 1;
renderer.setUvRotateTop( 3 );
renderer.setUvRotateBottom( 3 );
renderer.setUvRotateNorth( 1 );
renderer.setUvRotateSouth( 2 );
renderer.setUvRotateWest( 1 );
renderer.setRenderBounds( 3 / 16.0, 3 / 16.0, 0, 13 / 16.0, 13 / 16.0, 16 / 16.0 );
rh.renderBlockCurrentBounds( pos, renderer );
@@ -354,45 +354,45 @@ public class PartDenseCable extends PartCable
}
}
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
rh.setTexture( null );
}
@SideOnly( Side.CLIENT )
public void renderDenseConnection( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer, final int channels, final AEPartLocation of )
{
final TileEntity te = this.tile.getWorld().getTileEntity( pos.offset( of.getFacing() ) );
final TileEntity te = this.getTile().getWorld().getTileEntity( pos.offset( of.getFacing() ) );
final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
final IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null;
AEColor myColor = this.getCableColor();
/*
* ( ghh != null && partHost != null && ghh.getCableConnectionType( of ) == AECableType.GLASS && partHost.getPart(
* of.getOpposite() ) == null ) { isGlass = true; rh.setTexture( getGlassTexture( myColor = partHost.getColor() ) );
* ( ghh != null && partHost != null && ghh.getCableConnectionType( of ) == AECableType.GLASS &&
* partHost.getPart(
* of.getOpposite() ) == null ) { isGlass = true; rh.setTexture( getGlassTexture( myColor = partHost.getColor()
* ) );
* } else if ( partHost == null && ghh != null && ghh.getCableConnectionType( of ) != AECableType.GLASS ) {
* rh.setTexture( getSmartTexture( myColor ) ); switch (of) { case DOWN: rh.setBounds( 3, 0, 3, 13, 4, 13 );
* break; case EAST: rh.setBounds( 12, 3, 3, 16, 13, 13 ); break; case NORTH: rh.setBounds( 3, 3, 0, 13, 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 ); TextureAtlasSprite firstIcon = new TaughtIcon( getChannelTex(
* channels, false ).getIcon(), -0.2f ); TextureAtlasSprite secondIcon = new TaughtIcon( getChannelTex( channels, true ).getIcon(),
* if ( true ) { setSmartConnectionRotations( of, renderer ); TextureAtlasSprite firstIcon = new TaughtIcon(
* getChannelTex(
* channels, false ).getIcon(), -0.2f ); TextureAtlasSprite secondIcon = new TaughtIcon( getChannelTex(
* channels, true ).getIcon(),
* -0.2f );
*
* if ( of == AEPartLocation.EAST || of == AEPartLocation.WEST ) { AEBaseBlock blk = (AEBaseBlock)
* rh.getBlock(); FlippableIcon ico = blk.getRendererInstance().getTexture( AEPartLocation.EAST ); ico.setFlip(
* false, true ); }
*
* Tessellator.INSTANCE.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.INSTANCE.setColorOpaque_I(
* myColor.mediumVariant ); rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon ); renderAllFaces( (AEBaseBlock)
* myColor.mediumVariant ); rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon );
* renderAllFaces( (AEBaseBlock)
* rh.getBlock(), x, y, z, renderer );
*
* Tessellator.INSTANCE.setColorOpaque_I( myColor.whiteVariant ); rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon,
* Tessellator.INSTANCE.setColorOpaque_I( myColor.whiteVariant ); rh.setTexture( secondIcon, secondIcon,
* secondIcon, secondIcon, secondIcon,
* secondIcon ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer );
*
* renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth =
* renderer.uvRotateTop = renderer.uvRotateWest = 0; }
*
* rh.setTexture( getTexture( getCableColor() ) ); }
*/
@@ -450,13 +450,13 @@ public class PartDenseCable extends PartCable
rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon, secondIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
}
}
private boolean isSmart( final AEPartLocation of )
{
final TileEntity te = this.tile.getWorld().getTileEntity( this.tile.getPos().offset( of.getFacing() ) );
final TileEntity te = this.getTile().getWorld().getTileEntity( this.getTile().getPos().offset( of.getFacing() ) );
if( te instanceof IGridHost )
{
final AECableType t = ( (IGridHost) te ).getCableConnectionType( of.getOpposite() );
@@ -504,12 +504,12 @@ public class PartDenseCable extends PartCable
default:
}
return renderer.getIcon( this.is );
return renderer.getIcon( this.getItemStack() );
}
private boolean isDense( final AEPartLocation of )
{
final TileEntity te = this.tile.getWorld().getTileEntity( this.tile.getPos().offset( of.getFacing() ) );
final TileEntity te = this.getTile().getWorld().getTileEntity( this.getTile().getPos().offset( of.getFacing() ) );
if( te instanceof IGridHost )
{
final AECableType t = ( (IGridHost) te ).getCableConnectionType( of.getOpposite() );
src/main/java/appeng/parts/networking/PartQuartzFiber.java
+8 -8
View File
@@ -52,13 +52,13 @@ import appeng.parts.AEBasePart;
public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider
{
final AENetworkProxy outerProxy = new AENetworkProxy( this, "outer", this.proxy.getMachineRepresentation(), true );
private final AENetworkProxy outerProxy = new AENetworkProxy( this, "outer", this.getProxy().getMachineRepresentation(), true );
public PartQuartzFiber( final ItemStack is )
{
super( is );
this.proxy.setIdlePowerUsage( 0 );
this.proxy.setFlags( GridFlags.CANNOT_CARRY );
this.getProxy().setIdlePowerUsage( 0 );
this.getProxy().setFlags( GridFlags.CANNOT_CARRY );
this.outerProxy.setIdlePowerUsage( 0 );
this.outerProxy.setFlags( GridFlags.CANNOT_CARRY );
}
@@ -81,7 +81,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider
{
GL11.glTranslated( -0.2, -0.3, 0.0 );
rh.setTexture( renderer.getIcon( this.is ) );
rh.setTexture( renderer.getIcon( this.getItemStack() ) );
rh.setBounds( 6.0f, 6.0f, 5.0f, 10.0f, 10.0f, 11.0f );
rh.renderInventoryBox( renderer );
rh.setTexture( null );
@@ -91,7 +91,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
final IAESprite myIcon = renderer.getIcon( this.is );
final IAESprite myIcon = renderer.getIcon( this.getItemStack() );
rh.setTexture( myIcon );
rh.setBounds( 6, 6, 10, 10, 10, 16 );
rh.renderBlock( pos, renderer );
@@ -159,7 +159,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider
try
{
final IEnergyGrid eg = this.proxy.getEnergy();
final IEnergyGrid eg = this.getProxy().getEnergy();
acquiredPower += eg.extractAEPower( amt - acquiredPower, mode, seen );
}
catch( final GridAccessException e )
@@ -186,7 +186,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider
try
{
final IEnergyGrid eg = this.proxy.getEnergy();
final IEnergyGrid eg = this.getProxy().getEnergy();
if( !seen.contains( eg ) )
{
return eg.injectAEPower( amt, mode, seen );
@@ -220,7 +220,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider
try
{
final IEnergyGrid eg = this.proxy.getEnergy();
final IEnergyGrid eg = this.getProxy().getEnergy();
demand += eg.getEnergyDemand( amt - demand, seen );
}
catch( final GridAccessException e )