Merge branch 'main' into feat/mc-26.1

SirYwell · SirYwell · commit 160f8afc896f · 2026-05-05T21:24:25.000+02:00
# Conflicts:
#	gradle/libs.versions.toml
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v6
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v6
       - name: Setup Java
         uses: actions/setup-java@v5
         with:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v6
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v6
       - name: Setup Java
         uses: actions/setup-java@v5
         with:
diff --git a/.github/workflows/upload-release-assets.yml b/.github/workflows/upload-release-assets.yml
@@ -9,7 +9,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v6
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v6
       - name: Setup Java
         uses: actions/setup-java@v5
         with:
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,15 +13,15 @@ worldguard-bukkit = "7.0.15"
 griefprevention = "18.0.0"
 griefdefender = "2.1.0-SNAPSHOT"
 residence = "6.0.0.1"
-towny = "0.102.0.12"
+towny = "0.102.0.14"
 plotsquared = "7.5.12"
 
 # Third party
 bstats = "3.2.1"
 sparsebitset = "1.3"
 parallelgzip = "1.0.5"
 adventure = "4.26.1"
-checkerqual = "3.54.0"
+checkerqual = "4.1.0"
 truezip = "6.8.4"
 auto-value = "1.11.1"
 jsr305 = "3.0.2"
@@ -31,7 +31,7 @@ antlr4 = "4.13.2"
 json-simple = "1.1.1"
 jlibnoise = "1.0.0"
 jchronic = "0.2.4a"
-lz4-java = "1.10.4"
+lz4-java = "1.11.0"
 commons-cli = "1.11.0"
 paperLib = "1.0.8"
 paster = "1.1.7"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-all.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/Fawe.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/Fawe.java
