Automatic synchronization

84 files changed, 5263 insertions, 1713 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 424a63e9bf..c51b2e2997 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -30,6 +30,7 @@ import gregtech.api.util.Recipe_GT;
 import gregtech.api.util.SemiFluidFuelHandler;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.commands.CommandDebugChunks;
+import gtPlusPlus.core.commands.CommandEnableDebugWhileRunning;
 import gtPlusPlus.core.commands.CommandMath;
 import gtPlusPlus.core.common.CommonProxy;
 import gtPlusPlus.core.config.ConfigHandler;
@@ -231,7 +232,8 @@ public class GTplusplus implements ActionListener {
 	public synchronized void serverStarting(final FMLServerStartingEvent event) {
 		INIT_PHASE.SERVER_START.setPhaseActive(true);
 		mChunkLoading.serverStarting(event);
-		event.registerServerCommand(new CommandMath());
+        event.registerServerCommand(new CommandMath());
+        event.registerServerCommand(new CommandEnableDebugWhileRunning());
 		event.registerServerCommand(new CommandDebugChunks());
 		if (LoadedMods.Thaumcraft) {
 			event.registerServerCommand(new CommandDumpAspects());
diff --git a/src/Java/gtPlusPlus/api/thermal/energy/IThermalConnection.java b/src/Java/gtPlusPlus/api/thermal/energy/IThermalConnection.java
new file mode 100644
index 0000000000..d8573000fc
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/thermal/energy/IThermalConnection.java
@@ -0,0 +1,7 @@
+package gtPlusPlus.api.thermal.energy;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+public interface IThermalConnection {
+	boolean canConnectThermalEnergy(ForgeDirection arg0);
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/api/thermal/energy/IThermalContainerItem.java b/src/Java/gtPlusPlus/api/thermal/energy/IThermalContainerItem.java
new file mode 100644
index 0000000000..072695bd76
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/thermal/energy/IThermalContainerItem.java
@@ -0,0 +1,15 @@
+package gtPlusPlus.api.thermal.energy;
+
+import net.minecraft.item.ItemStack;
+
+public interface IThermalContainerItem {
+	
+	int receiveThermalEnergy(ItemStack arg0, int arg1, boolean arg2);
+
+	int extractThermalEnergy(ItemStack arg0, int arg1, boolean arg2);
+
+	int getThermalEnergyStored(ItemStack arg0);
+
+	int getMaxThermalEnergyStored(ItemStack arg0);
+	
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/api/thermal/energy/IThermalHandler.java b/src/Java/gtPlusPlus/api/thermal/energy/IThermalHandler.java
new file mode 100644
index 0000000000..3ab7127757
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/thermal/energy/IThermalHandler.java
@@ -0,0 +1,15 @@
+package gtPlusPlus.api.thermal.energy;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+public interface IThermalHandler extends IThermalProvider, IThermalReceiver {
+	
+	int receiveThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2);
+
+	int extractThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2);
+
+	int getThermalEnergyStored(ForgeDirection arg0);
+
+	int getMaxThermalEnergyStored(ForgeDirection arg0);
+	
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/api/thermal/energy/IThermalProvider.java b/src/Java/gtPlusPlus/api/thermal/energy/IThermalProvider.java
new file mode 100644
index 0000000000..0e4a060b23
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/thermal/energy/IThermalProvider.java
@@ -0,0 +1,13 @@
+package gtPlusPlus.api.thermal.energy;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+public interface IThermalProvider extends IThermalConnection {
+	
+	int extractThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2);
+
+	int getThermalEnergyStored(ForgeDirection arg0);
+
+	int getMaxThermalEnergyStored(ForgeDirection arg0);
+	
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/api/thermal/energy/IThermalReceiver.java b/src/Java/gtPlusPlus/api/thermal/energy/IThermalReceiver.java
new file mode 100644
index 0000000000..e08ce48a06
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/thermal/energy/IThermalReceiver.java
@@ -0,0 +1,13 @@
+package gtPlusPlus.api.thermal.energy;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+public interface IThermalReceiver extends IThermalConnection {
+	
+	int receiveThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2);
+
+	int getThermalEnergyStored(ForgeDirection arg0);
+
+	int getMaxThermalEnergyStored(ForgeDirection arg0);
+	
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/api/thermal/energy/IThermalStorage.java b/src/Java/gtPlusPlus/api/thermal/energy/IThermalStorage.java
new file mode 100644
index 0000000000..db3e6c8966
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/thermal/energy/IThermalStorage.java
@@ -0,0 +1,13 @@
+package gtPlusPlus.api.thermal.energy;
+
+public interface IThermalStorage {
+	
+	int receiveThermalEnergy(int arg0, boolean arg1);
+
+	int extractThermalEnergy(int arg0, boolean arg1);
+
+	int getThermalEnergyStored();
+
+	int getMaxThermalEnergyStored();
+	
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java b/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java
new file mode 100644
index 0000000000..9c7bb0066c
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java
@@ -0,0 +1,116 @@
+package gtPlusPlus.api.thermal.energy;
+
+import net.minecraft.nbt.NBTTagCompound;
+
+public class ThermalStorage implements IThermalStorage {
+	
+	protected int thermal_energy;
+	protected int capacity;
+	protected int maxReceive;
+	protected int maxExtract;
+
+	public ThermalStorage(int arg0) {
+		this(arg0, arg0, arg0);
+	}
+
+	public ThermalStorage(int arg0, int arg1) {
+		this(arg0, arg1, arg1);
+	}
+
+	public ThermalStorage(int arg0, int arg1, int arg2) {
+		this.capacity = arg0;
+		this.maxReceive = arg1;
+		this.maxExtract = arg2;
+	}
+
+	public ThermalStorage readFromNBT(NBTTagCompound arg0) {
+		this.thermal_energy = arg0.getInteger("ThermalEnergy");
+		if (this.thermal_energy > this.capacity) {
+			this.thermal_energy = this.capacity;
+		}
+		return this;
+	}
+
+	public NBTTagCompound writeToNBT(NBTTagCompound arg0) {
+		if (this.thermal_energy < 0) {
+			this.thermal_energy = 0;
+		}
+		arg0.setInteger("ThermalEnergy", this.thermal_energy);
+		return arg0;
+	}
+
+	public void setCapacity(int arg0) {
+		this.capacity = arg0;
+		if (this.thermal_energy > arg0) {
+			this.thermal_energy = arg0;
+		}
+
+	}
+
+	public void setMaxTransfer(int arg0) {
+		this.setMaxReceive(arg0);
+		this.setMaxExtract(arg0);
+	}
+
+	public void setMaxReceive(int arg0) {
+		this.maxReceive = arg0;
+	}
+
+	public void setMaxExtract(int arg0) {
+		this.maxExtract = arg0;
+	}
+
+	public int getMaxReceive() {
+		return this.maxReceive;
+	}
+
+	public int getMaxExtract() {
+		return this.maxExtract;
+	}
+
+	public void setEnergyStored(int arg0) {
+		this.thermal_energy = arg0;
+		if (this.thermal_energy > this.capacity) {
+			this.thermal_energy = this.capacity;
+		} else if (this.thermal_energy < 0) {
+			this.thermal_energy = 0;
+		}
+
+	}
+
+	public void modifyEnergyStored(int arg0) {
+		this.thermal_energy += arg0;
+		if (this.thermal_energy > this.capacity) {
+			this.thermal_energy = this.capacity;
+		} else if (this.thermal_energy < 0) {
+			this.thermal_energy = 0;
+		}
+
+	}
+
+	public int receiveThermalEnergy(int arg0, boolean arg1) {
+		int arg2 = Math.min(this.capacity - this.thermal_energy, Math.min(this.maxReceive, arg0));
+		if (!arg1) {
+			this.thermal_energy += arg2;
+		}
+
+		return arg2;
+	}
+
+	public int extractThermalEnergy(int arg0, boolean arg1) {
+		int arg2 = Math.min(this.thermal_energy, Math.min(this.maxExtract, arg0));
+		if (!arg1) {
+			this.thermal_energy -= arg2;
+		}
+
+		return arg2;
+	}
+
+	public int getThermalEnergyStored() {
+		return this.thermal_energy;
+	}
+
+	public int getMaxThermalEnergyStored() {
+		return this.capacity;
+	}
+}
\ No