Refactor.

GregTechCEu · Jan 29, 2025 · 51c74e8 · 51c74e8
1 parent 177143d
commit 51c74e8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json
@@ -1797,6 +1797,7 @@
   "config.gtceu.option.machines": "sǝuıɥɔɐɯ",
   "config.gtceu.option.machinesEmissiveTextures": "sǝɹnʇxǝ⟘ǝʌıssıɯƎsǝuıɥɔɐɯ",
   "config.gtceu.option.meHatchEnergyUsage": "ǝbɐs∩ʎbɹǝuƎɥɔʇɐHǝɯ",
+  "config.gtceu.option.minerSpeed": "pǝǝdSɹǝuıɯ",
   "config.gtceu.option.minimap": "dɐɯıuıɯ",
   "config.gtceu.option.nanoSaber": "ɹǝqɐSouɐu",
   "config.gtceu.option.nanoSaberBaseDamage": "ǝbɐɯɐᗡǝsɐᗺɹǝqɐSouɐu",
@@ -3289,9 +3290,9 @@
   "gtceu.multiblock.pattern.location_end": "ɹ§puƎ ʎɹǝΛɔ§",
   "gtceu.multiblock.pattern.replaceable_air": "ɹıⱯ ʎq ǝןqɐǝɔɐןdǝᴚ",
   "gtceu.multiblock.pattern.single": "ɹ§pǝsn ǝq uɐɔ ʞɔoןq sıɥʇ ʎןuO9§",
-  "gtceu.multiblock.power_substation.average_in": "%s Ɐ %s              \nʇ/∩Ǝㄥ§ %s :ʇnduI ˙bʌⱯㄥ§",
+  "gtceu.multiblock.power_substation.average_in": "%s              \nʇ/∩Ǝㄥ§ %s :ʇnduI ˙bʌⱯㄥ§",
   "gtceu.multiblock.power_substation.average_in_hover": "ʞuɐq ʎbɹǝuǝ ןɐuɹǝʇuı s,uoıʇɐʇsqnS ɹǝʍoԀ ǝɥʇ oʇuı ∩Ǝ pǝʇɹǝsuı ǝbɐɹǝʌɐ ǝɥ⟘",
-  "gtceu.multiblock.power_substation.average_out": "%s Ɐ %s              \nʇ/∩Ǝㄥ§ %s :ʇndʇnO ˙bʌⱯㄥ§",
+  "gtceu.multiblock.power_substation.average_out": "%s              \nʇ/∩Ǝㄥ§ %s :ʇndʇnO ˙bʌⱯㄥ§",
   "gtceu.multiblock.power_substation.average_out_hover": "ʞuɐq ʎbɹǝuǝ ןɐuɹǝʇuı s,uoıʇɐʇsqnS ɹǝʍoԀ ǝɥʇ ɟo ʇno ∩Ǝ pǝʇɔɐɹʇxǝ ǝbɐɹǝʌɐ ǝɥ⟘",
   "gtceu.multiblock.power_substation.capacity": "∩Ǝㄥ§ %s :ʎʇıɔɐdɐƆㄥ§",
   "gtceu.multiblock.power_substation.passive_drain": "ʇ/∩Ǝㄥ§ %s :uıɐɹᗡ ǝʌıssɐԀㄥ§",

diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json
@@ -1797,6 +1797,7 @@
   "config.gtceu.option.machines": "machines",
   "config.gtceu.option.machinesEmissiveTextures": "machinesEmissiveTextures",
   "config.gtceu.option.meHatchEnergyUsage": "meHatchEnergyUsage",
+  "config.gtceu.option.minerSpeed": "minerSpeed",
   "config.gtceu.option.minimap": "minimap",
   "config.gtceu.option.nanoSaber": "nanoSaber",
   "config.gtceu.option.nanoSaberBaseDamage": "nanoSaberBaseDamage",
@@ -3289,9 +3290,9 @@
   "gtceu.multiblock.pattern.location_end": "§cVery End§r",
   "gtceu.multiblock.pattern.replaceable_air": "Replaceable by Air",
   "gtceu.multiblock.pattern.single": "§6Only this block can be used§r",
-  "gtceu.multiblock.power_substation.average_in": "§7Avg. Input: %s §7EU/t\n              %s A %s",
+  "gtceu.multiblock.power_substation.average_in": "§7Avg. Input: %s §7EU/t\n              %s",
   "gtceu.multiblock.power_substation.average_in_hover": "The average inserted EU into the Power Substation's internal energy bank",
-  "gtceu.multiblock.power_substation.average_out": "§7Avg. Output: %s §7EU/t\n              %s A %s",
+  "gtceu.multiblock.power_substation.average_out": "§7Avg. Output: %s §7EU/t\n              %s",
   "gtceu.multiblock.power_substation.average_out_hover": "The average extracted EU out of the Power Substation's internal energy bank",
   "gtceu.multiblock.power_substation.capacity": "§7Capacity: %s §7EU",
   "gtceu.multiblock.power_substation.passive_drain": "§7Passive Drain: %s §7EU/t",

diff --git a/...java/com/gregtechceu/gtceu/common/machine/multiblock/electric/PowerSubstationMachine.java b/...java/com/gregtechceu/gtceu/common/machine/multiblock/electric/PowerSubstationMachine.java
@@ -1,6 +1,5 @@
 package com.gregtechceu.gtceu.common.machine.multiblock.electric;
 
