From 4109c9575dd6d8a89f03e1242493dca228255570 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Mon, 29 Apr 2019 12:55:19 +1000
Subject: + Added Framework for Thermal power based upon the code used for RF.
 > This is more effective than trying to use the GT EU code for the exact same
 thing.

---
 .../api/thermal/energy/ThermalStorage.java         | 116 +++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java

(limited to 'src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java')

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..22a47b2807
--- /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("Energy");
+		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("Energy", 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
-- 
cgit 


From e5193543b16561e0f6b13ba0a347d94092d8a9b4 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sun, 12 May 2019 11:09:03 +1000
Subject: + Thermal Boiler now pulls lava filters from an input bus. + Added
 some minor GUI functions to GregtechMeta_MultiBlockBase. + Added some new
 Reflection functions.

---
 src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java')

diff --git a/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java b/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java
index 22a47b2807..9c7bb0066c 100644
--- a/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java
+++ b/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java
@@ -24,7 +24,7 @@ public class ThermalStorage implements IThermalStorage {
 	}
 
 	public ThermalStorage readFromNBT(NBTTagCompound arg0) {
-		this.thermal_energy = arg0.getInteger("Energy");
+		this.thermal_energy = arg0.getInteger("ThermalEnergy");
 		if (this.thermal_energy > this.capacity) {
 			this.thermal_energy = this.capacity;
 		}
@@ -35,7 +35,7 @@ public class ThermalStorage implements IThermalStorage {
 		if (this.thermal_energy < 0) {
 			this.thermal_energy = 0;
 		}
-		arg0.setInteger("Energy", this.thermal_energy);
+		arg0.setInteger("ThermalEnergy", this.thermal_energy);
 		return arg0;
 	}
 
-- 
cgit