Changed algorithm for energy distribution with capacitor banks.

updated version to 17.
This commit is contained in:
brad-c committed 2013-09-03 17:07:16 +08:00
1 parent cb9b293c24
commit 720b0cb86a
7 files changed
+238 -57

No files matched your search

+1 -1
View File
@@ -19,7 +19,7 @@
<property name="mc.version" value="1.6.2"/>
<property name="forge.version" value="9.10.0.828"/>
<property name="project.version" value="0.1.15"/>
<property name="project.version" value="0.1.17"/>
<property name="forge.name" value="minecraftforge-src-${mc.version}-${forge.version}.zip"/>
+1 -1
View File
@@ -50,7 +50,7 @@ import crazypants.enderio.material.ItemIndustrialBinder;
import crazypants.enderio.material.ItemYetaWrench;
import crazypants.enderio.material.MaterialRecipes;
@Mod(name = "EnderIO", modid = "EnderIO", version = "0.1.15", dependencies = "required-after:Forge@[9.10.0.800,)")
@Mod(name = "EnderIO", modid = "EnderIO", version = "0.1.17", dependencies = "required-after:Forge@[9.10.0.800,)")
@NetworkMod(clientSideRequired = true, serverSideRequired = true, channels = { "EnderIO" }, packetHandler = PacketHandler.class)
public class EnderIO {
@@ -9,10 +9,12 @@ import java.util.Set;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerHandler;
import buildcraft.api.power.PowerHandler.PowerReceiver;
import buildcraft.api.power.PowerHandler.Type;
import crazypants.enderio.conduit.power.PowerConduitNetwork.ReceptorEntry;
import crazypants.enderio.machine.power.TileCapacitorBank;
import crazypants.enderio.power.IInternalPowerReceptor;
import crazypants.enderio.power.PowerHandlerUtil;
import crazypants.util.BlockCoord;
@@ -45,37 +47,37 @@ public class NetworkPowerManager {
public void applyRecievedPower() {
//Update our energy stored based on what's in our conduits
updateNetorkStorage();
checkReserves();
// Update our energy stored based on what's in our conduits
updateNetorkStorage();
checkReserves();
updateActiveState();
if (energyStored <= 0 || receptors.isEmpty()) {
return;
}
CapBankSupply capSupply = new CapBankSupply();
int appliedCount = 0;
int numReceptors = receptors.size();
storageReceptors.clear();
while (energyStored > 0 && appliedCount < numReceptors) {
float available = energyStored + capSupply.canExtract - reserved;
float wasAvailable = available;
if (available <= 0 || (receptors.isEmpty() && storageReceptors.isEmpty())) {
return;
}
while (available > 0 && appliedCount < numReceptors) {
if (!receptors.isEmpty() && !receptorIterator.hasNext()) {
receptorIterator = receptors.listIterator();
}
ReceptorEntry r = receptorIterator.next();
float reservedForEntry = removeReservedEnergy(r);
PowerReceiver pp = r.powerReceptor.getPowerReceiver(r.direction);
if (pp != null) {
if (pp.getType() == Type.STORAGE) {
// only apply energy to these guys if there is any left over
storageReceptors.add(r);
} else if (pp.getType() != Type.ENGINE) {
if (pp.getType() != Type.ENGINE) {
float used = 0;
float nonReservedPower = energyStored - reserved;
float available = nonReservedPower + reservedForEntry;
float canOffer = Math.min(r.emmiter.getCapacitor().getMaxEnergyExtracted(), available);
float reservedForEntry = removeReservedEnergy(r);
float canOffer = available + reservedForEntry;
canOffer = Math.min(r.emmiter.getCapacitor().getMaxEnergyExtracted(), canOffer);
float requested = pp.powerRequest();
// If it is possible to supply the minimum amount of energy
@@ -87,15 +89,15 @@ public class NetworkPowerManager {
} else if (r.powerReceptor instanceof IInternalPowerReceptor) {
used = PowerHandlerUtil.transmitInternal((IInternalPowerReceptor) r.powerReceptor, pp, canOffer, Type.PIPE, r.direction);
} else {
float offer = Math.min(requested, canOffer);
used = pp.receiveEnergy(Type.PIPE, offer, r.direction);
float offer = Math.min(requested, canOffer);
used = pp.receiveEnergy(Type.PIPE, offer, r.direction);
}
}
energyStored -= used;
available -= used;
}
if (energyStored <= 0) {
}
if (available <= 0) {
break;
}
@@ -103,27 +105,29 @@ public class NetworkPowerManager {
appliedCount++;
}
//send any energy left over to the storage once we are more than 90% full internallly
if (energyStored > 0 && !storageReceptors.isEmpty() && (energyStored / maxEnergyStored > 0.9)) {
for (ReceptorEntry r : storageReceptors) {
PowerReceiver pp = r.powerReceptor.getPowerReceiver(r.direction);
if (pp != null) {
float used = 0;
float available = energyStored - reserved;
float canOffer = Math.min(r.emmiter.getCapacitor().getMaxEnergyExtracted(), available);
float requested = pp.powerRequest();
if (r.powerReceptor instanceof IInternalPowerReceptor) {
used = PowerHandlerUtil.transmitInternal((IInternalPowerReceptor) r.powerReceptor, pp, canOffer, Type.PIPE, r.direction);
} else {
used = pp.receiveEnergy(Type.PIPE, Math.min(requested, canOffer), r.direction);
}
energyStored -= used;
}
if (energyStored <= 0) {
break;
}
}
float used = wasAvailable - available;
// use all the capacator storage first
energyStored -= used;
float capBankChange = 0;
if (energyStored < 0) {
// not enough so get the rest from the capacitor bank
capBankChange = energyStored;
energyStored = 0;
} else if (energyStored > 0) {
// push as much as we can back to the cap banks
capBankChange = Math.min(energyStored, capSupply.canFill);
energyStored -= capBankChange;
}
if (capBankChange < 0) {
capSupply.remove(Math.abs(capBankChange));
} else if (capBankChange > 0) {
capSupply.add(capBankChange);
}
capSupply.balance();
distributeStorageToConduits();
}
@@ -169,31 +173,31 @@ public class NetworkPowerManager {
}
private void distributeStorageToConduits() {
if(maxEnergyStored <= 0 || energyStored <= 0) {
if (maxEnergyStored <= 0 || energyStored <= 0) {
for (IPowerConduit con : network.getConduits()) {
con.getPowerHandler().setEnergy(0);
}
return;
}
if(energyStored > maxEnergyStored) {
if (energyStored > maxEnergyStored) {
energyStored = maxEnergyStored;
}
float filledRatio = energyStored / maxEnergyStored;
float energyLeft = energyStored;
float given = 0;
for (IPowerConduit con : network.getConduits()) {
//NB: use ceil to ensure we dont through away any energy due to rounding errors
float give = (float)Math.ceil(con.getCapacitor().getMaxEnergyStored() * filledRatio);
give = Math.min(give, con.getCapacitor().getMaxEnergyStored());
give = Math.min(give, energyLeft);
float give = (float) Math.ceil(con.getCapacitor().getMaxEnergyStored() * filledRatio);
give = Math.min(give, con.getCapacitor().getMaxEnergyStored());
give = Math.min(give, energyLeft);
con.getPowerHandler().setEnergy(give);
given += give;
energyLeft -= give;
if(energyLeft <= 0) {
if (energyLeft <= 0) {
return;
}
}
}
}
boolean isActive() {
@@ -216,7 +220,14 @@ public class NetworkPowerManager {
public void receptorsChanged() {
receptors.clear();
receptors.addAll(network.getPowerReceptors());
storageReceptors.clear();
for (ReceptorEntry rec : network.getPowerReceptors()) {
if (rec.powerReceptor instanceof TileCapacitorBank) {
storageReceptors.add(rec);
} else {
receptors.add(rec);
}
}
receptorIterator = receptors.listIterator();
}
@@ -237,4 +248,162 @@ public class NetworkPowerManager {
}
private float minAbs(float amount, float limit) {
if (amount < 0) {
return Math.max(amount, -limit);
} else {
return Math.min(amount, limit);
}
}
private class CapBankSupply {
float canExtract;
float canFill;
float filledRatio;
float stored = 0;
float maxCap = 0;
List<CapBankSupplyEntry> enteries;
CapBankSupply() {
init();
}
void init() {
canExtract = 0;
canFill = 0;
stored = 0;
maxCap = 0;
enteries = new ArrayList<NetworkPowerManager.CapBankSupplyEntry>();
for (ReceptorEntry rec : storageReceptors) {
TileCapacitorBank cb = (TileCapacitorBank) rec.powerReceptor;
stored += cb.getEnergyStored();
maxCap += cb.getMaxEnergyStored();
float canGet = 0;
if (cb.isOutputEnabled()) {
canGet = Math.min(cb.getEnergyStored(), cb.getMaxIO());
canGet = Math.min(canGet, rec.emmiter.getCapacitor().getMaxEnergyExtracted());
canExtract += canGet;
}
float canFill = 0;
if(cb.isInputEnabled()) {
canFill = Math.min(cb.getMaxEnergyStored() - cb.getEnergyStored(), cb.getMaxIO());
this.canFill += canFill;
}
enteries.add(new CapBankSupplyEntry(cb, canGet, canFill));
}
filledRatio = 0;
if (maxCap > 0) {
filledRatio = stored / maxCap;
}
}
void balance() {
if (enteries.size() < 2) {
return;
}
init();
int canRemove = 0;
int canAdd = 0;
for (CapBankSupplyEntry entry : enteries) {
entry.calcToBalance(filledRatio);
if (entry.toBalance < 0) {
canRemove += -entry.toBalance;
} else {
canAdd += entry.toBalance;
}
}
float toalTransferAmount = Math.min(canAdd, canRemove);
for (int i = 0; i < enteries.size() && toalTransferAmount > 0; i++) {
CapBankSupplyEntry from = enteries.get(i);
float amount = from.toBalance;
amount = minAbs(amount, toalTransferAmount);
from.capBank.addEnergy(amount);
toalTransferAmount -= Math.abs(amount);
float toTranfser = Math.abs(amount);
for (int j = i + 1; j < enteries.size() && toTranfser > 0; j++) {
CapBankSupplyEntry to = enteries.get(j);
if (Math.signum(amount) != Math.signum(to.toBalance)) {
float toAmount = Math.min(toTranfser, Math.abs(to.toBalance));
to.capBank.addEnergy(toAmount * Math.signum(to.toBalance));
toTranfser -= toAmount;
}
}
}
}
void remove(float amount) {
if (canExtract <= 0 || amount <= 0) {
return;
}
float ratio = amount / canExtract;
for (CapBankSupplyEntry entry : enteries) {
double use = Math.ceil(ratio * entry.canExtract);
use = Math.min(use, amount);
use = Math.min(use, entry.canExtract);
entry.capBank.addEnergy(-(float) use);
amount -= use;
if (amount == 0) {
return;
}
}
}
void add(float amount) {
if (canFill <= 0 || amount <= 0) {
return;
}
float ratio = amount / canFill;
for (CapBankSupplyEntry entry : enteries) {
double add = (int) Math.ceil(ratio * entry.canFill);
add = Math.min(add, entry.canFill);
add = Math.min(add, amount);
entry.capBank.addEnergy((float) add);
amount -= add;
if (amount == 0) {
return;
}
}
}
}
private static class CapBankSupplyEntry {
final TileCapacitorBank capBank;
final float canExtract;
final float canFill;
float toBalance;
private CapBankSupplyEntry(TileCapacitorBank capBank, float available, float canFill) {
this.capBank = capBank;
this.canExtract = available;
this.canFill = canFill;
}
void calcToBalance(float targetRatio) {
float targetAmount = capBank.getMaxEnergyStored() * targetRatio;
toBalance = targetAmount - capBank.getEnergyStored();
if (toBalance < 0) {
toBalance = Math.max(toBalance, -canExtract);
} else {
toBalance = Math.min(toBalance, canFill);
}
}
}
}
@@ -200,9 +200,7 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven
requiresClientSync |= processTasks(redstoneCheckPassed);
// Update if our power has changed by more than 1%
requiresClientSync |= Math.abs(lastSyncPowerStored - powerHandler.getEnergyStored()) > powerHandler.getMaxEnergyStored() / 100;
requiresClientSync |= lastSyncPowerStored != powerHandler.getMaxEnergyStored() && powerHandler.getEnergyStored() == powerHandler.getMaxEnergyStored();
requiresClientSync |= lastSyncPowerStored != powerHandler.getEnergyStored() && worldObj.getTotalWorldTime() % 16 == 0;
if (requiresClientSync) {
lastSyncPowerStored = powerHandler.getEnergyStored();
@@ -15,6 +15,8 @@ import buildcraft.api.power.PowerHandler.PowerReceiver;
import buildcraft.api.power.PowerHandler.Type;
import crazypants.enderio.ModObject;
import crazypants.enderio.PacketHandler;
import crazypants.enderio.conduit.IConduitBundle;
import crazypants.enderio.conduit.TileConduitBundle;
import crazypants.enderio.machine.RedstoneControlMode;
import crazypants.enderio.power.BasicCapacitor;
import crazypants.enderio.power.IInternalPowerReceptor;
@@ -129,6 +131,14 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep
}
public boolean isOutputEnabled() {
return getController().outputEnabled;
}
public boolean isInputEnabled() {
return getController().inputEnabled;
}
private boolean transmitEnergy() {
if (powerHandler.getEnergyStored() <= 0) {
@@ -154,7 +164,11 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep
if (receptor.receptor instanceof IInternalPowerReceptor) {
// System.out.println("TileEntityStirlingGenerator.transmitEnergy: Sending "
// + canTransmit + " to internal.");
used = PowerHandlerUtil.transmitInternal((IInternalPowerReceptor) receptor.receptor, pp, canTransmit, Type.STORAGE, receptor.fromDir);
if(! (receptor.receptor instanceof IConduitBundle) ) { //power conduits manage the exchange between them an the cap bank
used = PowerHandlerUtil.transmitInternal((IInternalPowerReceptor) receptor.receptor, pp, canTransmit, Type.STORAGE, receptor.fromDir);
} else {
used = 0;
}
} else {
// System.out.println("TileEntityStirlingGenerator.transmitEnergy: Sending "
// + canTransmit + " to EXTERNAL. Receptor is: " + receptor.receptor);
Binary file not shown.

Before

Width:  |  Height:  |  Size: 683 B

After

Width:  |  Height:  |  Size: 467 B

+1 -1
View File
@@ -3,7 +3,7 @@
"modid": "EnderIO",
"name": "Ender IO",
"description": "Compact conduits, painted things and access to your stuff through an eye of ender.",
"version": "0.1.15",
"version": "0.1.17",
"mcversion": "1.6.2",
"url": "http://www.minecraftforum.net/topic/1937619-162152-ender-io-how-many-pipes-in-one-block-updated-198/",
"updateUrl": "",