tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Rename EnergyUtils to UnitDisplayUtils

Browse source
This commit is contained in:
Ben Spiers 2015-02-27 17:33:01 +00:00
parent fa9588d557
commit f2859cacbb
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/mekanism/api/MekanismConfig.java
View file

@ -1,7 +1,7 @@
package mekanism.api;
import mekanism.api.util.EnergyUtils.EnergyType;
import mekanism.api.util.EnergyUtils.TempType;
import mekanism.api.util.UnitDisplayUtils.EnergyType;
import mekanism.api.util.UnitDisplayUtils.TempType;
public class MekanismConfig
{

2
src/main/java/mekanism/api/util/EnergyUtils.java → src/main/java/mekanism/api/util/UnitDisplayUtils.java
View file

@ -3,7 +3,7 @@ package mekanism.api.util;
/**
* Code taken from UE and modified to fit Mekanism.
*/
public class EnergyUtils
public class UnitDisplayUtils
{
public static enum ElectricUnit
{

4
src/main/java/mekanism/common/CommonProxy.java
View file

@ -6,8 +6,8 @@ import mekanism.api.MekanismAPI;
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.api.util.UnitDisplayUtils.EnergyType;
import mekanism.api.util.UnitDisplayUtils.TempType;
import mekanism.common.base.IUpgradeTile;
import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.entity.EntityRobit;

2
src/main/java/mekanism/common/network/PacketConfigSync.java
View file

@ -2,7 +2,7 @@ package mekanism.common.network;
import mekanism.api.MekanismConfig.general;
import mekanism.api.MekanismConfig.usage;
import mekanism.api.util.EnergyUtils.EnergyType;
import mekanism.api.util.UnitDisplayUtils.EnergyType;
import mekanism.common.Mekanism;
import mekanism.common.base.IModule;
import mekanism.common.network.PacketConfigSync.ConfigSyncMessage;

24
src/main/java/mekanism/common/util/MekanismUtils.java
View file

@ -23,9 +23,9 @@ import mekanism.api.MekanismConfig.client;
import mekanism.api.MekanismConfig.general;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasStack;
import mekanism.api.util.EnergyUtils;
import mekanism.api.util.EnergyUtils.ElectricUnit;
import mekanism.api.util.EnergyUtils.TemperatureUnit;
import mekanism.api.util.UnitDisplayUtils;
import mekanism.api.util.UnitDisplayUtils.ElectricUnit;
import mekanism.api.util.UnitDisplayUtils.TemperatureUnit;
import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
import mekanism.common.OreDictCache;
@ -1143,13 +1143,13 @@ public final class MekanismUtils
switch(general.activeType)
{
case J:
return EnergyUtils.getDisplayShort(energy, ElectricUnit.JOULES);
return UnitDisplayUtils.getDisplayShort(energy, ElectricUnit.JOULES);
case RF:
return EnergyUtils.getDisplayShort(energy * general.TO_TE, ElectricUnit.REDSTONE_FLUX, 0);
return UnitDisplayUtils.getDisplayShort(energy * general.TO_TE, ElectricUnit.REDSTONE_FLUX, 0);
case EU:
return EnergyUtils.getDisplayShort(energy * general.TO_IC2, ElectricUnit.ELECTRICAL_UNITS, 0);
return UnitDisplayUtils.getDisplayShort(energy * general.TO_IC2, ElectricUnit.ELECTRICAL_UNITS, 0);
case MJ:
return EnergyUtils.getDisplayShort(energy * general.TO_TE / 10, ElectricUnit.MINECRAFT_JOULES);
return UnitDisplayUtils.getDisplayShort(energy * general.TO_TE / 10, ElectricUnit.MINECRAFT_JOULES);
}
return "error";
@ -1165,15 +1165,15 @@ public final class MekanismUtils
switch(general.tempUnit)
{
case K:
return EnergyUtils.getDisplayShort(T, TemperatureUnit.KELVIN);
return UnitDisplayUtils.getDisplayShort(T, TemperatureUnit.KELVIN);
case C:
return EnergyUtils.getDisplayShort(T, TemperatureUnit.CELSIUS);
return UnitDisplayUtils.getDisplayShort(T, TemperatureUnit.CELSIUS);
case R:
return EnergyUtils.getDisplayShort(T, TemperatureUnit.RANKINE);
return UnitDisplayUtils.getDisplayShort(T, TemperatureUnit.RANKINE);
case F:
return EnergyUtils.getDisplayShort(T, TemperatureUnit.FAHRENHEIT);
return UnitDisplayUtils.getDisplayShort(T, TemperatureUnit.FAHRENHEIT);
case STP:
return EnergyUtils.getDisplayShort(T, TemperatureUnit.AMBIENT);
return UnitDisplayUtils.getDisplayShort(T, TemperatureUnit.AMBIENT);
}
return "error";