Merge branch 'main' into publishing

Author: NotMyFault

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,6 +27,10 @@ body:
       description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
       multiple: false
       options:
+        - '1.21.8'
+        - '1.21.7'
+        - '1.21.6'
+        - '1.21.5'
         - '1.21.4'
         - '1.21.1'
         - '1.20.6'

build.gradle.kts

@@ -82,7 +82,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", "1.21.7")
+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.8")
 
 tasks {
     supportedVersions.forEach {
@@ -96,7 +96,7 @@ tasks {
         }
     }
     runServer {
-        minecraftVersion("1.21.7")
+        minecraftVersion("1.21.8")
         pluginJars(*project(":worldedit-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
                 .toTypedArray())
 

worldedit-bukkit/adapters/adapter-1_21_6/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.7-R0.1-20250701.225444-12")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.8-R0.1-20250720.221224-10")
     compileOnly(libs.paperlib)
 }

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

@@ -204,6 +204,13 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
 
     private static final RandomSource random = RandomSource.create();
 
+    private static final String WRONG_VERSION =
+            """
+            This version of FastAsyncWorldEdit has not been tested with the current Minecraft version.
+            While it may work, there might be unexpected issues.
+            It is recommended to use a version of FastAsyncWorldEdit that supports your Minecraft version.
+            """.stripIndent();
+
     // ------------------------------------------------------------------------
     // Code that may break between versions of Minecraft
     // ------------------------------------------------------------------------
@@ -213,8 +220,8 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException {
         CraftServer.class.cast(Bukkit.getServer());
 
         int dataVersion = SharedConstants.getCurrentVersion().dataVersion().version();
-        if (dataVersion != Constants.DATA_VERSION_MC_1_21_6 && dataVersion != Constants.DATA_VERSION_MC_1_21_7) {
-            throw new UnsupportedClassVersionError("Not 1.21.6 or 1.21.7!");
+        if (dataVersion != Constants.DATA_VERSION_MC_1_21_6 && dataVersion != Constants.DATA_VERSION_MC_1_21_7 && dataVersion != Constants.DATA_VERSION_MC_1_21_8) {
+            logger.warning(WRONG_VERSION);
         }
 
         serverWorldsField = CraftServer.class.getDeclaredField("worlds");

worldedit-core/src/main/java/com/sk89q/worldedit/internal/Constants.java

@@ -118,4 +118,9 @@ private Constants() {
      * The DataVersion for Minecraft 1.21.7
      */
     public static final int DATA_VERSION_MC_1_21_7 = 4438;
+
+    /**
+     * The DataVersion for Minecraft 1.21.8
+     */
+    public static final int DATA_VERSION_MC_1_21_8 = 4440;
 }