From afc3efbc610ebbcb05aec1232d95d44b36750d8c Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 25 Sep 2014 15:35:16 -0700 Subject: [PATCH] Fix #237 Engines connected to cables don't animate --- src/main/java/forestry/core/gadgets/Engine.java | 5 ++++- src/main/java/forestry/energy/EnergyManager.java | 10 ++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/forestry/core/gadgets/Engine.java b/src/main/java/forestry/core/gadgets/Engine.java index ce3117364..b956d0a4d 100755 --- a/src/main/java/forestry/core/gadgets/Engine.java +++ b/src/main/java/forestry/core/gadgets/Engine.java @@ -77,6 +77,9 @@ public abstract class Engine extends TileBase implements IEnergyHandler { this.maxEnergy = maxEnergy; this.maxEnergyExtracted = maxEnergyExtracted; energyManager = new EnergyManager(100, 2000, 100, 1000000); + + // allow engines to chain, but not have energy sucked out of them + energyManager.setReceiveOnly(); } @Override @@ -152,7 +155,7 @@ public abstract class Engine extends TileBase implements IEnergyHandler { } } else if (canPowerTo(tile)) { // If we are not already running, check if - if (extractEnergy(getOrientation(), 1, true) > 0) { + if (getEnergyStored(getOrientation()) > 0) { stagePiston = 1; // If we can transfer energy, start running setActive(true); } else diff --git a/src/main/java/forestry/energy/EnergyManager.java b/src/main/java/forestry/energy/EnergyManager.java index d3eb4eec4..7f30c3996 100644 --- a/src/main/java/forestry/energy/EnergyManager.java +++ b/src/main/java/forestry/energy/EnergyManager.java @@ -143,7 +143,8 @@ public class EnergyManager implements IEnergyHandler { } /** - * Sends as much energy as it can to the tile at orientation + * Sends as much energy as it can to the tile at orientation. + * For power sources. Ignores canExtract() * @param orientation * @param tile * @return amount sent @@ -153,7 +154,8 @@ public class EnergyManager implements IEnergyHandler { } /** - * Sends amount of energy to the tile at orientation + * Sends amount of energy to the tile at orientation. + * For power sources. Ignores canExtract() * @param orientation * @param tile * @param amount @@ -164,10 +166,10 @@ public class EnergyManager implements IEnergyHandler { if (BlockUtil.isRFTile(orientation.getOpposite(), tile)) { IEnergyHandler receptor = (IEnergyHandler) tile; - int extractable = extractEnergy(orientation, amount, true); + int extractable = energyStorage.extractEnergy(amount, true); if (extractable > 0) { sent = receptor.receiveEnergy(orientation.getOpposite(), extractable, false); - extractEnergy(orientation, sent, false); + energyStorage.extractEnergy(sent, false); } } return sent;