Fix the Fuelable TOP provider translation to run on the client (#1511)

Author: warjort

src/main/java/gregtech/api/capability/impl/FluidFuelInfo.java

@@ -15,6 +15,6 @@ public FluidFuelInfo(FluidStack fluidStack, int fuelRemaining, int fuelCapacity,
     }
 
     public String getFuelName() {
-        return fluidStack.getLocalizedName();
+        return fluidStack.getUnlocalizedName();
     }
 }

src/main/java/gregtech/api/capability/impl/ItemFuelInfo.java

@@ -15,6 +15,6 @@ public ItemFuelInfo(ItemStack itemStack, int fuelRemaining, int fuelCapacity, in
     }
 
     public String getFuelName() {
-        return itemStack.getDisplayName();
+        return itemStack.getUnlocalizedName();
     }
 }

src/main/java/gregtech/integration/theoneprobe/provider/FuelableInfoProvider.java

@@ -8,7 +8,6 @@
 import mcjty.theoneprobe.api.ElementAlignment;
 import mcjty.theoneprobe.api.IProbeInfo;
 import mcjty.theoneprobe.api.TextStyleClass;
-import net.minecraft.client.resources.I18n;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.capabilities.Capability;
@@ -34,7 +33,7 @@ protected boolean allowDisplaying(IFuelable capability) {
     protected void addProbeInfo(IFuelable capability, IProbeInfo probeInfo, TileEntity tileEntity, EnumFacing sideHit) {
         Collection<IFuelInfo> fuels = capability.getFuels();
         if (fuels == null || fuels.isEmpty()) {
-            probeInfo.text(TextStyleClass.WARNING + I18n.format("gregtech.top.fuel_none"));
+            probeInfo.text(TextStyleClass.WARNING + "{*gregtech.top.fuel_none*}");
             return;
         }
         for (IFuelInfo fuelInfo : fuels) {
@@ -45,20 +44,19 @@ protected void addProbeInfo(IFuelable capability, IProbeInfo probeInfo, TileEnti
             final int burnTime = fuelInfo.getFuelBurnTime()/20;
 
             IProbeInfo horizontalPane = probeInfo.horizontal(probeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER));
-            horizontalPane.text(TextStyleClass.INFO + I18n.format("gregtech.top.fuel_name", fuelName));
+            horizontalPane.text(TextStyleClass.INFO + "{*gregtech.top.fuel_name*} {*" + fuelName + "*}");
 
             horizontalPane = probeInfo.horizontal(probeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER));
-            String suffix;
-            if (fuelRemaining < fuelMinConsumed)
-                suffix = I18n.format("gregtech.top.fuel_min_consume", fuelCapacity, fuelMinConsumed);
-            else
-                suffix = I18n.format("gregtech.top.fuel_info", fuelCapacity, burnTime);
             horizontalPane.progress(fuelRemaining, fuelCapacity, probeInfo.defaultProgressStyle()
-                .suffix(suffix)
+                .suffix("/" + fuelCapacity + " ")
                 .borderColor(0x00000000)
                 .backgroundColor(0x00000000)
                 .filledColor(0xFFFFE000)
                 .alternateFilledColor(0xFFEED000));
+            if (fuelRemaining < fuelMinConsumed)
+                horizontalPane.text("{*gregtech.top.fuel_min_consume*} " + fuelMinConsumed);
+            else
+                horizontalPane.text("{*gregtech.top.fuel_burn*} " + burnTime + " {*gregtech.top.fuel_time*}");
         }
     }
 

src/main/resources/assets/gregtech/lang/en_us.lang

@@ -13,13 +13,16 @@ enchantment.disjunction=Disjunction
 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.fuel_info=/%,d for %,d secs
-gregtech.top.fuel_min_consume=/%,d needs %,d
-gregtech.top.fuel_name=Fuel: %s
+
+gregtech.top.fuel_burn=for
+gregtech.top.fuel_time=secs
+gregtech.top.fuel_min_consume=needs
+gregtech.top.fuel_name=Fuel:
 gregtech.top.fuel_none=No fuel
 
 gregtech.multiblock.title=Multiblock Pattern