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

Use qualified method and field access

Browse Source
This commit is contained in:
yueh
2017-08-11 21:43:47 +02:00
parent cdcab7d91c
commit e39855b48f
30 changed files with 207 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/storage/TileChest.java
+10 -9
View File
@@ -110,7 +110,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
private final AppEngInternalInventory inputInventory = new AppEngInternalInventory( this, 1 );
private final AppEngInternalInventory cellInventory = new AppEngInternalInventory( this, 1 );
private final IItemHandler internalInventory = new WrapperChainedItemHandler( inputInventory, cellInventory );
private final IItemHandler internalInventory = new WrapperChainedItemHandler( this.inputInventory, this.cellInventory );
private final BaseActionSource mySrc = new MachineSource( this );
private final IConfigManager config = new ConfigManager( this );
@@ -144,7 +144,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
public ItemStack getCell()
{
return cellInventory.getStackInSlot( 0 );
return this.cellInventory.getStackInSlot( 0 );
}
@Override
@@ -553,7 +553,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
@Override
public void onChangeInventory( final IItemHandler inv, final int slot, final InvOperation mc, final ItemStack removed, final ItemStack added )
{
if( inv == cellInventory )
if( inv == this.cellInventory )
{
this.itemCell = null;
this.fluidCell = null;
@@ -578,7 +578,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
this.markForUpdate();
}
}
if( inv == inputInventory && mc == InvOperation.INSERT )
if( inv == this.inputInventory && mc == InvOperation.INSERT )
{
this.tryToStoreContents();
}
@@ -589,11 +589,11 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
{
if( side == this.getForward() )
{
return cellInventory;
return this.cellInventory;
}
else
{
return inputInventory;
return this.inputInventory;
}
}
@@ -1010,14 +1010,15 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
@Override
public boolean allowInsert( IItemHandler inv, int slot, ItemStack stack )
{
if( isPowered() )
if( TileChest.this.isPowered() )
{
try
{
final IMEInventory<IAEItemStack> cell = getHandler( StorageChannel.ITEMS );
final IMEInventory<IAEItemStack> cell = TileChest.this.getHandler( StorageChannel.ITEMS );
if( cell != null )
{
final IAEItemStack returns = cell.injectItems( AEApi.instance().storage().createItemStack( stack ), Actionable.SIMULATE, mySrc );
final IAEItemStack returns = cell.injectItems( AEApi.instance().storage().createItemStack( stack ), Actionable.SIMULATE,
TileChest.this.mySrc );
return returns == null || returns.getStackSize() != stack.getCount();
}
}
src/main/java/appeng/tile/storage/TileIOPort.java
+10 -10
View File
@@ -84,10 +84,10 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
private final AppEngInternalInventory inputCells = new AppEngInternalInventory( this, 6 );
private final AppEngInternalInventory outputCells = new AppEngInternalInventory( this, 6 );
private final IItemHandler combinedInventory = new WrapperChainedItemHandler( inputCells, outputCells );
private final IItemHandler combinedInventory = new WrapperChainedItemHandler( this.inputCells, this.outputCells );
private final IItemHandler inputCellsExt = new WrapperFilteredItemHandler( inputCells, AEItemFilters.INSERT_ONLY );
private final IItemHandler outputCellsExt = new WrapperFilteredItemHandler( outputCells, AEItemFilters.EXTRACT_ONLY );
private final IItemHandler inputCellsExt = new WrapperFilteredItemHandler( this.inputCells, AEItemFilters.INSERT_ONLY );
private final IItemHandler outputCellsExt = new WrapperFilteredItemHandler( this.outputCells, AEItemFilters.EXTRACT_ONLY );
private final UpgradeInventory upgrades;
private final BaseActionSource mySrc;
@@ -232,7 +232,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
{
if( this.isEnabled() )
{
return !ItemHandlerUtil.isEmpty( inputCells );
return !ItemHandlerUtil.isEmpty( this.inputCells );
}
return false;
@@ -256,13 +256,13 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
@Override
protected IItemHandler getItemHandlerForSide( final EnumFacing facing )
{
if( facing == getUp() || facing == getUp().getOpposite() )
if( facing == this.getUp() || facing == this.getUp().getOpposite() )
{
return inputCellsExt;
return this.inputCellsExt;
}
else
{
return outputCellsExt;
return this.outputCellsExt;
}
}
@@ -470,10 +470,10 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
private boolean moveSlot( final int x )
{
final InventoryAdaptor ad = new AdaptorItemHandler( outputCells );
if( ad.addItems( inputCells.getStackInSlot( x ) ).isEmpty() )
final InventoryAdaptor ad = new AdaptorItemHandler( this.outputCells );
if( ad.addItems( this.inputCells.getStackInSlot( x ) ).isEmpty() )
{
inputCells.setStackInSlot( x, ItemStack.EMPTY );
this.inputCells.setStackInSlot( x, ItemStack.EMPTY );
return true;
}
return false;