Add colored voltage tier display for Waila (#1598)

* Add colored voltage tier display for Waila

* Adapt to new methods

10 files changed, 45 insertions, 37 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
index fd3fe175c9..965e920e82 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
@@ -1,13 +1,10 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.VN;
-
 import cofh.api.energy.IEnergyReceiver;
 import cpw.mods.fml.common.Loader;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Dyes;
-import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
 import gregtech.api.enums.Textures;
@@ -441,7 +438,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     public String[] getDescription() {
         return new String[] {
             "Max Voltage: %%%" + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mVoltage) + " ("
-                    + GT_Values.TIER_COLORS[GT_Utility.getTier(mVoltage)] + VN[GT_Utility.getTier(mVoltage)]
+                    + GT_Utility.getColoredTierNameFromVoltage(mVoltage)
                     + EnumChatFormatting.GREEN + ")" + EnumChatFormatting.GRAY,
             "Max Amperage: %%%" + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(mAmperage)
                     + EnumChatFormatting.GRAY,
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
index a279f92783..c46dbe0bae 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
@@ -346,10 +346,16 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
                 "GT5U.waila.energy.stored",
                 GT_Utility.formatNumbers(tag.getLong("mStored")),
                 GT_Utility.formatNumbers(tag.getLong("mMax"))));
+        long avgIn = tag.getLong("AvgIn");
+        long avgOut = tag.getLong("AvgOut");
         currenttip.add(StatCollector.translateToLocalFormatted(
-                "GT5U.waila.energy.avg_in", GT_Utility.formatNumbers(tag.getLong("AvgIn"))));
+                "GT5U.waila.energy.avg_in",
+                GT_Utility.formatNumbers(avgIn),
+                GT_Utility.getColoredTierNameFromVoltage(avgIn)));
         currenttip.add(StatCollector.translateToLocalFormatted(
-                "GT5U.waila.energy.avg_out", GT_Utility.formatNumbers(tag.getLong("AvgOut"))));
+                "GT5U.waila.energy.avg_out",
+                GT_Utility.formatNumbers(avgOut),
+                GT_Utility.getColoredTierNameFromVoltage(avgOut)));
         super.getWailaBody(itemStack, currenttip, accessor, config);
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
index bbe20b6be6..c67a5564cc 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
@@ -1255,10 +1255,14 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
                 int mEUt = tag.getInteger("eut");
                 if (mEUt > 0) {
                     currenttip.add(StatCollector.translateToLocalFormatted(
-                            "GT5U.waila.energy.use", GT_Utility.formatNumbers(mEUt)));
+                            "GT5U.waila.energy.use",
+                            GT_Utility.formatNumbers(mEUt),
+                            GT_Utility.getColoredTierNameFromVoltage(mEUt)));
                 } else if (mEUt < 0) {
                     currenttip.add(StatCollector.translateToLocalFormatted(
-                            "GT5U.waila.energy.produce", GT_Utility.formatNumbers(-mEUt)));
+                            "GT5U.waila.energy.produce",
+                            GT_Utility.formatNumbers(-mEUt),
+                            GT_Utility.getColoredTierNameFromVoltage(-mEUt)));
                 }
             }
             currenttip.add(GT_Waila.getMachineProgressString(
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index 71adcd3a40..52bab2d391 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -1247,10 +1247,14 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
             long actualEnergyUsage = tag.getLong("energyUsage");
             if (actualEnergyUsage > 0) {
                 currentTip.add(StatCollector.translateToLocalFormatted(
-                        "GT5U.waila.energy.use", GT_Utility.formatNumbers(actualEnergyUsage)));
+                        "GT5U.waila.energy.use",
+                        GT_Utility.formatNumbers(actualEnergyUsage),
+                        GT_Utility.getColoredTierNameFromVoltage(actualEnergyUsage)));
             } else if (actualEnergyUsage < 0) {
                 currentTip.add(StatCollector.translateToLocalFormatted(
-                        "GT5U.waila.energy.produce", GT_Utility.formatNumbers(-actualEnergyUsage)));
+                        "GT5U.waila.energy.produce",
+                        GT_Utility.formatNumbers(-actualEnergyUsage),
+                        GT_Utility.getColoredTierNameFromVoltage(-actualEnergyUsage)));
             }
         }
         currentTip.add(
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java
index 4b01454a02..21267f983e 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java
@@ -10,6 +10,7 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.gui.modularui.GT_UITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.util.GT_Utility;
 import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Cleanroom;
 
 public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntity {
@@ -121,13 +122,13 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
     protected SlotWidget createChargerSlot(int x, int y) {
         final String batterySlotTooltipKey;
         final Object[] batterySlotTooltipArgs;
-        final String pTier1 = powerTierName(mTier);
+        final String pTier1 = GT_Utility.getColoredTierNameFromTier(mTier);
         if (mTier == GT_Values.VN.length - 1) {
             batterySlotTooltipKey = BATTERY_SLOT_TOOLTIP_ALT;
             batterySlotTooltipArgs = new String[] {pTier1};
         } else {
             batterySlotTooltipKey = BATTERY_SLOT_TOOLTIP;
-            batterySlotTooltipArgs = new String[] {pTier1, powerTierName((byte) (mTier + 1))};
+            batterySlotTooltipArgs = new String[] {pTier1, GT_Utility.getColoredTierNameFromTier((byte) (mTier + 1))};
         }
         return createChargerSlot(x, y, batterySlotTooltipKey, batterySlotTooltipArgs);
     }
@@ -140,13 +141,4 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
                 .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CHARGER)
                 .setPos(x, y);
     }
