diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index b8a3c37607..72f166500e 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -3288,9 +3288,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 :ʇnduI ˙bʌⱯㄥ§", + "gtceu.multiblock.power_substation.average_in": "%s Ɐ %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 :ʇndʇnO ˙bʌⱯㄥ§", + "gtceu.multiblock.power_substation.average_out": "%s Ɐ %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 index 2bfbc8b809..8298733dd1 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -3288,9 +3288,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", + "gtceu.multiblock.power_substation.average_in": "§7Avg. Input: %s §7EU/t\n %s A %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", + "gtceu.multiblock.power_substation.average_out": "§7Avg. Output: %s §7EU/t\n %s A %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/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/PowerSubstationMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/PowerSubstationMachine.java index 2bf3899227..c225aa6d0c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/PowerSubstationMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/PowerSubstationMachine.java @@ -1,5 +1,6 @@ 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; @@ -22,6 +23,7 @@ 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.*; @@ -233,16 +235,24 @@ public void addDisplayText(List 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)) + avgInComponent.setStyle(STYLE_GREEN), + Component.literal(FormattingUtil.DECIMAL_FORMAT_1F.format(avgInAmperage)), + Component.literal(GTValues.VNF[avgInVoltage])) .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)) + avgOutComponent.setStyle(STYLE_RED), + Component.literal(FormattingUtil.DECIMAL_FORMAT_1F.format(avgOutAmperage)), + Component.literal(GTValues.VNF[avgOutVoltage])) .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 index 4f1dff814f..adf143d77f 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java @@ -915,10 +915,10 @@ 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"); + 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_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"); + provider.add("gtceu.multiblock.power_substation.average_out", "§7Avg. Output: %s §7EU/t\n %s A %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");