Merge branch 'main' into SecondaryBrushFlagChange

worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightGetBlocks.java

@@ -148,6 +148,7 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
             throw new IllegalStateException("Attempting to set if chunk GET should create copy, but it is not call-locked.");
         }
         this.createCopy = createCopy;
+        // Increment regardless of whether copy will be created or not to return null from getCopy()
         return ++this.copyKey;
     }
 

worldedit-bukkit/adapters/adapter-1_18_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R2/PaperweightGetBlocks.java

@@ -153,6 +153,7 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
             throw new IllegalStateException("Attempting to set if chunk GET should create copy, but it is not call-locked.");
         }
         this.createCopy = createCopy;
+        // Increment regardless of whether copy will be created or not to return null from getCopy()
         return ++this.copyKey;
     }
 

worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R3/PaperweightGetBlocks.java

@@ -156,6 +156,7 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
             throw new IllegalStateException("Attempting to set if chunk GET should create copy, but it is not call-locked.");
         }
         this.createCopy = createCopy;
+        // Increment regardless of whether copy will be created or not to return null from getCopy()
         return ++this.copyKey;
     }
 

worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R1/PaperweightGetBlocks.java

@@ -156,6 +156,7 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
             throw new IllegalStateException("Attempting to set if chunk GET should create copy, but it is not call-locked.");
         }
         this.createCopy = createCopy;
+        // Increment regardless of whether copy will be created or not to return null from getCopy()
         return ++this.copyKey;
     }
 

worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightGetBlocks.java

@@ -135,6 +135,7 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
             throw new IllegalStateException("Attempting to set if chunk GET should create copy, but it is not call-locked.");
         }
         this.createCopy = createCopy;
+        // Increment regardless of whether copy will be created or not to return null from getCopy()
         return ++this.copyKey;
     }
 

worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightGetBlocks.java

@@ -135,6 +135,7 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
             throw new IllegalStateException("Attempting to set if chunk GET should create copy, but it is not call-locked.");
         }
         this.createCopy = createCopy;
+        // Increment regardless of whether copy will be created or not to return null from getCopy()
         return ++this.copyKey;
     }
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/FaweCache.java

@@ -612,12 +612,38 @@ public enum FaweCache implements Trimable {
     /*
     Thread stuff
      */
+
+    /**
+     * Create a new blocking executor with default name and FaweCache logger
+     *
+     * @return new blocking executor
+     */
     public ThreadPoolExecutor newBlockingExecutor() {
+        return newBlockingExecutor("FAWE Blocking Executor - %d");
+    }
+
+    /**
+     * Create a new blocking executor with specified name and FaweCache logger
+     *
+     * @return new blocking executor
+     * @since TODO
+     */
+    public ThreadPoolExecutor newBlockingExecutor(String name) {
+        return newBlockingExecutor(name, LOGGER);
+    }
+
+    /**
+     * Create a new blocking executor with specified name and logger
+     *
+     * @return new blocking executor
+     * @since TODO
+     */
+    public ThreadPoolExecutor newBlockingExecutor(String name, Logger logger) {
         int nThreads = Settings.settings().QUEUE.PARALLEL_THREADS;
         ArrayBlockingQueue<Runnable> queue = new ArrayBlockingQueue<>(nThreads, true);
         return new ThreadPoolExecutor(nThreads, nThreads,
                 0L, TimeUnit.MILLISECONDS, queue,
-                new ThreadFactoryBuilder().setNameFormat("FAWE Blocking Executor - %d").build(),
+                new ThreadFactoryBuilder().setNameFormat(name).build(),
                 new ThreadPoolExecutor.CallerRunsPolicy()
         ) {
 
@@ -652,10 +678,10 @@ public enum FaweCache implements Trimable {
                         int hash = throwable.getMessage() != null ? throwable.getMessage().hashCode() : 0;
                         if (hash != lastException) {
                             lastException = hash;
-                            LOGGER.catching(throwable);
+                            logger.catching(throwable);
                             count = 0;
                         } else if (count < Settings.settings().QUEUE.PARALLEL_THREADS) {
-                            LOGGER.warn(throwable.getMessage());
+                            logger.warn(throwable.getMessage());
                             count++;
                         }
                     }
@@ -665,10 +691,10 @@ public enum FaweCache implements Trimable {
             private void handleFaweException(FaweException e) {
                 FaweException.Type type = e.getType();
                 if (e.getType() == FaweException.Type.OTHER) {
-                    LOGGER.catching(e);
+                    logger.catching(e);
                 } else if (!faweExceptionReasonsUsed[type.ordinal()]) {
                     faweExceptionReasonsUsed[type.ordinal()] = true;
-                    LOGGER.warn("FaweException: " + e.getMessage());
+                    logger.warn("FaweException: " + e.getMessage());
                 }
             }
         };

worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/QueueHandler.java

@@ -68,7 +68,8 @@ public abstract class QueueHandler implements Trimable, Runnable {
      * Main "work-horse" queue for FAWE. Handles chunk submission (and chunk submission alone). Blocking in order to forcibly
      * prevent overworking/over-submission of chunk process tasks.
      */
-    private final ThreadPoolExecutor blockingExecutor = FaweCache.INSTANCE.newBlockingExecutor();
+    private final ThreadPoolExecutor blockingExecutor = FaweCache.INSTANCE.newBlockingExecutor(
+            "FAWE QueueHandler Blocking Executor - %d");
     /**
      * Queue for tasks to be completed on the main thread. These take priority of tasks submitted to syncWhenFree queue
      */

worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/SingleThreadQueueExtent.java

@@ -158,6 +158,7 @@ public class SingleThreadQueueExtent extends ExtentBatchProcessorHolder implemen
         this.setProcessor(EmptyBatchProcessor.getInstance());
         this.setPostProcessor(EmptyBatchProcessor.getInstance());
         this.world = null;
+        this.faweExceptionReasonsUsed = new boolean[FaweException.Type.values().length];
     }
 
     /**

worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/chunk/ChunkHolder.java

@@ -12,6 +12,7 @@ import com.fastasyncworldedit.core.queue.IChunkSet;
 import com.fastasyncworldedit.core.queue.IQueueChunk;
 import com.fastasyncworldedit.core.queue.IQueueExtent;
 import com.fastasyncworldedit.core.queue.Pool;
+import com.fastasyncworldedit.core.util.MemUtil;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.Region;
@@ -959,7 +960,7 @@ public class ChunkHolder<T extends Future<T>> implements IQueueChunk<T> {
     public final IChunkGet getOrCreateGet() {
         if (chunkExisting == null) {
             chunkExisting = newWrappedGet();
-            chunkExisting.trim(false);
+            chunkExisting.trim(MemUtil.isMemoryLimited());
         }
         return chunkExisting;
     }
@@ -1031,10 +1032,10 @@ public class ChunkHolder<T extends Future<T>> implements IQueueChunk<T> {
             try {
                 get.lockCall();
                 boolean postProcess = !(getExtent().getPostProcessor() instanceof EmptyBatchProcessor);
+                final int copyKey = get.setCreateCopy(postProcess);
                 final IChunkSet iChunkSet = getExtent().processSet(this, get, set);
                 Runnable finalizer;
                 if (postProcess) {
-                    int copyKey = get.setCreateCopy(true);
                     finalizer = () -> {
                         getExtent().postProcess(this, get.getCopy(copyKey), iChunkSet);
                         finalize.run();