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

Always use qualified access for fields and methods

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/powersink/AERootPoweredTile.java
+10 -10
View File
@@ -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;
}
}
src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java
+4 -4
View File
@@ -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
src/main/java/appeng/tile/powersink/TeslaEnergyAdapter.java
+2 -2
View File
@@ -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;