Update MCStructs to 3.0.0 (#975)

Author: FlorianMichael

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/ComponentRewriter1_21_5.java

@@ -17,11 +17,6 @@
  */
 package com.viaversion.viabackwards.protocol.v1_21_5to1_21_4.rewriter;
 
-import static com.viaversion.viaversion.util.TagUtil.getNamespacedCompoundTag;
-import static com.viaversion.viaversion.util.TagUtil.getNamespacedCompoundTagList;
-import static com.viaversion.viaversion.util.TagUtil.getNamespacedNumberTag;
-import static com.viaversion.viaversion.util.TagUtil.removeNamespaced;
-
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.NumberTag;
@@ -38,6 +33,11 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import static com.viaversion.viaversion.util.TagUtil.getNamespacedCompoundTag;
+import static com.viaversion.viaversion.util.TagUtil.getNamespacedCompoundTagList;
+import static com.viaversion.viaversion.util.TagUtil.getNamespacedNumberTag;
+import static com.viaversion.viaversion.util.TagUtil.removeNamespaced;
+
 public final class ComponentRewriter1_21_5 extends NBTComponentRewriter<ClientboundPacket1_21_5> {
 
     public ComponentRewriter1_21_5(final BackwardsProtocol<ClientboundPacket1_21_5, ?, ?, ?> protocol) {
@@ -246,7 +246,7 @@ private void updateShowEntityHover(final CompoundTag hoverEventTag) {
 
     private String toUglyJson(final UserConnection connection, final Tag value) {
         processTag(connection, value);
-        return SerializerVersion.V1_21_4.toString(SerializerVersion.V1_21_4.toComponent(value));
+        return SerializerVersion.V1_21_4.toString(SerializerVersion.V1_21_5.toComponent(value));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java

@@ -42,7 +42,7 @@
 import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
 import com.viaversion.viaversion.api.type.types.version.Types1_21;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2IntMap;
-import com.viaversion.viaversion.libs.mcstructs.core.TextFormatting;
+import com.viaversion.viaversion.libs.mcstructs.text.TextFormatting;
 import com.viaversion.viaversion.libs.mcstructs.text.components.StringComponent;
 import com.viaversion.viaversion.libs.mcstructs.text.components.TranslationComponent;
 import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.rewriter.RecipeRewriter1_20_3;

common/src/main/java/com/viaversion/viabackwards/utils/ChatUtil.java

@@ -17,10 +17,12 @@
  */
 package com.viaversion.viabackwards.utils;
 
-import com.viaversion.viaversion.libs.mcstructs.text.ATextComponent;
 import com.viaversion.viaversion.libs.mcstructs.text.Style;
+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.LegacyStringDeserializer;
+import com.viaversion.viaversion.libs.mcstructs.text.stringformat.StringFormat;
+import com.viaversion.viaversion.libs.mcstructs.text.stringformat.handling.ColorHandling;
+import com.viaversion.viaversion.libs.mcstructs.text.stringformat.handling.DeserializerUnknownHandling;
 import com.viaversion.viaversion.util.SerializerVersion;
 import java.util.HashSet;
 import java.util.Objects;
@@ -43,8 +45,8 @@ public static String legacyToJsonString(String legacy, String translation, boole
         }, itemData);
     }
 
-    public static String legacyToJsonString(String legacy, Consumer<ATextComponent> consumer, boolean itemData) {
-        final ATextComponent component = LegacyStringDeserializer.parse(legacy, true);
+    public static String legacyToJsonString(String legacy, Consumer<TextComponent> consumer, boolean itemData) {
+        final TextComponent component = StringFormat.vanilla().fromString(legacy, ColorHandling.RESET, DeserializerUnknownHandling.WHITE);
         consumer.accept(component);
 
         if (itemData) {

gradle.properties

@@ -1,7 +1,7 @@
 projectVersion=5.3.1-SNAPSHOT
 
 # Smile emoji
-mcVersions=1.21.5,1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10
+mcVersions=1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10
 mcVersionRange=1.10-1.21.5
 velocityVersion=3.4
 

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ metadata.format.version = "1.1"
 [versions]
 
 # ViaVersion
-viaver = "5.3.0"
+viaver = "5.3.1-SNAPSHOT"
 
 # Common provided
 netty = "4.0.20.Final"