Add folia support.

Author: DxsSucuk

build.gradle.kts

@@ -13,12 +13,14 @@ val paperVersion = "1.20.1-R0.1-SNAPSHOT"
 val viaVersionVersion = "4.8.1"
 val miniPlaceholdersVersion = "2.2.3"
 val lombokVersion = "1.18.30"
+val foliaLibVersion = "main-SNAPSHOT"
 
 allprojects {
     apply(plugin = "java-library")
 
     repositories {
         mavenLocal()
+        maven { url = uri("https://jitpack.io") }
         maven { url = uri("https://repo.papermc.io/repository/maven-public/") }
         maven { url = uri("https://hub.spigotmc.org/nexus/content/groups/public/") }
         maven { url = uri("https://repo.dmulloy2.net/content/groups/public/") }
@@ -52,6 +54,8 @@ allprojects {
         compileOnly("net.kyori:adventure-text-minimessage:${adventureVersion}")
         compileOnly("net.kyori:adventure-text-serializer-gson:${adventureVersion}")
         compileOnly("net.kyori:adventure-text-serializer-legacy:${adventureVersion}")
+
+        compileOnly("com.github.technicallycoded:FoliaLib:${foliaLibVersion}")
     }
 }
 

src/main/java/me/catcoder/sidebar/Sidebar.java

@@ -1,6 +1,9 @@
 package me.catcoder.sidebar;
 
 import com.google.common.base.Preconditions;
+import com.tcoded.folialib.FoliaLib;
+import com.tcoded.folialib.wrapper.task.WrappedBukkitTask;
+import com.tcoded.folialib.wrapper.task.WrappedTask;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NonNull;
@@ -39,14 +42,17 @@ public class Sidebar<R> {
     private final ScoreboardObjective<R> objective;
 
     private TextIterator titleText;
-    private BukkitTask titleUpdater;
+    private WrappedTask titleUpdater;
 
-    final Set<Integer> taskIds = new HashSet<>();
+    final Set<WrappedTask> tasks = new HashSet<>();
     final TextProvider<R> textProvider;
 
     @Getter
     private final Plugin plugin;
 
+    @Getter
+    private final FoliaLib foliaLib;
+
     /**
      * Construct a new sidebar instance.
      *
@@ -55,6 +61,7 @@ public class Sidebar<R> {
      */
     Sidebar(@NonNull R title, @NonNull Plugin plugin, @NonNull TextProvider<R> textProvider) {
         this.plugin = plugin;
+        this.foliaLib = new FoliaLib(plugin);
         this.textProvider = textProvider;
         this.objective = new ScoreboardObjective<>(OBJECTIVE_PREFIX + RandomString.generate(3), title, textProvider);
     }
@@ -67,6 +74,7 @@ public class Sidebar<R> {
      */
     Sidebar(@NonNull TextIterator titleIterator, @NonNull Plugin plugin, @NonNull TextProvider<R> textProvider) {
         this.plugin = plugin;
+        this.foliaLib = new FoliaLib(plugin);
         this.textProvider = textProvider;
 
         this.objective = new ScoreboardObjective<>(
@@ -121,7 +129,7 @@ private void setTitleIter(@NonNull TextIterator iterator) {
         cancelTitleUpdater();
 
         this.titleText = iterator;
-        this.titleUpdater = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, () -> {
+        this.titleUpdater = foliaLib.getScheduler().runTimerAsync(() -> {
             String next = titleText.next();
 
             objective.setDisplayName(textProvider.fromLegacyMessage(next));
@@ -151,8 +159,14 @@ public void shiftLine(SidebarLine<R> line, int offset) {
      * @param task - task to bind
      * @return the task
      */
+    @Deprecated(since = "6.2.9")
     public BukkitTask bindBukkitTask(@NonNull BukkitTask task) {
-        this.taskIds.add(task.getTaskId());
+        this.tasks.add(new WrappedBukkitTask(task));
+        return task;
+    }
+
+    public WrappedTask bindWrappedTask(@NonNull WrappedTask task) {
+        this.tasks.add(task);
         return task;
     }
 
@@ -163,7 +177,7 @@ public BukkitTask bindBukkitTask(@NonNull BukkitTask task) {
      * @param period period in ticks
      * @return the scheduled task
      */
-    public BukkitTask updateLinesPeriodically(long delay, long period) {
+    public WrappedTask updateLinesPeriodically(long delay, long period) {
         return updateLinesPeriodically(delay, period, true);
     }
 
@@ -175,12 +189,12 @@ public BukkitTask updateLinesPeriodically(long delay, long period) {
      * @param async  whether the task should be executed asynchronously
      * @return the scheduled task
      */
-    public BukkitTask updateLinesPeriodically(long delay, long period, boolean async) {
+    public WrappedTask updateLinesPeriodically(long delay, long period, boolean async) {
         return async ?
-                bindBukkitTask(Bukkit.getScheduler()
-                        .runTaskTimerAsynchronously(plugin, this::updateAllLines, delay, period)) :
-                bindBukkitTask(Bukkit.getScheduler()
-                        .runTaskTimer(plugin, this::updateAllLines, delay, period));
+                bindWrappedTask(foliaLib.getScheduler()
+                        .runTimerAsync(this::updateAllLines, delay, period)) :
+                bindWrappedTask(foliaLib.getScheduler()
+                        .runTimer(this::updateAllLines, delay, period));
     }
 
     /**
@@ -371,8 +385,8 @@ public void removeViewers() {
     public void destroy() {
         cancelTitleUpdater();
 
-        for (int taskId : taskIds) {
-            Bukkit.getScheduler().cancelTask(taskId);
+        for (WrappedTask task : tasks) {
+            foliaLib.getScheduler().cancelTask(task);
         }
 
         removeViewers();
@@ -381,7 +395,7 @@ public void destroy() {
             lines.clear();
         }
 
-        taskIds.clear();
+        tasks.clear();
     }
 
     /**

src/main/java/me/catcoder/sidebar/SidebarLine.java

@@ -2,6 +2,7 @@
 
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
+import com.tcoded.folialib.wrapper.task.WrappedTask;
 import io.netty.buffer.ByteBuf;
 import lombok.*;
 import me.catcoder.sidebar.protocol.ChannelInjector;
@@ -11,9 +12,7 @@
 import me.catcoder.sidebar.util.lang.ThrowingFunction;
 import me.catcoder.sidebar.util.lang.ThrowingPredicate;
 import me.catcoder.sidebar.util.lang.ThrowingSupplier;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitTask;
 
 @Getter
 @ToString
@@ -28,7 +27,7 @@ public class SidebarLine<R> {
     private final boolean staticText;
 
     // for internal use
-    BukkitTask updateTask;
+    WrappedTask updateTask;
 
     private ThrowingFunction<Player, R, Throwable> updater;
     private ThrowingPredicate<Player, Throwable> displayCondition;
@@ -68,21 +67,21 @@ public SidebarLine<R> scoreNumberFormatStyled(@NonNull Function<Player, R> score
         return this;
     }
 
-    public BukkitTask updatePeriodically(long delay, long period, @NonNull Sidebar<R> sidebar) {
+    public WrappedTask updatePeriodically(long delay, long period, @NonNull Sidebar<R> sidebar) {
         Preconditions.checkState(!isStaticText(), "Cannot set updater for static text line");
 
         if (updateTask != null) {
             Preconditions.checkState(updateTask.isCancelled(),
                     "Update task for line %s is already running. Cancel it first.", this);
-            sidebar.taskIds.remove(updateTask.getTaskId());
+            sidebar.getFoliaLib().getScheduler().cancelTask(updateTask);
+            sidebar.tasks.remove(updateTask);
         }
 
-        BukkitTask task = Bukkit.getScheduler().runTaskTimerAsynchronously(sidebar.getPlugin(),
-                () -> sidebar.updateLine(this), delay, period);
+        WrappedTask task = sidebar.getFoliaLib().getScheduler().runTimerAsync(() -> sidebar.updateLine(this), delay, period);
 
         this.updateTask = task;
 
-        sidebar.bindBukkitTask(task);
+        sidebar.bindWrappedTask(task);
 
         return task;
     }

standalone-plugin/build.gradle.kts

@@ -9,9 +9,9 @@ dependencies {
     implementation(project(":"))
 }
 
-
 tasks.withType<ShadowJar> {
     archiveFileName.set("ProtocolSidebar-${rootProject.version}.jar")
+    relocate("com.tcoded.folialib", "me.catcoder.protocolsidebar.lib.folialib")
 
     // create final jar in project root dir
     destinationDirectory.set(rootProject.rootDir.resolve("bin"))