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/misc/TileCondenser.java
+4 -4
View File
@@ -69,7 +69,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
private final IFluidHandler fluidHandler = new FluidHandler();
private final MEHandler meHandler = new MEHandler();
private final IItemHandler combinedInv = new WrapperChainedItemHandler( inputSlot, inv );
private final IItemHandler combinedInv = new WrapperChainedItemHandler( this.inputSlot, this.inv );
private double storedPower = 0;
@@ -132,7 +132,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
private boolean canAddOutput( final ItemStack output )
{
return inv.insertItem( 0, output, true ).isEmpty();
return this.inv.insertItem( 0, output, true ).isEmpty();
}
/**
@@ -142,7 +142,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
*/
private void addOutput( final ItemStack output )
{
inv.insertItem( 0, output, false );
this.inv.insertItem( 0, output, false );
}
private ItemStack getOutput()
@@ -222,7 +222,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
{
if( capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY )
{
return (T) inputSlot;
return (T) this.inputSlot;
}
else if( capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY )
{
src/main/java/appeng/tile/misc/TileInscriber.java
+13 -13
View File
@@ -101,7 +101,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
private final IItemHandler bottomItemHandlerExtern;
private final IItemHandler sideItemHandlerExtern;
private final IItemHandlerModifiable inv = new WrapperChainedItemHandler( topItemHandler, bottomItemHandler, sideItemHandler );
private final IItemHandlerModifiable inv = new WrapperChainedItemHandler( this.topItemHandler, this.bottomItemHandler, this.sideItemHandler );
@Reflected
public TileInscriber()
@@ -115,9 +115,9 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
this.upgrades = new DefinitionUpgradeInventory( inscriberDefinition, this, this.getUpgradeSlots() );
final IAEItemFilter filter = new ItemHandlerFilter();
topItemHandlerExtern = new WrapperFilteredItemHandler( topItemHandler, filter );
bottomItemHandlerExtern = new WrapperFilteredItemHandler( bottomItemHandler, filter );
sideItemHandlerExtern = new WrapperFilteredItemHandler( sideItemHandler, filter );
this.topItemHandlerExtern = new WrapperFilteredItemHandler( this.topItemHandler, filter );
this.bottomItemHandlerExtern = new WrapperFilteredItemHandler( this.bottomItemHandler, filter );
this.sideItemHandlerExtern = new WrapperFilteredItemHandler( this.sideItemHandler, filter );
}
private int getUpgradeSlots()
@@ -236,7 +236,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
@Override
public IItemHandler getInternalInventory()
{
return inv;
return this.inv;
}
@Override
@@ -463,7 +463,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
if( out != null )
{
final ItemStack outputCopy = out.getOutput().copy();
if( sideItemHandler.insertItem( 1, outputCopy, true ).isEmpty() )
if( this.sideItemHandler.insertItem( 1, outputCopy, true ).isEmpty() )
{
this.setSmash( true );
this.finalStep = 0;
@@ -501,17 +501,17 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
@Override
protected IItemHandler getItemHandlerForSide( @Nonnull EnumFacing facing )
{
if( facing == getUp() )
if( facing == this.getUp() )
{
return topItemHandlerExtern;
return this.topItemHandlerExtern;
}
else if( facing == getUp().getOpposite() )
else if( facing == this.getUp().getOpposite() )
{
return bottomItemHandlerExtern;
return this.bottomItemHandlerExtern;
}
else
{
return sideItemHandlerExtern;
return this.sideItemHandlerExtern;
}
}
@@ -576,7 +576,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
return false;
}
return inv == topItemHandler || inv == bottomItemHandler || slot == 1;
return inv == TileInscriber.this.topItemHandler || inv == TileInscriber.this.bottomItemHandler || slot == 1;
}
@Override
@@ -593,7 +593,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
return false;
}
if( inv == topItemHandler || inv == bottomItemHandler )
if( inv == TileInscriber.this.topItemHandler || inv == TileInscriber.this.bottomItemHandler )
{
if( AEApi.instance().definitions().materials().namePress().isSameAs( stack ) )
{