diff options
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Item_Machines.java | 9 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/power/EUPower.java | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java index 6ee2db6b6e..7ca54ad115 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java @@ -3,7 +3,6 @@ package gregtech.common.blocks; import static gregtech.GT_Mod.GT_FML_LOGGER; import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.interfaces.ISecondaryDescribable; import gregtech.api.interfaces.metatileentity.IConnectable; @@ -77,19 +76,19 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem { } if (tTileEntity.getEUCapacity() > 0L) { if (tTileEntity.getInputVoltage() > 0L) { - final int inputTier = GT_Utility.getTier(tTileEntity.getInputVoltage()); + final byte inputTier = GT_Utility.getTier(tTileEntity.getInputVoltage()); aList.add(GT_LanguageManager.addStringLocalization( "TileEntity_EUp_IN", "Voltage IN: ", !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(tTileEntity.getInputVoltage()) - + " (" + GT_Values.TIER_COLORS[inputTier] + GT_Values.VN[inputTier] + + " (" + GT_Utility.getColoredTierNameFromTier(inputTier) + EnumChatFormatting.GREEN + ")" + EnumChatFormatting.GRAY); } if (tTileEntity.getOutputVoltage() > 0L) { - final int outputTier = GT_Utility.getTier(tTileEntity.getOutputVoltage()); + final byte outputTier = GT_Utility.getTier(tTileEntity.getOutputVoltage()); aList.add(GT_LanguageManager.addStringLocalization( "TileEntity_EUp_OUT", "Voltage OUT: ", !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(tTileEntity.getOutputVoltage()) - + " (" + GT_Values.TIER_COLORS[outputTier] + GT_Values.VN[outputTier] + + " (" + GT_Utility.getColoredTierNameFromTier(outputTier) + EnumChatFormatting.GREEN + ")" + EnumChatFormatting.GRAY); } if (tTileEntity.getOutputAmperage() > 1L) { diff --git a/src/main/java/gregtech/common/power/EUPower.java b/src/main/java/gregtech/common/power/EUPower.java index 39fa0bb04e..cc8c00f8f5 100644 --- a/src/main/java/gregtech/common/power/EUPower.java +++ b/src/main/java/gregtech/common/power/EUPower.java @@ -2,7 +2,6 @@ package gregtech.common.power; import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_Utility; -import net.minecraft.util.EnumChatFormatting; public class EUPower extends Power { protected final int amperage; @@ -23,7 +22,7 @@ public class EUPower extends Power { @Override public String getTierString() { - return GT_Values.TIER_COLORS[tier] + GT_Values.VN[tier] + EnumChatFormatting.RESET; + return GT_Utility.getColoredTierNameFromTier(tier); } @Override |