Add additional number formatting to GT5u and fix localisation issue with volumetric flasks (#1431)

* Format large cells.

* Add number formatting and fix localisation issue.

* Add number formatting for radioactive cells.

* Add number formatting for coal boiler.

* Add number formatting for GT turbine items.

* Add number formatting for GT credits.

* Add number formatting for breeder cells.

* spotlessApply (#1432)

Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>

Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

7 files changed, 50 insertions, 35 deletions

diff --git a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java b/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
index c30987183b..fa16c0edea 100644
--- a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
@@ -1,5 +1,7 @@
 package gregtech.api.items;
 
+import static gregtech.api.util.GT_Utility.formatNumbers;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_Utility;
 import ic2.api.reactor.IReactor;
@@ -69,8 +71,8 @@ public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComp
         }
         aList.add(String.format(
                 transItem("020", "Progress: %s/%s"),
-                "" + color2 + aStack.getItemDamage() + EnumChatFormatting.RESET,
-                "" + getMaxDamage()));
+                "" + color2 + formatNumbers(aStack.getItemDamage()) + EnumChatFormatting.RESET,
+                "" + formatNumbers(getMaxDamage())));
         if (aStack.getItemDamage() > 0) aList.add(EnumChatFormatting.RED + transItem("021", "Radiation Hazard"));
     }
 
diff --git a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
index bf2b0d2d96..feffa9e9a5 100644
--- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
+++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
@@ -2,6 +2,7 @@ package gregtech.api.items;
 
 import static gregtech.api.enums.GT_Values.D1;
 import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.util.GT_Utility.formatNumbers;
 
 import gregtech.api.enums.SubTag;
 import gregtech.api.interfaces.IItemBehaviour;
