Merge pull request #32 from Deichor/master

Add folia support with UniversalScheduler

advancedslot/build.gradle

@@ -1,6 +1,7 @@
 dependencies {
     compileOnly project(':core')
     compileOnly 'org.spigotmc:spigot:1.8.8-R0.1-SNAPSHOT'
+    implementation 'com.github.Anon8281:UniversalScheduler:0.1.6'
 }
 
 project.setLibsDirName('../../target')

advancedslot/src/main/java/mc/obliviate/inventory/advancedslot/AdvancedSlotManager.java

@@ -1,8 +1,10 @@
 package mc.obliviate.inventory.advancedslot;
 
+import com.github.Anon8281.universalScheduler.scheduling.schedulers.TaskScheduler;
 import mc.obliviate.inventory.Gui;
 import mc.obliviate.inventory.Icon;
-import org.bukkit.Bukkit;
+
+import mc.obliviate.inventory.Scheduler;
 import org.bukkit.Material;
 import org.bukkit.event.inventory.InventoryAction;
 import org.bukkit.event.inventory.InventoryClickEvent;
@@ -142,7 +144,10 @@ public void putIconToAdvancedSlot(@Nonnull final AdvancedSlot aSlot, @Nonnull fi
                         default:
                             return;
                     }
-                    Bukkit.getScheduler().runTaskLater(this.gui.getPlugin(), () -> {
+
+                    TaskScheduler scheduler = Scheduler.getScheduler();
+
+                    scheduler.runTaskLater(() -> {
                         if (this.gui.getInventory().getItem(aSlot.getSlot()) == null) {
                             aSlot.reset();
                         }

core/build.gradle

@@ -6,6 +6,7 @@ dependencies {
     compileOnly 'net.kyori:adventure-text-serializer-legacy:$adventure'
     compileOnly 'net.kyori:adventure-text-serializer-gson:$adventure'
     implementation 'com.github.hamza-cskn:obliviate-utils:2.0.6'
+    implementation 'com.github.Anon8281:UniversalScheduler:0.1.6'
 }
 
 project.setLibsDirName('../../target')

core/src/main/java/mc/obliviate/inventory/Gui.java

@@ -1,5 +1,7 @@
 package mc.obliviate.inventory;
 
+import com.github.Anon8281.universalScheduler.scheduling.schedulers.TaskScheduler;
+import com.github.Anon8281.universalScheduler.scheduling.tasks.MyScheduledTask;
 import com.google.common.base.Preconditions;
 import mc.obliviate.inventory.event.customclosevent.FakeInventoryCloseEvent;
 import mc.obliviate.inventory.util.NMSUtil;
@@ -16,7 +18,6 @@
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitTask;
 
 import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
@@ -32,7 +33,7 @@
 public abstract class Gui implements InventoryHolder {
 
 	private final Map<Integer, GuiIcon> registeredIcons;
-	private final List<BukkitTask> taskList = new ArrayList<>();
+	private final List<MyScheduledTask> taskList = new ArrayList<>();
 	private final String id;
 	private final InventoryType inventoryType;
 	public final Player player;
@@ -243,11 +244,14 @@ public void addItem(@Nonnegative int slot, Material material) {
 	 * @param periodInTicks
 	 * @param update
 	 */
-	public void updateTask(@Nonnegative long runDelayInTicks, @Nonnegative long periodInTicks, @Nonnull final Consumer<BukkitTask> update) {
+	public void updateTask(@Nonnegative long runDelayInTicks, @Nonnegative long periodInTicks, @Nonnull final Consumer<MyScheduledTask> update) {
 		Preconditions.checkNotNull(InventoryAPI.getInstance(), "InventoryAPI is not initialized.");
-		final BukkitTask[] bukkitTask = new BukkitTask[]{null};
-		bukkitTask[0] = Bukkit.getScheduler().runTaskTimer(getPlugin(), () -> update.accept(bukkitTask[0]), runDelayInTicks, periodInTicks);
-		taskList.add(bukkitTask[0]);
+		final MyScheduledTask[] scheduledTask = new MyScheduledTask[]{null};
+
+		TaskScheduler scheduler = Scheduler.getScheduler();
+
+		scheduledTask[0] = scheduler.runTaskTimer(() -> update.accept(scheduledTask[0]), runDelayInTicks, periodInTicks);
+		taskList.add(scheduledTask[0]);
 	}
 
 	/**
@@ -257,11 +261,14 @@ public void updateTask(@Nonnegative long runDelayInTicks, @Nonnegative long peri
 	 * @param runDelayInTicks
 	 * @param update
 	 */
-	public void runTaskLater(@Nonnegative long runDelayInTicks, @Nonnull final Consumer<BukkitTask> update) {
+	public void runTaskLater(@Nonnegative long runDelayInTicks, @Nonnull final Consumer<MyScheduledTask> update) {
 		Preconditions.checkNotNull(InventoryAPI.getInstance(), "InventoryAPI is not initialized.");
-		final BukkitTask[] bukkitTask = new BukkitTask[]{null};
-		bukkitTask[0] = Bukkit.getScheduler().runTaskLater(getPlugin(), () -> update.accept(bukkitTask[0]), runDelayInTicks);
-		taskList.add(bukkitTask[0]);
+		final MyScheduledTask[] scheduledTask = new MyScheduledTask[]{null};
+
+		TaskScheduler scheduler = Scheduler.getScheduler();
+
+		scheduledTask[0] = scheduler.runTaskLater(() -> update.accept(scheduledTask[0]), runDelayInTicks);
+		taskList.add(scheduledTask[0]);
 	}
 
 	@Nonnull
@@ -357,18 +364,18 @@ public void setClosed(boolean closed) {
 		this.isClosed = closed;
 	}
 
-	public List<BukkitTask> getTaskList() {
+	public List<MyScheduledTask> getTaskList() {
 		return Collections.unmodifiableList(taskList);
 	}
 
-	public void stopTask(@Nonnull BukkitTask task) {
+	public void stopTask(@Nonnull MyScheduledTask task) {
 		Preconditions.checkNotNull(task, "task cannot be null");
 		task.cancel();
 		taskList.remove(task);
 	}
 
 	public void stopAllTasks() {
-		taskList.forEach(BukkitTask::cancel);
+		taskList.forEach(MyScheduledTask::cancel);
 		taskList.clear();
 	}
 

core/src/main/java/mc/obliviate/inventory/Scheduler.java

@@ -0,0 +1,15 @@
+package mc.obliviate.inventory;
+
+import com.github.Anon8281.universalScheduler.UniversalScheduler;
+import com.github.Anon8281.universalScheduler.scheduling.schedulers.TaskScheduler;
+
+public class Scheduler {
+
+
+    public static TaskScheduler getScheduler(){
+
+        return UniversalScheduler.getScheduler(InventoryAPI.getInstance().getPlugin());
+
+    }
+
+}