Upstream

.github/workflows/build-pr.yml

@@ -17,11 +17,11 @@ jobs:
         with:
           distribution: temurin
           cache: gradle
-          java-version: 21
+          java-version: 25
       - name: Build on ${{ matrix.os }}
         run: ./gradlew build -s
       - name: Archive artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         if: ${{ matrix.os == 'ubuntu-latest' }} # only upload once, use linux builds
         with:
             name: FastAsyncWorldEdit-SNAPSHOT

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           distribution: temurin
           cache: gradle
-          java-version: 21
+          java-version: 25
       - name: Build
         run: ./gradlew build
       - name: Determine release status
@@ -67,7 +67,7 @@ jobs:
           target-branch: main
           target-directory: worldedit-bukkit
       - name: Archive Artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: FastAsyncWorldEdit-Bukkit-SNAPSHOT
           path: worldedit-bukkit/build/libs/FastAsyncWorldEdit-*.jar

.github/workflows/codeql.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           distribution: temurin
           cache: gradle
-          java-version: 21
+          java-version: 25
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v4
         with:

.github/workflows/upload-release-assets.yml

@@ -15,7 +15,7 @@ jobs:
         with:
           distribution: temurin
           cache: gradle
-          java-version: 21
+          java-version: 25
       - name: Clean Build
         run: ./gradlew clean build --no-daemon
       - name: Upload Release Assets

build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts

@@ -15,7 +15,7 @@ tasks
         val disabledLint = listOf(
             "processing", "path", "fallthrough", "serial", "overloads", "this-escape",
         )
-        options.release.set(21)
+        sourceCompatibility = "21"
         options.compilerArgs.addAll(listOf("-Xlint:all") + disabledLint.map { "-Xlint:-$it" })
         options.isDeprecation = true
         options.encoding = "UTF-8"

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

