diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2023-05-01 02:45:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-01 11:45:56 +0200 |
| commit | b2c8cfb4ec8b82337a95f51364277964ec968b52 (patch) | |
| tree | d4cf94acc93249cd649b33ec13c5b0d75f1f75db /src/main/java/gtPlusPlus/api/thermal/energy | |
| parent | d2eda84e457d549ad9a51f40e9dd159147a141f8 (diff) | |
| download | GT5-Unofficial-b2c8cfb4ec8b82337a95f51364277964ec968b52.tar.gz GT5-Unofficial-b2c8cfb4ec8b82337a95f51364277964ec968b52.tar.bz2 GT5-Unofficial-b2c8cfb4ec8b82337a95f51364277964ec968b52.zip | |
ForgeDirection (#608)
* 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 <lea.gris@noiraude.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/api/thermal/energy')
| -rw-r--r-- | src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java index 6f0235f4d7..e50ae45003 100644 --- a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java +++ b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java @@ -4,11 +4,15 @@ import net.minecraftforge.common.util.ForgeDirection; public interface IThermalHandler extends IThermalProvider, IThermalReceiver { + @Override int receiveThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2); + @Override int extractThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2); + @Override int getThermalEnergyStored(ForgeDirection arg0); + @Override int getMaxThermalEnergyStored(ForgeDirection arg0); } 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; } |