From 618fc290241a489cb7a5c37806353b6dc64e7e87 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 8 Mar 2021 11:47:07 -0600 Subject: [PATCH] Fix TOP Transformer Translation (#1520) --- .../provider/TransformerInfoProvider.java | 15 +++++++++------ .../resources/assets/gregtech/lang/en_us.lang | 8 ++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/gregtech/integration/theoneprobe/provider/TransformerInfoProvider.java b/src/main/java/gregtech/integration/theoneprobe/provider/TransformerInfoProvider.java index cb36e65d9b..073678cd36 100644 --- a/src/main/java/gregtech/integration/theoneprobe/provider/TransformerInfoProvider.java +++ b/src/main/java/gregtech/integration/theoneprobe/provider/TransformerInfoProvider.java @@ -35,21 +35,24 @@ protected void addProbeInfo(IEnergyContainer capability, IProbeInfo probeInfo, T // Step Up/Step Down line if (mteTransformer.isInverted()) { - transformInfo = I18n.format("gregtech.top.transform_up", - inputVoltageN, inputAmperage, outputVoltageN, outputAmperage); + transformInfo = "{*gregtech.top.transform_up*} "; } else { - transformInfo = I18n.format("gregtech.top.transform_down", - inputVoltageN, inputAmperage, outputVoltageN, outputAmperage); + transformInfo = "{*gregtech.top.transform_down*} "; } + transformInfo += inputVoltageN + " (" + inputAmperage + "A) -> " + + outputVoltageN + " (" + outputAmperage + "A)"; horizontalPane.text(TextStyleClass.INFO + transformInfo); // Input/Output side line horizontalPane = probeInfo.vertical(probeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER)); if (capability.inputsEnergy(sideHit)) { - transformInfo = I18n.format("gregtech.top.transform_input", inputVoltageN, inputAmperage); + transformInfo = "{*gregtech.top.transform_input*} " + + inputVoltageN + " (" + inputAmperage + "A)"; horizontalPane.text(TextStyleClass.INFO + transformInfo); + } else if(capability.outputsEnergy(sideHit)) { - transformInfo = I18n.format("gregtech.top.transform_output", outputVoltageN, outputAmperage); + transformInfo = "{*gregtech.top.transform_output*} " + + outputVoltageN + " (" + outputAmperage + "A)"; horizontalPane.text(TextStyleClass.INFO + transformInfo); } } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 63933c1a3d..894d6676cc 100755 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -14,10 +14,10 @@ gregtech.top.energy_stored=Energy: gregtech.top.progress=Progress: gregtech.top.working_disabled=Working Disabled -gregtech.top.transform_up=§cStep Up§r %s (%,dA) -> %s (%,dA) -gregtech.top.transform_down=§aStep Down§r %s (%,dA) -> %s (%,dA) -gregtech.top.transform_input=§6Input:§r %s (%,dA) -gregtech.top.transform_output=§9Output:§r %s (%,dA) +gregtech.top.transform_up=§cStep Up§r +gregtech.top.transform_down=§aStep Down§r +gregtech.top.transform_input=§6Input:§r +gregtech.top.transform_output=§9Output:§r gregtech.top.fuel_burn=for gregtech.top.fuel_time=secs