From b2be7ffe423a070a9d6ebbd4f5759df001369b12 Mon Sep 17 00:00:00 2001
From: aidancbrady <me@aidancbrady.com>
Date: Sat, 13 Jun 2015 12:39:23 -0400
Subject: [PATCH] Fixed Universal Cable IC2 interaction, Solar Evaporation
 Plants now cool down half as fast as they did previously, also continue to
 operate with internal heat at night

---
 src/main/java/mekanism/common/EnergyNetwork.java           | 2 ++
 .../java/mekanism/common/base/EnergyAcceptorWrapper.java   | 7 ++++++-
 .../common/tile/TileEntitySolarEvaporationController.java  | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java
index e7e239f96..9eeb2ff22 100644
--- a/src/main/java/mekanism/common/EnergyNetwork.java
+++ b/src/main/java/mekanism/common/EnergyNetwork.java
@@ -133,10 +133,12 @@ public class EnergyNetwork extends DynamicNetwork<EnergyAcceptorWrapper, EnergyN
 	public double emit(double energyToSend, boolean doEmit)
 	{
 		double toUse = Math.min(getEnergyNeeded(), energyToSend);
+		
 		if(doEmit)
 		{
 			buffer.amount += toUse;
 		}
+		
 		return energyToSend-toUse;
 	}
 
diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
index bda1f64d1..becdc629d 100644
--- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
+++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
@@ -164,7 +164,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor
 		@Override
 		public double transferEnergyToAcceptor(ForgeDirection side, double amount)
 		{
-			return acceptor.injectEnergy(side, toEU(amount), 0);
+			return amount - fromEU(acceptor.injectEnergy(side, toEU(amount), 0));
 		}
 
 		@Override
@@ -201,5 +201,10 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor
 		{
 			return joules * general.TO_IC2;
 		}
+		
+		public double fromEU(double eu)
+		{
+			return eu * general.FROM_IC2;
+		}
 	}
 }
diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java
index a940eb73d..9de08628a 100644
--- a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java
+++ b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java
@@ -195,7 +195,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
 
 	public boolean canOperate(SolarEvaporationRecipe recipe)
 	{
-		if(!structured || height < 3 || height > 18 || inputTank.getFluid() == null || getTempMultiplier() == 0)
+		if(!structured || height < 3 || height > 18 || inputTank.getFluid() == null)
 		{
 			return false;
 		}
@@ -314,7 +314,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
 		
 		if(getTempMultiplier() == 0)
 		{
-			temperature = Math.max(0, getTemperature()-(max/WARMUP));
+			temperature = Math.max(0, getTemperature()-(max/(WARMUP*2)));
 		}
 		else {
 			temperature = Math.min(max, getTemperature()+incr);