diff --git a/src/main/java/forestry/core/TemperatureState.java b/src/main/java/forestry/core/TemperatureState.java index c35770dcf..155af83ea 100755 --- a/src/main/java/forestry/core/TemperatureState.java +++ b/src/main/java/forestry/core/TemperatureState.java @@ -24,6 +24,24 @@ public enum TemperatureState { OVERHEATING, - MELTING + MELTING; + + public static TemperatureState getState(double heat, double maxHeat) { + final double scaledHeat = heat / maxHeat; + + if (scaledHeat < 0.20) { + return TemperatureState.COOL; + } else if (scaledHeat < 0.45) { + return TemperatureState.WARMED_UP; + } else if (scaledHeat < 0.65) { + return TemperatureState.OPERATING_TEMPERATURE; + } else if (scaledHeat < 0.85) { + return TemperatureState.RUNNING_HOT; + } else if (scaledHeat < 1.0) { + return TemperatureState.OVERHEATING; + } else { + return TemperatureState.MELTING; + } + } } diff --git a/src/main/java/forestry/core/gadgets/Engine.java b/src/main/java/forestry/core/gadgets/Engine.java index 5c5bb201f..4e58e9e71 100755 --- a/src/main/java/forestry/core/gadgets/Engine.java +++ b/src/main/java/forestry/core/gadgets/Engine.java @@ -225,22 +225,7 @@ public abstract class Engine extends TileBase implements IEnergyConnection, IAct * Returns the current energy state of the engine */ public TemperatureState getTemperatureState() { - // double scaledStorage = (double)storedEnergy / (double)maxEnergy; - double scaledHeat = (double) heat / (double) maxHeat; - - if (scaledHeat < 0.20) { - return TemperatureState.COOL; - } else if (scaledHeat < 0.45) { - return TemperatureState.WARMED_UP; - } else if (scaledHeat < 0.65) { - return TemperatureState.OPERATING_TEMPERATURE; - } else if (scaledHeat < 0.85) { - return TemperatureState.RUNNING_HOT; - } else if (scaledHeat < 1.0) { - return TemperatureState.OVERHEATING; - } else { - return TemperatureState.MELTING; - } + return TemperatureState.getState(heat, maxHeat); } public float getPistonSpeed() { diff --git a/src/main/java/forestry/energy/gadgets/EngineClockwork.java b/src/main/java/forestry/energy/gadgets/EngineClockwork.java index f371e6d81..e96400838 100755 --- a/src/main/java/forestry/energy/gadgets/EngineClockwork.java +++ b/src/main/java/forestry/energy/gadgets/EngineClockwork.java @@ -133,19 +133,11 @@ public class EngineClockwork extends Engine { @Override public TemperatureState getTemperatureState() { - double scaled = (heat / 10000) / ENGINE_CLOCKWORK_WIND_MAX; - - if (scaled < 0.20) { - return TemperatureState.COOL; - } else if (scaled < 0.45) { - return TemperatureState.WARMED_UP; - } else if (scaled < 0.65) { - return TemperatureState.OPERATING_TEMPERATURE; - } else if (scaled < 0.85) { - return TemperatureState.RUNNING_HOT; - } else { - return TemperatureState.OVERHEATING; + TemperatureState state = TemperatureState.getState(heat / 10000, ENGINE_CLOCKWORK_WIND_MAX); + if (state == TemperatureState.MELTING) { + state = TemperatureState.OVERHEATING; } + return state; } @Override