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/tile/networking/TileCableBus.java
+51 -51
View File
@@ -64,54 +64,54 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
@TileEvent(TileEventType.WORLD_NBT_READ)
public void readFromNBT_TileCableBus(NBTTagCompound data)
{
cb.readFromNBT( data );
this.cb.readFromNBT( data );
}
@TileEvent(TileEventType.WORLD_NBT_WRITE)
public void writeToNBT_TileCableBus(NBTTagCompound data)
{
cb.writeToNBT( data );
this.cb.writeToNBT( data );
}
@TileEvent(TileEventType.NETWORK_READ)
public boolean readFromStream_TileCableBus(ByteBuf data) throws IOException
{
boolean ret = cb.readFromStream( data );
boolean ret = this.cb.readFromStream( data );
int newLV = cb.getLightValue();
if ( newLV != oldLV )
int newLV = this.cb.getLightValue();
if ( newLV != this.oldLV )
{
oldLV = newLV;
worldObj.func_147451_t( xCoord, yCoord, zCoord );
this.oldLV = newLV;
this.worldObj.func_147451_t( this.xCoord, this.yCoord, this.zCoord );
// worldObj.updateAllLightTypes( xCoord, yCoord, zCoord );
}
updateTileSetting();
this.updateTileSetting();
return ret;
}
@TileEvent(TileEventType.NETWORK_WRITE)
public void writeToStream_TileCableBus(ByteBuf data) throws IOException
{
cb.writeToStream( data );
this.cb.writeToStream( data );
}
@Override
public boolean isInWorld()
{
return cb.isInWorld();
return this.cb.isInWorld();
}
protected void updateTileSetting()
{
if ( cb.requiresDynamicRender )
if ( this.cb.requiresDynamicRender )
{
TileCableBus tcb;
try
{
tcb = (TileCableBus) BlockCableBus.tesrTile.newInstance();
tcb.copyFrom( this );
getWorldObj().setTileEntity( xCoord, yCoord, zCoord, tcb );
this.getWorldObj().setTileEntity( this.xCoord, this.yCoord, this.zCoord, tcb );
}
catch (Throwable ignored)
{
@@ -122,9 +122,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
protected void copyFrom(TileCableBus oldTile)
{
CableBusContainer tmpCB = cb;
cb = oldTile.cb;
oldLV = oldTile.oldLV;
CableBusContainer tmpCB = this.cb;
this.cb = oldTile.cb;
this.oldLV = oldTile.oldLV;
oldTile.cb = tmpCB;
}
@@ -132,20 +132,20 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
public void onReady()
{
super.onReady();
if ( cb.isEmpty() )
if ( this.cb.isEmpty() )
{
if ( worldObj.getTileEntity( xCoord, yCoord, zCoord ) == this )
worldObj.func_147480_a( xCoord, yCoord, zCoord, true );
if ( this.worldObj.getTileEntity( this.xCoord, this.yCoord, this.zCoord ) == this )
this.worldObj.func_147480_a( this.xCoord, this.yCoord, this.zCoord, true );
}
else
cb.addToWorld();
this.cb.addToWorld();
}
@Override
public void onChunkUnload()
{
super.onChunkUnload();
cb.removeFromWorld();
this.cb.removeFromWorld();
}
@Override
@@ -159,7 +159,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
public void invalidate()
{
super.invalidate();
cb.removeFromWorld();
this.cb.removeFromWorld();
}
@Override
@@ -177,43 +177,43 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
@Override
public void getDrops(World w, int x, int y, int z, ArrayList drops)
{
cb.getDrops( drops );
this.cb.getDrops( drops );
}
@Override
public void getNoDrops(World w, int x, int y, int z, ArrayList<ItemStack> drops)
{
cb.getNoDrops( drops );
this.cb.getNoDrops( drops );
}
@Override
public IGridNode getGridNode(ForgeDirection dir)
{
return cb.getGridNode( dir );
return this.cb.getGridNode( dir );
}
@Override
public boolean canAddPart(ItemStack is, ForgeDirection side)
{
return cb.canAddPart( is, side );
return this.cb.canAddPart( is, side );
}
@Override
public ForgeDirection addPart(ItemStack is, ForgeDirection side, EntityPlayer player)
{
return cb.addPart( is, side, player );
return this.cb.addPart( is, side, player );
}
@Override
public void removePart(ForgeDirection side, boolean suppressUpdate)
{
cb.removePart( side, suppressUpdate );
this.cb.removePart( side, suppressUpdate );
}
@Override
public IPart getPart(ForgeDirection side)
{
return cb.getPart( side );
return this.cb.getPart( side );
}
@Override
@@ -231,57 +231,57 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
@Override
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean visual)
{
return cb.getSelectedBoundingBoxesFromPool( false, true, e, visual );
return this.cb.getSelectedBoundingBoxesFromPool( false, true, e, visual );
}
@Override
public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e)
{
for (AxisAlignedBB bx : getSelectedBoundingBoxesFromPool( w, x, y, z, e, false ))
for (AxisAlignedBB bx : this.getSelectedBoundingBoxesFromPool( w, x, y, z, e, false ))
out.add( AxisAlignedBB.getBoundingBox( bx.minX, bx.minY, bx.minZ, bx.maxX, bx.maxY, bx.maxZ ) );
}
@Override
public AECableType getCableConnectionType(ForgeDirection side)
{
return cb.getCableConnectionType( side );
return this.cb.getCableConnectionType( side );
}
@Override
public AEColor getColor()
{
return cb.getColor();
return this.cb.getColor();
}
@Override
public IFacadeContainer getFacadeContainer()
{
return cb.getFacadeContainer();
return this.cb.getFacadeContainer();
}
@Override
public void clearContainer()
{
cb = new CableBusContainer( this );
this.cb = new CableBusContainer( this );
}
@Override
public boolean isBlocked(ForgeDirection side)
{
return !ImmibisMicroblocks_isSideOpen( side.ordinal() );
return !this.ImmibisMicroblocks_isSideOpen( side.ordinal() );
}
@Override
public void markForUpdate()
{
if ( worldObj == null )
if ( this.worldObj == null )
return;
int newLV = cb.getLightValue();
if ( newLV != oldLV )
int newLV = this.cb.getLightValue();
if ( newLV != this.oldLV )
{
oldLV = newLV;
worldObj.func_147451_t( xCoord, yCoord, zCoord );
this.oldLV = newLV;
this.worldObj.func_147451_t( this.xCoord, this.yCoord, this.zCoord );
// worldObj.updateAllLightTypes( xCoord, yCoord, zCoord );
}
@@ -291,20 +291,20 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
@Override
public SelectedPart selectPart(Vec3 pos)
{
return cb.selectPart( pos );
return this.cb.selectPart( pos );
}
@Override
public void partChanged()
{
notifyNeighbors();
this.notifyNeighbors();
}
@Override
public void notifyNeighbors()
{
if ( worldObj != null && worldObj.blockExists( xCoord, yCoord, zCoord ) && !CableBusContainer.isLoading() )
Platform.notifyBlocksOfNeighbors( worldObj, xCoord, yCoord, zCoord );
if ( this.worldObj != null && this.worldObj.blockExists( this.xCoord, this.yCoord, this.zCoord ) && !CableBusContainer.isLoading() )
Platform.notifyBlocksOfNeighbors( this.worldObj, this.xCoord, this.yCoord, this.zCoord );
}
@Override
@@ -316,25 +316,25 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
@Override
public boolean hasRedstone(ForgeDirection side)
{
return cb.hasRedstone( side );
return this.cb.hasRedstone( side );
}
@Override
public boolean isEmpty()
{
return cb.isEmpty();
return this.cb.isEmpty();
}
@Override
public boolean requiresTESR()
{
return cb.requiresDynamicRender;
return this.cb.requiresDynamicRender;
}
@Override
public Set<LayerFlags> getLayerFlags()
{
return cb.getLayerFlags();
return this.cb.getLayerFlags();
}
@Override
@@ -347,7 +347,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
return;
}
getWorldObj().setBlock( xCoord, yCoord, zCoord, Platform.air );
this.getWorldObj().setBlock( this.xCoord, this.yCoord, this.zCoord, Platform.air );
}
/**
@@ -363,13 +363,13 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
public void ImmibisMicroblocks_onMicroblocksChanged()
{
cb.updateConnections();
this.cb.updateConnections();
}
@Override
public boolean recolourBlock(ForgeDirection side, AEColor colour, EntityPlayer who)
{
return cb.recolourBlock( side, colour, who );
return this.cb.recolourBlock( side, colour, who );
}
}
src/main/java/appeng/tile/networking/TileCableBusTESR.java
+2 -2
View File
@@ -26,14 +26,14 @@ public class TileCableBusTESR extends TileCableBus
@Override
protected void updateTileSetting()
{
if ( !cb.requiresDynamicRender )
if ( !this.cb.requiresDynamicRender )
{
TileCableBus tcb;
try
{
tcb = (TileCableBus) BlockCableBus.noTesrTile.newInstance();
tcb.copyFrom( this );
getWorldObj().setTileEntity( xCoord, yCoord, zCoord, tcb );
this.getWorldObj().setTileEntity( this.xCoord, this.yCoord, this.zCoord, tcb );
}
catch (Throwable ignored)
{
src/main/java/appeng/tile/networking/TileController.java
+28 -28
View File
@@ -43,10 +43,10 @@ public class TileController extends AENetworkPowerTile
boolean isValid = false;
public TileController() {
internalMaxPower = 8000;
internalPublicPowerStorage = true;
gridProxy.setIdlePowerUsage( 3 );
gridProxy.setFlags( GridFlags.CANNOT_CARRY, GridFlags.DENSE_CAPACITY );
this.internalMaxPower = 8000;
this.internalPublicPowerStorage = true;
this.gridProxy.setIdlePowerUsage( 3 );
this.gridProxy.setFlags( GridFlags.CANNOT_CARRY, GridFlags.DENSE_CAPACITY );
}
@Override
@@ -60,7 +60,7 @@ public class TileController extends AENetworkPowerTile
{
try
{
return gridProxy.getEnergy().getEnergyDemand( 8000 );
return this.gridProxy.getEnergy().getEnergyDemand( 8000 );
}
catch (GridAccessException e)
{
@@ -74,7 +74,7 @@ public class TileController extends AENetworkPowerTile
{
try
{
double ret = gridProxy.getEnergy().injectPower( AEUnits, mode );
double ret = this.gridProxy.getEnergy().injectPower( AEUnits, mode );
if ( mode == Actionable.SIMULATE )
return ret;
return 0;
@@ -91,7 +91,7 @@ public class TileController extends AENetworkPowerTile
{
try
{
gridProxy.getGrid().postEvent( new MENetworkPowerStorage( this, x ) );
this.gridProxy.getGrid().postEvent( new MENetworkPowerStorage( this, x ) );
}
catch (GridAccessException e)
{
@@ -102,64 +102,64 @@ public class TileController extends AENetworkPowerTile
@MENetworkEventSubscribe
public void onControllerChange(MENetworkControllerChange status)
{
updateMeta();
this.updateMeta();
}
@MENetworkEventSubscribe
public void onPowerChange(MENetworkPowerStatusChange status)
{
updateMeta();
this.updateMeta();
}
@Override
public void onReady()
{
onNeighborChange( true );
this.onNeighborChange( true );
super.onReady();
}
public void onNeighborChange(boolean force)
{
boolean xx = worldObj.getTileEntity( xCoord - 1, yCoord, zCoord ) instanceof TileController
&& worldObj.getTileEntity( xCoord + 1, yCoord, zCoord ) instanceof TileController;
boolean yy = worldObj.getTileEntity( xCoord, yCoord - 1, zCoord ) instanceof TileController
&& worldObj.getTileEntity( xCoord, yCoord + 1, zCoord ) instanceof TileController;
boolean zz = worldObj.getTileEntity( xCoord, yCoord, zCoord - 1 ) instanceof TileController
&& worldObj.getTileEntity( xCoord, yCoord, zCoord + 1 ) instanceof TileController;
boolean xx = this.worldObj.getTileEntity( this.xCoord - 1, this.yCoord, this.zCoord ) instanceof TileController
&& this.worldObj.getTileEntity( this.xCoord + 1, this.yCoord, this.zCoord ) instanceof TileController;
boolean yy = this.worldObj.getTileEntity( this.xCoord, this.yCoord - 1, this.zCoord ) instanceof TileController
&& this.worldObj.getTileEntity( this.xCoord, this.yCoord + 1, this.zCoord ) instanceof TileController;
boolean zz = this.worldObj.getTileEntity( this.xCoord, this.yCoord, this.zCoord - 1 ) instanceof TileController
&& this.worldObj.getTileEntity( this.xCoord, this.yCoord, this.zCoord + 1 ) instanceof TileController;
// int meta = world.getBlockMetadata( xCoord, yCoord, zCoord );
// boolean hasPower = meta > 0;
// boolean isConflict = meta == 2;
boolean oldValid = isValid;
boolean oldValid = this.isValid;
isValid = (xx && !yy && !zz) || (!xx && yy && !zz) || (!xx && !yy && zz) || ((xx ? 1 : 0) + (yy ? 1 : 0) + (zz ? 1 : 0) <= 1);
this.isValid = (xx && !yy && !zz) || (!xx && yy && !zz) || (!xx && !yy && zz) || ((xx ? 1 : 0) + (yy ? 1 : 0) + (zz ? 1 : 0) <= 1);
if ( oldValid != isValid || force )
if ( oldValid != this.isValid || force )
{
if ( isValid )
gridProxy.setValidSides( EnumSet.allOf( ForgeDirection.class ) );
if ( this.isValid )
this.gridProxy.setValidSides( EnumSet.allOf( ForgeDirection.class ) );
else
gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) );
this.gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) );
}
updateMeta();
this.updateMeta();
}
private void updateMeta()
{
if ( !gridProxy.isReady() )
if ( !this.gridProxy.isReady() )
return;
int meta = 0;
try
{
if ( gridProxy.getEnergy().isNetworkPowered() )
if ( this.gridProxy.getEnergy().isNetworkPowered() )
{
meta = 1;
if ( gridProxy.getPath().getControllerState() == ControllerState.CONTROLLER_CONFLICT )
if ( this.gridProxy.getPath().getControllerState() == ControllerState.CONTROLLER_CONFLICT )
meta = 2;
}
}
@@ -168,7 +168,7 @@ public class TileController extends AENetworkPowerTile
meta = 0;
}
worldObj.setBlockMetadataWithNotify( xCoord, yCoord, zCoord, meta, 2 );
this.worldObj.setBlockMetadataWithNotify( this.xCoord, this.yCoord, this.zCoord, meta, 2 );
}
final int sides[] = new int[] {};
@@ -189,7 +189,7 @@ public class TileController extends AENetworkPowerTile
@Override
public int[] getAccessibleSlotsBySide(ForgeDirection side)
{
return sides;
return this.sides;
}
}
src/main/java/appeng/tile/networking/TileCreativeEnergyCell.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class TileCreativeEnergyCell extends AENetworkTile implements IAEPowerSto
{
public TileCreativeEnergyCell() {
gridProxy.setIdlePowerUsage( 0 );
this.gridProxy.setIdlePowerUsage( 0 );
}
@Override
src/main/java/appeng/tile/networking/TileDenseEnergyCell.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class TileDenseEnergyCell extends TileEnergyCell
{
public TileDenseEnergyCell() {
internalMaxPower = 200000 * 8;
this.internalMaxPower = 200000 * 8;
}
}
src/main/java/appeng/tile/networking/TileEnergyAcceptor.java
+9 -9
View File
@@ -47,16 +47,16 @@ public class TileEnergyAcceptor extends AENetworkPowerTile
@TileEvent(TileEventType.TICK)
public void Tick_TileEnergyAcceptor()
{
if ( internalCurrentPower > 0 )
if ( this.internalCurrentPower > 0 )
{
try
{
IEnergyGrid eg = gridProxy.getEnergy();
double powerRequested = internalCurrentPower - eg.injectPower( internalCurrentPower, Actionable.SIMULATE );
IEnergyGrid eg = this.gridProxy.getEnergy();
double powerRequested = this.internalCurrentPower - eg.injectPower( this.internalCurrentPower, Actionable.SIMULATE );
if ( powerRequested > 0 )
{
eg.injectPower( extractAEPower( powerRequested, Actionable.MODULATE, PowerMultiplier.ONE ), Actionable.MODULATE );
eg.injectPower( this.extractAEPower( powerRequested, Actionable.MODULATE, PowerMultiplier.ONE ), Actionable.MODULATE );
}
}
catch (GridAccessException e)
@@ -72,7 +72,7 @@ public class TileEnergyAcceptor extends AENetworkPowerTile
{
try
{
IEnergyGrid grid = gridProxy.getEnergy();
IEnergyGrid grid = this.gridProxy.getEnergy();
return grid.getEnergyDemand( maxRequired );
}
catch (GridAccessException e)
@@ -86,7 +86,7 @@ public class TileEnergyAcceptor extends AENetworkPowerTile
{
try
{
IEnergyGrid grid = gridProxy.getEnergy();
IEnergyGrid grid = this.gridProxy.getEnergy();
double leftOver = grid.injectPower( newPower, mode );
if ( mode == Actionable.SIMULATE )
return leftOver;
@@ -99,8 +99,8 @@ public class TileEnergyAcceptor extends AENetworkPowerTile
}
public TileEnergyAcceptor() {
gridProxy.setIdlePowerUsage( 0.0 );
internalMaxPower = 100;
this.gridProxy.setIdlePowerUsage( 0.0 );
this.internalMaxPower = 100;
}
@Override
@@ -118,7 +118,7 @@ public class TileEnergyAcceptor extends AENetworkPowerTile
@Override
public int[] getAccessibleSlotsBySide(ForgeDirection side)
{
return sides;
return this.sides;
}
}
src/main/java/appeng/tile/networking/TileEnergyCell.java
+38 -38
View File
@@ -49,38 +49,38 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
private void changePowerLevel()
{
if ( notLoaded() )
if ( this.notLoaded() )
return;
byte boundMetadata = (byte) (8.0 * (internalCurrentPower / internalMaxPower));
byte boundMetadata = (byte) (8.0 * (this.internalCurrentPower / this.internalMaxPower));
if ( boundMetadata > 7 )
boundMetadata = 7;
if ( boundMetadata < 0 )
boundMetadata = 0;
if ( currentMeta != boundMetadata )
if ( this.currentMeta != boundMetadata )
{
currentMeta = boundMetadata;
worldObj.setBlockMetadataWithNotify( xCoord, yCoord, zCoord, currentMeta, 2 );
this.currentMeta = boundMetadata;
this.worldObj.setBlockMetadataWithNotify( this.xCoord, this.yCoord, this.zCoord, this.currentMeta, 2 );
}
}
@TileEvent(TileEventType.WORLD_NBT_WRITE)
public void writeToNBT_TileEnergyCell(NBTTagCompound data)
{
if ( !worldObj.isRemote )
data.setDouble( "internalCurrentPower", internalCurrentPower );
if ( !this.worldObj.isRemote )
data.setDouble( "internalCurrentPower", this.internalCurrentPower );
}
@TileEvent(TileEventType.WORLD_NBT_READ)
public void readFromNBT_TileEnergyCell(NBTTagCompound data)
{
internalCurrentPower = data.getDouble( "internalCurrentPower" );
this.internalCurrentPower = data.getDouble( "internalCurrentPower" );
}
public TileEnergyCell() {
gridProxy.setIdlePowerUsage( 0 );
this.gridProxy.setIdlePowerUsage( 0 );
}
@Override
@@ -94,29 +94,29 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
{
if ( mode == Actionable.SIMULATE )
{
double fakeBattery = internalCurrentPower + amt;
if ( fakeBattery > internalMaxPower )
double fakeBattery = this.internalCurrentPower + amt;
if ( fakeBattery > this.internalMaxPower )
{
return fakeBattery - internalMaxPower;
return fakeBattery - this.internalMaxPower;
}
return 0;
}
if ( internalCurrentPower < 0.01 && amt > 0.01 )
gridProxy.getNode().getGrid().postEvent( new MENetworkPowerStorage( this, PowerEventType.PROVIDE_POWER ) );
if ( this.internalCurrentPower < 0.01 && amt > 0.01 )
this.gridProxy.getNode().getGrid().postEvent( new MENetworkPowerStorage( this, PowerEventType.PROVIDE_POWER ) );
internalCurrentPower += amt;
if ( internalCurrentPower > internalMaxPower )
this.internalCurrentPower += amt;
if ( this.internalCurrentPower > this.internalMaxPower )
{
amt = internalCurrentPower - internalMaxPower;
internalCurrentPower = internalMaxPower;
amt = this.internalCurrentPower - this.internalMaxPower;
this.internalCurrentPower = this.internalMaxPower;
changePowerLevel();
this.changePowerLevel();
return amt;
}
changePowerLevel();
this.changePowerLevel();
return 0;
}
@@ -124,18 +124,18 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
{
if ( mode == Actionable.SIMULATE )
{
if ( internalCurrentPower > amt )
if ( this.internalCurrentPower > amt )
return amt;
return internalCurrentPower;
return this.internalCurrentPower;
}
boolean wasFull = internalCurrentPower >= internalMaxPower - 0.001;
boolean wasFull = this.internalCurrentPower >= this.internalMaxPower - 0.001;
if ( wasFull && amt > 0.001 )
{
try
{
gridProxy.getGrid().postEvent( new MENetworkPowerStorage( this, PowerEventType.REQUEST_POWER ) );
this.gridProxy.getGrid().postEvent( new MENetworkPowerStorage( this, PowerEventType.REQUEST_POWER ) );
}
catch (GridAccessException ignored)
{
@@ -143,37 +143,37 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
}
}
if ( internalCurrentPower > amt )
if ( this.internalCurrentPower > amt )
{
internalCurrentPower -= amt;
this.internalCurrentPower -= amt;
changePowerLevel();
this.changePowerLevel();
return amt;
}
amt = internalCurrentPower;
internalCurrentPower = 0;
amt = this.internalCurrentPower;
this.internalCurrentPower = 0;
changePowerLevel();
this.changePowerLevel();
return amt;
}
@Override
final public double extractAEPower(double amt, Actionable mode, PowerMultiplier pm)
{
return pm.divide( extractAEPower( pm.multiply( amt ), mode ) );
return pm.divide( this.extractAEPower( pm.multiply( amt ), mode ) );
}
@Override
public double getAEMaxPower()
{
return internalMaxPower;
return this.internalMaxPower;
}
@Override
public double getAECurrentPower()
{
return internalCurrentPower;
return this.internalCurrentPower;
}
@Override
@@ -192,8 +192,8 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
public void onReady()
{
super.onReady();
currentMeta = (byte) worldObj.getBlockMetadata( xCoord, yCoord, zCoord );
changePowerLevel();
this.currentMeta = (byte) this.worldObj.getBlockMetadata( this.xCoord, this.yCoord, this.zCoord );
this.changePowerLevel();
}
@Override
@@ -202,8 +202,8 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
if ( from == SettingsFrom.DISMANTLE_ITEM )
{
NBTTagCompound tag = new NBTTagCompound();
tag.setDouble( "internalCurrentPower", internalCurrentPower );
tag.setDouble( "internalMaxPower", internalMaxPower ); // used for tool tip.
tag.setDouble( "internalCurrentPower", this.internalCurrentPower );
tag.setDouble( "internalMaxPower", this.internalMaxPower ); // used for tool tip.
return tag;
}
return null;
@@ -214,7 +214,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
{
if ( from == SettingsFrom.DISMANTLE_ITEM )
{
internalCurrentPower = compound.getDouble( "internalCurrentPower" );
this.internalCurrentPower = compound.getDouble( "internalCurrentPower" );
}
}
}
src/main/java/appeng/tile/networking/TileWireless.java
+25 -25
View File
@@ -61,57 +61,57 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
public TileWireless()
{
gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL );
gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) );
this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL );
this.gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) );
}
@Override
public void setOrientation( ForgeDirection inForward, ForgeDirection inUp )
{
super.setOrientation( inForward, inUp );
gridProxy.setValidSides( EnumSet.of( getForward().getOpposite() ) );
this.gridProxy.setValidSides( EnumSet.of( this.getForward().getOpposite() ) );
}
@MENetworkEventSubscribe
public void chanRender( MENetworkChannelsChanged c )
{
markForUpdate();
this.markForUpdate();
}
@MENetworkEventSubscribe
public void powerRender( MENetworkPowerStatusChange c )
{
markForUpdate();
this.markForUpdate();
}
@TileEvent( TileEventType.NETWORK_READ )
public boolean readFromStream_TileWireless( ByteBuf data )
{
int old = clientFlags;
clientFlags = data.readByte();
int old = this.clientFlags;
this.clientFlags = data.readByte();
return old != clientFlags;
return old != this.clientFlags;
}
@TileEvent( TileEventType.NETWORK_WRITE )
public void writeToStream_TileWireless( ByteBuf data )
{
clientFlags = 0;
this.clientFlags = 0;
try
{
if ( gridProxy.getEnergy().isNetworkPowered() )
clientFlags |= POWERED_FLAG;
if ( this.gridProxy.getEnergy().isNetworkPowered() )
this.clientFlags |= POWERED_FLAG;
if ( gridProxy.getNode().meetsChannelRequirements() )
clientFlags |= CHANNEL_FLAG;
if ( this.gridProxy.getNode().meetsChannelRequirements() )
this.clientFlags |= CHANNEL_FLAG;
}
catch ( GridAccessException e )
{
// meh
}
data.writeByte( ( byte ) clientFlags );
data.writeByte( ( byte ) this.clientFlags );
}
@Override
@@ -129,46 +129,46 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
@Override
public IInventory getInternalInventory()
{
return inv;
return this.inv;
}
@Override
public void onReady()
{
updatePower();
this.updatePower();
super.onReady();
}
@Override
public void markDirty()
{
updatePower();
this.updatePower();
}
private void updatePower()
{
gridProxy.setIdlePowerUsage( AEConfig.instance.wireless_getPowerDrain( getBoosters() ) );
this.gridProxy.setIdlePowerUsage( AEConfig.instance.wireless_getPowerDrain( this.getBoosters() ) );
}
@Override
public int[] getAccessibleSlotsBySide( ForgeDirection side )
{
return sides;
return this.sides;
}
@Override
public double getRange()
{
return AEConfig.instance.wireless_getMaxRange( getBoosters() );
return AEConfig.instance.wireless_getMaxRange( this.getBoosters() );
}
@Override
public boolean isActive()
{
if ( Platform.isClient() )
return isPowered() && ( CHANNEL_FLAG == ( clientFlags & CHANNEL_FLAG ) );
return this.isPowered() && ( CHANNEL_FLAG == ( this.clientFlags & CHANNEL_FLAG ) );
return gridProxy.isActive();
return this.gridProxy.isActive();
}
@Override
@@ -176,7 +176,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
{
try
{
return gridProxy.getGrid();
return this.gridProxy.getGrid();
}
catch ( GridAccessException e )
{
@@ -186,7 +186,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
private int getBoosters()
{
ItemStack boosters = inv.getStackInSlot( 0 );
ItemStack boosters = this.inv.getStackInSlot( 0 );
return boosters == null ? 0 : boosters.stackSize;
}
@@ -205,7 +205,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
@Override
public boolean isPowered()
{
return POWERED_FLAG == ( clientFlags & POWERED_FLAG );
return POWERED_FLAG == ( this.clientFlags & POWERED_FLAG );
}
}