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

Merge pull request #218 from thatsIch/localvars

Browse Source 
Remove redundant local variables
This commit is contained in:
Chris
2014-10-01 20:23:56 -07:00
parent 67d8a43ea1 cd064ec05c
commit c2fba2de55
21 changed files with 58 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/implementations/ContainerCondenser.java
+1 -2
View File
@@ -34,9 +34,8 @@ public class ContainerCondenser extends AEBaseContainer implements IProgressProv
{
double maxStorage = this.condenser.getStorage();
double requiredEnergy = this.condenser.getRequiredPower();
int maxDisplay = requiredEnergy == 0 ? (int) maxStorage : (int) Math.min( requiredEnergy, maxStorage );
this.requiredEnergy = maxDisplay;
this.requiredEnergy = requiredEnergy == 0 ? (int) maxStorage : (int) Math.min( requiredEnergy, maxStorage );
this.storedPower = (int) this.condenser.storedPower;
this.output = (CondenserOutput) this.condenser.getConfigManager().getSetting( Settings.CONDENSER_OUTPUT );
}
src/main/java/appeng/container/implementations/ContainerUpgradeable.java
+1 -2
View File
@@ -52,8 +52,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl
if ( te instanceof IPart )
{
IUpgradeableHost myTile = te;
TileEntity mk = myTile.getTile();
TileEntity mk = te.getTile();
w = mk.getWorldObj();
xCoord = mk.xCoord;
yCoord = mk.yCoord;
src/main/java/appeng/container/slot/SlotRestrictedInput.java
+1 -2
View File
@@ -198,8 +198,7 @@ public class SlotRestrictedInput extends AppEngSlot
case WORKBENCH_CELL:
return i.getItem() instanceof ICellWorkbenchItem && ((ICellWorkbenchItem) i.getItem()).isEditable( i );
case STORAGE_COMPONENT:
boolean isComp = i.getItem() instanceof IStorageComponent && ((IStorageComponent) i.getItem()).isStorageComponent( i );
return isComp;
return i.getItem() instanceof IStorageComponent && ((IStorageComponent) i.getItem()).isStorageComponent( i );
case TRASH:
if ( AEApi.instance().registries().cell().isCellHandled( i ) )
return false;