Folia Support Using MineLib

.github/workflows/maven.yml

@@ -3,7 +3,7 @@
 
 # This workflow uses actions that are not certified by GitHub.
 # They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
+# separate terms of service, privacy policy, and support 
 # documentation.
 
 name: Java CI with Maven

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "editor.wordBasedSuggestions": "matchingDocuments"
+}

bukkit/pom.xml

@@ -103,5 +103,36 @@
             <version>3.0.2</version>
             <scope>compile</scope>
         </dependency>
+        <!-- MineLib -->
+        <dependency>
+            <groupId>io.github.projectunified</groupId>
+            <artifactId>minelib-scheduler-entity</artifactId>
+            <version>1.2.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.projectunified</groupId>
+            <artifactId>minelib-scheduler-global</artifactId>
+            <version>1.2.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.projectunified</groupId>
+            <artifactId>minelib-scheduler-async</artifactId>
+            <version>1.2.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.projectunified</groupId>
+            <artifactId>minelib-scheduler-canceller</artifactId>
+            <version>1.2.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.projectunified</groupId>
+            <artifactId>minelib-scheduler-common</artifactId>
+            <version>1.2.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

bukkit/src/main/java/net/leaderos/plugin/Bukkit.java

@@ -30,6 +30,9 @@
 import org.bstats.bukkit.Metrics;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
+import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
+import io.github.projectunified.minelib.scheduler.common.task.Task;
+import io.github.projectunified.minelib.scheduler.global.GlobalScheduler;
 
 import java.io.File;
 
