diff options
author | D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> | 2021-08-08 07:41:35 -0600 |
---|---|---|
committer | D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> | 2021-08-08 11:39:53 -0600 |
commit | 324c870597aef034712d80571f072cb45d609aee (patch) | |
tree | 6b844edca1f999833ff15b3e0893bc787523c42a /src/main/java/gregtech/api/util | |
parent | a36a64987573d87e34059557793b033c60d5e4b6 (diff) | |
download | GT5-Unofficial-324c870597aef034712d80571f072cb45d609aee.tar.gz GT5-Unofficial-324c870597aef034712d80571f072cb45d609aee.tar.bz2 GT5-Unofficial-324c870597aef034712d80571f072cb45d609aee.zip |
Remove scientific notation formatter
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index f1f83c3c14..6ac69f55b3 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -95,9 +95,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 basicFormatter = new DecimalFormat(); - /** Formats a number into scientific notation with at most 2 fraction digits. Meant for large numbers. */ - private static final DecimalFormat scientificNotationFormatter = new DecimalFormat("0.##E0"); + private static final DecimalFormat decimalFormat = new DecimalFormat(); /** * Forge screwed the Fluid Registry up again, so I make my own, which is also much more efficient than the stupid Stuff over there. @@ -112,10 +110,10 @@ public class GT_Utility { public static UUID defaultUuid = null; // maybe default non-null? UUID.fromString("00000000-0000-0000-0000-000000000000"); static { - DecimalFormatSymbols symbols = basicFormatter.getDecimalFormatSymbols(); + DecimalFormatSymbols symbols = decimalFormat.getDecimalFormatSymbols(); symbols.setGroupingSeparator(' '); - basicFormatter.setDecimalFormatSymbols(symbols); - basicFormatter.setMaximumFractionDigits(2); + decimalFormat.setDecimalFormatSymbols(symbols); + decimalFormat.setMaximumFractionDigits(2); GregTech_API.sItemStackMappings.add(sFilledContainerToData); GregTech_API.sItemStackMappings.add(sEmptyContainerToFluidToData); @@ -2230,19 +2228,11 @@ public class GT_Utility { } public static String formatNumbers(long aNumber) { - String formatted = basicFormatter.format(aNumber); - if (aNumber >= 1_000_000_000L) { - formatted += " [" + scientificNotationFormatter.format(aNumber) + "]"; - } - return formatted; + return decimalFormat.format(aNumber); } public static String formatNumbers(double aNumber) { - String formatted = basicFormatter.format(aNumber); - if (aNumber >= 1_000_000_000d) { - formatted += " [" + scientificNotationFormatter.format(aNumber) + "]"; - } - return formatted; + return decimalFormat.format(aNumber); } /* |