-import com.gregtechceu.gtceu.api.GTValues;
 import com.gregtechceu.gtceu.api.capability.IEnergyContainer;
 import com.gregtechceu.gtceu.api.capability.IEnergyInfoProvider;
 import com.gregtechceu.gtceu.api.capability.recipe.EURecipeCapability;
@@ -23,7 +22,6 @@
 import com.gregtechceu.gtceu.api.misc.EnergyContainerList;
 import com.gregtechceu.gtceu.config.ConfigHolder;
 import com.gregtechceu.gtceu.utils.FormattingUtil;
-import com.gregtechceu.gtceu.utils.GTUtil;
 
 import com.lowdragmc.lowdraglib.gui.modular.ModularUI;
 import com.lowdragmc.lowdraglib.gui.widget.*;
@@ -215,24 +213,18 @@ public void addDisplayText(List<Component> textList) {
                         passiveDrainComponent.setStyle(STYLE_DARK_RED)));
 
                 var avgInComponent = Component.literal(FormattingUtil.formatNumbers(averageInLastSec));
-                var avgInVoltage = GTUtil.getFloorTierByVoltage(averageInLastSec);
-                var avgInAmperage = averageInLastSec / (double) GTValues.VEX[avgInVoltage];
                 textList.add(Component
                         .translatable("gtceu.multiblock.power_substation.average_in",
                                 avgInComponent.setStyle(STYLE_GREEN),
-                                Component.literal(FormattingUtil.DECIMAL_FORMAT_1F.format(avgInAmperage)),
-                                Component.literal(GTValues.VNF[avgInVoltage]))
+                                Component.literal(FormattingUtil.formatVoltageByTier(Math.abs(averageInLastSec))))
                         .withStyle(Style.EMPTY.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
                                 Component.translatable("gtceu.multiblock.power_substation.average_in_hover")))));
 
                 var avgOutComponent = Component.literal(FormattingUtil.formatNumbers(Math.abs(averageOutLastSec)));
-                var avgOutVoltage = GTUtil.getFloorTierByVoltage(averageOutLastSec);
-                var avgOutAmperage = averageOutLastSec / (double) GTValues.VEX[avgOutVoltage];
                 textList.add(Component
                         .translatable("gtceu.multiblock.power_substation.average_out",
                                 avgOutComponent.setStyle(STYLE_RED),
-                                Component.literal(FormattingUtil.DECIMAL_FORMAT_1F.format(avgOutAmperage)),
-                                Component.literal(GTValues.VNF[avgOutVoltage]))
+                                Component.literal(FormattingUtil.formatVoltageByTier(Math.abs(averageOutLastSec))))
                         .withStyle(Style.EMPTY.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
                                 Component.translatable("gtceu.multiblock.power_substation.average_out_hover")))));
 

diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java
@@ -915,11 +915,11 @@ protected static void init(RegistrateLangProvider provider) {
         provider.add("gtceu.multiblock.power_substation.stored", "§7Stored: %s §7EU");
         provider.add("gtceu.multiblock.power_substation.capacity", "§7Capacity: %s §7EU");
         provider.add("gtceu.multiblock.power_substation.passive_drain", "§7Passive Drain: %s §7EU/t");
-        provider.add("gtceu.multiblock.power_substation.average_in", "§7Avg. Input: %s §7EU/t\n              %s A %s");
+        provider.add("gtceu.multiblock.power_substation.average_in", "§7Avg. Input: %s §7EU/t\n              %s");
         provider.add("gtceu.multiblock.power_substation.average_in_hover",
                 "The average inserted EU into the Power Substation's internal energy bank");
         provider.add("gtceu.multiblock.power_substation.average_out",
-                "§7Avg. Output: %s §7EU/t\n              %s A %s");
+                "§7Avg. Output: %s §7EU/t\n              %s");
         provider.add("gtceu.multiblock.power_substation.average_out_hover",
                 "The average extracted EU out of the Power Substation's internal energy bank");
         provider.add("gtceu.multiblock.power_substation.time_to_fill", "§7Time to fill: %s");

diff --git a/src/main/java/com/gregtechceu/gtceu/utils/FormattingUtil.java b/src/main/java/com/gregtechceu/gtceu/utils/FormattingUtil.java
@@ -1,5 +1,7 @@
 package com.gregtechceu.gtceu.utils;
 
+import com.gregtechceu.gtceu.api.GTValues;
+
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ComponentContents;
 import net.minecraft.network.chat.MutableComponent;
@@ -241,6 +243,12 @@ public static Component formatPercentage2Places(String langKey, float percentage
         return Component.translatable(langKey, formatNumber2Places(percentage)).withStyle(YELLOW);
     }
 
+    public static String formatVoltageByTier(long voltage) {
+        var voltageTier = GTUtil.getFloorTierByVoltage(voltage);
+        var amperage = voltage / (double) GTValues.VEX[voltageTier];
+        return FormattingUtil.DECIMAL_FORMAT_1F.format(amperage) + " A " + GTValues.VNF[voltageTier];
+    }
+
     public static void combineComponents(MutableComponent c1, Component c2) {
         if (!isEmptyComponent(c1) && !isEmptyComponent(c2)) {
             c1.append(", ").append(c2);