@@ -184,7 +187,7 @@ public void setupFiles() {
     }
 
     public void checkUpdate() {
-        org.bukkit.Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getInstance(), () -> {
+        AsyncScheduler.get(this).run(() -> {
             PluginUpdater updater = new PluginUpdater(getDescription().getVersion());
             try {
                 if (updater.checkForUpdates()) {
@@ -197,7 +200,6 @@ public void checkUpdate() {
             } catch (Exception ignored) {}
         });
     }
-
     /**
      * Constructor of Main class
      */

bukkit/src/main/java/net/leaderos/plugin/modules/auth/commands/AuthCommand.java

@@ -11,6 +11,9 @@
 import net.leaderos.shared.helpers.RequestUtil;
 import net.leaderos.shared.modules.auth.AuthHelper;
 import org.bukkit.entity.Player;
+import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
+import io.github.projectunified.minelib.scheduler.common.task.Task;
+import io.github.projectunified.minelib.scheduler.global.GlobalScheduler;
 
 /**
  * Auth commands
@@ -20,7 +23,7 @@
 @RequiredArgsConstructor
 @Command(value = "auth", alias = {"authy", "kayit", "site", "web"})
 public class AuthCommand extends BaseCommand {
-
+    private static Bukkit instance;
     /**
      * Default command of auth
      * @param player executor
@@ -35,7 +38,7 @@ public void defaultCommand(Player player) {
 
         RequestUtil.addRequest(player.getUniqueId());
 
-        org.bukkit.Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getInstance(), () -> {
+        AsyncScheduler.get(instance).run(() -> {
             String link = AuthHelper.getAuthLink(player.getName(), player.getUniqueId());
             if (link != null)
                 player.spigot().sendMessage(

bukkit/src/main/java/net/leaderos/plugin/modules/bazaar/gui/BazaarAddItemGui.java

@@ -21,6 +21,9 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
+import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
+import io.github.projectunified.minelib.scheduler.common.task.Task;
+import io.github.projectunified.minelib.scheduler.global.GlobalScheduler;
 
 import java.net.HttpURLConnection;
 import java.text.SimpleDateFormat;
@@ -41,6 +44,7 @@ public class BazaarAddItemGui {
      */
     public BazaarAddItemGui() {}
 
+    private static Bukkit instance;
 
     /**
      * Opens gui to player
@@ -113,7 +117,7 @@ public static void showGui(Player player, int itemAmount) {
                         String modelId = ItemUtil.getModelId(item);
                         String enchantment = ItemUtil.getEnchantments(item);
 
-                        org.bukkit.Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getInstance(), () -> {
+                        AsyncScheduler.get(instance).run(() -> {
                             // Sends response
                             try {
                                 Response postBazaarItem = new AddBazaarItemRequest(userId, name, lore, amount, maxDurability, durability, base64, price, creationDate, modelId, enchantment, serverId, material.name()).getResponse();

bukkit/src/main/java/net/leaderos/plugin/modules/bazaar/gui/BazaarGui.java

@@ -14,6 +14,9 @@
 import net.leaderos.shared.helpers.RequestUtil;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
+import io.github.projectunified.minelib.scheduler.common.task.Task;
+import io.github.projectunified.minelib.scheduler.global.GlobalScheduler;
 
 import java.util.List;
 
@@ -28,6 +31,10 @@ public class BazaarGui {
      * Constructor of gui
      */
     public BazaarGui() {}
+    /**
+     * Instance of plugin
+     */
+    private static Bukkit instance;
 
     /**
      * Opens gui to player
@@ -42,7 +49,7 @@ public static void showGui(Player player) {
 
         RequestUtil.addRequest(player.getUniqueId());
 
-        org.bukkit.Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getInstance(), () -> {
+        AsyncScheduler.get(instance).run(() -> {
             // Gui template as array
             String[] layout = Bukkit.getInstance().getModulesFile().getBazaar().getGui().getLayout().toArray(new String[0]);
             // Inventory object
@@ -85,7 +92,7 @@ public static void showGui(Player player) {
                                         String subtitleProgress = ChatUtil.color(Bukkit.getInstance().getLangFile().getGui().getBazaarGui().getWithdrawProgressSubtitle());
                                         player.sendTitle(title, subtitleProgress);
 
-                                        org.bukkit.Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getInstance(), () -> {
+                                        AsyncScheduler.get(instance).run(() -> {
                                             Error error = playerBazaarItem.withdrawItem(player);
                                             if (error == null)
                                                 player.sendTitle(title, subtitleSuccess);
@@ -105,7 +112,7 @@ else if (error == Error.DELETE_ERROR)
             gui.addElement(GuiHelper.createNextPage(Bukkit.getInstance().getModulesFile().getBazaar().getGui().getNextPage().getItem()));
             gui.addElement(GuiHelper.createPreviousPage(Bukkit.getInstance().getModulesFile().getBazaar().getGui().getPreviousPage().getItem()));
 
-            org.bukkit.Bukkit.getScheduler().runTask(Bukkit.getInstance(), () -> {
+            GlobalScheduler.get(instance).run(() -> {
                 gui.show(player);
             });
         });

bukkit/src/main/java/net/leaderos/plugin/modules/cache/listeners/LoginListener.java

@@ -5,6 +5,9 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerLoginEvent;
+import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
+import io.github.projectunified.minelib.scheduler.common.task.Task;
+import io.github.projectunified.minelib.scheduler.global.GlobalScheduler;
 
 /**
  * Login listener class
@@ -13,12 +16,14 @@
  */
 public class LoginListener implements Listener {
 
+    private static Bukkit instance;
+
     /**
      * Login event of player
      * @param event LoginEvent
      */
     @EventHandler
     public void playerLoginEvent(PlayerLoginEvent event) {
-        org.bukkit.Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getInstance(), () -> User.loadPlayerCache(event.getPlayer()));
+       AsyncScheduler.get(instance).run(() -> User.loadPlayerCache(event.getPlayer()));
     }
 }

bukkit/src/main/java/net/leaderos/plugin/modules/cache/listeners/QuitListener.java

@@ -5,6 +5,9 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
+import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
+import io.github.projectunified.minelib.scheduler.common.task.Task;
+import io.github.projectunified.minelib.scheduler.global.GlobalScheduler;
 
 /**
  * Quit listener for remove cache
@@ -19,13 +22,15 @@ public class QuitListener implements Listener {
      */
     public QuitListener(){}
 
+    private static Bukkit instance;
+
     /**
      * QuitListener for remove cache
      * @param event QuitEvent
      */
     @EventHandler
     public void quitListener(PlayerQuitEvent event) {
-        org.bukkit.Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getInstance(), () -> User.unloadPlayerCache(event.getPlayer().getName()));
+        AsyncScheduler.get(instance).run(() -> User.unloadPlayerCache(event.getPlayer().getName()));
     }
 
 }

