mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Merge branch 'development' into 1.9.4
* development: Fixed heat displays
This commit is contained in:
commit
24377545ba
6 files changed
+8
-7
No files matched your search
@@ -42,7 +42,7 @@ public class GuiBoilerStats extends GuiMekanism
|
||||
public List<String> getInfo()
|
||||
{
|
||||
TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()];
|
||||
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss*unit.intervalSize, unit);
|
||||
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss*unit.intervalSize, false, unit);
|
||||
return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t");
|
||||
}
|
||||
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png")));
|
||||
|
||||
@@ -39,7 +39,7 @@ public class GuiFuelwoodHeater extends GuiMekanism
|
||||
public List<String> getInfo()
|
||||
{
|
||||
TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()];
|
||||
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss*unit.intervalSize, unit);
|
||||
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss*unit.intervalSize, false, unit);
|
||||
return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t");
|
||||
}
|
||||
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFuelwoodHeater.png")));
|
||||
|
||||
@@ -63,7 +63,6 @@ public class GuiResistiveHeater extends GuiMekanism
|
||||
@Override
|
||||
public List<String> getInfo()
|
||||
{
|
||||
System.out.println(tileEntity.lastEnvironmentLoss);
|
||||
TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()];
|
||||
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss*unit.intervalSize, false, unit);
|
||||
return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t");
|
||||
|
||||
@@ -52,7 +52,7 @@ public class GuiThermalEvaporationController extends GuiMekanism
|
||||
public List<String> getInfo()
|
||||
{
|
||||
TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()];
|
||||
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.totalLoss*unit.intervalSize, unit);
|
||||
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.totalLoss*unit.intervalSize, false, unit);
|
||||
return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t");
|
||||
}
|
||||
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png")));
|
||||
|
||||
@@ -71,7 +71,7 @@ public class GuiThermoelectricBoiler extends GuiMekanism
|
||||
public List<String> getInfo()
|
||||
{
|
||||
TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()];
|
||||
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss*unit.intervalSize, unit);
|
||||
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss*unit.intervalSize, false, unit);
|
||||
return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t");
|
||||
}
|
||||
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png")));
|
||||
|
||||
@@ -2,6 +2,7 @@ package mekanism.generators.client.gui;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import mekanism.api.MekanismConfig.general;
|
||||
import mekanism.api.util.ListUtils;
|
||||
import mekanism.api.util.UnitDisplayUtils;
|
||||
import mekanism.api.util.UnitDisplayUtils.TemperatureUnit;
|
||||
@@ -65,8 +66,9 @@ public class GuiHeatGenerator extends GuiMekanism
|
||||
@Override
|
||||
public List<String> getInfo()
|
||||
{
|
||||
String transfer = UnitDisplayUtils.getDisplayShort(tileEntity.lastTransferLoss, TemperatureUnit.KELVIN);
|
||||
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss, TemperatureUnit.KELVIN);
|
||||
TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()];
|
||||
String transfer = UnitDisplayUtils.getDisplayShort(tileEntity.lastTransferLoss, false, unit);
|
||||
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss, false, unit);
|
||||
return ListUtils.asList(LangUtils.localize("gui.transferred") + ": " + transfer + "/t", LangUtils.localize("gui.dissipated") + ": " + environment + "/t");
|
||||
}
|
||||
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png")));
|
||||
|
||||
Reference in new issue
Block a user