Add Folia support

pom.xml

@@ -38,6 +38,10 @@
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/public/</url>
         </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
+        </repository>
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
@@ -70,6 +74,13 @@
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
+        <!-- Folia -->
+        <dependency>
+            <groupId>dev.folia</groupId>
+            <artifactId>folia-api</artifactId>
+            <version>1.21.4-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- JetBrains Annotations -->
         <dependency>
             <groupId>org.jetbrains</groupId>

src/main/java/emanondev/itemtag/actions/ActionHandler.java

@@ -3,6 +3,7 @@
 import emanondev.itemedit.utility.VersionUtils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;

src/main/java/emanondev/itemtag/actions/DelayedAction.java

@@ -1,10 +1,10 @@
 package emanondev.itemtag.actions;
 
 import emanondev.itemedit.utility.CompleteUtility;
-import emanondev.itemtag.ItemTag;
+import emanondev.itemtag.compability.FoliaRunnable;
+import emanondev.itemtag.compability.SchedulerUtils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -48,11 +48,11 @@ public String fixActionInfo(String actionInfo) {
     @Override
     public void execute(Player player, String text) {
         String[] args = text.split(" ");
-        new BukkitRunnable() {
+        SchedulerUtils.runTaskLater(player.getLocation(), new FoliaRunnable() {
             public void run() {
                 ActionHandler.handleAction(player, args[1], text.substring(args[0].length() + args[1].length() + 2));
             }
-        }.runTaskLater(ItemTag.get(), Long.parseLong(args[0]));
+        }, Long.parseLong(args[0]));
     }
 
     @Override

src/main/java/emanondev/itemtag/activity/action/DelayedActionType.java

@@ -3,6 +3,8 @@
 import emanondev.itemtag.ItemTag;
 import emanondev.itemtag.activity.ActionManager;
 import emanondev.itemtag.activity.ActionType;
+import emanondev.itemtag.compability.FoliaRunnable;
+import emanondev.itemtag.compability.SchedulerUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.inventory.ItemStack;
@@ -37,12 +39,12 @@ public DelayedAction(@NotNull String info) {
 
         @Override
         public boolean execute(@NotNull Player player, @NotNull ItemStack item, Event event) {
-            new BukkitRunnable() {
+            SchedulerUtils.runTaskLater(player.getLocation(), new FoliaRunnable() {
                 @Override
                 public void run() {
                     action.execute(player, item, event);
                 }
-            }.runTaskLater(ItemTag.get(), delay);
+            }, delay);
             return true;
         }
     }

src/main/java/emanondev/itemtag/command/itemtag/Effects.java

@@ -9,8 +9,11 @@
 import emanondev.itemtag.ItemTagUtility;
 import emanondev.itemtag.command.ItemTagCommand;
 import emanondev.itemtag.command.ListenerSubCmd;
+import emanondev.itemtag.compability.FoliaRunnable;
+import emanondev.itemtag.compability.SchedulerUtils;
 import emanondev.itemtag.equipmentchange.EquipmentChangeEvent;
 import emanondev.itemtag.gui.EffectsGui;
+import io.papermc.paper.threadedregions.scheduler.RegionScheduler;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
@@ -22,10 +25,10 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scheduler.BukkitRunnable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.reflect.Method;
 import java.util.*;
 
 public class Effects extends ListenerSubCmd {
@@ -269,7 +272,7 @@ public void onEquipChange(EquipmentChangeEvent event) {
 
     @EventHandler
     private void onPlayerRespawn(PlayerRespawnEvent event) {
-        new BukkitRunnable() {
+        SchedulerUtils.runTaskLater(event.getPlayer().getLocation(), new FoliaRunnable() {
             public void run() {
                 for (EquipmentSlot slot : ItemTagUtility.getPlayerEquipmentSlots()) {
                     ItemStack equip = getEquip(event.getPlayer(), slot);
@@ -303,7 +306,7 @@ else if (currentEffect.getAmplifier() <= effect.getAmplifier())
                     }
                 }
             }
-        }.runTaskLater(ItemTag.get(), 1L); //effect are resetted just after playerrespawnevent
+        }, 1L); //effect are resetted just after playerrespawnevent
 
     }
 
@@ -317,6 +320,26 @@ private void addEffect(@NotNull Player target, @NotNull PotionEffectType type, @
             target.addPotionEffect(effect);
             return;
         }
+        if(VersionUtils.hasFoliaAPI()) {
+            try {
+                Method getRegionScheduler = ItemTag.get().getServer().getClass().getMethod("getRegionScheduler");
+                RegionScheduler regionScheduler = (RegionScheduler) getRegionScheduler.invoke(ItemTag.get().getServer());
+                if (VersionUtils.isVersionAfter(1, 16)) {
+                    if (target.hasPotionEffect(effect.getType()))
+                        target.removePotionEffect(effect.getType());
+                    regionScheduler.execute(ItemTag.get(), target.getLocation(), () -> {
+                        target.addPotionEffect(effect);
+                    });
+                } else
+                    regionScheduler.execute(ItemTag.get(), target.getLocation(), () -> {
+                        target.addPotionEffect(effect, true);
+                    });
+            }catch (Exception e) {
+                ItemTag.get().log("Failed to get Folia RegionScheduler");
+                return;
+            }
+            return;
+        }
         if (VersionUtils.isVersionAfter(1, 16)) {
             if (target.hasPotionEffect(effect.getType()))
                 target.removePotionEffect(effect.getType());
@@ -328,7 +351,7 @@ private void addEffect(@NotNull Player target, @NotNull PotionEffectType type, @
     @EventHandler(ignoreCancelled = true)
     private void event(PlayerItemConsumeEvent event) {
         if (event.getItem().getType() == Material.MILK_BUCKET)
-            Bukkit.getScheduler().runTaskLater(this.getPlugin(), () -> restoreEffects(event.getPlayer()), 1L);
+            SchedulerUtils.runTaskLater(event.getPlayer().getLocation(), () -> restoreEffects(event.getPlayer()), 1L);
     }
 
     public void restoreEffects(Player p) {

src/main/java/emanondev/itemtag/command/itemtag/EffectsResurrectListener.java

@@ -1,5 +1,6 @@
 package emanondev.itemtag.command.itemtag;
 
+import emanondev.itemtag.compability.SchedulerUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -21,7 +22,7 @@ public class EffectsResurrectListener implements Listener {
     @EventHandler(ignoreCancelled = true)
     private void event(EntityResurrectEvent event) {
         if (event.getEntity() instanceof Player)
-            Bukkit.getScheduler().runTaskLater(parent.getPlugin(),
+            SchedulerUtils.runTaskLater(event.getEntity().getLocation(),
                     () -> {
                         List<PotionEffect> l = new ArrayList<>(event.getEntity().getActivePotionEffects());
                         l.forEach((e) -> event.getEntity().removePotionEffect(e.getType()));

src/main/java/emanondev/itemtag/command/itemtag/WearPermission.java

@@ -10,6 +10,7 @@
 import emanondev.itemtag.ItemTag;
 import emanondev.itemtag.TagItem;
 import emanondev.itemtag.command.ListenerSubCmd;
+import emanondev.itemtag.compability.SchedulerUtils;
 import emanondev.itemtag.equipmentchange.EquipmentChangeEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.Sound;
@@ -114,7 +115,7 @@ public void event(final EquipmentChangeEvent event) {
             return;
         }
 
-        Bukkit.getScheduler().runTaskLater(getPlugin(), () -> {
+        SchedulerUtils.runTaskLater(player.getLocation(), () -> {
             if (!player.isOnline())
                 return;
             ItemStack originalItem = InventoryUtils.getItem(player, event.getSlotType());

src/main/java/emanondev/itemtag/command/itemtag/customflags/EquipmentFlag.java

@@ -4,6 +4,7 @@
 import emanondev.itemedit.utility.ItemUtils;
 import emanondev.itemtag.ItemTag;
 import emanondev.itemtag.command.itemtag.Flag;
+import emanondev.itemtag.compability.SchedulerUtils;
 import emanondev.itemtag.equipmentchange.EquipmentChangeEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -48,7 +49,7 @@ public void event(EquipmentChangeEvent event) {
         if (this.getValue(ItemTag.getTagItem(event.getTo()))) {
             return;
         }
-        Bukkit.getScheduler().runTaskLater(getPlugin(), () -> {
+        SchedulerUtils.runTaskLater(event.getPlayer().getLocation(), () -> {
             if (!event.getPlayer().isOnline()) {
                 return;
             }

src/main/java/emanondev/itemtag/command/itemtag/customflags/RenamableOld.java

@@ -2,6 +2,7 @@
 
 import emanondev.itemtag.ItemTag;
 import emanondev.itemtag.command.itemtag.Flag;
+import emanondev.itemtag.compability.SchedulerUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
@@ -27,7 +28,7 @@ public void event(InventoryClickEvent event) {
         }
         if (ItemTag.getTagItem(event.getInventory().getItem(0)).hasBooleanTag(RENAMABLE_KEY) ||
                 ItemTag.getTagItem(event.getInventory().getItem(1)).hasBooleanTag(RENAMABLE_KEY)) {
-            Bukkit.getScheduler().runTaskLater(ItemTag.get(), () -> {
+            SchedulerUtils.runTaskLater(event.getWhoClicked().getLocation(), () -> {
                 if (ItemTag.getTagItem(event.getInventory().getItem(0)).hasBooleanTag(RENAMABLE_KEY) ||
                         ItemTag.getTagItem(event.getInventory().getItem(1)).hasBooleanTag(RENAMABLE_KEY)) {
                     event.getInventory().setItem(2, null);

src/main/java/emanondev/itemtag/command/itemtag/customflags/Usable.java

@@ -4,6 +4,7 @@
 import emanondev.itemedit.utility.VersionUtils;
 import emanondev.itemtag.ItemTag;
 import emanondev.itemtag.command.itemtag.Flag;
+import emanondev.itemtag.compability.SchedulerUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.Material;
@@ -37,7 +38,7 @@ private void event(PlayerInteractEvent event) {
                         b = event.getPlayer().getTargetBlockExact(7, FluidCollisionMode.SOURCE_ONLY);
                     } else
                         b = null;
-                    Bukkit.getScheduler().runTaskLater(ItemTag.get(), () -> { //TODO folia fix
+                    SchedulerUtils.runTaskLater(event.getPlayer().getLocation(), () -> {
                         if (!VersionUtils.isVersionAfter(1, 20)) {
                             InventoryUtils.updateView(event.getPlayer());
                         }

src/main/java/emanondev/itemtag/compability/FoliaRunnable.java

@@ -0,0 +1,22 @@
+package emanondev.itemtag.compability;
+
+import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
+import org.bukkit.scheduler.BukkitRunnable;
+
+public class FoliaRunnable extends BukkitRunnable {
+
+    private ScheduledTask foliaTask;
+
+    @Override
+    public synchronized void cancel() throws IllegalStateException {
+        if(foliaTask != null) foliaTask.cancel();
+    }
+
+    @Override
+    public void run() {
+    }
+
+    public void setScheduledTask(ScheduledTask task) {
+        this.foliaTask = task;
+    }
+}