99import net .minecraft .nbt .DoubleTag ;
1010import net .minecraft .nbt .IntTag ;
1111import net .minecraft .nbt .ListTag ;
12+ import net .minecraft .nbt .NbtOps ;
13+ import net .minecraft .nbt .SnbtGrammar ;
1214import net .minecraft .nbt .SnbtPrinterTagVisitor ;
1315import net .minecraft .nbt .StringTag ;
1416import net .minecraft .nbt .Tag ;
@@ -20,7 +22,7 @@ public class CraftNBTTagConfigSerializer {
2022 private static final Pattern ARRAY = Pattern .compile ("^\\ [.*]" );
2123 private static final Pattern INTEGER = Pattern .compile ("[-+]?(?:0|[1-9][0-9]*)i" , Pattern .CASE_INSENSITIVE ); // Paper - fix regex
2224 private static final Pattern DOUBLE = Pattern .compile ("[-+]?(?:[0-9]+[.]?|[0-9]*[.][0-9]+)(?:e[-+]?[0-9]+)?d" , Pattern .CASE_INSENSITIVE );
23- private static final TagParser MOJANGSON_PARSER = new TagParser ( new StringReader ( "" ) );
25+ private static final TagParser < Tag > MOJANGSON_PARSER = TagParser . create ( NbtOps . INSTANCE );
2426
2527 public static String serialize (@ NotNull final Tag base ) {
2628 final SnbtPrinterTagVisitor snbtVisitor = new SnbtPrinterTagVisitor ();
@@ -31,7 +33,7 @@ public static Tag deserialize(final Object object) {
3133 // The new logic expects the top level object to be a single string, holding the entire nbt tag as SNBT.
3234 if (object instanceof final String snbtString ) {
3335 try {
34- return TagParser .parseTag (snbtString );
36+ return TagParser .parseCompoundFully (snbtString );
3537 } catch (final CommandSyntaxException e ) {
3638 throw new RuntimeException ("Failed to deserialise nbt" , e );
3739 }
@@ -65,7 +67,7 @@ private static Tag internalLegacyDeserialization(@NotNull final Object object) {
6567
6668 if (CraftNBTTagConfigSerializer .ARRAY .matcher (string ).matches ()) {
6769 try {
68- return new TagParser ( new StringReader ( string )). readArrayTag ( );
70+ return MOJANGSON_PARSER . parseFully ( string );
6971 } catch (CommandSyntaxException e ) {
7072 throw new RuntimeException ("Could not deserialize found list " , e );
7173 }
@@ -74,14 +76,18 @@ private static Tag internalLegacyDeserialization(@NotNull final Object object) {
7476 } else if (CraftNBTTagConfigSerializer .DOUBLE .matcher (string ).matches ()) {
7577 return DoubleTag .valueOf (Double .parseDouble (string .substring (0 , string .length () - 1 )));
7678 } else {
77- Tag nbtBase = CraftNBTTagConfigSerializer .MOJANGSON_PARSER .type (string );
79+ try {
80+ Tag nbtBase = CraftNBTTagConfigSerializer .MOJANGSON_PARSER .parseFully (string );
7881
79- if (nbtBase instanceof IntTag ) { // If this returns an integer, it did not use our method from above
80- return StringTag .valueOf (nbtBase .getAsString ()); // It then is a string that was falsely read as an int
81- } else if (nbtBase instanceof DoubleTag ) {
82- return StringTag .valueOf (String .valueOf (((DoubleTag ) nbtBase ).getAsDouble ())); // Doubles add "d" at the end
83- } else {
84- return nbtBase ;
82+ if (nbtBase instanceof IntTag ) { // If this returns an integer, it did not use our method from above
83+ return StringTag .valueOf (nbtBase .toString ()); // It then is a string that was falsely read as an int
84+ } else if (nbtBase instanceof DoubleTag ) {
85+ return StringTag .valueOf (String .valueOf (((DoubleTag ) nbtBase ).doubleValue ())); // Doubles add "d" at the end
86+ } else {
87+ return nbtBase ;
88+ }
89+ } catch (final CommandSyntaxException commandSyntaxException ) {
90+ throw new RuntimeException ("Could not deserialize found primitive " , commandSyntaxException );
8591 }
8692 }
8793 }
0 commit comments