we're really getting somewhere!@1

who the fuck decided to use 2 space instead of 4

README.md

@@ -9,6 +9,7 @@
 [spigot]: https://www.spigotmc.org/resources/6245/
 [hangar]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
 [bbb]: https://builtbybit.com/resources/placeholderapi.24306
+[modrinth]: https://modrinth.com/plugin/placeholderapi
 [Expansions cloud]: https://api.extendedclip.com/home
 [placeholder list]: https://helpch.at/placeholders
 [statistics]: https://bstats.org/plugin/bukkit/PlaceholderAPI
@@ -16,7 +17,7 @@
 [ci]: http://ci.extendedclip.com/job/PlaceholderAPI/
 [ciImg]: http://ci.extendedclip.com/buildStatus/icon?job=PlaceholderAPI
 
-[APIversionImg]: https://img.shields.io/nexus/placeholderapi/me.clip/placeholderapi?server=https%3A%2F%2Frepo.extendedclip.com&label=API%20Version
+[APIversionImg]: https://repo.extendedclip.com/api/badge/latest/releases/me/clip/placeholderapi?name=API%20Version
 [logo]: https://wiki.placeholderapi.com/assets/img/papi-logo.png
 
 [contributing]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/.github/CONTRIBUTING.md
@@ -32,7 +33,7 @@
 
 Support for specific plugins are provided either by the plugin itself or through expansions. The expansions may be downloaded in-game through the PAPI Expansion Cloud. There are currently over 240+ expansions that support a wide variety of plugins, such as Essentials, Factions, LuckPerms, and Vault. 
 
-PlaceholderAPI has been downloaded over 1,000,000 times and has been used concurrently on over 40,000 servers, which makes it a must-have for a server of any type or scale.
+PlaceholderAPI has been downloaded over 1,700,000 times on Spigot and has been used concurrently on over 45,000 servers, which makes it a must-have for a server of any type or scale.
 
 ## Contribute
 If you would like to contribute towards PlaceholderAPI should you take a look at our [Contributing file][contributing] for the ins and outs on how you can do that and what you need to keep in mind.
@@ -51,4 +52,5 @@ If you would like to create your own Placeholder Expansion for PlaceholderAPI, t
 - [Spigot Page][spigot]
 - [Hangar Page][hangar]
 - [BuiltByBit Page][bbb]
+- [Modrinth Page][modrinth]
 - [Plugin Statistics][statistics]

build.gradle.kts

@@ -4,11 +4,11 @@ plugins {
     `java-library`
     `maven-publish`
     id("com.github.hierynomus.license") version "0.16.1"
-    id("com.github.johnrengelman.shadow") version "8.1.0"
+    id("io.github.goooler.shadow") version "8.1.7"
 }
 
 group = "me.clip"
-version = "2.11.6-DEV-${System.getProperty("BUILD_NUMBER")}"
+version = "2.11.7-DEV-${System.getProperty("BUILD_NUMBER")}"
 
 description = "An awesome placeholder provider!"
 
