From b2c8cfb4ec8b82337a95f51364277964ec968b52 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 1 May 2023 02:45:56 -0700 Subject: ForgeDirection (#608) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ForgeDirection WIP * Fix GTPP_Render_MachineBlock Fix handling of getTexture with facing mask for pipes Kill a bunch of magic numbers * spotlessApply (#612) Co-authored-by: GitHub GTNH Actions <> * Bump bw/tt deps --------- Co-authored-by: Léa Gris Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java') diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java b/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java index 60efc687dc..a2c29ba76a 100644 --- a/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java +++ b/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java @@ -85,6 +85,7 @@ public class ThermalStorage implements IThermalStorage { } } + @Override public int receiveThermalEnergy(int arg0, boolean arg1) { int arg2 = Math.min(this.capacity - this.thermal_energy, Math.min(this.maxReceive, arg0)); if (!arg1) { @@ -94,6 +95,7 @@ public class ThermalStorage implements IThermalStorage { return arg2; } + @Override public int extractThermalEnergy(int arg0, boolean arg1) { int arg2 = Math.min(this.thermal_energy, Math.min(this.maxExtract, arg0)); if (!arg1) { @@ -103,10 +105,12 @@ public class ThermalStorage implements IThermalStorage { return arg2; } + @Override public int getThermalEnergyStored() { return this.thermal_energy; } + @Override public int getMaxThermalEnergyStored() { return this.capacity; } -- cgit