Fix invalid unit on current charge on batteries (#1562)

GregTechCEu · Jul 9, 2024 · 28ab4c4 · 28ab4c4
1 parent 01894be
commit 28ab4c4
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java b/src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java
@@ -156,22 +156,18 @@ private static void addCurrentChargeTooltip(List<Component> tooltip, long curren
         long currentChargeTime;
         long maxChargeTime;
         String unit;
-        if (durationCurrent.getSeconds() <= 180) {
-            currentChargeTime = durationCurrent.getSeconds();
-        } else if (durationCurrent.toMinutes() <= 180) {
-            currentChargeTime = durationCurrent.toMinutes();
-        } else {
-            currentChargeTime = durationCurrent.toHours();
-        }
 
         if (durationMax.getSeconds() <= 180) {
             maxChargeTime = durationMax.getSeconds();
+            currentChargeTime = durationCurrent.toSeconds();
             unit = LocalizationUtils.format("item.gtceu.battery.charge_unit.second");
         } else if (durationMax.toMinutes() <= 180) {
             maxChargeTime = durationMax.toMinutes();
+            currentChargeTime = durationCurrent.toMinutes();
             unit = LocalizationUtils.format("item.gtceu.battery.charge_unit.minute");
         } else {
             maxChargeTime = durationMax.toHours();
+            currentChargeTime = durationCurrent.toHours();
             unit = LocalizationUtils.format("item.gtceu.battery.charge_unit.hour");
         }