From fda1ee40c41d6e1e4e4bb4d5cba22ea530ebaf8c Mon Sep 17 00:00:00 2001
From: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com>
Date: Sat, 23 Oct 2021 21:19:44 -0600
Subject: Try to use locale formatting

 * Also format some more of the portable scanner's output
---
 src/main/java/gregtech/api/util/GT_Utility.java | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index b3f3c6d666..16d22be9ef 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -78,7 +78,7 @@ import javax.annotation.Nullable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.text.DecimalFormat;
+import java.text.NumberFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.*;
 import java.util.Map.Entry;
@@ -98,7 +98,7 @@ import static gregtech.common.GT_UndergroundOil.undergroundOilReadInformation;
  */
 public class GT_Utility {
     /** Formats a number with group separator and at most 2 fraction digits. */
-    private static final DecimalFormat decimalFormat = new DecimalFormat();
+    private static final NumberFormat numberFormat = NumberFormat.getInstance();
 
     /**
      * Forge screwed the Fluid Registry up again, so I make my own, which is also much more efficient than the stupid Stuff over there.
@@ -116,10 +116,7 @@ public class GT_Utility {
     public static UUID defaultUuid = null; // maybe default non-null? UUID.fromString("00000000-0000-0000-0000-000000000000");
 
     static {
-        DecimalFormatSymbols symbols = decimalFormat.getDecimalFormatSymbols();
-        symbols.setGroupingSeparator(' ');
-        decimalFormat.setDecimalFormatSymbols(symbols);
-        decimalFormat.setMaximumFractionDigits(2);
+        numberFormat.setMaximumFractionDigits(2);
 
         GregTech_API.sItemStackMappings.add(sFilledContainerToData);
         GregTech_API.sItemStackMappings.add(sEmptyContainerToFluidToData);
@@ -2308,11 +2305,11 @@ public class GT_Utility {
     }
 
     public static String formatNumbers(long aNumber) {
-        return decimalFormat.format(aNumber);
+        return numberFormat.format(aNumber);
     }
 
     public static String formatNumbers(double aNumber) {
-        return decimalFormat.format(aNumber);
+        return numberFormat.format(aNumber);
     }
 
     /*
-- 
cgit