Use NBTSon instead

ArcaneArts · Jul 5, 2022 · 814735a · 814735a
1 parent 7fc9167
commit 814735a
Show file tree

Hide file tree

Showing 50 changed files with 11 additions and 4,865 deletions.
diff --git a/build.gradle b/build.gradle
@@ -56,6 +56,7 @@ dependencies {
     implementation 'org.reflections:reflections:0.10.2'
     api 'systems.manifold:manifold-rt:2022.1.18'
     api 'systems.manifold:manifold-ext-rt:2022.1.18'
+    api 'art.arcane:NBTSon:22.7.7'
     api 'it.unimi.dsi:fastutil:8.5.8'
     api 'com.google.guava:guava:31.1-jre'
     api 'org.apache.commons:commons-lang3:3.12.0'

diff --git a/src/main/java/Amulet/extensions/java/io/DataInputStream/XDataInputStream.java b/src/main/java/Amulet/extensions/java/io/DataInputStream/XDataInputStream.java
@@ -19,15 +19,12 @@
 package Amulet.extensions.java.io.DataInputStream;
 
 import art.arcane.amulet.data.Varint;
-import art.arcane.amulet.io.nbt.nbt.io.NBTDeserializer;
-import art.arcane.amulet.io.nbt.nbt.io.NBTSerializer;
-import art.arcane.amulet.io.nbt.nbt.io.NamedTag;
-import art.arcane.amulet.io.nbt.nbt.tag.CompoundTag;
+import art.arcane.nbtson.io.NBTDeserializer;
+import art.arcane.nbtson.tag.CompoundTag;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.This;
 
 import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
 
 @Extension

diff --git a/src/main/java/Amulet/extensions/java/io/DataOutputStream/XDataOutputStream.java b/src/main/java/Amulet/extensions/java/io/DataOutputStream/XDataOutputStream.java
@@ -19,10 +19,9 @@
 package Amulet.extensions.java.io.DataOutputStream;
 
 import art.arcane.amulet.data.Varint;
-import art.arcane.amulet.io.nbt.nbt.io.NBTSerializer;
-import art.arcane.amulet.io.nbt.nbt.io.NBTUtil;
-import art.arcane.amulet.io.nbt.nbt.io.NamedTag;
-import art.arcane.amulet.io.nbt.nbt.tag.CompoundTag;
+import art.arcane.nbtson.io.NBTSerializer;
+import art.arcane.nbtson.io.NamedTag;
+import art.arcane.nbtson.tag.CompoundTag;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.This;
 

diff --git a/src/main/java/Amulet/extensions/java/lang/Object/XObject.java b/src/main/java/Amulet/extensions/java/lang/Object/XObject.java
@@ -18,13 +18,13 @@
 
 package Amulet.extensions.java.lang.Object;
 
-import art.arcane.amulet.io.nbt.nbt.io.SNBTSerializer;
-import art.arcane.amulet.io.nbt.nbt.tag.CompoundTag;
-import art.arcane.amulet.io.nbt.nbt.tag.Tag;
-import art.arcane.amulet.io.nbt.objects.NBTObjectSerializer;
-import art.arcane.amulet.io.nbt.objects.UnserializableClassException;
 import art.arcane.amulet.logging.LogListener;
 import art.arcane.amulet.profiling.Profiler;
+import art.arcane.nbtson.io.NBTObjectSerializer;
+import art.arcane.nbtson.io.SNBTSerializer;
+import art.arcane.nbtson.io.UnserializableClassException;
+import art.arcane.nbtson.tag.CompoundTag;
+import art.arcane.nbtson.tag.Tag;
 import com.google.gson.Gson;
 import manifold.ext.rt.api.Extension;
 import manifold.ext.rt.api.This;

diff --git a/src/main/java/art/arcane/amulet/io/nbt/io/Deserializer.java b/src/main/java/art/arcane/amulet/io/nbt/io/Deserializer.java
diff --git a/src/main/java/art/arcane/amulet/io/nbt/io/ExceptionBiFunction.java b/src/main/java/art/arcane/amulet/io/nbt/io/ExceptionBiFunction.java
diff --git a/src/main/java/art/arcane/amulet/io/nbt/io/ExceptionTriConsumer.java b/src/main/java/art/arcane/amulet/io/nbt/io/ExceptionTriConsumer.java
diff --git a/src/main/java/art/arcane/amulet/io/nbt/io/MaxDepthIO.java b/src/main/java/art/arcane/amulet/io/nbt/io/MaxDepthIO.java
diff --git a/src/main/java/art/arcane/amulet/io/nbt/io/MaxDepthReachedException.java b/src/main/java/art/arcane/amulet/io/nbt/io/MaxDepthReachedException.java
diff --git a/src/main/java/art/arcane/amulet/io/nbt/io/Serializer.java b/src/main/java/art/arcane/amulet/io/nbt/io/Serializer.java
diff --git a/src/main/java/art/arcane/amulet/io/nbt/io/StringDeserializer.java b/src/main/java/art/arcane/amulet/io/nbt/io/StringDeserializer.java
diff --git a/src/main/java/art/arcane/amulet/io/nbt/io/StringSerializer.java b/src/main/java/art/arcane/amulet/io/nbt/io/StringSerializer.java