@@ -20,13 +20,16 @@ repositories {
 
     maven("https://repo.codemc.org/repository/maven-public/")
     maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+    maven("https://repo.papermc.io/repository/maven-public/")
 }
 
 dependencies {
     implementation("org.bstats:bstats-bukkit:3.0.1")
-    implementation("net.kyori:adventure-platform-bukkit:4.3.1")
+    implementation("net.kyori:adventure-platform-bukkit:4.4.1")
 
-    compileOnly("org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT")
+    //compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT")
+    compileOnly("dev.folia:folia-api:1.20.1-R0.1-SNAPSHOT")
     compileOnlyApi("org.jetbrains:annotations:23.0.0")
 
     testImplementation("org.openjdk.jmh:jmh-core:1.32")
@@ -43,6 +46,8 @@ java {
 
     withJavadocJar()
     withSourcesJar()
+
+    disableAutoTargetJvm()
 }
 
 license {
@@ -71,6 +76,7 @@ tasks {
 
     withType<JavaCompile> {
         options.encoding = "UTF-8"
+        options.release = 8
     }
 
     withType<Javadoc> {
@@ -87,7 +93,14 @@ tasks {
         archiveClassifier.set("")
 
         relocate("org.bstats", "me.clip.placeholderapi.metrics")
-        relocate("net.kyori", "me.clip.placeholderapi.libs.kyori")
+//        relocate("net.kyori", "me.clip.placeholderapi.libs.kyori") {
+//            exclude("me/clip/placeholderapi/PAPIComponents.java")
+//            exclude("me/clip/placeholderapi/commands/TestCommand.java")
+//        }
+
+        destinationDirectory = file("server/1.21/plugins/")
+
+        exclude("META-INF/versions/**")
     }
 
     test {
@@ -105,9 +118,9 @@ tasks {
         repositories {
             maven {
                 if ("-DEV" in version.toString()) {
-                    url = uri("https://repo.extendedclip.com/content/repositories/dev/")
+                    url = uri("https://repo.extendedclip.com/snapshots")
                 } else {
-                    url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+                    url = uri("https://repo.extendedclip.com/releases")
                 }
 
                 credentials {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright <EFBFBD> 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions <EFBFBD>$var<EFBFBD>, <EFBFBD>${var}<EFBFBD>, <EFBFBD>${var:-default}<EFBFBD>, <EFBFBD>${var+SET}<EFBFBD>,
-#           <EFBFBD>${var#prefix}<EFBFBD>, <EFBFBD>${var%suffix}<EFBFBD>, and <EFBFBD>$( cmd )<EFBFBD>;
-#         * compound commands having a testable exit status, especially <EFBFBD>case<EFBFBD>;
-#         * various built-in commands including <EFBFBD>command<EFBFBD>, <EFBFBD>set<EFBFBD>, and <EFBFBD>ulimit<EFBFBD>.
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/java/me/clip/placeholderapi/PAPIComponents.java

@@ -0,0 +1,121 @@
+package me.clip.placeholderapi;
+
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.expansion.Relational;
+import me.clip.placeholderapi.replacer.ExactReplacer;
+import me.clip.placeholderapi.replacer.Replacer;
+import net.kyori.adventure.text.Component;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.checkerframework.checker.units.qual.N;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+public final class PAPIComponents {
+    private static final Replacer EXACT_REPLACER = new ExactReplacer();
+
+    @NotNull
+    public static Component setPlaceholders(final OfflinePlayer player, @NotNull final Component component) {
+        // TODO: explore a custom TextReplacementRenderer which doesn't use regex for performance benefits i.e. merge CharsReplacer with kyori TextReplacementRenderer
+        return component.replaceText(config -> config.match(PlaceholderAPI.PLACEHOLDER_PATTERN).replacement((result, builder) ->
+                builder.content(EXACT_REPLACER.apply(result.group(), player, PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()::getExpansion))));
+    }
+
+    @NotNull
+    public static List<Component> setPlaceholders(final OfflinePlayer player, @NotNull final List<Component> components) {
+        return components.stream().map(component -> setPlaceholders(player, component)).collect(Collectors.toList());
+    }
+
+    @NotNull
+    public static Component setPlaceholders(final Player player, @NotNull final Component component) {
+        return setPlaceholders((OfflinePlayer) player, component);
+    }
+
+    @NotNull
+    public static List<Component> setPlaceholders(final Player player, @NotNull final List<Component> components) {
+        return setPlaceholders((OfflinePlayer) player, components);
+    }
+
+    @NotNull
+    public static Component setBracketPlaceholders(final OfflinePlayer player, @NotNull final Component component) {
+        return component.replaceText(config -> config.match(PlaceholderAPI.BRACKET_PLACEHOLDER_PATTERN).replacement((result, builder) ->
+                builder.content(EXACT_REPLACER.apply(result.group(), player, PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()::getExpansion))));
+    }
+
+    @NotNull
+    public static List<Component> setBracketPlaceholders(final OfflinePlayer player, @NotNull final List<Component> components) {
+        return components.stream().map(component -> setBracketPlaceholders(player, component)).collect(Collectors.toList());
+    }
+
+    @NotNull
+    public static Component setBracketPlaceholders(final Player player, @NotNull final Component component) {
+        return setBracketPlaceholders((OfflinePlayer) player, component);
+    }
+
+    @NotNull
+    public static List<Component> setBracketPlaceholders(final Player player, @NotNull final List<Component> components) {
+        return setBracketPlaceholders((OfflinePlayer) player, components);
+    }
+
+//  public static Component setRelationalPlaceholders(Player one, Player two, Component component) {
+//    return component.replaceText(config -> config.match(PlaceholderAPI.RELATIONAL_PLACEHOLDER_PATTERN).replacement((result, builder) -> {
+//
+//      final String format = result.group(2);
+//      final int index = format.indexOf("_");
+//
+//      if (index <= 0 || index >= format.length()) {
+//        continue;
+//      }
+//
+//      String identifier = format.substring(0, index).toLowerCase(Locale.ROOT);
+//      String params = format.substring(index + 1);
+//      final PlaceholderExpansion expansion = PlaceholderAPIPlugin.getInstance()
+//              .getLocalExpansionManager().getExpansion(identifier);
+//
+//      if (!(expansion instanceof Relational)) {
+//        continue;
+//      }
+//
+//      final String value = ((Relational) expansion).onPlaceholderRequest(one, two, params);
+//
+//      if (value != null) {
+//        text = text.replaceAll(Pattern.quote(matcher.group()), Matcher.quoteReplacement(value));
+//      }
+//
+//
+//    }));
+//
+//    final Matcher matcher = PlaceholderAPI.RELATIONAL_PLACEHOLDER_PATTERN.matcher(text);
+//
+//    while (matcher.find()) {
+//      final String format = matcher.group(2);
+//      final int index = format.indexOf("_");
+//
+//      if (index <= 0 || index >= format.length()) {
+//        continue;
+//      }
+//
+//      String identifier = format.substring(0, index).toLowerCase(Locale.ROOT);
+//      String params = format.substring(index + 1);
+//      final PlaceholderExpansion expansion = PlaceholderAPIPlugin.getInstance()
+//              .getLocalExpansionManager().getExpansion(identifier);
+//
+//      if (!(expansion instanceof Relational)) {
+//        continue;
+//      }
+//
+//      final String value = ((Relational) expansion).onPlaceholderRequest(one, two, params);
+//
+//      if (value != null) {
+//        text = text.replaceAll(Pattern.quote(matcher.group()), Matcher.quoteReplacement(value));
+//      }
+//    }
+//
+//    return text;
+//  }
+}

src/main/java/me/clip/placeholderapi/PlaceholderAPI.java

@@ -34,6 +34,7 @@ import me.clip.placeholderapi.expansion.manager.LocalExpansionManager;
 import me.clip.placeholderapi.replacer.CharsReplacer;
 import me.clip.placeholderapi.replacer.Replacer;
 import me.clip.placeholderapi.replacer.Replacer.Closure;
+import me.clip.placeholderapi.replacer.ExactReplacer;
 import me.clip.placeholderapi.util.Msg;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -46,11 +47,12 @@ public final class PlaceholderAPI {
     private static final Replacer REPLACER_PERCENT = new CharsReplacer(Closure.PERCENT);
     private static final Replacer REPLACER_BRACKET = new CharsReplacer(Closure.BRACKET);
 
-  private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("[%]([^%]+)[%]");
-  private static final Pattern BRACKET_PLACEHOLDER_PATTERN = Pattern.compile("[{]([^{}]+)[}]");
-  private static final Pattern RELATIONAL_PLACEHOLDER_PATTERN = Pattern
+    static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("[%]([^%]+)[%]");
+    static final Pattern BRACKET_PLACEHOLDER_PATTERN = Pattern.compile("[{]([^{}]+)[}]");
+    static final Pattern RELATIONAL_PLACEHOLDER_PATTERN = Pattern
             .compile("[%](rel_)([^%]+)[%]");
 
+    private static final Replacer TEST = new ExactReplacer();
 
     private PlaceholderAPI() {
     }
@@ -136,8 +138,8 @@ public final class PlaceholderAPI {
      * @return String containing all translated placeholders
      */
     @NotNull
-  public static List<String> setBracketPlaceholders(final OfflinePlayer player,
-      @NotNull final List<String> text) {
+    public static List<@NotNull String> setBracketPlaceholders(final OfflinePlayer player,
+                                                               @NotNull final List<@NotNull String> text) {
         return text.stream().map(line -> setBracketPlaceholders(player, line))
                 .collect(Collectors.toList());
     }
@@ -150,7 +152,8 @@ public final class PlaceholderAPI {
      * @param text Text to set the placeholder values in
      * @return String containing all translated placeholders
      */
-  public static String setBracketPlaceholders(Player player, String text) {
+    @NotNull
+    public static String setBracketPlaceholders(Player player, @NotNull String text) {
         return setBracketPlaceholders((OfflinePlayer) player, text);
     }
 
@@ -162,7 +165,8 @@ public final class PlaceholderAPI {
      * @param text List of Strings to set the placeholder values in
      * @return String containing all translated placeholders
      */
-  public static List<String> setBracketPlaceholders(Player player, List<String> text) {
+    @NotNull
+    public static List<String> setBracketPlaceholders(Player player, @NotNull List<String> text) {
         return setBracketPlaceholders((OfflinePlayer) player, text);
     }
 

src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java

@@ -25,12 +25,15 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import me.clip.placeholderapi.commands.PlaceholderCommandRouter;
+import me.clip.placeholderapi.commands.TestCommand;
 import me.clip.placeholderapi.configuration.PlaceholderAPIConfig;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.clip.placeholderapi.expansion.Version;
 import me.clip.placeholderapi.expansion.manager.CloudExpansionManager;
 import me.clip.placeholderapi.expansion.manager.LocalExpansionManager;
 import me.clip.placeholderapi.listeners.ServerLoadEventListener;
+import me.clip.placeholderapi.scheduler.UniversalScheduler;
+import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
 import me.clip.placeholderapi.updatechecker.UpdateChecker;
 import me.clip.placeholderapi.util.Msg;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
@@ -68,7 +71,6 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
             version = 'v' + version.replace('.', '_').replace("_" + minor, "") + '_' + "R" + (minor - 1);
         }
 
-
         boolean isSpigot;
         try {
             Class.forName("org.spigotmc.SpigotConfig");
@@ -87,9 +89,12 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
     private final LocalExpansionManager localExpansionManager = new LocalExpansionManager(this);
     @NotNull
     private final CloudExpansionManager cloudExpansionManager = new CloudExpansionManager(this);
+    @NotNull
+    private final TaskScheduler scheduler = UniversalScheduler.getScheduler(this);
 
     private BukkitAudiences adventure;
 
+
     /**
      * Gets the static instance of the main class for PlaceholderAPI. This class is not the actual API
      * class, this is the main class that extends JavaPlugin. For most API methods, use static methods
@@ -153,6 +158,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
 
     @Override
     public void onEnable() {
+        registerCommand("test", new TestCommand());
         setupCommand();
         setupMetrics();
         setupExpansions();
@@ -175,7 +181,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
 
         HandlerList.unregisterAll(this);
 
-    Bukkit.getScheduler().cancelTasks(this);
+        scheduler.cancelTasks(this);
 
         adventure.close();
         adventure = null;
@@ -216,6 +222,11 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
         return adventure;
     }
 
+    @NotNull
+    public TaskScheduler getScheduler() {
+        return scheduler;
+    }
+
     /**
      * Obtain the configuration class for PlaceholderAPI.
      *
@@ -263,8 +274,8 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
             Class.forName("org.bukkit.event.server.ServerLoadEvent");
             new ServerLoadEventListener(this);
         } catch (final ClassNotFoundException ignored) {
-      Bukkit.getScheduler()
-          .runTaskLater(this, () -> getLocalExpansionManager().load(Bukkit.getConsoleSender()), 1);
+            scheduler
+                    .runTaskLater(() -> getLocalExpansionManager().load(Bukkit.getConsoleSender()), 1);
         }
     }
 

src/main/java/me/clip/placeholderapi/PlaceholderHook.java

@@ -20,11 +20,14 @@
 
 package me.clip.placeholderapi;
 
+import net.kyori.adventure.text.Component;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Optional;
+
 public abstract class PlaceholderHook {
   @Nullable
   public String onRequest(final OfflinePlayer player, @NotNull final String params) {

src/main/java/me/clip/placeholderapi/commands/PlaceholderCommand.java

@@ -22,10 +22,12 @@ package me.clip.placeholderapi.commands;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Stream;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

src/main/java/me/clip/placeholderapi/commands/PlaceholderCommandRouter.java

@@ -22,6 +22,7 @@ package me.clip.placeholderapi.commands;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -30,6 +31,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Stream;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.impl.cloud.CommandECloud;
 import me.clip.placeholderapi.commands.impl.local.CommandDump;

src/main/java/me/clip/placeholderapi/commands/TestCommand.java

@@ -0,0 +1,51 @@
+package me.clip.placeholderapi.commands;
+
+import io.papermc.paper.command.brigadier.BasicCommand;
+import io.papermc.paper.command.brigadier.CommandSourceStack;
+import me.clip.placeholderapi.PAPIComponents;
+import me.clip.placeholderapi.PlaceholderAPI;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.event.HoverEvent;
+import net.kyori.adventure.text.event.HoverEventSource;
+import net.kyori.adventure.text.format.TextColor;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.bukkit.OfflinePlayer;
+
+public class TestCommand implements BasicCommand {
+    private static final MiniMessage MINI = MiniMessage.miniMessage();
+
+    @Override
+    public void execute(final CommandSourceStack commandSourceStack, final String[] strings) {
+//        final Component component = Component.text("Woo! Test: %player_name%").color(TextColor.color(50, 168, 82)).hoverEvent(HoverEvent.showText(Component.text("OMG %player_gamemode%")));
+        final Component component = Component.text("Woo! Test: %player_name%");
+
+        String ser = MINI.serialize(component);
+        System.out.println(ser);
+
+        commandSourceStack.getSender().sendMessage(
+                PAPIComponents.setPlaceholders((OfflinePlayer) commandSourceStack.getSender(), component)
+        );
+
+        long tmp = System.currentTimeMillis();
+        for (int i = 0; i < 100000; ++i) {
+            PAPIComponents.setPlaceholders((OfflinePlayer) commandSourceStack.getSender(), component);
+        }
+        commandSourceStack.getSender().sendMessage(String.valueOf(System.currentTimeMillis() - tmp));
+
+        tmp = System.currentTimeMillis();
+        for (int i = 0; i < 100000; ++i) {
+            PlaceholderAPI.setPlaceholders((OfflinePlayer) commandSourceStack.getSender(), "Woo! Test: %player_name%");
+        }
+        commandSourceStack.getSender().sendMessage(String.valueOf(System.currentTimeMillis() - tmp));
+
+        tmp = System.currentTimeMillis();
+        for (int i = 0; i < 100000; ++i) {
+            final String serr = MINI.serialize(component);
+            final String repl = PlaceholderAPI.setPlaceholders((OfflinePlayer) commandSourceStack.getSender(), serr);
+            MINI.deserialize(repl);
+        }
+        commandSourceStack.getSender().sendMessage(String.valueOf(System.currentTimeMillis() - tmp));
+
+
+    }
+}

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudClear.java

@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.cloud;
 
 import java.util.List;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.util.Msg;

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudDownload.java

@@ -24,6 +24,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionInfo.java

@@ -23,6 +23,7 @@ package me.clip.placeholderapi.commands.impl.cloud;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java

@@ -25,12 +25,14 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.common.primitives.Ints;
+
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.configuration.ExpansionSort;

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionPlaceholders.java

@@ -21,9 +21,11 @@
 package me.clip.placeholderapi.commands.impl.cloud;
 
 import com.google.common.collect.Lists;
+
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudRefresh.java

@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.cloud;
 
 import java.util.List;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.util.Msg;

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudStatus.java

@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.cloud;
 
 import java.util.List;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.expansion.manager.CloudExpansionManager;

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudUpdate.java

@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.cloud;
 
 import com.google.common.collect.Lists;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -28,6 +29,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionRegister.java

@@ -25,6 +25,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.logging.Level;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionUnregister.java

@@ -22,6 +22,7 @@ package me.clip.placeholderapi.commands.impl.local;
 
 import java.util.List;
 import java.util.Optional;
+
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandHelp.java

@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.local;
 
 import java.util.List;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.util.Msg;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandInfo.java

@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.local;
 
 import java.util.List;
+
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandList.java

@@ -21,9 +21,11 @@
 package me.clip.placeholderapi.commands.impl.local;
 
 import com.google.common.collect.Lists;
+
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandParse.java

@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Stream;
+
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandReload.java

@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.local;
 
 import java.util.List;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import org.bukkit.command.CommandSender;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandVersion.java

@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.local;
 
 import java.util.List;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.util.Msg;

src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java

@@ -23,6 +23,7 @@ package me.clip.placeholderapi.events;
 
 import java.util.Collections;
 import java.util.List;
+
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
@@ -53,7 +54,7 @@ public class ExpansionsLoadedEvent extends Event {
      * @return List of {@link PlaceholderExpansion registered PlaceholderExpansions}.
      */
     @NotNull
-    public final List<PlaceholderExpansion> getExpansions(){
+    public final List<PlaceholderExpansion> getExpansions() {
         return expansions;
     }
 

src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java

@@ -50,7 +50,11 @@ public enum NMSVersion {
   SPIGOT_1_20_R1("v1_20_R1"),
   SPIGOT_1_20_R2("v1_20_R2"),
   SPIGOT_1_20_R3("v1_20_R3"),
-  SPIGOT_1_20_R4("v1_20_R4");
+  SPIGOT_1_20_R4("v1_20_R4"),
+  SPIGOT_1_21_R1("v1_21_R1"),
+  SPIGOT_1_21_R2("V1_21_R2"),
+  SPIGOT_1_21_R3("V1_21_R3"),
+  SPIGOT_1_21_R4("V1_21_R4");
 
   private final String version;
 

src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java

@@ -23,6 +23,7 @@ package me.clip.placeholderapi.expansion.cloud;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+
 import me.clip.placeholderapi.util.TimeUtil;
 
 

src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java

@@ -25,6 +25,7 @@ import com.google.common.io.Resources;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -50,6 +51,7 @@ import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
@@ -202,10 +204,8 @@ public final class CloudExpansionManager {
 
                     // loop through what's left on the main thread
                     plugin
-              .getServer()
                             .getScheduler()
                             .runTask(
-                  plugin,
                                     () -> {
                                         try {
                                             for (Map.Entry<String, CloudExpansion> entry : values.entrySet()) {

src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java

@@ -22,6 +22,7 @@ package me.clip.placeholderapi.expansion.manager;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+
 import java.io.File;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
@@ -34,10 +35,11 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.events.ExpansionRegisterEvent;
 import me.clip.placeholderapi.events.ExpansionUnregisterEvent;
@@ -172,7 +174,7 @@ public final class LocalExpansionManager implements Listener {
         try {
             final PlaceholderExpansion expansion = createExpansionInstance(clazz);
 
-      if(expansion == null){
+            if (expansion == null) {
                 return Optional.empty();
             }
 
@@ -213,6 +215,7 @@ public final class LocalExpansionManager implements Listener {
 
     /**
      * Attempt to register a {@link PlaceholderExpansion}
+     *
      * @param expansion the expansion to register
      * @return if the expansion was registered
      */
@@ -440,7 +443,8 @@ public final class LocalExpansionManager implements Listener {
                 Msg.severe("Failed to load expansion %s (is a dependency missing?)", e, file.getName());
                 return null;
             } catch (Exception e) {
-        throw new CompletionException(e.getMessage() + " (expansion file: " + file.getAbsolutePath() + ")", e);
+                plugin.getLogger().log(Level.SEVERE, "Failed to load expansion file: " + file.getAbsolutePath(), e);
+                return null;
             }
         });
     }

src/main/java/me/clip/placeholderapi/replacer/CharsReplacer.java

@@ -22,6 +22,7 @@ package me.clip.placeholderapi.replacer;
 
 import java.util.Locale;
 import java.util.function.Function;
+
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
@@ -43,6 +44,8 @@ public final class CharsReplacer implements Replacer {
     public String apply(@NotNull final String text, @Nullable final OfflinePlayer player,
                         @NotNull final Function<String, @Nullable PlaceholderExpansion> lookup) {
         final char[] chars = text.toCharArray();
+        // Woo! Hlello %player_name%
+        // Woo! GHsda PiggyPiglet
         final StringBuilder builder = new StringBuilder(text.length());
 
         final StringBuilder identifier = new StringBuilder();

src/main/java/me/clip/placeholderapi/replacer/ComponentReplacer.java

@@ -0,0 +1,146 @@
+package me.clip.placeholderapi.replacer;
+
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import net.kyori.adventure.text.*;
+import net.kyori.adventure.text.format.Style;
+import org.bukkit.OfflinePlayer;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.function.Function;
+
+public final class ComponentReplacer {
+    public Component replace(Component component, OfflinePlayer player, Function<String, PlaceholderExpansion> function) {
+        Component modified = component;
+
+        final List<Component> oldChildren = component.children();
+        final int oldChildrenSize = oldChildren.size();
+        List<Component> children = null;
+
+        if (component instanceof TextComponent) {
+            TextComponent tc = (TextComponent) component;
+            final String content = tc.content();
+
+            final char[] chars = content.toCharArray();
+
+            final StringBuilder identifier = new StringBuilder();
+            final StringBuilder parameters = new StringBuilder();
+
+            for (int i = 0; i < chars.length; i++) {
+                final char l = chars[i];
+
+                if (l != '%' || i + 1 >= chars.length) {
+                    continue;
+                }
+
+                final int start = i;
+
+                boolean identified = false;
+                boolean invalid = true;
+
+                while (++i < chars.length) {
+                    final char p = chars[i];
+
+                    if (p == ' ' && !identified) {
+                        break;
+                    }
+
+                    if (p == '%') {
+                        invalid = false;
+                        break;
+                    }
+
+                    if (p == '_' && !identified) {
+                        identified = true;
+                        continue;
+                    }
+
+                    if (identified) {
+                        parameters.append(p);
+                    } else {
+                        identifier.append(p);
+                    }
+                }
+
+                final String identifierString = identifier.toString();
+                final String lowercaseIdentifierString = identifierString.toLowerCase(Locale.ROOT);
+                final String parametersString = parameters.toString();
+
+                identifier.setLength(0);
+                parameters.setLength(0);
+
+                if (invalid) {
+                    continue;
+                }
+
+                final PlaceholderExpansion expansion = function.apply(lowercaseIdentifierString);
+
+                if (expansion == null) {
+                    continue;
+                }
+
+                final String placeholderValue = expansion.onRequest(player, parametersString);
+
+                if (placeholderValue == null) {
+                    continue;
+                }
+
+                if (start == 0) {
+                    // if we're a full match, modify the component directly
+                    if (i == content.length() - 1) {
+                        final ComponentLike replacement = Component.text(placeholderValue).style(component.style());
+
+                        modified = replacement.asComponent();
+                        Style modStyle = modified.style();
+
+                        if (modStyle.hoverEvent() != null) {
+                            Object hoverValue = modStyle.hoverEvent().value();
+
+                            if (hoverValue instanceof Component) {
+                                final Component replacedHoverComponent = replace((Component) hoverValue, player, function);
+
+                                if (replacedHoverComponent != hoverValue) {
+                                    modified.style();
+                                }
+                            }
+                        }
+
+                        if (modStyle.clickEvent() != null) {
+                            String clickValue =
+                        }
+                    }
+                }
+            }
+
+        } else if (component instanceof TranslatableComponent) {
+            TranslatableComponent tc = (TranslatableComponent) component;
+            final List<TranslationArgument> args = tc.arguments();
+            List<TranslationArgument> newArgs = null;
+            for (int i = 0, size = args.size(); i < size; i++) {
+                final TranslationArgument original = args.get(i);
+                TranslationArgument replacement = original instanceof Component ? TranslationArgument.component(replace((Component) original, player, function)) : original;
+
+                if (original != replacement) {
+                    if (newArgs == null) {
+                        newArgs = new ArrayList<>(size);
+
+                        if (i > 0) {
+                            newArgs.addAll(args.subList(0, i));
+                        }
+                    }
+                }
+
+                if (newArgs != null) {
+                    newArgs.add(replacement);
+                }
+            }
+
+            if (newArgs != null) {
+                modified = ((TranslatableComponent) modified).arguments(newArgs);
+            }
+        }
+
+        return modified;
+    }
+}

src/main/java/me/clip/placeholderapi/replacer/ExactReplacer.java

@@ -0,0 +1,48 @@
+package me.clip.placeholderapi.replacer;
+
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Function;
+import java.util.regex.Pattern;
+
+public class ExactReplacer implements Replacer {
+    private static final Pattern DELIMITER = Pattern.compile("_");
+
+    @NotNull
+    @Override
+    public String apply(@NotNull String text, @Nullable final OfflinePlayer player,
+                        @NotNull final Function<String, @Nullable PlaceholderExpansion> lookup) {
+        text = text.substring(1, text.length() - 1);
+        final String[] parts = DELIMITER.split(text);
+        final PlaceholderExpansion expansion;
+
+        if (parts.length == 0) {
+            expansion = lookup.apply(text);
+        } else {
+            expansion = lookup.apply(parts[0]);
+        }
+
+        if (expansion == null) {
+            return text;
+        }
+
+        final String params;
+
+        if (text.endsWith("_")) {
+            params = "";
+        } else {
+            params = text.substring(text.indexOf('_') + 1);
+        }
+
+        final String result = expansion.onRequest(player, params);
+
+        if (result == null) {
+            return text;
+        }
+
+        return result;
+    }
+}

src/main/java/me/clip/placeholderapi/replacer/Replacer.java

@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.replacer;
 
 import java.util.function.Function;
+
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;

src/main/java/me/clip/placeholderapi/scheduler/UniversalRunnable.java

@@ -0,0 +1,178 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package me.clip.placeholderapi.scheduler;
+
+import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
+import me.clip.placeholderapi.scheduler.scheduling.tasks.MyScheduledTask;
+import org.bukkit.plugin.Plugin;
+
+/** Just modified BukkitRunnable */
+public abstract class UniversalRunnable implements Runnable {
+    MyScheduledTask task;
+
+    public synchronized void cancel() throws IllegalStateException {
+        checkScheduled();
+        task.cancel();
+    }
+
+    /**
+     * Returns true if this task has been cancelled.
+     *
+     * @return true if the task has been cancelled
+     * @throws IllegalStateException if task was not scheduled yet
+     */
+    public synchronized boolean isCancelled() throws IllegalStateException {
+        checkScheduled();
+        return task.isCancelled();
+    }
+
+    /**
+     * Schedules this in the Bukkit scheduler to run on next tick.
+     *
+     * @param plugin the reference to the plugin scheduling task
+     * @return {@link MyScheduledTask}
+     * @throws IllegalArgumentException if plugin is null
+     * @throws IllegalStateException    if this was already scheduled
+     * @see TaskScheduler#runTask(Runnable)
+     */
+
+    public synchronized MyScheduledTask runTask(Plugin plugin) throws IllegalArgumentException, IllegalStateException {
+        checkNotYetScheduled();
+        return setupTask(UniversalScheduler.getScheduler(plugin).runTask(this));
+    }
+
+    /**
+     * <b>Asynchronous tasks should never access any API in Bukkit. Great care
+     * should be taken to assure the thread-safety of asynchronous tasks.</b>
+     * <p>
+     * Schedules this in the Bukkit scheduler to run asynchronously.
+     *
+     * @param plugin the reference to the plugin scheduling task
+     * @return {@link MyScheduledTask}
+     * @throws IllegalArgumentException if plugin is null
+     * @throws IllegalStateException    if this was already scheduled
+     * @see TaskScheduler#runTaskAsynchronously(Runnable)
+     */
+
+    public synchronized MyScheduledTask runTaskAsynchronously(Plugin plugin) throws IllegalArgumentException, IllegalStateException {
+        checkNotYetScheduled();
+        return setupTask(UniversalScheduler.getScheduler(plugin).runTaskAsynchronously(this));
+    }
+
+    /**
+     * Schedules this to run after the specified number of server ticks.
+     *
+     * @param plugin the reference to the plugin scheduling task
+     * @param delay  the ticks to wait before running the task
+     * @return {@link MyScheduledTask}
+     * @throws IllegalArgumentException if plugin is null
+     * @throws IllegalStateException    if this was already scheduled
+     * @see TaskScheduler#runTaskLater(Runnable, long)
+     */
+
+    public synchronized MyScheduledTask runTaskLater(Plugin plugin, long delay) throws IllegalArgumentException, IllegalStateException {
+        checkNotYetScheduled();
+        return setupTask(UniversalScheduler.getScheduler(plugin).runTaskLater(this, delay));
+    }
+
+    /**
+     * <b>Asynchronous tasks should never access any API in Bukkit. Great care
+     * should be taken to assure the thread-safety of asynchronous tasks.</b>
+     * <p>
+     * Schedules this to run asynchronously after the specified number of
+     * server ticks.
+     *
+     * @param plugin the reference to the plugin scheduling task
+     * @param delay  the ticks to wait before running the task
+     * @return {@link MyScheduledTask}
+     * @throws IllegalArgumentException if plugin is null
+     * @throws IllegalStateException    if this was already scheduled
+     * @see TaskScheduler#runTaskLaterAsynchronously(Runnable, long)
+     */
+
+    public synchronized MyScheduledTask runTaskLaterAsynchronously(Plugin plugin, long delay) throws IllegalArgumentException, IllegalStateException {
+        checkNotYetScheduled();
+        return setupTask(UniversalScheduler.getScheduler(plugin).runTaskLaterAsynchronously(this, delay));
+    }
+
+    /**
+     * Schedules this to repeatedly run until cancelled, starting after the
+     * specified number of server ticks.
+     *
+     * @param plugin the reference to the plugin scheduling task
+     * @param delay  the ticks to wait before running the task
+     * @param period the ticks to wait between runs
+     * @return {@link MyScheduledTask}
+     * @throws IllegalArgumentException if plugin is null
+     * @throws IllegalStateException    if this was already scheduled
+     * @see TaskScheduler#runTaskTimer(Runnable, long, long)
+     */
+
+    public synchronized MyScheduledTask runTaskTimer(Plugin plugin, long delay, long period) throws IllegalArgumentException, IllegalStateException {
+        checkNotYetScheduled();
+        return setupTask(UniversalScheduler.getScheduler(plugin).runTaskTimer(this, delay, period));
+    }
+
+    /**
+     * <b>Asynchronous tasks should never access any API in Bukkit. Great care
+     * should be taken to assure the thread-safety of asynchronous tasks.</b>
+     * <p>
+     * Schedules this to repeatedly run asynchronously until cancelled,
+     * starting after the specified number of server ticks.
+     *
+     * @param plugin the reference to the plugin scheduling task
+     * @param delay  the ticks to wait before running the task for the first
+     *               time
+     * @param period the ticks to wait between runs
+     * @return {@link MyScheduledTask}
+     * @throws IllegalArgumentException if plugin is null
+     * @throws IllegalStateException    if this was already scheduled
+     * @see TaskScheduler#runTaskTimerAsynchronously(Runnable, long, long)
+     */
+
+    public synchronized MyScheduledTask runTaskTimerAsynchronously(Plugin plugin, long delay, long period) throws IllegalArgumentException, IllegalStateException {
+        checkNotYetScheduled();
+        return setupTask(UniversalScheduler.getScheduler(plugin).runTaskTimerAsynchronously(this, delay, period));
+    }
+
+    private void checkScheduled() {
+        if (task == null) {
+            throw new IllegalStateException("Not scheduled yet");
+        }
+    }
+
+    private void checkNotYetScheduled() {
+        if (task != null) {
+            throw new IllegalStateException("Already scheduled");
+        }
+    }
+
+
+    private MyScheduledTask setupTask(final MyScheduledTask task) {
+        this.task = task;
+        return task;
+    }
+
+
+}

src/main/java/me/clip/placeholderapi/scheduler/UniversalScheduler.java

@@ -0,0 +1,42 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package me.clip.placeholderapi.scheduler;
+
+import me.clip.placeholderapi.scheduler.bukkit.BukkitScheduler;
+import me.clip.placeholderapi.scheduler.folia.FoliaScheduler;
+import me.clip.placeholderapi.scheduler.paper.PaperScheduler;
+import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
+import me.clip.placeholderapi.scheduler.utils.JavaUtil;
+import org.bukkit.plugin.Plugin;
+
+public class UniversalScheduler {
+    private static final boolean IS_FOLIA = JavaUtil.classExists("io.papermc.paper.threadedregions.RegionizedServer");
+    private static final boolean IS_CANVAS = JavaUtil.classExists("io.canvasmc.canvas.server.ThreadedServer");
+    private static final boolean IS_EXPANDED_SCHEDULING_AVAILABLE = JavaUtil.classExists("io.papermc.paper.threadedregions.scheduler.ScheduledTask");
+
+    public static TaskScheduler getScheduler(Plugin plugin) {
+        return IS_FOLIA || IS_CANVAS ? new FoliaScheduler(plugin) : (IS_EXPANDED_SCHEDULING_AVAILABLE ? new PaperScheduler(plugin) : new BukkitScheduler(plugin));
+    }
+
+}

src/main/java/me/clip/placeholderapi/scheduler/bukkit/BukkitScheduledTask.java

@@ -0,0 +1,71 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package me.clip.placeholderapi.scheduler.bukkit;
+
+import me.clip.placeholderapi.scheduler.scheduling.tasks.MyScheduledTask;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitTask;
+
+public class BukkitScheduledTask implements MyScheduledTask {
+
+    BukkitTask task;
+
+    boolean isRepeating;
+
+    public BukkitScheduledTask(final BukkitTask task) {
+        this.task = task;
+        this.isRepeating = false;
+    }
+
+    public BukkitScheduledTask(final BukkitTask task, boolean isRepeating) {
+        this.task = task;
+        this.isRepeating = isRepeating;
+    }
+
+    @Override
+    public void cancel() {
+        task.cancel();
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return task.isCancelled();
+    }
+
+    @Override
+    public Plugin getOwningPlugin() {
+        return task.getOwner();
+    }
+
+    @Override
+    public boolean isCurrentlyRunning() {
+        return Bukkit.getServer().getScheduler().isCurrentlyRunning(this.task.getTaskId()); //There's no other way. Fuck bukkit
+    }
+
+    @Override
+    public boolean isRepeatingTask() {
+        return isRepeating;
+    }
+}

src/main/java/me/clip/placeholderapi/scheduler/bukkit/BukkitScheduler.java

@@ -0,0 +1,129 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package me.clip.placeholderapi.scheduler.bukkit;
+
+import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
+import me.clip.placeholderapi.scheduler.scheduling.tasks.MyScheduledTask;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.plugin.Plugin;
+
+public class BukkitScheduler implements TaskScheduler {
+    final Plugin plugin;
+
+    public BukkitScheduler(Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public boolean isGlobalThread() {
+        return Bukkit.getServer().isPrimaryThread();
+    }
+
+    @Override
+    public boolean isEntityThread(Entity entity) {
+        return Bukkit.getServer().isPrimaryThread();
+    }
+
+    @Override
+    public boolean isRegionThread(Location location) {
+        return Bukkit.getServer().isPrimaryThread();
+    }
+
+    @Override
+    public MyScheduledTask runTask(Runnable runnable) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTask(plugin, runnable));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLater(Runnable runnable, long delay) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskLater(plugin, runnable, delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimer(Runnable runnable, long delay, long period) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskTimer(plugin, runnable, delay, period));
+    }
+
+    @Override
+    public MyScheduledTask runTaskAsynchronously(Runnable runnable) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskAsynchronously(plugin, runnable));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLaterAsynchronously(Runnable runnable, long delay) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, runnable, delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimerAsynchronously(Runnable runnable, long delay, long period) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, runnable, delay, period));
+    }
+
+    //Useless? Or...
+    public MyScheduledTask runTask(Plugin plugin, Runnable runnable) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTask(plugin, runnable));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLater(Plugin plugin, Runnable runnable, long delay) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskLater(plugin, runnable, delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimer(Plugin plugin, Runnable runnable, long delay, long period) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskTimer(plugin, runnable, delay, period));
+    }
+
+    @Override
+    public MyScheduledTask runTaskAsynchronously(Plugin plugin, Runnable runnable) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskAsynchronously(plugin, runnable));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLaterAsynchronously(Plugin plugin, Runnable runnable, long delay) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, runnable, delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimerAsynchronously(Plugin plugin, Runnable runnable, long delay, long period) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, runnable, delay, period));
+    }
+
+    @Override
+    public void execute(Runnable runnable) {
+        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, runnable);
+    }
+
+    @Override
+    public void cancelTasks() {
+        Bukkit.getScheduler().cancelTasks(plugin);
+    }
+
+    @Override
+    public void cancelTasks(Plugin plugin) {
+        Bukkit.getScheduler().cancelTasks(plugin);
+    }
+}

src/main/java/me/clip/placeholderapi/scheduler/folia/FoliaScheduledTask.java

@@ -0,0 +1,57 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package me.clip.placeholderapi.scheduler.folia;
+
+import me.clip.placeholderapi.scheduler.scheduling.tasks.MyScheduledTask;
+import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
+import org.bukkit.plugin.Plugin;
+
+public class FoliaScheduledTask implements MyScheduledTask {
+    private final ScheduledTask task;
+
+    public FoliaScheduledTask(final ScheduledTask task) {
+        this.task = task;
+    }
+
+    public void cancel() {
+        this.task.cancel();
+    }
+
+    public boolean isCancelled() {
+        return this.task.isCancelled();
+    }
+
+    public Plugin getOwningPlugin() {
+        return this.task.getOwningPlugin();
+    }
+
+    public boolean isCurrentlyRunning() {
+        final ScheduledTask.ExecutionState state = this.task.getExecutionState();
+        return state == ScheduledTask.ExecutionState.RUNNING || state == ScheduledTask.ExecutionState.CANCELLED_RUNNING;
+    }
+
+    public boolean isRepeatingTask() {
+        return this.task.isRepeatingTask();
+    }
+}

src/main/java/me/clip/placeholderapi/scheduler/folia/FoliaScheduler.java

@@ -0,0 +1,220 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package me.clip.placeholderapi.scheduler.folia;
+
+import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
+import me.clip.placeholderapi.scheduler.scheduling.tasks.MyScheduledTask;
+import io.papermc.paper.threadedregions.scheduler.AsyncScheduler;
+import io.papermc.paper.threadedregions.scheduler.GlobalRegionScheduler;
+import io.papermc.paper.threadedregions.scheduler.RegionScheduler;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.plugin.Plugin;
+
+import java.util.concurrent.TimeUnit;
+
+public class FoliaScheduler implements TaskScheduler {
+
+    final Plugin plugin;
+
+    public FoliaScheduler(Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+    private final RegionScheduler regionScheduler = Bukkit.getServer().getRegionScheduler();
+    private final GlobalRegionScheduler globalRegionScheduler = Bukkit.getServer().getGlobalRegionScheduler();
+    private final AsyncScheduler asyncScheduler = Bukkit.getServer().getAsyncScheduler();
+
+    @Override
+    public boolean isGlobalThread() {
+        return Bukkit.getServer().isGlobalTickThread();
+    }
+
+    @Override
+    public boolean isTickThread() {
+        return Bukkit.getServer().isPrimaryThread(); // The Paper implementation checks whether this is a tick thread, this method exists to avoid confusion.
+    }
+
+    @Override
+    public boolean isEntityThread(Entity entity) {
+        return Bukkit.getServer().isOwnedByCurrentRegion(entity);
+    }
+
+    @Override
+    public boolean isRegionThread(Location location) {
+        return Bukkit.getServer().isOwnedByCurrentRegion(location);
+    }
+
+    @Override
+    public MyScheduledTask runTask(Runnable runnable) {
+        return new FoliaScheduledTask(globalRegionScheduler.run(plugin, task -> runnable.run()));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLater(Runnable runnable, long delay) {
+        //Folia exception: Delay ticks may not be <= 0
+        if (delay <= 0) {
+            return runTask(runnable);
+        }
+        return new FoliaScheduledTask(globalRegionScheduler.runDelayed(plugin, task -> runnable.run(), delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimer(Runnable runnable, long delay, long period) {
+        //Folia exception: Delay ticks may not be <= 0
+        delay = getOneIfNotPositive(delay);
+        return new FoliaScheduledTask(globalRegionScheduler.runAtFixedRate(plugin, task -> runnable.run(), delay, period));
+    }
+
+    @Override
+    public MyScheduledTask runTask(Plugin plugin, Runnable runnable) {
+        return new FoliaScheduledTask(globalRegionScheduler.run(plugin, task -> runnable.run()));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLater(Plugin plugin, Runnable runnable, long delay) {
+        //Folia exception: Delay ticks may not be <= 0
+        if (delay <= 0) {
+            return runTask(plugin, runnable);
+        }
+        return new FoliaScheduledTask(globalRegionScheduler.runDelayed(plugin, task -> runnable.run(), delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimer(Plugin plugin, Runnable runnable, long delay, long period) {
+        //Folia exception: Delay ticks may not be <= 0
+        delay = getOneIfNotPositive(delay);
+        return new FoliaScheduledTask(globalRegionScheduler.runAtFixedRate(plugin, task -> runnable.run(), delay, period));
+    }
+
+    @Override
+    public MyScheduledTask runTask(Location location, Runnable runnable) {
+        return new FoliaScheduledTask(regionScheduler.run(plugin, location, task -> runnable.run()));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLater(Location location, Runnable runnable, long delay) {
+        //Folia exception: Delay ticks may not be <= 0
+        if (delay <= 0) {
+            return runTask(runnable);
+        }
+        return new FoliaScheduledTask(regionScheduler.runDelayed(plugin, location, task -> runnable.run(), delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimer(Location location, Runnable runnable, long delay, long period) {
+        //Folia exception: Delay ticks may not be <= 0
+        delay = getOneIfNotPositive(delay);
+        return new FoliaScheduledTask(regionScheduler.runAtFixedRate(plugin, location, task -> runnable.run(), delay, period));
+    }
+
+    @Override
+    public MyScheduledTask runTask(Entity entity, Runnable runnable) {
+        return new FoliaScheduledTask(entity.getScheduler().run(plugin, task -> runnable.run(), null));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLater(Entity entity, Runnable runnable, long delay) {
+        //Folia exception: Delay ticks may not be <= 0
+        if (delay <= 0) {
+            return runTask(entity, runnable);
+        }
+        return new FoliaScheduledTask(entity.getScheduler().runDelayed(plugin, task -> runnable.run(), null, delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimer(Entity entity, Runnable runnable, long delay, long period) {
+        //Folia exception: Delay ticks may not be <= 0
+        delay = getOneIfNotPositive(delay);
+        return new FoliaScheduledTask(entity.getScheduler().runAtFixedRate(plugin, task -> runnable.run(), null, delay, period));
+    }
+
+    @Override
+    public MyScheduledTask runTaskAsynchronously(Runnable runnable) {
+        return new FoliaScheduledTask(asyncScheduler.runNow(plugin, task -> runnable.run()));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLaterAsynchronously(Runnable runnable, long delay) {
+        //Folia exception: Delay ticks may not be <= 0
+        delay = getOneIfNotPositive(delay);
+        return new FoliaScheduledTask(asyncScheduler.runDelayed(plugin, task -> runnable.run(), delay * 50L, TimeUnit.MILLISECONDS));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimerAsynchronously(Runnable runnable, long delay, long period) {
+        return new FoliaScheduledTask(asyncScheduler.runAtFixedRate(plugin, task -> runnable.run(), delay * 50, period * 50, TimeUnit.MILLISECONDS));
+    }
+
+    @Override
+    public MyScheduledTask runTaskAsynchronously(Plugin plugin, Runnable runnable) {
+        return new FoliaScheduledTask(asyncScheduler.runNow(plugin, task -> runnable.run()));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLaterAsynchronously(Plugin plugin, Runnable runnable, long delay) {
+        //Folia exception: Delay ticks may not be <= 0
+        delay = getOneIfNotPositive(delay);
+        return new FoliaScheduledTask(asyncScheduler.runDelayed(plugin, task -> runnable.run(), delay * 50L, TimeUnit.MILLISECONDS));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimerAsynchronously(Plugin plugin, Runnable runnable, long delay, long period) {
+        //Folia exception: Delay ticks may not be <= 0
+        delay = getOneIfNotPositive(delay);
+        return new FoliaScheduledTask(asyncScheduler.runAtFixedRate(plugin, task -> runnable.run(), delay * 50, period * 50, TimeUnit.MILLISECONDS));
+    }
+
+    @Override
+    public void execute(Runnable runnable) {
+        globalRegionScheduler.execute(plugin, runnable);
+    }
+
+    @Override
+    public void execute(Location location, Runnable runnable) {
+        regionScheduler.execute(plugin, location, runnable);
+    }
+
+    @Override
+    public void execute(Entity entity, Runnable runnable) {
+        entity.getScheduler().execute(plugin, runnable, null, 1L);
+    }
+
+    @Override
+    public void cancelTasks() {
+        globalRegionScheduler.cancelTasks(plugin);
+        asyncScheduler.cancelTasks(plugin);
+    }
+
+    @Override
+    public void cancelTasks(Plugin plugin) {
+        globalRegionScheduler.cancelTasks(plugin);
+        asyncScheduler.cancelTasks(plugin);
+    }
+
+    private long getOneIfNotPositive(long x) {
+        return x <= 0 ? 1L : x;
+    }
+}

src/main/java/me/clip/placeholderapi/scheduler/paper/PaperScheduler.java

@@ -0,0 +1,41 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package me.clip.placeholderapi.scheduler.paper;
+
+import me.clip.placeholderapi.scheduler.folia.FoliaScheduler;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+
+//Thanks to Towny
+public class PaperScheduler extends FoliaScheduler {
+    public PaperScheduler(Plugin plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public boolean isGlobalThread() {
+        // isGlobalThread does not exist on paper, match the bukkit task scheduler's behaviour.
+        return Bukkit.getServer().isPrimaryThread();
+    }
+}

src/main/java/me/clip/placeholderapi/scheduler/scheduling/schedulers/TaskScheduler.java

@@ -0,0 +1,346 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package me.clip.placeholderapi.scheduler.scheduling.schedulers;
+
+import me.clip.placeholderapi.scheduler.scheduling.tasks.MyScheduledTask;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.plugin.Plugin;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+
+public interface TaskScheduler {
+
+    /**
+     * <b>Folia</b>: Returns whether the current thread is ticking the global region <br>
+     * <b>Paper & Bukkit</b>: Returns {@link org.bukkit.Server#isPrimaryThread}
+     */
+    boolean isGlobalThread();
+
+    /**
+     * @return {@link org.bukkit.Server#isPrimaryThread}
+     */
+    default boolean isTickThread() {
+        return Bukkit.getServer().isPrimaryThread();
+    }
+
+    /**
+     * <b>Folia & Paper</b>: Returns whether the current thread is ticking a region and that the region
+     * being ticked owns the specified entity. Note that this function is the only appropriate method of
+     * checking for ownership of an entity, as retrieving the entity's location is undefined unless the
+     * entity is owned by the current region
+     * <p>
+     * <b>Bukkit</b>: returns {@link org.bukkit.Server#isPrimaryThread}
+     *
+     * @param entity Specified entity
+     */
+    boolean isEntityThread(Entity entity);
+
+    /**
+     * <b>Folia & Paper</b>: Returns whether the current thread is ticking a region and that the region
+     * being ticked owns the chunk at the specified world and block position as included in the specified location
+     * <p>
+     * <b>Bukkit</b>: returns {@link org.bukkit.Server#isPrimaryThread}
+     *
+     * @param location Specified location, must have a non-null world.
+     */
+    boolean isRegionThread(Location location);
+
+    /**
+     * Schedules a task to be executed on the next tick <br>
+     * <b>Folia & Paper</b>: ...on the global region <br>
+     * <b>Bukkit</b>: ...on the main thread
+     *
+     * @param runnable The task to execute
+     */
+    MyScheduledTask runTask(Runnable runnable);
+
+    /**
+     * Schedules a task to be executed after the specified delay in ticks <br>
+     * <b>Folia & Paper</b>: ...on the global region <br>
+     * <b>Bukkit</b>: ...on the main thread
+     *
+     * @param runnable The task to execute
+     * @param delay    The delay, in ticks
+     */
+    MyScheduledTask runTaskLater(Runnable runnable, long delay);
+
+    /**
+     * Schedules a repeating task to be executed after the initial delay with the specified period <br>
+     * <b>Folia & Paper</b>: ...on the global region <br>
+     * <b>Bukkit</b>: ...on the main thread
+     *
+     * @param runnable The task to execute
+     * @param delay    The initial delay, in ticks.
+     * @param period   The period, in ticks.
+     */
+    MyScheduledTask runTaskTimer(Runnable runnable, long delay, long period);
+
+    /**
+     * Deprecated: use {@link #runTask(Runnable)}
+     */
+    @Deprecated
+    default MyScheduledTask runTask(Plugin plugin, Runnable runnable) {
+        return runTask(runnable);
+    }
+
+    /**
+     * Deprecated: use {@link #runTaskLater(Runnable, long)}
+     */
+    @Deprecated
+    default MyScheduledTask runTaskLater(Plugin plugin, Runnable runnable, long delay) {
+        return runTaskLater(runnable, delay);
+    }
+
+    /**
+     * Deprecated: use {@link #runTaskTimer(Runnable, long, long)}
+     */
+    @Deprecated
+    default MyScheduledTask runTaskTimer(Plugin plugin, Runnable runnable, long delay, long period) {
+        return runTaskTimer(runnable, delay, period);
+    }
+
+    /**
+     * <b>Folia & Paper</b>: Schedules a task to be executed on the region which owns the location on the next tick
+     * <p>
+     * <b>Bukkit</b>: same as {@link #runTask(Runnable)}
+     *
+     * @param location The location which the region executing should own
+     * @param runnable The task to execute
+     */
+    default MyScheduledTask runTask(Location location, Runnable runnable) {
+        return runTask(runnable);
+    }
+
+    /**
+     * <b>Folia & Paper</b>: Schedules a task to be executed on the region which owns the location after the
+     * specified delay in ticks
+     * <p>
+     * <b>Bukkit</b>: same as {@link #runTaskLater(Runnable, long)}
+     *
+     * @param location The location which the region executing should own
+     * @param runnable The task to execute
+     * @param delay    The delay, in ticks.
+     */
+    default MyScheduledTask runTaskLater(Location location, Runnable runnable, long delay) {
+        return runTaskLater(runnable, delay);
+    }
+
+    /**
+     * <b>Folia & Paper</b>: Schedules a repeating task to be executed on the region which owns the location
+     * after the initial delay with the specified period
+     * <p>
+     * <b>Bukkit</b>: same as {@link #runTaskTimer(Runnable, long, long)}
+     *
+     * @param location The location which the region executing should own
+     * @param runnable The task to execute
+     * @param delay    The initial delay, in ticks.
+     * @param period   The period, in ticks.
+     */
+    default MyScheduledTask runTaskTimer(Location location, Runnable runnable, long delay, long period) {
+        return runTaskTimer(runnable, delay, period);
+    }
+
+    /**
+     * Deprecated: use {@link #runTaskLater(Runnable, long)}
+     */
+    @Deprecated
+    default MyScheduledTask scheduleSyncDelayedTask(Runnable runnable, long delay) {
+        return runTaskLater(runnable, delay);
+    }
+
+    /**
+     * Deprecated: use {@link #execute(Runnable)} or {@link #runTask(Runnable)}
+     */
+    @Deprecated
+    default MyScheduledTask scheduleSyncDelayedTask(Runnable runnable) {
+        return runTask(runnable);
+    }
+
+    /**
+     * Deprecated: use {@link #runTaskTimer(Runnable, long, long)}
+     */
+    @Deprecated
+    default MyScheduledTask scheduleSyncRepeatingTask(Runnable runnable, long delay, long period) {
+        return runTaskTimer(runnable, delay, period);
+    }
+
+    /**
+     * <b>Folia & Paper</b>: Schedules a task to be executed on the region which owns the location
+     * of given entity on the next tick
+     * <p>
+     * <b>Bukkit</b>: same as {@link #runTask(Runnable)}
+     *
+     * @param entity   The entity whose location the region executing should own
+     * @param runnable The task to execute
+     */
+    default MyScheduledTask runTask(Entity entity, Runnable runnable) {
+        return runTask(runnable);
+    }
+
+    /**
+     * <b>Folia & Paper</b>: Schedules a task to be executed on the region which owns the location
+     * of given entity after the specified delay in ticks
+     * <p>
+     * <b>Bukkit</b>: same as {@link #runTaskLater(Runnable, long)}
+     *
+     * @param entity   The entity whose location the region executing should own
+     * @param runnable The task to execute
+     * @param delay    The delay, in ticks.
+     */
+    default MyScheduledTask runTaskLater(Entity entity, Runnable runnable, long delay) {
+        return runTaskLater(runnable, delay);
+    }
+
+    /**
+     * <b>Folia & Paper</b>: Schedules a repeating task to be executed on the region which owns the
+     * location of given entity after the initial delay with the specified period
+     * <p>
+     * <b>Bukkit</b>: same as {@link #runTaskTimer(Runnable, long, long)}
+     *
+     * @param entity   The entity whose location the region executing should own
+     * @param runnable The task to execute
+     * @param delay    The initial delay, in ticks.
+     * @param period   The period, in ticks.
+     */
+    default MyScheduledTask runTaskTimer(Entity entity, Runnable runnable, long delay, long period) {
+        return runTaskTimer(runnable, delay, period);
+    }
+
+    /**
+     * Schedules the specified task to be executed asynchronously immediately
+     *
+     * @param runnable The task to execute
+     * @return The {@link MyScheduledTask} that represents the scheduled task
+     */
+    MyScheduledTask runTaskAsynchronously(Runnable runnable);
+
+    /**
+     * Schedules the specified task to be executed asynchronously after the time delay has passed
+     *
+     * @param runnable The task to execute
+     * @param delay    The time delay to pass before the task should be executed
+     * @return The {@link MyScheduledTask} that represents the scheduled task
+     */
+    MyScheduledTask runTaskLaterAsynchronously(Runnable runnable, long delay);
+
+    /**
+     * Schedules the specified task to be executed asynchronously after the initial delay has passed,
+     * and then periodically executed with the specified period
+     *
+     * @param runnable The task to execute
+     * @param delay    The time delay to pass before the first execution of the task, in ticks
+     * @param period   The time between task executions after the first execution of the task, in ticks
+     * @return The {@link MyScheduledTask} that represents the scheduled task
+     */
+    MyScheduledTask runTaskTimerAsynchronously(Runnable runnable, long delay, long period);
+
+    /**
+     * Deprecated: use {@link #runTaskAsynchronously(Runnable)}
+     */
+    @Deprecated
+    default MyScheduledTask runTaskAsynchronously(Plugin plugin, Runnable runnable) {
+        return runTaskAsynchronously(runnable);
+    }
+
+    /**
+     * Deprecated: use {@link #runTaskLaterAsynchronously(Runnable, long)}
+     */
+    @Deprecated
+    default MyScheduledTask runTaskLaterAsynchronously(Plugin plugin, Runnable runnable, long delay) {
+        return runTaskLaterAsynchronously(runnable, delay);
+    }
+
+    /**
+     * Deprecated: use {@link #runTaskTimerAsynchronously(Runnable, long, long)}
+     */
+    @Deprecated
+    default MyScheduledTask runTaskTimerAsynchronously(Plugin plugin, Runnable runnable, long delay, long period) {
+        return runTaskTimerAsynchronously(runnable, delay, period);
+    }
+
+    /**
+     * Calls a method on the main thread and returns a Future object. This task will be executed
+     * by the main(Bukkit)/global(Folia&Paper) server thread.
+     * <p>
+     * Note: The Future.get() methods must NOT be called from the main thread.
+     * <p>
+     * Note2: There is at least an average of 10ms latency until the isDone() method returns true.
+     *
+     * @param task Task to be executed
+     */
+    default <T> Future<T> callSyncMethod(final Callable<T> task) {
+        CompletableFuture<T> completableFuture = new CompletableFuture<>();
+        execute(() -> {
+            try {
+                completableFuture.complete(task.call());
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return completableFuture;
+    }
+
+    /**
+     * Schedules a task to be executed on the global region
+     *
+     * @param runnable The task to execute
+     */
+    void execute(Runnable runnable);
+
+    /**
+     * Schedules a task to be executed on the region which owns the location
+     *
+     * @param location The location which the region executing should own
+     * @param runnable The task to execute
+     */
+    default void execute(Location location, Runnable runnable) {
+        execute(runnable);
+    }
+
+    /**
+     * Schedules a task to be executed on the region which owns the location of given entity
+     *
+     * @param entity   The entity which location the region executing should own
+     * @param runnable The task to execute
+     */
+    default void execute(Entity entity, Runnable runnable) {
+        execute(runnable);
+    }
+
+    /**
+     * Attempts to cancel all tasks scheduled by this plugin
+     */
+    void cancelTasks();
+
+    /**
+     * Attempts to cancel all tasks scheduled by the specified plugin
+     *
+     * @param plugin specified plugin
+     */
+    void cancelTasks(Plugin plugin);
+}

src/main/java/me/clip/placeholderapi/scheduler/scheduling/tasks/MyScheduledTask.java

@@ -0,0 +1,53 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package me.clip.placeholderapi.scheduler.scheduling.tasks;
+
+import org.bukkit.plugin.Plugin;
+
+public interface MyScheduledTask {
+    /**
+     * Cancels executing task
+     */
+    void cancel();
+
+    /**
+     * @return true if task is cancelled, false otherwise
+     */
+    boolean isCancelled();
+
+    /**
+     * @return The plugin under which the task was scheduled.
+     */
+    Plugin getOwningPlugin();
+
+    /**
+     * @return true if task is currently executing, false otherwise
+     */
+    boolean isCurrentlyRunning();
+
+    /**
+     * @return true if task is repeating, false otherwise
+     */
+    boolean isRepeatingTask();
+}

src/main/java/me/clip/placeholderapi/scheduler/utils/JavaUtil.java

@@ -0,0 +1,12 @@
+package me.clip.placeholderapi.scheduler.utils;
+
+public class JavaUtil {
+    public static boolean classExists(String className) {
+        try {
+            Class.forName(className);
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
+}

src/main/java/me/clip/placeholderapi/updatechecker/UpdateChecker.java

@@ -26,6 +26,7 @@ import java.net.URL;
 import java.util.Arrays;
 import javax.net.ssl.HttpsURLConnection;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
 import me.clip.placeholderapi.util.Msg;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
@@ -35,15 +36,17 @@ import org.bukkit.event.player.PlayerJoinEvent;
 
 public class UpdateChecker implements Listener {
 
-  private final int RESOURCE_ID = 6245;
+  private static final int RESOURCE_ID = 6245;
   private final PlaceholderAPIPlugin plugin;
+  private final TaskScheduler scheduler;
   private final String pluginVersion;
   private String spigotVersion;
   private boolean updateAvailable;
 
-  public UpdateChecker(PlaceholderAPIPlugin i) {
-    plugin = i;
-    pluginVersion = i.getDescription().getVersion();
+  public UpdateChecker(PlaceholderAPIPlugin plugin) {
+    this.plugin = plugin;
+    scheduler = plugin.getScheduler();
+    pluginVersion = plugin.getDescription().getVersion();
   }
 
   public boolean hasUpdateAvailable() {
@@ -55,7 +58,7 @@ public class UpdateChecker implements Listener {
   }
 
   public void fetch() {
-    Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+    scheduler.runTaskAsynchronously(() -> {
       try {
         HttpsURLConnection con = (HttpsURLConnection) new URL(
             "https://api.spigotmc.org/legacy/update.php?resource=" + RESOURCE_ID).openConnection();
@@ -76,7 +79,7 @@ public class UpdateChecker implements Listener {
         return;
       }
 
-      Bukkit.getScheduler().runTask(plugin, () -> {
+      scheduler.runTask(() -> {
         plugin.getLogger()
             .info("An update for PlaceholderAPI (v" + getSpigotVersion() + ") is available at:");
         plugin.getLogger()

src/main/java/me/clip/placeholderapi/util/Format.java

@@ -29,6 +29,7 @@ import static java.util.stream.IntStream.range;
 
 import java.util.List;
 import java.util.Optional;
+
 import org.jetbrains.annotations.NotNull;
 
 /**

src/main/java/me/clip/placeholderapi/util/Futures.java

@@ -27,6 +27,8 @@ import java.util.function.BiConsumer;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
@@ -36,14 +38,14 @@ public final class Futures {
     private Futures() {}
 
 
-  public static <T> void onMainThread(@NotNull final Plugin plugin,
+    public static <T> void onMainThread(@NotNull final PlaceholderAPIPlugin plugin,
                                         @NotNull final CompletableFuture<T> future,
                                         @NotNull final BiConsumer<T, Throwable> consumer) {
         future.whenComplete((value, exception) -> {
             if (Bukkit.isPrimaryThread()) {
                 consumer.accept(value, exception);
             } else {
-        Bukkit.getScheduler().runTask(plugin, () -> consumer.accept(value, exception));
+                plugin.getScheduler().runTask(() -> consumer.accept(value, exception));
             }
         });
     }

src/main/java/me/clip/placeholderapi/util/Msg.java

@@ -23,6 +23,7 @@ package me.clip.placeholderapi.util;
 import java.util.Arrays;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -43,7 +44,7 @@ public final class Msg {
         log(Level.WARNING, msg, args);
     }
 
-  public static void warn(String msg, Throwable throwable, Object... args){
+    public static void warn(String msg, Throwable throwable, Object... args) {
         PlaceholderAPIPlugin.getInstance().getLogger().log(Level.WARNING, String.format(msg, args), throwable);
     }
 

src/main/resources/plugin.yml

@@ -1,5 +1,6 @@
 name: PlaceholderAPI
 main: "me.clip.placeholderapi.PlaceholderAPIPlugin"
+folia-supported: true
 
 version: ${version}
 author: HelpChat
@@ -11,6 +12,8 @@ commands:
   placeholderapi:
     description: "PlaceholderAPI Command"
     aliases: ["papi"]
+  test:
+    description: "yes"
 
 permissions:
   placeholderapi.*: