use NBTRaw for raw data

Author: HSGamer

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

@@ -273,10 +273,7 @@ private static String normalizeToString(Object value, UnaryOperator<String> tran
 
     private static Object normalizeToRaw(Object value, UnaryOperator<String> translator) {
         String rawValue = translator.apply(value.toString());
-        Map<String, Object> rawMap = new HashMap<>();
-        rawMap.put("$raw", true);
-        rawMap.put("$value", rawValue);
-        return rawMap;
+        return new NBTRaw(rawValue);
     }
 
     private static List<?> normalizeToList(Object value, UnaryOperator<String> translator) {

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

@@ -0,0 +1,31 @@
+package io.github.projectunified.craftitem.nbt;
+
+import java.util.Objects;
+
+/**
+ * A class indicating the raw NBT data.
+ */
+public class NBTRaw {
+    public final String value;
+
+    /**
+     * Create the instance
+     *
+     * @param value the raw data
+     */
+    public NBTRaw(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        NBTRaw nbtRaw = (NBTRaw) o;
+        return Objects.equals(value, nbtRaw.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(value);
+    }
+}

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

@@ -61,14 +61,15 @@ private static String convertValue(Object value) {
             return "\"\"";
         }
 
+        // Check for raw NBT data
+        if (value instanceof NBTRaw) {
+            return ((NBTRaw) value).value;
+        }
+
         // Check for map
         if (value instanceof Map) {
             @SuppressWarnings("unchecked")
             Map<String, Object> map = (Map<String, Object>) value;
-            // Check if this is a raw string map
-            if (isRawStringMap(map)) {
-                return map.get("$value").toString();
-            }
             return convertToCompound(map, false);
         }
 
@@ -312,15 +313,4 @@ private static boolean needsQuotesForKey(String key) {
         }
         return false;
     }
-
-    /**
-     * Checks if a map represents a raw string (has $raw flag set to true)
-     */
-    private static boolean isRawStringMap(Map<String, Object> map) {
-        Object rawFlag = map.get("$raw");
-        if (rawFlag instanceof Boolean) {
-            return (Boolean) rawFlag;
-        }
-        return false;
-    }
 }