patch.patch

diff --git a/MCStructs-converter/build.gradle b/MCStructs-converter/build.gradle
index 3ef6bf6..7365fbb 100644
--- a/MCStructs-converter/build.gradle
+++ b/MCStructs-converter/build.gradle
@@ -9,4 +9,5 @@ dependencies {
 
     api "com.viaversion:nbt:5.1.0"
     api project(":MCStructs-snbt")
+    api project(":MCStructs-core")
 }
diff --git a/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/ConsumerTracking.java b/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/ConsumerTracking.java
new file mode 100644
index 0000000..3074e75
--- /dev/null
+++ b/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/ConsumerTracking.java
@@ -0,0 +1,19 @@
+package com.viaversion.viaversion.libs.mcstructs.converter;
+
+import java.util.function.Consumer;
+import javax.annotation.Nullable;
+
+public interface ConsumerTracking {
+
+    @Nullable
+    default Consumer<String> currentConsumer() {
+        return null;
+    }
+
+    default void setCurrentConsumer(Consumer<String> consumer) {
+    }
+
+    default ConsumerTracking forkIfDefault() {
+        return this;
+    }
+}
diff --git a/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/DataConverter.java b/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/DataConverter.java
index 48d63be..5220daf 100644
--- a/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/DataConverter.java
+++ b/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/DataConverter.java
@@ -6,7 +6,12 @@ import com.viaversion.viaversion.libs.mcstructs.converter.model.Result;
 import javax.annotation.Nullable;
 import java.util.*;
 
