Merge pull request #2 from Euphillya/rewrite-scheduler

Rewrite Scheduler

Author: Euphillya

readme.md

@@ -1,6 +1,7 @@
 ## API
 
 Bukkit/Spigot/Paper :
+
 ```java
 // Example Scheduler
 Bukkit.getScheduler().runTask(this.plugin, () -> {
@@ -9,6 +10,7 @@ Bukkit.getScheduler().runTask(this.plugin, () -> {
 ```
 
 Folia :
+
 ```java
 // Example Scheduler 
 Bukkit.getGlobalRegionScheduler().run(this.plugin, task -> {
@@ -21,7 +23,9 @@ Entity.getScheduler().run(this.plugin, task -> {
     // code                
 }, retired);
 ```
+
 Energie :
+
 ```java
 Energie energie = new Energie(this.plugin);
 

src/main/java/fr/euphyllia/energie/Energie.java

@@ -8,16 +8,14 @@
 
 public class Energie {
 
-    private final Plugin plugin;
     private final ExecutorsScheduler executorsScheduler;
     private final LegacyScheduler legacyScheduler;
     private final FoliaScheduler foliaScheduler;
 
     public Energie(Plugin javaPlugin) {
-        this.plugin = javaPlugin;
-        this.executorsScheduler = new ExecutorsScheduler(this.plugin);
-        this.legacyScheduler = new LegacyScheduler(this.plugin);
-        this.foliaScheduler = new FoliaScheduler(this.plugin);
+        this.executorsScheduler = new ExecutorsScheduler(javaPlugin);
+        this.legacyScheduler = new LegacyScheduler(javaPlugin);
+        this.foliaScheduler = new FoliaScheduler(javaPlugin);
     }
 
     public static boolean isFolia() {
@@ -28,28 +26,38 @@ public static boolean isPaper() {
         return hasClass("com.destroystokyo.paper.PaperConfig") || hasClass("io.papermc.paper.configuration.Configuration");
     }
 
+    private static boolean hasClass(String className) {
+        try {
+            Class.forName(className);
+            return true;
+        } catch (ClassNotFoundException exception) {
+            return false;
+        }
+    }
+
+    public Scheduler getNativeScheduler() {
+        return this.executorsScheduler;
+    }
+
+    public Scheduler getMinecraftScheduler() {
+        if (isFolia()) {
+            return this.foliaScheduler;
+        }
+        return this.legacyScheduler;
+    }
+
+    @Deprecated
     public Scheduler getScheduler(SchedulerSoft schedulerSoft) {
         if (schedulerSoft == SchedulerSoft.NATIVE) {
-            return this.executorsScheduler;
+            return this.getNativeScheduler();
         } else if (schedulerSoft == SchedulerSoft.MINECRAFT) {
-            if (isFolia()) {
-                return this.foliaScheduler;
-            }
-            return this.legacyScheduler;
+            return this.getMinecraftScheduler();
         }
         throw new UnsupportedOperationException();
     }
 
+    @Deprecated
     public enum SchedulerSoft {
         NATIVE, MINECRAFT
     }
-
-    private static boolean hasClass(String className) {
-        try {
-            Class.forName(className);
-            return true;
-        } catch (ClassNotFoundException exception) {
-            return false;
-        }
-    }
 }

src/main/java/fr/euphyllia/energie/executors/ExecutorsScheduler.java

@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class ExecutorsScheduler implements Scheduler {
 
@@ -28,17 +29,33 @@ public ExecutorsScheduler(Plugin pluginBukkit) {
     }
 
     @Override
-    public @Nullable SchedulerTaskInter runAtFixedRate(@NotNull SchedulerType schedulerType, SchedulerCallBack callBack, long initialDelayTicks, long periodTicks) {
+    public SchedulerTaskInter runAtFixedRate(@NotNull SchedulerType schedulerType, SchedulerCallBack callBack, long initialDelayTicks, long periodTicks) {
         if (!schedulerType.equals(SchedulerType.ASYNC)) {
             throw new UnsupportedOperationException();
         }
+        final AtomicReference<ExecutorsSchedulerTask> executorsSchedulerTaskRef = new AtomicReference<>();
+
         ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
-        executorService.scheduleAtFixedRate(() -> {
-            ExecutorsSchedulerTask executorsScheduler = new ExecutorsSchedulerTask(plugin, executorService);
+
+        TaskRunnable taskRunnable = (executorsScheduler) -> {
             mapSchedulerTask.put(executorsScheduler.getTaskId(), executorsScheduler);
             callBack.run(executorsScheduler);
+        };
+
+        executorsSchedulerTaskRef.set(new ExecutorsSchedulerTask(this.plugin, executorService));
+
+        executorService.scheduleAtFixedRate(() -> {
+            taskRunnable.run(executorsSchedulerTaskRef.get());
         }, initialDelayTicks * 50, periodTicks * 50, TimeUnit.MILLISECONDS);
-        return new ExecutorsSchedulerTask(plugin, executorService);
+
+        executorService.shutdown();
+        try {
+            executorService.awaitTermination(60, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+
+        return executorsSchedulerTaskRef.get();
     }
 
     @Override
@@ -61,13 +78,29 @@ public ExecutorsScheduler(Plugin pluginBukkit) {
         if (!schedulerType.equals(SchedulerType.ASYNC)) {
             throw new UnsupportedOperationException();
         }
+        final AtomicReference<ExecutorsSchedulerTask> executorsSchedulerTaskRef = new AtomicReference<>();
+
         ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
-        executorService.schedule(() -> {
-            ExecutorsSchedulerTask executorsScheduler = new ExecutorsSchedulerTask(plugin, executorService);
+
+        TaskRunnable taskRunnable = (executorsScheduler) -> {
             mapSchedulerTask.put(executorsScheduler.getTaskId(), executorsScheduler);
             callBack.run(executorsScheduler);
+        };
+
+        executorsSchedulerTaskRef.set(new ExecutorsSchedulerTask(this.plugin, executorService));
+
+        executorService.schedule(() -> {
+            taskRunnable.run(executorsSchedulerTaskRef.get());
         }, delayTicks * 50, TimeUnit.MILLISECONDS);
-        return new ExecutorsSchedulerTask(plugin, executorService);
+
+        executorService.shutdown();
+        try {
+            executorService.awaitTermination(60, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+
+        return executorsSchedulerTaskRef.get();
     }
 
     @Override
@@ -90,13 +123,29 @@ public ExecutorsScheduler(Plugin pluginBukkit) {
         if (!schedulerType.equals(SchedulerType.ASYNC)) {
             throw new UnsupportedOperationException();
         }
+        final AtomicReference<ExecutorsSchedulerTask> executorsSchedulerTaskRef = new AtomicReference<>();
+
         ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
-        executorService.execute(() -> {
-            ExecutorsSchedulerTask executorsScheduler = new ExecutorsSchedulerTask(plugin, executorService);
+
+        TaskRunnable taskRunnable = (executorsScheduler) -> {
             mapSchedulerTask.put(executorsScheduler.getTaskId(), executorsScheduler);
             callBack.run(executorsScheduler);
+        };
+
+        executorsSchedulerTaskRef.set(new ExecutorsSchedulerTask(this.plugin, executorService));
+
+        executorService.execute(() -> {
+            taskRunnable.run(executorsSchedulerTaskRef.get());
         });
-        return new ExecutorsSchedulerTask(plugin, executorService);
+
+        executorService.shutdown();
+        try {
+            executorService.awaitTermination(60, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+
+        return executorsSchedulerTaskRef.get();
     }
 
     @Override
@@ -169,47 +218,56 @@ public int scheduleSyncRepeating(@NotNull SchedulerType schedulerType, Entity en
         throw new UnsupportedOperationException();
     }
 
-    @Override @Deprecated
+    @Override
+    @Deprecated
     public void runAtFixedRate(@NotNull SchedulerType schedulerType, long initialDelayTicks, long periodTicks, SchedulerCallBack callBack) {
         this.runAtFixedRate(schedulerType, callBack, initialDelayTicks, periodTicks);
     }
 
-    @Override @Deprecated
+    @Override
+    @Deprecated
     public void runAtFixedRate(@NotNull SchedulerType schedulerType, @Nullable Object chunkOrLoc, long initialDelayTicks, long periodTicks, SchedulerCallBack callBack) {
         throw new UnsupportedOperationException();
     }
 
-    @Override @Deprecated
+    @Override
+    @Deprecated
     public void runAtFixedRate(@NotNull SchedulerType schedulerType, @Nullable Object chunkOrLocOrEntity, @Nullable Runnable retired, long initialDelayTicks, long periodTicks, SchedulerCallBack callBack) {
         throw new UnsupportedOperationException();
     }
 
-    @Override @Deprecated
+    @Override
+    @Deprecated
     public void runDelayed(@NotNull SchedulerType schedulerType, long delayTicks, SchedulerCallBack callBack) {
         this.runDelayed(schedulerType, callBack, delayTicks);
     }
 
-    @Override @Deprecated
+    @Override
+    @Deprecated
     public void runDelayed(@NotNull SchedulerType schedulerType, @Nullable Object chunkOrLoc, long delayTicks, SchedulerCallBack callBack) {
         throw new UnsupportedOperationException();
     }
 
-    @Override @Deprecated
+    @Override
+    @Deprecated
     public void runDelayed(@NotNull SchedulerType schedulerType, @Nullable Object chunkOrLocOrEntity, @Nullable Runnable retired, long delayTicks, SchedulerCallBack callBack) {
         throw new UnsupportedOperationException();
     }
 
-    @Override @Deprecated
+    @Override
+    @Deprecated
     public void execute(@NotNull SchedulerType schedulerType, SchedulerCallBack callBack) {
         this.runTask(schedulerType, callBack);
     }
 
-    @Override @Deprecated
+    @Override
+    @Deprecated
     public void execute(@NotNull SchedulerType schedulerType, @Nullable Object chunkOrLoc, SchedulerCallBack callBack) {
         throw new UnsupportedOperationException();
     }
 
-    @Override @Deprecated
+    @Override
+    @Deprecated
     public void execute(@NotNull SchedulerType schedulerType, @Nullable Object chunkOrLocOrEntity, @Nullable Runnable retired, SchedulerCallBack callBack) {
         throw new UnsupportedOperationException();
     }

src/main/java/fr/euphyllia/energie/executors/TaskRunnable.java

@@ -0,0 +1,6 @@
+package fr.euphyllia.energie.executors;
+
+@FunctionalInterface
+public interface TaskRunnable {
+    void run(ExecutorsSchedulerTask executorsSchedulerTask);
+}