@@ -13,7 +13,7 @@ configurations.all {
 
 plugins.withId("java") {
     the<JavaPluginExtension>().toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
 }
 

gradle/libs.versions.toml

@@ -17,7 +17,7 @@ towny = "0.102.0.7"
 plotsquared = "7.5.11"
 
 # Third party
-bstats = "3.1.0"
+bstats = "3.2.1"
 sparsebitset = "1.3"
 parallelgzip = "1.0.5"
 adventure = "4.26.1"
@@ -39,21 +39,22 @@ vault = "1.7.1"
 serverlib = "2.3.7"
 linbus = "0.2.0"
 autoService = "1.1.1"
+guice = "7.0.0"
 
 ## Internal
 text-adapter = "3.0.6"
 text = "3.0.4"
 piston = "0.5.11"
 
 # Tests
-mockito = "5.21.0"
+mockito = "5.22.0"
 junit = "6.0.3"
 
 # Gradle plugins
 pluginyml = "0.6.0"
 mod-publish-plugin = "1.1.0"
 grgit = "5.3.3"
-shadow = "9.3.1"
+shadow = "9.3.2"
 paperweight = "2.0.0-SNAPSHOT"
 codecov = "0.2.0"
 
@@ -125,6 +126,8 @@ linBus-stream = { group = "org.enginehub.lin-bus", name = "lin-bus-stream" }
 linBus-tree = { group = "org.enginehub.lin-bus", name = "lin-bus-tree" }
 linBus-format-snbt = { group = "org.enginehub.lin-bus.format", name = "lin-bus-format-snbt" }
 
+guice = { group = "com.google.inject", name = "guice", version.ref = "guice" }
+
 # Internal
 ## Text
 kyoriText-adapter-bukkit = { group = "net.kyori", name = "text-adapter-bukkit", version.ref = "text-adapter" }

worldedit-bukkit/build.gradle.kts

@@ -130,6 +130,7 @@ dependencies {
     compileOnly(libs.towny) { isTransitive = false }
     compileOnly(libs.plotsquared.bukkit) { isTransitive = false }
     compileOnly(libs.plotsquared.core) { isTransitive = false }
+    compileOnly(libs.guice)
 
     // Third party
     implementation(libs.serverlib)

worldedit-bukkit/src/main/resources/defaults/worldedit-config.yml

@@ -24,6 +24,11 @@ limits:
   max-polygonal-points:
     default: -1
     maximum: 20
+  max-polyhedron-points:
+    default: -1
+    maximum: 20
+  vertical-height:
+    default: 256
   # radius, superpickaxe, brush radius are ignored, use FAWE config limits
   max-radius: -1
   max-super-pickaxe-size: 5
@@ -84,6 +89,7 @@ history:
 
 calculation:
   timeout: 100
+  max-timeout: 300
 
 debugging:
   trace-unflushed-sessions: false

worldedit-core/src/main/java/com/fastasyncworldedit/core/history/change/ChangePopulator.java

@@ -14,7 +14,6 @@ public interface ChangePopulator<C extends Change> {
 
     static <C extends Change> ChangePopulator<C> empty() {
         class Empty implements ChangePopulator<C> {
-            private static final Empty EMPTY = new Empty();
 
             @Override
             public @NotNull C create() {
@@ -36,7 +35,7 @@ public boolean accepts(final Change change) {
                 return false;
             }
         }
-        return Empty.EMPTY;
+        return new Empty();
     }
 
     @SuppressWarnings("unchecked")

worldedit-core/src/main/java/com/fastasyncworldedit/core/internal/simd/SimdSupport.java

@@ -24,6 +24,7 @@ public class SimdSupport {
 
     private static final Logger LOGGER = LogManagerCompat.getLogger();
     private static final boolean VECTOR_API_PRESENT;
+    private static final boolean JAVA_25_OR_NEWER = Runtime.version().feature() >= 25;
 
     static {
         boolean vectorApiPresent = false;
@@ -36,19 +37,25 @@ public class SimdSupport {
         if (!VECTOR_API_PRESENT && Settings.settings().EXPERIMENTAL.USE_VECTOR_API) {
             LOGGER.warn("""
                     FAWE use-vector-api is enabled but --add-modules=jdk.incubator.vector is not set.
-                    Vector instructions will not be used.
+                    Vector instructions will not be used.\
                     """);
         } else if (VECTOR_API_PRESENT && !Settings.settings().EXPERIMENTAL.USE_VECTOR_API) {
             LOGGER.warn("""
                     The server is running with the --add-modules=jdk.incubator.vector option.
                     FAWE can use vector instructions, but it is disabled in the config.
                     Enable use-vector-api to benefit from vector instructions with FAWE.\
                     """);
+        } else if (VECTOR_API_PRESENT && !JAVA_25_OR_NEWER) {
+            LOGGER.warn("""
+                    The server is running with the --add-modules=jdk.incubator.vector option.
+                    However, Java 25+ is required due to compatibility problems.
+                    Update to Java 25 to make use of this feature.\
+                    """);
         }
     }
 
     public static boolean useVectorApi() {
-        return VECTOR_API_PRESENT && Settings.settings().EXPERIMENTAL.USE_VECTOR_API;
+        return VECTOR_API_PRESENT && JAVA_25_OR_NEWER && Settings.settings().EXPERIMENTAL.USE_VECTOR_API;
     }
 
     public static @Nullable VectorizedMask vectorizedTargetMask(Mask mask) {
@@ -72,7 +79,7 @@ public static boolean useVectorApi() {
 
     private static VectorizedMask vectorizedTargetMaskNonAir() {
         // everything > VOID_AIR is not air
-        return (set, get, species) -> get.get(species).compare(VectorOperators.UNSIGNED_GT, BlockTypesCache.ReservedIDs.VOID_AIR);
+        return (set, get, species) -> get.get(species).compare(VectorOperators.UGT, BlockTypesCache.ReservedIDs.VOID_AIR);
     }
 
     private static VectorizedMask vectorizedTargetMask(char ordinal) {