From b885de7765cb7d073fe0c0c4f9cf5e80ffb0feaa Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 15 Dec 2014 21:03:05 +0800 Subject: [PATCH] #1409 Energy conduit and capacitor interaction bug --- ReleaseNotes.txt | 1 + .../conduit/power/NetworkPowerManager.java | 27 ++++++++++--------- .../enderio/machine/capbank/TileCapBank.java | 6 +++++ .../capbank/network/CapBankClientNetwork.java | 5 ++++ .../capbank/network/CapBankNetwork.java | 6 +++++ .../machine/power/TileCapacitorBank.java | 6 +++++ .../enderio/power/IPowerStorage.java | 10 +++++++ 7 files changed, 49 insertions(+), 12 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 5d252189..33d65c74 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -3,6 +3,7 @@ Version 2.2.4 ------------------------------------------------------ Bugs +- #1409 Energy conduit and capacitor interaction bug - Fixed infinite power bug ------------------------------------------------------ diff --git a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java index 5ea82d2d..22ee1e7b 100644 --- a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java +++ b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java @@ -147,7 +147,7 @@ public class NetworkPowerManager { } ReceptorEntry r = receptorIterator.next(); IPowerInterface pp = r.powerInterface; - if(pp != null) { + if(pp != null) { int canOffer = Math.min(r.emmiter.getMaxEnergyExtracted(r.direction), available); int used = pp.recieveEnergy(r.direction.getOpposite(), canOffer); used = Math.max(0, used); @@ -287,7 +287,7 @@ public class NetworkPowerManager { con.onTick(); energyStored += con.getEnergyStored(); } - energyStored = MathHelper.clamp_int(energyStored, 0, maxEnergyStored); + energyStored = MathHelper.clamp_int(energyStored, 0, maxEnergyStored); } public void receptorsChanged() { @@ -381,18 +381,21 @@ public class NetworkPowerManager { } long canGet = 0; - if(cb.isOutputEnabled(rec.direction.getOpposite())) { - canGet = Math.min(cb.getEnergyStoredL(), cb.getMaxOutput()); - canGet = Math.min(canGet, rec.emmiter.getMaxEnergyRecieved(rec.direction)); - canExtract += canGet; - } long canFill = 0; - if(cb.isInputEnabled(rec.direction.getOpposite())) { - canFill = Math.min(cb.getMaxEnergyStoredL() - cb.getEnergyStoredL(), cb.getMaxInput()); - canFill = Math.min(canFill, rec.emmiter.getMaxEnergyExtracted(rec.direction)); - this.canFill += canFill; + if(cb.isNetworkControlledIo(rec.direction.getOpposite())) { + if(cb.isOutputEnabled(rec.direction.getOpposite())) { + canGet = Math.min(cb.getEnergyStoredL(), cb.getMaxOutput()); + canGet = Math.min(canGet, rec.emmiter.getMaxEnergyRecieved(rec.direction)); + canExtract += canGet; + } + + if(cb.isInputEnabled(rec.direction.getOpposite())) { + canFill = Math.min(cb.getMaxEnergyStoredL() - cb.getEnergyStoredL(), cb.getMaxInput()); + canFill = Math.min(canFill, rec.emmiter.getMaxEnergyExtracted(rec.direction)); + this.canFill += canFill; + } + enteries.add(new CapBankSupplyEntry(cb, (int) canGet, (int) canFill, rec.emmiter, rec.direction)); } - enteries.add(new CapBankSupplyEntry(cb, (int) canGet, (int) canFill, rec.emmiter, rec.direction)); } diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index af9b3327..85a128c9 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -437,6 +437,12 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerHandler, return network.isInputEnabled(); } + @Override + public boolean isNetworkControlledIo(ForgeDirection direction) { + IoMode mode = getIoMode(direction); + return mode == IoMode.NONE || mode == IoMode.PULL; + } + @Override public boolean isCreative() { return getType().isCreative(); diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java index 1aed7834..9534e17f 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java @@ -251,4 +251,9 @@ public class CapBankClientNetwork implements ICapBankNetwork { return false; } + @Override + public boolean isNetworkControlledIo(ForgeDirection direction) { + return true; + } + } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java index abb01a82..c6fe23c4 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java @@ -554,4 +554,10 @@ public class CapBankNetwork implements ICapBankNetwork { return type.isCreative(); } + @Override + public boolean isNetworkControlledIo(ForgeDirection direction) { + //This is handled at the block level based on the IO mode + return true; + } + } diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index f9204ea4..d661d7f1 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -328,6 +328,12 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerHa return mode == IoMode.PULL || mode == IoMode.NONE && isInputEnabled(); } + @Override + public boolean isNetworkControlledIo(ForgeDirection direction) { + IoMode mode = getIoMode(direction); + return mode == IoMode.NONE || mode == IoMode.PULL; + } + private boolean transmitEnergy() { if(getEnergyStored() <= 0) { diff --git a/src/main/java/crazypants/enderio/power/IPowerStorage.java b/src/main/java/crazypants/enderio/power/IPowerStorage.java index dde90d3c..306ae6b1 100644 --- a/src/main/java/crazypants/enderio/power/IPowerStorage.java +++ b/src/main/java/crazypants/enderio/power/IPowerStorage.java @@ -10,6 +10,16 @@ public interface IPowerStorage { long getMaxEnergyStoredL(); + /** + * If false this connection will be treated the same a regular powered block. + * No power will be drawn over the connection and it will not be used to + * balance capacitor bank levels + * + * @param direction + * @return + */ + boolean isNetworkControlledIo(ForgeDirection direction); + boolean isOutputEnabled(ForgeDirection direction); boolean isInputEnabled(ForgeDirection direction);