#741 Capacitor bank io modes effect wrong connections.

This commit is contained in:
CrazyPants committed 2014-06-10 16:34:10 +08:00
1 parent acda2be8ec
commit eae8f8a132
2 files changed
+27 -27

No files matched your search

@@ -381,9 +381,9 @@ public class NetworkPowerManager {
receptors.clear();
storageReceptors.clear();
for (ReceptorEntry rec : network.getPowerReceptors()) {
if(rec.powerInterface.getDelegate() != null &&
rec.powerInterface.getDelegate().getClass() == TileCapacitorBank.class &&
!((TileCapacitorBank)rec.powerInterface.getDelegate()).isCreative()) {
if(rec.powerInterface.getDelegate() != null &&
rec.powerInterface.getDelegate().getClass() == TileCapacitorBank.class &&
!((TileCapacitorBank) rec.powerInterface.getDelegate()).isCreative()) {
storageReceptors.add(rec);
} else {
receptors.add(rec);
@@ -447,35 +447,35 @@ public class NetworkPowerManager {
for (ReceptorEntry rec : storageReceptors) {
TileCapacitorBank cb = (TileCapacitorBank) rec.powerInterface.getDelegate();
cb = cb.getController();
boolean processed = capBanks.contains(cb);
boolean processed = capBanks.contains(cb.getController());
if(!processed) {
stored += cb.getEnergyStored();
maxCap += cb.getMaxEnergyStored();
capBanks.add(cb);
if(rec.emmiter.getConectionMode(rec.direction) == ConnectionMode.IN_OUT) {
toBalance += cb.getEnergyStored();
maxToBalance += cb.getMaxEnergyStored();
}
float canGet = 0;
if(cb.isOutputEnabled(rec.direction.getOpposite())) {
canGet = Math.min(cb.getEnergyStored(), cb.getMaxOutput());
canGet = Math.min(canGet, rec.emmiter.getMaxEnergyRecieved(rec.direction));
canExtract += canGet;
}
float canFill = 0;
if(cb.isInputEnabled(rec.direction.getOpposite())) {
canFill = Math.min(cb.getMaxEnergyStored() - cb.getEnergyStored(), cb.getMaxInput());
canFill = Math.min(canFill, rec.emmiter.getMaxEnergyExtracted(rec.direction));
this.canFill += canFill;
}
enteries.add(new CapBankSupplyEntry(cb, canGet, canFill, rec.emmiter, rec.direction));
capBanks.add(cb.getController());
}
if(rec.emmiter.getConectionMode(rec.direction) == ConnectionMode.IN_OUT) {
toBalance += cb.getEnergyStored();
maxToBalance += cb.getMaxEnergyStored();
}
float canGet = 0;
if(cb.isOutputEnabled(rec.direction.getOpposite())) {
canGet = Math.min(cb.getEnergyStored(), cb.getMaxOutput());
canGet = Math.min(canGet, rec.emmiter.getMaxEnergyRecieved(rec.direction));
canExtract += canGet;
}
float canFill = 0;
if(cb.isInputEnabled(rec.direction.getOpposite())) {
canFill = Math.min(cb.getMaxEnergyStored() - cb.getEnergyStored(), cb.getMaxInput());
canFill = Math.min(canFill, rec.emmiter.getMaxEnergyExtracted(rec.direction));
this.canFill += canFill;
}
enteries.add(new CapBankSupplyEntry(cb, canGet, canFill, rec.emmiter, rec.direction));
}
@@ -317,7 +317,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe
public boolean isInputEnabled(ForgeDirection direction) {
IoMode mode = getIoMode(direction);
return mode == IoMode.PUSH || mode == IoMode.NONE && isInputEnabled();
return mode == IoMode.PULL || mode == IoMode.NONE && isInputEnabled();
}
private boolean transmitEnergy() {