Show energy flow amperage and correct voltage tier in WAILA for machine blocks (#1955)

Previously, WAILA just showed voltage tier based on total energy flow. This was problematic for machines that accept multiple amps such as the Arc Furnace. Even though it can accept up to 3A of input, increasing the total input voltage by one tier, it obviously cannot accept that voltage from a single source.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/PowerController.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/PowerController.java
index 477bb57b8e..532f171717 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/base/PowerController.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/PowerController.java
@@ -59,6 +59,7 @@ public abstract class PowerController<T extends PowerController<T>> extends Cont
         tag.setBoolean("isActive", isActive());
         if (isActive()) {
             tag.setLong("energyUsage", eut);
+            tag.setLong("energyTier", tier);
         }
     }
 
@@ -69,19 +70,22 @@ public abstract class PowerController<T extends PowerController<T>> extends Cont
         final NBTTagCompound tag = accessor.getNBTData();
         boolean isActive = tag.getBoolean("isActive");
         if (isActive) {
+            long energyTier = tag.getLong("energyTier");
             long actualEnergyUsage = tag.getLong("energyUsage");
             if (actualEnergyUsage > 0) {
                 currentTip.add(
                     StatCollector.translateToLocalFormatted(
-                        "GT5U.waila.energy.use",
+                        "GT5U.waila.energy.use_with_amperage",
                         GT_Utility.formatNumbers(actualEnergyUsage),
-                        GT_Utility.getColoredTierNameFromVoltage(actualEnergyUsage)));
+                        GT_Utility.getAmperageForTier(actualEnergyUsage, (byte) energyTier),
+                        GT_Utility.getColoredTierNameFromTier((byte) energyTier)));
             } else if (actualEnergyUsage < 0) {
                 currentTip.add(
                     StatCollector.translateToLocalFormatted(
-                        "GT5U.waila.energy.produce",
+                        "GT5U.waila.energy.produce_with_amperage",
                         GT_Utility.formatNumbers(-actualEnergyUsage),
-                        GT_Utility.getColoredTierNameFromVoltage(-actualEnergyUsage)));
+                        GT_Utility.getAmperageForTier(-actualEnergyUsage, (byte) energyTier),
+                        GT_Utility.getColoredTierNameFromTier((byte) energyTier)));
             }
         }
     }