Add this qualifier

This commit is contained in:
thatsIch
2015-09-30 14:26:54 +02:00
parent efecd4b8c1
commit ebda927fb5
105 changed files with 422 additions and 415 deletions
+5 -5
View File
@@ -114,7 +114,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor
@Override
public boolean hasCustomName()
{
return getInternalInventory().hasCustomName();
return this.getInternalInventory().hasCustomName();
}
@Override
@@ -128,7 +128,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor
{
final double squaredMCReach = 64.0D;
return this.worldObj.getTileEntity( pos ) == this && p.getDistanceSq( pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D ) <= squaredMCReach;
return this.worldObj.getTileEntity( this.pos ) == this && p.getDistanceSq( this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D ) <= squaredMCReach;
}
@Override
@@ -157,7 +157,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor
@Override
public int[] getSlotsForFace( final EnumFacing side )
{
final Block blk = this.worldObj.getBlockState( pos ).getBlock();
final Block blk = this.worldObj.getBlockState( this.pos ).getBlock();
if( blk instanceof AEBaseBlock )
{
return this.getAccessibleSlotsBySide( ( (AEBaseBlock) blk ).mapRotation( this, side ) );
@@ -204,11 +204,11 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor
@Override
public IChatComponent getDisplayName()
{
if( hasCustomName() )
if( this.hasCustomName() )
{
return new ChatComponentText( this.getCustomName() );
}
return new ChatComponentTranslation( getBlockType().getUnlocalizedName() );
return new ChatComponentTranslation( this.getBlockType().getUnlocalizedName() );
}
public abstract int[] getAccessibleSlotsBySide( EnumFacing whichSide );
+6 -6
View File
@@ -97,7 +97,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
public boolean notLoaded()
{
return !this.worldObj.isBlockLoaded( pos );
return !this.worldObj.isBlockLoaded( this.pos );
}
@Nonnull
@@ -214,7 +214,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
stream.capacity( stream.readableBytes() );
data.setByteArray( "X", stream.array() );
return new S35PacketUpdateTileEntity( pos, 64, data );
return new S35PacketUpdateTileEntity( this.pos, 64, data );
}
private boolean hasHandlerFor( final TileEventType type )
@@ -300,8 +300,8 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
// TODO: Optimize Network Load
if( this.worldObj != null )
{
AELog.blockUpdate( pos, this );
this.worldObj.markBlockForUpdate( pos );
AELog.blockUpdate( this.pos, this );
this.worldObj.markBlockForUpdate( this.pos );
}
}
}
@@ -424,7 +424,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
this.forward = inForward;
this.up = inUp;
this.markForUpdate();
Platform.notifyBlocksOfNeighbors( this.worldObj, pos );
Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos );
}
public void onPlacement( final ItemStack stack, final EntityPlayer player, final EnumFacing side )
@@ -570,7 +570,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
public void securityBreak()
{
this.worldObj.destroyBlock( pos, true );
this.worldObj.destroyBlock( this.pos, true );
this.disableDrops();
}
@@ -80,7 +80,7 @@ public class TileCraftingStorageTile extends TileCraftingTile
return 0;
}
final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( pos ).getBlock();
final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( this.pos ).getBlock();
switch( unit.type )
{
default:
@@ -114,7 +114,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
return false;
}
final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( pos ).getBlock();
final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( this.pos ).getBlock();
return unit.type == CraftingUnitType.ACCELERATOR;
}
@@ -157,12 +157,12 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
power = this.gridProxy.isActive();
}
final IBlockState current = this.worldObj.getBlockState( pos );
final IBlockState current = this.worldObj.getBlockState( this.pos );
final IBlockState newState = current.withProperty( BlockCraftingUnit.POWERED, power ).withProperty( BlockCraftingUnit.FORMED, formed );
if( current != newState )
{
this.worldObj.setBlockState( pos, newState );
this.worldObj.setBlockState( this.pos, newState );
}
if( updateFormed )
@@ -182,7 +182,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
{
if( Platform.isClient() )
{
return (boolean)this.worldObj.getBlockState( pos ).getValue( BlockCraftingUnit.FORMED );
return (boolean)this.worldObj.getBlockState( this.pos ).getValue( BlockCraftingUnit.FORMED );
}
return this.cluster != null;
}
@@ -334,7 +334,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
{
if( Platform.isClient() )
{
return (boolean)this.worldObj.getBlockState( pos ).getValue( BlockCraftingUnit.POWERED );
return (boolean)this.worldObj.getBlockState( this.pos ).getValue( BlockCraftingUnit.POWERED );
}
return this.gridProxy.isActive();
}
@@ -511,9 +511,9 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
try
{
final TargetPoint where = new TargetPoint( this.worldObj.provider.getDimensionId(), pos.getX(), pos.getY(), pos.getZ(), 32 );
final TargetPoint where = new TargetPoint( this.worldObj.provider.getDimensionId(), this.pos.getX(), this.pos.getY(), this.pos.getZ(), 32 );
final IAEItemStack item = AEItemStack.create( output );
NetworkHandler.instance.sendToAllAround( new PacketAssemblerAnimation( pos, (byte) speed, item ), where );
NetworkHandler.instance.sendToAllAround( new PacketAssemblerAnimation( this.pos, (byte) speed, item ), where );
}
catch( final IOException e )
{
@@ -592,7 +592,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
return output;
}
final TileEntity te = this.getWorld().getTileEntity( pos.offset( d ) );
final TileEntity te = this.getWorld().getTileEntity( this.pos.offset( d ) );
if( te == null )
{
@@ -81,7 +81,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, IUpdatePl
}
final EnumFacing grinder = this.getUp().getOpposite();
final TileEntity te = this.worldObj.getTileEntity( pos.offset( grinder ) );
final TileEntity te = this.worldObj.getTileEntity( this.pos.offset( grinder ) );
if( te instanceof ICrankable )
{
return (ICrankable) te;
@@ -106,8 +106,8 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, IUpdatePl
public void setOrientation( final EnumFacing inForward, final EnumFacing inUp )
{
super.setOrientation( inForward, inUp );
final IBlockState state = this.worldObj.getBlockState( pos );
this.getBlockType().onNeighborBlockChange( this.worldObj, pos, state, state.getBlock() );
final IBlockState state = this.worldObj.getBlockState( this.pos );
this.getBlockType().onNeighborBlockChange( this.worldObj, this.pos, state, state.getBlock() );
}
@Override
@@ -143,7 +143,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, IUpdatePl
this.hits++;
if( this.hits > 10 )
{
this.worldObj.destroyBlock( pos, false );
this.worldObj.destroyBlock( this.pos, false );
}
}
}
@@ -49,8 +49,8 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable
public void setOrientation( final EnumFacing inForward, final EnumFacing inUp )
{
super.setOrientation( inForward, inUp );
final IBlockState state = worldObj.getBlockState( pos );
this.getBlockType().onNeighborBlockChange( this.worldObj, pos, state, state.getBlock() );
final IBlockState state = this.worldObj.getBlockState( this.pos );
this.getBlockType().onNeighborBlockChange( this.worldObj, this.pos, state, state.getBlock() );
}
@Override
@@ -185,7 +185,7 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable
final List<ItemStack> out = new ArrayList<ItemStack>();
out.add( notAdded );
Platform.spawnDrops( this.worldObj, pos.offset( this.getForward() ), out );
Platform.spawnDrops( this.worldObj, this.pos.offset( this.getForward() ), out );
}
}
@@ -313,7 +313,7 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
{
for( int x = 0; x < this.size; x++ )
{
setInventorySlotContents( x, null );
this.setInventorySlotContents( x, null );
}
}
}
@@ -317,7 +317,7 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
{
for( int x = 0; x < this.size; x++ )
{
setInventorySlotContents( x,null );
this.setInventorySlotContents( x,null );
}
}
}
@@ -292,7 +292,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IUpda
final List<ItemStack> drops = new ArrayList<ItemStack>();
drops.add( myItem );
this.setInventorySlotContents( 0, null );
Platform.spawnDrops( this.worldObj, pos.offset( getForward() ), drops );
Platform.spawnDrops( this.worldObj, this.pos.offset( this.getForward() ), drops );
}
}
}
@@ -116,7 +116,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IT
this.setOrientation( this.pointAt.yOffset != 0 ? EnumFacing.SOUTH : EnumFacing.UP, this.pointAt.getOpposite().getFacing() );
}
configureNodeSides();
this.configureNodeSides();
this.markForUpdate();
this.markDirty();
}
@@ -153,7 +153,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IT
@Override
public void onReady()
{
configureNodeSides();
this.configureNodeSides();
super.onReady();
this.duality.initialize();
}
@@ -50,12 +50,12 @@ public class TileLightDetector extends AEBaseTile implements IUpdatePlayerListBo
public void updateLight()
{
final int val = this.worldObj.getLight( pos );
final int val = this.worldObj.getLight( this.pos );
if( this.lastLight != val )
{
this.lastLight = val;
Platform.notifyBlocksOfNeighbors( this.worldObj, pos );
Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos );
}
}
@@ -132,7 +132,7 @@ public class TilePaint extends AEBaseTile
if( this.worldObj != null )
{
this.worldObj.getLightFor( EnumSkyBlock.BLOCK, pos );
this.worldObj.getLightFor( EnumSkyBlock.BLOCK, this.pos );
}
}
@@ -169,7 +169,7 @@ public class TilePaint extends AEBaseTile
public boolean isSideValid( final EnumFacing side )
{
final BlockPos p = pos.offset( side );
final BlockPos p = this.pos.offset( side );
final IBlockState blk = this.worldObj.getBlockState( p );
return blk.getBlock().isSideSolid( this.worldObj, p, side.getOpposite() );
}
@@ -210,7 +210,7 @@ public class TilePaint extends AEBaseTile
if( this.dots == null )
{
this.worldObj.setBlockToAir( pos );
this.worldObj.setBlockToAir( this.pos );
}
}
@@ -233,7 +233,7 @@ public class TilePaint extends AEBaseTile
public void addBlot( final ItemStack type, final EnumFacing side, final Vec3 hitVec )
{
final BlockPos p = pos.offset(side);
final BlockPos p = this.pos.offset( side );
final IBlockState blk = this.worldObj.getBlockState( p );
if( blk.getBlock().isSideSolid( this.worldObj, p, side.getOpposite() ) )
@@ -291,7 +291,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
if ( this.hasWorldObj() )
{
Platform.notifyBlocksOfNeighbors( this.worldObj, pos );
Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos );
}
}
}
@@ -89,7 +89,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
if( newLV != this.oldLV )
{
this.oldLV = newLV;
this.worldObj.checkLight( pos );
this.worldObj.checkLight( this.pos );
}
this.updateTileSetting();
@@ -104,7 +104,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
{
final TileCableBus tcb = (TileCableBus) BlockCableBus.tesrTile.newInstance();
tcb.copyFrom( this );
this.getWorld().setTileEntity( pos, tcb );
this.getWorld().setTileEntity( this.pos, tcb );
}
catch( final Throwable ignored )
{
@@ -178,7 +178,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
if( newLV != this.oldLV )
{
this.oldLV = newLV;
this.worldObj.getLight( pos );
this.worldObj.getLight( this.pos );
// worldObj.updateAllLightTypes( xCoord, yCoord, zCoord );
}
@@ -209,9 +209,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
super.onReady();
if( this.cb.isEmpty() )
{
if( this.worldObj.getTileEntity( pos ) == this )
if( this.worldObj.getTileEntity( this.pos ) == this )
{
this.worldObj.destroyBlock( pos, true );
this.worldObj.destroyBlock( this.pos, true );
}
}
else
@@ -340,7 +340,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
}
}
this.getWorld().setBlockToAir( pos );
this.getWorld().setBlockToAir( this.pos );
}
@Override
@@ -360,9 +360,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
@Override
public void notifyNeighbors()
{
if( this.worldObj != null && this.worldObj.isBlockLoaded( pos ) && !CableBusContainer.isLoading() )
if( this.worldObj != null && this.worldObj.isBlockLoaded( this.pos ) && !CableBusContainer.isLoading() )
{
Platform.notifyBlocksOfNeighbors( this.worldObj, pos );
Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos );
}
}
@@ -34,7 +34,7 @@ public class TileCableBusTESR extends TileCableBus
{
final TileCableBus tcb = (TileCableBus) BlockCableBus.noTesrTile.newInstance();
tcb.copyFrom( this );
this.getWorld().setTileEntity( pos, tcb );
this.getWorld().setTileEntity( this.pos, tcb );
}
catch( final Throwable ignored )
{
@@ -73,9 +73,9 @@ public class TileController extends AENetworkPowerTile
public void onNeighborChange( final boolean force )
{
final boolean xx = checkController( pos.offset( EnumFacing.EAST ) ) && checkController( pos.offset( EnumFacing.WEST ) );
final boolean yy = checkController( pos.offset( EnumFacing.UP ) ) && checkController( pos.offset( EnumFacing.DOWN ) );
final boolean zz = checkController( pos.offset( EnumFacing.NORTH ) ) && checkController( pos.offset( EnumFacing.SOUTH ) );
final boolean xx = this.checkController( this.pos.offset( EnumFacing.EAST ) ) && this.checkController( this.pos.offset( EnumFacing.WEST ) );
final boolean yy = this.checkController( this.pos.offset( EnumFacing.UP ) ) && this.checkController( this.pos.offset( EnumFacing.DOWN ) );
final boolean zz = this.checkController( this.pos.offset( EnumFacing.NORTH ) ) && this.checkController( this.pos.offset( EnumFacing.SOUTH ) );
// int meta = world.getBlockMetadata( xCoord, yCoord, zCoord );
// boolean hasPower = meta > 0;
@@ -127,9 +127,9 @@ public class TileController extends AENetworkPowerTile
metaState = ControllerBlockState.OFFLINE;
}
if( checkController( pos ) && this.worldObj.getBlockState( pos ).getValue( BlockController.CONTROLLER_STATE ) != metaState )
if( this.checkController( this.pos ) && this.worldObj.getBlockState( this.pos ).getValue( BlockController.CONTROLLER_STATE ) != metaState )
{
this.worldObj.setBlockState( pos, worldObj.getBlockState( pos ).withProperty( BlockController.CONTROLLER_STATE, metaState ) );
this.worldObj.setBlockState( this.pos, this.worldObj.getBlockState( this.pos ).withProperty( BlockController.CONTROLLER_STATE, metaState ) );
}
}
@@ -60,8 +60,8 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
public void onReady()
{
super.onReady();
final int value = ( Integer ) this.worldObj.getBlockState( pos ).getValue( BlockEnergyCell.ENERGY_STORAGE );
currentMeta = (byte)value;
final int value = ( Integer ) this.worldObj.getBlockState( this.pos ).getValue( BlockEnergyCell.ENERGY_STORAGE );
this.currentMeta = (byte)value;
this.changePowerLevel();
}
@@ -86,7 +86,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
if( this.currentMeta != boundMetadata )
{
this.currentMeta = boundMetadata;
this.worldObj.setBlockState( pos, this.worldObj.getBlockState( pos ).withProperty( BlockEnergyCell.ENERGY_STORAGE, (int)boundMetadata ) );
this.worldObj.setBlockState( this.pos, this.worldObj.getBlockState( this.pos ).withProperty( BlockEnergyCell.ENERGY_STORAGE, (int)boundMetadata ) );
}
}
@@ -264,7 +264,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock
for( final AEPartLocation d : AEPartLocation.values() )
{
final TileEntity te = this.worldObj.getTileEntity( d == AEPartLocation.INTERNAL ? pos : pos.offset( d.getFacing() ) );
final TileEntity te = this.worldObj.getTileEntity( d == AEPartLocation.INTERNAL ? this.pos : this.pos.offset( d.getFacing() ) );
if( te instanceof TileQuantumBridge )
{
set.add( d );
@@ -89,7 +89,7 @@ public class TileSpatialIOPort extends AENetworkInvTile implements IWorldCallabl
public void updateRedstoneState()
{
final YesNo currentState = this.worldObj.isBlockIndirectlyGettingPowered( pos ) != 0 ? YesNo.YES : YesNo.NO;
final YesNo currentState = this.worldObj.isBlockIndirectlyGettingPowered( this.pos ) != 0 ? YesNo.YES : YesNo.NO;
if( this.lastRedstoneState != currentState )
{
this.lastRedstoneState = currentState;
@@ -195,7 +195,7 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock
if( hasLight != this.didHaveLight )
{
this.didHaveLight = hasLight;
this.worldObj.checkLight( pos );
this.worldObj.checkLight( this.pos );
// worldObj.updateAllLightTypes( xCoord, yCoord, zCoord );
}
}
@@ -544,7 +544,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
// update the neighbors
if( this.worldObj != null )
{
Platform.notifyBlocksOfNeighbors( this.worldObj, pos );
Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos );
this.markForUpdate();
}
}
@@ -860,7 +860,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
@Override
public void saveChanges( final IMEInventory cellInventory )
{
this.worldObj.markChunkDirty( pos, this );
this.worldObj.markChunkDirty( this.pos, this );
}
private static class ChestNoHandler extends Exception
@@ -417,6 +417,6 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
@Override
public void saveChanges( final IMEInventory cellInventory )
{
this.worldObj.markChunkDirty( pos, this );
this.worldObj.markChunkDirty( this.pos, this );
}
}
@@ -174,7 +174,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
public void updateRedstoneState()
{
final YesNo currentState = this.worldObj.isBlockIndirectlyGettingPowered( pos ) != 0 ? YesNo.YES : YesNo.NO;
final YesNo currentState = this.worldObj.isBlockIndirectlyGettingPowered( this.pos ) != 0 ? YesNo.YES : YesNo.NO;
if( this.lastRedstoneState != currentState )
{
this.lastRedstoneState = currentState;
@@ -87,7 +87,7 @@ public class TileSkyChest extends AEBaseInvTile
if( this.playerOpen == 1 )
{
this.getWorld().playSoundEffect( pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "random.chestopen", 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F );
this.getWorld().playSoundEffect( this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, "random.chestopen", 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F );
this.markForUpdate();
}
}
@@ -109,7 +109,7 @@ public class TileSkyChest extends AEBaseInvTile
if( this.playerOpen == 0 )
{
this.getWorld().playSoundEffect( pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "random.chestclosed", 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F );
this.getWorld().playSoundEffect( this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, "random.chestclosed", 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F );
this.markForUpdate();
}
}