Update MCStructs to 3.0.0

FlorianMichael · RaphiMC · FlorianMichael · commit c5f342746ba6 · 2025-03-29T15:06:10.000+01:00
Co-authored-by: RaphiMC &lt;50594595+raphimc@users.noreply.github.com&gt;
diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "com.viaversion:viaversion-common:5.3.0"
+    compileOnly "com.viaversion:viaversion-common:5.3.1-SNAPSHOT"
     compileOnly "com.google.guava:guava:33.4.6-jre"
     compileOnly "io.netty:netty-handler:4.1.119.Final"
 }
diff --git a/src/main/java/net/raphimc/vialegacy/protocol/release/r1_6_4tor1_7_2_5/rewriter/TextRewriter.java b/src/main/java/net/raphimc/vialegacy/protocol/release/r1_6_4tor1_7_2_5/rewriter/TextRewriter.java
@@ -20,7 +20,7 @@
 
 import com.viaversion.viaversion.libs.fastutil.objects.Object2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.objects.Object2ObjectOpenHashMap;
-import com.viaversion.viaversion.libs.mcstructs.text.ATextComponent;
+import com.viaversion.viaversion.libs.mcstructs.text.TextComponent;
 import com.viaversion.viaversion.libs.mcstructs.text.components.StringComponent;
 import com.viaversion.viaversion.libs.mcstructs.text.components.TranslationComponent;
 import com.viaversion.viaversion.libs.mcstructs.text.serializer.LegacyStringDeserializer;
