Add a proper temperature display utility

This commit is contained in:
Ben Spiers committed 2015-02-27 17:33:14 +00:00
1 parent 743d80b516
commit fa9588d557
6 files changed
+162 -8

No files matched your search

@@ -7,6 +7,7 @@ import mekanism.api.MekanismConfig.general;
import mekanism.api.MekanismConfig.usage;
import mekanism.api.Pos3D;
import mekanism.api.util.EnergyUtils.EnergyType;
import mekanism.api.util.EnergyUtils.TempType;
import mekanism.common.base.IUpgradeTile;
import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.entity.EntityRobit;
@@ -244,6 +245,32 @@ public class CommonProxy
}
}
s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Temperature Units", "K", null, new String[]{"K", "C", "R", "F"}).getString();
if(s != null)
{
if(s.trim().equalsIgnoreCase("k") || s.trim().equalsIgnoreCase("kelvin"))
{
general.tempUnit = TempType.K;
}
else if(s.trim().equalsIgnoreCase("c") || s.trim().equalsIgnoreCase("celsius") || s.trim().equalsIgnoreCase("centigrade"))
{
general.tempUnit = TempType.C;
}
else if(s.trim().equalsIgnoreCase("r") || s.trim().equalsIgnoreCase("rankine"))
{
general.tempUnit = TempType.R;
}
else if(s.trim().equalsIgnoreCase("f") || s.trim().equalsIgnoreCase("fahrenheit"))
{
general.tempUnit = TempType.F;
}
else if(s.trim().equalsIgnoreCase("a") || s.trim().equalsIgnoreCase("ambient") || s.trim().equalsIgnoreCase("stp"))
{
general.tempUnit = TempType.STP;
}
}
general.laserRange = Mekanism.configuration.get("general", "LaserRange", 64).getInt(64);
general.laserEnergyNeededPerHardness = Mekanism.configuration.get("general", "LaserDiggingEnergy", 100000).getInt(100000);