Format number centralisation (#846)

Co-authored-by: Connor Colenso <colen@CONNORSPC>

dependencies.gradle

@@ -2,7 +2,7 @@
 
 dependencies {
     api('com.github.GTNewHorizons:CodeChickenCore:1.4.7:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.8.0:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.9.6:dev')
 
     shadowImplementation('org.apache.commons:commons-csv:1.10.0')
 

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.49'
 }
 
 

src/main/java/codechicken/nei/NEIClientUtils.java

@@ -11,7 +11,6 @@ import static codechicken.nei.NEIClientConfig.world;
 import java.awt.Color;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -126,18 +125,6 @@ public class NEIClientUtils extends NEIServerUtils {
         });
     }
 
-    public static String formatNumbers(BigInteger aNumber) {
-        return getDecimalFormat().format(aNumber);
-    }
-
-    public static String formatNumbers(long aNumber) {
-        return getDecimalFormat().format(aNumber);
-    }
-
-    public static String formatNumbers(double aNumber) {
-        return getDecimalFormat().format(aNumber);
-    }
-
     public static void deleteHeldItem() {
         deleteSlotStack(-999);
     }

src/main/java/codechicken/nei/guihook/GuiContainerManager.java

@@ -5,6 +5,7 @@ import static codechicken.lib.gui.GuiDraw.fontRenderer;
 import static codechicken.lib.gui.GuiDraw.getMousePosition;
 import static codechicken.lib.gui.GuiDraw.renderEngine;
 import static codechicken.nei.NEIClientUtils.translate;
+import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
 
 import java.awt.Point;
 import java.util.ArrayList;
@@ -16,6 +17,7 @@ import java.util.Map;
 import java.util.StringJoiner;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Consumer;
+import java.util.function.IntFunction;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -42,6 +44,8 @@ import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
+import com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil;
+
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.ItemList;
 import codechicken.nei.ItemStackSet;
@@ -164,7 +168,7 @@ public class GuiContainerManager {
      * @return A list of Strings representing the text to be displayed on each line of the tool tip.
      */
     public static List<String> itemDisplayNameMultiline(ItemStack stack, GuiContainer gui, boolean includeHandlers) {
-        List<String> namelist = null;
+        List<String> namelist;
         try {
             namelist = stack.getTooltip(
                     Minecraft.getMinecraft().thePlayer,
@@ -199,26 +203,27 @@ public class GuiContainerManager {
     }
 
     @Nullable
-    public static String countDetails(int stackSize, int maxStackSize, String fullPattern, String shortPattern) {
+    public static String countDetails(int stackSize, int maxStackSize, String fullPattern, String shortPattern,
+            IntFunction<String> valueFormatter) {
         if (maxStackSize > 1 && stackSize > maxStackSize) {
             final int remainder = stackSize % maxStackSize;
+            final int units = stackSize / maxStackSize;
 
             if (remainder > 0) {
                 return String.format(
                         fullPattern,
-                        NEIClientUtils.formatNumbers(stackSize),
-                        NEIClientUtils.formatNumbers(stackSize / maxStackSize),
-                        NEIClientUtils.formatNumbers(maxStackSize),
-                        NEIClientUtils.formatNumbers(remainder));
+                        valueFormatter.apply(stackSize),
+                        formatNumber(units),
+                        valueFormatter.apply(maxStackSize),
+                        valueFormatter.apply(remainder));
             } else {
                 return String.format(
                         shortPattern,
-                        NEIClientUtils.formatNumbers(stackSize),
-                        NEIClientUtils.formatNumbers(stackSize / maxStackSize),
-                        NEIClientUtils.formatNumbers(maxStackSize));
+                        valueFormatter.apply(stackSize),
+                        formatNumber(units),
+                        valueFormatter.apply(maxStackSize));
             }
         }
-
         return null;
     }
 
@@ -232,7 +237,8 @@ public class GuiContainerManager {
                     stack.stackSize,
                     stack.getMaxStackSize(),
                     translate("inventory.tooltip.count.item", "%s = %s * %s + %s"),
-                    translate("inventory.tooltip.count.item", "%s = %s * %s"));
+                    translate("inventory.tooltip.count.item", "%s = %s * %s"),
+                    NumberFormatUtil::formatNumber);
         }
     }
 
@@ -247,8 +253,9 @@ public class GuiContainerManager {
         return countDetails(
                 amount,
                 144,
-                translate("inventory.tooltip.count.fluid", "%s L = %s * %s L + %s L"),
-                translate("inventory.tooltip.count.fluid", "%s L = %s * %s L"));
+                translate("inventory.tooltip.count.fluid", "%s = %s * %s + %s"),
+                translate("inventory.tooltip.count.fluid", "%s = %s * %s"),
+                NumberFormatUtil::formatFluid);
     }
 
     /**