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

Reduce scope of variables

Browse Source
This commit is contained in:
thatsIch
2015-09-30 14:22:21 +02:00
parent dca09fe0a6
commit 059523f543
70 changed files with 151 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/CableBusContainer.java
+1 -2
View File
@@ -927,11 +927,10 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
for( int x = 0; x < 7; x++ )
{
ItemStack is = null;
IPart p = this.getPart( AEPartLocation.fromOrdinal( x ) );
if( p != null )
{
is = p.getItemStack( PartItemStack.Network );
ItemStack is = p.getItemStack( PartItemStack.Network );
data.writeShort( Item.getIdFromItem( is.getItem() ) );
data.writeShort( is.getItemDamage() );
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
+4 -4
View File
@@ -160,9 +160,6 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
protected void renderStaticWithIcon( BlockPos opos, IPartRenderHelper rh, ModelGenerator renderer, IAESprite activeIcon )
{
int minX = 1;
int minY = 1;
int maxX = 15;
int maxY = 15;
final EnumFacing e = rh.getWorldX();
final EnumFacing u = rh.getWorldY();
@@ -174,17 +171,20 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
{
minX = 0;
}
int maxX = 15;
if( this.isAnnihilationPlane( te.getWorld().getTileEntity( pos.offset( e ) ), this.side ) )
{
maxX = 16;
}
int minY = 1;
if( this.isAnnihilationPlane( te.getWorld().getTileEntity( pos.offset( u.getOpposite() ) ), this.side ) )
{
minY = 0;
}
int maxY = 15;
if( this.isAnnihilationPlane( te.getWorld().getTileEntity( pos.offset( e) ), this.side ) )
{
maxY = 16;
src/main/java/appeng/parts/automation/PartFormationPlane.java
+3 -3
View File
@@ -282,9 +282,6 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
public void renderStatic( BlockPos opos, IPartRenderHelper rh, ModelGenerator renderer )
{
int minX = 1;
int minY = 1;
int maxX = 15;
int maxY = 15;
EnumFacing e = rh.getWorldX();
EnumFacing u = rh.getWorldY();
@@ -297,16 +294,19 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
minX = 0;
}
int maxX = 15;
if( this.isTransitionPlane( te.getWorld().getTileEntity( pos.offset( e ) ), this.side ) )
{
maxX = 16;
}
int minY = 1;
if( this.isTransitionPlane( te.getWorld().getTileEntity( pos.offset( u.getOpposite() ) ), this.side ) )
{
minY = 0;
}
int maxY = 15;
if( this.isTransitionPlane( te.getWorld().getTileEntity( pos.offset( u ) ), this.side ) )
{
maxY = 16;
src/main/java/appeng/parts/automation/PartImportBus.java
+2 -2
View File
@@ -286,8 +286,6 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
private int calculateMaximumAmountToImport( InventoryAdaptor myAdaptor, IAEItemStack whatToImport, IMEMonitor<IAEItemStack> inv, FuzzyMode fzMode )
{
final int toSend = Math.min( this.itemToSend, 64 );
final ItemStack simResult;
final IAEItemStack itemAmountNotStorable;
final ItemStack itemStackToImport;
if( whatToImport == null )
@@ -299,6 +297,8 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
itemStackToImport = whatToImport.getItemStack();
}
final IAEItemStack itemAmountNotStorable;
final ItemStack simResult;
if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
{
simResult = myAdaptor.simulateSimilarRemove( toSend, itemStackToImport, fzMode, this.configDestination( inv ) );
src/main/java/appeng/parts/automation/PartLevelEmitter.java
+6 -6
View File
@@ -430,9 +430,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
baseY += 7.0 / 16.0;
double par10 = 0;
// double par11 = 0;
double Zero = 0;
/*
* double d5 = (double)TextureAtlasSprite.func_94209_e(); double d6 = (double)TextureAtlasSprite.func_94206_g(); double d7 =
@@ -472,9 +470,6 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
double var38 = baseX + 0.5D;
double var40 = baseZ - 0.5D;
double var42 = baseZ + 0.5D;
double var44 = 0.0625D;
double var422 = 0.1915D + 1.0 / 16.0;
double TorchLen = 0.625D;
double toff = 0.0d;
@@ -490,12 +485,17 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
}
EnumFacing t = EnumFacing.UP;
double TorchLen = 0.625D;
double var44 = 0.0625D;
double Zero = 0;
double par10 = 0;
this.addVertexWithUV(t,renderer, baseX + Zero * ( 1.0D - TorchLen ) - var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) - var44, var20, var22 );
this.addVertexWithUV(t,renderer, baseX + Zero * ( 1.0D - TorchLen ) - var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var20, var26 );
this.addVertexWithUV(t,renderer, baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var24, var26 );
this.addVertexWithUV(t,renderer, baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) - var44, var24, var22 );
double var422 = 0.1915D + 1.0 / 16.0;
this.addVertexWithUV(t,renderer, baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + var422, baseZ + par10 * ( 1.0D - TorchLen ) - var44, var24b, var22b );
this.addVertexWithUV(t,renderer, baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + var422, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var24b, var26b );
this.addVertexWithUV(t,renderer, baseX + Zero * ( 1.0D - TorchLen ) - var44, baseY + var422, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var20b, var26b );
src/main/java/appeng/parts/networking/PartCable.java
+2 -2
View File
@@ -465,10 +465,10 @@ public class PartCable extends AEBasePart implements IPartCable
if( Platform.isServer() )
{
IGridNode node = this.getGridNode();
int howMany = 0;
if( node != null )
{
int howMany = 0;
for( IGridConnection gc : node.getConnections() )
{
howMany = Math.max( gc.getUsedChannels(), howMany );
@@ -816,11 +816,11 @@ public class PartCable extends AEBasePart implements IPartCable
TileEntity te = this.tile.getWorld().getTileEntity( pos.offset( of.getFacing() ) );
IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null;
boolean isGlass = false;
AEColor myColor = this.getCableColor();
rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of.getFacing() ) ) );
boolean isGlass = false;
if( ghh != null && partHost != null && ghh.getCableConnectionType( of.getOpposite() ) == AECableType.GLASS && partHost.getPart( of.getOpposite() ) == null && partHost.getColor() != AEColor.Transparent )
{
isGlass = true;
src/main/java/appeng/parts/networking/PartDenseCable.java
+1 -1
View File
@@ -364,7 +364,6 @@ public class PartDenseCable extends PartCable
TileEntity te = this.tile.getWorld().getTileEntity( pos.offset( of.getFacing() ) );
IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null;
boolean isGlass = false;
AEColor myColor = this.getCableColor();
/*
* ( ghh != null && partHost != null && ghh.getCableConnectionType( of ) == AECableType.GLASS && partHost.getPart(
@@ -434,6 +433,7 @@ public class PartDenseCable extends PartCable
rh.renderBlock( pos, renderer );
rh.setFacesToRender( EnumSet.allOf( EnumFacing.class ) );
boolean isGlass = false;
if( !isGlass )
{
this.setSmartConnectionRotations( of, renderer );
src/main/java/appeng/parts/p2p/PartP2PLiquids.java
+1 -1
View File
@@ -136,9 +136,9 @@ public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFl
}
int available = resource.amount;
int used = 0;
i = list.iterator();
int used = 0;
while( i.hasNext() )
{
PartP2PLiquids l = i.next();