@@ -233,7 +234,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
                 aList.add(EnumChatFormatting.AQUA
                         + String.format(
                                 transItem("009", "Contains %s EU   Tier: %s"),
-                                GT_Utility.formatNumbers(tStats[3]),
+                                formatNumbers(tStats[3]),
                                 "" + (tStats[2] >= 0 ? tStats[2] : 0))
                         + EnumChatFormatting.GRAY);
             } else {
@@ -246,8 +247,8 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
                     aList.add(String.valueOf(EnumChatFormatting.AQUA)
                             + String.format(
                                     transItem("011", "%s / %s EU - Voltage: %s"),
-                                    GT_Utility.formatNumbers(tCharge),
-                                    GT_Utility.formatNumbers(Math.abs(tStats[0])),
+                                    formatNumbers(tCharge),
+                                    formatNumbers(Math.abs(tStats[0])),
                                     ""
                                             + V[
                                                     (int)
@@ -269,7 +270,9 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
                     + EnumChatFormatting.GRAY);
             aList.add(EnumChatFormatting.BLUE
                     + String.format(
-                            transItem("013", "%sL / %sL"), "" + (tFluid == null ? 0 : tFluid.amount), "" + tStats[0])
+                            transItem("013", "%sL / %sL"),
+                            "" + (tFluid == null ? 0 : formatNumbers(tFluid.amount)),
+                            "" + formatNumbers(tStats[0]))
                     + EnumChatFormatting.GRAY);
         }
 
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
index a7d31332a8..dc3ffdf8f6 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
@@ -2,6 +2,7 @@ package gregtech.api.items;
 
 import static gregtech.api.enums.GT_Values.MOD_ID_FR;
 import static gregtech.api.enums.GT_Values.MOD_ID_RC;
+import static gregtech.api.util.GT_Utility.formatNumbers;
 import static gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Steam.calculateLooseFlow;
 
 import buildcraft.api.tools.IToolWrench;
@@ -448,8 +449,9 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                         EnumChatFormatting.GRAY
                                 + String.format(
                                         transItem("001", "Durability: %s/%s"),
-                                        "" + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " ",
-                                        " " + tMaxDamage)
+                                        "" + EnumChatFormatting.GREEN
+                                                + formatNumbers(tMaxDamage - getToolDamage(aStack)) + " ",
+                                        " " + formatNumbers(tMaxDamage))
                                 + EnumChatFormatting.GRAY);
                 aList.add(
                         tOffset + 1,
@@ -472,13 +474,13 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                                 + String.format(
                                         transItem("006", "Optimal Steam flow: %s L/t"),
                                         "" + EnumChatFormatting.GOLD
-                                                + GT_Utility.safeInt((long) (Math.max(
+                                                + formatNumbers(GT_Utility.safeInt((long) (Math.max(
                                                         Float.MIN_NORMAL,
                                                         tStats.getSpeedMultiplier()
                                                                 * getPrimaryMaterial(aStack).mToolSpeed
                                                                 * (1000
                                                                         * getPrimaryMaterial(aStack).mSteamMultiplier
-                                                                        / 20))))
+                                                                        / 20)))))
                                                 + EnumChatFormatting.GRAY));
                 aList.add(
                         tOffset + 4,
@@ -486,7 +488,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                                 + String.format(
                                         transItem("900", "Energy from Optimal Steam Flow: %s EU/t"),
                                         "" + EnumChatFormatting.GOLD
-                                                + GT_Utility.safeInt((long) (Math.max(
+                                                + formatNumbers(GT_Utility.safeInt((long) (Math.max(
                                                                 Float.MIN_NORMAL,
                                                                 tStats.getSpeedMultiplier()
                                                                         * getPrimaryMaterial(aStack).mToolSpeed
@@ -495,7 +497,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                                                                                         .mSteamMultiplier
                                                                                 / 20))
                                                         * (50.0F + (10.0F * getToolCombatDamage(aStack)))
-                                                        / 200))
+                                                        / 200)))
                                                 + EnumChatFormatting.GRAY));
                 {
                     long[] calculatedFlow = calculateLooseFlow(aOptFlow, aBaseEff);
@@ -515,7 +517,8 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                                     + String.format(
                                             transItem("501", "Optimal Steam flow (Loose): %s L/t"),
                                             "" + EnumChatFormatting.GOLD
-                                                    + (aOptFlowLoose * getPrimaryMaterial(aStack).mSteamMultiplier)
+                                                    + formatNumbers((aOptFlowLoose
+                                                            * getPrimaryMaterial(aStack).mSteamMultiplier))
                                                     + EnumChatFormatting.GRAY));
                     aList.add(
                             tOffset + 7,
@@ -523,10 +526,10 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                                     + String.format(
                                             transItem("901", "Energy from Optimal Steam Flow (Loose): %s EU/t"),
                                             "" + EnumChatFormatting.GOLD
-                                                    + (aOptFlowLoose
+                                                    + formatNumbers((aOptFlowLoose
                                                                     * getPrimaryMaterial(aStack).mSteamMultiplier
                                                                     / 10000)
-                                                            * (aBaseEffLoose / 2)
+                                                            * (aBaseEffLoose / 2))
                                                     + EnumChatFormatting.GRAY));
                     aList.add(
                             tOffset + 8,
@@ -538,14 +541,14 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                                 + String.format(
                                         transItem("007", "Energy from Optimal Gas Flow: %s EU/t"),
                                         "" + EnumChatFormatting.GOLD
-                                                + GT_Utility.safeInt((long) (Math.max(
+                                                + formatNumbers(GT_Utility.safeInt((long) (Math.max(
                                                                 Float.MIN_NORMAL,
                                                                 tStats.getSpeedMultiplier()
                                                                         * getPrimaryMaterial(aStack).mToolSpeed
                                                                         * 50
                                                                         * getPrimaryMaterial(aStack).mGasMultiplier)
                                                         * (50.0F + (10.0F * getToolCombatDamage(aStack)))
-                                                        / 100))
+                                                        / 100)))
                                                 + EnumChatFormatting.GRAY));
                 aList.add(
                         tOffset + 10,
@@ -553,14 +556,14 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
                                 + String.format(
                                         transItem("008", "Energy from Optimal Plasma Flow: %s EU/t"),
                                         "" + EnumChatFormatting.GOLD
-                                                + GT_Utility.safeInt((long) (Math.max(
+                                                + formatNumbers(GT_Utility.safeInt((long) (Math.max(
                                                                 Float.MIN_NORMAL,
                                                                 tStats.getSpeedMultiplier()
                                                                         * getPrimaryMaterial(aStack).mToolSpeed
                                                                         * 2000
                                                                         * getPrimaryMaterial(aStack).mPlasmaMultiplier)
                                                         * (50.0F + (10.0F * getToolCombatDamage(aStack)))
-                                                        * (1.05 / 100)))
+                                                        * (1.05 / 100))))
                                                 + EnumChatFormatting.GRAY));
                 aList.add(
                         tOffset + 12,
@@ -583,12 +586,13 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
 
             } else {
                 aList.add(
-                        tOffset + 0,
+                        tOffset,
                         EnumChatFormatting.WHITE
                                 + String.format(
                                         transItem("001", "Durability: %s/%s"),
-                                        "" + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " ",
-                                        " " + tMaxDamage)
+                                        "" + EnumChatFormatting.GREEN
+                                                + formatNumbers(tMaxDamage - getToolDamage(aStack)) + " ",
+                                        " " + formatNumbers(tMaxDamage))
                                 + EnumChatFormatting.GRAY);
                 aList.add(
                         tOffset + 1,
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
index cff5bf38a8..a49ca4998d 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
@@ -1,5 +1,7 @@
 package gregtech.api.items;
 
+import static gregtech.api.util.GT_Utility.formatNumbers;
+
 import gregtech.common.items.GT_DepletetCell_Item;
 import ic2.api.item.IBoxable;
 import ic2.core.util.StackUtil;
@@ -153,8 +155,8 @@ public class GT_RadioactiveCell_Item extends GT_Generic_Item implements IBoxable
         aList.add(color1
                 + String.format(
                         transItem("001", "Durability: %s/%s"),
-                        "" + color2 + (this.maxDmg - getDurabilityOfStack(aStack)) + color1,
-                        "" + this.maxDmg));
+                        "" + color2 + formatNumbers(this.maxDmg - getDurabilityOfStack(aStack)) + color1,
+                        "" + formatNumbers(this.maxDmg)));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
index 5ec670aea5..a36c3cced1 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
@@ -129,9 +129,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 tLastID = 2, "Silver GT Credit", "8 Credits", new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)));
         ItemList.Credit_Greg_Gold.set(addItem(tLastID = 3, "Gold GT Credit", "64 Credits"));
         ItemList.Credit_Greg_Platinum.set(addItem(tLastID = 4, "Platinum GT Credit", "512 Credits"));
