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

Quick cleanup

Browse source
This commit is contained in:
Aidan Brady 2014-01-10 16:35:29 -05:00
parent 210e949ed4
commit 73f0c646c8
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
common/mekanism/common/EnergyDisplay.java
View file

@ -7,8 +7,13 @@ public class EnergyDisplay
{ {
public static enum ElectricUnit public static enum ElectricUnit
{ {
AMPERE("Amp", "I"), AMP_HOUR("Amp Hour", "Ah"), VOLTAGE("Volt", "V"), WATT("Watt", "W"), AMPERE("Amp", "I"),
WATT_HOUR("Watt Hour", "Wh"), RESISTANCE("Ohm", "R"), CONDUCTANCE("Siemen", "S"), AMP_HOUR("Amp Hour", "Ah"),
VOLTAGE("Volt", "V"),
WATT("Watt", "W"),
WATT_HOUR("Watt Hour", "Wh"),
RESISTANCE("Ohm", "R"),
CONDUCTANCE("Siemen", "S"),
JOULES("Joule", "J"); JOULES("Joule", "J");
public String name; public String name;
@ -29,10 +34,16 @@ public class EnergyDisplay
/** Metric system of measurement. */ /** Metric system of measurement. */
public static enum MeasurementUnit public static enum MeasurementUnit
{ {
MICRO("Micro", "u", 0.000001D), MILLI("Milli", "m", 0.001D), BASE("", "", 1), MICRO("Micro", "u", 0.000001D),
KILO("Kilo", "k", 1000D), MEGA("Mega", "M", 1000000D), GIGA("Giga", "G", 1000000000D), MILLI("Milli", "m", 0.001D),
TERA("Tera", "T", 1000000000000D), PETA("Peta", "P", 1000000000000000D), BASE("", "", 1),
EXA("Exa", "E", 1000000000000000000D), ZETTA("Zetta", "Z", 1000000000000000000000D), KILO("Kilo", "k", 1000D),
MEGA("Mega", "M", 1000000D),
GIGA("Giga", "G", 1000000000D),
TERA("Tera", "T", 1000000000000D),
PETA("Peta", "P", 1000000000000000D),
EXA("Exa", "E", 1000000000000000000D),
ZETTA("Zetta", "Z", 1000000000000000000000D),
YOTTA("Yotta", "Y", 1000000000000000000000000D); YOTTA("Yotta", "Y", 1000000000000000000000000D);
/** long name for the unit */ /** long name for the unit */

2
common/mekanism/common/util/CableUtils.java
View file

@ -118,9 +118,7 @@ public final class CableUtils
TileEntity tile = coord.getFromSide(side).getTileEntity(tileEntity.worldObj); TileEntity tile = coord.getFromSide(side).getTileEntity(tileEntity.worldObj);
connectable[side.ordinal()] |= isEnergyAcceptor(tile) && isConnectable(tileEntity, tile, side); connectable[side.ordinal()] |= isEnergyAcceptor(tile) && isConnectable(tileEntity, tile, side);
connectable[side.ordinal()] |= isCable(tile); connectable[side.ordinal()] |= isCable(tile);
connectable[side.ordinal()] |= isOutputter(tile, side); connectable[side.ordinal()] |= isOutputter(tile, side);
} }