apply SchedulerUtil

HSGamer · HSGamer · commit 1cf1e7411a41 · 2024-07-12T15:26:34.000+07:00
diff --git a/src/main/java/me/hsgamer/bettergui/action/ClickActionHandler.java b/src/main/java/me/hsgamer/bettergui/action/ClickActionHandler.java
@@ -1,9 +1,8 @@
 package me.hsgamer.bettergui.action;
 
-import io.github.projectunified.minelib.scheduler.entity.EntityScheduler;
-import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.api.menu.Menu;
 import me.hsgamer.bettergui.util.ProcessApplierConstants;
+import me.hsgamer.bettergui.util.SchedulerUtil;
 import me.hsgamer.hscore.bukkit.clicktype.BukkitClickType;
 import me.hsgamer.hscore.bukkit.clicktype.ClickTypeUtils;
 import me.hsgamer.hscore.collections.map.CaseInsensitiveStringMap;
@@ -78,7 +77,7 @@ public void apply(UUID uuid, BukkitClickType clickType, BatchRunnable batchRunna
       Optional.ofNullable(Bukkit.getPlayer(uuid))
         .ifPresent(player ->
           batchRunnable.getTaskPool(ProcessApplierConstants.ACTION_STAGE).addLast(process ->
-            EntityScheduler.get(BetterGUI.getInstance(), player)
+            SchedulerUtil.entity(player)
               .run(() -> {
                 try {
                   menu.close(player);
diff --git a/src/main/java/me/hsgamer/bettergui/action/type/BackAction.java b/src/main/java/me/hsgamer/bettergui/action/type/BackAction.java
@@ -1,9 +1,8 @@
 package me.hsgamer.bettergui.action.type;
 
-import io.github.projectunified.minelib.scheduler.entity.EntityScheduler;
-import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.Permissions;
 import me.hsgamer.bettergui.api.menu.Menu;
+import me.hsgamer.bettergui.util.SchedulerUtil;
 import me.hsgamer.hscore.action.common.Action;
 import me.hsgamer.hscore.common.StringReplacer;
 import me.hsgamer.hscore.task.element.TaskProcess;
@@ -30,7 +29,7 @@ public void apply(UUID uuid, TaskProcess process, StringReplacer stringReplacer)
     Runnable runnable = menu.getParentMenu(uuid)
       .<Runnable>map(parentMenu -> () -> parentMenu.create(player, new String[0], player.hasPermission(Permissions.OPEN_MENU_BYPASS)))
       .orElse(player::closeInventory);
-    EntityScheduler.get(BetterGUI.getInstance(), player)
+    SchedulerUtil.entity(player)
       .run(() -> {
         try {
           runnable.run();
diff --git a/src/main/java/me/hsgamer/bettergui/action/type/CloseMenuAction.java b/src/main/java/me/hsgamer/bettergui/action/type/CloseMenuAction.java
@@ -1,8 +1,7 @@
 package me.hsgamer.bettergui.action.type;
 
-import io.github.projectunified.minelib.scheduler.entity.EntityScheduler;
-import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.api.menu.Menu;
+import me.hsgamer.bettergui.util.SchedulerUtil;
 import me.hsgamer.hscore.action.common.Action;
 import me.hsgamer.hscore.common.StringReplacer;
 import me.hsgamer.hscore.task.element.TaskProcess;
@@ -25,7 +24,7 @@ public void apply(UUID uuid, TaskProcess process, StringReplacer stringReplacer)
       process.next();
       return;
     }
-    EntityScheduler.get(BetterGUI.getInstance(), player)
+    SchedulerUtil.entity(player)
       .run(() -> {
         try {
           menu.close(player);
diff --git a/src/main/java/me/hsgamer/bettergui/action/type/OpenMenuAction.java b/src/main/java/me/hsgamer/bettergui/action/type/OpenMenuAction.java
@@ -1,11 +1,11 @@
 package me.hsgamer.bettergui.action.type;
 
-import io.github.projectunified.minelib.scheduler.entity.EntityScheduler;
 import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.api.menu.Menu;
 import me.hsgamer.bettergui.builder.ActionBuilder;
 import me.hsgamer.bettergui.config.MessageConfig;
 import me.hsgamer.bettergui.manager.MenuManager;
+import me.hsgamer.bettergui.util.SchedulerUtil;
 import me.hsgamer.hscore.action.common.Action;
 import me.hsgamer.hscore.bukkit.utils.MessageUtils;
 import me.hsgamer.hscore.common.StringReplacer;
@@ -49,7 +49,7 @@ public void apply(UUID uuid, TaskProcess process, StringReplacer stringReplacer)
     if (getInstance().get(MenuManager.class).contains(menu)) {
       String[] finalArgs = args;
       Menu parentMenu = this.menu;
-      EntityScheduler.get(BetterGUI.getInstance(), player)
+      SchedulerUtil.entity(player)
         .run(() -> {
           try {
             getInstance().get(MenuManager.class).openMenu(menu, player, finalArgs, parentMenu, bypass);
diff --git a/src/main/java/me/hsgamer/bettergui/action/type/SoundAction.java b/src/main/java/me/hsgamer/bettergui/action/type/SoundAction.java
@@ -1,7 +1,6 @@
 package me.hsgamer.bettergui.action.type;
 
-import io.github.projectunified.minelib.scheduler.entity.EntityScheduler;
-import me.hsgamer.bettergui.BetterGUI;
+import me.hsgamer.bettergui.util.SchedulerUtil;
 import me.hsgamer.hscore.action.common.Action;
 import me.hsgamer.hscore.common.StringReplacer;
 import me.hsgamer.hscore.task.element.TaskProcess;
@@ -55,7 +54,7 @@ public void apply(UUID uuid, TaskProcess process, StringReplacer stringReplacer)
 
     float finalVolume = volume;
     float finalPitch = pitch;
-    EntityScheduler.get(BetterGUI.getInstance(), player)
+    SchedulerUtil.entity(player)
       .run(() -> {
         try {
           Sound soundEnum = Sound.valueOf(sound.replace(" ", "_").toUpperCase());
diff --git a/src/main/java/me/hsgamer/bettergui/action/type/UpdateMenuAction.java b/src/main/java/me/hsgamer/bettergui/action/type/UpdateMenuAction.java
@@ -1,8 +1,7 @@
 package me.hsgamer.bettergui.action.type;
 
-import io.github.projectunified.minelib.scheduler.entity.EntityScheduler;
-import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.api.menu.Menu;
+import me.hsgamer.bettergui.util.SchedulerUtil;
 import me.hsgamer.hscore.action.common.Action;
 import me.hsgamer.hscore.common.StringReplacer;
 import me.hsgamer.hscore.task.element.TaskProcess;
@@ -25,7 +24,7 @@ public void apply(UUID uuid, TaskProcess process, StringReplacer stringReplacer)
       process.next();
       return;
     }
-    EntityScheduler.get(BetterGUI.getInstance(), player)
+    SchedulerUtil.entity(player)
       .run(() -> {
         try {
           menu.update(player);
diff --git a/src/main/java/me/hsgamer/bettergui/argument/type/SingleArgumentProcessor.java b/src/main/java/me/hsgamer/bettergui/argument/type/SingleArgumentProcessor.java
@@ -1,9 +1,8 @@
 package me.hsgamer.bettergui.argument.type;
 
-import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
-import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.builder.ArgumentProcessorBuilder;
 import me.hsgamer.bettergui.util.ProcessApplierConstants;
+import me.hsgamer.bettergui.util.SchedulerUtil;
 import me.hsgamer.hscore.common.Pair;
 import me.hsgamer.hscore.task.BatchRunnable;
 
@@ -36,7 +35,7 @@ public Optional<String[]> process(UUID uuid, String[] args) {
     if (args.length == 0) {
       BatchRunnable batchRunnable = new BatchRunnable();
       batchRunnable.getTaskPool(ProcessApplierConstants.ACTION_STAGE).addLast(process -> onRequiredActionApplier.accept(uuid, process));
-      AsyncScheduler.get(BetterGUI.getInstance()).run(batchRunnable);
+      SchedulerUtil.async().run(batchRunnable);
       return Optional.empty();
     }
 
@@ -47,7 +46,7 @@ public Optional<String[]> process(UUID uuid, String[] args) {
     if (!object.isPresent()) {
       BatchRunnable batchRunnable = new BatchRunnable();
       batchRunnable.getTaskPool(ProcessApplierConstants.ACTION_STAGE).addLast(process -> onInvalidActionApplier.accept(uuid, process));
-      AsyncScheduler.get(BetterGUI.getInstance()).run(batchRunnable);
+      SchedulerUtil.async().run(batchRunnable);
       return Optional.empty();
     }
 
diff --git a/src/main/java/me/hsgamer/bettergui/argument/type/StoreArgumentProcessor.java b/src/main/java/me/hsgamer/bettergui/argument/type/StoreArgumentProcessor.java
@@ -1,9 +1,8 @@
 package me.hsgamer.bettergui.argument.type;
 
-import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
-import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.builder.ArgumentProcessorBuilder;
 import me.hsgamer.bettergui.util.ProcessApplierConstants;
+import me.hsgamer.bettergui.util.SchedulerUtil;
 import me.hsgamer.hscore.common.CollectionUtils;
 import me.hsgamer.hscore.common.MapUtils;
 import me.hsgamer.hscore.common.Pair;
@@ -54,7 +53,7 @@ public Optional<String[]> process(UUID uuid, String[] args) {
     if (length > 0 && args.length < length) {
       BatchRunnable batchRunnable = new BatchRunnable();
       batchRunnable.getTaskPool(ProcessApplierConstants.ACTION_STAGE).addLast(process -> onRequiredActionApplier.accept(uuid, process));
-      AsyncScheduler.get(BetterGUI.getInstance()).run(batchRunnable);
+      SchedulerUtil.async().run(batchRunnable);
       return Optional.empty();
     }
 
@@ -72,7 +71,7 @@ public Optional<String[]> process(UUID uuid, String[] args) {
     if (checkSuggestion && !suggestions.isEmpty() && !suggestions.contains(current)) {
       BatchRunnable batchRunnable = new BatchRunnable();
       batchRunnable.getTaskPool(ProcessApplierConstants.ACTION_STAGE).addLast(process -> onInvalidActionApplier.accept(uuid, process));
-      AsyncScheduler.get(BetterGUI.getInstance()).run(batchRunnable);
+      SchedulerUtil.async().run(batchRunnable);
       return Optional.empty();
     }
 
diff --git a/src/main/java/me/hsgamer/bettergui/button/ActionButton.java b/src/main/java/me/hsgamer/bettergui/button/ActionButton.java
@@ -1,11 +1,11 @@
 package me.hsgamer.bettergui.button;
 
-import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
 import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.action.ClickActionHandler;
 import me.hsgamer.bettergui.api.button.BaseWrappedButton;
 import me.hsgamer.bettergui.builder.ButtonBuilder;
 import me.hsgamer.bettergui.config.MainConfig;
+import me.hsgamer.bettergui.util.SchedulerUtil;
 import me.hsgamer.hscore.bukkit.clicktype.BukkitClickType;
 import me.hsgamer.hscore.bukkit.clicktype.ClickTypeUtils;
 import me.hsgamer.hscore.bukkit.gui.event.BukkitClickEvent;
@@ -42,7 +42,7 @@ protected B createButton(Map<String, Object> section) {
       BukkitClickType clickType = ClickTypeUtils.getClickTypeFromEvent(bukkitClickEvent.getEvent(), BetterGUI.getInstance().get(MainConfig.class).isModernClickType());
       BatchRunnable batchRunnable = new BatchRunnable();
       clickActionHandler.apply(clickEvent.getViewerID(), clickType, batchRunnable);
-      AsyncScheduler.get(BetterGUI.getInstance()).run(batchRunnable);
+      SchedulerUtil.async().run(batchRunnable);
     });
   }
 }
diff --git a/src/main/java/me/hsgamer/bettergui/button/WrappedPredicateButton.java b/src/main/java/me/hsgamer/bettergui/button/WrappedPredicateButton.java
@@ -1,6 +1,5 @@
 package me.hsgamer.bettergui.button;
 
-import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
 import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.api.button.BaseWrappedButton;
 import me.hsgamer.bettergui.api.button.WrappedButton;
@@ -9,6 +8,7 @@
 import me.hsgamer.bettergui.config.MainConfig;
 import me.hsgamer.bettergui.requirement.RequirementApplier;
 import me.hsgamer.bettergui.util.ProcessApplierConstants;
+import me.hsgamer.bettergui.util.SchedulerUtil;
 import me.hsgamer.hscore.bukkit.clicktype.BukkitClickType;
 import me.hsgamer.hscore.bukkit.clicktype.ClickTypeUtils;
 import me.hsgamer.hscore.bukkit.gui.event.BukkitClickEvent;
@@ -54,7 +54,7 @@ public static void applyRequirement(Map<String, Object> section, WrappedButton w
             result.applier.accept(uuid, process);
             process.next();
           });
-          AsyncScheduler.get(BetterGUI.getInstance()).run(batchRunnable);
+          SchedulerUtil.async().run(batchRunnable);
           return result.isSuccess;
         });
       });
@@ -73,7 +73,7 @@ public static void applyRequirement(Map<String, Object> section, WrappedButton w
                 result.applier.accept(clickEvent.getViewerID(), process);
                 process.next();
               });
-              AsyncScheduler.get(BetterGUI.getInstance()).run(batchRunnable);
+              SchedulerUtil.async().run(batchRunnable);
               return result.isSuccess;
             });
         });
diff --git a/src/main/java/me/hsgamer/bettergui/menu/BaseInventoryMenu.java b/src/main/java/me/hsgamer/bettergui/menu/BaseInventoryMenu.java
@@ -1,12 +1,10 @@
 package me.hsgamer.bettergui.menu;
 
-import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
 import io.github.projectunified.minelib.scheduler.common.task.Task;
-import io.github.projectunified.minelib.scheduler.entity.EntityScheduler;
-import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.api.requirement.Requirement;
 import me.hsgamer.bettergui.builder.InventoryBuilder;
 import me.hsgamer.bettergui.util.ProcessApplierConstants;
+import me.hsgamer.bettergui.util.SchedulerUtil;
 import me.hsgamer.bettergui.util.StringReplacerApplier;
 import me.hsgamer.bettergui.util.TickUtil;
 import me.hsgamer.hscore.bukkit.gui.BukkitGUIDisplay;
@@ -77,7 +75,7 @@ protected void onOpen(@NotNull OpenEvent event) {
         if (!openActionApplier.isEmpty()) {
           BatchRunnable batchRunnable = new BatchRunnable();
           batchRunnable.getTaskPool(ProcessApplierConstants.ACTION_STAGE).addLast(process -> openActionApplier.accept(uuid, process));
-          AsyncScheduler.get(BetterGUI.getInstance()).run(batchRunnable);
+          SchedulerUtil.async().run(batchRunnable);
         }
 
         Optional.ofNullable(updateTasks.get(uuid)).ifPresent(UpdateTask::start);
@@ -90,7 +88,7 @@ protected void onClose(@NotNull CloseEvent event) {
         if (!closeActionApplier.isEmpty()) {
           BatchRunnable batchRunnable = new BatchRunnable();
           batchRunnable.getTaskPool(ProcessApplierConstants.ACTION_STAGE).addLast(process -> closeActionApplier.accept(uuid, process));
-          AsyncScheduler.get(BetterGUI.getInstance()).run(batchRunnable);
+          SchedulerUtil.async().run(batchRunnable);
         }
 
         if (!closeRequirementApplier.isEmpty()) {
@@ -105,14 +103,14 @@ protected void onClose(@NotNull CloseEvent event) {
             result.applier.accept(uuid, process);
             process.next();
           });
-          AsyncScheduler.get(BetterGUI.getInstance()).run(batchRunnable);
+          SchedulerUtil.async().run(batchRunnable);
 
           if (!result.isSuccess) {
             event.setRemoveDisplay(false);
             guiHolder.getDisplay(uuid).ifPresent(display -> {
               Player player = Bukkit.getPlayer(uuid);
               if (player != null) {
-                EntityScheduler.get(BetterGUI.getInstance(), player).run(() -> player.openInventory(display.getInventory()));
+                SchedulerUtil.entity(player).run(() -> player.openInventory(display.getInventory()));
               }
             });
           }
@@ -241,7 +239,7 @@ private UpdateTask(Runnable runnable, long millis) {
     public void start() {
       if (task != null && !task.isCancelled()) return;
 
-      task = AsyncScheduler.get(BetterGUI.getInstance()).runTimer(() -> {
+      task = SchedulerUtil.async().runTimer(() -> {
         runnable.run();
         return true;
       }, millis, millis, TimeUnit.MILLISECONDS);
diff --git a/src/main/java/me/hsgamer/bettergui/menu/BaseMenu.java b/src/main/java/me/hsgamer/bettergui/menu/BaseMenu.java
@@ -1,7 +1,5 @@
 package me.hsgamer.bettergui.menu;
 
-import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
-import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.action.ActionApplier;
 import me.hsgamer.bettergui.api.menu.StandardMenu;
 import me.hsgamer.bettergui.api.requirement.Requirement;
@@ -10,6 +8,7 @@
 import me.hsgamer.bettergui.manager.MenuCommandManager;
 import me.hsgamer.bettergui.requirement.RequirementApplier;
 import me.hsgamer.bettergui.util.ProcessApplierConstants;
+import me.hsgamer.bettergui.util.SchedulerUtil;
 import me.hsgamer.hscore.bukkit.utils.MessageUtils;
 import me.hsgamer.hscore.bukkit.utils.PermissionUtils;
 import me.hsgamer.hscore.common.CollectionUtils;
@@ -121,7 +120,7 @@ public boolean create(Player player, String[] args, boolean bypass) {
         result.applier.accept(uuid, process);
         process.next();
       });
-      AsyncScheduler.get(BetterGUI.getInstance()).run(batchRunnable);
+      SchedulerUtil.async().run(batchRunnable);
 
       if (!result.isSuccess) {
         return false;
diff --git a/src/main/java/me/hsgamer/bettergui/menu/PredicateMenu.java b/src/main/java/me/hsgamer/bettergui/menu/PredicateMenu.java
@@ -1,6 +1,5 @@
 package me.hsgamer.bettergui.menu;
 
-import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
 import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.api.menu.StandardMenu;
 import me.hsgamer.bettergui.api.requirement.Requirement;
@@ -9,6 +8,7 @@
 import me.hsgamer.bettergui.manager.MenuManager;
 import me.hsgamer.bettergui.requirement.RequirementApplier;
 import me.hsgamer.bettergui.util.ProcessApplierConstants;
+import me.hsgamer.bettergui.util.SchedulerUtil;
 import me.hsgamer.bettergui.util.StringReplacerApplier;
 import me.hsgamer.hscore.bukkit.utils.PermissionUtils;
 import me.hsgamer.hscore.collections.map.CaseInsensitiveStringMap;
@@ -97,7 +97,7 @@ public boolean create(Player player, String[] args, boolean bypass) {
         result.applier.accept(uuid, process);
         process.next();
       });
-      AsyncScheduler.get(BetterGUI.getInstance()).run(batchRunnable);
+      SchedulerUtil.async().run(batchRunnable);
 
       if (result.isSuccess) {
         MenuProcess menuProcess = pair.getValue();