@@ -43,6 +43,7 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * [ WorldEdit action ]
@@ -413,26 +414,31 @@ private void setupMemoryListener() {
             final MemoryMXBean memBean = ManagementFactory.getMemoryMXBean();
             final NotificationEmitter ne = (NotificationEmitter) memBean;
 
+            AtomicLong lastWarn = new AtomicLong(System.currentTimeMillis());
             ne.addNotificationListener((notification, handback) -> {
                 final long heapSize = Runtime.getRuntime().totalMemory();
                 final long heapMaxSize = Runtime.getRuntime().maxMemory();
                 if (heapSize < heapMaxSize) {
                     return;
                 }
-                LOGGER.warn("High memory usage detected, FAWE will attempt to slow operations to prevent a crash.");
+                final long time = System.currentTimeMillis();
+                if (time > lastWarn.get() + TimeUnit.SECONDS.toMillis(30)) {
+                    lastWarn.set(time);
+                    LOGGER.warn("High memory usage detected, FAWE will attempt to slow operations to prevent a crash.");
+                }
                 MemUtil.memoryLimitedTask();
             }, null, null);
 
             final List<MemoryPoolMXBean> memPools = ManagementFactory.getMemoryPoolMXBeans();
             for (final MemoryPoolMXBean mp : memPools) {
-                if (mp.isUsageThresholdSupported()) {
+                if (mp.isCollectionUsageThresholdSupported()) {
                     final MemoryUsage mu = mp.getUsage();
                     final long max = mu.getMax();
                     if (max < 0) {
                         continue;
                     }
                     final long alert = (max * Settings.settings().MAX_MEMORY_PERCENT) / 100;
-                    mp.setUsageThreshold(alert);
+                    mp.setCollectionUsageThreshold(alert);
                 }
             }
         } catch (Throwable ignored) {
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
@@ -24,6 +24,7 @@
 import com.fastasyncworldedit.core.event.extent.ActorSaveClipboardEvent;
 import com.fastasyncworldedit.core.extent.clipboard.MultiClipboardHolder;
 import com.fastasyncworldedit.core.extent.clipboard.URIClipboardHolder;
+import com.fastasyncworldedit.core.internal.exception.FaweException;
 import com.fastasyncworldedit.core.math.transform.MutatingOperationTransformHolder;
 import com.fastasyncworldedit.core.util.MainUtil;
 import com.google.common.collect.Multimap;
@@ -576,15 +577,20 @@ public void save(
         ClipboardHolder holder = session.getClipboard();
 
         SchematicSaveTask task = new SchematicSaveTask(actor, f, dir, format, holder, overwrite);
-        AsyncCommandBuilder.wrap(task, actor)
-                .registerWithSupervisor(worldEdit.getSupervisor(), "Saving schematic " + filename)
-                .setDelayMessage(Caption.of("worldedit.schematic.save.saving"))
-                .onSuccess(filename + " saved" + (overwrite ? " (overwriting previous file)." : "."), null)
-                .onFailure(
-                        Caption.of("worldedit.schematic.failed-to-save"),
-                        worldEdit.getPlatformManager().getPlatformCommandManager().getExceptionConverter()
-                )
-                .buildAndExec(worldEdit.getExecutorService());
+        AsyncCommandBuilder
+            .wrap(task, actor)
+            .registerWithSupervisor(worldEdit.getSupervisor(), "Saving schematic " + filename)
+            .setDelayMessage(Caption.of("worldedit.schematic.save.saving"))
+            .onSuccess(
+                overwrite
+                    ? Caption.of("fawe.worldedit.schematic.schematic.overwritten")
+                    : Caption.of("fawe.worldedit.schematic.schematic.saved", filename), null
+            )
+            .onFailure(
+                Caption.of("worldedit.schematic.failed-to-save"),
+                worldEdit.getPlatformManager().getPlatformCommandManager().getExceptionConverter()
+            )
+            .buildAndExec(worldEdit.getExecutorService());
     }
 
     @Command(
@@ -1001,14 +1007,8 @@ public Void call() throws Exception {
                 int limit = actor.getLimit().SCHEM_FILE_NUM_LIMIT;
 
                 if (numFiles >= limit) {
-                    TextComponent noSlotsErr = TextComponent.of( //TODO - to be moved into captions/translatablecomponents
-                            String.format(
-                                    "You have " + numFiles + "/" + limit + " saved schematics. Delete some to save this one!",
-                                    TextColor.RED
-                            ));
                     LOGGER.info(actor.getName() + " failed to save " + file.getCanonicalPath() + " - too many schematics!");
-                    throw new WorldEditException(noSlotsErr) {
-                    };
+                    throw new FaweException(Caption.of("fawe.error.schematic.over.limit", numFiles, limit));
                 }
             }
             //FAWE end
@@ -1034,9 +1034,7 @@ public Void call() throws Exception {
                     closer.close(); // release the new .schem file so that its size can be measured
                     double filesizeKb = Files.size(Paths.get(file.getAbsolutePath())) / 1000.0;
 
-                    TextComponent filesizeNotif = TextComponent.of( //TODO - to be moved into captions/translatablecomponents
-                            SCHEMATIC_NAME + " size: " + String.format("%.1f", filesizeKb) + "kb", TextColor.GRAY);
-                    actor.print(filesizeNotif);
+                    actor.print(Caption.of("fawe.worldedit.schematic.schematic.size", SCHEMATIC_NAME, String.format("%.1f", filesizeKb)));
 
                     if (checkFilesize) {
 
@@ -1049,42 +1047,25 @@ public Void call() throws Exception {
 
                         if ((curKb) > allocatedKb) {
                             file.delete();
-                            TextComponent notEnoughKbErr = TextComponent.of(
-                                    //TODO - to be moved into captions/translatablecomponents
-                                    "You're about to be at " + String.format("%.1f", curKb) + "kb of schematics. ("
-                                            + String.format(
-                                            "%dkb",
-                                            allocatedKb
-                                    ) + " available) Delete some first to save this one!",
-                                    TextColor.RED
-                            );
                             LOGGER.info(actor.getName() + " failed to save " + SCHEMATIC_NAME + " - not enough space!");
-                            throw new WorldEditException(notEnoughKbErr) {
-                            };
+                            throw new FaweException(Caption.of(
+                                    "fawe.error.schematic.over.disk.limit",
+                                    String.format("%.1f", curKb),
+                                    String.format("%dkb", allocatedKb)
+                            ));
                         }
                         if (overwrite) {
                             new File(curFilepath).delete();
                             file.renameTo(new File(curFilepath));
                         } else {
                             numFiles++;
                         }
-                        TextComponent kbRemainingNotif = TextComponent.of(
-                                //TODO - to be moved into captions/translatablecomponents
-                                "You have " + String.format("%.1f", (allocatedKb - curKb)) + "kb left for schematics.",
-                                TextColor.GRAY
-                        );
-                        actor.print(kbRemainingNotif);
+
+                        actor.print(Caption.of("fawe.worldedit.schematic.schematic.disk.space", String.format("%.1f", (allocatedKb - curKb))));
                     }
 
                     if (Settings.settings().PATHS.PER_PLAYER_SCHEMATICS && actor.getLimit().SCHEM_FILE_NUM_LIMIT > -1) {
-
-                        TextComponent slotsRemainingNotif = TextComponent.of(
-                                //TODO - to be moved into captions/translatablecomponents
-                                "You have " + (actor.getLimit().SCHEM_FILE_NUM_LIMIT - numFiles)
-                                        + " schematic file slots left.",
-                                TextColor.GRAY
-                        );
-                        actor.print(slotsRemainingNotif);
+                        actor.print(Caption.of("fawe.worldedit.schematic.schematic.slots.free", (actor.getLimit().SCHEM_FILE_NUM_LIMIT - numFiles)));
                     }
                     LOGGER.info(actor.getName() + " saved " + file.getCanonicalPath());
                 } else {
diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json
@@ -68,8 +68,12 @@
   "fawe.worldedit.schematic.schematic.move.failed": "{0} no moved: {1}",
   "fawe.worldedit.schematic.schematic.loaded": "{0} loaded. Paste it with //paste",
   "fawe.worldedit.schematic.schematic.saved": "{0} saved.",
+  "fawe.worldedit.schematic.schematic.overwritten": "{0} saved (overwriting previous file).",
   "fawe.worldedit.schematic.schematic.none": "No files found.",
   "fawe.worldedit.schematic.schematic.load-failure": "File could not be read or it does not exist: {0}. If you are specifying a format, you may not be specifying the correct one. Sponge schematic v2 and v3 both use the .schem file extension. To allow FAWE to select the format, do not specify one. If you are using a litematica schematic, it is not supported!",
+  "fawe.worldedit.schematic.schematic.size": "{0} size: {1}kb",
+  "fawe.worldedit.schematic.schematic.disk.space": "You have {0}kb left for schematics.",
+  "fawe.worldedit.schematic.schematic.slots.free": "You have {0} schematic file slots left.",
   "fawe.worldedit.clipboard.clipboard.uri.not.found": "You do not have {0} loaded",
   "fawe.worldedit.clipboard.clipboard.cleared": "Clipboard cleared",
   "fawe.worldedit.clipboard.clipboard.invalid.format": "Unknown clipboard format:  {0}",
@@ -125,6 +129,8 @@
   "fawe.error.input-parser-exception": "Invalid empty string instead of boolean.",
   "fawe.error.invalid-boolean": "Invalid boolean {0}",
   "fawe.error.schematic.not.found": "Schematic {0} not found.",
+  "fawe.error.schematic.over.count.limit": "You have {0}/{1} saved schematics. Delete some to save this one!",
+  "fawe.error.schematic.over.disk.limit": "You're about to be at {0}kb of schematics ({1} available). Delete some first to save this one!",
   "fawe.error.parse.invalid-dangling-character": "Invalid dangling character {0}.",
   "fawe.error.parse.unknown-mask": "Unknown mask: {0}, See: {1}",
   "fawe.error.parse.unknown-pattern": "Unknown pattern: {0}, See: {1}",