bukkit/src/main/java/net/leaderos/plugin/modules/cache/model/User.java

@@ -10,6 +10,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
+import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
+import io.github.projectunified.minelib.scheduler.common.task.Task;
+import io.github.projectunified.minelib.scheduler.global.GlobalScheduler;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -33,6 +36,8 @@ public class User {
     @Getter
     private static HashMap<String, User> userList = new HashMap<>();
 
+    private static Bukkit instance;
+
     /**
      * Gets one player @Nullable
      * @param name - player name
@@ -142,7 +147,7 @@ public static boolean isPlayerAuthed(Player player) {
      * loads all player data
      */
     public static void loadAllPlayers() {
-        org.bukkit.Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getInstance(), () ->
+        AsyncScheduler.get(instance).run(() ->
                 org.bukkit.Bukkit.getOnlinePlayers().forEach(User::loadPlayerCache));
     }
 

bukkit/src/main/java/net/leaderos/plugin/modules/connect/ConnectModule.java

@@ -9,6 +9,9 @@
 import net.leaderos.shared.modules.connect.socket.SocketClient;
 import net.leaderos.shared.modules.connect.data.CommandsQueue;
 import org.bukkit.event.HandlerList;
+import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
+import io.github.projectunified.minelib.scheduler.common.task.Task;
+import io.github.projectunified.minelib.scheduler.global.GlobalScheduler;
 
 import java.net.URISyntaxException;
 import java.util.List;
@@ -22,6 +25,8 @@
 @Getter
 public class ConnectModule extends LeaderOSModule {
 
+    private static Bukkit instance;
+
     /**
      * Socket client for connect to leaderos
      */
@@ -75,7 +80,7 @@ public void executeCommands(List<String> commands, String username) {
                         });
                     } else {
                         // Execute commands
-                        org.bukkit.Bukkit.getScheduler().runTask(Bukkit.getInstance(), () -> {
+                        GlobalScheduler.get(instance).run(() -> {
                             commands.forEach(command -> {
                                 org.bukkit.Bukkit.dispatchCommand(org.bukkit.Bukkit.getConsoleSender(), command);
 

bukkit/src/main/java/net/leaderos/plugin/modules/connect/listeners/LoginListener.java

@@ -8,6 +8,10 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
+import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
+import io.github.projectunified.minelib.scheduler.common.task.Task;
+import io.github.projectunified.minelib.scheduler.global.GlobalScheduler;
+import io.github.projectunified.minelib.scheduler.entity.EntityScheduler;
 
 import java.util.List;
 
@@ -18,6 +22,8 @@
  * @since 1.0
  */
 public class LoginListener implements Listener {
+
+    private static Bukkit instance;
 
     /**
      * Listens player join event to execute commands
@@ -34,7 +40,7 @@ public void onJoin(PlayerJoinEvent event) {
             if (commands == null || commands.isEmpty()) return;
 
             // Execute commands
-            org.bukkit.Bukkit.getScheduler().runTaskLater(Bukkit.getInstance(), () -> {
+            EntityScheduler.get(instance, player).runLater(() -> {
                 if (!player.isOnline()) return;
 
                 commands.forEach(command -> {