Update for 1.21.6 (#3211)

* Initial changes for 1.21.6

* update data version

* update dev bundle

* update mappings

* converters

* 1.21.5 dev bundle annoyances

* apply sign component fix

* dev bundle update

Author: SirYwell

build.gradle.kts

@@ -83,7 +83,7 @@ allprojects {
 }
 
 applyCommonConfiguration()
-val supportedVersions = listOf("1.20.4", "1.20.5", "1.20.6", "1.21", "1.21.1", "1.21.4", "1.21.5")
+val supportedVersions = listOf("1.20.4", "1.20.5", "1.20.6", "1.21", "1.21.1", "1.21.4", "1.21.5", "1.21.6")
 
 tasks {
     supportedVersions.forEach {

settings.gradle.kts

@@ -2,7 +2,7 @@ rootProject.name = "FastAsyncWorldEdit"
 
 include("worldedit-libs")
 
-listOf("1_20_2", "1_20_4", "1_20_5", "1_21", "1_21_4", "1_21_5").forEach {
+listOf("1_20_2", "1_20_4", "1_20_5", "1_21", "1_21_4", "1_21_5", "1_21_6").forEach {
     include("worldedit-bukkit:adapters:adapter-$it")
 }
 

worldedit-bukkit/adapters/adapter-1_21_5/build.gradle.kts

@@ -12,6 +12,6 @@ repositories {
 
 dependencies {
     // https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
-    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.5-R0.1-20250529.121722-99")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.5-R0.1-20250618.110345-108")
     compileOnly(libs.paperlib)
 }

worldedit-bukkit/adapters/adapter-1_21_6/build.gradle.kts

@@ -0,0 +1,17 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
+plugins {
+    java
+}
+
+applyPaperweightAdapterConfiguration()
+
+repositories {
+    gradlePluginPortal()
+}
+
+dependencies {
+    // https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.6-R0.1-20250621.050219-23")
+    compileOnly(libs.paperlib)
+}

worldedit-bukkit/adapters/adapter-1_21_6/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_6/ComponentConverter.java

@@ -0,0 +1,77 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.bukkit.adapter.ext.fawe.v1_21_6;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonParser;
+import com.google.gson.Strictness;
+import com.google.gson.stream.JsonReader;
+import com.mojang.serialization.JsonOps;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ComponentSerialization;
+import net.minecraft.network.chat.MutableComponent;
+
+import java.io.StringReader;
+import javax.annotation.Nullable;
+
+public class ComponentConverter {
+
+    public static class Serializer {
+        private static final Gson GSON = (new GsonBuilder()).disableHtmlEscaping().create();
+
+        private Serializer() {
+        }
+
+        static MutableComponent deserialize(JsonElement json, HolderLookup.Provider registries) {
+            return (MutableComponent) ComponentSerialization.CODEC.parse(registries.createSerializationContext(JsonOps.INSTANCE), json).getOrThrow(JsonParseException::new);
+        }
+
+        static JsonElement serialize(Component text, HolderLookup.Provider registries) {
+            return ComponentSerialization.CODEC.encodeStart(registries.createSerializationContext(JsonOps.INSTANCE), text).getOrThrow(JsonParseException::new);
+        }
+
+        public static String toJson(Component text, HolderLookup.Provider registries) {
+            return GSON.toJson(serialize(text, registries));
+        }
+
+        @Nullable
+        public static MutableComponent fromJson(String json, HolderLookup.Provider registries) {
+            JsonElement jsonelement = JsonParser.parseString(json);
+            return jsonelement == null ? null : deserialize(jsonelement, registries);
+        }
+
+        @Nullable
+        public static MutableComponent fromJson(@Nullable JsonElement json, HolderLookup.Provider registries) {
+            return json == null ? null : deserialize(json, registries);
+        }
+
+        @Nullable
+        public static MutableComponent fromJsonLenient(String json, HolderLookup.Provider registries) {
+            JsonReader jsonreader = new JsonReader(new StringReader(json));
+            jsonreader.setStrictness(Strictness.LENIENT);
+            JsonElement jsonelement = JsonParser.parseReader(jsonreader);
+            return jsonelement == null ? null : deserialize(jsonelement, registries);
+        }
+    }
+}