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

Changed access to use this qualifier

Browse Source
This commit is contained in:
yueh
2014-12-29 15:13:47 +01:00
parent 2a5e57a59b
commit f471513bd0
604 changed files with 11573 additions and 11573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/debug/BlockChunkloader.java
+3 -3
View File
@@ -36,8 +36,8 @@ public class BlockChunkloader extends AEBaseBlock implements LoadingCallback
public BlockChunkloader() {
super( BlockChunkloader.class, Material.iron );
setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
setTileEntity( TileChunkLoader.class );
this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
this.setTileEntity( TileChunkLoader.class );
ForgeChunkManager.setForcedChunkLoadingCallback( AppEng.instance, this );
}
@@ -50,7 +50,7 @@ public class BlockChunkloader extends AEBaseBlock implements LoadingCallback
@Override
public void registerBlockIcons(IIconRegister iconRegistry)
{
registerNoIcons();
this.registerNoIcons();
}
}
src/main/java/appeng/debug/BlockCubeGenerator.java
+4 -4
View File
@@ -32,15 +32,15 @@ public class BlockCubeGenerator extends AEBaseBlock
public BlockCubeGenerator() {
super( BlockCubeGenerator.class, Material.iron );
setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
setTileEntity( TileCubeGenerator.class );
this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
this.setTileEntity( TileCubeGenerator.class );
}
@Override
public boolean onActivated(World w, int x, int y, int z,
EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
TileCubeGenerator tcg = getTileEntity(w, x, y, z);
TileCubeGenerator tcg = this.getTileEntity(w, x, y, z);
if ( tcg != null )
tcg.click( player );
@@ -50,7 +50,7 @@ public class BlockCubeGenerator extends AEBaseBlock
@Override
public void registerBlockIcons(IIconRegister iconRegistry)
{
registerNoIcons();
this.registerNoIcons();
}
}
src/main/java/appeng/debug/BlockItemGen.java
+3 -3
View File
@@ -30,14 +30,14 @@ public class BlockItemGen extends AEBaseBlock
public BlockItemGen() {
super( BlockItemGen.class, Material.iron );
setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
setTileEntity( TileItemGen.class );
this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
this.setTileEntity( TileItemGen.class );
}
@Override
public void registerBlockIcons(IIconRegister iconRegistry)
{
registerNoIcons();
this.registerNoIcons();
}
}
src/main/java/appeng/debug/BlockPhantomNode.java
+4 -4
View File
@@ -32,14 +32,14 @@ public class BlockPhantomNode extends AEBaseBlock
public BlockPhantomNode() {
super( BlockPhantomNode.class, Material.iron );
setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
setTileEntity( TilePhantomNode.class );
this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
this.setTileEntity( TilePhantomNode.class );
}
@Override
public boolean onActivated(World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
{
TilePhantomNode tpn = getTileEntity( w, x, y, z );
TilePhantomNode tpn = this.getTileEntity( w, x, y, z );
tpn.BOOM();
return true;
}
@@ -47,7 +47,7 @@ public class BlockPhantomNode extends AEBaseBlock
@Override
public void registerBlockIcons(IIconRegister iconRegistry)
{
registerNoIcons();
this.registerNoIcons();
}
}
src/main/java/appeng/debug/TileChunkLoader.java
+9 -9
View File
@@ -44,10 +44,10 @@ public class TileChunkLoader extends AEBaseTile
@TileEvent(TileEventType.TICK)
public void Tick_TileChunkLoader()
{
if ( requestTicket )
if ( this.requestTicket )
{
requestTicket = false;
initTicket();
this.requestTicket = false;
this.initTicket();
}
}
@@ -56,9 +56,9 @@ public class TileChunkLoader extends AEBaseTile
if ( Platform.isClient() )
return;
ct = ForgeChunkManager.requestTicket( AppEng.instance, worldObj, Type.NORMAL );
this.ct = ForgeChunkManager.requestTicket( AppEng.instance, this.worldObj, Type.NORMAL );
if ( ct == null )
if ( this.ct == null )
{
MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
if ( server != null )
@@ -72,8 +72,8 @@ public class TileChunkLoader extends AEBaseTile
return;
}
AELog.info( "New Ticket " + ct.toString() );
ForgeChunkManager.forceChunk( ct, new ChunkCoordIntPair( xCoord >> 4, zCoord >> 4 ) );
AELog.info( "New Ticket " + this.ct.toString() );
ForgeChunkManager.forceChunk( this.ct, new ChunkCoordIntPair( this.xCoord >> 4, this.zCoord >> 4 ) );
}
@Override
@@ -82,7 +82,7 @@ public class TileChunkLoader extends AEBaseTile
if ( Platform.isClient() )
return;
AELog.info( "Released Ticket " + ct.toString() );
ForgeChunkManager.releaseTicket( ct );
AELog.info( "Released Ticket " + this.ct.toString() );
ForgeChunkManager.releaseTicket( this.ct );
}
}
src/main/java/appeng/debug/TileCubeGenerator.java
+22 -22
View File
@@ -40,39 +40,39 @@ public class TileCubeGenerator extends AEBaseTile
@TileEvent(TileEventType.TICK)
public void TCG_Tick()
{
if ( is != null && Platform.isServer() )
if ( this.is != null && Platform.isServer() )
{
countdown--;
this.countdown--;
if ( countdown % 20 == 0 )
if ( this.countdown % 20 == 0 )
{
for (EntityPlayer e : CommonHelper.proxy.getPlayers())
{
e.addChatMessage( new ChatComponentText( "Spawning in... " + (countdown / 20) ) );
e.addChatMessage( new ChatComponentText( "Spawning in... " + (this.countdown / 20) ) );
}
}
if ( countdown <= 0 )
spawn();
if ( this.countdown <= 0 )
this.spawn();
}
}
void spawn()
{
worldObj.setBlock( xCoord, yCoord, zCoord, Platform.air, 0, 3 );
this.worldObj.setBlock( this.xCoord, this.yCoord, this.zCoord, Platform.air, 0, 3 );
Item i = is.getItem();
Item i = this.is.getItem();
int side = ForgeDirection.UP.ordinal();
int half = (int) Math.floor( size / 2 );
int half = (int) Math.floor( this.size / 2 );
for (int y = 0; y < size; y++)
for (int y = 0; y < this.size; y++)
{
for (int x = -half; x < half; x++)
{
for (int z = -half; z < half; z++)
{
i.onItemUse( is.copy(), who, worldObj, x + xCoord, y + yCoord - 1, z + zCoord, side, 0.5f, 0.0f, 0.5f );
i.onItemUse( this.is.copy(), this.who, this.worldObj, x + this.xCoord, y + this.yCoord - 1, z + this.zCoord, side, 0.5f, 0.0f, 0.5f );
}
}
}
@@ -83,28 +83,28 @@ public class TileCubeGenerator extends AEBaseTile
if ( Platform.isServer() )
{
ItemStack hand = player.inventory.getCurrentItem();
who = player;
this.who = player;
if ( hand == null )
{
is = null;
this.is = null;
if ( player.isSneaking() )
size--;
this.size--;
else
size++;
this.size++;
if ( size < 3 )
size = 3;
if ( size > 64 )
size = 64;
if ( this.size < 3 )
this.size = 3;
if ( this.size > 64 )
this.size = 64;
player.addChatMessage( new ChatComponentText( "Size: " + size ) );
player.addChatMessage( new ChatComponentText( "Size: " + this.size ) );
}
else
{
countdown = 20 * 10;
is = hand;
this.countdown = 20 * 10;
this.is = hand;
}
}
}
src/main/java/appeng/debug/TileItemGen.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class TileItemGen extends AEBaseTile implements IInventory
@Override
public ItemStack getStackInSlot(int i)
{
return getRandomItem();
return this.getRandomItem();
}
private ItemStack getRandomItem()
src/main/java/appeng/debug/TilePhantomNode.java
+8 -8
View File
@@ -35,26 +35,26 @@ public class TilePhantomNode extends AENetworkTile
public void onReady()
{
super.onReady();
proxy = createProxy();
proxy.onReady();
crashMode = true;
this.proxy = this.createProxy();
this.proxy.onReady();
this.crashMode = true;
}
@Override
public IGridNode getGridNode(ForgeDirection dir)
{
if ( !crashMode )
if ( !this.crashMode )
return super.getGridNode( dir );
return proxy.getNode();
return this.proxy.getNode();
}
public void BOOM()
{
if ( proxy != null )
if ( this.proxy != null )
{
crashMode = true;
proxy.setValidSides( EnumSet.allOf( ForgeDirection.class ) );
this.crashMode = true;
this.proxy.setValidSides( EnumSet.allOf( ForgeDirection.class ) );
}
}
}
src/main/java/appeng/debug/ToolDebugCard.java
+15 -15
View File
@@ -52,7 +52,7 @@ public class ToolDebugCard extends AEBaseItem
public ToolDebugCard() {
super( ToolDebugCard.class );
setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
}
public String timeMeasurement(long nanos)
@@ -80,8 +80,8 @@ public class ToolDebugCard extends AEBaseItem
totalNodes += g.getNodes().size();
}
outputMsg( player, "Grids: " + grids );
outputMsg( player, "Total Nodes: " + totalNodes );
this.outputMsg( player, "Grids: " + grids );
this.outputMsg( player, "Total Nodes: " + totalNodes );
}
else
{
@@ -94,8 +94,8 @@ public class ToolDebugCard extends AEBaseItem
{
Grid g = node.getInternalGrid();
IGridNode center = g.getPivot();
outputMsg( player, "This Node: " + node.toString() );
outputMsg( player, "Center Node: " + center.toString() );
this.outputMsg( player, "This Node: " + node.toString() );
this.outputMsg( player, "Center Node: " + center.toString() );
IPathingGrid pg = g.getCache( IPathingGrid.class );
if ( pg.getControllerState() == ControllerState.CONTROLLER_ONLINE )
@@ -127,12 +127,12 @@ public class ToolDebugCard extends AEBaseItem
break;
}
outputMsg( player, "Cable Distance: " + length );
this.outputMsg( player, "Cable Distance: " + length );
}
if ( center.getMachine() instanceof PartP2PTunnel )
{
outputMsg( player, "Freq: " + ((PartP2PTunnel) center.getMachine()).freq );
this.outputMsg( player, "Freq: " + ((PartP2PTunnel) center.getMachine()).freq );
}
TickManagerCache tmc = g.getCache( ITickManager.class );
@@ -148,19 +148,19 @@ public class ToolDebugCard extends AEBaseItem
if ( nanos < 0 )
{
outputMsg( player, c.getSimpleName() + " - " + o );
this.outputMsg( player, c.getSimpleName() + " - " + o );
}
else
{
outputMsg( player, c.getSimpleName() + " - " + o + "; " + timeMeasurement( nanos ) );
this.outputMsg( player, c.getSimpleName() + " - " + o + "; " + this.timeMeasurement( nanos ) );
}
}
}
else
outputMsg( player, "No Node Available." );
this.outputMsg( player, "No Node Available." );
}
else
outputMsg( player, "Not Networked Block" );
this.outputMsg( player, "Not Networked Block" );
if ( te instanceof IPartHost )
{
@@ -169,12 +169,12 @@ public class ToolDebugCard extends AEBaseItem
if ( center != null )
{
GridNode n = (GridNode) center.getGridNode();
outputMsg( player, "Node Channels: " + n.usedChannels() );
this.outputMsg( player, "Node Channels: " + n.usedChannels() );
for (IGridConnection gc : n.getConnections())
{
ForgeDirection fd = gc.getDirection( n );
if ( fd != ForgeDirection.UNKNOWN )
outputMsg( player, fd.toString() + ": " + gc.getUsedChannels() );
this.outputMsg( player, fd.toString() + ": " + gc.getUsedChannels() );
}
}
}
@@ -182,7 +182,7 @@ public class ToolDebugCard extends AEBaseItem
if ( te instanceof IAEPowerStorage )
{
IAEPowerStorage ps = (IAEPowerStorage) te;
outputMsg( player, "Energy: " + ps.getAECurrentPower() + " / " + ps.getAEMaxPower() );
this.outputMsg( player, "Energy: " + ps.getAECurrentPower() + " / " + ps.getAEMaxPower() );
if ( te instanceof IGridHost )
{
@@ -190,7 +190,7 @@ public class ToolDebugCard extends AEBaseItem
if ( node != null && node.getGrid() != null )
{
IEnergyGrid eg = node.getGrid().getCache( IEnergyGrid.class );
outputMsg( player, "GridEnergy: " + eg.getStoredPower() + " : " + eg.getEnergyDemand( Double.MAX_VALUE ) );
this.outputMsg( player, "GridEnergy: " + eg.getStoredPower() + " : " + eg.getEnergyDemand( Double.MAX_VALUE ) );
}
}
}
src/main/java/appeng/debug/ToolEraser.java
+8 -8
View File
@@ -39,7 +39,7 @@ public class ToolEraser extends AEBaseItem
public ToolEraser() {
super( ToolEraser.class );
setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
}
@Override
@@ -71,12 +71,12 @@ public class ToolEraser extends AEBaseItem
blocks++;
world.setBlock( wc.x, wc.y, wc.z, Platform.air );
check( world, wc.x + 1, wc.y, wc.z, next );
check( world, wc.x - 1, wc.y, wc.z, next );
check( world, wc.x, wc.y + 1, wc.z, next );
check( world, wc.x, wc.y - 1, wc.z, next );
check( world, wc.x, wc.y, wc.z + 1, next );
check( world, wc.x, wc.y, wc.z - 1, next );
this.check( world, wc.x + 1, wc.y, wc.z, next );
this.check( world, wc.x - 1, wc.y, wc.z, next );
this.check( world, wc.x, wc.y + 1, wc.z, next );
this.check( world, wc.x, wc.y - 1, wc.z, next );
this.check( world, wc.x, wc.y, wc.z + 1, next );
this.check( world, wc.x, wc.y, wc.z - 1, next );
}
}
@@ -95,7 +95,7 @@ public class ToolEraser extends AEBaseItem
@Override
public void registerIcons(IIconRegister par1IconRegister)
{
itemIcon = new MissingIcon( this );
this.itemIcon = new MissingIcon( this );
}
}
src/main/java/appeng/debug/ToolMeteoritePlacer.java
+2 -2
View File
@@ -36,7 +36,7 @@ public class ToolMeteoritePlacer extends AEBaseItem
public ToolMeteoritePlacer() {
super( ToolMeteoritePlacer.class );
setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
}
@Override
@@ -57,7 +57,7 @@ public class ToolMeteoritePlacer extends AEBaseItem
@Override
public void registerIcons(IIconRegister par1IconRegister)
{
itemIcon = new MissingIcon( this );
this.itemIcon = new MissingIcon( this );
}
}
src/main/java/appeng/debug/ToolReplicatorCard.java
+7 -7
View File
@@ -43,7 +43,7 @@ public class ToolReplicatorCard extends AEBaseItem
public ToolReplicatorCard() {
super( ToolReplicatorCard.class );
setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) );
}
@Override
@@ -65,7 +65,7 @@ public class ToolReplicatorCard extends AEBaseItem
stack.setTagCompound( tag );
}
else
outputMsg( player, "This is not a Grid Tile." );
this.outputMsg( player, "This is not a Grid Tile." );
}
else
{
@@ -135,19 +135,19 @@ public class ToolReplicatorCard extends AEBaseItem
}
else
outputMsg( player, "requires valid spatial pylon setup." );
this.outputMsg( player, "requires valid spatial pylon setup." );
}
else
outputMsg( player, "no grid?" );
this.outputMsg( player, "no grid?" );
}
else
outputMsg( player, "No grid node?" );
this.outputMsg( player, "No grid node?" );
}
else
outputMsg( player, "Src is no longer a grid block?" );
this.outputMsg( player, "Src is no longer a grid block?" );
}
else
outputMsg( player, "No Source Defined" );
this.outputMsg( player, "No Source Defined" );
}
return true;
}