mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 03:39:09 +00:00
Tidy up TemperatureState for engines
This commit is contained in:
1 parent
9ade0b8df2
commit
00ad24d415
3 files changed
+24
-29
No files matched your search
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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() {
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user