diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 5bde272af..66c8b12f0 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -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 { diff --git a/src/main/java/mekanism/api/util/EnergyUtils.java b/src/main/java/mekanism/api/util/UnitDisplayUtils.java similarity index 99% rename from src/main/java/mekanism/api/util/EnergyUtils.java rename to src/main/java/mekanism/api/util/UnitDisplayUtils.java index a7d6981d4..7f6a2151a 100644 --- a/src/main/java/mekanism/api/util/EnergyUtils.java +++ b/src/main/java/mekanism/api/util/UnitDisplayUtils.java @@ -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 { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 961afee97..c21762b42 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -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; diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index fee7f917d..3b89ae1c5 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -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; diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index e3fd24e0a..f7db768f3 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -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";