[Bukkit] 26.1.1

Author: me4502

gradle/libs.versions.toml

@@ -50,7 +50,7 @@ errorprone-annotations = { module = "com.google.errorprone:error_prone_annotatio
 # https://maven.fabricmc.net/net/fabricmc/sponge-mixin/
 fabric-mixin = "net.fabricmc:sponge-mixin:0.17.0+mixin.0.8.7"
 
-paperweight = "io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:2.0.0-beta.19"
+paperweight = "io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:2.0.0-beta.21"
 
 linBus-bom = "org.enginehub.lin-bus:lin-bus-bom:0.2.0"
 linBus-common.module = "org.enginehub.lin-bus:lin-bus-common"

settings.gradle.kts

@@ -83,7 +83,7 @@ includeBuild("build-logic")
 
 include("worldedit-libs")
 
-listOf("1.21.4", "1.21.5", "1.21.6", "1.21.9", "1.21.11").forEach {
+listOf("1.21.4", "1.21.5", "1.21.6", "1.21.9", "1.21.11", "26.1").forEach {
     include("worldedit-bukkit:adapters:adapter-$it")
 }
 

worldedit-bukkit/adapters/adapter-1.21.11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_11/PaperweightAdapter.java

@@ -237,6 +237,9 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException {
         if (dataVersion != Constants.DATA_VERSION_MC_1_21_11) {
             logger.warning(WRONG_VERSION);
         }
+        if (dataVersion >= Constants.DATA_VERSION_MC_26_1) {
+            throw new RuntimeException("Force prevent this loading on 26.1+");
+        }
 
         serverWorldsField = CraftServer.class.getDeclaredField("worlds");
         serverWorldsField.setAccessible(true);

worldedit-bukkit/adapters/adapter-26.1/build.gradle.kts

@@ -0,0 +1,10 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
+plugins {
+    id("buildlogic.adapter-mojmap")
+}
+
+dependencies {
+    // https://artifactory.papermc.io/ui/native/universe/io/papermc/paper/dev-bundle/
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("26.1.1.build.14-alpha")
+}

worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/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.impl.v26_1;
+
+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);
+        }
+    }
+}