Always use qualified access for fields and methods

This commit is contained in:
yueh
2017-07-20 21:27:22 +02:00
parent f9cad0758d
commit 15582fd1df
211 changed files with 1086 additions and 1086 deletions
+4 -4
View File
@@ -246,15 +246,15 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor
{
if( facing == null )
{
if( itemHandler == null )
if( this.itemHandler == null )
{
itemHandler = new InvWrapper( getInternalInventory() );
this.itemHandler = new InvWrapper( this.getInternalInventory() );
}
return (T) itemHandler;
return (T) this.itemHandler;
}
else
{
return (T) sidedItemHandler.computeIfAbsent( facing, side -> new SidedInvWrapper( this, side ) );
return (T) this.sidedItemHandler.computeIfAbsent( facing, side -> new SidedInvWrapper( this, side ) );
}
}
return super.getCapability( capability, facing );
+10 -10
View File
@@ -118,11 +118,11 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
@Nonnull
public IBlockState getBlockState()
{
if( state == null )
if( this.state == null )
{
state = world.getBlockState( getPos() );
this.state = this.world.getBlockState( this.getPos() );
}
return state;
return this.state;
}
/**
@@ -197,7 +197,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
@Override
public SPacketUpdateTileEntity getUpdatePacket()
{
return new SPacketUpdateTileEntity( this.pos, 64, getUpdateTag() );
return new SPacketUpdateTileEntity( this.pos, 64, this.getUpdateTag() );
}
private boolean hasHandlerFor( final TileEventType type )
@@ -213,7 +213,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
// / pkt.actionType
if( pkt.getTileEntityType() == 64 )
{
handleUpdateTag( pkt.getNbtCompound() );
this.handleUpdateTag( pkt.getNbtCompound() );
}
}
@@ -260,16 +260,16 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
@Override
public NBTTagCompound getUpdateTag()
{
final NBTTagCompound data = writeUpdateData();
final NBTTagCompound data = this.writeUpdateData();
if( data == null )
{
return new NBTTagCompound();
}
data.setInteger( "x", pos.getX() );
data.setInteger( "y", pos.getY() );
data.setInteger( "z", pos.getZ() );
data.setInteger( "x", this.pos.getX() );
data.setInteger( "y", this.pos.getY() );
data.setInteger( "z", this.pos.getZ() );
return data;
}
@@ -340,7 +340,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
if( this.world != null )
{
AELog.blockUpdate( this.pos, this );
this.world.notifyBlockUpdate( this.pos, getBlockState(), getBlockState(), 3 );
this.world.notifyBlockUpdate( this.pos, this.getBlockState(), this.getBlockState(), 3 );
}
}
}
@@ -126,7 +126,7 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
@Override
public void setInventorySlotContents( final int slot, final ItemStack newItemStack )
{
final ItemStack oldStack = getOldStack( slot );
final ItemStack oldStack = this.getOldStack( slot );
this.inv[slot] = newItemStack;
if( this.getTileEntity() != null && this.eventsEnabled() )
@@ -245,7 +245,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid
@Override
public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
{
return doWork() ? TickRateModulation.FASTER : TickRateModulation.SLEEP;
return this.doWork() ? TickRateModulation.FASTER : TickRateModulation.SLEEP;
}
private boolean doWork()
@@ -287,15 +287,15 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
{
if( capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY )
{
return (T) itemHandler;
return (T) this.itemHandler;
}
else if( capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY )
{
return (T) fluidHandler;
return (T) this.fluidHandler;
}
else if( capability == Capabilities.STORAGE_MONITORABLE_ACCESSOR )
{
return (T) meHandler;
return (T) this.meHandler;
}
return super.getCapability( capability, facing );
}
@@ -326,7 +326,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
}
if( !simulate && !stack.isEmpty() )
{
addPower( stack.getCount() );
TileCondenser.this.addPower( stack.getCount() );
}
return ItemStack.EMPTY;
}
@@ -364,7 +364,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
{
if( doFill )
{
addPower( ( resource == null ? 0.0 : (double) resource.amount ) / 500.0 );
TileCondenser.this.addPower( ( resource == null ? 0.0 : (double) resource.amount ) / 500.0 );
}
return resource == null ? 0 : resource.amount;
@@ -408,13 +408,13 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
@Override
public IMEMonitor<IAEItemStack> getItemInventory()
{
return itemInventory;
return this.itemInventory;
}
@Override
public IMEMonitor<IAEFluidStack> getFluidInventory()
{
return fluidInventory;
return this.fluidInventory;
}
}
@@ -589,17 +589,17 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
{
if( capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY )
{
if( facing == getUp() )
if( facing == this.getUp() )
{
return (T) topItemHandler;
return (T) this.topItemHandler;
}
else if( facing == getUp().getOpposite() )
else if( facing == this.getUp().getOpposite() )
{
return (T) bottomItemHandler;
return (T) this.bottomItemHandler;
}
else
{
return (T) sideItemHandler;
return (T) this.sideItemHandler;
}
}
@@ -673,7 +673,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
@Override
public int getSlots()
{
return insertSlot != extractSlot ? 2 : 1;
return this.insertSlot != this.extractSlot ? 2 : 1;
}
@Override
@@ -682,11 +682,11 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
{
if( slot == 0 )
{
return inv.getStackInSlot( insertSlot );
return TileInscriber.this.inv.getStackInSlot( this.insertSlot );
}
else if( insertSlot != extractSlot && slot == 1 )
else if( this.insertSlot != this.extractSlot && slot == 1 )
{
return inv.getStackInSlot( extractSlot );
return TileInscriber.this.inv.getStackInSlot( this.extractSlot );
}
return ItemStack.EMPTY;
}
@@ -701,12 +701,12 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
}
// If there's already an item stack in the slot, we don't allow insertion and don't do any other checks
if( !inv.getStackInSlot( insertSlot ).isEmpty() )
if( !TileInscriber.this.inv.getStackInSlot( this.insertSlot ).isEmpty() )
{
return stack;
}
AdaptorIInventory adapter = new AdaptorIInventory( new WrapperInventoryRange( TileInscriber.this, insertSlot, 1, true ) );
AdaptorIInventory adapter = new AdaptorIInventory( new WrapperInventoryRange( TileInscriber.this, this.insertSlot, 1, true ) );
if( simulate )
{
@@ -722,14 +722,14 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
@Nonnull
public ItemStack extractItem( int slot, int amount, boolean simulate )
{
final int validExtractSlot = ( insertSlot == extractSlot ) ? 0 : 1;
final int validExtractSlot = ( this.insertSlot == this.extractSlot ) ? 0 : 1;
if( slot != validExtractSlot || amount == 0 )
{
return ItemStack.EMPTY;
}
AdaptorIInventory adapter = new AdaptorIInventory( new WrapperInventoryRange( TileInscriber.this, extractSlot, 1, true ) );
AdaptorIInventory adapter = new AdaptorIInventory( new WrapperInventoryRange( TileInscriber.this, this.extractSlot, 1, true ) );
if( simulate )
{
@@ -95,25 +95,25 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
EnumFacing newForward = facing;
if( !omniDirectional && getForward() == facing.getOpposite() )
if( !this.omniDirectional && this.getForward() == facing.getOpposite() )
{
newForward = facing;
}
else if( !omniDirectional && ( getForward() == facing || getForward() == facing.getOpposite() ) )
else if( !this.omniDirectional && ( this.getForward() == facing || this.getForward() == facing.getOpposite() ) )
{
omniDirectional = true;
this.omniDirectional = true;
}
else if( omniDirectional )
else if( this.omniDirectional )
{
newForward = facing.getOpposite();
omniDirectional = false;
this.omniDirectional = false;
}
else
{
newForward = Platform.rotateAround( getForward(), facing );
newForward = Platform.rotateAround( this.getForward(), facing );
}
if( omniDirectional )
if( this.omniDirectional )
{
this.setOrientation( EnumFacing.NORTH, EnumFacing.UP );
}
@@ -134,13 +134,13 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
private void configureNodeSides()
{
if( omniDirectional )
if( this.omniDirectional )
{
this.getProxy().setValidSides( EnumSet.allOf( EnumFacing.class ) );
}
else
{
this.getProxy().setValidSides( EnumSet.complementOf( EnumSet.of( getForward() ) ) );
this.getProxy().setValidSides( EnumSet.complementOf( EnumSet.of( this.getForward() ) ) );
}
}
@@ -174,7 +174,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
@TileEvent( TileEventType.WORLD_NBT_WRITE )
public void writeToNBT_TileInterface( final NBTTagCompound data )
{
data.setBoolean( "omniDirectional", omniDirectional );
data.setBoolean( "omniDirectional", this.omniDirectional );
this.duality.writeToNBT( data );
}
@@ -191,13 +191,13 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
{
boolean oldOmniDirectional = this.omniDirectional;
this.omniDirectional = data.readBoolean();
return oldOmniDirectional != omniDirectional;
return oldOmniDirectional != this.omniDirectional;
}
@TileEvent( TileEventType.NETWORK_WRITE )
public void writeToStream_TileInterface( final ByteBuf data )
{
data.writeBoolean( omniDirectional );
data.writeBoolean( this.omniDirectional );
}
@Override
@@ -263,11 +263,11 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
@Override
public EnumSet<EnumFacing> getTargets()
{
if( omniDirectional )
if( this.omniDirectional )
{
return EnumSet.allOf( EnumFacing.class );
}
return EnumSet.of( getForward() );
return EnumSet.of( this.getForward() );
}
@Override
@@ -105,7 +105,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
{
final TileCableBus tcb = (TileCableBus) BlockCableBus.getTesrTile().newInstance();
tcb.copyFrom( this );
this.getWorld().setTileEntity( pos, tcb );
this.getWorld().setTileEntity( this.pos, tcb );
}
catch( final Throwable ignored )
{
@@ -388,7 +388,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
// Note that null will be translated to INTERNAL here
AEPartLocation partLocation = AEPartLocation.fromFacing( fromSide );
IPart part = getPart( partLocation );
IPart part = this.getPart( partLocation );
boolean result = part != null && part.hasCapability( capabilityClass );
return result || super.hasCapability( capabilityClass, fromSide );
@@ -400,7 +400,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
// Note that null will be translated to INTERNAL here
AEPartLocation partLocation = AEPartLocation.fromFacing( fromSide );
IPart part = getPart( partLocation );
IPart part = this.getPart( partLocation );
T result = part == null ? null : part.getCapability( capabilityClass );
if( result != null )
@@ -37,7 +37,7 @@ public class TileCableBusTESR extends TileCableBus
{
final TileCableBus tcb = (TileCableBus) BlockCableBus.getNoTesrTile().newInstance();
tcb.copyFrom( this );
this.getWorld().setTileEntity( pos, tcb );
this.getWorld().setTileEntity( this.pos, tcb );
}
catch( final Throwable ignored )
{
@@ -61,13 +61,13 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
public AERootPoweredTile()
{
forgeEnergyAdapter = new ForgeEnergyAdapter( this );
this.forgeEnergyAdapter = new ForgeEnergyAdapter( this );
if( Capabilities.TESLA_CONSUMER != null )
{
teslaEnergyAdapter = new TeslaEnergyAdapter( this );
this.teslaEnergyAdapter = new TeslaEnergyAdapter( this );
}
ic2Sink = Integrations.ic2().createPowerSink( this, this );
ic2Sink.setValidFaces( internalPowerSides );
this.ic2Sink = Integrations.ic2().createPowerSink( this, this );
this.ic2Sink.setValidFaces( this.internalPowerSides );
}
protected EnumSet<EnumFacing> getPowerSides()
@@ -78,7 +78,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
protected void setPowerSides( final EnumSet<EnumFacing> sides )
{
this.internalPowerSides = sides;
ic2Sink.setValidFaces( sides );
this.ic2Sink.setValidFaces( sides );
// trigger re-calc!
}
@@ -262,7 +262,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
{
super.onReady();
ic2Sink.onLoad();
this.ic2Sink.onLoad();
}
@Override
@@ -270,7 +270,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
{
super.onChunkUnload();
ic2Sink.onChunkUnload();
this.ic2Sink.onChunkUnload();
}
@Override
@@ -278,7 +278,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
{
super.invalidate();
ic2Sink.invalidate();
this.ic2Sink.invalidate();
}
@Override
@@ -310,14 +310,14 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
{
if( this.getPowerSides().contains( facing ) )
{
return (T) forgeEnergyAdapter;
return (T) this.forgeEnergyAdapter;
}
}
else if( capability == Capabilities.TESLA_CONSUMER )
{
if( this.getPowerSides().contains( facing ) )
{
return (T) teslaEnergyAdapter;
return (T) this.teslaEnergyAdapter;
}
}
@@ -23,12 +23,12 @@ class ForgeEnergyAdapter implements IEnergyStorage
@Override
public final int receiveEnergy( int maxReceive, boolean simulate )
{
final int networkDemand = (int) Math.floor( sink.getExternalPowerDemand( PowerUnits.RF, maxReceive ) );
final int networkDemand = (int) Math.floor( this.sink.getExternalPowerDemand( PowerUnits.RF, maxReceive ) );
final int used = Math.min( maxReceive, networkDemand );
if( !simulate )
{
sink.injectExternalPower( PowerUnits.RF, used );
this.sink.injectExternalPower( PowerUnits.RF, used );
}
return used;
@@ -37,13 +37,13 @@ class ForgeEnergyAdapter implements IEnergyStorage
@Override
public final int getEnergyStored()
{
return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, sink.getAECurrentPower() ) );
return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, this.sink.getAECurrentPower() ) );
}
@Override
public final int getMaxEnergyStored()
{
return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, sink.getAEMaxPower() ) );
return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, this.sink.getAEMaxPower() ) );
}
@Override
@@ -43,12 +43,12 @@ class TeslaEnergyAdapter implements ITeslaConsumer
// Cut it down to what we can represent in a double
double powerDbl = (double) power;
double networkDemand = sink.getExternalPowerDemand( PowerUnits.RF, powerDbl );
double networkDemand = this.sink.getExternalPowerDemand( PowerUnits.RF, powerDbl );
long used = (long) Math.min( powerDbl, networkDemand );
if( !simulated )
{
sink.injectExternalPower( PowerUnits.RF, used );
this.sink.injectExternalPower( PowerUnits.RF, used );
}
return used;
@@ -147,7 +147,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock
.blocks()
.quantumLink()
.maybeBlock()
.map( link -> getBlockType() == link )
.map( link -> this.getBlockType() == link )
.orElse( false );
}
@@ -931,11 +931,11 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
@Override
public boolean hasCapability( Capability<?> capability, EnumFacing facing )
{
if( capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && this.fluidHandler != null && facing != getForward() )
if( capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && this.fluidHandler != null && facing != this.getForward() )
{
return true;
}
if( capability == Capabilities.STORAGE_MONITORABLE_ACCESSOR && this.accessor != null && facing != getForward() )
if( capability == Capabilities.STORAGE_MONITORABLE_ACCESSOR && this.accessor != null && facing != this.getForward() )
{
return true;
}
@@ -946,13 +946,13 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
@Override
public <T> T getCapability( Capability<T> capability, @Nullable EnumFacing facing )
{
if( capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && this.fluidHandler != null && facing != getForward() )
if( capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && this.fluidHandler != null && facing != this.getForward() )
{
return (T) this.fluidHandler;
}
if( capability == Capabilities.STORAGE_MONITORABLE_ACCESSOR && this.accessor != null && facing != getForward() )
if( capability == Capabilities.STORAGE_MONITORABLE_ACCESSOR && this.accessor != null && facing != this.getForward() )
{
return (T) accessor;
return (T) this.accessor;
}
return super.getCapability( capability, facing );
}
@@ -963,7 +963,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
@Override
public IStorageMonitorable getInventory( BaseActionSource src )
{
if( Platform.canAccess( getProxy(), src ) )
if( Platform.canAccess( TileChest.this.getProxy(), src ) )
{
return TileChest.this;
}
@@ -227,7 +227,7 @@ public class TileSkyChest extends AEBaseInvTile implements ITickable
public float getPrevLidAngle()
{
return prevLidAngle;
return this.prevLidAngle;
}
public void setPrevLidAngle( float prevLidAngle )