mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-20 20:12:30 +00:00
Naming standards :)
This commit is contained in:
1 parent
725b7463f0
commit
d9bb5845cd
5 files changed
+10
-10
No files matched your search
@@ -1,6 +1,6 @@
|
||||
package mekanism.api;
|
||||
|
||||
import mekanism.api.util.EnergyUtil.EnergyType;
|
||||
import mekanism.api.util.EnergyUtils.EnergyType;
|
||||
|
||||
public class MekanismConfig
|
||||
{
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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";
|
||||
|
||||
Reference in new issue
Block a user