Changed access to use this qualifier
This commit is contained in:
yueh
+114
-114
@@ -101,29 +101,29 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
|
||||
private double buffer()
|
||||
{
|
||||
return providers.isEmpty() ? 1000.0 : 0.0;
|
||||
return this.providers.isEmpty() ? 1000.0 : 0.0;
|
||||
}
|
||||
|
||||
private IAEPowerStorage getFirstRequester()
|
||||
{
|
||||
if ( lastRequester == null )
|
||||
if ( this.lastRequester == null )
|
||||
{
|
||||
Iterator<IAEPowerStorage> i = requesters.iterator();
|
||||
lastRequester = i.hasNext() ? i.next() : null;
|
||||
Iterator<IAEPowerStorage> i = this.requesters.iterator();
|
||||
this.lastRequester = i.hasNext() ? i.next() : null;
|
||||
}
|
||||
|
||||
return lastRequester;
|
||||
return this.lastRequester;
|
||||
}
|
||||
|
||||
private IAEPowerStorage getFirstProvider()
|
||||
{
|
||||
if ( lastProvider == null )
|
||||
if ( this.lastProvider == null )
|
||||
{
|
||||
Iterator<IAEPowerStorage> i = providers.iterator();
|
||||
lastProvider = i.hasNext() ? i.next() : null;
|
||||
Iterator<IAEPowerStorage> i = this.providers.iterator();
|
||||
this.lastProvider = i.hasNext() ? i.next() : null;
|
||||
}
|
||||
|
||||
return lastProvider;
|
||||
return this.lastProvider;
|
||||
}
|
||||
|
||||
final Multiset<IEnergyGridProvider> energyGridProviders = HashMultiset.create();
|
||||
@@ -132,13 +132,13 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
PathGridCache pgc;
|
||||
|
||||
public EnergyGridCache(IGrid g) {
|
||||
myGrid = g;
|
||||
this.myGrid = g;
|
||||
}
|
||||
|
||||
@MENetworkEventSubscribe
|
||||
public void postInit(MENetworkPostCacheConstruction pcc)
|
||||
{
|
||||
pgc = myGrid.getCache( IPathingGrid.class );
|
||||
this.pgc = this.myGrid.getCache( IPathingGrid.class );
|
||||
}
|
||||
|
||||
@MENetworkEventSubscribe
|
||||
@@ -152,7 +152,7 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
double diffDraw = newDraw - node.previousDraw;
|
||||
node.previousDraw = newDraw;
|
||||
|
||||
drainPerTick += diffDraw;
|
||||
this.drainPerTick += diffDraw;
|
||||
}
|
||||
|
||||
@MENetworkEventSubscribe
|
||||
@@ -164,11 +164,11 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
{
|
||||
case PROVIDE_POWER:
|
||||
if ( ev.storage.getPowerFlow() != AccessRestriction.WRITE )
|
||||
providers.add( ev.storage );
|
||||
this.providers.add( ev.storage );
|
||||
break;
|
||||
case REQUEST_POWER:
|
||||
if ( ev.storage.getPowerFlow() != AccessRestriction.READ )
|
||||
requesters.add( ev.storage );
|
||||
this.requesters.add( ev.storage );
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -181,8 +181,8 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
@Override
|
||||
public double getEnergyDemand(double maxRequired)
|
||||
{
|
||||
localSeen.clear();
|
||||
return getEnergyDemand( maxRequired, localSeen );
|
||||
this.localSeen.clear();
|
||||
return this.getEnergyDemand( maxRequired, this.localSeen );
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -191,9 +191,9 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
if ( !seen.add( this ) )
|
||||
return 0;
|
||||
|
||||
double required = buffer() - extra;
|
||||
double required = this.buffer() - this.extra;
|
||||
|
||||
Iterator<IAEPowerStorage> it = requesters.iterator();
|
||||
Iterator<IAEPowerStorage> it = this.requesters.iterator();
|
||||
while (required < maxRequired && it.hasNext())
|
||||
{
|
||||
IAEPowerStorage node = it.next();
|
||||
@@ -201,7 +201,7 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
required += Math.max( 0.0, node.getAEMaxPower() - node.getAECurrentPower() );
|
||||
}
|
||||
|
||||
Iterator<IEnergyGridProvider> ix = energyGridProviders.iterator();
|
||||
Iterator<IEnergyGridProvider> ix = this.energyGridProviders.iterator();
|
||||
while (required < maxRequired && ix.hasNext())
|
||||
{
|
||||
IEnergyGridProvider node = ix.next();
|
||||
@@ -214,8 +214,8 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
@Override
|
||||
public double injectPower(double amt, Actionable mode)
|
||||
{
|
||||
localSeen.clear();
|
||||
return injectAEPower( amt, mode, localSeen );
|
||||
this.localSeen.clear();
|
||||
return this.injectAEPower( amt, mode, this.localSeen );
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -224,40 +224,40 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
if ( !seen.add( this ) )
|
||||
return 0;
|
||||
|
||||
double ignore = extra;
|
||||
amt += extra;
|
||||
double ignore = this.extra;
|
||||
amt += this.extra;
|
||||
|
||||
if ( mode == Actionable.SIMULATE )
|
||||
{
|
||||
Iterator<IAEPowerStorage> it = requesters.iterator();
|
||||
Iterator<IAEPowerStorage> it = this.requesters.iterator();
|
||||
while (amt > 0 && it.hasNext())
|
||||
{
|
||||
IAEPowerStorage node = it.next();
|
||||
amt = node.injectAEPower( amt, Actionable.SIMULATE );
|
||||
}
|
||||
|
||||
Iterator<IEnergyGridProvider> i = energyGridProviders.iterator();
|
||||
Iterator<IEnergyGridProvider> i = this.energyGridProviders.iterator();
|
||||
while (amt > 0 && i.hasNext())
|
||||
amt = i.next().injectAEPower( amt, mode, seen );
|
||||
}
|
||||
else
|
||||
{
|
||||
tickInjectionPerTick += amt - ignore;
|
||||
this.tickInjectionPerTick += amt - ignore;
|
||||
// totalInjectionPastTicks[0] += i;
|
||||
|
||||
while (amt > 0 && !requesters.isEmpty())
|
||||
while (amt > 0 && !this.requesters.isEmpty())
|
||||
{
|
||||
IAEPowerStorage node = getFirstRequester();
|
||||
IAEPowerStorage node = this.getFirstRequester();
|
||||
|
||||
amt = node.injectAEPower( amt, Actionable.MODULATE );
|
||||
if ( amt > 0 )
|
||||
{
|
||||
requesters.remove( node );
|
||||
lastRequester = null;
|
||||
this.requesters.remove( node );
|
||||
this.lastRequester = null;
|
||||
}
|
||||
}
|
||||
|
||||
Iterator<IEnergyGridProvider> i = energyGridProviders.iterator();
|
||||
Iterator<IEnergyGridProvider> i = this.energyGridProviders.iterator();
|
||||
while (amt > 0 && i.hasNext())
|
||||
{
|
||||
IEnergyGridProvider what = i.next();
|
||||
@@ -270,30 +270,30 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
amt = cannotHold;
|
||||
}
|
||||
|
||||
extra = amt;
|
||||
this.extra = amt;
|
||||
}
|
||||
|
||||
return Math.max( 0.0, amt - buffer() );
|
||||
return Math.max( 0.0, amt - this.buffer() );
|
||||
}
|
||||
|
||||
@Override
|
||||
public double extractAEPower(double amt, Actionable mode, PowerMultiplier pm)
|
||||
{
|
||||
localSeen.clear();
|
||||
return pm.divide( extractAEPower( pm.multiply( amt ), mode, localSeen ) );
|
||||
this.localSeen.clear();
|
||||
return pm.divide( this.extractAEPower( pm.multiply( amt ), mode, this.localSeen ) );
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addNode(IGridNode node, IGridHost machine)
|
||||
{
|
||||
if ( machine instanceof IEnergyGridProvider )
|
||||
energyGridProviders.add( (IEnergyGridProvider) machine );
|
||||
this.energyGridProviders.add( (IEnergyGridProvider) machine );
|
||||
|
||||
// idle draw...
|
||||
GridNode gridNode = (GridNode) node;
|
||||
IGridBlock gb = gridNode.getGridBlock();
|
||||
gridNode.previousDraw = gb.getIdlePowerUsage();
|
||||
drainPerTick += gridNode.previousDraw;
|
||||
this.drainPerTick += gridNode.previousDraw;
|
||||
|
||||
// power storage
|
||||
if ( machine instanceof IAEPowerStorage )
|
||||
@@ -306,17 +306,17 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
|
||||
if ( ps.getPowerFlow() != AccessRestriction.WRITE )
|
||||
{
|
||||
globalMaxPower += ps.getAEMaxPower();
|
||||
this.globalMaxPower += ps.getAEMaxPower();
|
||||
}
|
||||
|
||||
if ( current > 0 && ps.getPowerFlow() != AccessRestriction.WRITE )
|
||||
{
|
||||
globalAvailablePower += current;
|
||||
providers.add( ps );
|
||||
this.globalAvailablePower += current;
|
||||
this.providers.add( ps );
|
||||
}
|
||||
|
||||
if ( current < max && ps.getPowerFlow() != AccessRestriction.READ )
|
||||
requesters.add( ps );
|
||||
this.requesters.add( ps );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -324,22 +324,22 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
{
|
||||
IEnergyWatcherHost swh = (IEnergyWatcherHost) machine;
|
||||
EnergyWatcher iw = new EnergyWatcher( this, swh );
|
||||
watchers.put( node, iw );
|
||||
this.watchers.put( node, iw );
|
||||
swh.updateWatcher( iw );
|
||||
}
|
||||
|
||||
myGrid.postEventTo( node, new MENetworkPowerStatusChange() );
|
||||
this.myGrid.postEventTo( node, new MENetworkPowerStatusChange() );
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeNode(IGridNode node, IGridHost machine)
|
||||
{
|
||||
if ( machine instanceof IEnergyGridProvider )
|
||||
energyGridProviders.remove( machine );
|
||||
this.energyGridProviders.remove( machine );
|
||||
|
||||
// idle draw.
|
||||
GridNode gridNode = (GridNode) node;
|
||||
drainPerTick -= gridNode.previousDraw;
|
||||
this.drainPerTick -= gridNode.previousDraw;
|
||||
|
||||
// power storage.
|
||||
if ( machine instanceof IAEPowerStorage )
|
||||
@@ -349,28 +349,28 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
{
|
||||
if ( ps.getPowerFlow() != AccessRestriction.WRITE )
|
||||
{
|
||||
globalMaxPower -= ps.getAEMaxPower();
|
||||
globalAvailablePower -= ps.getAECurrentPower();
|
||||
this.globalMaxPower -= ps.getAEMaxPower();
|
||||
this.globalAvailablePower -= ps.getAECurrentPower();
|
||||
}
|
||||
|
||||
if ( lastProvider == machine )
|
||||
lastProvider = null;
|
||||
if ( this.lastProvider == machine )
|
||||
this.lastProvider = null;
|
||||
|
||||
if ( lastRequester == machine )
|
||||
lastRequester = null;
|
||||
if ( this.lastRequester == machine )
|
||||
this.lastRequester = null;
|
||||
|
||||
providers.remove( machine );
|
||||
requesters.remove( machine );
|
||||
this.providers.remove( machine );
|
||||
this.requesters.remove( machine );
|
||||
}
|
||||
}
|
||||
|
||||
if ( machine instanceof IStackWatcherHost )
|
||||
{
|
||||
IEnergyWatcher myWatcher = watchers.get( machine );
|
||||
IEnergyWatcher myWatcher = this.watchers.get( machine );
|
||||
if ( myWatcher != null )
|
||||
{
|
||||
myWatcher.clear();
|
||||
watchers.remove( machine );
|
||||
this.watchers.remove( machine );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -381,66 +381,66 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
@Override
|
||||
public void onUpdateTick()
|
||||
{
|
||||
if ( !interests.isEmpty() )
|
||||
if ( !this.interests.isEmpty() )
|
||||
{
|
||||
double oldPower = lastStoredPower;
|
||||
lastStoredPower = getStoredPower();
|
||||
double oldPower = this.lastStoredPower;
|
||||
this.lastStoredPower = this.getStoredPower();
|
||||
|
||||
EnergyThreshold low = new EnergyThreshold( Math.min( oldPower, lastStoredPower ), null );
|
||||
EnergyThreshold high = new EnergyThreshold( Math.max( oldPower, lastStoredPower ), null );
|
||||
for (EnergyThreshold th : interests.subSet( low, true, high, true ))
|
||||
EnergyThreshold low = new EnergyThreshold( Math.min( oldPower, this.lastStoredPower ), null );
|
||||
EnergyThreshold high = new EnergyThreshold( Math.max( oldPower, this.lastStoredPower ), null );
|
||||
for (EnergyThreshold th : this.interests.subSet( low, true, high, true ))
|
||||
{
|
||||
((EnergyWatcher) th.watcher).post( this );
|
||||
}
|
||||
}
|
||||
|
||||
avgDrainPerTick *= (AvgLength - 1) / AvgLength;
|
||||
avgInjectionPerTick *= (AvgLength - 1) / AvgLength;
|
||||
this.avgDrainPerTick *= (this.AvgLength - 1) / this.AvgLength;
|
||||
this.avgInjectionPerTick *= (this.AvgLength - 1) / this.AvgLength;
|
||||
|
||||
avgDrainPerTick += tickDrainPerTick / AvgLength;
|
||||
avgInjectionPerTick += tickInjectionPerTick / AvgLength;
|
||||
this.avgDrainPerTick += this.tickDrainPerTick / this.AvgLength;
|
||||
this.avgInjectionPerTick += this.tickInjectionPerTick / this.AvgLength;
|
||||
|
||||
tickDrainPerTick = 0;
|
||||
tickInjectionPerTick = 0;
|
||||
this.tickDrainPerTick = 0;
|
||||
this.tickInjectionPerTick = 0;
|
||||
|
||||
// power information.
|
||||
boolean currentlyHasPower = false;
|
||||
|
||||
if ( drainPerTick > 0.0001 )
|
||||
if ( this.drainPerTick > 0.0001 )
|
||||
{
|
||||
double drained = extractAEPower( getIdlePowerUsage(), Actionable.MODULATE, PowerMultiplier.CONFIG );
|
||||
currentlyHasPower = drained >= drainPerTick - 0.001;
|
||||
double drained = this.extractAEPower( this.getIdlePowerUsage(), Actionable.MODULATE, PowerMultiplier.CONFIG );
|
||||
currentlyHasPower = drained >= this.drainPerTick - 0.001;
|
||||
}
|
||||
else
|
||||
{
|
||||
currentlyHasPower = extractAEPower( 0.1, Actionable.SIMULATE, PowerMultiplier.CONFIG ) > 0;
|
||||
currentlyHasPower = this.extractAEPower( 0.1, Actionable.SIMULATE, PowerMultiplier.CONFIG ) > 0;
|
||||
}
|
||||
|
||||
// ticks since change..
|
||||
if ( currentlyHasPower == hasPower )
|
||||
ticksSinceHasPowerChange++;
|
||||
if ( currentlyHasPower == this.hasPower )
|
||||
this.ticksSinceHasPowerChange++;
|
||||
else
|
||||
ticksSinceHasPowerChange = 0;
|
||||
this.ticksSinceHasPowerChange = 0;
|
||||
|
||||
// update status..
|
||||
hasPower = currentlyHasPower;
|
||||
this.hasPower = currentlyHasPower;
|
||||
|
||||
// update public status, this buffers power ups for 30 ticks.
|
||||
if ( hasPower && ticksSinceHasPowerChange > 30 )
|
||||
publicPowerState( true, myGrid );
|
||||
else if ( !hasPower )
|
||||
publicPowerState( false, myGrid );
|
||||
if ( this.hasPower && this.ticksSinceHasPowerChange > 30 )
|
||||
this.publicPowerState( true, this.myGrid );
|
||||
else if ( !this.hasPower )
|
||||
this.publicPowerState( false, this.myGrid );
|
||||
|
||||
availableTicksSinceUpdate++;
|
||||
this.availableTicksSinceUpdate++;
|
||||
}
|
||||
|
||||
private void publicPowerState(boolean newState, IGrid grid)
|
||||
{
|
||||
if ( publicHasPower == newState )
|
||||
if ( this.publicHasPower == newState )
|
||||
return;
|
||||
|
||||
publicHasPower = newState;
|
||||
((Grid) myGrid).setImportantFlag( 0, publicHasPower );
|
||||
this.publicHasPower = newState;
|
||||
((Grid) this.myGrid).setImportantFlag( 0, this.publicHasPower );
|
||||
grid.postEvent( new MENetworkPowerStatusChange() );
|
||||
}
|
||||
|
||||
@@ -449,25 +449,25 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
*/
|
||||
public void refreshPower()
|
||||
{
|
||||
availableTicksSinceUpdate = 0;
|
||||
globalAvailablePower = 0;
|
||||
for (IAEPowerStorage p : providers)
|
||||
globalAvailablePower += p.getAECurrentPower();
|
||||
this.availableTicksSinceUpdate = 0;
|
||||
this.globalAvailablePower = 0;
|
||||
for (IAEPowerStorage p : this.providers)
|
||||
this.globalAvailablePower += p.getAECurrentPower();
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getStoredPower()
|
||||
{
|
||||
if ( availableTicksSinceUpdate > 90 )
|
||||
refreshPower();
|
||||
if ( this.availableTicksSinceUpdate > 90 )
|
||||
this.refreshPower();
|
||||
|
||||
return Math.max( 0.0, globalAvailablePower );
|
||||
return Math.max( 0.0, this.globalAvailablePower );
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getMaxStoredPower()
|
||||
{
|
||||
return globalMaxPower;
|
||||
return this.globalMaxPower;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -476,15 +476,15 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
if ( !seen.add( this ) )
|
||||
return 0;
|
||||
|
||||
double extractedPower = extra;
|
||||
double extractedPower = this.extra;
|
||||
|
||||
if ( mode == Actionable.SIMULATE )
|
||||
{
|
||||
extractedPower += simulateExtract( extractedPower, amt );
|
||||
extractedPower += this.simulateExtract( extractedPower, amt );
|
||||
|
||||
if ( extractedPower < amt )
|
||||
{
|
||||
Iterator<IEnergyGridProvider> i = energyGridProviders.iterator();
|
||||
Iterator<IEnergyGridProvider> i = this.energyGridProviders.iterator();
|
||||
while (extractedPower < amt && i.hasNext())
|
||||
extractedPower += i.next().extractAEPower( amt - extractedPower, mode, seen );
|
||||
}
|
||||
@@ -493,38 +493,38 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
}
|
||||
else
|
||||
{
|
||||
extra = 0;
|
||||
extractedPower = doExtract( extractedPower, amt );
|
||||
this.extra = 0;
|
||||
extractedPower = this.doExtract( extractedPower, amt );
|
||||
}
|
||||
|
||||
// got more then we wanted?
|
||||
if ( extractedPower > amt )
|
||||
{
|
||||
extra = extractedPower - amt;
|
||||
globalAvailablePower -= amt;
|
||||
this.extra = extractedPower - amt;
|
||||
this.globalAvailablePower -= amt;
|
||||
|
||||
tickDrainPerTick += amt;
|
||||
this.tickDrainPerTick += amt;
|
||||
return amt;
|
||||
}
|
||||
|
||||
if ( extractedPower < amt )
|
||||
{
|
||||
Iterator<IEnergyGridProvider> i = energyGridProviders.iterator();
|
||||
Iterator<IEnergyGridProvider> i = this.energyGridProviders.iterator();
|
||||
while (extractedPower < amt && i.hasNext())
|
||||
extractedPower += i.next().extractAEPower( amt - extractedPower, mode, seen );
|
||||
}
|
||||
|
||||
// go less or the correct amount?
|
||||
globalAvailablePower -= extractedPower;
|
||||
tickDrainPerTick += extractedPower;
|
||||
this.globalAvailablePower -= extractedPower;
|
||||
this.tickDrainPerTick += extractedPower;
|
||||
return extractedPower;
|
||||
}
|
||||
|
||||
private double doExtract(double extractedPower, double amt)
|
||||
{
|
||||
while (extractedPower < amt && !providers.isEmpty())
|
||||
while (extractedPower < amt && !this.providers.isEmpty())
|
||||
{
|
||||
IAEPowerStorage node = getFirstProvider();
|
||||
IAEPowerStorage node = this.getFirstProvider();
|
||||
|
||||
double req = amt - extractedPower;
|
||||
double newPower = node.extractAEPower( req, Actionable.MODULATE, PowerMultiplier.ONE );
|
||||
@@ -532,8 +532,8 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
|
||||
if ( newPower < req )
|
||||
{
|
||||
providers.remove( node );
|
||||
lastProvider = null;
|
||||
this.providers.remove( node );
|
||||
this.lastProvider = null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -543,7 +543,7 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
|
||||
private double simulateExtract(double extractedPower, double amt)
|
||||
{
|
||||
Iterator<IAEPowerStorage> it = providers.iterator();
|
||||
Iterator<IAEPowerStorage> it = this.providers.iterator();
|
||||
|
||||
while (extractedPower < amt && it.hasNext())
|
||||
{
|
||||
@@ -560,38 +560,38 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
@Override
|
||||
public boolean isNetworkPowered()
|
||||
{
|
||||
return publicHasPower;
|
||||
return this.publicHasPower;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getIdlePowerUsage()
|
||||
{
|
||||
return drainPerTick + pgc.channelPowerUsage;
|
||||
return this.drainPerTick + this.pgc.channelPowerUsage;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getAvgPowerUsage()
|
||||
{
|
||||
return avgDrainPerTick;
|
||||
return this.avgDrainPerTick;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getAvgPowerInjection()
|
||||
{
|
||||
return avgInjectionPerTick;
|
||||
return this.avgInjectionPerTick;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSplit(IGridStorage storageB)
|
||||
{
|
||||
extra /= 2;
|
||||
storageB.dataObject().setDouble( "extraEnergy", extra );
|
||||
this.extra /= 2;
|
||||
storageB.dataObject().setDouble( "extraEnergy", this.extra );
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onJoin(IGridStorage storageB)
|
||||
{
|
||||
extra += storageB.dataObject().getDouble( "extraEnergy" );
|
||||
this.extra += storageB.dataObject().getDouble( "extraEnergy" );
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user