Merge changes to Master.

structureblocklib-api/src/main/java/com/github/shynixn/structureblocklib/api/service/ProxyService.java

@@ -5,6 +5,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.concurrent.Executor;
+
 /**
  * Proxies small framework specific actions.
  */
@@ -37,19 +39,31 @@ public interface ProxyService {
     @Nullable <L> Position toPosition(@Nullable L location);
 
     /**
-     * Runs an async task.
-     *
-     * @param runnable Runnable.
+     * Deprecated. Use getAsyncExecutor().execute instead.
      */
+    @Deprecated
     void runAsyncTask(@NotNull Runnable runnable);
 
     /**
-     * Runs a sync task.
-     *
-     * @param runnable Runnable.
+     * Deprecated. Use getSyncExecutor().execute instead.
      */
+    @Deprecated
     void runSyncTask(@NotNull Runnable runnable);
 
+    /**
+     * Gets an execute to schedule tasks on the synchronous bukkit thread.
+     *
+     * @return {@link Executor}.
+     */
+    Executor getSyncExecutor();
+
+    /**
+     * Gets an execute to schedule tasks on the asynchronous bukkit threadPool.
+     *
+     * @return {@link Executor}.
+     */
+    Executor getAsyncExecutor();
+
     /**
      * Gets the running minecraft version.
      *

structureblocklib-bukkit-core/bukkit-nms-109R2/src/test/java/helper/MockedProxyService.java

@@ -13,6 +13,7 @@
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -94,6 +95,26 @@ public void runSyncTask(@NotNull Runnable runnable) {
         concurrentList.add(runnable);
     }
 
+    /**
+     * Gets an execute to schedule tasks on the synchronous bukkit thread.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getSyncExecutor() {
+        return c -> concurrentList.add(c);
+    }
+
+    /**
+     * Gets an execute to schedule tasks on the asynchronous bukkit threadPool.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getAsyncExecutor() {
+        return executor;
+    }
+
     /**
      * Gets the running minecraft version.
      *

structureblocklib-bukkit-core/bukkit-nms-110R1/src/test/java/helper/MockedProxyService.java

@@ -13,6 +13,7 @@
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -94,6 +95,26 @@ public void runSyncTask(@NotNull Runnable runnable) {
         concurrentList.add(runnable);
     }
 
+    /**
+     * Gets an execute to schedule tasks on the synchronous bukkit thread.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getSyncExecutor() {
+        return c ->  concurrentList.add(c);
+    }
+
+    /**
+     * Gets an execute to schedule tasks on the asynchronous bukkit threadPool.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getAsyncExecutor() {
+        return executor;
+    }
+
     /**
      * Gets the running minecraft version.
      *

structureblocklib-bukkit-core/bukkit-nms-111R1/src/test/java/helper/MockedProxyService.java

@@ -13,6 +13,7 @@
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -94,6 +95,26 @@ public void runSyncTask(@NotNull Runnable runnable) {
         concurrentList.add(runnable);
     }
 
+    /**
+     * Gets an execute to schedule tasks on the synchronous bukkit thread.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getSyncExecutor() {
+        return c ->  concurrentList.add(c);
+    }
+
+    /**
+     * Gets an execute to schedule tasks on the asynchronous bukkit threadPool.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getAsyncExecutor() {
+        return executor;
+    }
+
     /**
      * Gets the running minecraft version.
      *

structureblocklib-bukkit-core/bukkit-nms-112R1/src/test/java/helper/MockedProxyService.java

@@ -13,6 +13,7 @@
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -94,6 +95,26 @@ public void runSyncTask(@NotNull Runnable runnable) {
         concurrentList.add(runnable);
     }
 
+    /**
+     * Gets an execute to schedule tasks on the synchronous bukkit thread.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getSyncExecutor() {
+        return c ->  concurrentList.add(c);
+    }
+
+    /**
+     * Gets an execute to schedule tasks on the asynchronous bukkit threadPool.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getAsyncExecutor() {
+        return executor;
+    }
+
     /**
      * Gets the running minecraft version.
      *

structureblocklib-bukkit-core/bukkit-nms-113R2/src/test/java/helper/MockedProxyService.java

@@ -13,6 +13,7 @@
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -94,6 +95,26 @@ public void runSyncTask(@NotNull Runnable runnable) {
         concurrentList.add(runnable);
     }
 
+    /**
+     * Gets an execute to schedule tasks on the synchronous bukkit thread.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getSyncExecutor() {
+        return c ->  concurrentList.add(c);
+    }
+
+    /**
+     * Gets an execute to schedule tasks on the asynchronous bukkit threadPool.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getAsyncExecutor() {
+        return executor;
+    }
+
     /**
      * Gets the running minecraft version.
      *

structureblocklib-bukkit-core/bukkit-nms-114R1/src/test/java/helper/MockedProxyService.java

@@ -13,6 +13,7 @@
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -94,6 +95,26 @@ public void runSyncTask(@NotNull Runnable runnable) {
         concurrentList.add(runnable);
     }
 
+    /**
+     * Gets an execute to schedule tasks on the synchronous bukkit thread.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getSyncExecutor() {
+        return c ->  concurrentList.add(c);
+    }
+
+    /**
+     * Gets an execute to schedule tasks on the asynchronous bukkit threadPool.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getAsyncExecutor() {
+        return executor;
+    }
+
     /**
      * Gets the running minecraft version.
      *

structureblocklib-bukkit-core/bukkit-nms-115R1/src/test/java/helper/MockedProxyService.java

@@ -13,6 +13,7 @@
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -94,6 +95,26 @@ public void runSyncTask(@NotNull Runnable runnable) {
         concurrentList.add(runnable);
     }
 
+    /**
+     * Gets an execute to schedule tasks on the synchronous bukkit thread.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getSyncExecutor() {
+        return c ->  concurrentList.add(c);
+    }
+
+    /**
+     * Gets an execute to schedule tasks on the asynchronous bukkit threadPool.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getAsyncExecutor() {
+        return executor;
+    }
+
     /**
      * Gets the running minecraft version.
      *

structureblocklib-bukkit-core/bukkit-nms-116R3/src/test/java/helper/MockedProxyService.java

@@ -13,6 +13,7 @@
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -94,6 +95,26 @@ public void runSyncTask(@NotNull Runnable runnable) {
         concurrentList.add(runnable);
     }
 
+    /**
+     * Gets an execute to schedule tasks on the synchronous bukkit thread.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getSyncExecutor() {
+        return c ->  concurrentList.add(c);
+    }
+
+    /**
+     * Gets an execute to schedule tasks on the asynchronous bukkit threadPool.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getAsyncExecutor() {
+        return executor;
+    }
+
     /**
      * Gets the running minecraft version.
      *

structureblocklib-bukkit-core/bukkit-nms-117R1/src/test/java/helper/MockedProxyService.java

@@ -13,6 +13,7 @@
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -94,6 +95,26 @@ public void runSyncTask(@NotNull Runnable runnable) {
         concurrentList.add(runnable);
     }
 
+    /**
+     * Gets an execute to schedule tasks on the synchronous bukkit thread.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getSyncExecutor() {
+        return c ->  concurrentList.add(c);
+    }
+
+    /**
+     * Gets an execute to schedule tasks on the asynchronous bukkit threadPool.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getAsyncExecutor() {
+        return executor;
+    }
+
     /**
      * Gets the running minecraft version.
      *

structureblocklib-bukkit-core/bukkit-nms-118R1/src/test/java/helper/MockedProxyService.java

@@ -13,6 +13,7 @@
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -74,6 +75,26 @@ public class MockedProxyService implements ProxyService {
         return position;
     }
 
+    /**
+     * Gets an execute to schedule tasks on the synchronous bukkit thread.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getSyncExecutor() {
+        return c ->  concurrentList.add(c);
+    }
+
+    /**
+     * Gets an execute to schedule tasks on the asynchronous bukkit threadPool.
+     *
+     * @return {@link Executor}.
+     */
+    @Override
+    public Executor getAsyncExecutor() {
+        return executor;
+    }
+
     /**
      * Runs an async task.
      *