From dc6d58112373fa1c668bf36bdf283378401e351c Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Sun, 21 Apr 2024 12:13:59 +0200
Subject: [PATCH] Update mcstructs and use new component serializer

---
 .../rewriter/ComponentRewriter1_20_5.java                     | 4 ++--
 .../java/com/viaversion/viaversion/util/ComponentUtil.java    | 4 ++--
 .../com/viaversion/viaversion/util/SerializerVersion.java     | 3 ++-
 gradle/libs.versions.toml                                     | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java
index 731e2f68e..99a99e5d8 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java
@@ -370,7 +370,7 @@ public class ComponentRewriter1_20_5 extends ComponentRewriter<ClientboundPacket
                 predicateTag.put("state", state);
             }
             if (predicate.tag() != null) {
-                predicateTag.putString("nbt", SerializerVersion.V1_20_3.toSNBT(predicate.tag()));
+                predicateTag.putString("nbt", serializerVersion().toSNBT(predicate.tag()));
             }
 
             predicates.add(predicateTag);
@@ -1045,7 +1045,7 @@ public class ComponentRewriter1_20_5 extends ComponentRewriter<ClientboundPacket
     }
 
     public SerializerVersion serializerVersion() {
-        return SerializerVersion.V1_20_3;
+        return SerializerVersion.V1_20_5;
     }
 
     @FunctionalInterface
diff --git a/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java b/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java
index 0f74d3f4b..947005974 100644
--- a/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java
+++ b/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java
@@ -94,7 +94,7 @@ public final class ComponentUtil {
 
     public static @Nullable String tagToJsonString(@Nullable final Tag tag) {
         try {
-            final ATextComponent component = SerializerVersion.V1_20_3.toComponent(tag);
+            final ATextComponent component = SerializerVersion.V1_20_5.toComponent(tag);
             return component != null ? SerializerVersion.V1_20_3.toString(component) : null;
         } catch (final Exception e) {
             Via.getPlatform().getLogger().log(Level.SEVERE, "Error converting tag: " + tag, e);
@@ -109,7 +109,7 @@ public final class ComponentUtil {
 
         try {
             final ATextComponent component = TextComponentSerializer.V1_20_3.deserialize(json);
-            return SerializerVersion.V1_20_3.toTag(component);
+            return SerializerVersion.V1_20_5.toTag(component);
         } catch (final Exception e) {
             Via.getPlatform().getLogger().log(Level.SEVERE, "Error converting component: " + json, e);
             return new StringTag("<error>");
diff --git a/common/src/main/java/com/viaversion/viaversion/util/SerializerVersion.java b/common/src/main/java/com/viaversion/viaversion/util/SerializerVersion.java
index ae76835a5..0e71683cf 100644
--- a/common/src/main/java/com/viaversion/viaversion/util/SerializerVersion.java
+++ b/common/src/main/java/com/viaversion/viaversion/util/SerializerVersion.java
@@ -39,7 +39,8 @@ public enum SerializerVersion {
     V1_17(TextComponentSerializer.V1_17, SNbtSerializer.V1_14),
     V1_18(TextComponentSerializer.V1_18, SNbtSerializer.V1_14),
     V1_19_4(TextComponentSerializer.V1_19_4, SNbtSerializer.V1_14),
-    V1_20_3(TextComponentCodec.V1_20_3, SNbtSerializer.V1_14);
+    V1_20_3(TextComponentCodec.V1_20_3, SNbtSerializer.V1_14),
+    V1_20_5(TextComponentCodec.V1_20_5, SNbtSerializer.V1_14);
 
     final TextComponentSerializer jsonSerializer;
     final SNbtSerializer<? extends Tag> snbtSerializer;
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 171fdf6f8..c45418a77 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ metadata.format.version = "1.1"
 gson = "2.10.1"
 fastutil = "8.5.12"
 vianbt = "4.4.3"
-mcstructs = "2.4.2"
+mcstructs = "2.5.0-SNAPSHOT"
 
 # Common provided
 netty = "4.0.20.Final"