Merge branch 'GTNewHorizons:master' into master

8 files changed, 0 insertions, 226 deletions

diff --git a/src/Java/gtPlusPlus/api/thermal/energy/IThermalConnection.java b/src/Java/gtPlusPlus/api/thermal/energy/IThermalConnection.java
deleted file mode 100644
index d8573000fc..0000000000
--- a/src/Java/gtPlusPlus/api/thermal/energy/IThermalConnection.java
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 072695bd76..0000000000
--- a/src/Java/gtPlusPlus/api/thermal/energy/IThermalContainerItem.java
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 3ab7127757..0000000000
--- a/src/Java/gtPlusPlus/api/thermal/energy/IThermalHandler.java
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 0e4a060b23..0000000000
--- a/src/Java/gtPlusPlus/api/thermal/energy/IThermalProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index e08ce48a06..0000000000
--- a/src/Java/gtPlusPlus/api/thermal/energy/IThermalReceiver.java
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index db3e6c8966..0000000000
--- a/src/Java/gtPlusPlus/api/thermal/energy/IThermalStorage.java
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 9c7bb0066c..0000000000
--- a/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java
+++ /dev/null
@@ -1,116 +0,0 @@
-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 newline at end of file
diff --git a/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorageAdv.java b/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorageAdv.java
deleted file mode 100644
index 47af7e79a6..0000000000
--- a/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorageAdv.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package gtPlusPlus.api.thermal.energy;
-
-public class ThermalStorageAdv extends ThermalStorage {
-	
-	public ThermalStorageAdv(int arg0) {
-		this(arg0, arg0, arg0);
-	}
-
-	public ThermalStorageAdv(int arg0, int arg1) {
-		this(arg0, arg1, arg1);
-	}
-
-	public ThermalStorageAdv(int arg0, int arg1, int arg2) {
-		super(arg0, arg1, arg2);
-	}
-
-	public int receiveEnergyNoLimit(int arg0, boolean arg1) {
-		int arg2 = Math.min(super.capacity - super.thermal_energy, arg0);
-		if (!arg1) {
-			super.thermal_energy += arg2;
-		}
-
-		return arg2;
-	}
-
-	public int extractEnergyNoLimit(int arg0, boolean arg1) {
-		int arg2 = Math.min(super.thermal_energy, arg0);
-		if (!arg1) {
-			super.thermal_energy -= arg2;
-		}
-
-		return arg2;
-	}
-}
\ No newline at end of file