Avoid ThreadLocal lookup in ParallelQueueExtent (#3096)

* Avoid ThreadLocal lookup in ParallelQueueExtent

* restore public methods

Author: SirYwell

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

@@ -19,6 +19,7 @@
 import com.fastasyncworldedit.core.queue.Filter;
 import com.fastasyncworldedit.core.queue.IQueueChunk;
 import com.fastasyncworldedit.core.queue.IQueueExtent;
+import com.fastasyncworldedit.core.util.task.FaweThread;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.extent.Extent;
@@ -53,7 +54,6 @@
 public class ParallelQueueExtent extends PassthroughExtent {
 
     private static final Logger LOGGER = LogManagerCompat.getLogger();
-    private static final ThreadLocal<Extent> extents = new ThreadLocal<>();
 
     private final World world;
     private final QueueHandler handler;
@@ -87,29 +87,31 @@ public ParallelQueueExtent(QueueHandler handler, World world, boolean fastmode,
     /**
      * Removes the extent currently associated with the calling thread.
      */
+    @Deprecated(forRemoval = true, since = "TODO")
     public static void clearCurrentExtent() {
-        extents.remove();
+        FaweThread.clearCurrentExtent();
     }
 
     /**
      * Sets the extent associated with the calling thread.
      */
+    @Deprecated(forRemoval = true, since = "TODO")
     public static void setCurrentExtent(Extent extent) {
-        extents.set(extent);
+        FaweThread.setCurrentExtent(extent);
     }
 
     private void enter(Extent extent) {
-        setCurrentExtent(extent);
+        FaweThread.setCurrentExtent(extent);
     }
 
     private void exit() {
-        clearCurrentExtent();
+        FaweThread.clearCurrentExtent();
     }
 
     @Override
     @SuppressWarnings({"unchecked", "rawtypes"})
     public IQueueExtent<IQueueChunk> getExtent() {
-        Extent extent = extents.get();
+        Extent extent = FaweThread.getCurrentExtent();
         if (extent == null) {
             extent = super.getExtent();
         }

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

@@ -10,9 +10,9 @@
 import com.fastasyncworldedit.core.queue.IChunkSet;
 import com.fastasyncworldedit.core.queue.IQueueChunk;
 import com.fastasyncworldedit.core.queue.IQueueExtent;
-import com.fastasyncworldedit.core.queue.implementation.ParallelQueueExtent;
 import com.fastasyncworldedit.core.util.MemUtil;
 import com.sk89q.worldedit.entity.Entity;
+import com.fastasyncworldedit.core.util.task.FaweThread;
 import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.Region;
@@ -1056,11 +1056,11 @@ public <U extends Future<U>> U call(IQueueExtent<? extends IChunk> owner, IChunk
     // This way, locking is spread across multiple STQEs, allowing for better performance
 
     private void trackExtent() {
-            ParallelQueueExtent.setCurrentExtent(extent);
+        FaweThread.setCurrentExtent(extent);
     }
 
     private void untrackExtent() {
-        ParallelQueueExtent.clearCurrentExtent();
+        FaweThread.clearCurrentExtent();
     }
 
     /**

worldedit-core/src/main/java/com/fastasyncworldedit/core/util/task/FaweForkJoinWorkerThreadFactory.java

@@ -16,7 +16,7 @@ public FaweForkJoinWorkerThreadFactory(String nameFormat) {
 
     @Override
     public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
-        final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
+        final ForkJoinWorkerThread worker = new FaweThread(pool);
         worker.setName(String.format(nameFormat, idCounter.getAndIncrement()));
         return worker;
     }

worldedit-core/src/main/java/com/fastasyncworldedit/core/util/task/FaweThread.java

@@ -0,0 +1,51 @@
+package com.fastasyncworldedit.core.util.task;
+
+import com.sk89q.worldedit.extent.Extent;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinWorkerThread;
+
+@ApiStatus.Internal
+public class FaweThread extends ForkJoinWorkerThread {
+
+    private static final ThreadLocal<Extent> EXTENTS = new ThreadLocal<>();
+
+    private Extent currentExtent;
+
+    protected FaweThread(final ForkJoinPool pool) {
+        super(null, pool, true);
+    }
+
+    /**
+     * Removes the extent currently associated with the calling thread.
+     */
+    public static void clearCurrentExtent() {
+        if (Thread.currentThread() instanceof FaweThread ft) {
+            ft.currentExtent = null;
+        } else {
+            EXTENTS.remove();
+        }
+    }
+
+    /**
+     * Sets the extent associated with the calling thread.
+     */
+    public static void setCurrentExtent(Extent extent) {
+        if (Thread.currentThread() instanceof FaweThread ft) {
+            ft.currentExtent = extent;
+        } else {
+            EXTENTS.set(extent);
+        }
+
+    }
+
+    public static Extent getCurrentExtent() {
+        if (Thread.currentThread() instanceof FaweThread ft) {
+            return ft.currentExtent;
+        } else {
+            return EXTENTS.get();
+        }
+    }
+
+}