From 2db6fde1189b8f2f1357a8358573ac2ef7a4423a Mon Sep 17 00:00:00 2001
From: aidancbrady <me@aidancbrady.com>
Date: Sun, 6 Mar 2016 13:51:11 -0500
Subject: [PATCH] EnergyNetwork now only distributes demanded energy to
 acceptors instead of forcing transfer, should fix interaction issues

---
 src/main/java/mekanism/common/EnergyNetwork.java         | 1 +
 .../java/mekanism/common/base/EnergyAcceptorWrapper.java | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java
index ec7fca8af..e9679d2ae 100644
--- a/src/main/java/mekanism/common/EnergyNetwork.java
+++ b/src/main/java/mekanism/common/EnergyNetwork.java
@@ -128,6 +128,7 @@ public class EnergyNetwork extends DynamicNetwork<EnergyAcceptorWrapper, EnergyN
 		} while(tryAgain);
 
 		joulesTransmitted = sent;
+		
 		return sent;
 	}
 
diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
index 2bd88308e..853fbbfa1 100644
--- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
+++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
@@ -103,7 +103,10 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor
 		@Override
 		public double transferEnergyToAcceptor(ForgeDirection side, double amount)
 		{
-			return fromRF(acceptor.receiveEnergy(side, toRF(amount), false));
+			int needed = acceptor.getMaxEnergyStored(side)-acceptor.getEnergyStored(side);
+			int transferred = acceptor.receiveEnergy(side, Math.min(needed, toRF(amount)), false);
+			
+			return fromRF(transferred);
 		}
 
 		@Override
@@ -135,7 +138,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor
 		@Override
 		public boolean needsEnergy(ForgeDirection side)
 		{
-			return acceptor.getMaxEnergyStored(side) - acceptor.getEnergyStored(side) > 0 || acceptor.receiveEnergy(side, 1, true) > 0;
+			return acceptor.receiveEnergy(side, 1, true) > 0;
 		}
 
 		public int toRF(double joules)
@@ -161,7 +164,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor
 		@Override
 		public double transferEnergyToAcceptor(ForgeDirection side, double amount)
 		{
-			return amount - fromEU(acceptor.injectEnergy(side, toEU(amount), 0));
+			return amount - fromEU(acceptor.injectEnergy(side, Math.min(acceptor.getDemandedEnergy(), toEU(amount)), 0));
 		}
 
 		@Override