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

Naming standards :)

Browse source
This commit is contained in:
Aidan Brady 2014-07-31 20:55:01 -04:00
parent 725b7463f0
commit d9bb5845cd
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
package mekanism.api; package mekanism.api;
import mekanism.api.util.EnergyUtil.EnergyType; import mekanism.api.util.EnergyUtils.EnergyType;
public class MekanismConfig public class MekanismConfig
{ {

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

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

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

@ -6,7 +6,7 @@ import mekanism.api.Coord4D;
import mekanism.api.MekanismAPI; import mekanism.api.MekanismAPI;
import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.general;
import mekanism.api.MekanismConfig.usage; 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.entity.EntityRobit;
import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine;
import mekanism.common.inventory.container.ContainerChanceMachine; import mekanism.common.inventory.container.ContainerChanceMachine;

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

@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf;
import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.general;
import mekanism.api.MekanismConfig.usage; import mekanism.api.MekanismConfig.usage;
import mekanism.api.util.EnergyUtil.EnergyType; import mekanism.api.util.EnergyUtils.EnergyType;
import mekanism.common.IModule; import mekanism.common.IModule;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.network.PacketConfigSync.ConfigSyncMessage; import mekanism.common.network.PacketConfigSync.ConfigSyncMessage;

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

@ -19,8 +19,8 @@ import mekanism.api.EnumColor;
import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.general;
import mekanism.api.gas.Gas; import mekanism.api.gas.Gas;
import mekanism.api.gas.GasStack; import mekanism.api.gas.GasStack;
import mekanism.api.util.EnergyUtil; import mekanism.api.util.EnergyUtils;
import mekanism.api.util.EnergyUtil.ElectricUnit; import mekanism.api.util.EnergyUtils.ElectricUnit;
import mekanism.common.IActiveState; import mekanism.common.IActiveState;
import mekanism.common.IFactory; import mekanism.common.IFactory;
import mekanism.common.IFactory.RecipeType; import mekanism.common.IFactory.RecipeType;
@ -1166,13 +1166,13 @@ public final class MekanismUtils
switch(general.activeType) switch(general.activeType)
{ {
case J: case J:
return EnergyUtil.getDisplayShort(energy, ElectricUnit.JOULES); return EnergyUtils.getDisplayShort(energy, ElectricUnit.JOULES);
case RF: 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: 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: case MJ:
return EnergyUtil.getDisplayShort(energy * general.TO_BC, ElectricUnit.MINECRAFT_JOULES); return EnergyUtils.getDisplayShort(energy * general.TO_BC, ElectricUnit.MINECRAFT_JOULES);
} }
return "error"; return "error";