add to IntegrationLang

Author: zetrock1

src/generated/resources/assets/gtceu/lang/en_ud.json

@@ -2489,11 +2489,18 @@
   "gtceu.jade.amperage_use": "Ɐ %s",
   "gtceu.jade.at": " @ ",
   "gtceu.jade.cleaned_this_second": "s/%s :pɹɐzɐɥ pǝuɐǝןƆ",
+  "gtceu.jade.days": "sʎɐp %s",
   "gtceu.jade.energy_stored": "∩Ǝ %d / %d",
   "gtceu.jade.fluid_use": "ʇ/ᗺɯ %s",
+  "gtceu.jade.hours": "sɹnoɥ %s",
+  "gtceu.jade.minutes": "sǝʇnuıɯ %s",
   "gtceu.jade.progress_computation": "∩MƆ %s / %s",
   "gtceu.jade.progress_sec": "s %s / %s",
   "gtceu.jade.progress_tick": "ʇ %s / %s",
+  "gtceu.jade.remaining_charge_time": "%s :pǝbɹɐɥɔ ןıʇu∩",
+  "gtceu.jade.remaining_discharge_time": "%s :ʎʇdɯǝ ןıʇu∩",
+  "gtceu.jade.seconds": "spuoɔǝs %s",
+  "gtceu.jade.years": "sɹɐǝʎ %s",
   "gtceu.jei.bedrock_fluid.heavy_oil_deposit": "ʇısodǝᗡ ןıO ʎʌɐǝH",
   "gtceu.jei.bedrock_fluid.lava_deposit": "ʇısodǝᗡ ɐʌɐꞀ",
   "gtceu.jei.bedrock_fluid.light_oil_deposit": "ʇısodǝᗡ ןıO ʇɥbıꞀ",

src/generated/resources/assets/gtceu/lang/en_us.json

@@ -2489,11 +2489,18 @@
   "gtceu.jade.amperage_use": "%s A",
   "gtceu.jade.at": " @ ",
   "gtceu.jade.cleaned_this_second": "Cleaned hazard: %s/s",
+  "gtceu.jade.days": "%s days",
   "gtceu.jade.energy_stored": "%d / %d EU",
   "gtceu.jade.fluid_use": "%s mB/t",
+  "gtceu.jade.hours": "%s hours",
+  "gtceu.jade.minutes": "%s minutes",
   "gtceu.jade.progress_computation": "%s / %s CWU",
   "gtceu.jade.progress_sec": "%s / %s s",
   "gtceu.jade.progress_tick": "%s / %s t",
+  "gtceu.jade.remaining_charge_time": "Until charged: %s",
+  "gtceu.jade.remaining_discharge_time": "Until empty: %s",
+  "gtceu.jade.seconds": "%s seconds",
+  "gtceu.jade.years": "%s years",
   "gtceu.jei.bedrock_fluid.heavy_oil_deposit": "Heavy Oil Deposit",
   "gtceu.jei.bedrock_fluid.lava_deposit": "Lava Deposit",
   "gtceu.jei.bedrock_fluid.light_oil_deposit": "Light Oil Deposit",

src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java

@@ -100,6 +100,13 @@ private static void initWailaLikeLang(RegistrateLangProvider provider) {
         provider.add("gtceu.jade.fluid_use", "%s mB/t");
         provider.add("gtceu.jade.amperage_use", "%s A");
         provider.add("gtceu.jade.at", " @ ");
+        provider.add("gtceu.jade.remaining_charge_time", "Until charged: %s");
+        provider.add("gtceu.jade.remaining_discharge_time", "Until empty: %s");
+        provider.add("gtceu.jade.seconds", "%s seconds");
+        provider.add("gtceu.jade.minutes", "%s minutes");
+        provider.add("gtceu.jade.hours", "%s hours");
+        provider.add("gtceu.jade.days", "%s days");
+        provider.add("gtceu.jade.years", "%s years");
 
         provider.add("gtceu.top.energy_stored", " / %d EU");
         provider.add("gtceu.top.progress_computation", " / %s CWU");

src/main/java/com/gregtechceu/gtceu/integration/jade/provider/BatteryStorageInfoProvider.java

@@ -42,9 +42,11 @@ public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPlugi
                     iTooltip.add(Component.literal("EU/sec: " + changed));
                     if (changed > 0) {
                         iTooltip.add(Component
-                                .literal("Until fully charged: " + getStringRemainTime((capacity - stored) / changed)));
+                                .translatable("gtceu.jade.remaining_charge_time",
+                                        getStringRemainTime((capacity - stored) / changed)));
                     } else if (changed < 0) {
-                        iTooltip.add(Component.literal("Until empty " + getStringRemainTime(stored / -changed)));
+                        iTooltip.add(Component.translatable("gtceu.jade.remaining_discharge_time",
+                                getStringRemainTime((stored) / -changed)));
                     }
                     if (Minecraft.getInstance().player.isShiftKeyDown()) {
                         CustomItemStackHandler handler = new CustomItemStackHandler();
@@ -55,6 +57,7 @@ public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPlugi
                                 ItemStack stack = handler.getStackInSlot(i);
                                 iTooltip.add(helper.smallItem(stack));
                                 IElectricItem item = GTCapabilityHelper.getElectricItem(stack);
+                                if (item == null) continue;
                                 iTooltip.append(Component.literal(
                                         GTValues.VNF[item.getTier()] + "§r " + formatEnergy(item.getCharge(), 100000) +
                                                 " / " + formatEnergy(item.getMaxCharge(), 100000) + " EU"));
@@ -67,19 +70,19 @@ public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPlugi
     }
 
     private String getStringRemainTime(long time) {
-        String s = time % 60 + " sec";
+        String s = Component.translatable("gtceu.jade.seconds", time % 60).getString();
         time /= 60;
         if (time > 0) {
-            s = time % 60 + " minutes " + s;
+            s = Component.translatable("gtceu.jade.minutes", time % 60).getString() + " " + s;
             time /= 60;
             if (time > 0) {
-                s = time % 60 + " hours " + s;
+                s = Component.translatable("gtceu.jade.hours", time % 60).getString() + " " + s;
                 time /= 60;
                 if (time > 0) {
-                    s = time % 24 + " days " + s;
+                    s = Component.translatable("gtceu.jade.days", time % 24).getString() + " " + s;
                     time /= 24;
                     if (time > 0) {
-                        s = formatEnergy(time, 10000) + " years " + s;
+                        s = Component.translatable("gtceu.jade.years", formatEnergy(time, 10000)).getString() + " " + s;
                     }
                 }
             }