text-minimessage: Changed syntax of Decimal Formats

KyoriPowered · Mar 4, 2022 · 9d3966f · 9d3966f
1 parent 75d7cd1
commit 9d3966f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/Tag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/Tag.java
@@ -25,6 +25,7 @@
 
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.Optional;
 import java.util.OptionalDouble;
 import java.util.OptionalInt;
 import java.util.function.Consumer;
@@ -216,5 +217,21 @@ default boolean isFalse() {
         return OptionalDouble.empty();
       }
     }
+
+    /**
+     * Try to return this argument as a {@code char}.
+     *
+     * <p>The optional will only be present if the value is a valid char.</p>
+     *
+     * @return an optional providing the value of this argument as an integer
+     * @since 4.10.0
+     */
+    default @NotNull Optional<Character> asChar() {
+      if (this.value().length() == 1) {
+        return Optional.of(this.value().charAt(0));
+      } else {
+        return Optional.empty();
+      }
+    }
   }
 }
diff --git a/...inimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/Formatter.java b/...inimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/Formatter.java
@@ -62,12 +62,9 @@ public static TagResolver formatNumber(final @NotNull String key, final Number n
       final DecimalFormat decimalFormat = new DecimalFormat(format);
       final DecimalFormatSymbols formatSymbols = new DecimalFormatSymbols(Locale.ROOT);
       if (argumentQueue.hasNext()) {
-        final String symbols = argumentQueue.pop().value();
-        if (symbols.length() >= 1) {
-          formatSymbols.setDecimalSeparator(symbols.charAt(0));
-        }
-        if (symbols.length() >= 2) {
-          formatSymbols.setGroupingSeparator(symbols.charAt(1));
+        argumentQueue.pop().asChar().ifPresent(formatSymbols::setDecimalSeparator);
+        if (argumentQueue.hasNext()) {
+          argumentQueue.pop().asChar().ifPresent(formatSymbols::setGroupingSeparator);
         }
       }
       decimalFormat.setDecimalFormatSymbols(formatSymbols);

diff --git a/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/FormatterTest.java b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/FormatterTest.java
@@ -49,7 +49,7 @@ void testNumberFormatter() {
 
   @Test
   void testNumberFormatterWithDecimal() {
-    final String input = "<double:'#,##0.00':',.'> is a nice number";
+    final String input = "<double:'#,##0.00':,:.> is a nice number";
     final Component expected = text("2.000,00 is a nice number");
 
     this.assertParsedEquals(