Qualified field and method access

This commit is contained in:
yueh
2015-08-06 18:53:17 +02:00
parent 8234c6dbb5
commit a5287f6779
6 changed files with 21 additions and 21 deletions
@@ -56,11 +56,11 @@ public class AEBaseSlabBlock extends BlockSlab implements IAEFeature
this.setResistance( block.getExplosionResistance( null ) * 5.0F / 3.0F ); this.setResistance( block.getExplosionResistance( null ) * 5.0F / 3.0F );
this.setStepSound( block.stepSound ); this.setStepSound( block.stepSound );
this.useNeighborBrightness = true; this.useNeighborBrightness = true;
if( !field_150004_a ) if( !this.field_150004_a )
{ {
this.doubleSlabs = new AEBaseSlabBlock( block, meta, features, true, name + ".double" ).setSlabs( this ); this.doubleSlabs = new AEBaseSlabBlock( block, meta, features, true, name + ".double" ).setSlabs( this );
} }
this.features = !field_150004_a ? new SlabBlockFeatureHandler( features, this ) : null; this.features = !this.field_150004_a ? new SlabBlockFeatureHandler( features, this ) : null;
} }
public AEBaseSlabBlock setSlabs( AEBaseSlabBlock slabs ) public AEBaseSlabBlock setSlabs( AEBaseSlabBlock slabs )
@@ -71,12 +71,12 @@ public class AEBaseSlabBlock extends BlockSlab implements IAEFeature
public AEBaseSlabBlock slabs() public AEBaseSlabBlock slabs()
{ {
return slabs; return this.slabs;
} }
public AEBaseSlabBlock doubleSlabs() public AEBaseSlabBlock doubleSlabs()
{ {
return doubleSlabs; return this.doubleSlabs;
} }
@Override @Override
@@ -94,7 +94,7 @@ public class AEBaseSlabBlock extends BlockSlab implements IAEFeature
@Override @Override
public IIcon getIcon( int dir, int meta ) public IIcon getIcon( int dir, int meta )
{ {
return block.getIcon( dir, this.meta ); return this.block.getIcon( dir, this.meta );
} }
@Override @Override
@@ -134,6 +134,6 @@ public class AEBaseSlabBlock extends BlockSlab implements IAEFeature
public String name() public String name()
{ {
return name; return this.name;
} }
} }
@@ -65,8 +65,8 @@ public class SlabBlockFeatureHandler implements IFeatureHandler
if( this.enabled ) if( this.enabled )
{ {
this.slabs.setCreativeTab( CreativeTab.instance ); this.slabs.setCreativeTab( CreativeTab.instance );
GameRegistry.registerBlock( slabs, AEBaseItemBlockSlab.class, "tile." + slabs.name(), slabs, slabs.doubleSlabs(), false ); GameRegistry.registerBlock( this.slabs, AEBaseItemBlockSlab.class, "tile." + this.slabs.name(), this.slabs, this.slabs.doubleSlabs(), false );
GameRegistry.registerBlock( slabs.doubleSlabs(), AEBaseItemBlockSlab.class, "tile." + slabs.name() + ".double", slabs, slabs.doubleSlabs(), true ); GameRegistry.registerBlock( this.slabs.doubleSlabs(), AEBaseItemBlockSlab.class, "tile." + this.slabs.name() + ".double", this.slabs, this.slabs.doubleSlabs(), true );
} }
} }
} }
@@ -219,7 +219,7 @@ public class PacketNEIRecipe extends AppEngPacket
// If that doesn't work, grab from the player's inventory // If that doesn't work, grab from the player's inventory
if( whichItem == null && playerInventory != null ) if( whichItem == null && playerInventory != null )
{ {
whichItem = extractItemFromPlayerInventory( player, realForFake, patternItem ); whichItem = this.extractItemFromPlayerInventory( player, realForFake, patternItem );
} }
craftMatrix.setInventorySlotContents( x, whichItem ); craftMatrix.setInventorySlotContents( x, whichItem );
+1 -1
View File
@@ -666,7 +666,7 @@ public class GridNode implements IGridNode, IPathItem
public int getLastUsedChannels() public int getLastUsedChannels()
{ {
return lastUsedChannels; return this.lastUsedChannels;
} }
private static class MachineSecurityBreak implements Callable<Void> private static class MachineSecurityBreak implements Callable<Void>
@@ -1285,24 +1285,24 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
private void updateElapsedTime( IAEItemStack is ) private void updateElapsedTime( IAEItemStack is )
{ {
final long nextStartTime = System.nanoTime(); final long nextStartTime = System.nanoTime();
this.elapsedTime = this.getElapsedTime() + nextStartTime - lastTime; this.elapsedTime = this.getElapsedTime() + nextStartTime - this.lastTime;
this.lastTime = nextStartTime; this.lastTime = nextStartTime;
this.remainingItemCount = this.getRemainingItemCount() - is.getStackSize(); this.remainingItemCount = this.getRemainingItemCount() - is.getStackSize();
} }
public long getElapsedTime() public long getElapsedTime()
{ {
return elapsedTime; return this.elapsedTime;
} }
public long getRemainingItemCount() public long getRemainingItemCount()
{ {
return remainingItemCount; return this.remainingItemCount;
} }
public long getStartItemCount() public long getStartItemCount()
{ {
return startItemCount; return this.startItemCount;
} }
static class TaskProgress static class TaskProgress
@@ -160,21 +160,21 @@ public abstract class RotaryCraft extends IC2 implements AdvancedShaftPowerRecei
public final ArrayList<String> getMessages( World world, int x, int y, int z, int side ) public final ArrayList<String> getMessages( World world, int x, int y, int z, int side )
{ {
String out; String out;
if( power >= 1000000000 ) if( this.power >= 1000000000 )
{ {
out = String.format( "Receiving %.3f GW @ %d rad/s.", power / 1000000000.0D, omega ); out = String.format( "Receiving %.3f GW @ %d rad/s.", this.power / 1000000000.0D, this.omega );
} }
else if( power >= 1000000 ) else if( this.power >= 1000000 )
{ {
out = String.format( "Receiving %.3f MW @ %d rad/s.", power / 1000000.0D, omega ); out = String.format( "Receiving %.3f MW @ %d rad/s.", this.power / 1000000.0D, this.omega );
} }
else if( power >= 1000 ) else if( this.power >= 1000 )
{ {
out = String.format( "Receiving %.3f kW @ %d rad/s.", power / 1000.0D, omega ); out = String.format( "Receiving %.3f kW @ %d rad/s.", this.power / 1000.0D, this.omega );
} }
else else
{ {
out = String.format( "Receiving %d W @ %d rad/s.", power, omega ); out = String.format( "Receiving %d W @ %d rad/s.", this.power, this.omega );
} }
ArrayList<String> messages = new ArrayList<String>( 1 ); ArrayList<String> messages = new ArrayList<String>( 1 );