-        ItemList.Credit_Greg_Osmium.set(addItem(tLastID = 5, "Osmium GT Credit", "4096 Credits"));
-        ItemList.Credit_Greg_Naquadah.set(addItem(tLastID = 6, "Naquadah GT Credit", "32768 Credits"));
-        ItemList.Credit_Greg_Neutronium.set(addItem(tLastID = 7, "Neutronium GT Credit", "262144 Credits"));
+        ItemList.Credit_Greg_Osmium.set(addItem(tLastID = 5, "Osmium GT Credit", "4,096 Credits"));
+        ItemList.Credit_Greg_Naquadah.set(addItem(tLastID = 6, "Naquadah GT Credit", "32,768 Credits"));
+        ItemList.Credit_Greg_Neutronium.set(addItem(tLastID = 7, "Neutronium GT Credit", "262,144 Credits"));
         ItemList.Coin_Gold_Ancient.set(addItem(
                 tLastID = 8,
                 "Ancient Gold Coin",
diff --git a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java
index e2549462e3..428bfce632 100644
--- a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java
+++ b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java
@@ -1,6 +1,7 @@
 package gregtech.common.items;
 
 import static gregtech.api.enums.GT_Values.RES_PATH_ITEM;
+import static gregtech.api.util.GT_Utility.formatNumbers;
 import static ic2.core.util.LiquidUtil.drainContainerStack;
 import static ic2.core.util.LiquidUtil.fillContainerStack;
 import static ic2.core.util.LiquidUtil.placeFluid;
@@ -10,6 +11,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.interfaces.INetworkUpdatableItem;
 import gregtech.api.items.GT_Generic_Item;
+import gregtech.api.util.GT_Utility;
 import ic2.core.util.LiquidUtil;
 import java.util.List;
 import net.minecraft.block.Block;
@@ -210,9 +212,9 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain
         super.addInformation(stack, player, info, b);
         FluidStack fs = getFluid(stack);
         if (fs != null) {
-            info.add(String.format("< %s, %d mB >", FluidRegistry.getFluidName(fs), fs.amount));
+            info.add(String.format("< %s, %s mB >", GT_Utility.getFluidName(fs, true), formatNumbers(fs.amount)));
         } else {
-            info.add(String.format("< Empty, %d mB >", getCapacity(stack)));
+            info.add(String.format("< Empty, %s mB >", formatNumbers(getCapacity(stack))));
         }
         info.add("Rightclick on air to set volume (only while empty)");
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
index dcf044c8b3..784e81f1ba 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
@@ -12,6 +12,7 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER_
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER_GLOW;
 import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.util.GT_Utility.formatNumbers;
 
 import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
@@ -101,21 +102,22 @@ public abstract class GT_MetaTileEntity_LargeBoiler
         // Tooltip differs between the boilers that output Superheated Steam (Titanium and Tungstensteel) and the ones
         // that do not (Bronze and Steel)
         if (isSuperheated()) {
-            tt.addInfo("Produces " + (getEUt() * 40) * ((runtimeBoost(20) / (20f)) / superToNormalSteam)
-                            + "L of Superheated Steam with 1 Coal at " + (getEUt() * 40) / superToNormalSteam
+            tt.addInfo("Produces " + formatNumbers((getEUt() * 40) * ((runtimeBoost(20) / (20f)) / superToNormalSteam))
+                            + "L of Superheated Steam with 1 Coal at "
+                            + formatNumbers((getEUt() * 40L) / superToNormalSteam)
                             + "L/s") // ?
                     .addInfo("A programmed circuit in the main block throttles the boiler (-1000L/s per config)")
                     .addInfo("Only some solid fuels are allowed (check the NEI Large Boiler tab for details)")
                     .addInfo("If there are any disallowed fuels in the input bus, the boiler won't run!");
         } else {
-            tt.addInfo("Produces " + (getEUt() * 40) * (runtimeBoost(20) / 20f) + "L of Steam with 1 Coal at "
-                            + getEUt() * 40 + "L/s") // ?
+            tt.addInfo("Produces " + formatNumbers((getEUt() * 40) * (runtimeBoost(20) / 20f))
+                            + "L of Steam with 1 Coal at " + formatNumbers(getEUt() * 40) + "L/s") // ?
                     .addInfo("A programmed circuit in the main block throttles the boiler (-1000L/s per config)")
                     .addInfo("Solid Fuels with a burn value that is too high or too low will not work");
         }
         tt.addInfo(String.format(
-                        "Diesel fuels have 1/4 efficiency - Takes %.2f seconds to heat up",
-                        500.0 / getEfficiencyIncrease())) // ? check semifluid again
+                        "Diesel fuels have 1/4 efficiency - Takes %s seconds to heat up",
+                        formatNumbers(500.0 / getEfficiencyIncrease()))) // ? check semifluid again
                 .addPollutionAmount(getPollutionPerSecond(null))
                 .addSeparator()
                 .beginStructureBlock(3, 5, 3, false)