PlayerKits2 Folia

README.md

@@ -1,3 +1,16 @@
 # PlayerKits2
 https://www.spigotmc.org/resources/playerkits-2-fully-configurable-kits-1-8-1-20.112616/
+
+# Unofficial Discord 
+
+https://discord.gg/aT9z7q7hX8
+
+# Building instructions
+
+mvn clean install
 
+# Folia inquisitors
+
+[<img src="https://github.com/Folia-Inquisitors.png" width=80 alt="Folia-Inquisitors">](https://github.com/orgs/Folia-Inquisitors/repositories)
+[<img src="https://github.com/KaspianDev.png" width=80 alt="KaspianDev">](https://github.com/KaspianDev)
+[<img src="https://github.com/HSGamer.png" width=80 alt="HSGamer">](https://github.com/HSGamer)

pom.xml

@@ -21,7 +21,7 @@
         </repository>
         <repository>
             <id>placeholderapi</id>
-            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+            <url>https://repo.extendedclip.com/releases/</url>
         </repository>
         <repository>
             <id>jitpack.io</id>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.1</version>
+            <version>2.11.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -64,6 +64,26 @@
             <version>4.0.3</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>io.github.projectunified</groupId>
+            <artifactId>minelib-scheduler-common</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.projectunified</groupId>
+            <artifactId>minelib-scheduler-entity</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.projectunified</groupId>
+            <artifactId>minelib-scheduler-async</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.projectunified</groupId>
+            <artifactId>minelib-scheduler-global</artifactId>
+            <version>1.2.1</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -89,7 +109,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.5.2</version>
                 <configuration>
                 </configuration>
                 <executions>
@@ -107,6 +127,10 @@
                                         <include>com.zaxxer.hikari.**</include>
                                     </includes>
                                 </relocation>
+                                <relocation>
+                                    <pattern>io.github.projectunified.minelib</pattern>
+                                    <shadedPattern>pk.ajneb97.libs.minelib</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>

src/main/java/pk/ajneb97/database/MySQLConnection.java

@@ -1,8 +1,9 @@
 package pk.ajneb97.database;
 
+import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
+import io.github.projectunified.minelib.scheduler.global.GlobalScheduler;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.scheduler.BukkitRunnable;
 import pk.ajneb97.PlayerKits2;
 import pk.ajneb97.managers.MessagesManager;
 import pk.ajneb97.model.PlayerData;
@@ -115,7 +116,7 @@ public void createTables() {
     }
 
     public void getPlayer(String uuid,PlayerCallback callback){
-        new BukkitRunnable(){
+        AsyncScheduler.get(plugin).run(new Runnable(){
             @Override
             public void run() {
                 PlayerData player = null;
@@ -154,21 +155,21 @@ public void run() {
                     }
 
                     PlayerData finalPlayer = player;
-                    new BukkitRunnable(){
+                    GlobalScheduler.get(plugin).run(new Runnable(){
                         @Override
                         public void run() {
                             callback.onDone(finalPlayer);
                         }
-                    }.runTask(plugin);
+                    });
                 } catch (SQLException e) {
                     e.printStackTrace();
                 }
             }
-        }.runTaskAsynchronously(plugin);
+        });
     }
 
     public void createPlayer(PlayerData player,SimpleCallback callback){
-        new BukkitRunnable(){
+        AsyncScheduler.get(plugin).run(new Runnable(){
             @Override
             public void run() {
                 try(Connection connection = getConnection()){
@@ -180,21 +181,21 @@ public void run() {
                     statement.setString(2, player.getName());
                     statement.executeUpdate();
 
-                    new BukkitRunnable(){
+                    GlobalScheduler.get(plugin).run(new Runnable(){
                         @Override
                         public void run() {
                             callback.onDone();
                         }
-                    }.runTask(plugin);
+                    });
                 } catch (SQLException e) {
                     e.printStackTrace();
                 }
             }
-        }.runTaskAsynchronously(plugin);
+        });
     }
 
     public void updatePlayerName(PlayerData player){
-        new BukkitRunnable(){
+        AsyncScheduler.get(plugin).run(new Runnable(){
             @Override
             public void run() {
                 try(Connection connection = getConnection()){
@@ -209,11 +210,11 @@ public void run() {
                     e.printStackTrace();
                 }
             }
-        }.runTaskAsynchronously(plugin);
+        });
     }
 
     public void updateKit(PlayerData player,PlayerDataKit kit,boolean mustCreate){
-        new BukkitRunnable(){
+        AsyncScheduler.get(plugin).run(new Runnable(){
             @Override
             public void run() {
                 try(Connection connection = getConnection()){
@@ -246,11 +247,11 @@ public void run() {
                     e.printStackTrace();
                 }
             }
-        }.runTaskAsynchronously(plugin);
+        });
     }
 
     public void resetKit(String uuid,String kitName,boolean all){
-        new BukkitRunnable(){
+        AsyncScheduler.get(plugin).run(new Runnable(){
             @Override
             public void run() {
                 try(Connection connection = getConnection()){
@@ -274,6 +275,6 @@ public void run() {
                     e.printStackTrace();
                 }
             }
-        }.runTaskAsynchronously(plugin);
+        });
     }
 }

src/main/java/pk/ajneb97/libs/actionbar/ActionBarAPI.java

@@ -1,10 +1,10 @@
 package pk.ajneb97.libs.actionbar;
 
+import io.github.projectunified.minelib.scheduler.entity.EntityScheduler;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 import pk.ajneb97.PlayerKits2;
 import pk.ajneb97.managers.MessagesManager;
 import pk.ajneb97.utils.OtherUtils;
@@ -80,23 +80,13 @@ public static void sendActionBar(final Player player, final String message, int
 
       if (duration > 0) {
           // Sends empty message at the end of the duration. Allows messages shorter than 3 seconds, ensures precision.
-          new BukkitRunnable() {
-              @Override
-              public void run() {
-            	  sendActionBar(player, "");
-              }
-          }.runTaskLater(plugin, duration + 1);
+          EntityScheduler.get(plugin, player).runLater(() -> sendActionBar(player, ""), duration + 1);
       }
 
       // Re-sends the messages every 3 seconds so it doesn't go away from the player's screen.
       while (duration > 40) {
           duration -= 40;
-          new BukkitRunnable() {
-              @Override
-              public void run() {
-                  sendActionBar(player, message);
-              }
-          }.runTaskLater(plugin, (long) duration);
+          EntityScheduler.get(plugin, player).runLater(() -> sendActionBar(player, message), duration);
       }
   }
 

src/main/java/pk/ajneb97/listeners/InventoryEditListener.java

@@ -1,5 +1,6 @@
 package pk.ajneb97.listeners;
 
+import io.github.projectunified.minelib.scheduler.entity.EntityScheduler;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -9,7 +10,6 @@
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
-import org.bukkit.scheduler.BukkitRunnable;
 import pk.ajneb97.PlayerKits2;
 import pk.ajneb97.managers.edit.InventoryEditManager;
 import pk.ajneb97.model.inventory.InventoryPlayer;
@@ -76,12 +76,9 @@ public void onChat(AsyncPlayerChatEvent event){
         InventoryPlayer inventoryPlayer = invManager.getInventoryPlayer(player);
         if(inventoryPlayer != null) {
             event.setCancelled(true);
-            new BukkitRunnable(){
-                @Override
-                public void run() {
-                    invManager.writeChat(inventoryPlayer, ChatColor.stripColor(event.getMessage()));
-                }
-            }.runTaskLater(plugin,1L);
+            EntityScheduler.get(plugin, player).run(
+                    () -> invManager.writeChat(inventoryPlayer, ChatColor.stripColor(event.getMessage()))
+            );
         }
     }
 }

src/main/java/pk/ajneb97/managers/InventoryManager.java

@@ -2,7 +2,6 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -285,14 +284,14 @@ public void clickOnOpenInventoryItem(InventoryPlayer inventoryPlayer,String open
 
     public void clickOnCommandItem(InventoryPlayer inventoryPlayer,String itemCommands){
         String[] sep = itemCommands.split("\\|");
-        ConsoleCommandSender sender = Bukkit.getConsoleSender();
         for(String c : sep) {
             if(c.startsWith("msg %player% ")) {
                 inventoryPlayer.getPlayer().sendMessage(MessagesManager.getColoredMessage(c.replace("msg %player% ", "")));
             }else if(c.equals("close_inventory")){
                 inventoryPlayer.getPlayer().closeInventory();
             }else{
-                Bukkit.dispatchCommand(sender, c.replace("%player%", inventoryPlayer.getPlayer().getName()));
+                String command = c.replace("%player%", inventoryPlayer.getPlayer().getName());
+                ActionUtils.consoleCommand(plugin, command);
             }
         }
     }

src/main/java/pk/ajneb97/managers/KitsManager.java

@@ -397,10 +397,10 @@ public void executeAction(Player player,String actionText){
                 ActionUtils.message(player,actionLine);
                 break;
             case "console_command":
-                ActionUtils.consoleCommand(actionLine);
+                ActionUtils.consoleCommand(plugin, actionLine);
                 break;
             case "player_command":
-                ActionUtils.playerCommand(player,actionLine);
+                ActionUtils.playerCommand(plugin, player,actionLine);
                 break;
             case "playsound":
                 ActionUtils.playSound(player,actionLine);

src/main/java/pk/ajneb97/managers/MigrationManager.java

@@ -1,8 +1,8 @@
 package pk.ajneb97.managers;
 
+import io.github.projectunified.minelib.scheduler.async.AsyncScheduler;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.scheduler.BukkitRunnable;
 import pk.ajneb97.PlayerKits2;
 import pk.ajneb97.configs.KitsConfigManager;
 import pk.ajneb97.configs.PlayersConfigManager;
@@ -23,15 +23,12 @@ public MigrationManager(PlayerKits2 plugin){
     }
 
     public void migrate(CommandSender sender){
-        new BukkitRunnable(){
-            @Override
-            public void run() {
-                migrateKits(sender);
-                migratePlayers(sender);
+        AsyncScheduler.get(plugin).run(() -> {
+            migrateKits(sender);
+            migratePlayers(sender);
 
-                sender.sendMessage(PlayerKits2.prefix+MessagesManager.getColoredMessage(" &aMigration completed."));
-            }
-        }.runTaskAsynchronously(plugin);
+            sender.sendMessage(PlayerKits2.prefix+MessagesManager.getColoredMessage(" &aMigration completed."));
+        });
     }
 
     public void migrateKits(CommandSender sender){

src/main/java/pk/ajneb97/managers/edit/InventoryEditPositionManager.java

@@ -1,13 +1,13 @@
 package pk.ajneb97.managers.edit;
 
+import io.github.projectunified.minelib.scheduler.entity.EntityScheduler;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.scheduler.BukkitRunnable;
 import pk.ajneb97.PlayerKits2;
 import pk.ajneb97.managers.*;
 import pk.ajneb97.model.Kit;
@@ -146,13 +146,12 @@ public void clickInventory(InventoryPlayer inventoryPlayer, ItemStack item, int
     public void closeInventory(InventoryPlayer inventoryPlayer){
         boolean mustReturn = Boolean.parseBoolean(inventoryPlayer.getInventoryName().split(";")[2]);
         if(mustReturn){
-            new BukkitRunnable(){
-                @Override
-                public void run() {
-                    inventoryPlayer.restoreSavedInventoryContents();
-                    inventoryEditManager.openInventory(inventoryPlayer);
-                }
-            }.runTaskLater(plugin,1L);
+            EntityScheduler.get(plugin, inventoryPlayer.getPlayer()).run(
+                    () -> {
+                        inventoryPlayer.restoreSavedInventoryContents();
+                        inventoryEditManager.openInventory(inventoryPlayer);
+                    }
+            );
         }
     }
 }

src/main/java/pk/ajneb97/tasks/InventoryUpdateTaskManager.java

@@ -1,9 +1,9 @@
 package pk.ajneb97.tasks;
 
+import io.github.projectunified.minelib.scheduler.global.GlobalScheduler;
 import org.bukkit.Material;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.scheduler.BukkitRunnable;
 import pk.ajneb97.PlayerKits2;
 import pk.ajneb97.managers.*;
 import pk.ajneb97.model.inventory.InventoryPlayer;
@@ -20,12 +20,7 @@ public InventoryUpdateTaskManager(PlayerKits2 plugin){
     }
 
     public void start(){
-        new BukkitRunnable(){
-            @Override
-            public void run() {
-                execute();
-            }
-        }.runTaskTimer(plugin,0L,20L);
+        GlobalScheduler.get(plugin).runTimer(this::execute, 0L, 20L);
     }
 
     public void execute(){