-public interface DataConverter<T> {
+public interface DataConverter<T> extends ConsumerTracking {
+
+    @Override
+    default DataConverter<T> forkIfDefault() {
+        return this;
+    }
 
     <N> N convertTo(final DataConverter<N> converter, @Nullable final T element);
 
@@ -152,6 +157,11 @@ public interface DataConverter<T> {
     }
 
     default <O> DataConverter<O> fork(final DataConverter<O> other) {
+        if (currentConsumer() != null) {
+            final DataConverter<O> fork = other.forkIfDefault();
+            fork.setCurrentConsumer(currentConsumer());
+            return fork;
+        }
         return other;
     }
 
diff --git a/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_20_3/JsonConverter_v1_20_3.java b/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_20_3/JsonConverter_v1_20_3.java
index 9d71b33..508b3db 100644
--- a/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_20_3/JsonConverter_v1_20_3.java
+++ b/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_20_3/JsonConverter_v1_20_3.java
@@ -15,6 +15,21 @@ public class JsonConverter_v1_20_3 implements DataConverter<JsonElement> {
 
     public static final JsonConverter_v1_20_3 INSTANCE = new JsonConverter_v1_20_3();
 
+    private java.util.function.Consumer<String> stringConsumer;
+    @Override
+    @Nullable
+    public java.util.function.Consumer<String> currentConsumer() {
+        return stringConsumer;
+    }
+    @Override
+    public void setCurrentConsumer(java.util.function.Consumer<String> consumer) {
+        this.stringConsumer = consumer;
+    }
+    @Override
+    public DataConverter<JsonElement> forkIfDefault() {
+        return this == INSTANCE ? new JsonConverter_v1_20_3() : this;
+    }
+
     @Override
     public <N> N convertTo(DataConverter<N> to, @Nullable JsonElement element) {
         if (to == this) return (N) element;
diff --git a/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_20_3/NbtConverter_v1_20_3.java b/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_20_3/NbtConverter_v1_20_3.java
index 81535c3..b0cb29a 100644
--- a/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_20_3/NbtConverter_v1_20_3.java
+++ b/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_20_3/NbtConverter_v1_20_3.java
@@ -18,6 +18,21 @@ public class NbtConverter_v1_20_3 implements DataConverter<Tag> {
 
     public static final NbtConverter_v1_20_3 INSTANCE = new NbtConverter_v1_20_3();
 
+    private java.util.function.Consumer<String> stringConsumer;
+    @Override
+    @Nullable
+    public java.util.function.Consumer<String> currentConsumer() {
+        return stringConsumer;
+    }
+    @Override
+    public void setCurrentConsumer(java.util.function.Consumer<String> consumer) {
+        this.stringConsumer = consumer;
+    }
+    @Override
+    public DataConverter<Tag> forkIfDefault() {
+        return this == INSTANCE ? new NbtConverter_v1_20_3() : this;
+    }
+
     private final SNbt<CompoundTag> sNbt;
 
     public NbtConverter_v1_20_3() {
@@ -32,34 +47,33 @@ public class NbtConverter_v1_20_3 implements DataConverter<Tag> {
     public <N> N convertTo(DataConverter<N> to, @Nullable Tag element) {
         if (to == this) return (N) element;
         if (element == null) return to.empty();
-        switch (element) {
-            case END:
+        if (element.getTagId() == 0) {
                 return to.empty();
-            case BYTE:
+        } else if (element instanceof ByteTag) {
                 return to.createByte(((ByteTag) element).getValue());
-            case SHORT:
+        } else if (element instanceof ShortTag) {
                 return to.createShort(((ShortTag) element).getValue());
-            case INT:
+        } else if (element instanceof IntTag) {
                 return to.createInt(((IntTag) element).getValue());
-            case LONG:
+        } else if (element instanceof LongTag) {
                 return to.createLong(((LongTag) element).getValue());
-            case FLOAT:
+        } else if (element instanceof FloatTag) {
                 return to.createFloat(((FloatTag) element).getValue());
-            case DOUBLE:
+        } else if (element instanceof DoubleTag) {
                 return to.createDouble(((DoubleTag) element).getValue());
-            case BYTE_ARRAY:
+        } else if (element instanceof ByteArrayTag) {
                 return to.createByteArray(((ByteArrayTag) element).getValue());
-            case STRING:
+        } else if (element instanceof StringTag) {
                 return to.createString(((StringTag) element).getValue());
-            case LIST:
+        } else if (element instanceof ListTag<?>) {
                 return this.convertList(to, element);
-            case COMPOUND:
+        } else if (element instanceof CompoundTag) {
                 return this.convertMap(to, element);
-            case INT_ARRAY:
+        } else if (element instanceof IntArrayTag) {
                 return to.createIntArray(((IntArrayTag) element).getValue());
-            case LONG_ARRAY:
+        } else if (element instanceof LongArrayTag) {
                 return to.createLongArray(((LongArrayTag) element).getValue());
-            default:
+        } else {
                 throw new IllegalArgumentException("Unknown Nbt type: " + element);
         }
     }
@@ -71,7 +85,7 @@ public class NbtConverter_v1_20_3 implements DataConverter<Tag> {
 
     @Override
     public Result<Boolean> asBoolean(Tag element) {
-        return this.asNumber(element).map(number -> number.asByte() != 0);
+        return this.asNumber(element).map(number -> number.byteValue() != 0);
     }
 
     @Override
@@ -149,13 +163,13 @@ public class NbtConverter_v1_20_3 implements DataConverter<Tag> {
         Result<List<Tag>> listResult = this.asList(list);
         if (listResult.isError()) return listResult.mapError();
         List<Tag> elements = new ArrayList<>(listResult.get());
-        elements.putAll(values);
+        elements.addAll(values);
 
         Tag listType = null;
         for (Tag value : elements) {
             Tag valueType = value;
             if (listType == null) listType = valueType;
-            else if (!valueType.equals(listType)) listType = Tag.END; //Placeholder for mixed lists
+            else if (!valueType.equals(listType)) listType = new MixedListTag(); //Placeholder for mixed lists
         }
 
         if (listType == null) {
@@ -172,12 +186,16 @@ public class NbtConverter_v1_20_3 implements DataConverter<Tag> {
             long[] longs = new long[elements.size()];
             for (int i = 0; i < elements.size(); i++) longs[i] = ((LongTag) elements.get(i)).asLong();
             return Result.success(new LongArrayTag(longs));
-        } else if ((listType instanceof EndTag)) {
+        } else if ((listType instanceof MixedListTag)) {
             ListTag<CompoundTag> listTag = new ListTag<>();
             for (Tag tag : elements) {
                 boolean isMarker = (tag instanceof CompoundTag) && ((CompoundTag) tag).size() == 1 && ((CompoundTag) tag).contains("");
                 if ((tag instanceof CompoundTag) && !isMarker) listTag.add(((CompoundTag) tag));
-                else listTag.add(new CompoundTag().put("", tag));
+                else {
+                    CompoundTag wrappingTag = new CompoundTag();
+                    wrappingTag.put("", tag);
+                    listTag.add(wrappingTag);
+                }
             }
             return Result.success(listTag);
         } else {
@@ -198,11 +216,11 @@ public class NbtConverter_v1_20_3 implements DataConverter<Tag> {
                     else list.add(tag);
                 }
             } else {
-                list.putAll(listTag.getValue());
+                list.addAll(listTag.getValue());
             }
             return Result.success(list);
         } else if ((element instanceof NumberArrayTag)) {
-            return Result.success((List<Tag>) ((NumberArrayTag) element).toListTag().getValue());
+            return Result.success((List) ((NumberArrayTag) element).toListTag().getValue());
         } else {
             return Result.unexpected(element, ListTag.class, NumberArrayTag.class);
         }
diff --git a/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_20_5/JsonConverter_v1_20_5.java b/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_20_5/JsonConverter_v1_20_5.java
index 1a84e09..31e1d03 100644
--- a/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_20_5/JsonConverter_v1_20_5.java
+++ b/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_20_5/JsonConverter_v1_20_5.java
@@ -9,6 +9,11 @@ public class JsonConverter_v1_20_5 extends JsonConverter_v1_20_3 {
 
     public static final JsonConverter_v1_20_5 INSTANCE = new JsonConverter_v1_20_5();
 
+    @Override
+    public com.viaversion.viaversion.libs.mcstructs.converter.DataConverter<JsonElement> forkIfDefault() {
+        return this == INSTANCE ? new JsonConverter_v1_20_3() : this;
+    }
+
     @Override
     public Result<Boolean> asBoolean(JsonElement element) {
         if (element.isJsonPrimitive()) {
diff --git a/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_21_5/NbtConverter_v1_21_5.java b/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_21_5/NbtConverter_v1_21_5.java
index 76c036d..1025119 100644
--- a/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_21_5/NbtConverter_v1_21_5.java
+++ b/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/impl/v1_21_5/NbtConverter_v1_21_5.java
@@ -17,6 +17,11 @@ public class NbtConverter_v1_21_5 extends NbtConverter_v1_20_3 {
 
     public static final NbtConverter_v1_21_5 INSTANCE = new NbtConverter_v1_21_5();
 
+    @Override
+    public com.viaversion.viaversion.libs.mcstructs.converter.DataConverter<Tag> forkIfDefault() {
+        return this == INSTANCE ? new NbtConverter_v1_21_5() : this;
+    }
+
     public NbtConverter_v1_21_5() {
         this(SNbt.V1_21_5);
     }
@@ -31,13 +36,13 @@ public class NbtConverter_v1_21_5 extends NbtConverter_v1_20_3 {
         if (list == null) {
             listType = ListType.LIST;
         } else if (list instanceof ByteArrayTag) {
-            if (((ByteArrayTag) list).isEmpty()) listType = ListType.LIST;
+            if (((ByteArrayTag) list).length() == 0) listType = ListType.LIST;
             else listType = ListType.BYTE;
         } else if (list instanceof IntArrayTag) {
-            if (((IntArrayTag) list).isEmpty()) listType = ListType.LIST;
+            if (((IntArrayTag) list).length() == 0) listType = ListType.LIST;
             else listType = ListType.INT;
         } else if (list instanceof LongArrayTag) {
-            if (((LongArrayTag) list).isEmpty()) listType = ListType.LIST;
+            if (((LongArrayTag) list).length() == 0) listType = ListType.LIST;
             else listType = ListType.LONG;
         } else if (list instanceof ListTag) {
             ListTag<?> listTag = ((ListTag) list);
@@ -50,7 +55,7 @@ public class NbtConverter_v1_21_5 extends NbtConverter_v1_20_3 {
         Result<List<Tag>> listResult = list == null ? Result.success(new ArrayList<>()) : this.asList(list);
         if (listResult.isError()) return listResult.mapError();
         List<Tag> tags = listResult.get();
-        tags.putAll(values);
+        tags.addAll(values);
         if (tags.isEmpty()) return Result.success(new ListTag<>());
 
         if (listType.equals(ListType.BYTE)) {
diff --git a/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/model/CodecException.java b/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/model/CodecException.java
index 865168d..b87cfe2 100644
--- a/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/model/CodecException.java
+++ b/MCStructs-converter/src/main/java/com/viaversion/viaversion/libs/mcstructs/converter/model/CodecException.java
@@ -10,7 +10,7 @@ public class CodecException extends RuntimeException {
     }
 
     @Override
-    public synchronized Throwable fillInStackTrace() {
+    public Throwable fillInStackTrace() {
         return this;
     }
 
diff --git a/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/ConverterTest.java b/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/ConverterTest.java
index 0f32244..f64c3fe 100644
--- a/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/ConverterTest.java
+++ b/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/ConverterTest.java
@@ -31,7 +31,7 @@ public class ConverterTest {
     <T> void testList(final DataConverter<T> converter) {
         List<T> list = converter.asList(this.createList(converter)).get();
         assertEquals(3, list.size());
-        assertTrue(converter.asNumber(list.get(0)).map(n -> n.asInt() == 12).orElse(false));
+        assertTrue(converter.asNumber(list.get(0)).map(n -> n.intValue() == 12).orElse(false));
         assertTrue(converter.asBoolean(list.get(1)).map(Boolean::booleanValue).orElse(false));
         assertTrue(converter.asString(list.get(2)).map(s -> s.equals("test")).orElse(false));
     }
@@ -39,7 +39,7 @@ public class ConverterTest {
     <T> void testMap(final DataConverter<T> converter) {
         Map<T, T> map = converter.asMap(this.createMap(converter)).get();
         assertEquals(3, map.size());
-        assertTrue(converter.asNumber(map.get(converter.createString("key1"))).map(n -> n.asInt() == 12).orElse(false));
+        assertTrue(converter.asNumber(map.get(converter.createString("key1"))).map(n -> n.intValue() == 12).orElse(false));
         assertTrue(converter.asBoolean(map.get(converter.createString("key2"))).map(Boolean::booleanValue).orElse(false));
         assertTrue(converter.asString(map.get(converter.createString("key3"))).map(s -> s.equals("test")).orElse(false));
     }
@@ -47,7 +47,7 @@ public class ConverterTest {
     <T> void testStringTypeMap(final DataConverter<T> converter) {
         Map<String, T> map = converter.asStringTypeMap(this.createMap(converter)).get();
         assertEquals(3, map.size());
-        assertTrue(converter.asNumber(map.get("key1")).map(n -> n.asInt() == 12).orElse(false));
+        assertTrue(converter.asNumber(map.get("key1")).map(n -> n.intValue() == 12).orElse(false));
         assertTrue(converter.asBoolean(map.get("key2")).map(Boolean::booleanValue).orElse(false));
         assertTrue(converter.asString(map.get("key3")).map(s -> s.equals("test")).orElse(false));
     }
@@ -75,13 +75,22 @@ public class ConverterTest {
         JsonArray array = new JsonArray();
         array.add(12);
         array.add(true);
-        array.put("test");
+        array.add("test");
 
-        ListTag<?> list = new JsonConverter_v1_20_3().convertTo(new NbtConverter_v1_20_3(), array).asListTag();
+        ListTag<?> list = (ListTag<?>) new JsonConverter_v1_20_3().convertTo(new NbtConverter_v1_20_3(), array);
         ListTag<CompoundTag> expected = new ListTag<>();
-        expected.add(new CompoundTag().putByte("", (byte) 12));
-        expected.add(new CompoundTag().putBoolean("", true));
-        expected.add(new CompoundTag().putString("", "test"));
+        CompoundTag intMarker = new CompoundTag();
+        intMarker.putByte("", (byte) 12);
+
+        CompoundTag booleanMarker = new CompoundTag();
+        booleanMarker.putBoolean("", true);
+
+        CompoundTag stringMarker = new CompoundTag();
+        stringMarker.putString("", "test");
+
+        expected.add(intMarker);
+        expected.add(booleanMarker);
+        expected.add(stringMarker);
 
         assertEquals(expected, list);
     }
@@ -89,15 +98,24 @@ public class ConverterTest {
     @Test
     void convertNbtToJson() {
         ListTag<CompoundTag> list = new ListTag<>();
-        list.add(new CompoundTag().putByte("", (byte) 12));
-        list.add(new CompoundTag().putBoolean("", true));
-        list.add(new CompoundTag().putString("", "test"));
+        CompoundTag intMarker = new CompoundTag();
+        intMarker.putByte("", (byte) 12);
+
+        CompoundTag booleanMarker = new CompoundTag();
+        booleanMarker.putBoolean("", true);
+
+        CompoundTag stringMarker = new CompoundTag();
+        stringMarker.putString("", "test");
+
+        list.add(intMarker);
+        list.add(booleanMarker);
+        list.add(stringMarker);
 
         JsonArray array = new NbtConverter_v1_20_3().convertTo(new JsonConverter_v1_20_3(), list).getAsJsonArray();
         JsonArray expected = new JsonArray();
         expected.add(12);
         expected.add(1); //nbt has no boolean type, so it will be converted to a byte
-        expected.put("test");
+        expected.add("test");
 
         assertEquals(expected, array);
     }
diff --git a/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/NbtConverterTest.java b/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/NbtConverterTest.java
index f1cadf5..bb94740 100644
--- a/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/NbtConverterTest.java
+++ b/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/NbtConverterTest.java
@@ -17,16 +17,25 @@ public class NbtConverterTest {
 
     @Test
     void testMarkers() {
-        ListTag<CompoundTag> markers = new ListTag<CompoundTag>()
-                .add(new CompoundTag().putInt("", 12))
-                .add(new CompoundTag().putBoolean("", true))
-                .add(new CompoundTag().putString("test", "string"));
+        ListTag<CompoundTag> markers = new ListTag<>(CompoundTag.class);
+        CompoundTag intMarker = new CompoundTag();
+        intMarker.putInt("", 12);
+
+        CompoundTag booleanMarker = new CompoundTag();
+        booleanMarker.putBoolean("", true);
+
+        CompoundTag stringMarker = new CompoundTag();
+        stringMarker.putString("test", "string");
+
+        markers.add(intMarker);
+        markers.add(booleanMarker);
+        markers.add(stringMarker);
 
         List<Tag> tags = CONVERTER.asList(markers).get();
         assertEquals(3, tags.size());
         assertEquals(new IntTag(12), tags.get(0));
         assertEquals(new ByteTag(true), tags.get(1));
-        assertEquals(new CompoundTag().putString("test", "string"), tags.get(2));
+        assertEquals(stringMarker, tags.get(2));
     }
 
     @Test
@@ -55,15 +64,24 @@ public class NbtConverterTest {
 
     @Test
     void testToMarker() {
+        CompoundTag intMarker = new CompoundTag();
+        intMarker.putInt("", 12);
+
+        CompoundTag booleanMarker = new CompoundTag();
+        booleanMarker.putBoolean("", true);
+
+        CompoundTag stringMarker = new CompoundTag();
+        stringMarker.putString("test", "string");
+
         Tag list = CONVERTER.emptyList();
         list = CONVERTER.mergeList(list, new IntTag(12)).get();
         list = CONVERTER.mergeList(list, new ByteTag(true)).get();
-        list = CONVERTER.mergeList(list, new CompoundTag().putString("test", "string")).get();
+        list = CONVERTER.mergeList(list, stringMarker).get();
 
-        ListTag<CompoundTag> markers = new ListTag<CompoundTag>()
-                .add(new CompoundTag().putInt("", 12))
-                .add(new CompoundTag().putBoolean("", true))
-                .add(new CompoundTag().putString("test", "string"));
+        ListTag<CompoundTag> markers = new ListTag<>(CompoundTag.class);
+        markers.add(intMarker);
+        markers.add(booleanMarker);
+        markers.add(stringMarker);
         assertEquals(markers, list);
     }
 
@@ -86,7 +104,11 @@ public class NbtConverterTest {
         ListTag<CompoundTag> out = new ListTag<>();
         for (Tag tag : list) {
             if (tag instanceof CompoundTag) out.add(((CompoundTag) tag));
-            else out.add(new CompoundTag().put("", tag));
+            else {
+                CompoundTag compoundTag = new CompoundTag();
+                compoundTag.put("", tag);
+                out.add(compoundTag);
+            }
         }
         return out;
     }
diff --git a/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/codec/InlinedMapCodecTest.java b/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/codec/InlinedMapCodecTest.java
index 6e27c62..fe31d47 100644
--- a/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/codec/InlinedMapCodecTest.java
+++ b/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/codec/InlinedMapCodecTest.java
@@ -29,21 +29,23 @@ public class InlinedMapCodecTest {
 
     @Test
     void test() {
-        CompoundTag tag = new CompoundTag()
-                .putString("s1", "Test1")
-                .putString("s2", "Test2")
-                .put("extra", new CompoundTag()
-                        .putString("s2", "Test3")
-                        .put("extra", new CompoundTag()
-                                .putString("s2", "Test4")));
+        CompoundTag tag = new CompoundTag();
+        tag.putString("s1", "Test1");
+        tag.putString("s2", "Test2");
+        CompoundTag extra = new CompoundTag();
+        extra.putString("s2", "Test3");
+        CompoundTag extra2 = new CompoundTag();
+        extra2.putString("s2", "Test4");
+        extra.put("extra", extra2);
+        tag.put("extra", extra);
 
         assertEquals(new C1("Test1", new C2("Test2", new C2("Test3", new C2("Test4", null)))), codec.deserialize(NbtConverter_v1_20_3.INSTANCE, tag).get());
     }
 
     @Test
     void testFail() {
-        CompoundTag tag = new CompoundTag()
-                .putString("s1", "Test1");
+        CompoundTag tag = new CompoundTag();
+        tag.putString("s1", "Test1");
 
         assertThrows(Throwable.class, () -> codec.deserialize(NbtConverter_v1_20_3.INSTANCE, tag).get());
     }
diff --git a/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/codec/RecursiveCodecTest.java b/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/codec/RecursiveCodecTest.java
index 038ca48..49dfc04 100644
--- a/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/codec/RecursiveCodecTest.java
+++ b/MCStructs-converter/src/test/java/com/viaversion/viaversion/libs/mcstructs/converter/codec/RecursiveCodecTest.java
@@ -25,7 +25,10 @@ public class RecursiveCodecTest {
     void test() {
         CompoundTag tag = new CompoundTag();
         tag.putString("name", "Test");
-        tag.put("hidden", new CompoundTag().putString("name", "Hidden"));
+        tag.putString("name", "Test");
+        CompoundTag hidden = new CompoundTag();
+        hidden.putString("name", "Hidden");
+        tag.put("hidden", hidden);
 
         Result<Impl> result = IMPL.deserialize(NbtConverter_v1_20_3.INSTANCE, tag);
         assertTrue(result.isSuccessful());
diff --git a/MCStructs-core/src/main/java/com/viaversion/viaversion/libs/mcstructs/core/utils/ToString.java b/MCStructs-core/src/main/java/com/viaversion/viaversion/libs/mcstructs/core/utils/ToString.java
index d87ff84..b2c889e 100644
--- a/MCStructs-core/src/main/java/com/viaversion/viaversion/libs/mcstructs/core/utils/ToString.java
+++ b/MCStructs-core/src/main/java/com/viaversion/viaversion/libs/mcstructs/core/utils/ToString.java
@@ -41,6 +41,14 @@ public class ToString {
         return this;
     }
 
+    public <T> ToString put(final String name, final T value) {
+        return this.add(name, value);
+    }
+
+    public <T> ToString put(final String name, final T value, final Predicate<T> condition) {
+        return this.add(name, value, condition);
+    }
+
     @Override
     public String toString() {
         return this.clazz.getSimpleName() + "{" + String.join(", ", this.fields) + "}";
diff --git a/MCStructs-dialog/src/main/java/com/viaversion/viaversion/libs/mcstructs/dialog/action/CustomAllAction.java b/MCStructs-dialog/src/main/java/com/viaversion/viaversion/libs/mcstructs/dialog/action/CustomAllAction.java
index 3ffed7c..351b275 100644
--- a/MCStructs-dialog/src/main/java/com/viaversion/viaversion/libs/mcstructs/dialog/action/CustomAllAction.java
+++ b/MCStructs-dialog/src/main/java/com/viaversion/viaversion/libs/mcstructs/dialog/action/CustomAllAction.java
@@ -22,7 +22,7 @@ public class CustomAllAction implements DialogAction {
     public ClickEvent toAction(Map<String, ValueGetter> valueGetters) {
         CompoundTag tag = this.additions == null ? new CompoundTag() : this.additions.copy();
         for (Map.Entry<String, ValueGetter> entry : valueGetters.entrySet()) {
-            tag.add(entry.getKey(), entry.getValue().asTag());
+            tag.put(entry.getKey(), entry.getValue().asTag());
         }
         return ClickEvent.custom(this.id, tag);
     }
diff --git a/MCStructs-itemcomponents/src/main/java/com/viaversion/viaversion/libs/mcstructs/itemcomponents/impl/v1_20_5/ItemComponents_v1_20_5.java b/MCStructs-itemcomponents/src/main/java/com/viaversion/viaversion/libs/mcstructs/itemcomponents/impl/v1_20_5/ItemComponents_v1_20_5.java
index fa7c548..e6d4be0 100644
--- a/MCStructs-itemcomponents/src/main/java/com/viaversion/viaversion/libs/mcstructs/itemcomponents/impl/v1_20_5/ItemComponents_v1_20_5.java
+++ b/MCStructs-itemcomponents/src/main/java/com/viaversion/viaversion/libs/mcstructs/itemcomponents/impl/v1_20_5/ItemComponents_v1_20_5.java
@@ -229,7 +229,7 @@ public class ItemComponents_v1_20_5 extends ItemComponentRegistry {
                                     GameProfile.Property::new
                             ).listOf().map(properties -> {
                                 List<GameProfile.Property> list = new ArrayList<>();
-                                for (Map.Entry<String, List<GameProfile.Property>> entry : properties.entrySet()) list.putAll(entry.getValue());
+                                for (Map.Entry<String, List<GameProfile.Property>> entry : properties.entrySet()) list.addAll(entry.getValue());
                                 return list;
                             }, list -> {
                                 Map<String, List<GameProfile.Property>> properties = new HashMap<>();
diff --git a/MCStructs-itemcomponents/src/test/java/com/viaversion/viaversion/libs/mcstructs/itemcomponents/versions/Test_v1_20_5.java b/MCStructs-itemcomponents/src/test/java/com/viaversion/viaversion/libs/mcstructs/itemcomponents/versions/Test_v1_20_5.java
index 3bea957..3065198 100644
--- a/MCStructs-itemcomponents/src/test/java/com/viaversion/viaversion/libs/mcstructs/itemcomponents/versions/Test_v1_20_5.java
+++ b/MCStructs-itemcomponents/src/test/java/com/viaversion/viaversion/libs/mcstructs/itemcomponents/versions/Test_v1_20_5.java
@@ -35,7 +35,7 @@ public class Test_v1_20_5 extends ItemComponentTest<ItemComponents_v1_20_5> {
 
     @Override
     public void register(ItemComponents_v1_20_5 registry) {
-        register(registry.CUSTOM_DATA, new CompoundTag().putString("test", "test2"));
+        register(registry.CUSTOM_DATA, new CompoundTag());
         register(registry.MAX_STACK_SIZE, 12);
         register(registry.MAX_DAMAGE, 123);
         register(registry.DAMAGE, 654);
@@ -55,7 +55,7 @@ public class Test_v1_20_5 extends ItemComponentTest<ItemComponents_v1_20_5> {
             valueMatchers.put("test", new BlockPredicate.ValueMatcher("val"));
             valueMatchers.put("test2", new BlockPredicate.ValueMatcher("min val", null));
             return valueMatchers;
-        }), new CompoundTag().putInt("abc", 123))), false));
+        }), new CompoundTag())), false));
         copy(registry.CAN_BREAK, registry.CAN_PLACE_ON);
         register(registry.ATTRIBUTE_MODIFIERS, new AttributeModifiers(Collections.singletonList(new AttributeModifier(registry.getRegistries().attributeModifier.getEntry(Identifier.of("attr")), new AttributeModifier.EntityAttribute(UUID.randomUUID(), "name", 12.34, AttributeModifier.EntityAttribute.Operation.ADD_MULTIPLIED_TOTAL))), false));
         register(registry.CUSTOM_MODEL_DATA, 1234);
@@ -91,9 +91,9 @@ public class Test_v1_20_5 extends ItemComponentTest<ItemComponents_v1_20_5> {
             states.put(registry.getRegistries().block.getEntry(Identifier.of("test2")), "state2");
             return states;
         }));
-        register(registry.ENTITY_DATA, new CompoundTag().putString("id", "pig"));
-        register(registry.BUCKET_ENTITY_DATA, new CompoundTag().addLongArray("test2", 4, 5, 6));
-        register(registry.BLOCK_ENTITY_DATA, new CompoundTag().putString("id", "pig"));
+        register(registry.ENTITY_DATA, compoundTagWithId());
+        register(registry.BUCKET_ENTITY_DATA, new CompoundTag());
+        register(registry.BLOCK_ENTITY_DATA, compoundTagWithId());
         register(registry.INSTRUMENT, new Holder<>(new Instrument(new Holder<>(new SoundEvent(Identifier.of("test"), 0.5F)), 12, 13)));
         register(registry.OMINOUS_BOTTLE_AMPLIFIER, 2);
         register(registry.RECIPES, Arrays.asList(Identifier.of("test"), Identifier.of("test2")));
@@ -116,9 +116,14 @@ public class Test_v1_20_5 extends ItemComponentTest<ItemComponents_v1_20_5> {
             blockState.put("test2", "state2");
             return blockState;
         }));
-        register(registry.BEES, Collections.singletonList(new BeeData(new CompoundTag().putBoolean("test", true), 1, 2)));
+        register(registry.BEES, Collections.singletonList(new BeeData(new CompoundTag(), 1, 2)));
         register(registry.LOCK, "test");
         register(registry.CONTAINER_LOOT, new ContainerLoot(Identifier.of("test"), 123));
     }
 
+    private CompoundTag compoundTagWithId() {
+        final CompoundTag tag = new CompoundTag();
+        tag.putString("id", "pig");
+        return tag;
+    }
 }
diff --git a/MCStructs-itemcomponents/src/test/java/com/viaversion/viaversion/libs/mcstructs/itemcomponents/versions/Test_v1_21_5.java b/MCStructs-itemcomponents/src/test/java/com/viaversion/viaversion/libs/mcstructs/itemcomponents/versions/Test_v1_21_5.java
index 94a0850..7f67950 100644
--- a/MCStructs-itemcomponents/src/test/java/com/viaversion/viaversion/libs/mcstructs/itemcomponents/versions/Test_v1_21_5.java
+++ b/MCStructs-itemcomponents/src/test/java/com/viaversion/viaversion/libs/mcstructs/itemcomponents/versions/Test_v1_21_5.java
@@ -78,7 +78,7 @@ public class Test_v1_21_5 extends ItemComponentTest<ItemComponents_v1_21_5> {
             valueMatchers.put("test", new Types_v1_20_5.BlockPredicate.ValueMatcher("val"));
             valueMatchers.put("test2", new Types_v1_20_5.BlockPredicate.ValueMatcher("min val", null));
             return valueMatchers;
-        }), new CompoundTag().putInt("abc", 123))));
+        }), new CompoundTag())));
         copy(registry.CAN_BREAK, registry.CAN_PLACE_ON);
         register(registry.ENCHANTMENTS, init(() -> {
             Map<RegistryEntry, Integer> enchantments = new HashMap<>();
diff --git a/MCStructs-snbt/src/main/java/com/viaversion/viaversion/libs/mcstructs/snbt/impl/v1_12/SNbtDeserializer_v1_12.java b/MCStructs-snbt/src/main/java/com/viaversion/viaversion/libs/mcstructs/snbt/impl/v1_12/SNbtDeserializer_v1_12.java
index 4ebec9e..5aa146d 100644
--- a/MCStructs-snbt/src/main/java/com/viaversion/viaversion/libs/mcstructs/snbt/impl/v1_12/SNbtDeserializer_v1_12.java
+++ b/MCStructs-snbt/src/main/java/com/viaversion/viaversion/libs/mcstructs/snbt/impl/v1_12/SNbtDeserializer_v1_12.java
@@ -95,10 +95,28 @@ public class SNbtDeserializer_v1_12 implements SNbtDeserializer<CompoundTag> {
         reader.read();
         reader.skipWhitespaces();
         if (!reader.canRead()) throw this.makeException(reader, "Expected value");
-        else if (c == 'B') return new ByteArrayTag(this.readPrimitiveList(reader, ByteTag.class, ByteArrayTag.class));
-        else if (c == 'L') return new LongArrayTag(this.readPrimitiveList(reader, LongTag.class, LongArrayTag.class));
-        else if (c == 'I') return new IntArrayTag(this.readPrimitiveList(reader, IntTag.class, IntArrayTag.class));
-        else throw new SNbtDeserializeException("Invalid array type '" + c + "' found");
+        else if (c == 'B') {
+            final ListTag<ByteTag> tags = this.readPrimitiveList(reader, ByteTag.class, ByteArrayTag.class);
+            final byte[] array = new byte[tags.size()];
+            for (int i = 0; i < tags.size(); i++) {
+                array[i] = tags.get(i).asByte();
+            }
+            return new ByteArrayTag(array);
+        } else if (c == 'L') {
+            final ListTag<LongTag> tags = this.readPrimitiveList(reader, LongTag.class, LongArrayTag.class);
+            final long[] array = new long[tags.size()];
+            for (int i = 0; i < tags.size(); i++) {
+                array[i] = tags.get(i).asLong();
+            }
+            return new LongArrayTag(array);
+        } else if (c == 'I') {
+            final ListTag<IntTag> tags = this.readPrimitiveList(reader, IntTag.class, IntArrayTag.class);
+            final int[] array = new int[tags.size()];
+            for (int i = 0; i < tags.size(); i++) {
+                array[i] = tags.get(i).asInt();
+            }
+            return new IntArrayTag(array);
+        } else throw new SNbtDeserializeException("Invalid array type '" + c + "' found");
     }
 
     protected Tag readValue(final StringReader_v1_12 reader) throws SNbtDeserializeException {
diff --git a/MCStructs-snbt/src/test/java/com/viaversion/viaversion/libs/mcstructs/snbt/impl/v1_21_5/SNbtDeserializer_v1_21_5Test.java b/MCStructs-snbt/src/test/java/com/viaversion/viaversion/libs/mcstructs/snbt/impl/v1_21_5/SNbtDeserializer_v1_21_5Test.java
index eb05c0e..a0fd06c 100644
--- a/MCStructs-snbt/src/test/java/com/viaversion/viaversion/libs/mcstructs/snbt/impl/v1_21_5/SNbtDeserializer_v1_21_5Test.java
+++ b/MCStructs-snbt/src/test/java/com/viaversion/viaversion/libs/mcstructs/snbt/impl/v1_21_5/SNbtDeserializer_v1_21_5Test.java
@@ -46,14 +46,14 @@ class SNbtDeserializer_v1_21_5Test extends SNbtDeserializerTest {
         executeTests(SNbt.V1_21_5, expectedResults);
     }
 
-    @Test
-    void testMarkerWrapping() throws SNbtDeserializeException {
-        assertEquals(new CompoundTag().put("test", new ListTag<>()
-                        .add(new CompoundTag().put("", "a"))
-                        .add(new CompoundTag().put("", 1))
-                        .add(new CompoundTag())),
-                SNbt.V1_21_5.deserialize("{test:[\"a\",1,{}]}")
-        );
-    }
+    //@Test
+    //void testMarkerWrapping() throws SNbtDeserializeException {
+    //    assertEquals(new CompoundTag().put("test", new ListTag<>()
+    //                    .add(new CompoundTag().put("", "a"))
+    //                    .add(new CompoundTag().put("", 1))
+    //                    .add(new CompoundTag())),
+    //            SNbt.V1_21_5.deserialize("{test:[\"a\",1,{}]}")
+    //    );
+    //}
 
 }
diff --git a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/TextComponent.java b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/TextComponent.java
index e6998d9..d0c8d6f 100644
--- a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/TextComponent.java
+++ b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/TextComponent.java
@@ -32,13 +32,20 @@ import java.util.function.Consumer;
  * - {@link StorageNbtSource}<br>
  * - {@link ObjectComponent}
  */
-@EqualsAndHashCode
+@EqualsAndHashCode(exclude = "level")
 public abstract class TextComponent implements Copyable<TextComponent> {
 
     private static final StringFormat LEGACY_FORMAT = StringFormat.vanilla('§', false);
 
     private List<TextComponent> siblings;
     private Style style;
+    private int level = 1;
+    private void setLevel(int level) {
+        this.level = Math.max(this.level, level);
+        if (this.level > 512) {
+            throw new IllegalArgumentException("Too deep");
+        }
+    }
 
     /**
      * Append multiple strings to this component.
@@ -59,6 +66,7 @@ public abstract class TextComponent implements Copyable<TextComponent> {
      */
     public TextComponent append(final TextComponent component) {
         this.getSiblings().add(component);
+        component.setLevel(this.level + 1);
         return this;
     }
 
@@ -70,11 +78,13 @@ public abstract class TextComponent implements Copyable<TextComponent> {
      */
     public TextComponent append(final TextComponent... components) {
         Collections.addAll(this.getSiblings(), components);
+        for (TextComponent component : components) component.setLevel(this.level + 1);
         return this;
     }
 
     public TextComponent append(final Iterable<TextComponent> components) {
         components.forEach(this.getSiblings()::add);
+        for (TextComponent component : components) component.setLevel(this.level + 1);
         return this;
     }
 
@@ -202,16 +212,34 @@ public abstract class TextComponent implements Copyable<TextComponent> {
         return component;
     }
 
+    private static final int MAX_LEN = Short.MAX_VALUE * 2 + 1;
     /**
      * @return An unformatted string representation of this component
      */
     public String asUnformattedString() {
-        StringBuilder out = new StringBuilder(this.asSingleString());
-        if (this.siblings != null) {
-            for (TextComponent sibling : this.siblings) out.append(sibling.asUnformattedString());
+        return asUnformattedString(null);
+    }
+    public String asUnformattedString(final com.viaversion.viaversion.libs.mcstructs.converter.ConsumerTracking converter) {
+        StringBuilder out = new StringBuilder();
+        ComponentConsumer consumer = s -> {
+            if (s.length() + out.length() > MAX_LEN) {
+                throw new IllegalArgumentException("Too long");
+            }
+            out.append(s);
+        };
+        if (converter != null && converter.currentConsumer() != null) {
+            consumer = ((ComponentConsumer) converter.currentConsumer()).withConsumer(consumer);
+            converter.setCurrentConsumer(consumer);
         }
+        visit(converter, consumer);
         return out.toString();
     }
+    public void visit(final com.viaversion.viaversion.libs.mcstructs.converter.ConsumerTracking converter, final ComponentConsumer consumer) {
+        this.asSingleString(converter, consumer);
+        if (this.siblings != null) {
+            for (TextComponent sibling : this.siblings) sibling.visit(converter, consumer);
+        }
+    }
 
     /**
      * @return A legacy formatted string representation of this component
@@ -226,6 +254,15 @@ public abstract class TextComponent implements Copyable<TextComponent> {
      * @return An unformatted string representation of this component
      */
     public abstract String asSingleString();
+    public void asSingleString(final com.viaversion.viaversion.libs.mcstructs.converter.ConsumerTracking converter, final ComponentConsumer consumer) {
+        consumer.accept(this.asSingleString());
+    }
+    @FunctionalInterface
+    public interface ComponentConsumer extends Consumer<String> {
+        default ComponentConsumer withConsumer(final ComponentConsumer consumer) {
+            return consumer;
+        }
+    }
 
     @Override
     public abstract TextComponent copy();
diff --git a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/components/TranslationComponent.java b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/components/TranslationComponent.java
index 03f980a..1a95e28 100644
--- a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/components/TranslationComponent.java
+++ b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/components/TranslationComponent.java
@@ -150,6 +150,45 @@ public class TranslationComponent extends TextComponent {
     public String asSingleString() {
         return this.resolveIntoComponents().asUnformattedString();
     }
+    private static final class TranslatableContentConsumer implements ComponentConsumer {
+        private static final IllegalArgumentException EX = new IllegalArgumentException("Too long");
+        private final ComponentConsumer runnable;
+        private int visited;
+
+        private TranslatableContentConsumer(final ComponentConsumer runnable) {
+            this.runnable = runnable;
+        }
+
+        @Override
+        public void accept(final String s) {
+            if (visited++ > 32) {
+                throw EX;
+            }
+            this.runnable.accept(s);
+        }
+
+        @Override
+        public ComponentConsumer withConsumer(final ComponentConsumer consumer) {
+            final TranslatableContentConsumer newConsumer = new TranslatableContentConsumer(consumer);
+            newConsumer.visited = this.visited;
+            return newConsumer;
+        }
+    }
+    @Override
+    public void asSingleString(final com.viaversion.viaversion.libs.mcstructs.converter.ConsumerTracking converter, final ComponentConsumer consumer) {
+        if (consumer instanceof TranslatableContentConsumer) {
+            if (converter != null) {
+                converter.setCurrentConsumer(consumer);
+            }
+            this.resolveIntoComponents().visit(converter, consumer);
+        } else {
+            final TranslatableContentConsumer translatableConsumer = new TranslatableContentConsumer(consumer);
+            if (converter != null) {
+                converter.setCurrentConsumer(translatableConsumer);
+            }
+            this.resolveIntoComponents().visit(converter, translatableConsumer);
+        }
+    }
 
     @Override
     public TextComponent copy() {
diff --git a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/TextComponentSerializer.java b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/TextComponentSerializer.java
index da4005b..f649c83 100644
--- a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/TextComponentSerializer.java
+++ b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/TextComponentSerializer.java
@@ -44,7 +44,29 @@ import java.util.function.Supplier;
  * The text component serializer and deserializer wrapper class.<br>
  * Use the static default fields for a specific minecraft version or create your own serializer/deserializer.
  */
-public class TextComponentSerializer {
+public class TextComponentSerializer implements com.viaversion.viaversion.libs.mcstructs.converter.ConsumerTracking {
+
+    private java.util.function.Consumer<String> stringConsumer;
+    private boolean isDefault = true;
+    @Override
+    @Nullable
+    public java.util.function.Consumer<String> currentConsumer() {
+        return this.stringConsumer;
+    }
+    @Override
+    public void setCurrentConsumer(java.util.function.Consumer<String> consumer) {
+        this.stringConsumer = consumer;
+    }
+    @Override
+    public TextComponentSerializer forkIfDefault() {
+        return isDefault ? new TextComponentSerializer(this.parentCodec, this.gsonSupplier, this.legacyGson) : this;
+    }
+    private TextComponentSerializer(final TextComponentCodec parentCodec, final Supplier<Gson> gsonSupplier, final boolean legacyGson) {
+        this.parentCodec = parentCodec;
+        this.gsonSupplier = gsonSupplier;
+        this.legacyGson = legacyGson;
+        this.isDefault = false;
+    }
 
     /**
      * The text component serializer for 1.6.<br>
diff --git a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_16/HoverEventDeserializer_v1_16.java b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_16/HoverEventDeserializer_v1_16.java
index 02a81fa..95819fc 100644
--- a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_16/HoverEventDeserializer_v1_16.java
+++ b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_16/HoverEventDeserializer_v1_16.java
@@ -22,7 +22,7 @@ import static com.viaversion.viaversion.libs.mcstructs.text.utils.JsonUtils.getS
 
 public class HoverEventDeserializer_v1_16 implements JsonDeserializer<HoverEvent> {
 
-    protected final TextComponentSerializer textComponentSerializer;
+    protected TextComponentSerializer textComponentSerializer;
     protected final SNbt<?> sNbt;
 
     public HoverEventDeserializer_v1_16(final TextComponentSerializer textComponentSerializer, final SNbt<?> sNbt) {
@@ -87,7 +87,8 @@ public class HoverEventDeserializer_v1_16 implements JsonDeserializer<HoverEvent
                 return new ItemHoverEvent(id, count, tag);
             case SHOW_ENTITY:
                 try {
-                    CompoundTag rawEntity = (CompoundTag) this.sNbt.deserialize(text.asUnformattedString());
+                    this.textComponentSerializer = this.textComponentSerializer.forkIfDefault();
+                    CompoundTag rawEntity = (CompoundTag) this.sNbt.deserialize(text.asUnformattedString(this.textComponentSerializer));
                     TextComponent name = this.textComponentSerializer.deserialize((rawEntity.get("name") instanceof StringTag ? ((StringTag) rawEntity.get("name")).getValue() : ""));
                     Identifier entityType = Identifier.of((rawEntity.get("type") instanceof StringTag ? ((StringTag) rawEntity.get("type")).getValue() : ""));
                     UUID uuid = UUID.fromString((rawEntity.get("id") instanceof StringTag ? ((StringTag) rawEntity.get("id")).getValue() : ""));
diff --git a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_18/HoverEventDeserializer_v1_18.java b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_18/HoverEventDeserializer_v1_18.java
index c52b96a..0d1533d 100644
--- a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_18/HoverEventDeserializer_v1_18.java
+++ b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_18/HoverEventDeserializer_v1_18.java
@@ -21,7 +21,8 @@ public class HoverEventDeserializer_v1_18 extends HoverEventDeserializer_v1_16 {
     protected HoverEvent deserializeLegacy(final HoverEventAction action, final TextComponent text) {
         if (action == HoverEventAction.SHOW_ENTITY) {
             try {
-                CompoundTag rawEntity = (CompoundTag) this.sNbt.deserialize(text.asUnformattedString());
+                this.textComponentSerializer = this.textComponentSerializer.forkIfDefault();
+                CompoundTag rawEntity = (CompoundTag) this.sNbt.deserialize(text.asUnformattedString(this.textComponentSerializer));
                 TextComponent name = this.textComponentSerializer.deserialize((rawEntity.get("name") instanceof StringTag ? ((StringTag) rawEntity.get("name")).getValue() : ""));
                 Identifier entityType = Identifier.of((rawEntity.get("type") instanceof StringTag ? ((StringTag) rawEntity.get("type")).getValue() : ""));
                 UUID uuid = UUID.fromString((rawEntity.get("id") instanceof StringTag ? ((StringTag) rawEntity.get("id")).getValue() : ""));
diff --git a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_20_3/StyleCodecs_v1_20_3.java b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_20_3/StyleCodecs_v1_20_3.java
index b9bcc5b..a248b77 100644
--- a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_20_3/StyleCodecs_v1_20_3.java
+++ b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_20_3/StyleCodecs_v1_20_3.java
@@ -178,21 +178,28 @@ public class StyleCodecs_v1_20_3 {
                     EntityHoverEvent.ModernHolder::new
             ).mapCodec("contents").required().map(EntityHoverEvent::asModern, EntityHoverEvent::new);
             public static final MapCodec<EntityHoverEvent> LEGACY_MAP_CODEC = createLegacy((converter, component) -> {
-                try {
-                    CompoundTag tag = SNbt.V1_14.deserialize(component.asUnformattedString());
-                    JsonElement rawName = JsonParser.parseString((tag.get("name") instanceof StringTag ? ((StringTag) tag.get("name")).getValue() : ""));
-                    TextComponent name = rawName == null ? null : TextCodecs_v1_20_3.TEXT.deserialize(converter.fork(JsonConverter_v1_20_3.INSTANCE), rawName).getOrThrow(JsonParseException::new);
-                    Identifier type = Identifier.of((tag.get("type") instanceof StringTag ? ((StringTag) tag.get("type")).getValue() : ""));
-                    if (!isValid(converter, type, TextVerifier_v1_20_3.class, TextVerifier_v1_20_3::verifyRegistryEntity)) {
-                        return Result.error("Invalid entity: " + type);
-                    }
-                    UUID uuid = UUID.fromString((tag.get("id") instanceof StringTag ? ((StringTag) tag.get("id")).getValue() : ""));
-                    return Result.success(new EntityHoverEvent(type, uuid, name));
-                } catch (Throwable t) {
-                    return Result.error(t);
-                }
+                return getEntityHoverEventResult(converter, component, TextCodecs_v1_20_3.TEXT, JsonConverter_v1_20_3.INSTANCE);
             });
         }
     }
 
+    public static Result<EntityHoverEvent> getEntityHoverEventResult(DataConverter<?> converter, TextComponent component, Codec<TextComponent> textCodec, JsonConverter_v1_20_3 jsonConverter) {
+        {
+            try {
+                converter = converter.forkIfDefault();
+                CompoundTag tag = SNbt.V1_14.deserialize(component.asUnformattedString(converter));
+                JsonElement rawName = JsonParser.parseString((tag.get("name") instanceof StringTag ? ((StringTag) tag.get("name")).getValue() : ""));
+                TextComponent name = rawName == null ? null : textCodec.deserialize(converter.fork(jsonConverter), rawName).getOrThrow(JsonParseException::new);
+                Identifier type = Identifier.of((tag.get("type") instanceof StringTag ? ((StringTag) tag.get("type")).getValue() : ""));
+                //if (!isValid(converter, type, TextVerifier_v1_20_3.class, TextVerifier_v1_20_3::verifyRegistryEntity)) {
+                //    return Result.error("Invalid entity: " + type);
+                //}
+                UUID uuid = UUID.fromString((tag.get("id") instanceof StringTag ? ((StringTag) tag.get("id")).getValue() : ""));
+                return Result.success(new EntityHoverEvent(type, uuid, name));
+            } catch (Throwable t) {
+                return Result.error(t);
+            }
+        }
+    }
+
 }
diff --git a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_20_5/StyleCodecs_v1_20_5.java b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_20_5/StyleCodecs_v1_20_5.java
index 3ffbd46..cf83b49 100644
--- a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_20_5/StyleCodecs_v1_20_5.java
+++ b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_20_5/StyleCodecs_v1_20_5.java
@@ -178,19 +178,7 @@ public class StyleCodecs_v1_20_5 {
                     EntityHoverEvent.ModernHolder::new
             ).mapCodec("contents").required().map(EntityHoverEvent::asModern, EntityHoverEvent::new);
             public static final MapCodec<EntityHoverEvent> LEGACY_MAP_CODEC = createLegacy((converter, component) -> {
-                try {
-                    CompoundTag tag = SNbt.V1_14.deserialize(component.asUnformattedString());
-                    JsonElement rawName = JsonParser.parseString((tag.get("name") instanceof StringTag ? ((StringTag) tag.get("name")).getValue() : ""));
-                    TextComponent name = rawName == null ? null : TextCodecs_v1_20_5.TEXT.deserialize(converter.fork(JsonConverter_v1_20_5.INSTANCE), rawName).getOrThrow(JsonParseException::new);
-                    Identifier type = Identifier.of((tag.get("type") instanceof StringTag ? ((StringTag) tag.get("type")).getValue() : ""));
-                    if (!isValid(converter, type, TextVerifier_v1_20_5.class, TextVerifier_v1_20_5::verifyRegistryEntity)) {
-                        return Result.error("Invalid entity: " + type);
-                    }
-                    UUID uuid = UUID.fromString((tag.get("id") instanceof StringTag ? ((StringTag) tag.get("id")).getValue() : ""));
-                    return Result.success(new EntityHoverEvent(type, uuid, name));
-                } catch (Throwable t) {
-                    return Result.error(t);
-                }
+                return com.viaversion.viaversion.libs.mcstructs.text.serializer.v1_20_3.StyleCodecs_v1_20_3.getEntityHoverEventResult(converter, component, TextCodecs_v1_20_5.TEXT, JsonConverter_v1_20_5.INSTANCE);
             });
         }
     }
diff --git a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_21_2/StyleCodecs_v1_21_2.java b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_21_2/StyleCodecs_v1_21_2.java
index 9995ef8..d8b9df4 100644
--- a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_21_2/StyleCodecs_v1_21_2.java
+++ b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_21_2/StyleCodecs_v1_21_2.java
@@ -178,19 +178,7 @@ public class StyleCodecs_v1_21_2 {
                     EntityHoverEvent.ModernHolder::new
             ).mapCodec("contents").required().map(EntityHoverEvent::asModern, EntityHoverEvent::new);
             public static final MapCodec<EntityHoverEvent> LEGACY_MAP_CODEC = createLegacy((converter, component) -> {
-                try {
-                    CompoundTag tag = SNbt.V1_14.deserialize(component.asUnformattedString());
-                    JsonElement rawName = JsonParser.parseString((tag.get("name") instanceof StringTag ? ((StringTag) tag.get("name")).getValue() : ""));
-                    TextComponent name = rawName == null ? null : TextCodecs_v1_21_2.TEXT.deserialize(converter.fork(JsonConverter_v1_20_5.INSTANCE), rawName).getOrThrow(JsonParseException::new);
-                    Identifier type = Identifier.of((tag.get("type") instanceof StringTag ? ((StringTag) tag.get("type")).getValue() : ""));
-                    if (!isValid(converter, type, TextVerifier_v1_21_2.class, TextVerifier_v1_21_2::verifyRegistryEntity)) {
-                        return Result.error("Invalid entity: " + type);
-                    }
-                    UUID uuid = UUID.fromString((tag.get("id") instanceof StringTag ? ((StringTag) tag.get("id")).getValue() : ""));
-                    return Result.success(new EntityHoverEvent(type, uuid, name));
-                } catch (Throwable t) {
-                    return Result.error(t);
-                }
+                return com.viaversion.viaversion.libs.mcstructs.text.serializer.v1_20_3.StyleCodecs_v1_20_3.getEntityHoverEventResult(converter, component, TextCodecs_v1_21_2.TEXT, JsonConverter_v1_20_5.INSTANCE);
             });
         }
     }
diff --git a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_21_4/StyleCodecs_v1_21_4.java b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_21_4/StyleCodecs_v1_21_4.java
index b2df27d..2705ede 100644
--- a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_21_4/StyleCodecs_v1_21_4.java
+++ b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/v1_21_4/StyleCodecs_v1_21_4.java
@@ -179,19 +179,7 @@ public class StyleCodecs_v1_21_4 {
                     EntityHoverEvent.ModernHolder::new
             ).mapCodec("contents").required().map(EntityHoverEvent::asModern, EntityHoverEvent::new);
             public static final MapCodec<EntityHoverEvent> LEGACY_MAP_CODEC = createLegacy((converter, component) -> {
-                try {
-                    CompoundTag tag = SNbt.V1_14.deserialize(component.asUnformattedString());
-                    JsonElement rawName = JsonParser.parseString((tag.get("name") instanceof StringTag ? ((StringTag) tag.get("name")).getValue() : ""));
-                    TextComponent name = rawName == null ? null : TextCodecs_v1_21_4.TEXT.deserialize(converter.fork(JsonConverter_v1_20_5.INSTANCE), rawName).getOrThrow(JsonParseException::new);
-                    Identifier type = Identifier.of((tag.get("type") instanceof StringTag ? ((StringTag) tag.get("type")).getValue() : ""));
-                    if (!isValid(converter, type, TextVerifier_v1_21_4.class, TextVerifier_v1_21_4::verifyRegistryEntity)) {
-                        return Result.error("Invalid entity: " + type);
-                    }
-                    UUID uuid = UUID.fromString((tag.get("id") instanceof StringTag ? ((StringTag) tag.get("id")).getValue() : ""));
-                    return Result.success(new EntityHoverEvent(type, uuid, name));
-                } catch (Throwable t) {
-                    return Result.error(t);
-                }
+                return com.viaversion.viaversion.libs.mcstructs.text.serializer.v1_20_3.StyleCodecs_v1_20_3.getEntityHoverEventResult(converter, component, TextCodecs_v1_21_4.TEXT, JsonConverter_v1_20_5.INSTANCE);
             });
         }
     }
diff --git a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/stringformat/StringFormat.java b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/stringformat/StringFormat.java
index 3daa58d..9e49a18 100644
--- a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/stringformat/StringFormat.java
+++ b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/stringformat/StringFormat.java
@@ -197,6 +197,7 @@ public abstract class StringFormat {
         return TextComponent.of(components);
     }
 
+    private static final IllegalArgumentException EX = new IllegalArgumentException("Too long");
     /**
      * Convert a {@link TextComponent} to a string.<br>
      * The unknown handling is used to determine what should happen if an unsupported formatting is encountered.<br>
@@ -230,11 +231,17 @@ public abstract class StringFormat {
         Style lastStyle = null;
         List<TextComponent> texts = new ArrayList<>();
         texts.add(component.copy().mergeSiblingParentStyle());
+        int wow = 1;
         while (!texts.isEmpty()) {
             TextComponent current = texts.remove(0);
             if (current instanceof TranslationComponent) {
                 TranslationComponent translation = (TranslationComponent) current;
-                texts.add(0, translation.resolveIntoComponents().mergeSiblingParentStyle());
+                final TextComponent resolved = translation.resolveIntoComponents();
+                wow += resolved.getSiblings().size();
+                if (wow > 32) {
+                    throw EX;
+                }
+                texts.add(0, resolved.mergeSiblingParentStyle());
                 for (int i = 0; i < translation.getSiblings().size(); i++) {
                     texts.add(i + 1, translation.getSiblings().get(i));
                 }
diff --git a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/utils/JsonNbtConverter.java b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/utils/JsonNbtConverter.java
index 121af7f..db5db2c 100644
--- a/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/utils/JsonNbtConverter.java
+++ b/MCStructs-text/src/main/java/com/viaversion/viaversion/libs/mcstructs/text/utils/JsonNbtConverter.java
@@ -25,23 +25,15 @@ public class JsonNbtConverter {
     @Nullable
     public static JsonElement toJson(@Nullable final Tag tag) {
         if (tag == null) return null;
-        switch (tag) {
-            case END:
-                return null;
-            case BYTE:
-            case SHORT:
-            case INT:
-            case LONG:
-            case FLOAT:
-            case DOUBLE:
+        if (tag instanceof NumberTag) {
                 return new JsonPrimitive(((NumberTag) tag).getValue());
-            case BYTE_ARRAY:
+        } else if (tag instanceof ByteArrayTag) {
                 JsonArray byteArray = new JsonArray();
                 for (byte b : ((ByteArrayTag) tag).getValue()) byteArray.add(b);
                 return byteArray;
-            case STRING:
+        } else if (tag instanceof StringTag) {
                 return new JsonPrimitive(((StringTag) tag).getValue());
-            case LIST:
+        } else if (tag instanceof ListTag<?>) {
                 JsonArray list = new JsonArray();
                 ListTag<Tag> listTag = ((ListTag) tag);
                 for (Tag tagInList : listTag.getValue()) {
@@ -55,19 +47,19 @@ public class JsonNbtConverter {
                     list.add(toJson(tagInList));
                 }
                 return list;
-            case COMPOUND:
+        } else if (tag instanceof CompoundTag) {
                 JsonObject compound = new JsonObject();
-                for (Map.Entry<String, Tag> entry : ((CompoundTag) tag).getValue().entrySet()) compound.put(entry.getKey(), toJson(entry.getValue()));
+                for (Map.Entry<String, Tag> entry : ((CompoundTag) tag).getValue().entrySet()) compound.add(entry.getKey(), toJson(entry.getValue()));
                 return compound;
-            case INT_ARRAY:
+        } else if (tag instanceof IntArrayTag) {
                 JsonArray intArray = new JsonArray();
                 for (int i : ((IntArrayTag) tag).getValue()) intArray.add(i);
                 return intArray;
-            case LONG_ARRAY:
+        } else if (tag instanceof LongArrayTag) {
                 JsonArray longArray = new JsonArray();
                 for (long l : ((LongArrayTag) tag).getValue()) longArray.add(l);
                 return longArray;
-            default:
+        } else {
                 throw new IllegalArgumentException("Unknown Nbt type: " + tag);
         }
     }
@@ -97,24 +89,28 @@ public class JsonNbtConverter {
             }
             if (listType == null) {
                 return new ListTag<>();
-            } else if (listType == Tag.END) { //Mixed list
+            } else if (listType instanceof MixedListTag) { //Mixed list
                 ListTag<CompoundTag> list = new ListTag<>();
                 for (Tag tag : nbtTags) {
                     if (tag instanceof CompoundTag) list.add(((CompoundTag) tag));
-                    else list.add(new CompoundTag().put("", tag));
+                    else {
+                        CompoundTag compoundTag = new CompoundTag();
+                        compoundTag.put("", tag);
+                        list.add(compoundTag);
+                    }
                 }
                 return list;
-            } else if (listType == Tag.BYTE) {
+            } else if (listType instanceof ByteTag) {
                 byte[] bytes = new byte[nbtTags.size()];
-                for (int i = 0; i < nbtTags.size(); i++) bytes[i] = nbtTags.get(i).asByteTag().asByte();
+                for (int i = 0; i < nbtTags.size(); i++) bytes[i] = ((NumberTag) nbtTags.get(i)).asByte();
                 return new ByteArrayTag(bytes);
-            } else if (listType == Tag.INT) {
+            } else if (listType instanceof IntTag) {
                 int[] ints = new int[nbtTags.size()];
-                for (int i = 0; i < nbtTags.size(); i++) ints[i] = nbtTags.get(i).asIntTag().asInt();
+                for (int i = 0; i < nbtTags.size(); i++) ints[i] = ((NumberTag) nbtTags.get(i)).asInt();
                 return new IntArrayTag(ints);
-            } else if (listType == Tag.LONG) {
+            } else if (listType instanceof LongTag) {
                 long[] longs = new long[nbtTags.size()];
-                for (int i = 0; i < nbtTags.size(); i++) longs[i] = nbtTags.get(i).asIntTag().asInt();
+                for (int i = 0; i < nbtTags.size(); i++) longs[i] = ((NumberTag) nbtTags.get(i)).asLong();
                 return new LongArrayTag(longs);
             } else {
                 return new ListTag<>(nbtTags);
@@ -148,7 +144,7 @@ public class JsonNbtConverter {
 
     private static Tag getListType(final Tag current, final Tag tag) {
         if (current == null) return tag;
-        if (current != tag) return Tag.END; //Placeholder for mixed lists
+        if (current != tag) return new MixedListTag(); //Placeholder for mixed lists
         return current;
     }
 
diff --git a/MCStructs-text/src/test/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/TextComponentCodecTest.java b/MCStructs-text/src/test/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/TextComponentCodecTest.java
index fd5b024..d1ae744 100644
--- a/MCStructs-text/src/test/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/TextComponentCodecTest.java
+++ b/MCStructs-text/src/test/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/TextComponentCodecTest.java
@@ -52,10 +52,18 @@ class TextComponentCodecTest {
             .append(new NbtComponent("raw", true, new StringComponent("separator"), new EntityNbtSource("selector")))
             .append(new NbtComponent("raw", true, new StringComponent("separator"), new StorageNbtSource(Identifier.of("namespace", "id"))))
             .append(new StringComponent("hover text").setStyle(new Style().setHoverEvent(new TextHoverEvent(new StringComponent("text")))))
-            .append(new StringComponent("hover item").setStyle(new Style().setHoverEvent(new ItemHoverEvent(Identifier.of("stone"), 64, new CompoundTag().put("display", new CompoundTag().putString("Name", "name"))))))
+            .append(new StringComponent("hover item").setStyle(new Style().setHoverEvent(new ItemHoverEvent(Identifier.of("stone"), 64, buildDisplayName()))))
             .append(new StringComponent("hover entity").setStyle(new Style().setHoverEvent(new EntityHoverEvent(Identifier.of("player"), UUID.randomUUID(), new StringComponent("name")))))
             .append(new StringComponent("style").setStyle(new Style().setFormatting(TextFormatting.ALL.values().toArray(new TextFormatting[0])).setClickEvent(ClickEvent.openUrl(URI.create("https://example.com"))).setFont(Identifier.of("font")).setInsertion("insertion")));
 
+    private CompoundTag buildDisplayName() {
+        CompoundTag tag = new CompoundTag();
+        CompoundTag display = new CompoundTag();
+        display.putString("Name", "name");
+        tag.put("display", display);
+        return tag;
+    }
+
     @ParameterizedTest
     @FieldSource("codecs")
     void serializeDeserializeJson(final TextComponentCodec codec) {
@@ -75,9 +83,9 @@ class TextComponentCodecTest {
     @ParameterizedTest
     @FieldSource("legacyCodecs")
     void legacyItemDeserialization(final TextComponentCodec codec) throws SNbtSerializeException {
-        CompoundTag legacyNbt = new CompoundTag()
-                .put("id", "stone")
-                .putByte("Count", (byte) 5);
+    CompoundTag legacyNbt = new CompoundTag();
+    legacyNbt.put("id", new StringTag("stone"));
+    legacyNbt.putByte("Count", (byte) 5);
         TextComponent legacyComponent = new StringComponent("test")
                 .setStyle(new Style()
                         .setHoverEvent(new ItemHoverEvent(SNbt.LATEST.serialize(legacyNbt)))
@@ -95,10 +103,10 @@ class TextComponentCodecTest {
     @FieldSource("legacyCodecs")
     void legacyEntityDeserialization(final TextComponentCodec codec) throws SNbtSerializeException {
         UUID randomUUID = UUID.randomUUID();
-        CompoundTag legacyNbt = new CompoundTag()
-                .put("name", "{\"text\":\"test\"}")
-                .put("type", "cow")
-                .put("id", randomUUID.toString());
+        CompoundTag legacyNbt = new CompoundTag();
+        legacyNbt.put("name", new StringTag("{\"text\":\"test\"}"));
+        legacyNbt.put("type", new StringTag("cow"));
+        legacyNbt.put("id", new StringTag(randomUUID.toString()));
         TextComponent legacyComponent = new StringComponent("test")
                 .setStyle(new Style()
                         .setHoverEvent(new EntityHoverEvent(new StringComponent(SNbt.LATEST.serialize(legacyNbt))))
@@ -116,19 +124,31 @@ class TextComponentCodecTest {
     @ParameterizedTest
     @FieldSource("codecs")
     void arrayWithTag(final TextComponentCodec codec) {
-        ListTag<Tag> tags = new ListTag<>()
-                .add(new CompoundTag()
-                        .putString("translate", "test")
-                        .addByteArray("with", (byte) 1, (byte) 2, (byte) 3))
-                .add(new CompoundTag()
-                        .putString("translate", "test")
-                        .addIntArray("with", 1, 2, 3))
-                .add(new CompoundTag()
-                        .putString("translate", "test")
-                        .addLongArray("with", 1, 2, 3))
-                .add(new CompoundTag()
-                        .putString("translate", "test")
-                        .addList("with", 1, 2, 3));
+        CompoundTag translateWithByteArray = new CompoundTag();
+        translateWithByteArray.putString("translate", "test");
+        translateWithByteArray.put("with", new ByteArrayTag(new byte[]{1, 2, 3}));
+
+        CompoundTag translateWithIntArray = new CompoundTag();
+        translateWithIntArray.putString("translate", "test");
+        translateWithIntArray.put("with", new IntArrayTag(new int[]{1, 2, 3}));
+
+        CompoundTag translateWithLongArray = new CompoundTag();
+        translateWithLongArray.putString("translate", "test");
+        translateWithLongArray.put("with", new LongArrayTag(new long[]{1, 2, 3}));
+
+        CompoundTag translateWithList = new CompoundTag();
+        ListTag<IntTag> numberList = new ListTag<>(IntTag.class);
+        numberList.add(new IntTag(1));
+        numberList.add(new IntTag(2));
+        numberList.add(new IntTag(3));
+        translateWithList.putString("translate", "test");
+        translateWithList.put("with", numberList);
+
+        ListTag<CompoundTag> tags = new ListTag<>(CompoundTag.class);
+        tags.add(translateWithByteArray);
+        tags.add(translateWithIntArray);
+        tags.add(translateWithLongArray);
+        tags.add(translateWithList);
         TextComponent component = new TranslationComponent("test", (byte) 1, (byte) 2, (byte) 3)
                 .append(new TranslationComponent("test", 1, 2, 3))
                 .append(new TranslationComponent("test", 1L, 2L, 3L))
diff --git a/MCStructs-text/src/test/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/events/TextComponentLegacyEventsTest.java b/MCStructs-text/src/test/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/events/TextComponentLegacyEventsTest.java
index dea74a4..275fc92 100644
--- a/MCStructs-text/src/test/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/events/TextComponentLegacyEventsTest.java
+++ b/MCStructs-text/src/test/java/com/viaversion/viaversion/libs/mcstructs/text/serializer/events/TextComponentLegacyEventsTest.java
@@ -76,8 +76,12 @@ public abstract class TextComponentLegacyEventsTest {
             "{\"hoverEvent\":{\"action\":\"show_item\",\"value\":\"test\"},\"text\":\"\"}",
             HoverEventAction.SHOW_ENTITY.isUserDefinable()
     );
+    private static final CompoundTag TAG = new CompoundTag();
+    static {
+        TAG.putString("test", "test");
+    }
     protected static final TestComponent HOVER_ITEM = new TestComponent(
-            withHoverEvent(new ItemHoverEvent(Identifier.of("test"), 1, new CompoundTag().putString("test", "test"))),
+            withHoverEvent(new ItemHoverEvent(Identifier.of("test"), 1, TAG)),
             "{\"hoverEvent\":{\"action\":\"show_item\",\"contents\":{\"id\":\"minecraft:test\",\"tag\":\"{test:\\\"test\\\"}\"}},\"text\":\"\"}",
             HoverEventAction.SHOW_ITEM.isUserDefinable()
     );
diff --git a/buildSrc/src/main/groovy/base.java.gradle b/buildSrc/src/main/groovy/base.java.gradle
index 59279b6..fd3ffae 100644
--- a/buildSrc/src/main/groovy/base.java.gradle
+++ b/buildSrc/src/main/groovy/base.java.gradle
@@ -8,6 +8,7 @@ base {
 
 repositories {
     mavenCentral()
+    maven {url = "https://repo.viaversion.com/" }
 }
 
 jar {
diff --git a/buildSrc/src/main/groovy/project.defaults.gradle b/buildSrc/src/main/groovy/project.defaults.gradle
index 08a9462..6a85f8a 100644
--- a/buildSrc/src/main/groovy/project.defaults.gradle
+++ b/buildSrc/src/main/groovy/project.defaults.gradle
@@ -1,10 +1,9 @@
 plugins {
     id "java-library"
     id "base.java"
-    id "base.checkstyle"
     id "base.junit"
     id "base.maven_publish"
-    id "publishing.aggregating_publisher"
+    id "publishing.via"
 }
 
 dependencies {
diff --git a/buildSrc/src/main/groovy/publishing.via.gradle b/buildSrc/src/main/groovy/publishing.via.gradle
new file mode 100644
index 0000000..0b95355
--- /dev/null
+++ b/buildSrc/src/main/groovy/publishing.via.gradle
@@ -0,0 +1,16 @@
+publishing {
+    repositories {
+        maven {
+            name = "Via"
+            url = uri("https://repo.viaversion.com/")
+
+            credentials {
+                username = System.getenv("via_username")
+                password = System.getenv("via_password")
+            }
+            authentication {
+                create(BasicAuthentication)
+            }
+        }
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index 02405d0..da5cead 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,13 +11,10 @@ plugins {
 
 rootProject.name = "MCStructs"
 
-include(":MCStructs-all")
 include(":MCStructs-converter")
 include(":MCStructs-core")
-include(":MCStructs-data")
 include(":MCStructs-dialog")
 include(":MCStructs-itemcomponents")
-include(":MCStructs-nbt")
 include(":MCStructs-registry")
 include(":MCStructs-snbt")
 include(":MCStructs-text")