normalize NBT string as number if it has number suffix

Author: HSGamer

nbt/src/main/java/io/github/projectunified/craftitem/nbt/NBTMapNormalizer.java

@@ -69,9 +69,52 @@ public static Object normalize(Object value, UnaryOperator<String> translator) {
             return result;
         }
 
+        if (value instanceof String) {
+            Number number = tryParseNumberWithSuffix(((String) value).trim());
+            if (number != null) {
+                return number;
+            }
+        }
+
         return value;
     }
 
+    /**
+     * Attempts to parse a string as a number with a type suffix
+     */
+    private static Number tryParseNumberWithSuffix(String str) {
+        if (str.length() < 2) {
+            return null;
+        }
+
+        char lastChar = str.charAt(str.length() - 1);
+        String numPart = str.substring(0, str.length() - 1);
+
+        try {
+            switch (lastChar) {
+                case 'b':
+                case 'B':
+                    return Byte.parseByte(numPart);
+                case 's':
+                case 'S':
+                    return Short.parseShort(numPart);
+                case 'l':
+                case 'L':
+                    return Long.parseLong(numPart);
+                case 'f':
+                case 'F':
+                    return Float.parseFloat(numPart);
+                case 'd':
+                case 'D':
+                    return Double.parseDouble(numPart);
+            }
+        } catch (NumberFormatException e) {
+            // Not a valid number with this suffix
+        }
+
+        return null;
+    }
+
     /**
      * Normalizes a forced-value based on specified $type
      */

nbt/src/main/java/io/github/projectunified/craftitem/nbt/SNBTConverter.java

@@ -184,12 +184,6 @@ private static String convertToLongArray(long[] arr) {
     private static String convertStringValue(String str) {
         str = str.trim();
 
-        // Try parsing as number with suffix (byte, short, long, float, double)
-        String numberWithSuffix = tryParseNumberWithSuffix(str);
-        if (numberWithSuffix != null) {
-            return numberWithSuffix;
-        }
-
         // Try parsing as plain number (int or double)
         String plainNumber = tryParseNumber(str);
         if (plainNumber != null) {
@@ -200,47 +194,6 @@ private static String convertStringValue(String str) {
         return escapeString(str);
     }
 
-    /**
-     * Attempts to parse a string as a number with a type suffix
-     */
-    private static String tryParseNumberWithSuffix(String str) {
-        if (str.length() < 2) {
-            return null;
-        }
-
-        char lastChar = str.charAt(str.length() - 1);
-        String numPart = str.substring(0, str.length() - 1);
-
-        try {
-            switch (lastChar) {
-                case 'b':
-                case 'B':
-                    Byte.parseByte(numPart);
-                    return str.toLowerCase().replace('B', 'b');
-                case 's':
-                case 'S':
-                    Short.parseShort(numPart);
-                    return str.toLowerCase().replace('S', 's');
-                case 'l':
-                case 'L':
-                    Long.parseLong(numPart);
-                    return str.toUpperCase().replace('l', 'L');
-                case 'f':
-                case 'F':
-                    Float.parseFloat(numPart);
-                    return str.toLowerCase().replace('F', 'f');
-                case 'd':
-                case 'D':
-                    Double.parseDouble(numPart);
-                    return numPart;
-            }
-        } catch (NumberFormatException e) {
-            // Not a valid number with this suffix
-        }
-
-        return null;
-    }
-
     /**
      * Attempts to parse a string as a plain number (int or double)
      */