diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index e2ca9217c..b073c9af8 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -1,6 +1,6 @@ package mekanism.api; -import mekanism.api.util.EnergyUtil.EnergyType; +import mekanism.api.util.EnergyUtils.EnergyType; public class MekanismConfig { diff --git a/src/main/java/mekanism/api/util/EnergyUtil.java b/src/main/java/mekanism/api/util/EnergyUtils.java similarity index 99% rename from src/main/java/mekanism/api/util/EnergyUtil.java rename to src/main/java/mekanism/api/util/EnergyUtils.java index ffbfd775d..fceedb530 100644 --- a/src/main/java/mekanism/api/util/EnergyUtil.java +++ b/src/main/java/mekanism/api/util/EnergyUtils.java @@ -3,7 +3,7 @@ package mekanism.api.util; /** * Code taken from UE and modified to fit Mekanism. */ -public class EnergyUtil +public class EnergyUtils { public static enum ElectricUnit { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index ffb1a617e..403d223f9 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -6,7 +6,7 @@ import mekanism.api.Coord4D; import mekanism.api.MekanismAPI; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; -import mekanism.api.util.EnergyUtil.EnergyType; +import mekanism.api.util.EnergyUtils.EnergyType; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.inventory.container.ContainerChanceMachine; diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 16c6b88bb..5536f03f7 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; -import mekanism.api.util.EnergyUtil.EnergyType; +import mekanism.api.util.EnergyUtils.EnergyType; import mekanism.common.IModule; import mekanism.common.Mekanism; 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 3a8627f30..9272d55f3 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -19,8 +19,8 @@ import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; -import mekanism.api.util.EnergyUtil; -import mekanism.api.util.EnergyUtil.ElectricUnit; +import mekanism.api.util.EnergyUtils; +import mekanism.api.util.EnergyUtils.ElectricUnit; import mekanism.common.IActiveState; import mekanism.common.IFactory; import mekanism.common.IFactory.RecipeType; @@ -1166,13 +1166,13 @@ public final class MekanismUtils switch(general.activeType) { case J: - return EnergyUtil.getDisplayShort(energy, ElectricUnit.JOULES); + return EnergyUtils.getDisplayShort(energy, ElectricUnit.JOULES); case RF: - return EnergyUtil.getDisplayShort(energy * general.TO_TE, ElectricUnit.REDSTONE_FLUX, 0); + return EnergyUtils.getDisplayShort(energy * general.TO_TE, ElectricUnit.REDSTONE_FLUX, 0); case EU: - return EnergyUtil.getDisplayShort(energy * general.TO_IC2, ElectricUnit.ELECTRICAL_UNITS, 0); + return EnergyUtils.getDisplayShort(energy * general.TO_IC2, ElectricUnit.ELECTRICAL_UNITS, 0); case MJ: - return EnergyUtil.getDisplayShort(energy * general.TO_BC, ElectricUnit.MINECRAFT_JOULES); + return EnergyUtils.getDisplayShort(energy * general.TO_BC, ElectricUnit.MINECRAFT_JOULES); } return "error";