Move 21 into only old adapters, set launcher for paperweight (#2959)

Author: octylFractal

build-logic/src/main/kotlin/buildlogic.adapter-mojmap.gradle.kts

@@ -8,3 +8,10 @@ plugins {
 paperweight {
     reobfArtifactConfiguration = ReobfArtifactConfiguration.MOJANG_PRODUCTION
 }
+
+tasks
+    .withType<JavaCompile>()
+    .matching { it.name == "compileJava" || it.name == "compileTestJava" }
+    .configureEach {
+        options.release.set(25)
+    }

build-logic/src/main/kotlin/buildlogic.adapter-reobf.gradle.kts

@@ -6,8 +6,24 @@ plugins {
 
 paperweight {
     reobfArtifactConfiguration = ReobfArtifactConfiguration.REOBF_PRODUCTION
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
 }
 
 tasks.named("assemble") {
     dependsOn("reobfJar")
 }
+
+java {
+    // Required when we de-sync release option and declared Java versions.
+    disableAutoTargetJvm()
+}
+
+tasks
+    .withType<JavaCompile>()
+    .matching { it.name == "compileJava" || it.name == "compileTestJava" }
+    .configureEach {
+        // We use Java 21 for most of the pre-existing adapters.
+        options.release.set(21)
+    }

build-logic/src/main/kotlin/buildlogic.adapter.gradle.kts

@@ -9,19 +9,6 @@ plugins {
     id("io.papermc.paperweight.userdev")
 }
 
-java {
-    // Required when we de-sync release option and declared Java versions.
-    disableAutoTargetJvm()
-}
-
-tasks
-    .withType<JavaCompile>()
-    .matching { it.name == "compileJava" || it.name == "compileTestJava" }
-    .configureEach {
-        // We use Java 21 for most of the pre-existing adapters.
-        options.release.set(21)
-    }
-
 repositories {
     maven {
         name = "Minecraft Libraries"

worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightAdapter.java

@@ -231,8 +231,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
 
     public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException {
         // A simple test
-        @SuppressWarnings({"ReturnValueIgnored", "unused"})
-        var unused = CraftServer.class.cast(Bukkit.getServer());
+        var _ = CraftServer.class.cast(Bukkit.getServer());
 
         int dataVersion = SharedConstants.getCurrentVersion().dataVersion().version();
         if (dataVersion < Constants.DATA_VERSION_MC_26_1 || dataVersion > Constants.DATA_VERSION_MC_26_1_2) {