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

TESR should use less CPU when no-op.

Browse Source 
onInventoryChange for FZ.
Networks without batteries can store up to 1000 AE.
Fixed a bug that cause energy to spiral out of control and go infinite.
Fixed a crash with storage buses and fluids.
This commit is contained in:
AlgorithmX2
2014-02-05 22:36:10 -06:00
parent e79e866417
commit f295669e6e
14 changed files with 121 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
me/cache/EnergyGridCache.java
Vendored
+15 -12
View File
@@ -68,6 +68,11 @@ public class EnergyGridCache implements IEnergyGrid
IAEPowerStorage lastRequestor;
Set<IAEPowerStorage> requesters = new LinkedHashSet();
private double buffer()
{
return providers.isEmpty() ? 1000.0 : 0.0;
}
private IAEPowerStorage getFirstRequestor()
{
if ( lastRequestor == null )
@@ -183,7 +188,7 @@ public class EnergyGridCache implements IEnergyGrid
extra = i;
}
return i;
return Math.max( 0.0, i - buffer() );
}
Set<IEnergyGrid> seen = new HashSet();
@@ -299,8 +304,8 @@ public class EnergyGridCache implements IEnergyGrid
publicPowerState( false, myGrid );
availableTicksSinceUpdate++;
if ( extra > 32 )
injectPower( 0.0, Actionable.MODULATE );
// if ( extra > 32 )
// injectPower( 0.0, Actionable.MODULATE );
}
private void publicPowerState(boolean newState, IGrid grid)
@@ -354,7 +359,10 @@ public class EnergyGridCache implements IEnergyGrid
return extractedPower;
}
else
extractedPower += doExtract( extractedPower, amt );
{
extra = 0;
extractedPower = doExtract( extractedPower, amt );
}
// got more then we wanted?
if ( extractedPower > amt )
@@ -379,8 +387,6 @@ public class EnergyGridCache implements IEnergyGrid
private double doExtract(double extractedPower, double amt)
{
extra = 0;
while (extractedPower < amt && !providers.isEmpty())
{
IAEPowerStorage node = getFirstProvider();
@@ -435,8 +441,7 @@ public class EnergyGridCache implements IEnergyGrid
return avgDrainPerTick;/*
* double out = 0;
*
* for (double x : totalDrainPastTicks) out +=
* x;
* for (double x : totalDrainPastTicks) out += x;
*
* return out / totalDrainPastTicks.length;
*/
@@ -448,11 +453,9 @@ public class EnergyGridCache implements IEnergyGrid
return avgInjectionPerTick;/*
* double out = 0;
*
* for (double x : totalInjectionPastTicks)
* out += x;
* for (double x : totalInjectionPastTicks) out += x;
*
* return out /
* totalInjectionPastTicks.length;
* return out / totalInjectionPastTicks.length;
*/
}