@@ -72,7 +72,7 @@ public class TextRewriter {
     }
 
     public static String toClient(final String text) {
-        ATextComponent component = TextComponentSerializer.V1_6.deserialize(text);
+        TextComponent component = TextComponentSerializer.V1_6.deserialize(text);
         // Replace translation keys with their actual translations
         TextUtils.iterateAll(component, c -> {
             if (c instanceof TranslationComponent translationComponent) {
@@ -94,7 +94,7 @@ public static String toClient(final String text) {
             if (c instanceof TranslationComponent translationComponent) {
                 final Object[] args = translationComponent.getArgs();
                 for (int i = 0; i < args.length; i++) {
-                    if (args[i] != null && !(args[i] instanceof ATextComponent)) {
+                    if (args[i] != null && !(args[i] instanceof TextComponent)) {
                         args[i] = new StringComponent(args[i].toString());
                     }
                 }
diff --git a/src/main/java/net/raphimc/vialegacy/protocol/release/r1_7_2_5tor1_7_6_10/rewriter/TextRewriter.java b/src/main/java/net/raphimc/vialegacy/protocol/release/r1_7_2_5tor1_7_6_10/rewriter/TextRewriter.java
@@ -19,7 +19,7 @@
 
 import com.viaversion.viaversion.libs.fastutil.objects.Object2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.objects.Object2ObjectOpenHashMap;
-import com.viaversion.viaversion.libs.mcstructs.text.ATextComponent;
+import com.viaversion.viaversion.libs.mcstructs.text.TextComponent;
 import com.viaversion.viaversion.libs.mcstructs.text.components.TranslationComponent;
 import com.viaversion.viaversion.libs.mcstructs.text.serializer.TextComponentSerializer;
 import com.viaversion.viaversion.libs.mcstructs.text.utils.TextUtils;
@@ -118,7 +118,7 @@ public class TextRewriter {
     }
 
     public static String toClient(final String text) {
-        final ATextComponent component = TextComponentSerializer.V1_7.deserialize(text);
+        final TextComponent component = TextComponentSerializer.V1_7.deserialize(text);
         // Replace translation keys with their actual translations
         TextUtils.iterateAll(component, c -> {
             if (c instanceof TranslationComponent translationComponent) {
diff --git a/src/main/java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/rewriter/ItemRewriter.java b/src/main/java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/rewriter/ItemRewriter.java
@@ -24,7 +24,7 @@
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.libs.mcstructs.text.ATextComponent;
+import com.viaversion.viaversion.libs.mcstructs.text.TextComponent;
 import com.viaversion.viaversion.libs.mcstructs.text.components.StringComponent;
 import com.viaversion.viaversion.libs.mcstructs.text.serializer.TextComponentSerializer;
 import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_8;
@@ -134,7 +134,7 @@ public Item handleItemToServer(final UserConnection user, final Item item) {
 
             for (int i = 0; i < pages.size(); i++) {
                 final String text = pages.get(i).getValue();
-                final ATextComponent textComponent = TextComponentSerializer.V1_8.deserialize(text);
+                final TextComponent textComponent = TextComponentSerializer.V1_8.deserialize(text);
                 if (textComponent instanceof StringComponent stringComponent) {
                     pages.set(i, new StringTag(stringComponent.getText()));
                 } else {
diff --git a/src/main/java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/rewriter/TextRewriter.java b/src/main/java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/rewriter/TextRewriter.java
@@ -27,12 +27,10 @@
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
 import com.viaversion.viaversion.libs.fastutil.objects.Object2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.objects.Object2ObjectOpenHashMap;
-import com.viaversion.viaversion.libs.mcstructs.snbt.SNbtSerializer;
-import com.viaversion.viaversion.libs.mcstructs.text.ATextComponent;
-import com.viaversion.viaversion.libs.mcstructs.text.components.StringComponent;
+import com.viaversion.viaversion.libs.mcstructs.snbt.SNbt;
+import com.viaversion.viaversion.libs.mcstructs.text.TextComponent;
 import com.viaversion.viaversion.libs.mcstructs.text.components.TranslationComponent;
-import com.viaversion.viaversion.libs.mcstructs.text.events.hover.HoverEventAction;
-import com.viaversion.viaversion.libs.mcstructs.text.events.hover.impl.TextHoverEvent;
+import com.viaversion.viaversion.libs.mcstructs.text.events.hover.impl.ItemHoverEvent;
 import com.viaversion.viaversion.libs.mcstructs.text.serializer.TextComponentSerializer;
 import com.viaversion.viaversion.libs.mcstructs.text.utils.TextUtils;
 import com.viaversion.viaversion.util.Key;
@@ -430,7 +428,7 @@ public TextRewriter(final Protocol<?, ?, ?, ?> protocol) {
     }
 
     public String toClient(final UserConnection user, final String text) {
-        final ATextComponent component = TextComponentSerializer.V1_7.deserialize(text);
+        final TextComponent component = TextComponentSerializer.V1_7.deserialize(text);
         // Replace translation keys with their actual translations
         TextUtils.iterateAll(component, c -> {
             if (c instanceof TranslationComponent translationComponent) {
@@ -441,38 +439,36 @@ public String toClient(final UserConnection user, final String text) {
         });
         // Translate item hover events
         TextUtils.iterateAll(component, c -> {
-            if (c.getStyle().getHoverEvent() instanceof TextHoverEvent textHoverEvent) {
-                if (textHoverEvent.getAction().equals(HoverEventAction.SHOW_ITEM)) {
-                    try {
-                        final CompoundTag tag = (CompoundTag) SNbtSerializer.V1_7.deserialize(textHoverEvent.getText().asUnformattedString());
-                        final short id = tag.getShort("id");
-                        final short damage = tag.getShort("Damage");
-                        final CompoundTag itemTag = tag.getCompoundTag("tag");
+            if (c.getStyle().getHoverEvent() instanceof ItemHoverEvent itemHoverEvent && itemHoverEvent.getData() instanceof ItemHoverEvent.LegacyHolder legacyHolder) {
+                try {
+                    final CompoundTag tag = (CompoundTag) SNbt.V1_7.deserialize(legacyHolder.getData());
+                    final short id = tag.getShort("id");
+                    final short damage = tag.getShort("Damage");
+                    final CompoundTag itemTag = tag.getCompoundTag("tag");
 
-                        Item item = new DataItem();
-                        item.setIdentifier(id);
-                        item.setData(damage);
-                        item.setTag(itemTag);
-                        item = this.protocol.getItemRewriter().handleItemToClient(user, item);
+                    Item item = new DataItem();
+                    item.setIdentifier(id);
+                    item.setData(damage);
+                    item.setTag(itemTag);
+                    item = this.protocol.getItemRewriter().handleItemToClient(user, item);
 
-                        if (!ID_TO_NAME.containsKey(item.identifier())) {
-                            throw new IllegalArgumentException("Invalid item ID: " + item.identifier());
-                        }
-                        tag.putString("id", Key.namespaced(ID_TO_NAME.get(item.identifier())));
-                        if (damage != item.data()) {
-                            tag.putShort("Damage", item.data());
-                        }
-                        if (item.tag() != itemTag) {
-                            tag.put("tag", item.tag());
-                        }
+                    if (!ID_TO_NAME.containsKey(item.identifier())) {
+                        throw new IllegalArgumentException("Invalid item ID: " + item.identifier());
+                    }
+                    tag.putString("id", Key.namespaced(ID_TO_NAME.get(item.identifier())));
+                    if (damage != item.data()) {
+                        tag.putShort("Damage", item.data());
+                    }
+                    if (item.tag() != itemTag) {
+                        tag.put("tag", item.tag());
+                    }
 
-                        c.getStyle().setHoverEvent(new TextHoverEvent(textHoverEvent.getAction(), new StringComponent(SNbtSerializer.V1_8.serialize(tag))));
-                    } catch (Throwable e) {
-                        if (!Via.getConfig().isSuppressConversionWarnings()) {
-                            ViaLegacy.getPlatform().getLogger().log(Level.WARNING, "Error remapping NBT in show_item:" + textHoverEvent.getText().asUnformattedString(), e);
-                        }
-                        c.getStyle().setHoverEvent(new TextHoverEvent(textHoverEvent.getAction(), new StringComponent())); // Invalid item
+                    legacyHolder.setData(SNbt.V1_8.serialize(tag));
+                } catch (Throwable e) {
+                    if (!Via.getConfig().isSuppressConversionWarnings()) {
+                        ViaLegacy.getPlatform().getLogger().log(Level.WARNING, "Error remapping NBT in show_item:" + legacyHolder.getData(), e);
                     }
+                    legacyHolder.setData("");
                 }
             }
         });

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ repositories {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`dependencies {`
`26`		`- compileOnly "com.viaversion:viaversion-common:5.3.0"`
	`26`	`+ compileOnly "com.viaversion:viaversion-common:5.3.1-SNAPSHOT"`
`27`	`27`	`compileOnly "com.google.guava:guava:33.4.6-jre"`
`28`	`28`	`compileOnly "io.netty:netty-handler:4.1.119.Final"`
`29`	`29`	`}`