-
-    /**
-     * Apply proper coloration to a machine's power tier short name
-     * @param machineTier
-     * @return colored power tier short name
-     */
-    private String powerTierName(byte machineTier) {
-        return GT_Values.TIER_COLORS[machineTier] + GT_Values.VN[machineTier];
-    }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java
index 4bd5905ac5..0f6f6249a5 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java
@@ -14,7 +14,6 @@ import crazypants.enderio.machine.capbank.network.ICapBankNetwork;
 import crazypants.enderio.power.IPowerContainer;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -304,11 +303,11 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
                 "%s %s(%dA) -> %s(%dA)",
                 (allowedToWork ? (GREEN + "Step Down") : (RED + "Step Up")) + RESET,
                 GT_Mod.gregtechproxy.mWailaTransformerVoltageTier
-                        ? GT_Values.TIER_COLORS[inputTier] + GT_Values.VN[inputTier] + RESET
+                        ? GT_Utility.getColoredTierNameFromTier(inputTier)
                         : tag.getLong("maxEUInput"),
                 tag.getLong("maxAmperesIn"),
                 GT_Mod.gregtechproxy.mWailaTransformerVoltageTier
-                        ? GT_Values.TIER_COLORS[outputTier] + GT_Values.VN[outputTier] + RESET
+                        ? GT_Utility.getColoredTierNameFromTier(outputTier)
                         : tag.getLong("maxEUOutput"),
                 tag.getLong("maxAmperesOut")));
 
@@ -316,14 +315,14 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
             currenttip.add(String.format(
                     GOLD + "Input:" + RESET + " %s(%dA)",
                     GT_Mod.gregtechproxy.mWailaTransformerVoltageTier
-                            ? GT_Values.TIER_COLORS[inputTier] + GT_Values.VN[inputTier] + RESET
+                            ? GT_Utility.getColoredTierNameFromTier(inputTier)
                             : tag.getLong("maxEUInput"),
                     tag.getLong("maxAmperesIn")));
         } else {
             currenttip.add(String.format(
                     BLUE + "Output:" + RESET + " %s(%dA)",
                     GT_Mod.gregtechproxy.mWailaTransformerVoltageTier
-                            ? GT_Values.TIER_COLORS[outputTier] + GT_Values.VN[outputTier] + RESET
+                            ? GT_Utility.getColoredTierNameFromTier(outputTier)
                             : tag.getLong("maxEUOutput"),
                     tag.getLong("maxAmperesOut")));
         }
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index e24c893063..462324dd60 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -444,6 +444,14 @@ public class GT_Utility {
         return i;
     }
 
+    public static String getColoredTierNameFromVoltage(long voltage) {
+        return getColoredTierNameFromTier(getTier(voltage));
+    }
+
+    public static String getColoredTierNameFromTier(byte tier) {
+        return GT_Values.TIER_COLORS[tier] + GT_Values.VN[tier] + EnumChatFormatting.RESET;
+    }
+
     public static void sendChatToPlayer(EntityPlayer aPlayer, String aChatMessage) {
         if (aPlayer instanceof EntityPlayerMP && aChatMessage != null) {
             aPlayer.addChatComponentMessage(new ChatComponentText(aChatMessage));
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
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index 3755568b9e..e891492d94 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -303,10 +303,10 @@ GT5U.interface.coverTabs.east=East
 GT5U.waila.cover=Cover (%s): %s
 GT5U.waila.cover.current_facing=Current Facing
 GT5U.waila.energy.stored=Stored: §a%s§r EU / §e%s§r EU
-GT5U.waila.energy.avg_in=Average Input: §a%s§r EU
-GT5U.waila.energy.avg_out=Average Output: §c%s§r EU
-GT5U.waila.energy.use=Probably uses: §e%s§r EU
-GT5U.waila.energy.produce=Probably generates: §a%s§r EU
+GT5U.waila.energy.avg_in=Average Input: §a%s§r EU/t (%s)
+GT5U.waila.energy.avg_out=Average Output: §c%s§r EU/t (%s)
+GT5U.waila.energy.use=Probably uses: §e%s§r EU/t (%s)
+GT5U.waila.energy.produce=Probably generates: §a%s§r EU/t (%s)
 
 achievement.flintpick=First Tools
 achievement.flintpick.desc=Craft a flint pick