Move check to before expansions.remove and remove redundant check in unregisterAll

.github/CONTRIBUTING.md

@@ -38,7 +38,7 @@ PlaceholderAPI provides a feature to have expansions (separate jar files) for pl
 In those cases should you report the issue to the issue tracker of the expansion or plugin.
 
 ## Pull requests
-As an open source project we are welcoming all contributions to improve PlaceholderAPI, being it changes to its code, or contributions to its documentation such as the [Wiki] or the Javadocs.
+As an open source project are we welcoming all contributions to improve PlaceholderAPI, being it changes to its code, or contributions to its documentation such as the [Wiki] or the Javadocs.
 
 > [!IMPORTANT]
 > When contributing, make sure to both base of and target the mentioned branch. Pull requests targeting the wrong branch may get closed without a warning.

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,7 +21,7 @@
 ### Description
 <!-- What does your Pull request change? -->
 
-Closes N/A <!-- If your PR is based on an issue, change "N/A" to the issue ID (#id) -->
+Closes N/A <!-- If your PR is based on an issue, change "N/A" the the issue ID (#id) -->
 
 
 <!-- DO NOT ALTER ANYTHING BELOW THIS LINE! -->

.github/workflows/pr_build_jars.yml

@@ -5,10 +5,8 @@ on:
     branches:
     - development
     paths:
-    - "../../spigot/**"
+    - "src/**"
-    - "../../paper/**"
+    - "build.gradle"
-    - "build.gradle.kts"
-    - "settings.gradle.kts"
 
 jobs:
   testBuilds:

README.md

@@ -8,15 +8,15 @@
 [discord]: https://helpch.at/discord
 [spigot]: https://www.spigotmc.org/resources/6245/
 [hangar]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
-[modrinth]: https://modrinth.com/plugin/placeholderapi
+[bbb]: https://builtbybit.com/resources/placeholderapi.24306
-[Expansions cloud]: https://ecloud.placeholderapi.com
+[Expansions cloud]: https://api.extendedclip.com/home
 [placeholder list]: https://helpch.at/placeholders
 [statistics]: https://bstats.org/plugin/bukkit/PlaceholderAPI
 
 [ci]: http://ci.extendedclip.com/job/PlaceholderAPI/
 [ciImg]: http://ci.extendedclip.com/buildStatus/icon?job=PlaceholderAPI
 
-[APIversionImg]: https://repo.extendedclip.com/api/badge/latest/releases/me/clip/placeholderapi?name=API%20Version
+[APIversionImg]: https://img.shields.io/nexus/placeholderapi/me.clip/placeholderapi?server=https%3A%2F%2Frepo.extendedclip.com&label=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 +32,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 2,000,000 times on Spigot and has been used concurrently on over 50,000 servers, which makes it a must-have for a server of any type or scale.
+PlaceholderAPI has been downloaded over 1,600,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.
 
 ## 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.
@@ -50,5 +50,5 @@ If you would like to create your own Placeholder Expansion for PlaceholderAPI, t
 - [Placeholder List]
 - [Spigot Page][spigot]
 - [Hangar Page][hangar]
-- [Modrinth Page][modrinth]
+- [BuiltByBit Page][bbb]
 - [Plugin Statistics][statistics]

build.gradle.kts

@@ -3,23 +3,15 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 plugins {
     `java-library`
     `maven-publish`
-//    id("com.github.hierynomus.license") version "0.16.1"
+    id("com.github.hierynomus.license") version "0.16.1"
     id("io.github.goooler.shadow") version "8.1.7"
 }
 
 group = "me.clip"
-version = "2.12.2-DEV-${System.getProperty("BUILD_NUMBER")}"
+version = "2.11.7-DEV-${System.getProperty("BUILD_NUMBER")}"
 
 description = "An awesome placeholder provider!"
 
-val paper by sourceSets.creating {
-    java.srcDir("src/paper/java")
-
-    // paper can see main code
-    compileClasspath += sourceSets.main.get().output
-    runtimeClasspath += output + compileClasspath
-}
-
 repositories {
     maven("https://oss.sonatype.org/content/repositories/snapshots/")
 
@@ -28,21 +20,18 @@ 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.1.0")
+    implementation("org.bstats:bstats-bukkit:3.0.1")
-    implementation("net.kyori:adventure-platform-bukkit:4.4.1")
+    implementation("net.kyori:adventure-platform-bukkit:4.3.3")
 
-    add(paper.compileOnlyConfigurationName, "net.kyori:adventure-platform-bukkit:4.4.1")
+    compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
-    add(paper.compileOnlyConfigurationName, "dev.folia:folia-api:1.21.11-R0.1-SNAPSHOT")
-
-    compileOnly("dev.folia:folia-api:1.21.11-R0.1-SNAPSHOT")
     compileOnlyApi("org.jetbrains:annotations:23.0.0")
 
     testImplementation("org.openjdk.jmh:jmh-core:1.32")
     testImplementation("org.openjdk.jmh:jmh-generator-annprocess:1.32")
+
     testImplementation("org.junit.jupiter:junit-jupiter-engine:5.8.2")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
 }
@@ -54,8 +43,19 @@ java {
 
     withJavadocJar()
     withSourcesJar()
+}
 
-    disableAutoTargetJvm()
+license {
+    header = rootProject.file("config/headers/main.txt")
+
+    include("**/*.java")
+    mapping("java", "JAVADOC_STYLE")
+
+    encoding = "UTF-8"
+
+    ext {
+        set("year", 2024)
+    }
 }
 
 val javaComponent: SoftwareComponent = components["java"]
@@ -69,36 +69,14 @@ tasks {
         dependsOn(named("shadowJar"))
     }
 
-    register<JavaCompile>("compilePaper") {
+    withType<JavaCompile> {
-        source = paper.java
-        classpath = paper.compileClasspath
-        destinationDirectory.set(layout.buildDirectory.dir("classes/java/paper"))
         options.encoding = "UTF-8"
         options.release = 8
     }
 
-    val plainJar by registering(Jar::class) {
+    withType<Javadoc> {
-        dependsOn("compilePaper")
-
-        archiveClassifier.set("plain")
-        from(sourceSets.main.get().output)
-        from(paper.output)
-    }
-
-    val combinedSourcesJar by registering(Jar::class) {
-        archiveClassifier.set("sources")
-        from(sourceSets.main.get().allSource)
-        from(paper.allSource)
-
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    }
-
-    val combinedJavadoc by registering(Javadoc::class) {
         isFailOnError = false
 
-        source = sourceSets.main.get().allJava + paper.allJava
-        classpath = sourceSets.main.get().compileClasspath + paper.compileClasspath
-
         with(options as StandardJavadocDocletOptions) {
             addStringOption("Xdoclint:none", "-quiet")
             addStringOption("encoding", "UTF-8")
@@ -106,41 +84,13 @@ tasks {
         }
     }
 
-    val combinedJavadocJar by registering(Jar::class) {
-        archiveClassifier.set("javadoc")
-        dependsOn(combinedJavadoc)
-        from(combinedJavadoc.get().destinationDir)
-    }
-
-    withType<JavaCompile> {
-        options.encoding = "UTF-8"
-        options.release = 8
-    }
-
     withType<ShadowJar> {
-        configurations = listOf(project.configurations.runtimeClasspath.get())
-
-        from(sourceSets.main.get().output)
-
         archiveClassifier.set("")
 
         relocate("org.bstats", "me.clip.placeholderapi.metrics")
         relocate("net.kyori", "me.clip.placeholderapi.libs.kyori")
 
         exclude("META-INF/versions/**")
-
-        dependsOn("compilePaper")
-
-        doLast {
-            val paperDir = layout.buildDirectory.dir("classes/java/paper").get().asFile
-            val jarFile = archiveFile.get().asFile
-
-            ant.invokeMethod("zip", mapOf(
-                "destfile" to jarFile,
-                "update" to "true",
-                "basedir" to paperDir
-            ))
-        }
     }
 
     test {
@@ -151,28 +101,16 @@ tasks {
         publications {
             create<MavenPublication>("maven") {
                 artifactId = "placeholderapi"
-
+                from(javaComponent)
-                artifact(plainJar) {
-                    builtBy(plainJar)
-                    classifier = ""
-                }
-
-                artifact(combinedSourcesJar) {
-                    builtBy(combinedSourcesJar)
-                }
-
-                artifact(combinedJavadocJar) {
-                    builtBy(combinedJavadocJar)
-                }
             }
         }
 
         repositories {
             maven {
                 if ("-DEV" in version.toString()) {
-                    url = uri("https://repo.extendedclip.com/snapshots")
+                    url = uri("https://repo.extendedclip.com/content/repositories/dev/")
                 } else {
-                    url = uri("https://repo.extendedclip.com/releases")
+                    url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/")
                 }
 
                 credentials {

config/headers/jsonmessage.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018-2026 Peter Blood
+Copyright (c) 2018-2024 Peter Blood
 
 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:
 

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,9 +21,9 @@
 package me.clip.placeholderapi;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-
 import me.clip.placeholderapi.commands.PlaceholderCommandRouter;
 import me.clip.placeholderapi.configuration.PlaceholderAPIConfig;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@@ -31,10 +31,7 @@ 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.ExpansionSafetyCheck;
 import me.clip.placeholderapi.util.Msg;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bstats.bukkit.Metrics;
@@ -44,7 +41,6 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
@@ -55,243 +51,220 @@ import org.jetbrains.annotations.NotNull;
  */
 public final class PlaceholderAPIPlugin extends JavaPlugin {
 
-    @NotNull
+  @NotNull
-    private static final Version VERSION;
+  private static final Version VERSION;
-    private static PlaceholderAPIPlugin instance;
+  private static PlaceholderAPIPlugin instance;
 
-    static {
+  static {
-        String version = Bukkit.getServer().getBukkitVersion().split("-")[0];
+    String version = Bukkit.getServer().getBukkitVersion().split("-")[0];
-        String suffix;
+    String suffix;
-        if (version.chars()
+    if (version.chars()
-                .filter(c -> c == '.')
+            .filter(c -> c == '.')
-                .count() == 1) {
+            .count() == 1) {
-            suffix = "R1";
+      suffix = "R1";
-            version = 'v' + version.replace('.', '_') + '_' + suffix;
+      version = 'v' + version.replace('.', '_') + '_' + suffix;
-        } else {
+    } else {
-            int minor = Integer.parseInt(version.split("\\.")[2].charAt(0) + "");
+      int minor = Integer.parseInt(version.split("\\.")[2].charAt(0) + "");
-            version = 'v' + version.replace('.', '_').replace("_" + minor, "") + '_' + "R" + (minor - 1);
+      version = 'v' + version.replace('.', '_').replace("_" + minor, "") + '_' + "R" + (minor - 1);
-        }
-
-        boolean isSpigot;
-        try {
-            Class.forName("org.spigotmc.SpigotConfig");
-            isSpigot = true;
-        } catch (final ExceptionInInitializerError | ClassNotFoundException ignored) {
-            isSpigot = false;
-        }
-
-        VERSION = new Version(version, isSpigot);
     }
 
-    @NotNull
+    boolean isSpigot;
-    private final PlaceholderAPIConfig config = new PlaceholderAPIConfig(this);
+    try {
-
+      Class.forName("org.spigotmc.SpigotConfig");
-    @NotNull
+      isSpigot = true;
-    private final LocalExpansionManager localExpansionManager = new LocalExpansionManager(this);
+    } catch (final ExceptionInInitializerError | ClassNotFoundException ignored) {
-    @NotNull
+      isSpigot = false;
-    private final CloudExpansionManager cloudExpansionManager = new CloudExpansionManager(this);
-    @NotNull
-    private final TaskScheduler scheduler = UniversalScheduler.getScheduler(this);
-
-    private BukkitAudiences adventure;
-    private boolean safetyCheck = false;
-
-
-    /**
-     * 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
-     * available from the class: {@link PlaceholderAPI}
-     *
-     * @return PlaceholderAPIPlugin instance
-     */
-    @NotNull
-    public static PlaceholderAPIPlugin getInstance() {
-        return instance;
     }
 
-    /**
+    VERSION = new Version(version, isSpigot);
-     * Get the configurable {@linkplain String} value that should be returned when a boolean is true
+  }
-     *
+
-     * @return string value of true
+  @NotNull
-     */
+  private final PlaceholderAPIConfig config = new PlaceholderAPIConfig(this);
-    @NotNull
+
-    public static String booleanTrue() {
+  @NotNull
-        return getInstance().getPlaceholderAPIConfig().booleanTrue();
+  private final LocalExpansionManager localExpansionManager = new LocalExpansionManager(this);
+  @NotNull
+  private final CloudExpansionManager cloudExpansionManager = new CloudExpansionManager(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
+   * available from the class: {@link PlaceholderAPI}
+   *
+   * @return PlaceholderAPIPlugin instance
+   */
+  @NotNull
+  public static PlaceholderAPIPlugin getInstance() {
+    return instance;
+  }
+
+  /**
+   * Get the configurable {@linkplain String} value that should be returned when a boolean is true
+   *
+   * @return string value of true
+   */
+  @NotNull
+  public static String booleanTrue() {
+    return getInstance().getPlaceholderAPIConfig().booleanTrue();
+  }
+
+  /**
+   * Get the configurable {@linkplain String} value that should be returned when a boolean is false
+   *
+   * @return string value of false
+   */
+  @NotNull
+  public static String booleanFalse() {
+    return getInstance().getPlaceholderAPIConfig().booleanFalse();
+  }
+
+  /**
+   * Get the configurable {@linkplain SimpleDateFormat} object that is used to parse time for
+   * generic time based placeholders
+   *
+   * @return date format
+   */
+  @NotNull
+  public static SimpleDateFormat getDateFormat() {
+    try {
+      return new SimpleDateFormat(getInstance().getPlaceholderAPIConfig().dateFormat());
+    } catch (final IllegalArgumentException ex) {
+      Msg.warn("Configured date format ('%s') is invalid! Defaulting to 'MM/dd/yy HH:mm:ss'",
+          ex, getInstance().getPlaceholderAPIConfig().dateFormat());
+      return new SimpleDateFormat("MM/dd/yy HH:mm:ss");
+    }
+  }
+
+  @Deprecated
+  public static Version getServerVersion() {
+    return VERSION;
+  }
+
+  @Override
+  public void onLoad() {
+    instance = this;
+
+    saveDefaultConfig();
+  }
+
+  @Override
+  public void onEnable() {
+    setupCommand();
+    setupMetrics();
+    setupExpansions();
+
+    adventure = BukkitAudiences.create(this);
+
+    if (config.isCloudEnabled()) {
+      getCloudExpansionManager().load();
     }
 
-    /**
+    if (config.checkUpdates()) {
-     * Get the configurable {@linkplain String} value that should be returned when a boolean is false
+      new UpdateChecker(this).fetch();
-     *
+    }
-     * @return string value of false
+  }
-     */
+
-    @NotNull
+  @Override
-    public static String booleanFalse() {
+  public void onDisable() {
-        return getInstance().getPlaceholderAPIConfig().booleanFalse();
+    getCloudExpansionManager().kill();
+    getLocalExpansionManager().kill();
+
+    HandlerList.unregisterAll(this);
+
+    Bukkit.getScheduler().cancelTasks(this);
+
+    adventure.close();
+    adventure = null;
+
+    instance = null;
+  }
+
+  public void reloadConf(@NotNull final CommandSender sender) {
+    getLocalExpansionManager().kill();
+
+    reloadConfig();
+
+    getLocalExpansionManager().load(sender);
+
+    if (config.isCloudEnabled()) {
+      getCloudExpansionManager().load();
+    } else {
+      getCloudExpansionManager().kill();
+    }
+  }
+
+  @NotNull
+  public LocalExpansionManager getLocalExpansionManager() {
+    return localExpansionManager;
+  }
+
+  @NotNull
+  public CloudExpansionManager getCloudExpansionManager() {
+    return cloudExpansionManager;
+  }
+
+  @NotNull
+  public BukkitAudiences getAdventure() {
+    if(adventure == null) {
+      throw new IllegalStateException("Tried to access Adventure when the plugin was disabled!");
     }
 
-    /**
+    return adventure;
-     * Get the configurable {@linkplain SimpleDateFormat} object that is used to parse time for
+  }
-     * generic time based placeholders
+
-     *
+  /**
-     * @return date format
+   * Obtain the configuration class for PlaceholderAPI.
-     */
+   *
-    @NotNull
+   * @return PlaceholderAPIConfig instance
-    public static SimpleDateFormat getDateFormat() {
+   */
-        try {
+  @NotNull
-            return new SimpleDateFormat(getInstance().getPlaceholderAPIConfig().dateFormat());
+  public PlaceholderAPIConfig getPlaceholderAPIConfig() {
-        } catch (final IllegalArgumentException ex) {
+    return config;
-            Msg.warn("Configured date format ('%s') is invalid! Defaulting to 'MM/dd/yy HH:mm:ss'",
+  }
-                    ex, getInstance().getPlaceholderAPIConfig().dateFormat());
+
-            return new SimpleDateFormat("MM/dd/yy HH:mm:ss");
+  private void setupCommand() {
-        }
+    final PluginCommand pluginCommand = getCommand("placeholderapi");
+    if (pluginCommand == null) {
+      return;
     }
 
-    @Deprecated
+    final PlaceholderCommandRouter router = new PlaceholderCommandRouter(this);
-    public static Version getServerVersion() {
+    pluginCommand.setExecutor(router);
-        return VERSION;
+    pluginCommand.setTabCompleter(router);
-    }
+  }
-
+
-    @Override
+  private void setupMetrics() {
-    public void onLoad() {
+    final Metrics metrics = new Metrics(this, 438);
-        saveDefaultConfig();
+    metrics.addCustomChart(new SimplePie("using_expansion_cloud",
-
+        () -> getPlaceholderAPIConfig().isCloudEnabled() ? "yes" : "no"));
-        safetyCheck = new ExpansionSafetyCheck(this).runChecks();
+
-
+    metrics.addCustomChart(new SimplePie("using_spigot", () -> getServerVersion().isSpigot() ? "yes" : "no"));
-        if (safetyCheck) {
+
-            return;
+    metrics.addCustomChart(new AdvancedPie("expansions_used", () -> {
-        }
+      final Map<String, Integer> values = new HashMap<>();
-
+
-        instance = this;
+      for (final PlaceholderExpansion expansion : getLocalExpansionManager().getExpansions()) {
-    }
+        values.put(expansion.getRequiredPlugin() == null ? expansion.getIdentifier()
-
+            : expansion.getRequiredPlugin(), 1);
-    @Override
+      }
-    public void onEnable() {
+
-        if (safetyCheck) {
+      return values;
-            return;
+    }));
-        }
+  }
-
+
-        setupCommand();
+  private void setupExpansions() {
-        setupMetrics();
+    Bukkit.getPluginManager().registerEvents(getLocalExpansionManager(), this);
-        setupExpansions();
+
-
+    try {
-        adventure = BukkitAudiences.create(this);
+      Class.forName("org.bukkit.event.server.ServerLoadEvent");
-
+      new ServerLoadEventListener(this);
-        if (config.isCloudEnabled()) {
+    } catch (final ClassNotFoundException ignored) {
-            getCloudExpansionManager().load();
+      Bukkit.getScheduler()
-        }
+          .runTaskLater(this, () -> getLocalExpansionManager().load(Bukkit.getConsoleSender()), 1);
-
-        if (config.checkUpdates()) {
-            new UpdateChecker(this).fetch();
-        }
-    }
-
-    @Override
-    public void onDisable() {
-        if (safetyCheck) {
-            return;
-        }
-
-        getCloudExpansionManager().kill();
-        getLocalExpansionManager().kill();
-
-        HandlerList.unregisterAll(this);
-
-        scheduler.cancelTasks(this);
-
-        adventure.close();
-        adventure = null;
-
-        instance = null;
-    }
-
-    public void reloadConf(@NotNull final CommandSender sender) {
-        getLocalExpansionManager().kill();
-
-        reloadConfig();
-
-        getLocalExpansionManager().load(sender);
-
-        if (config.isCloudEnabled()) {
-            getCloudExpansionManager().load();
-        } else {
-            getCloudExpansionManager().kill();
-        }
-    }
-
-    @NotNull
-    public LocalExpansionManager getLocalExpansionManager() {
-        return localExpansionManager;
-    }
-
-    @NotNull
-    public CloudExpansionManager getCloudExpansionManager() {
-        return cloudExpansionManager;
-    }
-
-    @NotNull
-    public BukkitAudiences getAdventure() {
-        if (adventure == null) {
-            throw new IllegalStateException("Tried to access Adventure when the plugin was disabled!");
-        }
-
-        return adventure;
-    }
-
-    @NotNull
-    public TaskScheduler getScheduler() {
-        return scheduler;
-    }
-
-    /**
-     * Obtain the configuration class for PlaceholderAPI.
-     *
-     * @return PlaceholderAPIConfig instance
-     */
-    @NotNull
-    public PlaceholderAPIConfig getPlaceholderAPIConfig() {
-        return config;
-    }
-
-    private void setupCommand() {
-        final PluginCommand pluginCommand = getCommand("placeholderapi");
-        if (pluginCommand == null) {
-            return;
-        }
-
-        final PlaceholderCommandRouter router = new PlaceholderCommandRouter(this);
-        pluginCommand.setExecutor(router);
-        pluginCommand.setTabCompleter(router);
-    }
-
-    private void setupMetrics() {
-        final Metrics metrics = new Metrics(this, 438);
-        metrics.addCustomChart(new SimplePie("using_expansion_cloud",
-                () -> getPlaceholderAPIConfig().isCloudEnabled() ? "yes" : "no"));
-
-        metrics.addCustomChart(new SimplePie("using_spigot", () -> getServerVersion().isSpigot() ? "yes" : "no"));
-
-        metrics.addCustomChart(new AdvancedPie("expansions_used", () -> {
-            final Map<String, Integer> values = new HashMap<>();
-
-            for (final PlaceholderExpansion expansion : getLocalExpansionManager().getExpansions()) {
-                values.put(expansion.getRequiredPlugin() == null ? expansion.getIdentifier()
-                        : expansion.getRequiredPlugin(), 1);
-            }
-
-            return values;
-        }));
-    }
-
-    private void setupExpansions() {
-        Bukkit.getPluginManager().registerEvents(getLocalExpansionManager(), this);
-
-        try {
-            Class.forName("org.bukkit.event.server.ServerLoadEvent");
-            new ServerLoadEventListener(this);
-        } catch (final ClassNotFoundException ignored) {
-            scheduler
-                    .runTaskLater(() -> getLocalExpansionManager().load(Bukkit.getConsoleSender()), 1);
-        }
     }
+  }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,17 +26,17 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public abstract class PlaceholderHook {
-    @Nullable
+  @Nullable
-    public String onRequest(final OfflinePlayer player, @NotNull final String params) {
+  public String onRequest(final OfflinePlayer player, @NotNull final String params) {
-        if (player != null && player.isOnline()) {
+    if (player != null && player.isOnline()) {
-            return onPlaceholderRequest(player.getPlayer(), params);
+      return onPlaceholderRequest(player.getPlayer(), params);
-        }
-
-        return onPlaceholderRequest(null, params);
     }
 
-    @Nullable
+    return onPlaceholderRequest(null, params);
-    public String onPlaceholderRequest(final Player player, @NotNull final String params) {
+  }
-        return null;
+
-    }
+  @Nullable
+  public String onPlaceholderRequest(final Player player, @NotNull final String params) {
+    return null;
+  }
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,12 +22,10 @@ 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;
@@ -36,75 +34,75 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public abstract class PlaceholderCommand {
 
-    @NotNull
+  @NotNull
-    private final String label;
+  private final String label;
-    @NotNull
+  @NotNull
-    private final Set<String> alias;
+  private final Set<String> alias;
 
-    @Nullable
+  @Nullable
-    private String permission;
+  private String permission;
 
 
-    protected PlaceholderCommand(@NotNull final String label, @NotNull final String... alias) {
+  protected PlaceholderCommand(@NotNull final String label, @NotNull final String... alias) {
-        this.label = label;
+    this.label = label;
-        this.alias = Sets.newHashSet(alias);
+    this.alias = Sets.newHashSet(alias);
 
-        setPermission("placeholderapi." + label);
+    setPermission("placeholderapi." + label);
+  }
+
+  @NotNull
+  public static Stream<PlaceholderCommand> filterByPermission(@NotNull final CommandSender sender,
+      @NotNull final Stream<PlaceholderCommand> commands) {
+    return commands.filter(
+        target -> target.getPermission() == null || sender.hasPermission(target.getPermission()));
+  }
+
+  public static void suggestByParameter(@NotNull final Stream<String> possible,
+      @NotNull final List<String> suggestions, @Nullable final String parameter) {
+    if (parameter == null) {
+      possible.forEach(suggestions::add);
+    } else {
+      possible.filter(suggestion -> suggestion.toLowerCase(Locale.ROOT).startsWith(parameter.toLowerCase(Locale.ROOT)))
+          .forEach(suggestions::add);
     }
+  }
 
-    @NotNull
+  @NotNull
-    public static Stream<PlaceholderCommand> filterByPermission(@NotNull final CommandSender sender,
+  public final String getLabel() {
-                                                                @NotNull final Stream<PlaceholderCommand> commands) {
+    return label;
-        return commands.filter(
+  }
-                target -> target.getPermission() == null || sender.hasPermission(target.getPermission()));
-    }
 
-    public static void suggestByParameter(@NotNull final Stream<String> possible,
+  @NotNull
-                                          @NotNull final List<String> suggestions, @Nullable final String parameter) {
+  @Unmodifiable
-        if (parameter == null) {
+  public final Set<String> getAlias() {
-            possible.forEach(suggestions::add);
+    return ImmutableSet.copyOf(alias);
-        } else {
+  }
-            possible.filter(suggestion -> suggestion.toLowerCase(Locale.ROOT).startsWith(parameter.toLowerCase(Locale.ROOT)))
-                    .forEach(suggestions::add);
-        }
-    }
 
-    @NotNull
+  @NotNull
-    public final String getLabel() {
+  @Unmodifiable
-        return label;
+  public final Set<String> getLabels() {
-    }
+    return ImmutableSet.<String>builder().add(label).addAll(alias).build();
+  }
 
-    @NotNull
+  @Nullable
-    @Unmodifiable
+  public final String getPermission() {
-    public final Set<String> getAlias() {
+    return permission;
-        return ImmutableSet.copyOf(alias);
+  }
-    }
 
-    @NotNull
+  public void setPermission(@NotNull final String permission) {
-    @Unmodifiable
+    this.permission = permission;
-    public final Set<String> getLabels() {
+  }
-        return ImmutableSet.<String>builder().add(label).addAll(alias).build();
-    }
 
-    @Nullable
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
-    public final String getPermission() {
+      @NotNull final CommandSender sender, @NotNull final String alias,
-        return permission;
+      @NotNull @Unmodifiable final List<String> params) {
-    }
 
-    public void setPermission(@NotNull final String permission) {
+  }
-        this.permission = permission;
-    }
 
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params) {
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
 
-    }
+  }
-
-    public void complete(@NotNull final PlaceholderAPIPlugin plugin,
-                         @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
-
-    }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@ 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;
@@ -31,8 +30,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Stream;
-
-import com.google.common.collect.Lists;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.impl.cloud.CommandECloud;
 import me.clip.placeholderapi.commands.impl.local.CommandDump;
@@ -54,97 +51,93 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class PlaceholderCommandRouter implements CommandExecutor, TabCompleter {
 
-    @Unmodifiable
+  @Unmodifiable
-    private static final List<PlaceholderCommand> COMMANDS = ImmutableList.of(new CommandHelp(),
+  private static final List<PlaceholderCommand> COMMANDS = ImmutableList.of(new CommandHelp(),
-            new CommandInfo(),
+      new CommandInfo(),
-            new CommandList(),
+      new CommandList(),
-            new CommandDump(),
+      new CommandDump(),
-            new CommandECloud(),
+      new CommandECloud(),
-            new CommandParse(),
+      new CommandParse(),
-            new CommandReload(),
+      new CommandReload(),
-            new CommandVersion(),
+      new CommandVersion(),
-            new CommandExpansionRegister(),
+      new CommandExpansionRegister(),
-            new CommandExpansionUnregister());
+      new CommandExpansionUnregister());
 
 
-    @NotNull
+  @NotNull
-    private final PlaceholderAPIPlugin plugin;
+  private final PlaceholderAPIPlugin plugin;
-    @NotNull
+  @NotNull
-    @Unmodifiable
+  @Unmodifiable
-    private final Map<String, PlaceholderCommand> commands;
+  private final Map<String, PlaceholderCommand> commands;
 
 
-    public PlaceholderCommandRouter(@NotNull final PlaceholderAPIPlugin plugin) {
+  public PlaceholderCommandRouter(@NotNull final PlaceholderAPIPlugin plugin) {
-        this.plugin = plugin;
+    this.plugin = plugin;
 
-        final ImmutableMap.Builder<String, PlaceholderCommand> commands = ImmutableMap.builder();
+    final ImmutableMap.Builder<String, PlaceholderCommand> commands = ImmutableMap.builder();
 
-        for (final PlaceholderCommand command : COMMANDS) {
+    for (final PlaceholderCommand command : COMMANDS) {
-            command.getLabels().forEach(label -> commands.put(label, command));
+      command.getLabels().forEach(label -> commands.put(label, command));
-        }
-
-        this.commands = commands.build();
     }
 
+    this.commands = commands.build();
+  }
 
-    @Override
-    public boolean onCommand(@NotNull final CommandSender sender, @NotNull final Command command,
-                             @NotNull final String alias, @NotNull final String[] args) {
-        if (args.length == 0) {
-            final PlaceholderCommand fallback = commands.get("version");
-            if (fallback != null) {
-                fallback.evaluate(plugin, sender, "", Collections.emptyList());
-            }
 
-            return true;
+  @Override
-        }
+  public boolean onCommand(@NotNull final CommandSender sender, @NotNull final Command command,
+      @NotNull final String alias, @NotNull final String[] args) {
+    if (args.length == 0) {
+      final PlaceholderCommand fallback = commands.get("version");
+      if (fallback != null) {
+        fallback.evaluate(plugin, sender, "", Collections.emptyList());
+      }
 
-        final String search = args[0].toLowerCase(Locale.ROOT);
+      return true;
-        final PlaceholderCommand target = commands.get(search);
-
-        if (target == null) {
-            Msg.msg(sender, "&cUnknown command &7" + search);
-            return true;
-        }
-
-        final String permission = target.getPermission();
-        if (permission != null && !permission.isEmpty() && !sender.hasPermission(permission)) {
-            Msg.msg(sender, "&cYou do not have permission to do this!");
-            return true;
-        }
-
-        target
-                .evaluate(plugin, sender, search, Arrays.asList(Arrays.copyOfRange(args, 1, args.length)));
-
-        return true;
     }
 
-    @Override
+    final String search = args[0].toLowerCase(Locale.ROOT);
-    public List<String> onTabComplete(@NotNull final CommandSender sender, @NotNull final Command command,
+    final PlaceholderCommand target = commands.get(search);
-                                      @NotNull final String alias, @NotNull final String[] args) {
-        final List<String> suggestions = new ArrayList<>();
 
-        if (args.length > 1) {
+    if (target == null) {
-            final PlaceholderCommand target = this.commands.get(args[0].toLowerCase(Locale.ROOT));
+      Msg.msg(sender, "&cUnknown command &7" + search);
-
+      return true;
-            if (target != null) {
-                if (target.getPermission() != null && !target.getPermission().isEmpty() && !sender.hasPermission(target.getPermission())) {
-                    return suggestions;
-                }
-
-                target.complete(plugin, sender, args[0].toLowerCase(Locale.ROOT),
-                        Arrays.asList(Arrays.copyOfRange(args, 1, args.length)), suggestions);
-            }
-
-            return suggestions;
-        }
-
-        final Stream<String> targets = PlaceholderCommand
-                .filterByPermission(sender, commands.values().stream()).map(PlaceholderCommand::getLabels)
-                .flatMap(Collection::stream);
-        PlaceholderCommand.suggestByParameter(targets, suggestions, args.length == 0 ? null : args[0]);
-
-        return suggestions;
     }
 
+    final String permission = target.getPermission();
+    if (permission != null && !permission.isEmpty() && !sender.hasPermission(permission)) {
+      Msg.msg(sender, "&cYou do not have permission to do this!");
+      return true;
+    }
+
+    target
+        .evaluate(plugin, sender, search, Arrays.asList(Arrays.copyOfRange(args, 1, args.length)));
+
+    return true;
+  }
+
+  @Override
+  public List<String> onTabComplete(@NotNull final CommandSender sender,
+      @NotNull final Command command, @NotNull final String alias, @NotNull final String[] args) {
+    final List<String> suggestions = new ArrayList<>();
+
+    if (args.length > 1) {
+      final PlaceholderCommand target = this.commands.get(args[0].toLowerCase(Locale.ROOT));
+
+      if (target != null) {
+        target.complete(plugin, sender, args[0].toLowerCase(Locale.ROOT),
+            Arrays.asList(Arrays.copyOfRange(args, 1, args.length)), suggestions);
+      }
+
+      return suggestions;
+    }
+
+    final Stream<String> targets = PlaceholderCommand
+        .filterByPermission(sender, commands.values().stream()).map(PlaceholderCommand::getLabels)
+        .flatMap(Collection::stream);
+    PlaceholderCommand.suggestByParameter(targets, suggestions, args.length == 0 ? null : args[0]);
+
+    return suggestions;
+  }
+
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,115 +37,110 @@ import java.util.stream.Stream;
 
 public final class CommandECloud extends PlaceholderCommand {
 
-    @Unmodifiable
+  @Unmodifiable
-    private static final List<PlaceholderCommand> COMMANDS = ImmutableList
+  private static final List<PlaceholderCommand> COMMANDS = ImmutableList
-            .of(new CommandECloudClear(),
+      .of(new CommandECloudClear(),
-                    new CommandECloudStatus(),
+          new CommandECloudStatus(),
-                    new CommandECloudUpdate(),
+          new CommandECloudUpdate(),
-                    new CommandECloudRefresh(),
+          new CommandECloudRefresh(),
-                    new CommandECloudDownload(),
+          new CommandECloudDownload(),
-                    new CommandECloudExpansionInfo(),
+          new CommandECloudExpansionInfo(),
-                    new CommandECloudExpansionList(),
+          new CommandECloudExpansionList(),
-                    new CommandECloudExpansionPlaceholders());
+          new CommandECloudExpansionPlaceholders());
 
-    static {
+  static {
-        COMMANDS
+    COMMANDS
-                .forEach(command -> command.setPermission("placeholderapi.ecloud." + command.getLabel()));
+        .forEach(command -> command.setPermission("placeholderapi.ecloud." + command.getLabel()));
+  }
+
+  @NotNull
+  @Unmodifiable
+  private final Map<String, PlaceholderCommand> commands;
+
+
+  public CommandECloud() {
+    super("ecloud");
+
+    final ImmutableMap.Builder<String, PlaceholderCommand> commands = ImmutableMap.builder();
+
+    for (final PlaceholderCommand command : COMMANDS) {
+      command.getLabels().forEach(label -> commands.put(label, command));
     }
 
-    @NotNull
+    this.commands = commands.build();
-    @Unmodifiable
+  }
-    private final Map<String, PlaceholderCommand> commands;
 
 
-    public CommandECloud() {
+  @Override
-        super("ecloud");
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&b&lPlaceholderAPI &8- &7eCloud Help Menu &8- ",
+          " ",
+          "&b/papi &fecloud status",
+          "  &7&oView status of the eCloud",
+          "&b/papi &fecloud list <all/{author}/installed> {page}",
+          "  &7&oList all/author specific available expansions",
+          "&b/papi &fecloud info <expansion name> {version}",
+          "  &7&oView information about a specific expansion available on the eCloud",
+          "&b/papi &fecloud placeholders <expansion name>",
+          "  &7&oView placeholders for an expansion",
+          "&b/papi &fecloud download <expansion name> {version}",
+          "  &7&oDownload an expansion from the eCloud",
+          "&b/papi &fecloud update <expansion name/all>",
+          "  &7&oUpdate a specific/all installed expansions",
+          "&b/papi &fecloud refresh",
+          "  &7&oFetch the most up to date list of expansions available.",
+          "&b/papi &fecloud clear",
+          "  &7&oClear the expansion cloud cache.");
 
-        final ImmutableMap.Builder<String, PlaceholderCommand> commands = ImmutableMap.builder();
+      return;
-
-        for (final PlaceholderCommand command : COMMANDS) {
-            command.getLabels().forEach(label -> commands.put(label, command));
-        }
-
-        this.commands = commands.build();
     }
 
+    final String search = params.get(0).toLowerCase(Locale.ROOT);
+    final PlaceholderCommand target = commands.get(search);
 
-    @Override
+    if (target == null) {
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      Msg.msg(sender, "&cUnknown command &7ecloud " + search);
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+      return;
-                         @NotNull @Unmodifiable final List<String> params) {
-        if (params.isEmpty()) {
-            Msg.msg(sender,
-                    "&b&lPlaceholderAPI &8- &7eCloud Help Menu &8- ",
-                    " ",
-                    "&b/papi &fecloud status",
-                    "  &7&oView status of the eCloud",
-                    "&b/papi &fecloud list <all/{author}/installed> {page}",
-                    "  &7&oList all/author specific available expansions",
-                    "&b/papi &fecloud info <expansion name> {version}",
-                    "  &7&oView information about a specific expansion available on the eCloud",
-                    "&b/papi &fecloud placeholders <expansion name>",
-                    "  &7&oView placeholders for an expansion",
-                    "&b/papi &fecloud download <expansion name> {version}",
-                    "  &7&oDownload an expansion from the eCloud",
-                    "&b/papi &fecloud update <expansion name/all>",
-                    "  &7&oUpdate a specific/all installed expansions",
-                    "&b/papi &fecloud refresh",
-                    "  &7&oFetch the most up to date list of expansions available.",
-                    "&b/papi &fecloud clear",
-                    "  &7&oClear the expansion cloud cache.");
-
-            return;
-        }
-
-        final String search = params.get(0).toLowerCase(Locale.ROOT);
-        final PlaceholderCommand target = commands.get(search);
-
-        if (target == null) {
-            Msg.msg(sender, "&cUnknown command &7ecloud " + search);
-            return;
-        }
-
-        final String permission = target.getPermission();
-        if (permission != null && !permission.isEmpty() && !sender.hasPermission(permission)) {
-            Msg.msg(sender, "&cYou do not have permission to do this!");
-            return;
-        }
-
-        if (!plugin.getPlaceholderAPIConfig().isCloudEnabled()) {
-            Msg.msg(sender, "&cThe eCloud Manager is not enabled! To enable it, set 'cloud_enabled' to true and reload the plugin.");
-            return;
-        }
-
-        if (!target.getLabel().equalsIgnoreCase("refresh") && plugin.getCloudExpansionManager().isEmpty()) {
-            Msg.msg(sender, "&cThere is no available data from the eCloud. Please try running &f/papi ecloud refresh&c. If this does not resolve the issue, the eCloud may be blocked by your firewall, server host, or service provider.\n&r\n&cMore information: &fhttps://placeholderapi.com/ecloud-blocked");
-            return;
-        }
-
-        target.evaluate(plugin, sender, search, params.subList(1, params.size()));
     }
 
-    @Override
+    final String permission = target.getPermission();
-    public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+    if (permission != null && !permission.isEmpty() && !sender.hasPermission(permission)) {
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+      Msg.msg(sender, "&cYou do not have permission to do this!");
-                         @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+      return;
-        if (params.size() <= 1) {
-            final Stream<String> targets = filterByPermission(sender, commands.values().stream())
-                    .map(PlaceholderCommand::getLabels).flatMap(Collection::stream);
-            suggestByParameter(targets, suggestions, params.isEmpty() ? null : params.get(0));
-
-            return; // send sub commands
-        }
-
-        final String search = params.get(0).toLowerCase(Locale.ROOT);
-        final PlaceholderCommand target = commands.get(search);
-
-        if (target == null) {
-            return;
-        }
-
-        target.complete(plugin, sender, search, params.subList(1, params.size()), suggestions);
     }
 
+    if (!plugin.getPlaceholderAPIConfig().isCloudEnabled()) {
+      Msg.msg(sender, "&cThe eCloud Manager is not enabled! To enable it, set 'cloud_enabled' to true and reload the plugin.");
+      return;
+    }
+
+    target.evaluate(plugin, sender, search, params.subList(1, params.size()));
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() <= 1) {
+      final Stream<String> targets = filterByPermission(sender, commands.values().stream())
+          .map(PlaceholderCommand::getLabels).flatMap(Collection::stream);
+      suggestByParameter(targets, suggestions, params.isEmpty() ? null : params.get(0));
+
+      return; // send sub commands
+    }
+
+    final String search = params.get(0).toLowerCase(Locale.ROOT);
+    final PlaceholderCommand target = commands.get(search);
+
+    if (target == null) {
+      return;
+    }
+
+    target.complete(plugin, sender, search, params.subList(1, params.size()), suggestions);
+  }
+
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
 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;
@@ -31,17 +30,17 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class CommandECloudClear extends PlaceholderCommand {
 
-    public CommandECloudClear() {
+  public CommandECloudClear() {
-        super("clear");
+    super("clear");
-    }
+  }
 
-    @Override
+  @Override
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params) {
+      @NotNull @Unmodifiable final List<String> params) {
-        plugin.getCloudExpansionManager().clean();
+    plugin.getCloudExpansionManager().clean();
-        Msg.msg(sender,
+    Msg.msg(sender,
-                "&aThe eCloud cache has been cleared!");
+        "&aThe eCloud cache has been cleared!");
-    }
+  }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@ 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;
@@ -35,106 +34,106 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class CommandECloudDownload extends PlaceholderCommand {
 
-    public CommandECloudDownload() {
+  public CommandECloudDownload() {
-        super("download");
+    super("download");
+  }
+
+  private boolean isBlockedExpansion(String name) {
+    String env = System.getenv("PAPI_BLOCKED_EXPANSIONS");
+    if (env == null) {
+      return false;
     }
 
-    private boolean isBlockedExpansion(String name) {
+    return Arrays.stream(env.split(","))
-        String env = System.getenv("PAPI_BLOCKED_EXPANSIONS");
+            .anyMatch(s -> s.equalsIgnoreCase(name));
-        if (env == null) {
+  }
-            return false;
-        }
 
-        return Arrays.stream(env.split(","))
+  @Override
-                .anyMatch(s -> s.equalsIgnoreCase(name));
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&cYou must supply the name of an expansion.");
+      return;
     }
 
-    @Override
+    if (isBlockedExpansion(params.get(0))) {
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      Msg.msg(sender,
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+          "&cThis expansion can't be downloaded.");
-                         @NotNull @Unmodifiable final List<String> params) {
+      return;
-        if (params.isEmpty()) {
+    }
+
+    final CloudExpansion expansion = plugin.getCloudExpansionManager()
+        .findCloudExpansionByName(params.get(0)).orElse(null);
+    if (expansion == null) {
+      Msg.msg(sender,
+          "&cFailed to find an expansion named: &f" + params.get(0));
+      return;
+    }
+
+    if (!expansion.isVerified()) {
+      Msg.msg(sender, "&cThe expansion '&f" + params.get(0) + "&c' is not verified and can only be downloaded manually from &fhttps://placeholderapi.com/ecloud");
+      return;
+    }
+
+    final CloudExpansion.Version version;
+    if (params.size() < 2) {
+      version = expansion.getVersion(expansion.getLatestVersion());
+      if (version == null) {
+        Msg.msg(sender,
+            "&cCould not find latest version for expansion.");
+        return;
+      }
+    } else {
+      version = expansion.getVersion(params.get(1));
+      if (version == null) {
+        Msg.msg(sender,
+            "&cCould not find specified version: &f" + params.get(1),
+            "&7Available versions: &f" + expansion.getAvailableVersions());
+        return;
+      }
+    }
+
+    plugin.getCloudExpansionManager().downloadExpansion(expansion, version)
+        .whenComplete((file, exception) -> {
+          if (exception != null) {
             Msg.msg(sender,
-                    "&cYou must supply the name of an expansion.");
+                "&cFailed to download expansion: &f" + exception.getMessage());
             return;
-        }
+          }
 
-        if (isBlockedExpansion(params.get(0))) {
+          Msg.msg(sender,
-            Msg.msg(sender,
+              "&aSuccessfully downloaded expansion &f" + expansion.getName() + " [" + version
-                    "&cThis expansion can't be downloaded.");
+                  .getVersion() + "] &ato file: &f" + file.getName(),
-            return;
+              "&aMake sure to type &f/papi reload &ato enable your new expansion!");
-        }
 
-        final CloudExpansion expansion = plugin.getCloudExpansionManager()
+          plugin.getCloudExpansionManager().load();
-                .findCloudExpansionByName(params.get(0)).orElse(null);
+        });
-        if (expansion == null) {
+  }
-            Msg.msg(sender,
-                    "&cFailed to find an expansion named: &f" + params.get(0));
-            return;
-        }
 
-        final CloudExpansion.Version version;
+  @Override
-        if (params.size() < 2) {
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
-            version = expansion.getVersion(expansion.getLatestVersion());
+      @NotNull final CommandSender sender, @NotNull final String alias,
-            if (version == null) {
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
-                Msg.msg(sender,
+    if (params.size() > 2) {
-                        "&cCould not find latest version for expansion.");
+      return;
-                return;
-            }
-        } else {
-            version = expansion.getVersion(params.get(1));
-            if (version == null) {
-                Msg.msg(sender,
-                        "&cCould not find specified version: &f" + params.get(1),
-                        "&7Available versions: &f" + expansion.getAvailableVersions());
-                return;
-            }
-        }
-
-        if (!version.isVerified()) {
-            Msg.msg(sender, "&cThe expansion '&f" + params.get(0) + "&c' is not verified and can only be downloaded manually from &fhttps://ecloud.placeholderapi.com");
-            return;
-        }
-
-        plugin.getCloudExpansionManager().downloadExpansion(expansion, version)
-                .whenComplete((file, exception) -> {
-                    if (exception != null) {
-                        Msg.msg(sender,
-                                "&cFailed to download expansion: &f" + exception.getMessage());
-                        return;
-                    }
-
-                    Msg.msg(sender,
-                            "&aSuccessfully downloaded expansion &f" + expansion.getName() + " [" + version
-                                    .getVersion() + "] &ato file: &f" + file.getName(),
-                            "&aMake sure to type &f/papi reload &ato enable your new expansion!");
-
-                    plugin.getCloudExpansionManager().load();
-                });
     }
 
-    @Override
+    if (params.size() <= 1) {
-    public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      final Stream<String> names = plugin.getCloudExpansionManager().getCloudExpansions().values()
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+          .stream().map(CloudExpansion::getName).map(name -> name.replace(' ', '_'));
-                         @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+      suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(0));
-        if (params.size() > 2) {
+      return;
-            return;
-        }
-
-        if (params.size() <= 1) {
-            final Stream<String> names = plugin.getCloudExpansionManager().getCloudExpansions().values()
-                    .stream().map(CloudExpansion::getName).map(name -> name.replace(' ', '_'));
-            suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(0));
-            return;
-        }
-
-        final Optional<CloudExpansion> expansion = plugin.getCloudExpansionManager()
-                .findCloudExpansionByName(params.get(0));
-        if (!expansion.isPresent()) {
-            return;
-        }
-
-        suggestByParameter(expansion.get().getAvailableVersions().stream(), suggestions, params.get(1));
     }
 
+    final Optional<CloudExpansion> expansion = plugin.getCloudExpansionManager()
+        .findCloudExpansionByName(params.get(0));
+    if (!expansion.isPresent()) {
+      return;
+    }
+
+    suggestByParameter(expansion.get().getAvailableVersions().stream(), suggestions, params.get(1));
+  }
+
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@ 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;
@@ -34,100 +33,97 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class CommandECloudExpansionInfo extends PlaceholderCommand {
 
-    public CommandECloudExpansionInfo() {
+  public CommandECloudExpansionInfo() {
-        super("info");
+    super("info");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&cYou must specify the name of the expansion.");
+      return;
     }
 
-    @Override
+    final CloudExpansion expansion = plugin.getCloudExpansionManager()
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+        .findCloudExpansionByName(params.get(0)).orElse(null);
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+    if (expansion == null) {
-                         @NotNull @Unmodifiable final List<String> params) {
+      Msg.msg(sender,
-        if (params.isEmpty()) {
+          "&cThere is no expansion with the name: &f" + params.get(0));
-            Msg.msg(sender,
+      return;
-                    "&cYou must specify the name of the expansion.");
-            return;
-        }
-
-        final CloudExpansion expansion = plugin.getCloudExpansionManager()
-                .findCloudExpansionByName(params.get(0)).orElse(null);
-        if (expansion == null) {
-            Msg.msg(sender,
-                    "&cThere is no expansion with the name: &f" + params.get(0));
-            return;
-        }
-
-        final StringBuilder builder = new StringBuilder();
-
-        builder.append("&bExpansion: &f")
-                .append(expansion.shouldUpdate() ? "&e" : "&a")
-                .append(expansion.getName())
-                .append('\n')
-                .append("&bAuthor: &f")
-                .append(expansion.getAuthor())
-                .append('\n');
-
-        if (params.size() < 2) {
-            builder.append("&bLatest Version: &f")
-                    .append(expansion.getLatestVersion())
-                    .append('\n')
-                    .append("&bReleased: &f")
-                    .append(expansion.getTimeSinceLastUpdate())
-                    .append(" ago")
-                    .append('\n')
-                    .append("&bVerified: ")
-                    .append(expansion.getVersion().isVerified() ? "&a&l✔" : "&c&l❌")
-                    .append('\n')
-                    .append("&bRelease Notes: &f")
-                    .append(expansion.getVersion().getReleaseNotes())
-                    .append('\n');
-        } else {
-            final CloudExpansion.Version version = expansion.getVersion(params.get(1));
-            if (version == null) {
-                Msg.msg(sender,
-                        "&cCould not find specified version: &f" + params.get(1),
-                        "&aVersions: &f" + expansion.getAvailableVersions());
-                return;
-            }
-
-            builder.append("&bVersion: &f")
-                    .append(version.getVersion())
-                    .append('\n')
-                    .append("&bVerified: ")
-                    .append(version.isVerified() ? "&a&l✔" : "&c&l❌")
-                    .append('\n')
-                    .append("&bRelease Notes: &f")
-                    .append(version.getReleaseNotes())
-                    .append('\n')
-                    .append("&bDownload URL: &f")
-                    .append(version.getUrl())
-                    .append('\n');
-        }
-
-        Msg.msg(sender, builder.toString());
     }
 
-    @Override
+    final StringBuilder builder = new StringBuilder();
-    public void complete(@NotNull final PlaceholderAPIPlugin plugin,
-                         @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
-        if (params.size() > 2) {
-            return;
-        }
 
-        if (params.size() <= 1) {
+    builder.append("&bExpansion: &f")
-            final Stream<String> names = plugin.getCloudExpansionManager().getCloudExpansions().values()
+        .append(expansion.shouldUpdate() ? "&e" : "&a")
-                    .stream().map(CloudExpansion::getName).map(name -> name.replace(' ', '_'));
+        .append(expansion.getName())
-            suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(0));
+        .append('\n')
-            return;
+        .append("&bAuthor: &f")
-        }
+        .append(expansion.getAuthor())
+        .append('\n')
+        .append("&bVerified: ")
+        .append(expansion.isVerified() ? "&a&l✔" : "&c&l❌")
+        .append('\n');
 
-        final Optional<CloudExpansion> expansion = plugin.getCloudExpansionManager()
+    if (params.size() < 2) {
-                .findCloudExpansionByName(params.get(0));
+      builder.append("&bLatest Version: &f")
-        if (!expansion.isPresent()) {
+          .append(expansion.getLatestVersion())
-            return;
+          .append('\n')
-        }
+          .append("&bReleased: &f")
+          .append(expansion.getTimeSinceLastUpdate())
+          .append(" ago")
+          .append('\n')
+          .append("&bRelease Notes: &f")
+          .append(expansion.getVersion().getReleaseNotes())
+          .append('\n');
+    } else {
+      final CloudExpansion.Version version = expansion.getVersion(params.get(1));
+      if (version == null) {
+        Msg.msg(sender,
+            "&cCould not find specified version: &f" + params.get(1),
+            "&aVersions: &f" + expansion.getAvailableVersions());
+        return;
+      }
 
-        suggestByParameter(expansion.get().getAvailableVersions().stream(), suggestions, params.get(1));
+      builder.append("&bVersion: &f")
+          .append(version.getVersion())
+          .append('\n')
+          .append("&bRelease Notes: &f")
+          .append(version.getReleaseNotes())
+          .append('\n')
+          .append("&bDownload URL: &f")
+          .append(version.getUrl())
+          .append('\n');
     }
 
+    Msg.msg(sender, builder.toString());
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 2) {
+      return;
+    }
+
+    if (params.size() <= 1) {
+      final Stream<String> names = plugin.getCloudExpansionManager().getCloudExpansions().values()
+          .stream().map(CloudExpansion::getName).map(name -> name.replace(' ', '_'));
+      suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(0));
+      return;
+    }
+
+    final Optional<CloudExpansion> expansion = plugin.getCloudExpansionManager()
+        .findCloudExpansionByName(params.get(0));
+    if (!expansion.isPresent()) {
+      return;
+    }
+
+    suggestByParameter(expansion.get().getAvailableVersions().stream(), suggestions, params.get(1));
+  }
+
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,14 +25,12 @@ 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;
@@ -56,301 +54,299 @@ import static net.kyori.adventure.text.format.NamedTextColor.*;
 
 public final class CommandECloudExpansionList extends PlaceholderCommand {
 
-    private static final int PAGE_SIZE = 10;
+  private static final int PAGE_SIZE = 10;
 
-    @NotNull
+  @NotNull
-    private static final Function<CloudExpansion, Object> EXPANSION_NAME =
+  private static final Function<CloudExpansion, Object> EXPANSION_NAME =
-            expansion -> (expansion.shouldUpdate() ? "&6" : expansion.hasExpansion() ? "&a" : "&7")
+      expansion -> (expansion.shouldUpdate() ? "&6" : expansion.hasExpansion() ? "&a" : "&7")
-                    + expansion.getName();
+          + expansion.getName();
-    @NotNull
+  @NotNull
-    private static final Function<CloudExpansion, Object> EXPANSION_AUTHOR =
+  private static final Function<CloudExpansion, Object> EXPANSION_AUTHOR =
-            expansion -> "&f" + expansion.getAuthor();
+      expansion -> "&f" + expansion.getAuthor();
-    @NotNull
+  @NotNull
-    private static final Function<CloudExpansion, Object> EXPANSION_VERIFIED =
+  private static final Function<CloudExpansion, Object> EXPANSION_VERIFIED =
-            expansion -> expansion.getVersion().isVerified() ? "&aY" : "&cN";
+      expansion -> expansion.isVerified() ? "&aY" : "&cN";
-    @NotNull
+  @NotNull
-    private static final Function<CloudExpansion, Object> EXPANSION_LATEST_VERSION =
+  private static final Function<CloudExpansion, Object> EXPANSION_LATEST_VERSION =
-            expansion -> "&f" + expansion.getLatestVersion();
+      expansion -> "&f" + expansion.getLatestVersion();
-    @NotNull
+  @NotNull
-    private static final Function<CloudExpansion, Object> EXPANSION_CURRENT_VERSION =
+  private static final Function<CloudExpansion, Object> EXPANSION_CURRENT_VERSION =
-            expansion -> "&f" + PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()
+      expansion -> "&f" + PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()
-                    .findExpansionByName(expansion.getName()).map(PlaceholderExpansion::getVersion)
+          .findExpansionByName(expansion.getName()).map(PlaceholderExpansion::getVersion)
-                    .orElse("Unknown");
+          .orElse("Unknown");
 
 
-    @Unmodifiable
+  @Unmodifiable
-    private static final Set<String> OPTIONS = ImmutableSet.of("all", "installed");
+  private static final Set<String> OPTIONS = ImmutableSet.of("all", "installed");
 
 
-    public CommandECloudExpansionList() {
+  public CommandECloudExpansionList() {
-        super("list");
+    super("list");
+  }
+
+  @NotNull
+  private static Collection<CloudExpansion> getExpansions(@NotNull final String target,
+      @NotNull final PlaceholderAPIPlugin plugin) {
+    switch (target.toLowerCase(Locale.ROOT)) {
+      case "all":
+        return plugin.getCloudExpansionManager().getCloudExpansions().values();
+      case "installed":
+        return plugin.getCloudExpansionManager().getCloudExpansionsInstalled().values();
+      default:
+        return plugin.getCloudExpansionManager().getCloudExpansionsByAuthor(target).values();
+    }
+  }
+
+  @NotNull
+  private static List<CloudExpansion> getPage(@NotNull final List<CloudExpansion> expansions,
+      final int page) {
+    final int head = (page * PAGE_SIZE);
+    final int tail = Math.min(expansions.size(), head + PAGE_SIZE);
+
+    if (expansions.size() < head) {
+      return Collections.emptyList();
     }
 
-    @NotNull
+    return expansions.subList(head, tail);
-    private static Collection<CloudExpansion> getExpansions(@NotNull final String target,
+  }
-                                                            @NotNull final PlaceholderAPIPlugin plugin) {
+
-        switch (target.toLowerCase(Locale.ROOT)) {
+  public static void addExpansionTitle(@NotNull final StringBuilder builder,
-            case "all":
+      @NotNull final String target, final int page) {
-                return plugin.getCloudExpansionManager().getCloudExpansions().values();
+    switch (target.toLowerCase(Locale.ROOT)) {
-            case "installed":
+      case "all":
-                return plugin.getCloudExpansionManager().getCloudExpansionsInstalled().values();
+        builder.append("&bAll Expansions");
-            default:
+        break;
-                return plugin.getCloudExpansionManager().getCloudExpansionsByAuthor(target).values();
+      case "installed":
-        }
+        builder.append("&bInstalled Expansions");
+        break;
+      default:
+        builder.append("&bExpansions by &f")
+            .append(target);
+        break;
     }
 
-    @NotNull
+    if (page == -1) {
-    private static List<CloudExpansion> getPage(@NotNull final List<CloudExpansion> expansions,
+      builder.append('\n');
-                                                final int page) {
+      return;
-        final int head = (page * PAGE_SIZE);
-        final int tail = Math.min(expansions.size(), head + PAGE_SIZE);
-
-        if (expansions.size() < head) {
-            return Collections.emptyList();
-        }
-
-        return expansions.subList(head, tail);
     }
 
-    public static void addExpansionTitle(@NotNull final StringBuilder builder,
+    builder.append(" &bPage&7: &a")
-                                         @NotNull final String target, final int page) {
+        .append(page)
-        switch (target.toLowerCase(Locale.ROOT)) {
+        .append("&r");
-            case "all":
+  }
-                builder.append("&bAll Expansions");
-                break;
-            case "installed":
-                builder.append("&bInstalled Expansions");
-                break;
-            default:
-                builder.append("&bExpansions by &f")
-                        .append(target);
-                break;
-        }
 
-        if (page == -1) {
+  private static Component getMessage(@NotNull final List<CloudExpansion> expansions,
-            builder.append('\n');
+      final int page, final int limit, @NotNull final String target) {
-            return;
+    final SimpleDateFormat format = PlaceholderAPIPlugin.getDateFormat();
-        }
 
-        builder.append(" &bPage&7: &a")
+    final TextComponent.Builder message = text();
-                .append(page)
-                .append("&r");
-    }
 
-    private static Component getMessage(@NotNull final List<CloudExpansion> expansions,
+    for (int index = 0; index < expansions.size(); index++) {
-                                        final int page, final int limit, @NotNull final String target) {
+      final CloudExpansion expansion = expansions.get(index);
-        final SimpleDateFormat format = PlaceholderAPIPlugin.getDateFormat();
+      final TextComponent.Builder line = text();
 
-        final TextComponent.Builder message = text();
+      final int expansionNumber = index + ((page - 1) * PAGE_SIZE) + 1;
+      line.append(text(expansionNumber + ". ", DARK_GRAY));
 
-        for (int index = 0; index < expansions.size(); index++) {
+      final NamedTextColor expansionColour;
-            final CloudExpansion expansion = expansions.get(index);
-            final TextComponent.Builder line = text();
 
-            final int expansionNumber = index + ((page - 1) * PAGE_SIZE) + 1;
+      if (expansion.shouldUpdate()) {
-            line.append(text(expansionNumber + ". ", DARK_GRAY));
+        expansionColour = GOLD;
-
+      } else {
-            final NamedTextColor expansionColour;
+        if (expansion.hasExpansion()) {
-
+          expansionColour = GREEN;
-            if (expansion.shouldUpdate()) {
-                expansionColour = GOLD;
-            } else {
-                if (expansion.hasExpansion()) {
-                    expansionColour = GREEN;
-                } else {
-                    expansionColour = GRAY;
-                }
-            }
-
-            line.append(text(expansion.getName(), expansionColour));
-
-            line.clickEvent(ClickEvent.suggestCommand("/papi ecloud download " + expansion.getName()));
-
-            final TextComponent.Builder hoverText = text("Click to download this expansion!", AQUA)
-                    .append(newline()).append(newline())
-                    .append(text("Author: ", AQUA)).append(text(expansion.getAuthor(), WHITE))
-                    .append(newline())
-                    .append(text("Version: ", AQUA)).append(text(expansion.getVersion().getVersion(), WHITE))
-                    .append(newline())
-                    .append(text("Verified: ", AQUA)).append(text(expansion.getVersion().isVerified() ? "✔" : "❌", expansion.getVersion().isVerified() ? GREEN : RED, TextDecoration.BOLD))
-                    .append(newline())
-                    .append(text("Released: ", AQUA)).append(text(format.format(expansion.getLastUpdate()), WHITE))
-                    .toBuilder();
-
-            Optional.ofNullable(expansion.getDescription())
-                    .filter(description -> !description.isEmpty())
-                    .ifPresent(description -> hoverText.append(newline()).append(newline())
-                            .append(text(description.replace("\r", "").trim(), WHITE))
-                    );
-
-            line.hoverEvent(HoverEvent.showText(hoverText.build()));
-
-            if (index != expansions.size() - 1) {
-                line.append(newline());
-            }
-
-            message.append(line.build());
-        }
-
-        if (limit > 1) {
-            message.append(newline());
-
-            final TextComponent.Builder left = text("◀", page > 1 ? GRAY : DARK_GRAY).toBuilder();
-
-            if (page > 1) {
-                left.clickEvent(ClickEvent.runCommand("/papi ecloud list " + target + " " + (page - 1)));
-            }
-
-            final TextComponent.Builder right = text("▶", page < limit ? GRAY : DARK_GRAY).toBuilder();
-
-            if (page < limit) {
-                right.clickEvent(ClickEvent.runCommand("/papi ecloud list " + target + " " + (page + 1)));
-            }
-
-            message.append(left, text(" " + page + " ", GREEN), right);
-        }
-
-        return message.build();
-    }
-
-    private static void addExpansionTable(@NotNull final List<CloudExpansion> expansions,
-                                          @NotNull final StringBuilder message, final int startIndex,
-                                          @NotNull final String versionTitle,
-                                          @NotNull final Function<CloudExpansion, Object> versionFunction) {
-        final Map<String, Function<CloudExpansion, Object>> functions = new LinkedHashMap<>();
-
-        final AtomicInteger counter = new AtomicInteger(startIndex);
-        functions.put("&f", expansion -> "&8" + counter.getAndIncrement() + ".");
-
-        functions.put("&9Name", EXPANSION_NAME);
-        functions.put("&9Author", EXPANSION_AUTHOR);
-        functions.put("&9Verified", EXPANSION_VERIFIED);
-        functions.put(versionTitle, versionFunction);
-
-        final List<List<String>> rows = new ArrayList<>();
-
-        rows.add(0, new ArrayList<>(functions.keySet()));
-
-        for (final CloudExpansion expansion : expansions) {
-            rows.add(functions.values().stream().map(function -> function.apply(expansion))
-                    .map(Objects::toString).collect(Collectors.toList()));
-        }
-
-        final List<String> table = Format.tablify(Format.Align.LEFT, rows)
-                .orElse(Collections.emptyList());
-        if (table.isEmpty()) {
-            return;
-        }
-
-        table.add(1, "&8" + Strings.repeat("-", table.get(0).length() - (rows.get(0).size() * 2)));
-
-        message.append(String.join("\n", table));
-    }
-
-    @Override
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
-                         @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params) {
-        if (params.isEmpty()) {
-            Msg.msg(sender,
-                    "&cYou must specify an option. [all, {author}, installed]");
-            return;
-        }
-
-        final boolean installed = params.get(0).equalsIgnoreCase("installed");
-        final List<CloudExpansion> expansions = Lists
-                .newArrayList(getExpansions(params.get(0), plugin));
-
-        if (expansions.isEmpty()) {
-            Msg.msg(sender,
-                    "&cNo expansions available to list.");
-            return;
-        }
-
-        expansions
-                .sort(plugin.getPlaceholderAPIConfig().getExpansionSort().orElse(ExpansionSort.LATEST));
-
-        if (!(sender instanceof Player) && params.size() < 2) {
-            final StringBuilder builder = new StringBuilder();
-
-            addExpansionTitle(builder, params.get(0), -1);
-            addExpansionTable(expansions,
-                    builder,
-                    1,
-                    installed ? "&9Version" : "&9Latest Version",
-                    installed ? EXPANSION_CURRENT_VERSION : EXPANSION_LATEST_VERSION);
-
-            Msg.msg(sender, builder.toString());
-            return;
-        }
-
-        final int page;
-
-        if (params.size() < 2) {
-            page = 1;
         } else {
-            //noinspection UnstableApiUsage
+          expansionColour = GRAY;
-            final Integer parsed = Ints.tryParse(params.get(1));
-            if (parsed == null) {
-                Msg.msg(sender,
-                        "&cPage number must be an integer.");
-                return;
-            }
-
-            final int limit = (int) Math.ceil((double) expansions.size() / PAGE_SIZE);
-
-            if (parsed < 1 || parsed > limit) {
-                Msg.msg(sender,
-                        "&cPage number must be in the range &8[&a1&7..&a" + limit + "&8]");
-                return;
-            }
-
-            page = parsed;
         }
+      }
 
-        final StringBuilder builder = new StringBuilder();
+      line.append(text(expansion.getName(), expansionColour));
-        final List<CloudExpansion> values = getPage(expansions, page - 1);
 
-        addExpansionTitle(builder, params.get(0), page);
+      line.clickEvent(ClickEvent.suggestCommand("/papi ecloud download " + expansion.getName()));
 
-        if (!(sender instanceof Player)) {
+      final TextComponent.Builder hoverText = text("Click to download this expansion!", AQUA)
-            addExpansionTable(values,
+              .append(newline()).append(newline())
-                    builder,
+              .append(text("Author: ", AQUA)).append(text(expansion.getAuthor(), WHITE))
-                    ((page - 1) * PAGE_SIZE) + 1,
+              .append(newline())
-                    installed ? "&9Version" : "&9Latest Version",
+              .append(text("Verified: ", AQUA)).append(text(expansion.isVerified() ? "✔" : "❌", expansion.isVerified() ? GREEN : RED, TextDecoration.BOLD))
-                    installed ? EXPANSION_CURRENT_VERSION : EXPANSION_LATEST_VERSION);
+              .append(newline())
+              .append(text("Released: ", AQUA)).append(text(format.format(expansion.getLastUpdate()), WHITE))
+              .toBuilder();
 
-            Msg.msg(sender, builder.toString());
+      Optional.ofNullable(expansion.getDescription())
+              .filter(description -> !description.isEmpty())
+              .ifPresent(description -> hoverText.append(newline()).append(newline())
+                      .append(text(description.replace("\r", "").trim(), WHITE))
+              );
 
-            return;
+      line.hoverEvent(HoverEvent.showText(hoverText.build()));
-        }
 
-        Msg.msg(sender, builder.toString());
+      if (index != expansions.size() - 1) {
+        line.append(newline());
+      }
 
-        final int limit = (int) Math.ceil((double) expansions.size() / PAGE_SIZE);
+      message.append(line.build());
-
-        final Component message = getMessage(values, page, limit, params.get(0));
-        plugin.getAdventure().player((Player) sender).sendMessage(message);
     }
 
-    @Override
+    if (limit > 1) {
-    public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      message.append(newline());
-                         @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
-        if (params.size() > 2) {
-            return;
-        }
 
-        if (params.size() <= 1) {
+      final TextComponent.Builder left = text("◀", page > 1 ? GRAY : DARK_GRAY).toBuilder();
-            suggestByParameter(
-                    Sets.union(OPTIONS, plugin.getCloudExpansionManager().getCloudExpansionAuthors())
-                            .stream(), suggestions, params.isEmpty() ? null : params.get(0));
-            return;
-        }
 
-        suggestByParameter(IntStream.rangeClosed(1,
+      if (page > 1) {
-                        (int) Math.ceil((double) getExpansions(params.get(0), plugin).size() / PAGE_SIZE))
+        left.clickEvent(ClickEvent.runCommand("/papi ecloud list " + target + " " + (page - 1)));
-                .mapToObj(Objects::toString), suggestions, params.get(1));
+      }
+
+      final TextComponent.Builder right = text("▶", page < limit ? GRAY : DARK_GRAY).toBuilder();
+
+      if (page < limit) {
+        right.clickEvent(ClickEvent.runCommand("/papi ecloud list " + target + " " + (page + 1)));
+      }
+
+      message.append(left, text(" " + page + " ", GREEN), right);
     }
 
+    return message.build();
+  }
+
+  private static void addExpansionTable(@NotNull final List<CloudExpansion> expansions,
+      @NotNull final StringBuilder message, final int startIndex,
+      @NotNull final String versionTitle,
+      @NotNull final Function<CloudExpansion, Object> versionFunction) {
+    final Map<String, Function<CloudExpansion, Object>> functions = new LinkedHashMap<>();
+
+    final AtomicInteger counter = new AtomicInteger(startIndex);
+    functions.put("&f", expansion -> "&8" + counter.getAndIncrement() + ".");
+
+    functions.put("&9Name", EXPANSION_NAME);
+    functions.put("&9Author", EXPANSION_AUTHOR);
+    functions.put("&9Verified", EXPANSION_VERIFIED);
+    functions.put(versionTitle, versionFunction);
+
+    final List<List<String>> rows = new ArrayList<>();
+
+    rows.add(0, new ArrayList<>(functions.keySet()));
+
+    for (final CloudExpansion expansion : expansions) {
+      rows.add(functions.values().stream().map(function -> function.apply(expansion))
+          .map(Objects::toString).collect(Collectors.toList()));
+    }
+
+    final List<String> table = Format.tablify(Format.Align.LEFT, rows)
+        .orElse(Collections.emptyList());
+    if (table.isEmpty()) {
+      return;
+    }
+
+    table.add(1, "&8" + Strings.repeat("-", table.get(0).length() - (rows.get(0).size() * 2)));
+
+    message.append(String.join("\n", table));
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&cYou must specify an option. [all, {author}, installed]");
+      return;
+    }
+
+    final boolean installed = params.get(0).equalsIgnoreCase("installed");
+    final List<CloudExpansion> expansions = Lists
+        .newArrayList(getExpansions(params.get(0), plugin));
+
+    if (expansions.isEmpty()) {
+      Msg.msg(sender,
+          "&cNo expansions available to list.");
+      return;
+    }
+
+    expansions
+        .sort(plugin.getPlaceholderAPIConfig().getExpansionSort().orElse(ExpansionSort.LATEST));
+
+    if (!(sender instanceof Player) && params.size() < 2) {
+      final StringBuilder builder = new StringBuilder();
+
+      addExpansionTitle(builder, params.get(0), -1);
+      addExpansionTable(expansions,
+          builder,
+          1,
+          installed ? "&9Version" : "&9Latest Version",
+          installed ? EXPANSION_CURRENT_VERSION : EXPANSION_LATEST_VERSION);
+
+      Msg.msg(sender, builder.toString());
+      return;
+    }
+
+    final int page;
+
+    if (params.size() < 2) {
+      page = 1;
+    } else {
+      //noinspection UnstableApiUsage
+      final Integer parsed = Ints.tryParse(params.get(1));
+      if (parsed == null) {
+        Msg.msg(sender,
+            "&cPage number must be an integer.");
+        return;
+      }
+
+      final int limit = (int) Math.ceil((double) expansions.size() / PAGE_SIZE);
+
+      if (parsed < 1 || parsed > limit) {
+        Msg.msg(sender,
+            "&cPage number must be in the range &8[&a1&7..&a" + limit + "&8]");
+        return;
+      }
+
+      page = parsed;
+    }
+
+    final StringBuilder builder = new StringBuilder();
+    final List<CloudExpansion> values = getPage(expansions, page - 1);
+
+    addExpansionTitle(builder, params.get(0), page);
+
+    if (!(sender instanceof Player)) {
+      addExpansionTable(values,
+          builder,
+          ((page - 1) * PAGE_SIZE) + 1,
+          installed ? "&9Version" : "&9Latest Version",
+          installed ? EXPANSION_CURRENT_VERSION : EXPANSION_LATEST_VERSION);
+
+      Msg.msg(sender, builder.toString());
+
+      return;
+    }
+
+    Msg.msg(sender, builder.toString());
+
+    final int limit = (int) Math.ceil((double) expansions.size() / PAGE_SIZE);
+
+    final Component message = getMessage(values, page, limit, params.get(0));
+    plugin.getAdventure().player((Player) sender).sendMessage(message);
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 2) {
+      return;
+    }
+
+    if (params.size() <= 1) {
+      suggestByParameter(
+          Sets.union(OPTIONS, plugin.getCloudExpansionManager().getCloudExpansionAuthors())
+              .stream(), suggestions, params.isEmpty() ? null : params.get(0));
+      return;
+    }
+
+    suggestByParameter(IntStream.rangeClosed(1,
+        (int) Math.ceil((double) getExpansions(params.get(0), plugin).size() / PAGE_SIZE))
+        .mapToObj(Objects::toString), suggestions, params.get(1));
+  }
+
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,11 +21,9 @@
 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;
@@ -36,61 +34,61 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class CommandECloudExpansionPlaceholders extends PlaceholderCommand {
 
-    public CommandECloudExpansionPlaceholders() {
+  public CommandECloudExpansionPlaceholders() {
-        super("placeholders");
+    super("placeholders");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&cYou must specify the name of the expansion.");
+      return;
     }
 
-    @Override
+    final CloudExpansion expansion = plugin.getCloudExpansionManager()
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+        .findCloudExpansionByName(params.get(0)).orElse(null);
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+    if (expansion == null) {
-                         @NotNull @Unmodifiable final List<String> params) {
+      Msg.msg(sender,
-        if (params.isEmpty()) {
+          "&cThere is no expansion with the name: &f" + params.get(0));
-            Msg.msg(sender,
+      return;
-                    "&cYou must specify the name of the expansion.");
-            return;
-        }
-
-        final CloudExpansion expansion = plugin.getCloudExpansionManager()
-                .findCloudExpansionByName(params.get(0)).orElse(null);
-        if (expansion == null) {
-            Msg.msg(sender,
-                    "&cThere is no expansion with the name: &f" + params.get(0));
-            return;
-        }
-
-        final List<String> placeholders = expansion.getPlaceholders();
-        if (placeholders == null || placeholders.isEmpty()) {
-            Msg.msg(sender,
-                    "&cThe expansion specified does not have placeholders listed.");
-            return;
-        }
-
-        final List<List<String>> partitions = Lists
-                .partition(placeholders.stream().sorted().collect(Collectors.toList()), 10);
-
-        Msg.msg(sender,
-                "&6" + placeholders.size() + "&7 placeholders: &a",
-                partitions.stream().map(partition -> String.join(", ", partition))
-                        .collect(Collectors.joining("\n")));
-
     }
 
-    @Override
+    final List<String> placeholders = expansion.getPlaceholders();
-    public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+    if (placeholders == null || placeholders.isEmpty()) {
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+      Msg.msg(sender,
-                         @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+          "&cThe expansion specified does not have placeholders listed.");
-        if (params.size() > 1) {
+      return;
-            return;
-        }
-
-        final Stream<String> names = plugin.getCloudExpansionManager()
-                .getCloudExpansions()
-                .values()
-                .stream()
-                .map(CloudExpansion::getName)
-                .map(name -> name.replace(' ', '_'));
-
-        suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(0));
     }
 
+    final List<List<String>> partitions = Lists
+        .partition(placeholders.stream().sorted().collect(Collectors.toList()), 10);
+
+    Msg.msg(sender,
+        "&6" + placeholders.size() + "&7 placeholders: &a",
+        partitions.stream().map(partition -> String.join(", ", partition))
+            .collect(Collectors.joining("\n")));
+
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 1) {
+      return;
+    }
+
+    final Stream<String> names = plugin.getCloudExpansionManager()
+        .getCloudExpansions()
+        .values()
+        .stream()
+        .map(CloudExpansion::getName)
+        .map(name -> name.replace(' ', '_'));
+
+    suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(0));
+  }
+
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
 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;
@@ -31,18 +30,18 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class CommandECloudRefresh extends PlaceholderCommand {
 
-    public CommandECloudRefresh() {
+  public CommandECloudRefresh() {
-        super("refresh");
+    super("refresh");
-    }
+  }
 
-    @Override
+  @Override
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params) {
+      @NotNull @Unmodifiable final List<String> params) {
-        plugin.getCloudExpansionManager().load();
+    plugin.getCloudExpansionManager().load();
 
-        Msg.msg(sender,
+    Msg.msg(sender,
-                "&aThe eCloud manager has been refreshed!");
+        "&aThe eCloud manager has been refreshed!");
-    }
+  }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
 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;
@@ -32,34 +31,34 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class CommandECloudStatus extends PlaceholderCommand {
 
-    public CommandECloudStatus() {
+  public CommandECloudStatus() {
-        super("status");
+    super("status");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    final CloudExpansionManager manager = plugin.getCloudExpansionManager();
+
+    final int updateCount = manager.getCloudUpdateCount();
+    final int authorCount = manager.getCloudExpansionAuthorCount();
+    final int expansionCount = manager.getCloudExpansions().size();
+
+    final StringBuilder builder = new StringBuilder();
+
+    builder.append("&bThere are &a").append(expansionCount)
+        .append("&b expansions available on the eCloud.").append('\n');
+    builder.append("&7A total of &f").append(authorCount)
+        .append("&7 authors have contributed to the eCloud.").append('\n');
+
+    if (updateCount > 0) {
+      builder.append("&eYou have &f").append(updateCount)
+          .append(updateCount > 1 ? "&e expansions" : "&e expansion").append(" installed that ")
+          .append(updateCount > 1 ? "have an" : "has an").append(" update available.");
     }
 
-    @Override
+    Msg.msg(sender, builder.toString());
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+  }
-                         @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params) {
-        final CloudExpansionManager manager = plugin.getCloudExpansionManager();
-
-        final int updateCount = manager.getCloudUpdateCount();
-        final int authorCount = manager.getCloudExpansionAuthorCount();
-        final int expansionCount = manager.getCloudExpansions().size();
-
-        final StringBuilder builder = new StringBuilder();
-
-        builder.append("&bThere are &a").append(expansionCount)
-                .append("&b expansions available on the eCloud.").append('\n');
-        builder.append("&7A total of &f").append(authorCount)
-                .append("&7 authors have contributed to the eCloud.").append('\n');
-
-        if (updateCount > 0) {
-            builder.append("&eYou have &f").append(updateCount)
-                    .append(updateCount > 1 ? "&e expansions" : "&e expansion").append(" installed that ")
-                    .append(updateCount > 1 ? "have an" : "has an").append(" update available.");
-        }
-
-        Msg.msg(sender, builder.toString());
-    }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
 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;
@@ -29,7 +28,6 @@ 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;
@@ -46,98 +44,98 @@ import org.jetbrains.annotations.Unmodifiable;
  */
 public final class CommandECloudUpdate extends PlaceholderCommand {
 
-    public CommandECloudUpdate() {
+  public CommandECloudUpdate() {
-        super("update");
+    super("update");
+  }
+
+  private static CompletableFuture<List<@Nullable Class<? extends PlaceholderExpansion>>> downloadAndDiscover(
+      @NotNull final List<CloudExpansion> expansions, @NotNull final PlaceholderAPIPlugin plugin) {
+    return expansions.stream()
+        .map(expansion -> plugin.getCloudExpansionManager()
+            .downloadExpansion(expansion, expansion.getVersion()))
+        .map(future -> future.thenCompose(plugin.getLocalExpansionManager()::findExpansionInFile))
+        .collect(Futures.collector());
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&cYou must define 'all' or the name of an expansion to update.");
+      return;
     }
 
-    private static CompletableFuture<List<@Nullable Class<? extends PlaceholderExpansion>>> downloadAndDiscover(
+    final boolean multiple = params.get(0).equalsIgnoreCase("all");
-            @NotNull final List<CloudExpansion> expansions, @NotNull final PlaceholderAPIPlugin plugin) {
+    final List<CloudExpansion> expansions = new ArrayList<>();
-        return expansions.stream()
+
-                .map(expansion -> plugin.getCloudExpansionManager()
+    // gather target expansions
-                        .downloadExpansion(expansion, expansion.getVersion()))
+    if (multiple) {
-                .map(future -> future.thenCompose(plugin.getLocalExpansionManager()::findExpansionInFile))
+      expansions.addAll(plugin.getCloudExpansionManager().getCloudExpansionsInstalled().values());
-                .collect(Futures.collector());
+    } else {
+      plugin.getCloudExpansionManager().findCloudExpansionByName(params.get(0))
+          .ifPresent(expansions::add);
     }
 
-    @Override
+    // remove the ones that are the latest version
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+    expansions.removeIf(expansion -> !expansion.shouldUpdate());
-                         @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params) {
-        if (params.isEmpty()) {
-            Msg.msg(sender,
-                    "&cYou must define 'all' or the name of an expansion to update.");
-            return;
-        }
 
-        final boolean multiple = params.get(0).equalsIgnoreCase("all");
+    if (expansions.isEmpty()) {
-        final List<CloudExpansion> expansions = new ArrayList<>();
+      Msg.msg(sender,
+          "&cNo updates available for " + (!multiple ? "this expansion."
+              : "your active expansions."));
+      return;
+    }
 
-        // gather target expansions
+    Msg.msg(sender,
-        if (multiple) {
+        "&aUpdating expansions: " + expansions.stream().map(CloudExpansion::getName)
-            expansions.addAll(plugin.getCloudExpansionManager().getCloudExpansionsInstalled().values());
+            .collect(Collectors.joining("&7, &6", "&8[&6", "&8]&r")));
-        } else {
-            plugin.getCloudExpansionManager().findCloudExpansionByName(params.get(0))
-                    .ifPresent(expansions::add);
-        }
-
-        // remove the ones that are the latest version
-        expansions.removeIf(expansion -> !expansion.shouldUpdate());
-
-        if (expansions.isEmpty()) {
-            Msg.msg(sender,
-                    "&cNo updates available for " + (!multiple ? "this expansion."
-                            : "your active expansions."));
-            return;
-        }
 
+    Futures.onMainThread(plugin, downloadAndDiscover(expansions, plugin), (classes, exception) -> {
+      if (exception != null) {
         Msg.msg(sender,
-                "&aUpdating expansions: " + expansions.stream().map(CloudExpansion::getName)
+            "&cFailed to update expansions: &e" + exception.getMessage());
-                        .collect(Collectors.joining("&7, &6", "&8[&6", "&8]&r")));
+        return;
+      }
 
-        Futures.onMainThread(plugin, downloadAndDiscover(expansions, plugin), (classes, exception) -> {
+      Msg.msg(sender,
-            if (exception != null) {
+          "&aSuccessfully downloaded updates, registering new versions.");
-                Msg.msg(sender,
-                        "&cFailed to update expansions: &e" + exception.getMessage());
-                return;
-            }
 
-            Msg.msg(sender,
+      final String message = classes.stream()
-                    "&aSuccessfully downloaded updates, registering new versions.");
+          .filter(Objects::nonNull)
+          .map(plugin.getLocalExpansionManager()::register)
+          .filter(Optional::isPresent)
+          .map(Optional::get)
+          .map(expansion -> "  &a" + expansion.getName() + " &f" + expansion.getVersion())
+          .collect(Collectors.joining("\n"));
 
-            final String message = classes.stream()
+      Msg.msg(sender,
-                    .filter(Objects::nonNull)
+          "&7Registered expansions:", message);
-                    .map(plugin.getLocalExpansionManager()::register)
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .map(expansion -> "  &a" + expansion.getName() + " &f" + expansion.getVersion())
-                    .collect(Collectors.joining("\n"));
 
-            Msg.msg(sender,
+    });
-                    "&7Registered expansions:", message);
+  }
 
-        });
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 1) {
+      return;
     }
 
-    @Override
+    final List<CloudExpansion> installed = Lists
-    public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+        .newArrayList(plugin.getCloudExpansionManager().getCloudExpansionsInstalled().values());
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+    installed.removeIf(expansion -> !expansion.shouldUpdate());
-                         @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
-        if (params.size() > 1) {
-            return;
-        }
 
-        final List<CloudExpansion> installed = Lists
+    if (!installed.isEmpty() && (params.isEmpty() || "all"
-                .newArrayList(plugin.getCloudExpansionManager().getCloudExpansionsInstalled().values());
+        .startsWith(params.get(0).toLowerCase(Locale.ROOT)))) {
-        installed.removeIf(expansion -> !expansion.shouldUpdate());
+      suggestions.add("all");
-
-        if (!installed.isEmpty() && (params.isEmpty() || "all"
-                .startsWith(params.get(0).toLowerCase(Locale.ROOT)))) {
-            suggestions.add("all");
-        }
-
-        suggestByParameter(
-                installed.stream().map(CloudExpansion::getName).map(name -> name.replace(" ", "_")),
-                suggestions, params.isEmpty() ? null : params.get(0));
     }
 
+    suggestByParameter(
+        installed.stream().map(CloudExpansion::getName).map(name -> name.replace(" ", "_")),
+        suggestions, params.isEmpty() ? null : params.get(0));
+  }
+
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,160 +54,160 @@ import java.util.stream.Collectors;
 
 public final class CommandDump extends PlaceholderCommand {
 
-    @NotNull
+  @NotNull
-    private static final String URL = "https://paste.helpch.at/";
+  private static final String URL = "https://paste.helpch.at/";
 
-    @NotNull
+  @NotNull
-    private static final Gson gson = new Gson();
+  private static final Gson gson = new Gson();
 
-    @NotNull
+  @NotNull
-    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter
+  private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter
-            .ofLocalizedDateTime(FormatStyle.LONG)
+      .ofLocalizedDateTime(FormatStyle.LONG)
-            .withLocale(Locale.US)
+      .withLocale(Locale.US)
-            .withZone(ZoneId.of("UTC"));
+      .withZone(ZoneId.of("UTC"));
 
 
-    public CommandDump() {
+  public CommandDump() {
-        super("dump");
+    super("dump");
-    }
+  }
 
-    @Override
+  @Override
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params) {
+      @NotNull @Unmodifiable final List<String> params) {
-        postDump(makeDump(plugin)).whenComplete((key, exception) -> {
+    postDump(makeDump(plugin)).whenComplete((key, exception) -> {
-            if (exception != null) {
+      if (exception != null) {
-                plugin.getLogger().log(Level.WARNING, "failed to post dump details", exception);
+        plugin.getLogger().log(Level.WARNING, "failed to post dump details", exception);
 
-                Msg.msg(sender,
+        Msg.msg(sender,
-                        "&cFailed to post dump details, check console.");
+            "&cFailed to post dump details, check console.");
-                return;
+        return;
-            }
+      }
 
-            Msg.msg(sender,
+      Msg.msg(sender,
-                    "&aSuccessfully posted dump: " + URL + key);
+          "&aSuccessfully posted dump: " + URL + key);
-        });
+    });
-    }
+  }
 
-    @NotNull
+  @NotNull
-    private CompletableFuture<String> postDump(@NotNull final String dump) {
+  private CompletableFuture<String> postDump(@NotNull final String dump) {
-        return CompletableFuture.supplyAsync(() -> {
+    return CompletableFuture.supplyAsync(() -> {
-            try {
+      try {
-                final HttpURLConnection connection = ((HttpURLConnection) new URL(URL + "documents")
+        final HttpURLConnection connection = ((HttpURLConnection) new URL(URL + "documents")
-                        .openConnection());
+            .openConnection());
-                connection.setRequestMethod("POST");
+        connection.setRequestMethod("POST");
-                connection.setRequestProperty("Content-Type", "text/plain; charset=utf-8");
+        connection.setRequestProperty("Content-Type", "text/plain; charset=utf-8");
-                connection.setDoOutput(true);
+        connection.setDoOutput(true);
 
-                connection.connect();
+        connection.connect();
-
-                try (final OutputStream stream = connection.getOutputStream()) {
-                    stream.write(dump.getBytes(StandardCharsets.UTF_8));
-                }
-
-                try (final InputStream stream = connection.getInputStream()) {
-                    final String json = CharStreams.toString(new InputStreamReader(stream, StandardCharsets.UTF_8));
-                    return gson.fromJson(json, JsonObject.class).get("key").getAsString();
-                }
-            } catch (final IOException ex) {
-                throw new CompletionException(ex);
-            }
-        });
-    }
-
-    @NotNull
-    private String makeDump(@NotNull final PlaceholderAPIPlugin plugin) {
-        final StringBuilder builder = new StringBuilder();
-
-        builder.append("Generated: ")
-                .append(DATE_FORMAT.format(Instant.now()))
-                .append("\n\n");
-
-        builder.append("PlaceholderAPI: ")
-                .append(plugin.getDescription().getVersion())
-                .append("\n\n");
-
-        builder.append("Expansions Registered:")
-                .append('\n');
-
-        final List<PlaceholderExpansion> expansions = plugin.getLocalExpansionManager()
-                .getExpansions()
-                .stream()
-                .sorted(
-                        Comparator.comparing(PlaceholderExpansion::getIdentifier)
-                                .thenComparing(PlaceholderExpansion::getAuthor)
-                )
-                .collect(Collectors.toList());
-
-        int size = expansions.stream().map(e -> e.getIdentifier().length())
-                .max(Integer::compareTo)
-                .orElse(0);
-
-        for (final PlaceholderExpansion expansion : expansions) {
-            builder.append("  ")
-                    .append(String.format("%-" + size + "s", expansion.getIdentifier()))
-                    .append(" [Author: ")
-                    .append(expansion.getAuthor())
-                    .append(", Version: ")
-                    .append(expansion.getVersion())
-                    .append("]\n");
 
+        try (final OutputStream stream = connection.getOutputStream()) {
+          stream.write(dump.getBytes(StandardCharsets.UTF_8));
         }
 
-        builder.append('\n');
+        try (final InputStream stream = connection.getInputStream()) {
-
+          final String json = CharStreams.toString(new InputStreamReader(stream, StandardCharsets.UTF_8));
-        builder.append("Expansions Directory:")
+          return gson.fromJson(json, JsonObject.class).get("key").getAsString();
-                .append('\n');
-
-        final String[] jars = plugin.getLocalExpansionManager()
-                .getExpansionsFolder()
-                .list((dir, name) -> name.toLowerCase(Locale.ROOT).endsWith(".jar"));
-
-
-        if (jars == null) {
-            builder.append("  ¨[Warning]: Could not load jar files from expansions folder.");
-        } else {
-            for (final String jar : jars) {
-                builder.append("  ")
-                        .append(jar)
-                        .append('\n');
-            }
         }
+      } catch (final IOException ex) {
+        throw new CompletionException(ex);
+      }
+    });
+  }
 
-        builder.append('\n');
+  @NotNull
+  private String makeDump(@NotNull final PlaceholderAPIPlugin plugin) {
+    final StringBuilder builder = new StringBuilder();
 
-        builder.append("Server Info: ")
+    builder.append("Generated: ")
-                .append(plugin.getServer().getBukkitVersion())
+        .append(DATE_FORMAT.format(Instant.now()))
-                .append('/')
+        .append("\n\n");
-                .append(plugin.getServer().getVersion())
-                .append("\n");
 
-        builder.append("Java Version: ")
+    builder.append("PlaceholderAPI: ")
-                .append(System.getProperty("java.version"))
+        .append(plugin.getDescription().getVersion())
-                .append("\n\n");
+        .append("\n\n");
 
-        builder.append("Plugin Info:")
+    builder.append("Expansions Registered:")
-                .append('\n');
+        .append('\n');
 
-        List<Plugin> plugins = Arrays.stream(plugin.getServer().getPluginManager().getPlugins())
+    final List<PlaceholderExpansion> expansions = plugin.getLocalExpansionManager()
-                .sorted(Comparator.comparing(Plugin::getName))
+        .getExpansions()
-                .collect(Collectors.toList());
+        .stream()
+        .sorted(
+            Comparator.comparing(PlaceholderExpansion::getIdentifier)
+                      .thenComparing(PlaceholderExpansion::getAuthor)
+        )
+        .collect(Collectors.toList());
 
-        size = plugins.stream().map(pl -> pl.getName().length())
+    int size = expansions.stream().map(e -> e.getIdentifier().length())
-                .max(Integer::compareTo)
+        .max(Integer::compareTo)
-                .orElse(0);
+        .orElse(0);
 
-        for (final Plugin other : plugins) {
+    for (final PlaceholderExpansion expansion : expansions) {
-            builder.append("  ")
+      builder.append("  ")
-                    .append(String.format("%-" + size + "s", other.getName()))
+          .append(String.format("%-" + size + "s", expansion.getIdentifier()))
-                    .append(" [Authors: [")
+          .append(" [Author: ")
-                    .append(String.join(", ", other.getDescription().getAuthors()))
+          .append(expansion.getAuthor())
-                    .append("], Version: ")
+          .append(", Version: ")
-                    .append(other.getDescription().getVersion())
+          .append(expansion.getVersion())
-                    .append("]")
+          .append("]\n");
-                    .append("\n");
-        }
 
-        return builder.toString();
     }
+
+    builder.append('\n');
+
+    builder.append("Expansions Directory:")
+        .append('\n');
+
+    final String[] jars = plugin.getLocalExpansionManager()
+        .getExpansionsFolder()
+        .list((dir, name) -> name.toLowerCase(Locale.ROOT).endsWith(".jar"));
+
+
+    if (jars == null) {
+      builder.append("  ¨[Warning]: Could not load jar files from expansions folder.");
+    } else {
+      for (final String jar : jars) {
+        builder.append("  ")
+            .append(jar)
+            .append('\n');
+      }
+    }
+
+    builder.append('\n');
+
+    builder.append("Server Info: ")
+        .append(plugin.getServer().getBukkitVersion())
+        .append('/')
+        .append(plugin.getServer().getVersion())
+        .append("\n");
+
+    builder.append("Java Version: ")
+        .append(System.getProperty("java.version"))
+        .append("\n\n");
+
+    builder.append("Plugin Info:")
+        .append('\n');
+
+    List<Plugin> plugins = Arrays.stream(plugin.getServer().getPluginManager().getPlugins())
+        .sorted(Comparator.comparing(Plugin::getName))
+        .collect(Collectors.toList());
+    
+    size = plugins.stream().map(pl -> pl.getName().length())
+        .max(Integer::compareTo)
+        .orElse(0);
+
+    for (final Plugin other : plugins) {
+      builder.append("  ")
+          .append(String.format("%-" + size + "s", other.getName()))
+          .append(" [Authors: [")
+          .append(String.join(", ", other.getDescription().getAuthors()))
+          .append("], Version: ")
+          .append(other.getDescription().getVersion())
+          .append("]")
+          .append("\n");
+    }
+
+    return builder.toString();
+  }
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@ 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;
@@ -38,74 +37,74 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class CommandExpansionRegister extends PlaceholderCommand {
 
-    public CommandExpansionRegister() {
+  public CommandExpansionRegister() {
-        super("register");
+    super("register");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.size() < 1) {
+      Msg.msg(sender,
+          "&cYou must specify the name of an expansion file.");
+      return;
     }
 
-    @Override
+    final LocalExpansionManager manager = plugin.getLocalExpansionManager();
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
-                         @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params) {
-        if (params.size() < 1) {
-            Msg.msg(sender,
-                    "&cYou must specify the name of an expansion file.");
-            return;
-        }
 
-        final LocalExpansionManager manager = plugin.getLocalExpansionManager();
+    final File file = new File(manager.getExpansionsFolder(), params.get(0));
-
+    if (!file.exists() || !file.getParentFile().equals(manager.getExpansionsFolder())) {
-        final File file = new File(manager.getExpansionsFolder(), params.get(0));
+      Msg.msg(sender,
-        if (!file.exists() || !file.getParentFile().equals(manager.getExpansionsFolder())) {
+          "&cThe file &f" + file.getName() + "&c doesn't exist!");
-            Msg.msg(sender,
+      return;
-                    "&cThe file &f" + file.getName() + "&c doesn't exist!");
-            return;
-        }
-
-        Futures.onMainThread(plugin, manager.findExpansionInFile(file), (clazz, exception) -> {
-            if (exception != null) {
-                Msg.msg(sender,
-                        "&cFailed to find expansion in file: &f" + file);
-
-                plugin.getLogger()
-                        .log(Level.WARNING, "failed to find expansion in file: " + file, exception);
-                return;
-            }
-
-            if (clazz == null) {
-                Msg.msg(sender,
-                        "&cNo expansion class found in file: &f" + file);
-                return;
-            }
-
-            final Optional<PlaceholderExpansion> expansion = manager.register(clazz);
-            if (!expansion.isPresent()) {
-                Msg.msg(sender,
-                        "&cFailed to register expansion from &f" + params.get(0));
-                return;
-            }
-
-            Msg.msg(sender,
-                    "&aSuccessfully registered expansion: &f" + expansion.get().getName());
-
-        });
     }
 
-    @Override
+    Futures.onMainThread(plugin, manager.findExpansionInFile(file), (clazz, exception) -> {
-    public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      if (exception != null) {
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+        Msg.msg(sender,
-                         @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+            "&cFailed to find expansion in file: &f" + file);
-        if (params.size() > 1) {
-            return;
-        }
 
-        final String[] fileNames = plugin.getLocalExpansionManager().getExpansionsFolder()
+        plugin.getLogger()
-                .list((dir, name) -> name.endsWith(".jar"));
+            .log(Level.WARNING, "failed to find expansion in file: " + file, exception);
-        if (fileNames == null || fileNames.length == 0) {
+        return;
-            return;
+      }
-        }
 
-        suggestByParameter(Arrays.stream(fileNames), suggestions,
+      if (clazz == null) {
-                params.isEmpty() ? null : params.get(0));
+        Msg.msg(sender,
+            "&cNo expansion class found in file: &f" + file);
+        return;
+      }
+
+      final Optional<PlaceholderExpansion> expansion = manager.register(clazz);
+      if (!expansion.isPresent()) {
+        Msg.msg(sender,
+            "&cFailed to register expansion from &f" + params.get(0));
+        return;
+      }
+
+      Msg.msg(sender,
+          "&aSuccessfully registered expansion: &f" + expansion.get().getName());
+
+    });
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 1) {
+      return;
     }
 
+    final String[] fileNames = plugin.getLocalExpansionManager().getExpansionsFolder()
+        .list((dir, name) -> name.endsWith(".jar"));
+    if (fileNames == null || fileNames.length == 0) {
+      return;
+    }
+
+    suggestByParameter(Arrays.stream(fileNames), suggestions,
+        params.isEmpty() ? null : params.get(0));
+  }
+
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@ 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;
@@ -34,45 +33,45 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class CommandExpansionUnregister extends PlaceholderCommand {
 
-    public CommandExpansionUnregister() {
+  public CommandExpansionUnregister() {
-        super("unregister");
+    super("unregister");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&cYou must specify the name of the expansion.");
+      return;
     }
 
-    @Override
+    final Optional<PlaceholderExpansion> expansion = plugin.getLocalExpansionManager()
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+        .findExpansionByName(params.get(0));
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+    if (!expansion.isPresent()) {
-                         @NotNull @Unmodifiable final List<String> params) {
+      Msg.msg(sender,
-        if (params.isEmpty()) {
+          "&cThere is no expansion loaded with the identifier: &f" + params.get(0));
-            Msg.msg(sender,
+      return;
-                    "&cYou must specify the name of the expansion.");
-            return;
-        }
-
-        final Optional<PlaceholderExpansion> expansion = plugin.getLocalExpansionManager()
-                .findExpansionByName(params.get(0));
-        if (!expansion.isPresent()) {
-            Msg.msg(sender,
-                    "&cThere is no expansion loaded with the identifier: &f" + params.get(0));
-            return;
-        }
-
-        final String message = !expansion.get().unregister() ?
-                "&cFailed to unregister expansion: &f" :
-                "&aSuccessfully unregistered expansion: &f";
-
-        Msg.msg(sender, message + expansion.get().getName());
     }
 
-    @Override
+    final String message = !expansion.get().unregister() ?
-    public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+        "&cFailed to unregister expansion: &f" :
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+        "&aSuccessfully unregistered expansion: &f";
-                         @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
-        if (params.size() > 1) {
-            return;
-        }
 
-        suggestByParameter(PlaceholderAPI.getRegisteredIdentifiers().stream(), suggestions,
+    Msg.msg(sender, message + expansion.get().getName());
-                params.isEmpty() ? null : params.get(0));
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 1) {
+      return;
     }
 
+    suggestByParameter(PlaceholderAPI.getRegisteredIdentifiers().stream(), suggestions,
+        params.isEmpty() ? null : params.get(0));
+  }
+
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
 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;
@@ -32,42 +31,42 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class CommandHelp extends PlaceholderCommand {
 
-    public CommandHelp() {
+  public CommandHelp() {
-        super("help");
+    super("help");
-    }
+  }
 
 
-    @Override
+  @Override
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params) {
+      @NotNull @Unmodifiable final List<String> params) {
-        final PluginDescriptionFile description = plugin.getDescription();
+    final PluginDescriptionFile description = plugin.getDescription();
 
-        Msg.msg(sender,
+    Msg.msg(sender,
-                "&b&lPlaceholderAPI &8- &7Help Menu &8- &7(&f" + description.getVersion() + "&7)",
+        "&b&lPlaceholderAPI &8- &7Help Menu &8- &7(&f" + description.getVersion() + "&7)",
-                " ",
+        " ",
-                "&b/papi &fbcparse &9<me|--null|player name> <message>",
+        "&b/papi &fbcparse &9<me|--null|player name> <message>",
-                "  &7&oParse a message with placeholders and broadcast it",
+        "  &7&oParse a message with placeholders and broadcast it",
-                "&b/papi &fcmdparse &9<me|player> <command with placeholders>",
+        "&b/papi &fcmdparse &9<me|player> <command with placeholders>",
-                "  &7&oParse a message with relational placeholders",
+        "  &7&oParse a message with relational placeholders",
-                "&b/papi &fdump",
+        "&b/papi &fdump",
-                "  &7&oDump all relevant information needed to help debug issues into a paste link.",
+        "  &7&oDump all relevant information needed to help debug issues into a paste link.",
-                "&b/papi &finfo &9<placeholder name>",
+        "&b/papi &finfo &9<placeholder name>",
-                "  &7&oView information for a specific expansion",
+        "  &7&oView information for a specific expansion",
-                "&b/papi &flist",
+        "&b/papi &flist",
-                "  &7&oList active expansions",
+        "  &7&oList active expansions",
-                "&b/papi &fparse &9<me|--null|player name> <message>",
+        "&b/papi &fparse &9<me|--null|player name> <message>",
-                "  &7&oParse a message with placeholders",
+        "  &7&oParse a message with placeholders",
-                "&b/papi &fparserel &9<player one> <player two> <message>",
+        "&b/papi &fparserel &9<player one> <player two> <message>",
-                "  &7&oParse a message with relational placeholders",
+        "  &7&oParse a message with relational placeholders",
-                "&b/papi &fregister &9<file name>",
+        "&b/papi &fregister &9<file name>",
-                "  &7&oRegister an expansion by the name of the file",
+        "  &7&oRegister an expansion by the name of the file",
-                "&b/papi &freload",
+        "&b/papi &freload",
-                "  &7&oReload the config of PAPI",
+        "  &7&oReload the config of PAPI",
-                "&b/papi &funregister &9<expansion name>",
+        "&b/papi &funregister &9<expansion name>",
-                "  &7&oUnregister an expansion by name",
+        "  &7&oUnregister an expansion by name",
-                "&b/papi &fversion",
+        "&b/papi &fversion",
-                "  &7&oView plugin info/version");
+        "  &7&oView plugin info/version");
-    }
+  }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
 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;
@@ -33,82 +32,82 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class CommandInfo extends PlaceholderCommand {
 
-    public CommandInfo() {
+  public CommandInfo() {
-        super("info");
+    super("info");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&cYou must specify the name of the expansion.");
+      return;
     }
 
-    @Override
+    final PlaceholderExpansion expansion = plugin.getLocalExpansionManager()
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+        .findExpansionByIdentifier(params.get(0)).orElse(null);
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+    if (expansion == null) {
-                         @NotNull @Unmodifiable final List<String> params) {
+      Msg.msg(sender,
-        if (params.isEmpty()) {
+          "&cThere is no expansion loaded with the identifier: &f" + params.get(0));
-            Msg.msg(sender,
+      return;
-                    "&cYou must specify the name of the expansion.");
-            return;
-        }
-
-        final PlaceholderExpansion expansion = plugin.getLocalExpansionManager()
-                .findExpansionByIdentifier(params.get(0)).orElse(null);
-        if (expansion == null) {
-            Msg.msg(sender,
-                    "&cThere is no expansion loaded with the identifier: &f" + params.get(0));
-            return;
-        }
-
-        final StringBuilder builder = new StringBuilder();
-
-        builder.append("&7Placeholder expansion info for: &r")
-                .append(expansion.getName())
-                .append('\n')
-                .append("&7Status: &r")
-                .append(expansion.isRegistered() ? "&aRegistered" : "7cNotRegistered")
-                .append('\n');
-
-        final String author = expansion.getAuthor();
-        if (author != null) {
-            builder.append("&7Author: &r")
-                    .append(author)
-                    .append('\n');
-        }
-
-        final String version = expansion.getVersion();
-        if (version != null) {
-            builder.append("&7Version: &r")
-                    .append(version)
-                    .append('\n');
-        }
-
-        final String requiredPlugin = expansion.getRequiredPlugin();
-        if (requiredPlugin != null) {
-            builder.append("&7Requires plugin: &r")
-                    .append(requiredPlugin)
-                    .append('\n');
-        }
-
-        final List<String> placeholders = expansion.getPlaceholders();
-        if (placeholders != null && !placeholders.isEmpty()) {
-            builder.append("&8&m-- &7Placeholders &8&m--&r")
-                    .append('\n');
-
-            for (final String placeholder : placeholders) {
-                builder.append(placeholder)
-                        .append('\n');
-            }
-        }
-
-        Msg.msg(sender, builder.toString());
     }
 
-    @Override
+    final StringBuilder builder = new StringBuilder();
-    public void complete(@NotNull final PlaceholderAPIPlugin plugin,
-                         @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
-        if (params.size() > 1) {
-            return;
-        }
 
-        suggestByParameter(PlaceholderAPI.getRegisteredIdentifiers().stream(), suggestions,
+    builder.append("&7Placeholder expansion info for: &r")
-                params.isEmpty() ? null : params.get(0));
+        .append(expansion.getName())
+        .append('\n')
+        .append("&7Status: &r")
+        .append(expansion.isRegistered() ? "&aRegistered" : "7cNotRegistered")
+        .append('\n');
+
+    final String author = expansion.getAuthor();
+    if (author != null) {
+      builder.append("&7Author: &r")
+          .append(author)
+          .append('\n');
     }
 
+    final String version = expansion.getVersion();
+    if (version != null) {
+      builder.append("&7Version: &r")
+          .append(version)
+          .append('\n');
+    }
+
+    final String requiredPlugin = expansion.getRequiredPlugin();
+    if (requiredPlugin != null) {
+      builder.append("&7Requires plugin: &r")
+          .append(requiredPlugin)
+          .append('\n');
+    }
+
+    final List<String> placeholders = expansion.getPlaceholders();
+    if (placeholders != null && !placeholders.isEmpty()) {
+      builder.append("&8&m-- &7Placeholders &8&m--&r")
+          .append('\n');
+
+      for (final String placeholder : placeholders) {
+        builder.append(placeholder)
+            .append('\n');
+      }
+    }
+
+    Msg.msg(sender, builder.toString());
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 1) {
+      return;
+    }
+
+    suggestByParameter(PlaceholderAPI.getRegisteredIdentifiers().stream(), suggestions,
+        params.isEmpty() ? null : params.get(0));
+  }
+
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,11 +21,9 @@
 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;
@@ -36,28 +34,28 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class CommandList extends PlaceholderCommand {
 
-    public CommandList() {
+  public CommandList() {
-        super("list");
+    super("list");
+  }
+
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    final Set<String> identifiers = PlaceholderAPI.getRegisteredIdentifiers();
+    if (identifiers.isEmpty()) {
+      Msg.msg(sender, "&cThere are no placeholder hooks active!");
+      return;
     }
 
+    final List<List<String>> partitions = Lists
+        .partition(identifiers.stream().sorted().collect(Collectors.toList()), 10);
 
-    @Override
+    Msg.msg(sender,
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+        "&7A total of &f" + identifiers.size() + "&7 placeholder hook(s) are active: &a",
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+        partitions.stream().map(partition -> String.join("&7, &a", partition))
-                         @NotNull @Unmodifiable final List<String> params) {
+            .collect(Collectors.joining("\n")));
-        final Set<String> identifiers = PlaceholderAPI.getRegisteredIdentifiers();
+  }
-        if (identifiers.isEmpty()) {
-            Msg.msg(sender, "&cThere are no placeholder hooks active!");
-            return;
-        }
-
-        final List<List<String>> partitions = Lists
-                .partition(identifiers.stream().sorted().collect(Collectors.toList()), 10);
-
-        Msg.msg(sender,
-                "&7A total of &f" + identifiers.size() + "&7 placeholder hook(s) are active: &a",
-                partitions.stream().map(partition -> String.join("&7, &a", partition))
-                        .collect(Collectors.joining("\n")));
-    }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@ 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;
@@ -41,217 +40,217 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class CommandParse extends PlaceholderCommand {
 
-    public CommandParse() {
+  public CommandParse() {
-        super("parse", "bcparse", "parserel", "cmdparse");
+    super("parse", "bcparse", "parserel", "cmdparse");
+  }
+
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    switch (alias.toLowerCase(Locale.ROOT)) {
+      case "parserel":
+        evaluateParseRelation(sender, params);
+        break;
+      case "parse":
+        evaluateParseSingular(sender, params, false, false);
+        break;
+      case "bcparse":
+        evaluateParseSingular(sender, params, true, false);
+        break;
+      case "cmdparse":
+        evaluateParseSingular(sender, params, false, true);
+        break;
+    }
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    switch (alias.toLowerCase(Locale.ROOT)) {
+      case "parserel":
+        completeParseRelation(params, suggestions);
+        break;
+      case "parse":
+      case "bcparse":
+      case "cmdparse":
+        completeParseSingular(sender, params, suggestions);
+        break;
+    }
+  }
+
+
+  private void evaluateParseSingular(@NotNull final CommandSender sender,
+      @NotNull @Unmodifiable final List<String> params, final boolean broadcast,
+      final boolean command) {
+    if (params.size() < 2) {
+      Msg.msg(sender,
+          "&cYou must provide a target and message: &b/papi "
+              + (command ? "cmdparse" : (broadcast ? "bcparse" : "parse")) 
+              + " &7{target} &a{message}");
+      return;
     }
 
+    OfflinePlayer player;
 
-    @Override
+    if ("me".equalsIgnoreCase(params.get(0))) {
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      if (!(sender instanceof Player)) {
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+        Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!");
-                         @NotNull @Unmodifiable final List<String> params) {
+        return;
-        switch (alias.toLowerCase(Locale.ROOT)) {
+      }
-            case "parserel":
+
-                evaluateParseRelation(sender, params);
+      player = ((Player) sender);
-                break;
+    } else if ("--null".equalsIgnoreCase(params.get(0))) {
-            case "parse":
+      player = null;
-                evaluateParseSingular(sender, params, false, false);
+    } else {
-                break;
+      final OfflinePlayer target = resolvePlayer(params.get(0));
-            case "bcparse":
+      if (target == null) {
-                evaluateParseSingular(sender, params, true, false);
+        Msg.msg(sender, "&cFailed to find player: &7" + params.get(0));
-                break;
+        return;
-            case "cmdparse":
+      }
-                evaluateParseSingular(sender, params, false, true);
+
-                break;
+      player = target;
-        }
     }
 
-    @Override
+    final String message = PlaceholderAPI
-    public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+        .setPlaceholders(player, String.join(" ", params.subList(1, params.size())));
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+
-                         @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (command) {
-        switch (alias.toLowerCase(Locale.ROOT)) {
+      Bukkit.dispatchCommand(sender, message);
-            case "parserel":
+      return;
-                completeParseRelation(params, suggestions);
-                break;
-            case "parse":
-            case "bcparse":
-            case "cmdparse":
-                completeParseSingular(sender, params, suggestions);
-                break;
-        }
     }
 
+    if (broadcast) {
+      Bukkit.broadcastMessage(message);
+    } else {
+      sender.sendMessage(message);
+    }
+  }
 
-    private void evaluateParseSingular(@NotNull final CommandSender sender,
+  private void evaluateParseRelation(@NotNull final CommandSender sender,
-                                       @NotNull @Unmodifiable final List<String> params, final boolean broadcast,
+      @NotNull @Unmodifiable final List<String> params) {
-                                       final boolean command) {
+    if (params.size() < 3) {
-        if (params.size() < 2) {
+      Msg.msg(sender,
-            Msg.msg(sender,
+          "&cYou must supply two targets, and a message: &b/papi parserel &7{target one} " 
-                    "&cYou must provide a target and message: &b/papi "
+              + "{target two} &a{message}");
-                            + (command ? "cmdparse" : (broadcast ? "bcparse" : "parse"))
+      return;
-                            + " &7{target} &a{message}");
-            return;
-        }
-
-        OfflinePlayer player;
-
-        if ("me".equalsIgnoreCase(params.get(0))) {
-            if (!(sender instanceof Player)) {
-                Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!");
-                return;
-            }
-
-            player = ((Player) sender);
-        } else if ("--null".equalsIgnoreCase(params.get(0))) {
-            player = null;
-        } else {
-            final OfflinePlayer target = resolvePlayer(params.get(0));
-            if (target == null) {
-                Msg.msg(sender, "&cFailed to find player: &7" + params.get(0));
-                return;
-            }
-
-            player = target;
-        }
-
-        final String message = PlaceholderAPI
-                .setPlaceholders(player, String.join(" ", params.subList(1, params.size())));
-
-        if (command) {
-            Bukkit.dispatchCommand(sender, message);
-            return;
-        }
-
-        if (broadcast) {
-            Bukkit.broadcastMessage(message);
-        } else {
-            sender.sendMessage(message);
-        }
     }
     
-    private void evaluateParseRelation(@NotNull final CommandSender sender,
+    OfflinePlayer playerOne;
-                                       @NotNull @Unmodifiable final List<String> params) {
-        if (params.size() < 3) {
-            Msg.msg(sender,
-                    "&cYou must supply two targets, and a message: &b/papi parserel &7{target one} "
-                            + "{target two} &a{message}");
-            return;
-        }
     
-        OfflinePlayer playerOne;
+    if ("me".equalsIgnoreCase(params.get(0))) {
+      if (!(sender instanceof Player)) {
+        Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!");
+        return;
+      }
       
-        if ("me".equalsIgnoreCase(params.get(0))) {
+      playerOne = ((Player) sender);
-            if (!(sender instanceof Player)) {
+    } else {
-                Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!");
+      playerOne = resolvePlayer(params.get(0));
-                return;
-            }
-
-            playerOne = ((Player) sender);
-        } else {
-            playerOne = resolvePlayer(params.get(0));
-        }
-
-        if (playerOne == null || !playerOne.isOnline()) {
-            Msg.msg(sender, "&cFailed to find player: &f" + params.get(0));
-            return;
-        }
-
-        OfflinePlayer playerTwo;
-
-        if ("me".equalsIgnoreCase(params.get(1))) {
-            if (!(sender instanceof Player)) {
-                Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!");
-                return;
-            }
-
-            playerTwo = ((Player) sender);
-        } else {
-            playerTwo = resolvePlayer(params.get(1));
-        }
-
-        if (playerTwo == null || !playerTwo.isOnline()) {
-            Msg.msg(sender, "&cFailed to find player: &f" + params.get(1));
-            return;
-        }
-
-        final String message = PlaceholderAPI
-                .setRelationalPlaceholders((Player) playerOne, (Player) playerTwo,
-                        String.join(" ", params.subList(2, params.size())));
-
-        sender.sendMessage(message);
     }
     
-
+    if (playerOne == null || !playerOne.isOnline()) {
-    private void completeParseSingular(@NotNull final CommandSender sender,
+      Msg.msg(sender, "&cFailed to find player: &f" + params.get(0));
-                                       @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+      return;
-        if (params.size() <= 1) {
-            if (sender instanceof Player && (params.isEmpty() || "me"
-                    .startsWith(params.get(0).toLowerCase(Locale.ROOT)))) {
-                suggestions.add("me");
-            }
-
-            if ("--null".startsWith(params.get(0).toLowerCase(Locale.ROOT))) {
-                suggestions.add("--null");
-            }
-
-            final Stream<String> names = Bukkit.getOnlinePlayers().stream().map(Player::getName);
-            suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(0));
-
-            return;
-        }
-
-        final String name = params.get(params.size() - 1);
-        if (!name.startsWith("%") || name.endsWith("%")) {
-            return;
-        }
-
-        final int index = name.indexOf('_');
-        if (index == -1) {
-            return; // no arguments supplied yet
-        }
-
-        final PlaceholderExpansion expansion = PlaceholderAPIPlugin.getInstance()
-                .getLocalExpansionManager().findExpansionByIdentifier(name.substring(1, index))
-                .orElse(null);
-        if (expansion == null) {
-            return;
-        }
-
-        final Set<String> possible = new HashSet<>(expansion.getPlaceholders());
-
-        PlaceholderAPIPlugin.getInstance()
-                .getCloudExpansionManager()
-                .findCloudExpansionByName(expansion.getName())
-                .ifPresent(cloud -> possible.addAll(cloud.getPlaceholders()));
-
-        suggestByParameter(possible.stream(), suggestions, params.get(params.size() - 1));
     }
     
-    private void completeParseRelation(@NotNull @Unmodifiable final List<String> params,
+    OfflinePlayer playerTwo;
-                                       @NotNull final List<String> suggestions) {
-        if (params.size() > 2) {
-            return;
-        }
     
-        final Stream<String> names = Bukkit.getOnlinePlayers().stream().map(Player::getName);
+    if ("me".equalsIgnoreCase(params.get(1))) {
-        suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(params.size() - 1));
+      if (!(sender instanceof Player)) {
+        Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!");
+        return;
+      }
+      
+      playerTwo = ((Player) sender);
+    } else {
+      playerTwo = resolvePlayer(params.get(1));
     }
     
-
+    if (playerTwo == null || !playerTwo.isOnline()) {
-    @Nullable
+      Msg.msg(sender, "&cFailed to find player: &f" + params.get(1));
-    private OfflinePlayer resolvePlayer(@NotNull final String name) {
+      return;
-        OfflinePlayer target = Bukkit.getPlayerExact(name);
-
-        if (target == null) {
-            // Not the best option, but Spigot doesn't offer a good replacement (as usual)
-            target = Bukkit.getOfflinePlayer(name);
-
-            return target.hasPlayedBefore() ? target : null;
-        }
-
-        return target;
-
     }
 
+    final String message = PlaceholderAPI
+        .setRelationalPlaceholders((Player) playerOne, (Player) playerTwo,
+            String.join(" ", params.subList(2, params.size())));
+    
+    sender.sendMessage(message);
+  }
+
+
+  private void completeParseSingular(@NotNull final CommandSender sender,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() <= 1) {
+      if (sender instanceof Player && (params.isEmpty() || "me"
+          .startsWith(params.get(0).toLowerCase(Locale.ROOT)))) {
+        suggestions.add("me");
+      }
+      
+      if ("--null".startsWith(params.get(0).toLowerCase(Locale.ROOT))) {
+        suggestions.add("--null");
+      }
+      
+      final Stream<String> names = Bukkit.getOnlinePlayers().stream().map(Player::getName);
+      suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(0));
+
+      return;
+    }
+
+    final String name = params.get(params.size() - 1);
+    if (!name.startsWith("%") || name.endsWith("%")) {
+      return;
+    }
+
+    final int index = name.indexOf('_');
+    if (index == -1) {
+      return; // no arguments supplied yet
+    }
+
+    final PlaceholderExpansion expansion = PlaceholderAPIPlugin.getInstance()
+        .getLocalExpansionManager().findExpansionByIdentifier(name.substring(1, index))
+        .orElse(null);
+    if (expansion == null) {
+      return;
+    }
+
+    final Set<String> possible = new HashSet<>(expansion.getPlaceholders());
+
+    PlaceholderAPIPlugin.getInstance()
+        .getCloudExpansionManager()
+        .findCloudExpansionByName(expansion.getName())
+        .ifPresent(cloud -> possible.addAll(cloud.getPlaceholders()));
+
+    suggestByParameter(possible.stream(), suggestions, params.get(params.size() - 1));
+  }
+
+  private void completeParseRelation(@NotNull @Unmodifiable final List<String> params,
+      @NotNull final List<String> suggestions) {
+    if (params.size() > 2) {
+      return;
+    }
+
+    final Stream<String> names = Bukkit.getOnlinePlayers().stream().map(Player::getName);
+    suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(params.size() - 1));
+  }
+
+
+  @Nullable
+  private OfflinePlayer resolvePlayer(@NotNull final String name) {
+    OfflinePlayer target = Bukkit.getPlayerExact(name);
+    
+    if (target == null) {
+      // Not the best option, but Spigot doesn't offer a good replacement (as usual)
+      target = Bukkit.getOfflinePlayer(name);
+      
+      return target.hasPlayedBefore() ? target : null;
+    }
+
+    return target;
+
+  }
+
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,27 +21,23 @@
 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.ExpansionSafetyCheck;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 public final class CommandReload extends PlaceholderCommand {
 
-    public CommandReload() {
+  public CommandReload() {
-        super("reload");
+    super("reload");
-    }
+  }
 
-    @Override
+  @Override
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params) {
+      @NotNull @Unmodifiable final List<String> params) {
-        if (!new ExpansionSafetyCheck(plugin).runChecks()) {
+    plugin.reloadConf(sender);
-            plugin.reloadConf(sender);
+  }
-        }
-    }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
 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;
@@ -32,22 +31,22 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class CommandVersion extends PlaceholderCommand {
 
-    public CommandVersion() {
+  public CommandVersion() {
-        super("version");
+    super("version");
-    }
+  }
 
 
-    @Override
+  @Override
-    public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
-                         @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull final CommandSender sender, @NotNull final String alias,
-                         @NotNull @Unmodifiable final List<String> params) {
+      @NotNull @Unmodifiable final List<String> params) {
-        final PluginDescriptionFile description = plugin.getDescription();
+    final PluginDescriptionFile description = plugin.getDescription();
 
-        Msg.msg(sender,
+    Msg.msg(sender,
-                "&b&lPlaceholderAPI &7(&f" + description.getVersion() + "&7)",
+        "&b&lPlaceholderAPI &7(&f" + description.getVersion() + "&7)",
-                "&7Author: &f" + description.getAuthors(),
+        "&7Author: &f" + description.getAuthors(),
-                "&7PAPI Commands: &b/papi &fhelp",
+        "&7PAPI Commands: &b/papi &fhelp",
-                "&7eCloud Commands&8: &b/papi &fecloud");
+        "&7eCloud Commands&8: &b/papi &fecloud");
-    }
+  }
 
 }

src/main/java/me/clip/placeholderapi/configuration/ExpansionSort.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,28 +21,27 @@
 package me.clip.placeholderapi.configuration;
 
 import java.util.Comparator;
-
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
 import org.jetbrains.annotations.NotNull;
 
 public enum ExpansionSort implements Comparator<CloudExpansion> {
 
-    NAME(Comparator.comparing(CloudExpansion::getName)),
+  NAME(Comparator.comparing(CloudExpansion::getName)),
-    AUTHOR(Comparator.comparing(CloudExpansion::getAuthor)),
+  AUTHOR(Comparator.comparing(CloudExpansion::getAuthor)),
-    LATEST(Comparator.comparing(CloudExpansion::getLastUpdate).reversed());
+  LATEST(Comparator.comparing(CloudExpansion::getLastUpdate).reversed());
 
 
-    @NotNull
+  @NotNull
-    private final Comparator<CloudExpansion> comparator;
+  private final Comparator<CloudExpansion> comparator;
 
-    ExpansionSort(@NotNull final Comparator<CloudExpansion> comparator) {
+  ExpansionSort(@NotNull final Comparator<CloudExpansion> comparator) {
-        this.comparator = comparator;
+    this.comparator = comparator;
-    }
+  }
 
 
-    @Override
+  @Override
-    public final int compare(final CloudExpansion expansion1, final CloudExpansion expansion2) {
+  public final int compare(final CloudExpansion expansion1, final CloudExpansion expansion2) {
-        return comparator.compare(expansion1, expansion2);
+    return comparator.compare(expansion1, expansion2);
-    }
+  }
 
 }

src/main/java/me/clip/placeholderapi/configuration/PlaceholderAPIConfig.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,81 +21,69 @@
 package me.clip.placeholderapi.configuration;
 
 import java.util.Optional;
-
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import org.jetbrains.annotations.NotNull;
 
 public final class PlaceholderAPIConfig {
 
-    @NotNull
+  @NotNull
-    private final PlaceholderAPIPlugin plugin;
+  private final PlaceholderAPIPlugin plugin;
 
-    public PlaceholderAPIConfig(@NotNull final PlaceholderAPIPlugin plugin) {
+  public PlaceholderAPIConfig(@NotNull final PlaceholderAPIPlugin plugin) {
-        this.plugin = plugin;
+    this.plugin = plugin;
+  }
+
+
+  public boolean checkUpdates() {
+    return plugin.getConfig().getBoolean("check_updates");
+  }
+
+
+  public boolean isCloudEnabled() {
+    return plugin.getConfig().getBoolean("cloud_enabled");
+  }
+
+  public void setCloudEnabled(boolean state) {
+    plugin.getConfig().set("cloud_enabled", state);
+    plugin.saveConfig();
+  }
+
+
+  public boolean isDebugMode() {
+    return plugin.getConfig().getBoolean("debug", false);
+  }
+
+
+  public Optional<ExpansionSort> getExpansionSort() {
+    final String option = plugin.getConfig()
+        .getString("cloud_sorting", ExpansionSort.LATEST.name());
+
+    try {
+      //noinspection ConstantConditions (bad spigot annotation)
+      return Optional.of(ExpansionSort.valueOf(option.toUpperCase()));
+    } catch (final IllegalArgumentException ignored) {
+      return Optional.empty();
     }
+  }
 
 
-    public boolean checkUpdates() {
+  @NotNull
-        return plugin.getConfig().getBoolean("check_updates");
+  public String dateFormat() {
-    }
+    //noinspection ConstantConditions (bad spigot annotation)
+    return plugin.getConfig().getString("date_format", "MM/dd/yy HH:mm:ss");
+  }
 
 
-    public boolean isCloudEnabled() {
+  @NotNull
-        return plugin.getConfig().getBoolean("cloud_enabled");
+  public String booleanTrue() {
-    }
+    //noinspection ConstantConditions (bad spigot annotation)
+    return plugin.getConfig().getString("boolean.true", "true");
+  }
 
-    public void setCloudEnabled(boolean state) {
+  @NotNull
-        plugin.getConfig().set("cloud_enabled", state);
+  public String booleanFalse() {
-        plugin.saveConfig();
+    //noinspection ConstantConditions (bad spigot annotation)
-    }
+    return plugin.getConfig().getString("boolean.false", "false");
+  }
 
-
-    public boolean isDebugMode() {
-        return plugin.getConfig().getBoolean("debug", false);
-    }
-
-    public boolean useAdventureReplacer() {
-        return plugin.getConfig().getBoolean("use_adventure_provided_replacer", false);
-    }
-
-
-    public Optional<ExpansionSort> getExpansionSort() {
-        final String option = plugin.getConfig()
-                .getString("cloud_sorting", ExpansionSort.LATEST.name());
-
-        try {
-            //noinspection ConstantConditions (bad spigot annotation)
-            return Optional.of(ExpansionSort.valueOf(option.toUpperCase()));
-        } catch (final IllegalArgumentException ignored) {
-            return Optional.empty();
-        }
-    }
-
-
-    @NotNull
-    public String dateFormat() {
-        //noinspection ConstantConditions (bad spigot annotation)
-        return plugin.getConfig().getString("date_format", "MM/dd/yy HH:mm:ss");
-    }
-
-
-    @NotNull
-    public String booleanTrue() {
-        //noinspection ConstantConditions (bad spigot annotation)
-        return plugin.getConfig().getString("boolean.true", "true");
-    }
-
-    @NotNull
-    public String booleanFalse() {
-        //noinspection ConstantConditions (bad spigot annotation)
-        return plugin.getConfig().getString("boolean.false", "false");
-    }
-
-    public boolean useAdventureProvidedReplacer() {
-        return plugin.getConfig().getBoolean("use_adventure_provided_replacer", false);
-    }
-
-    public boolean detectMaliciousExpansions() {
-        return plugin.getConfig().getBoolean("detect_malicious_expansions", true);
-    }
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,55 +35,55 @@ import org.jetbrains.annotations.NotNull;
  */
 public final class ExpansionRegisterEvent extends Event implements Cancellable {
 
-    @NotNull
+  @NotNull
-    private static final HandlerList HANDLERS = new HandlerList();
+  private static final HandlerList HANDLERS = new HandlerList();
-    @NotNull
+  @NotNull
-    private final PlaceholderExpansion expansion;
+  private final PlaceholderExpansion expansion;
-    private boolean cancelled;
+  private boolean cancelled;
 
-    public ExpansionRegisterEvent(@NotNull final PlaceholderExpansion expansion) {
+  public ExpansionRegisterEvent(@NotNull final PlaceholderExpansion expansion) {
-        this.expansion = expansion;
+    this.expansion = expansion;
-    }
+  }
 
-    @NotNull
+  @NotNull
-    public static HandlerList getHandlerList() {
+  public static HandlerList getHandlerList() {
-        return HANDLERS;
+    return HANDLERS;
-    }
+  }
   
-    /**
+  /**
-     * The {@link PlaceholderExpansion PlaceholderExpansion} that was registered in PlaceholderAPI.
+   * The {@link PlaceholderExpansion PlaceholderExpansion} that was registered in PlaceholderAPI.
-     * <br>The PlaceholderExpansion will be available for use when the event
+   * <br>The PlaceholderExpansion will be available for use when the event
-     * {@link #isCancelled() was not cancelled}!
+   * {@link #isCancelled() was not cancelled}!
-     *
+   * 
-     * @return Current instance of the registered {@link PlaceholderExpansion PlaceholderExpansion}
+   * @return Current instance of the registered {@link PlaceholderExpansion PlaceholderExpansion}
-     */
+   */
-    @NotNull
+  @NotNull
-    public PlaceholderExpansion getExpansion() {
+  public PlaceholderExpansion getExpansion() {
-        return expansion;
+    return expansion;
-    }
+  }
 
-    /**
+  /**
-     * Indicates if this event was cancelled or not.
+   * Indicates if this event was cancelled or not.
-     * <br>A cancelled Event will result in the {@link #getExpansion() PlaceholderExpansion} NOT
+   * <br>A cancelled Event will result in the {@link #getExpansion() PlaceholderExpansion} NOT
-     * being added to PlaceholderAPI's internal list and will therefore be considered not registered
+   * being added to PlaceholderAPI's internal list and will therefore be considered not registered
-     * anymore.
+   * anymore.
-     *
+   * 
-     * @return Whether the event has been cancelled or not.
+   * @return Whether the event has been cancelled or not.
-     */
+   */
-    @Override
+  @Override
-    public boolean isCancelled() {
+  public boolean isCancelled() {
-        return cancelled;
+    return cancelled;
-    }
+  }
 
-    @Override
+  @Override
-    public void setCancelled(boolean cancelled) {
+  public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
+    this.cancelled = cancelled;
-    }
+  }
 
-    @NotNull
+  @NotNull
-    @Override
+  @Override
-    public HandlerList getHandlers() {
+  public HandlerList getHandlers() {
-        return HANDLERS;
+    return HANDLERS;
-    }
+  }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,35 +36,35 @@ import org.jetbrains.annotations.NotNull;
  */
 public final class ExpansionUnregisterEvent extends Event {
 
-    @NotNull
+  @NotNull
-    private static final HandlerList HANDLERS = new HandlerList();
+  private static final HandlerList HANDLERS = new HandlerList();
   
-    @NotNull
+  @NotNull
-    private final PlaceholderExpansion expansion;
+  private final PlaceholderExpansion expansion;
 
-    public ExpansionUnregisterEvent(@NotNull final PlaceholderExpansion expansion) {
+  public ExpansionUnregisterEvent(@NotNull final PlaceholderExpansion expansion) {
-        this.expansion = expansion;
+    this.expansion = expansion;
-    }
+  }
 
-    @NotNull
+  @NotNull
-    public static HandlerList getHandlerList() {
+  public static HandlerList getHandlerList() {
-        return HANDLERS;
+    return HANDLERS;
-    }
+  }
   
-    /**
+  /**
-     * The {@link PlaceholderExpansion PlaceholderExpansion} that was unregistered.
+   * The {@link PlaceholderExpansion PlaceholderExpansion} that was unregistered.
-     *
+   * 
-     * @return The {@link PlaceholderExpansion PlaceholderExpansion} instance.
+   * @return The {@link PlaceholderExpansion PlaceholderExpansion} instance.
-     */
+   */
-    @NotNull
+  @NotNull
-    public PlaceholderExpansion getExpansion() {
+  public PlaceholderExpansion getExpansion() {
-        return expansion;
+    return expansion;
-    }
+  }
 
-    @NotNull
+  @NotNull
-    @Override
+  @Override
-    public HandlerList getHandlers() {
+  public HandlerList getHandlers() {
-        return HANDLERS;
+    return HANDLERS;
-    }
+  }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@ 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;
@@ -54,7 +53,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/events/PlaceholderHookUnloadEvent.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,40 +31,40 @@ import org.jetbrains.annotations.NotNull;
 @Deprecated
 public final class PlaceholderHookUnloadEvent extends Event {
 
-    @NotNull
+  @NotNull
-    private static final HandlerList HANDLERS = new HandlerList();
+  private static final HandlerList HANDLERS = new HandlerList();
 
 
-    @NotNull
+  @NotNull
-    private final String plugin;
+  private final String plugin;
-    @NotNull
+  @NotNull
-    private final PlaceholderHook placeholderHook;
+  private final PlaceholderHook placeholderHook;
 
-    public PlaceholderHookUnloadEvent(@NotNull final String plugin,
+  public PlaceholderHookUnloadEvent(@NotNull final String plugin,
-                                      @NotNull final PlaceholderHook placeholderHook) {
+      @NotNull final PlaceholderHook placeholderHook) {
-        this.plugin = plugin;
+    this.plugin = plugin;
-        this.placeholderHook = placeholderHook;
+    this.placeholderHook = placeholderHook;
-    }
+  }
 
-    @NotNull
+  @NotNull
-    public static HandlerList getHandlerList() {
+  public static HandlerList getHandlerList() {
-        return HANDLERS;
+    return HANDLERS;
-    }
+  }
 
-    @NotNull
+  @NotNull
-    public String getHookName() {
+  public String getHookName() {
-        return plugin;
+    return plugin;
-    }
+  }
 
-    @NotNull
+  @NotNull
-    public PlaceholderHook getHook() {
+  public PlaceholderHook getHook() {
-        return placeholderHook;
+    return placeholderHook;
-    }
+  }
 
-    @NotNull
+  @NotNull
-    @Override
+  @Override
-    public HandlerList getHandlers() {
+  public HandlerList getHandlers() {
-        return HANDLERS;
+    return HANDLERS;
-    }
+  }
 
 }

src/main/java/me/clip/placeholderapi/exceptions/NoDefaultCommandException.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,8 +22,8 @@ package me.clip.placeholderapi.exceptions;
 
 public final class NoDefaultCommandException extends RuntimeException {
 
-    public NoDefaultCommandException(final String message) {
+  public NoDefaultCommandException(final String message) {
-        super(message);
+    super(message);
-    }
+  }
 }
 

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@ package me.clip.placeholderapi.expansion;
  */
 public interface Cacheable {
 
-    /**
+  /**
-     * Called when the implementing class is unregistered from PlaceholderAPI
+   * Called when the implementing class is unregistered from PlaceholderAPI
-     */
+   */
-    void clear();
+  void clear();
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,10 +33,10 @@ import org.bukkit.entity.Player;
  */
 public interface Cleanable {
 
-    /**
+  /**
-     * Called when a player leaves the server
+   * Called when a player leaves the server
-     *
+   *
-     * @param p (@link Player} who left the server
+   * @param p (@link Player} who left the server
-     */
+   */
-    void cleanup(Player p);
+  void cleanup(Player p);
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,15 +43,15 @@ import java.util.Map;
  */
 public interface Configurable {
 
-    /**
+  /**
-     * The map returned by this method will be used to set config options in PlaceholderAPI's config.yml.
+   * The map returned by this method will be used to set config options in PlaceholderAPI's config.yml.
-     *
+   * 
-     * <p>The key and value pairs are set under a section named after your
+   * <p>The key and value pairs are set under a section named after your
-     * {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansion} in the
+   * {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansion} in the
-     * {@code expansions} section of the config.
+   * {@code expansions} section of the config.
-     *
+   *
-     * @return Map of config path / values which need to be added / removed from the PlaceholderAPI
+   * @return Map of config path / values which need to be added / removed from the PlaceholderAPI
-     * config.yml file
+   * config.yml file
-     */
+   */
-    Map<String, Object> getDefaults();
+  Map<String, Object> getDefaults();
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,60 +22,55 @@ package me.clip.placeholderapi.expansion;
 
 public enum NMSVersion {
 
-    UNKNOWN("unknown"),
+  UNKNOWN("unknown"),
-    SPIGOT_1_7_R1("v1_7_R1"),
+  SPIGOT_1_7_R1("v1_7_R1"),
-    SPIGOT_1_7_R2("v1_7_R2"),
+  SPIGOT_1_7_R2("v1_7_R2"),
-    SPIGOT_1_7_R3("v1_7_R3"),
+  SPIGOT_1_7_R3("v1_7_R3"),
-    SPIGOT_1_7_R4("v1_7_R4"),
+  SPIGOT_1_7_R4("v1_7_R4"),
-    SPIGOT_1_8_R1("v1_8_R1"),
+  SPIGOT_1_8_R1("v1_8_R1"),
-    SPIGOT_1_8_R2("v1_8_R2"),
+  SPIGOT_1_8_R2("v1_8_R2"),
-    SPIGOT_1_8_R3("v1_8_R3"),
+  SPIGOT_1_8_R3("v1_8_R3"),
-    SPIGOT_1_9_R1("v1_9_R1"),
+  SPIGOT_1_9_R1("v1_9_R1"),
-    SPIGOT_1_9_R2("v1_9_R2"),
+  SPIGOT_1_9_R2("v1_9_R2"),
-    SPIGOT_1_10_R1("v1_10_R1"),
+  SPIGOT_1_10_R1("v1_10_R1"),
-    SPIGOT_1_11_R1("v1_11_R1"),
+  SPIGOT_1_11_R1("v1_11_R1"),
-    SPIGOT_1_12_R1("v1_12_R1"),
+  SPIGOT_1_12_R1("v1_12_R1"),
-    SPIGOT_1_13_R1("v1_13_R1"),
+  SPIGOT_1_13_R1("v1_13_R1"),
-    SPIGOT_1_13_R2("v1_13_R2"),
+  SPIGOT_1_13_R2("v1_13_R2"),
-    SPIGOT_1_14_R1("v1_14_R1"),
+  SPIGOT_1_14_R1("v1_14_R1"),
-    SPIGOT_1_15_R1("v1_15_R1"),
+  SPIGOT_1_15_R1("v1_15_R1"),
-    SPIGOT_1_16_R1("v1_16_R1"),
+  SPIGOT_1_16_R1("v1_16_R1"),
-    SPIGOT_1_16_R2("v1_16_R2"),
+  SPIGOT_1_16_R2("v1_16_R2"),
-    SPIGOT_1_16_R3("v1_16_R3"),
+  SPIGOT_1_16_R3("v1_16_R3"),
-    SPIGOT_1_17_R1("v1_17_R1"),
+  SPIGOT_1_17_R1("v1_17_R1"),
-    SPIGOT_1_18_R1("v1_18_R1"),
+  SPIGOT_1_18_R1("v1_18_R1"),
-    SPIGOT_1_19_R1("v1_19_R1"),
+  SPIGOT_1_19_R1("v1_19_R1"),
-    SPIGOT_1_19_R2("v1_19_R2"),
+  SPIGOT_1_19_R2("v1_19_R2"),
-    SPIGOT_1_19_R3("v1_19_R3"),
+  SPIGOT_1_19_R3("v1_19_R3"),
-    SPIGOT_1_20_R1("v1_20_R1"),
+  SPIGOT_1_20_R1("v1_20_R1"),
-    SPIGOT_1_20_R2("v1_20_R2"),
+  SPIGOT_1_20_R2("v1_20_R2"),
-    SPIGOT_1_20_R3("v1_20_R3"),
+  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_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"),
-    SPIGOT_1_21_R5("V1_21_R5"),
-    SPIGOT_1_21_R6("V1_21_R6");
 
-    private final String version;
+  private final String version;
 
-    NMSVersion(String version) {
+  NMSVersion(String version) {
-        this.version = version;
+    this.version = version;
+  }
+
+  public static NMSVersion getVersion(String version) {
+    for (NMSVersion v : values()) {
+      if (v.getVersion().equalsIgnoreCase(version)) {
+        return v;
+      }
     }
 
-    public static NMSVersion getVersion(String version) {
+    return NMSVersion.UNKNOWN;
-        for (NMSVersion v : values()) {
+  }
-            if (v.getVersion().equalsIgnoreCase(version)) {
-                return v;
-            }
-        }
 
-        return NMSVersion.UNKNOWN;
+  public String getVersion() {
-    }
+    return version;
-
+  }
-    public String getVersion() {
-        return version;
-    }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@ package me.clip.placeholderapi.expansion;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
-
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.PlaceholderHook;
 import org.bukkit.Bukkit;
@@ -41,439 +40,445 @@ import org.jetbrains.annotations.Nullable;
  */
 public abstract class PlaceholderExpansion extends PlaceholderHook {
 
-    /**
+  /**
-     * The type is {@link Type#INTERNAL} by default.
+   * The type is {@link Type#INTERNAL} by default.
-     * For external expansions, the type is updated on {@link me.clip.placeholderapi.expansion.manager.LocalExpansionManager#register(Class) register}.
+   * For external expansions, the type is updated on {@link me.clip.placeholderapi.expansion.manager.LocalExpansionManager#register(Class) register}.
-     *
+   * @since 2.11.4
-     * @since 2.11.4
+   */
-     */
+  @ApiStatus.Internal
-    @ApiStatus.Internal
+  protected Type expansionType = Type.INTERNAL;
-    protected Type expansionType = Type.INTERNAL;
 
-    /**
+  /**
-     * The placeholder identifier of this expansion. May not contain {@literal %},
+   * The placeholder identifier of this expansion. May not contain {@literal %},
-     * {@literal {}} or _
+   * {@literal {}} or _
-     *
+   *
-     * @return placeholder identifier that is associated with this expansion
+   * @return placeholder identifier that is associated with this expansion
-     */
+   */
-    @NotNull
+  @NotNull
-    public abstract String getIdentifier();
+  public abstract String getIdentifier();
 
-    /**
+  /**
-     * The author of this expansion
+   * The author of this expansion
-     *
+   *
-     * @return name of the author for this expansion
+   * @return name of the author for this expansion
-     */
+   */
-    @NotNull
+  @NotNull
-    public abstract String getAuthor();
+  public abstract String getAuthor();
 
-    /**
+  /**
-     * The version of this expansion
+   * The version of this expansion
-     *
+   *
-     * @return current version of this expansion
+   * @return current version of this expansion
-     */
+   */
-    @NotNull
+  @NotNull
-    public abstract String getVersion();
+  public abstract String getVersion();
 
-    /**
+  /**
-     * The name of this expansion
+   * The name of this expansion
-     *
+   *
-     * @return {@link #getIdentifier()} by default, name of this expansion if specified
+   * @return {@link #getIdentifier()} by default, name of this expansion if specified
-     */
+   */
-    @NotNull
+  @NotNull
-    public String getName() {
+  public String getName() {
-        return getIdentifier();
+    return getIdentifier();
+  }
+
+  /**
+   * The name of the plugin that this expansion hooks into. by default will null
+   *
+   * @return plugin name that this expansion requires to function
+   */
+  @Nullable
+  public String getRequiredPlugin() {
+    return getPlugin();
+  }
+
+  /**
+   * The placeholders associated with this expansion
+   *
+   * @return placeholder list that this expansion provides
+   */
+  @NotNull
+  public List<String> getPlaceholders() {
+    return Collections.emptyList();
+  }
+
+
+  /**
+   * Expansions that do not use the ecloud and instead register from the dependency should set this
+   * to true to ensure that your placeholder expansion is not unregistered when the papi reload
+   * command is used
+   *
+   * @return if this expansion should persist through placeholder reloads
+   * 
+   * @deprecated PlaceholderExpansions registered through their {@link #register()} and not through
+   *             {@link me.clip.placeholderapi.expansion.manager.LocalExpansionManager#register(Class)}
+   *             will be considered internal now and not be unregistered during Plugin reloads.
+   */
+  @Deprecated
+  public boolean persist() {
+    return false;
+  }
+
+
+  /**
+   * Check if this placeholder identifier has already been registered
+   *
+   * @return true if the identifier for this expansion is already registered
+   */
+  public final boolean isRegistered() {
+    return getPlaceholderAPI().getLocalExpansionManager().findExpansionByIdentifier(getIdentifier())
+        .map(it -> it.equals(this)).orElse(false);
+  }
+
+
+  /**
+   * If any requirements need to be checked before this expansion should register, you can check
+   * them here
+   *
+   * @return true if this hook meets all the requirements to register
+   */
+  public boolean canRegister() {
+    return getRequiredPlugin() == null
+        || Bukkit.getPluginManager().getPlugin(getRequiredPlugin()) != null;
+  }
+
+  /**
+   * Attempt to register this PlaceholderExpansion
+   *
+   * @return true if this expansion is now registered with PlaceholderAPI
+   */
+  public boolean register() {
+    return getPlaceholderAPI().getLocalExpansionManager().register(this);
+  }
+
+  /**
+   * Attempt to unregister this PlaceholderExpansion
+   *
+   * @return true if this expansion is now unregistered with PlaceholderAPI
+   */
+  public final boolean unregister() {
+    return getPlaceholderAPI().getLocalExpansionManager().unregister(this);
+  }
+
+
+  /**
+   * Quick getter for the {@link PlaceholderAPIPlugin} instance
+   *
+   * @return {@link PlaceholderAPIPlugin} instance
+   */
+  @NotNull
+  public final PlaceholderAPIPlugin getPlaceholderAPI() {
+    return PlaceholderAPIPlugin.getInstance();
+  }
+
+  /**
+   * Get the type of the expansion
+   *
+   * @return the type of the expansion
+   * @since 2.11.4
+   */
+  @ApiStatus.Internal
+  public Type getExpansionType() {
+    return expansionType;
+  }
+
+  /**
+   * Set the type of the expansion
+   * @param expansionType the new type
+   * @since 2.11.4
+   */
+  @ApiStatus.Internal
+  public void setExpansionType(Type expansionType) {
+    this.expansionType = expansionType;
+  }
+
+  // === Configuration ===
+  
+  /**
+   * Gets the ConfigurationSection of the expansion located in the config.yml of PlaceholderAPI or
+   * null when not specified.
+   * <br>You may use the {@link Configurable} interface to define default values set
+   * 
+   * @return ConfigurationSection that this expansion has.
+   */
+  @Nullable
+  public final ConfigurationSection getConfigSection() {
+    return getPlaceholderAPI().getConfig().getConfigurationSection("expansions." + getIdentifier());
+  }
+  
+  /**
+   * Gets the ConfigurationSection relative to the {@link #getConfigSection() default one} set
+   * by the expansion or null when the default ConfigurationSection is null
+   * 
+   * @param path The path to get the ConfigurationSection from. This is relative to the default section
+   * @return ConfigurationSection relative to the default section
+   */
+  @Nullable
+  public final ConfigurationSection getConfigSection(@NotNull final String path) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? null : section.getConfigurationSection(path);
+  }
+  
+  /**
+   * Gets the Object relative to the {@link #getConfigSection() default ConfigurationSection} set
+   * by the expansion or the provided Default Object, when the default ConfigurationSection is null
+   * 
+   * @param path The path to get the Object from. This is relative to the default section
+   * @param def The default Object to return when the ConfigurationSection returns null
+   * @return Object from the provided path or the default one provided
+   */
+  @Nullable
+  @Contract("_, !null -> !null")
+  public final Object get(@NotNull final String path, final Object def) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? def : section.get(path, def);
+  }
+  
+  /**
+   * Gets the int relative to the {@link #getConfigSection() default ConfigurationSection} set
+   * by the expansion or the provided Default int, when the default ConfigurationSection is null
+   *
+   * @param path The path to get the int from. This is relative to the default section
+   * @param def The default int to return when the ConfigurationSection returns null
+   * @return int from the provided path or the default one provided
+   */
+  public final int getInt(@NotNull final String path, final int def) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? def : section.getInt(path, def);
+  }
+  
+  /**
+   * Gets the long relative to the {@link #getConfigSection() default ConfigurationSection} set
+   * by the expansion or the provided Default long, when the default ConfigurationSection is null
+   *
+   * @param path The path to get the long from. This is relative to the default section
+   * @param def The default long to return when the ConfigurationSection returns null
+   * @return long from the provided path or the default one provided
+   */
+  public final long getLong(@NotNull final String path, final long def) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? def : section.getLong(path, def);
+  }
+  
+  /**
+   * Gets the double relative to the {@link #getConfigSection() default ConfigurationSection} set
+   * by the expansion or the provided Default double, when the default ConfigurationSection is null
+   *
+   * @param path The path to get the double from. This is relative to the default section
+   * @param def The default double to return when the ConfigurationSection returns null
+   * @return double from the provided path or the default one provided
+   */
+  public final double getDouble(@NotNull final String path, final double def) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? def : section.getDouble(path, def);
+  }
+  
+  /**
+   * Gets the String relative to the {@link #getConfigSection() default ConfigurationSection} set
+   * by the expansion or the provided Default String, when the default ConfigurationSection is null
+   *
+   * @param path The path to get the String from. This is relative to the default section
+   * @param def The default String to return when the ConfigurationSection returns null. Can be null
+   * @return String from the provided path or the default one provided
+   */
+  @Nullable
+  @Contract("_, !null -> !null")
+  public final String getString(@NotNull final String path, @Nullable final String def) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? def : section.getString(path, def);
+  }
+  
+  /**
+   * Gets a String List relative to the {@link #getConfigSection() default ConfigurationSection} set
+   * by the expansion or an empty List, when the default ConfigurationSection is null
+   *
+   * @param path The path to get the String list from. This is relative to the default section
+   * @return String list from the provided path or an empty list
+   */
+  @NotNull
+  public final List<String> getStringList(@NotNull final String path) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? Collections.emptyList() : section.getStringList(path);
+  }
+  
+  /**
+   * Gets the boolean relative to the {@link #getConfigSection() default ConfigurationSection} set
+   * by the expansion or the default boolean, when the default ConfigurationSection is null
+   *
+   * @param path The path to get the boolean from. This is relative to the default section
+   * @param def The default boolean to return when the ConfigurationSection is null
+   * @return boolean from the provided path or the default one provided
+   */
+  public final boolean getBoolean(@NotNull final String path, final boolean def) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? def : section.getBoolean(path, def);
+  }
+
+  /**
+   * Whether the {@link #getConfigSection() default ConfigurationSection} contains the provided path
+   * or not. This will return {@code false} when either the default section is null, or doesn't
+   * contain the provided path
+   *
+   * @param path The path to check
+   * @return true when the default ConfigurationSection is not null and contains the path, false otherwise
+   */
+  public final boolean configurationContains(@NotNull final String path) {
+    final ConfigurationSection section = getConfigSection();
+    return section != null && section.contains(path);
+  }
+
+  /**
+   * Logs the provided message with the provided Level in the console.
+   * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
+   * 
+   * @param level The Level at which the message should be logged with
+   * @param msg The message to log
+   */
+  public void log(Level level, String msg) {
+    getPlaceholderAPI().getLogger().log(level, "[" + getName() + "] " + msg);
+  }
+
+  /**
+   * Logs the provided message and Throwable with the provided Level in the console.
+   * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
+   *
+   * @param level The Level at which the message should be logged with
+   * @param msg The message to log
+   * @param throwable The Throwable to log
+   */
+  public void log(Level level, String msg, Throwable throwable) {
+    getPlaceholderAPI().getLogger().log(level, "[" + getName() + "] " + msg, throwable);
+  }
+
+  /**
+   * Logs the provided message with Level "info".
+   * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
+   *
+   * @param msg The message to log
+   */
+  public void info(String msg) {
+    log(Level.INFO, msg);
+  }
+
+  /**
+   * Logs the provided message with Level "warning".
+   * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
+   *
+   * @param msg The message to log
+   */
+  public void warning(String msg) {
+    log(Level.WARNING, msg);
+  }
+
+  /**
+   * Logs the provided message with Level "severe" (error).
+   * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
+   *
+   * @param msg The message to log
+   */
+  public void severe(String msg) {
+    log(Level.SEVERE, msg);
+  }
+
+  /**
+   * Logs the provided message and Throwable with Level "severe" (error).
+   * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
+   *
+   * @param msg The message to log
+   * @param throwable The Throwable to log
+   */
+  public void severe(String msg, Throwable throwable) {
+    log(Level.SEVERE, msg, throwable);
+  }
+  
+  
+  /**
+   * Whether the provided Object is an instance of this PlaceholderExpansion.
+   * <br>This method will perform the following checks in order:
+   * <br><ul>
+   *     <li>Checks if Object equals the class. Returns true when equal and continues otherwise</li>
+   *     <li>Checks if the Object is an instance of a PlaceholderExpansion. Returns false if not</li>
+   *     <li>Checks if the Object's Identifier, Author and version equal the one of this class</li>
+   * </ul>
+   * 
+   * @param o The Object to check
+   * @return true or false depending on the above mentioned checks
+   */
+  @Override
+  public final boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof PlaceholderExpansion)) {
+      return false;
     }
 
-    /**
+    final PlaceholderExpansion expansion = (PlaceholderExpansion) o;
-     * The name of the plugin that this expansion hooks into. by default will null
+
-     *
+    return getIdentifier().equals(expansion.getIdentifier()) &&
-     * @return plugin name that this expansion requires to function
+        getAuthor().equals(expansion.getAuthor()) &&
-     */
+        getVersion().equals(expansion.getVersion());
-    @Nullable
+  }
-    public String getRequiredPlugin() {
+  
-        return getPlugin();
+  /**
-    }
+   * Returns a String containing the Expansion's name, author and version
+   * 
+   * @return String containing name, author and version of the expansion
+   */
+  @Override
+  public final String toString() {
+    return String.format("PlaceholderExpansion[name: '%s', author: '%s', version: '%s', type: '%s']", getName(),
+        getAuthor(), getVersion(), getExpansionType());
+  }
+
+  // === Deprecated API ===
+
+  /**
+   * @deprecated As of versions greater than 2.8.7, use {@link #getRequiredPlugin()}
+   *
+   * @return The plugin name.
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public String getPlugin() {
+    return null;
+  }
+
+  /**
+   * @deprecated As of versions greater than 2.8.7, use the expansion cloud to show a description
+   *
+   * @return The description of the expansion.
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public String getDescription() {
+    return null;
+  }
+
+  /**
+   * @deprecated As of versions greater than 2.8.7, use the expansion cloud to display a link
+   *
+   * @return The link for the expansion.
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public String getLink() {
+    return null;
+  }
+
+  public enum Type {
 
     /**
-     * The placeholders associated with this expansion
+     * An expansion provided by a plugin is considered internal
-     *
-     * @return placeholder list that this expansion provides
      */
-    @NotNull
+    INTERNAL,
-    public List<String> getPlaceholders() {
-        return Collections.emptyList();
-    }
-
 
     /**
-     * Expansions that do not use the ecloud and instead register from the dependency should set this
+     * An expansion loaded from the expansions folder is considered external
-     * to true to ensure that your placeholder expansion is not unregistered when the papi reload
-     * command is used
-     *
-     * @return if this expansion should persist through placeholder reloads
      */
-    public boolean persist() {
+    EXTERNAL
-        return false;
-    }
 
-
+  }
-    /**
-     * Check if this placeholder identifier has already been registered
-     *
-     * @return true if the identifier for this expansion is already registered
-     */
-    public final boolean isRegistered() {
-        return getPlaceholderAPI().getLocalExpansionManager().findExpansionByIdentifier(getIdentifier())
-                .map(it -> it.equals(this)).orElse(false);
-    }
-
-
-    /**
-     * If any requirements need to be checked before this expansion should register, you can check
-     * them here
-     *
-     * @return true if this hook meets all the requirements to register
-     */
-    public boolean canRegister() {
-        return getRequiredPlugin() == null
-                || Bukkit.getPluginManager().getPlugin(getRequiredPlugin()) != null;
-    }
-
-    /**
-     * Attempt to register this PlaceholderExpansion
-     *
-     * @return true if this expansion is now registered with PlaceholderAPI
-     */
-    public boolean register() {
-        return getPlaceholderAPI().getLocalExpansionManager().register(this);
-    }
-
-    /**
-     * Attempt to unregister this PlaceholderExpansion
-     *
-     * @return true if this expansion is now unregistered with PlaceholderAPI
-     */
-    public final boolean unregister() {
-        return getPlaceholderAPI().getLocalExpansionManager().unregister(this);
-    }
-
-
-    /**
-     * Quick getter for the {@link PlaceholderAPIPlugin} instance
-     *
-     * @return {@link PlaceholderAPIPlugin} instance
-     */
-    @NotNull
-    public final PlaceholderAPIPlugin getPlaceholderAPI() {
-        return PlaceholderAPIPlugin.getInstance();
-    }
-
-    /**
-     * Get the type of the expansion
-     *
-     * @return the type of the expansion
-     * @since 2.11.4
-     */
-    @ApiStatus.Internal
-    public Type getExpansionType() {
-        return expansionType;
-    }
-
-    /**
-     * Set the type of the expansion
-     *
-     * @param expansionType the new type
-     * @since 2.11.4
-     */
-    @ApiStatus.Internal
-    public void setExpansionType(Type expansionType) {
-        this.expansionType = expansionType;
-    }
-
-    // === Configuration ===
-
-    /**
-     * Gets the ConfigurationSection of the expansion located in the config.yml of PlaceholderAPI or
-     * null when not specified.
-     * <br>You may use the {@link Configurable} interface to define default values set
-     *
-     * @return ConfigurationSection that this expansion has.
-     */
-    @Nullable
-    public final ConfigurationSection getConfigSection() {
-        return getPlaceholderAPI().getConfig().getConfigurationSection("expansions." + getIdentifier());
-    }
-
-    /**
-     * Gets the ConfigurationSection relative to the {@link #getConfigSection() default one} set
-     * by the expansion or null when the default ConfigurationSection is null
-     *
-     * @param path The path to get the ConfigurationSection from. This is relative to the default section
-     * @return ConfigurationSection relative to the default section
-     */
-    @Nullable
-    public final ConfigurationSection getConfigSection(@NotNull final String path) {
-        final ConfigurationSection section = getConfigSection();
-        return section == null ? null : section.getConfigurationSection(path);
-    }
-
-    /**
-     * Gets the Object relative to the {@link #getConfigSection() default ConfigurationSection} set
-     * by the expansion or the provided Default Object, when the default ConfigurationSection is null
-     *
-     * @param path The path to get the Object from. This is relative to the default section
-     * @param def  The default Object to return when the ConfigurationSection returns null
-     * @return Object from the provided path or the default one provided
-     */
-    @Nullable
-    @Contract("_, !null -> !null")
-    public final Object get(@NotNull final String path, final Object def) {
-        final ConfigurationSection section = getConfigSection();
-        return section == null ? def : section.get(path, def);
-    }
-
-    /**
-     * Gets the int relative to the {@link #getConfigSection() default ConfigurationSection} set
-     * by the expansion or the provided Default int, when the default ConfigurationSection is null
-     *
-     * @param path The path to get the int from. This is relative to the default section
-     * @param def  The default int to return when the ConfigurationSection returns null
-     * @return int from the provided path or the default one provided
-     */
-    public final int getInt(@NotNull final String path, final int def) {
-        final ConfigurationSection section = getConfigSection();
-        return section == null ? def : section.getInt(path, def);
-    }
-
-    /**
-     * Gets the long relative to the {@link #getConfigSection() default ConfigurationSection} set
-     * by the expansion or the provided Default long, when the default ConfigurationSection is null
-     *
-     * @param path The path to get the long from. This is relative to the default section
-     * @param def  The default long to return when the ConfigurationSection returns null
-     * @return long from the provided path or the default one provided
-     */
-    public final long getLong(@NotNull final String path, final long def) {
-        final ConfigurationSection section = getConfigSection();
-        return section == null ? def : section.getLong(path, def);
-    }
-
-    /**
-     * Gets the double relative to the {@link #getConfigSection() default ConfigurationSection} set
-     * by the expansion or the provided Default double, when the default ConfigurationSection is null
-     *
-     * @param path The path to get the double from. This is relative to the default section
-     * @param def  The default double to return when the ConfigurationSection returns null
-     * @return double from the provided path or the default one provided
-     */
-    public final double getDouble(@NotNull final String path, final double def) {
-        final ConfigurationSection section = getConfigSection();
-        return section == null ? def : section.getDouble(path, def);
-    }
-
-    /**
-     * Gets the String relative to the {@link #getConfigSection() default ConfigurationSection} set
-     * by the expansion or the provided Default String, when the default ConfigurationSection is null
-     *
-     * @param path The path to get the String from. This is relative to the default section
-     * @param def  The default String to return when the ConfigurationSection returns null. Can be null
-     * @return String from the provided path or the default one provided
-     */
-    @Nullable
-    @Contract("_, !null -> !null")
-    public final String getString(@NotNull final String path, @Nullable final String def) {
-        final ConfigurationSection section = getConfigSection();
-        return section == null ? def : section.getString(path, def);
-    }
-
-    /**
-     * Gets a String List relative to the {@link #getConfigSection() default ConfigurationSection} set
-     * by the expansion or an empty List, when the default ConfigurationSection is null
-     *
-     * @param path The path to get the String list from. This is relative to the default section
-     * @return String list from the provided path or an empty list
-     */
-    @NotNull
-    public final List<String> getStringList(@NotNull final String path) {
-        final ConfigurationSection section = getConfigSection();
-        return section == null ? Collections.emptyList() : section.getStringList(path);
-    }
-
-    /**
-     * Gets the boolean relative to the {@link #getConfigSection() default ConfigurationSection} set
-     * by the expansion or the default boolean, when the default ConfigurationSection is null
-     *
-     * @param path The path to get the boolean from. This is relative to the default section
-     * @param def  The default boolean to return when the ConfigurationSection is null
-     * @return boolean from the provided path or the default one provided
-     */
-    public final boolean getBoolean(@NotNull final String path, final boolean def) {
-        final ConfigurationSection section = getConfigSection();
-        return section == null ? def : section.getBoolean(path, def);
-    }
-
-    /**
-     * Whether the {@link #getConfigSection() default ConfigurationSection} contains the provided path
-     * or not. This will return {@code false} when either the default section is null, or doesn't
-     * contain the provided path
-     *
-     * @param path The path to check
-     * @return true when the default ConfigurationSection is not null and contains the path, false otherwise
-     */
-    public final boolean configurationContains(@NotNull final String path) {
-        final ConfigurationSection section = getConfigSection();
-        return section != null && section.contains(path);
-    }
-
-    /**
-     * Logs the provided message with the provided Level in the console.
-     * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
-     *
-     * @param level The Level at which the message should be logged with
-     * @param msg   The message to log
-     */
-    public void log(Level level, String msg) {
-        getPlaceholderAPI().getLogger().log(level, "[" + getName() + "] " + msg);
-    }
-
-    /**
-     * Logs the provided message and Throwable with the provided Level in the console.
-     * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
-     *
-     * @param level     The Level at which the message should be logged with
-     * @param msg       The message to log
-     * @param throwable The Throwable to log
-     */
-    public void log(Level level, String msg, Throwable throwable) {
-        getPlaceholderAPI().getLogger().log(level, "[" + getName() + "] " + msg, throwable);
-    }
-
-    /**
-     * Logs the provided message with Level "info".
-     * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
-     *
-     * @param msg The message to log
-     */
-    public void info(String msg) {
-        log(Level.INFO, msg);
-    }
-
-    /**
-     * Logs the provided message with Level "warning".
-     * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
-     *
-     * @param msg The message to log
-     */
-    public void warning(String msg) {
-        log(Level.WARNING, msg);
-    }
-
-    /**
-     * Logs the provided message with Level "severe" (error).
-     * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
-     *
-     * @param msg The message to log
-     */
-    public void severe(String msg) {
-        log(Level.SEVERE, msg);
-    }
-
-    /**
-     * Logs the provided message and Throwable with Level "severe" (error).
-     * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
-     *
-     * @param msg       The message to log
-     * @param throwable The Throwable to log
-     */
-    public void severe(String msg, Throwable throwable) {
-        log(Level.SEVERE, msg, throwable);
-    }
-
-
-    /**
-     * Whether the provided Object is an instance of this PlaceholderExpansion.
-     * <br>This method will perform the following checks in order:
-     * <br><ul>
-     * <li>Checks if Object equals the class. Returns true when equal and continues otherwise</li>
-     * <li>Checks if the Object is an instance of a PlaceholderExpansion. Returns false if not</li>
-     * <li>Checks if the Object's Identifier, Author and version equal the one of this class</li>
-     * </ul>
-     *
-     * @param o The Object to check
-     * @return true or false depending on the above mentioned checks
-     */
-    @Override
-    public final boolean equals(final Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof PlaceholderExpansion)) {
-            return false;
-        }
-
-        final PlaceholderExpansion expansion = (PlaceholderExpansion) o;
-
-        return getIdentifier().equals(expansion.getIdentifier()) &&
-                getAuthor().equals(expansion.getAuthor()) &&
-                getVersion().equals(expansion.getVersion());
-    }
-
-    /**
-     * Returns a String containing the Expansion's name, author and version
-     *
-     * @return String containing name, author and version of the expansion
-     */
-    @Override
-    public final String toString() {
-        return String.format("PlaceholderExpansion[name: '%s', author: '%s', version: '%s', type: '%s']", getName(),
-                getAuthor(), getVersion(), getExpansionType());
-    }
-
-    // === Deprecated API ===
-
-    /**
-     * @return The plugin name.
-     * @deprecated As of versions greater than 2.8.7, use {@link #getRequiredPlugin()}
-     */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-    public String getPlugin() {
-        return null;
-    }
-
-    /**
-     * @return The description of the expansion.
-     * @deprecated As of versions greater than 2.8.7, use the expansion cloud to show a description
-     */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-    public String getDescription() {
-        return null;
-    }
-
-    /**
-     * @return The link for the expansion.
-     * @deprecated As of versions greater than 2.8.7, use the expansion cloud to display a link
-     */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-    public String getLink() {
-        return null;
-    }
-
-    public enum Type {
-
-        /**
-         * An expansion provided by a plugin is considered internal
-         */
-        INTERNAL,
-
-        /**
-         * An expansion loaded from the expansions folder is considered external
-         */
-        EXTERNAL
-
-    }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,13 +31,13 @@ import org.bukkit.entity.Player;
  */
 public interface Relational {
 
-    /**
+  /**
-     * This method is called whenever a placeholder starting with {@code rel_} is called.
+   * This method is called whenever a placeholder starting with {@code rel_} is called.
-     *
+   * 
-     * @param one        The first player used for the placeholder.
+   * @param one The first player used for the placeholder.
-     * @param two        The second player used for the placeholder.
+   * @param two The second player used for the placeholder.
-     * @param identifier The text right after the expansion's name (%expansion_<b>identifier</b>%)
+   * @param identifier The text right after the expansion's name (%expansion_<b>identifier</b>%)
-     * @return Parsed String from the expansion.
+   * @return Parsed String from the expansion.
-     */
+   */
-    String onPlaceholderRequest(Player one, Player two, String identifier);
+  String onPlaceholderRequest(Player one, Player two, String identifier);
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,15 +29,15 @@ package me.clip.placeholderapi.expansion;
  */
 public interface Taskable {
 
-    /**
+  /**
-     * Called when the implementing class has successfully been registered to the placeholder map.
+   * Called when the implementing class has successfully been registered to the placeholder map.
-     * <br>Tasks that need to be performed when this expansion is registered should go here
+   * <br>Tasks that need to be performed when this expansion is registered should go here
-     */
+   */
-    void start();
+  void start();
 
-    /**
+  /**
-     * Called when the implementing class has been unregistered from PlaceholderAPI.
+   * Called when the implementing class has been unregistered from PlaceholderAPI.
-     * <br>Tasks that need to be performed when this expansion has unregistered should go here
+   * <br>Tasks that need to be performed when this expansion has unregistered should go here
-     */
+   */
-    void stop();
+  void stop();
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,24 +23,24 @@ package me.clip.placeholderapi.expansion;
 @Deprecated
 public final class Version {
 
-    private final boolean isSpigot;
+  private final boolean isSpigot;
-    private final String version;
+  private final String version;
 
-    public Version(String version, boolean isSpigot) {
+  public Version(String version, boolean isSpigot) {
-        this.version = version;
+    this.version = version;
-        this.isSpigot = isSpigot;
+    this.isSpigot = isSpigot;
-    }
+  }
 
-    public String getVersion() {
+  public String getVersion() {
-        return version == null ? "unknown" : version;
+    return version == null ? "unknown" : version;
-    }
+  }
 
-    public boolean isSpigot() {
+  public boolean isSpigot() {
-        return isSpigot;
+    return isSpigot;
-    }
+  }
 
-    public boolean compareTo(String version) {
+  public boolean compareTo(String version) {
-        return getVersion().equalsIgnoreCase(version);
+    return getVersion().equalsIgnoreCase(version);
-    }
+  }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,17 +27,19 @@ package me.clip.placeholderapi.expansion;
  * with that version.
  *
  * @author Ryan McCarthy
+ *
  * @deprecated Will be removed in a future release.
  */
 @Deprecated
 public interface VersionSpecific {
 
-    /**
+  /**
-     * This method is called before the expansion is attempted to be registered The server version
+   * This method is called before the expansion is attempted to be registered The server version
-     * will be passed to this method so you know what version the server is currently running.
+   * will be passed to this method so you know what version the server is currently running.
-     *
+   *
-     * @param v The {@link Version} to check against
+   * @param v The {@link Version} to check against
-     * @return true if your expansion is compatible with the version the server is running.
+   *
-     */
+   * @return true if your expansion is compatible with the version the server is running.
-    boolean isCompatibleWith(Version v);
+   */
+  boolean isCompatibleWith(Version v);
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,185 +23,180 @@ 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;
 
 
 public class CloudExpansion {
 
-    private String name,
+  private String name,
-            author,
+      author,
-            latest_version,
+      latest_version,
-            description,
+      description,
-            source_url,
+      source_url,
-            dependency_url;
+      dependency_url;
 
-    private boolean hasExpansion,
+  private boolean hasExpansion,
-            shouldUpdate;
+      shouldUpdate,
+      verified;
 
-    private long last_update,
+  private long last_update,
-            ratings_count;
+      ratings_count;
 
-    private double average_rating;
+  private double average_rating;
 
-    private List<String> placeholders;
+  private List<String> placeholders;
 
-    private List<Version> versions;
+  private List<Version> versions;
 
-    public CloudExpansion() {
+  public CloudExpansion() {
+  }
+
+  public String getTimeSinceLastUpdate() {
+    int time = (int) TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - getLastUpdate());
+    return TimeUtil.getTime(time);
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getAuthor() {
+    return author;
+  }
+
+  public void setAuthor(String author) {
+    this.author = author;
+  }
+
+  public Version getVersion() {
+    return getLatestVersion() == null ? null : getVersion(getLatestVersion());
+  }
+
+  public Version getVersion(String version) {
+    return versions == null ? null : versions.stream()
+        .filter(v -> v.getVersion().equals(version))
+        .findFirst()
+        .orElse(null);
+  }
+
+  public List<String> getAvailableVersions() {
+    return versions.stream().map(Version::getVersion).collect(Collectors.toList());
+  }
+
+  public String getLatestVersion() {
+    return latest_version;
+  }
+
+  public void setLatestVersion(String latest_version) {
+    this.latest_version = latest_version;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public String getSourceUrl() {
+    return source_url;
+  }
+
+  public void setSourceUrl(String source_url) {
+    this.source_url = source_url;
+  }
+
+  public String getDependencyUrl() {
+    return dependency_url;
+  }
+
+  public void setDependencyUrl(String dependency_url) {
+    this.dependency_url = dependency_url;
+  }
+
+  public boolean hasExpansion() {
+    return hasExpansion;
+  }
+
+  public void setHasExpansion(boolean hasExpansion) {
+    this.hasExpansion = hasExpansion;
+  }
+
+  public boolean shouldUpdate() {
+    return shouldUpdate;
+  }
+
+  public void setShouldUpdate(boolean shouldUpdate) {
+    this.shouldUpdate = shouldUpdate;
+  }
+
+  public boolean isVerified() {
+    return verified;
+  }
+
+  public long getLastUpdate() {
+    return last_update;
+  }
+
+  public void setLastUpdate(long last_update) {
+    this.last_update = last_update;
+  }
+
+  public long getRatingsCount() {
+    return ratings_count;
+  }
+
+  public double getAverage_rating() {
+    return average_rating;
+  }
+
+  public List<String> getPlaceholders() {
+    return placeholders;
+  }
+
+  public void setPlaceholders(List<String> placeholders) {
+    this.placeholders = placeholders;
+  }
+
+  public List<Version> getVersions() {
+    return versions;
+  }
+
+  public void setVersions(List<Version> versions) {
+    this.versions = versions;
+  }
+
+  public static class Version {
+
+    private String url, version, release_notes;
+
+    public String getUrl() {
+      return url;
     }
 
-    public String getTimeSinceLastUpdate() {
+    public void setUrl(String url) {
-        int time = (int) TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - getLastUpdate());
+      this.url = url;
-        return TimeUtil.getTime(time);
     }
 
-    public String getName() {
+    public String getVersion() {
-        return name;
+      return version;
     }
 
-    public void setName(String name) {
+    public void setVersion(String version) {
-        this.name = name;
+      this.version = version;
     }
 
-    public String getAuthor() {
+    public String getReleaseNotes() {
-        return author;
+      return release_notes;
     }
 
-    public void setAuthor(String author) {
+    public void setReleaseNotes(String release_notes) {
-        this.author = author;
+      this.release_notes = release_notes;
-    }
-
-    public Version getVersion() {
-        return getLatestVersion() == null ? null : getVersion(getLatestVersion());
-    }
-
-    public Version getVersion(String version) {
-        return versions == null ? null : versions.stream()
-                .filter(v -> v.getVersion().equals(version))
-                .findFirst()
-                .orElse(null);
-    }
-
-    public List<String> getAvailableVersions() {
-        return versions.stream().map(Version::getVersion).collect(Collectors.toList());
-    }
-
-    public String getLatestVersion() {
-        return latest_version;
-    }
-
-    public void setLatestVersion(String latest_version) {
-        this.latest_version = latest_version;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getSourceUrl() {
-        return source_url;
-    }
-
-    public void setSourceUrl(String source_url) {
-        this.source_url = source_url;
-    }
-
-    public String getDependencyUrl() {
-        return dependency_url;
-    }
-
-    public void setDependencyUrl(String dependency_url) {
-        this.dependency_url = dependency_url;
-    }
-
-    public boolean hasExpansion() {
-        return hasExpansion;
-    }
-
-    public void setHasExpansion(boolean hasExpansion) {
-        this.hasExpansion = hasExpansion;
-    }
-
-    public boolean shouldUpdate() {
-        return shouldUpdate;
-    }
-
-    public void setShouldUpdate(boolean shouldUpdate) {
-        this.shouldUpdate = shouldUpdate;
-    }
-
-    public long getLastUpdate() {
-        return last_update;
-    }
-
-    public void setLastUpdate(long last_update) {
-        this.last_update = last_update;
-    }
-
-    public long getRatingsCount() {
-        return ratings_count;
-    }
-
-    public double getAverage_rating() {
-        return average_rating;
-    }
-
-    public List<String> getPlaceholders() {
-        return placeholders;
-    }
-
-    public void setPlaceholders(List<String> placeholders) {
-        this.placeholders = placeholders;
-    }
-
-    public List<Version> getVersions() {
-        return versions;
-    }
-
-    public void setVersions(List<Version> versions) {
-        this.versions = versions;
-    }
-
-    public static class Version {
-
-        private String url, version, release_notes;
-        private boolean verified;
-
-        public String getUrl() {
-            return url;
-        }
-
-        public void setUrl(String url) {
-            this.url = url;
-        }
-
-        public String getVersion() {
-            return version;
-        }
-
-        public void setVersion(String version) {
-            this.version = version;
-        }
-
-        public String getReleaseNotes() {
-            return release_notes;
-        }
-
-        public void setReleaseNotes(String release_notes) {
-            this.release_notes = release_notes;
-        }
-
-        public boolean isVerified() {
-            return verified;
-        }
-
-        public void setVerified(boolean verified) {
-            this.verified = verified;
-        }
     }
+  }
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,13 +25,11 @@ 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;
 import java.lang.reflect.Type;
 import java.net.URL;
-import java.net.UnknownHostException;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.charset.StandardCharsets;
@@ -52,7 +50,6 @@ 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;
@@ -62,224 +59,220 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class CloudExpansionManager {
 
-    @NotNull
+  @NotNull
-    private static final String API_URL = "https://ecloud.placeholderapi.com/api/v3/?platform=bukkit";
+  private static final String API_URL = "http://api.extendedclip.com/v2/";
 
-    @NotNull
+  @NotNull
-    private static final Gson GSON = new Gson();
+  private static final Gson GSON = new Gson();
-    @NotNull
+  @NotNull
-    private static final Type TYPE = new TypeToken<Map<String, CloudExpansion>>() {}.getType();
+  private static final Type TYPE = new TypeToken<Map<String, CloudExpansion>>() {}.getType();
 
-    @NotNull
+  @NotNull
-    private final Collector<CloudExpansion, ?, Map<String, CloudExpansion>> INDEXED_NAME_COLLECTOR = Collectors
+  private final Collector<CloudExpansion, ?, Map<String, CloudExpansion>> INDEXED_NAME_COLLECTOR = Collectors
-            .toMap(CloudExpansionManager::toIndexName, Function.identity());
+      .toMap(CloudExpansionManager::toIndexName, Function.identity());
 
 
-    @NotNull
+  @NotNull
-    private final PlaceholderAPIPlugin plugin;
+  private final PlaceholderAPIPlugin plugin;
 
-    @NotNull
+  @NotNull
-    private final Map<String, CloudExpansion> cache = new HashMap<>();
+  private final Map<String, CloudExpansion> cache = new HashMap<>();
-    @NotNull
+  @NotNull
-    private final Map<String, CompletableFuture<File>> await = new ConcurrentHashMap<>();
+  private final Map<String, CompletableFuture<File>> await = new ConcurrentHashMap<>();
 
-    private final ExecutorService ASYNC_EXECUTOR =
+  private final ExecutorService ASYNC_EXECUTOR =
-            Executors.newCachedThreadPool(
+      Executors.newCachedThreadPool(
-                    new ThreadFactoryBuilder().setNameFormat("placeholderapi-io-#%1$d").build());
+          new ThreadFactoryBuilder().setNameFormat("placeholderapi-io-#%1$d").build());
 
-    public CloudExpansionManager(@NotNull final PlaceholderAPIPlugin plugin) {
+  public CloudExpansionManager(@NotNull final PlaceholderAPIPlugin plugin) {
-        this.plugin = plugin;
+    this.plugin = plugin;
+  }
+
+  @NotNull
+  private static String toIndexName(@NotNull final String name) {
+    return name.toLowerCase(Locale.ROOT).replace(' ', '_');
+  }
+
+  @NotNull
+  private static String toIndexName(@NotNull final CloudExpansion expansion) {
+    return toIndexName(expansion.getName());
+  }
+
+  public void load() {
+    clean();
+    fetch();
+  }
+
+  public void kill() {
+    clean();
+  }
+
+  @NotNull
+  @Unmodifiable
+  public Map<String, CloudExpansion> getCloudExpansions() {
+    return ImmutableMap.copyOf(cache);
+  }
+
+  @NotNull
+  @Unmodifiable
+  public Map<String, CloudExpansion> getCloudExpansionsInstalled() {
+    if (cache.isEmpty()) {
+      return Collections.emptyMap();
     }
 
-    @NotNull
+    return cache.values()
-    private static String toIndexName(@NotNull final String name) {
+        .stream()
-        return name.toLowerCase(Locale.ROOT).replace(' ', '_');
+        .filter(CloudExpansion::hasExpansion)
+        .collect(INDEXED_NAME_COLLECTOR);
+  }
+
+  @NotNull
+  @Unmodifiable
+  public Map<String, CloudExpansion> getCloudExpansionsByAuthor(@NotNull final String author) {
+    if (cache.isEmpty()) {
+      return Collections.emptyMap();
     }
 
-    @NotNull
+    return cache.values()
-    private static String toIndexName(@NotNull final CloudExpansion expansion) {
+        .stream()
-        return toIndexName(expansion.getName());
+        .filter(expansion -> author.equalsIgnoreCase(expansion.getAuthor()))
-    }
+        .collect(INDEXED_NAME_COLLECTOR);
+  }
 
-    public void load() {
+  @NotNull
-        clean();
+  @Unmodifiable
-        fetch();
+  public Set<String> getCloudExpansionAuthors() {
-    }
+    return cache.values().stream().map(CloudExpansion::getAuthor).collect(Collectors.toSet());
+  }
 
-    public void kill() {
+  public int getCloudExpansionAuthorCount() {
-        clean();
+    return getCloudExpansionAuthors().size();
-    }
+  }
 
-    @NotNull
+  public int getCloudUpdateCount() {
-    @Unmodifiable
+    return ((int) plugin.getLocalExpansionManager()
-    public Map<String, CloudExpansion> getCloudExpansions() {
+        .getExpansions()
-        return ImmutableMap.copyOf(cache);
+        .stream()
-    }
+        .filter(expansion -> findCloudExpansionByName(expansion.getName())
+            .map(CloudExpansion::shouldUpdate).orElse(false))
+        .count());
+  }
 
-    public boolean isEmpty() {
+  @NotNull
-        return cache.isEmpty();
+  public Optional<CloudExpansion> findCloudExpansionByName(@NotNull final String name) {
-    }
+    return Optional.ofNullable(cache.get(toIndexName(name)));
+  }
 
-    @NotNull
+  public void clean() {
-    @Unmodifiable
+    cache.clear();
-    public Map<String, CloudExpansion> getCloudExpansionsInstalled() {
-        if (cache.isEmpty()) {
-            return Collections.emptyMap();
-        }
 
-        return cache.values()
+    await.values().forEach(future -> future.cancel(true));
-                .stream()
+    await.clear();
-                .filter(CloudExpansion::hasExpansion)
+  }
-                .collect(INDEXED_NAME_COLLECTOR);
-    }
 
-    @NotNull
+  public void fetch() {
-    @Unmodifiable
+    plugin.getLogger().info("Fetching available expansion information...");
-    public Map<String, CloudExpansion> getCloudExpansionsByAuthor(@NotNull final String author) {
-        if (cache.isEmpty()) {
-            return Collections.emptyMap();
-        }
 
-        return cache.values()
+    ASYNC_EXECUTOR.submit(
-                .stream()
+        () -> {
-                .filter(expansion -> author.equalsIgnoreCase(expansion.getAuthor()))
+          // a defence tactic! use ConcurrentHashMap instead of normal HashMap
-                .collect(INDEXED_NAME_COLLECTOR);
+          Map<String, CloudExpansion> values = new ConcurrentHashMap<>();
-    }
+          try {
+            //noinspection UnstableApiUsage
+            String json = Resources.toString(new URL(API_URL), StandardCharsets.UTF_8);
+            values.putAll(GSON.fromJson(json, TYPE));
 
-    @NotNull
+            List<String> toRemove = new ArrayList<>();
-    @Unmodifiable
-    public Set<String> getCloudExpansionAuthors() {
-        return cache.values().stream().map(CloudExpansion::getAuthor).collect(Collectors.toSet());
-    }
 
-    public int getCloudExpansionAuthorCount() {
+            for (Map.Entry<String, CloudExpansion> entry : values.entrySet()) {
-        return getCloudExpansionAuthors().size();
+              CloudExpansion expansion = entry.getValue();
-    }
+              if (expansion.getLatestVersion() == null
+                  || expansion.getVersion(expansion.getLatestVersion()) == null) {
+                toRemove.add(entry.getKey());
+              }
+            }
 
-    public int getCloudUpdateCount() {
+            for (String name : toRemove) {
-        return ((int) plugin.getLocalExpansionManager()
+              values.remove(name);
-                .getExpansions()
+            }
-                .stream()
+          } catch (Throwable e) {
-                .filter(expansion -> findCloudExpansionByName(expansion.getName())
+            // ugly swallowing of every throwable, but we have to be defensive
-                        .map(CloudExpansion::shouldUpdate).orElse(false))
+            plugin.getLogger().log(Level.WARNING, "Failed to download expansion information", e);
-                .count());
+          }
-    }
 
-    @NotNull
+          // loop through what's left on the main thread
-    public Optional<CloudExpansion> findCloudExpansionByName(@NotNull final String name) {
+          plugin
-        return Optional.ofNullable(cache.get(toIndexName(name)));
+              .getServer()
-    }
+              .getScheduler()
-
+              .runTask(
-    public void clean() {
+                  plugin,
-        cache.clear();
+                  () -> {
-
-        await.values().forEach(future -> future.cancel(true));
-        await.clear();
-    }
-
-    public void fetch() {
-        plugin.getLogger().info("Fetching available expansion information...");
-
-        ASYNC_EXECUTOR.submit(
-                () -> {
-                    // a defence tactic! use ConcurrentHashMap instead of normal HashMap
-                    Map<String, CloudExpansion> values = new ConcurrentHashMap<>();
                     try {
-                        //noinspection UnstableApiUsage
+                      for (Map.Entry<String, CloudExpansion> entry : values.entrySet()) {
-                        String json = Resources.toString(new URL(API_URL), StandardCharsets.UTF_8);
+                        String name = entry.getKey();
-                        values.putAll(GSON.fromJson(json, TYPE));
+                        CloudExpansion expansion = entry.getValue();
 
-                        List<String> toRemove = new ArrayList<>();
+                        expansion.setName(name);
 
-                        for (Map.Entry<String, CloudExpansion> entry : values.entrySet()) {
+                        Optional<PlaceholderExpansion> localOpt =
-                            CloudExpansion expansion = entry.getValue();
+                            plugin.getLocalExpansionManager().findExpansionByName(name);
-                            if (expansion.getLatestVersion() == null
+                        if (localOpt.isPresent()) {
-                                    || expansion.getVersion(expansion.getLatestVersion()) == null) {
+                          PlaceholderExpansion local = localOpt.get();
-                                toRemove.add(entry.getKey());
+                          if (local.isRegistered()) {
-                            }
+                            expansion.setHasExpansion(true);
+                            expansion.setShouldUpdate(
+                                !local.getVersion().equalsIgnoreCase(expansion.getLatestVersion()));
+                          }
                         }
 
-                        for (String name : toRemove) {
+                        cache.put(toIndexName(expansion), expansion);
-                            values.remove(name);
+                      }
-                        }
-                    } catch (UnknownHostException e) {
-                        plugin.getLogger().log(Level.WARNING, "There is no data available from the eCloud. Please try running /papi refresh. If this does not resolve the issue, the eCloud may be blocked by your firewall, server host, or service provider.\n\nMore information: https://placeholderapi.com/ecloud-blocked", e);
                     } catch (Throwable e) {
-                        // ugly swallowing of every throwable, but we have to be defensive
+                      // ugly swallowing of every throwable, but we have to be defensive
-                        plugin.getLogger().log(Level.WARNING, "Failed to download expansion information", e);
+                      plugin
+                          .getLogger()
+                          .log(Level.WARNING, "Failed to download expansion information", e);
                     }
+                  });
+        });
+  }
 
-                    // loop through what's left on the main thread
+  public boolean isDownloading(@NotNull final CloudExpansion expansion) {
-                    plugin
+    return await.containsKey(toIndexName(expansion));
-                            .getScheduler()
+  }
-                            .runTask(
-                                    () -> {
-                                        try {
-                                            for (Map.Entry<String, CloudExpansion> entry : values.entrySet()) {
-                                                String name = entry.getKey();
-                                                CloudExpansion expansion = entry.getValue();
 
-                                                expansion.setName(name);
+  @NotNull
-
+  public CompletableFuture<File> downloadExpansion(@NotNull final CloudExpansion expansion,
-                                                Optional<PlaceholderExpansion> localOpt =
+      @NotNull final CloudExpansion.Version version) {
-                                                        plugin.getLocalExpansionManager().findExpansionByName(name);
+    final CompletableFuture<File> previous = await.get(toIndexName(expansion));
-                                                if (localOpt.isPresent()) {
+    if (previous != null) {
-                                                    PlaceholderExpansion local = localOpt.get();
+      return previous;
-                                                    if (local.isRegistered()) {
-                                                        expansion.setHasExpansion(true);
-                                                        expansion.setShouldUpdate(
-                                                                !local.getVersion().equalsIgnoreCase(expansion.getLatestVersion()));
-                                                    }
-                                                }
-
-                                                cache.put(toIndexName(expansion), expansion);
-                                            }
-                                        } catch (Throwable e) {
-                                            // ugly swallowing of every throwable, but we have to be defensive
-                                            plugin
-                                                    .getLogger()
-                                                    .log(Level.WARNING, "Failed to download expansion information", e);
-                                        }
-                                    });
-                });
     }
 
-    public boolean isDownloading(@NotNull final CloudExpansion expansion) {
+    final File file = new File(plugin.getLocalExpansionManager().getExpansionsFolder(),
-        return await.containsKey(toIndexName(expansion));
+        "Expansion-" + toIndexName(expansion) + ".jar");
-    }
 
-    @NotNull
+    final CompletableFuture<File> download = CompletableFuture.supplyAsync(() -> {
-    public CompletableFuture<File> downloadExpansion(@NotNull final CloudExpansion expansion,
+      try (final ReadableByteChannel source = Channels.newChannel(new URL(version.getUrl())
-                                                     @NotNull final CloudExpansion.Version version) {
+          .openStream()); final FileOutputStream target = new FileOutputStream(file)) {
-        final CompletableFuture<File> previous = await.get(toIndexName(expansion));
+        target.getChannel().transferFrom(source, 0, Long.MAX_VALUE);
-        if (previous != null) {
+      } catch (final IOException ex) {
-            return previous;
+        throw new CompletionException(ex);
-        }
+      }
+      return file;
+    }, ASYNC_EXECUTOR);
 
-        final File file = new File(plugin.getLocalExpansionManager().getExpansionsFolder(),
+    download.whenCompleteAsync((value, exception) -> {
-                "Expansion-" + toIndexName(expansion) + ".jar");
+      await.remove(toIndexName(expansion));
 
-        final CompletableFuture<File> download = CompletableFuture.supplyAsync(() -> {
+      if (exception != null) {
-            try (final ReadableByteChannel source = Channels.newChannel(new URL(version.getUrl())
+        Msg.severe("Failed to download %s:%s", exception, expansion.getName(), expansion.getVersion());
-                    .openStream()); final FileOutputStream target = new FileOutputStream(file)) {
+      }
-                target.getChannel().transferFrom(source, 0, Long.MAX_VALUE);
+    }, ASYNC_EXECUTOR);
-            } catch (final IOException ex) {
-                throw new CompletionException(ex);
-            }
-            return file;
-        }, ASYNC_EXECUTOR);
 
-        download.whenCompleteAsync((value, exception) -> {
+    await.put(toIndexName(expansion), download);
-            await.remove(toIndexName(expansion));
 
-            if (exception != null) {
+    return download;
-                Msg.severe("Failed to download %s:%s", exception, expansion.getName(), expansion.getVersion());
+  }
-            }
-        }, ASYNC_EXECUTOR);
-
-        await.put(toIndexName(expansion), download);
-
-        return download;
-    }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@ 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;
@@ -35,11 +34,10 @@ 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;
@@ -48,6 +46,7 @@ import me.clip.placeholderapi.expansion.Cacheable;
 import me.clip.placeholderapi.expansion.Cleanable;
 import me.clip.placeholderapi.expansion.Configurable;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion.Type;
 import me.clip.placeholderapi.expansion.Taskable;
 import me.clip.placeholderapi.expansion.VersionSpecific;
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
@@ -70,429 +69,435 @@ import org.jetbrains.annotations.Unmodifiable;
 
 public final class LocalExpansionManager implements Listener {
 
-    @NotNull
+  @NotNull
-    private static final String EXPANSIONS_FOLDER_NAME = "expansions";
+  private static final String EXPANSIONS_FOLDER_NAME = "expansions";
 
-    @NotNull
+  @NotNull
-    private static final Set<MethodSignature> ABSTRACT_EXPANSION_METHODS = Arrays.stream(PlaceholderExpansion.class.getDeclaredMethods())
+  private static final Set<MethodSignature> ABSTRACT_EXPANSION_METHODS = Arrays.stream(PlaceholderExpansion.class.getDeclaredMethods())
-            .filter(method -> Modifier.isAbstract(method.getModifiers()))
+          .filter(method -> Modifier.isAbstract(method.getModifiers()))
-            .map(method -> new MethodSignature(method.getName(), method.getParameterTypes()))
+          .map(method -> new MethodSignature(method.getName(), method.getParameterTypes()))
-            .collect(Collectors.toSet());
+          .collect(Collectors.toSet());
 
-    @NotNull
+  @NotNull
-    private final File folder;
+  private final File folder;
-    @NotNull
+  @NotNull
-    private final PlaceholderAPIPlugin plugin;
+  private final PlaceholderAPIPlugin plugin;
 
-    @NotNull
+  @NotNull
-    private final Map<String, PlaceholderExpansion> expansions = new ConcurrentHashMap<>();
+  private final Map<String, PlaceholderExpansion> expansions = new ConcurrentHashMap<>();
-    private final ReentrantLock expansionsLock = new ReentrantLock();
+  private final ReentrantLock expansionsLock = new ReentrantLock();
 
 
-    public LocalExpansionManager(@NotNull final PlaceholderAPIPlugin plugin) {
+  public LocalExpansionManager(@NotNull final PlaceholderAPIPlugin plugin) {
-        this.plugin = plugin;
+    this.plugin = plugin;
-        this.folder = new File(plugin.getDataFolder(), EXPANSIONS_FOLDER_NAME);
+    this.folder = new File(plugin.getDataFolder(), EXPANSIONS_FOLDER_NAME);
 
-        if (!this.folder.exists() && !folder.mkdirs()) {
+    if (!this.folder.exists() && !folder.mkdirs()) {
-            Msg.warn("Failed to create expansions folder!");
+      Msg.warn("Failed to create expansions folder!");
+    }
+  }
+
+  public void load(@NotNull final CommandSender sender) {
+    registerAll(sender);
+  }
+
+  public void kill() {
+    unregisterAll();
+  }
+
+
+  @NotNull
+  public File getExpansionsFolder() {
+    return folder;
+  }
+
+  @NotNull
+  @Unmodifiable
+  public Collection<String> getIdentifiers() {
+    expansionsLock.lock();
+    try {
+      return ImmutableSet.copyOf(expansions.keySet());
+    } finally {
+      expansionsLock.unlock();
+    }
+  }
+
+  @NotNull
+  @Unmodifiable
+  public Collection<PlaceholderExpansion> getExpansions() {
+    expansionsLock.lock();
+    try {
+      return ImmutableSet.copyOf(expansions.values());
+    } finally {
+      expansionsLock.unlock();
+    }
+  }
+
+  @Nullable
+  public PlaceholderExpansion getExpansion(@NotNull final String identifier) {
+    expansionsLock.lock();
+    try {
+      return expansions.get(identifier.toLowerCase(Locale.ROOT));
+    } finally {
+      expansionsLock.unlock();
+    }
+  }
+
+  @NotNull
+  public Optional<PlaceholderExpansion> findExpansionByName(@NotNull final String name) {
+    expansionsLock.lock();
+    try {
+      PlaceholderExpansion bestMatch = null;
+      for (Map.Entry<String, PlaceholderExpansion> entry : expansions.entrySet()) {
+        PlaceholderExpansion expansion = entry.getValue();
+        if (expansion.getName().equalsIgnoreCase(name)) {
+          bestMatch = expansion;
+          break;
         }
+      }
+      return Optional.ofNullable(bestMatch);
+    } finally {
+      expansionsLock.unlock();
     }
+  }
 
-    public void load(@NotNull final CommandSender sender) {
+  @NotNull
-        registerAll(sender);
+  public Optional<PlaceholderExpansion> findExpansionByIdentifier(
-    }
+      @NotNull final String identifier) {
-
+    return Optional.ofNullable(getExpansion(identifier));
-    public void kill() {
+  }
-        unregisterAll();
-    }
 
 
-    @NotNull
+  public Optional<PlaceholderExpansion> register(
-    public File getExpansionsFolder() {
+      @NotNull final Class<? extends PlaceholderExpansion> clazz) {
-        return folder;
+    try {
-    }
+      final PlaceholderExpansion expansion = createExpansionInstance(clazz);
-
-    @NotNull
-    @Unmodifiable
-    public Collection<String> getIdentifiers() {
-        expansionsLock.lock();
-        try {
-            return ImmutableSet.copyOf(expansions.keySet());
-        } finally {
-            expansionsLock.unlock();
-        }
-    }
-
-    @NotNull
-    @Unmodifiable
-    public Collection<PlaceholderExpansion> getExpansions() {
-        expansionsLock.lock();
-        try {
-            return ImmutableSet.copyOf(expansions.values());
-        } finally {
-            expansionsLock.unlock();
-        }
-    }
-
-    @Nullable
-    public PlaceholderExpansion getExpansion(@NotNull final String identifier) {
-        expansionsLock.lock();
-        try {
-            return expansions.get(identifier.toLowerCase(Locale.ROOT));
-        } finally {
-            expansionsLock.unlock();
-        }
-    }
-
-    @NotNull
-    public Optional<PlaceholderExpansion> findExpansionByName(@NotNull final String name) {
-        expansionsLock.lock();
-        try {
-            PlaceholderExpansion bestMatch = null;
-            for (Map.Entry<String, PlaceholderExpansion> entry : expansions.entrySet()) {
-                PlaceholderExpansion expansion = entry.getValue();
-                if (expansion.getName().equalsIgnoreCase(name)) {
-                    bestMatch = expansion;
-                    break;
-                }
-            }
-            return Optional.ofNullable(bestMatch);
-        } finally {
-            expansionsLock.unlock();
-        }
-    }
-
-    @NotNull
-    public Optional<PlaceholderExpansion> findExpansionByIdentifier(
-            @NotNull final String identifier) {
-        return Optional.ofNullable(getExpansion(identifier));
-    }
-
-
-    public Optional<PlaceholderExpansion> register(
-            @NotNull final Class<? extends PlaceholderExpansion> clazz) {
-        try {
-            final PlaceholderExpansion expansion = createExpansionInstance(clazz);
-
-            if (expansion == null) {
-                return Optional.empty();
-            }
-
-            Objects.requireNonNull(expansion.getAuthor(), "The expansion author is null!");
-            Objects.requireNonNull(expansion.getIdentifier(), "The expansion identifier is null!");
-            Objects.requireNonNull(expansion.getVersion(), "The expansion version is null!");
-
-            if (expansion.getRequiredPlugin() != null && !expansion.getRequiredPlugin().isEmpty()) {
-                if (!Bukkit.getPluginManager().isPluginEnabled(expansion.getRequiredPlugin())) {
-                    Msg.warn("Cannot load expansion %s due to a missing plugin: %s", expansion.getIdentifier(),
-                            expansion.getRequiredPlugin());
-                    return Optional.empty();
-                }
-            }
-
-            expansion.setExpansionType(PlaceholderExpansion.Type.EXTERNAL);
-
-            if (!expansion.register()) {
-                Msg.warn("Cannot load expansion %s due to an unknown issue.", expansion.getIdentifier());
-                return Optional.empty();
-            }
-
-            return Optional.of(expansion);
-        } catch (LinkageError | NullPointerException ex) {
-            final String reason;
-
-            if (ex instanceof LinkageError) {
-                reason = " (Is a dependency missing?)";
-            } else {
-                reason = " - One of its properties is null which is not allowed!";
-            }
-
-            Msg.severe("Failed to load expansion class %s%s", ex, clazz.getSimpleName(), reason);
-        }
       
+      if(expansion == null){
         return Optional.empty();
+      }
+      
+      Objects.requireNonNull(expansion.getAuthor(), "The expansion author is null!");
+      Objects.requireNonNull(expansion.getIdentifier(), "The expansion identifier is null!");
+      Objects.requireNonNull(expansion.getVersion(), "The expansion version is null!");
+      
+      if (expansion.getRequiredPlugin() != null && !expansion.getRequiredPlugin().isEmpty()) {
+        if (!Bukkit.getPluginManager().isPluginEnabled(expansion.getRequiredPlugin())) {
+          Msg.warn("Cannot load expansion %s due to a missing plugin: %s", expansion.getIdentifier(),
+              expansion.getRequiredPlugin());
+          return Optional.empty();
+        }
+      }
+
+      expansion.setExpansionType(PlaceholderExpansion.Type.EXTERNAL);
+      
+      if (!expansion.register()) {
+        Msg.warn("Cannot load expansion %s due to an unknown issue.", expansion.getIdentifier());
+        return Optional.empty();
+      }
+
+      return Optional.of(expansion);
+    } catch (LinkageError | NullPointerException ex) {
+      final String reason;
+
+      if (ex instanceof LinkageError) {
+        reason = " (Is a dependency missing?)";
+      } else {
+        reason = " - One of its properties is null which is not allowed!";
+      }
+      
+      Msg.severe("Failed to load expansion class %s%s", ex, clazz.getSimpleName(), reason);
     }
 
-    /**
+    return Optional.empty();
-     * Attempt to register a {@link PlaceholderExpansion}
+  }
-     *
-     * @param expansion the expansion to register
-     * @return if the expansion was registered
-     */
-    @ApiStatus.Internal
-    public boolean register(@NotNull final PlaceholderExpansion expansion) {
-        final String identifier = expansion.getIdentifier().toLowerCase(Locale.ROOT);
 
-        if (!expansion.canRegister()) {
+  /**
-            return false;
+   * Attempt to register a {@link PlaceholderExpansion}
-        }
+   * @param expansion the expansion to register
+   * @return if the expansion was registered
+   */
+  @ApiStatus.Internal
+  public boolean register(@NotNull final PlaceholderExpansion expansion) {
+    final String identifier = expansion.getIdentifier().toLowerCase(Locale.ROOT);
 
-        // Avoid loading two external expansions with the same identifier
+    if (!expansion.canRegister()) {
-        if (expansion.getExpansionType() == PlaceholderExpansion.Type.EXTERNAL && expansions.containsKey(identifier)) {
+      return false;
-            Msg.warn("Failed to load external expansion %s. Identifier is already in use.", expansion.getIdentifier());
-            return false;
-        }
-
-        if (expansion instanceof Configurable) {
-            Map<String, Object> defaults = ((Configurable) expansion).getDefaults();
-            String pre = "expansions." + identifier + ".";
-            FileConfiguration cfg = plugin.getConfig();
-            boolean save = false;
-
-            if (defaults != null) {
-                for (Map.Entry<String, Object> entries : defaults.entrySet()) {
-                    if (entries.getKey() == null || entries.getKey().isEmpty()) {
-                        continue;
-                    }
-
-                    if (entries.getValue() == null) {
-                        if (cfg.contains(pre + entries.getKey())) {
-                            save = true;
-                            cfg.set(pre + entries.getKey(), null);
-                        }
-                    } else {
-                        if (!cfg.contains(pre + entries.getKey())) {
-                            save = true;
-                            cfg.set(pre + entries.getKey(), entries.getValue());
-                        }
-                    }
-                }
-            }
-
-            if (save) {
-                plugin.saveConfig();
-                plugin.reloadConfig();
-            }
-        }
-
-        if (expansion instanceof VersionSpecific) {
-            VersionSpecific nms = (VersionSpecific) expansion;
-            if (!nms.isCompatibleWith(PlaceholderAPIPlugin.getServerVersion())) {
-                Msg.warn("Your server version is incompatible with expansion %s %s",
-                        expansion.getIdentifier(), expansion.getVersion());
-                return false;
-            }
-        }
-
-        final PlaceholderExpansion removed = getExpansion(identifier);
-        if (removed != null && !removed.unregister()) {
-            return false;
-        }
-
-        final ExpansionRegisterEvent event = new ExpansionRegisterEvent(expansion);
-        Bukkit.getPluginManager().callEvent(event);
-
-        if (event.isCancelled()) {
-            return false;
-        }
-
-        expansionsLock.lock();
-        try {
-            expansions.put(identifier, expansion);
-        } finally {
-            expansionsLock.unlock();
-        }
-
-        if (expansion instanceof Listener) {
-            Bukkit.getPluginManager().registerEvents(((Listener) expansion), plugin);
-        }
-
-        Msg.info(
-                "Successfully registered %s expansion: %s [%s]",
-                expansion.getExpansionType().name().toLowerCase(),
-                expansion.getIdentifier(),
-                expansion.getVersion()
-        );
-
-        if (expansion instanceof Taskable) {
-            ((Taskable) expansion).start();
-        }
-
-        // Check eCloud for updates only if the expansion is external
-        if (plugin.getPlaceholderAPIConfig().isCloudEnabled() && expansion.getExpansionType() == PlaceholderExpansion.Type.EXTERNAL) {
-            final Optional<CloudExpansion> cloudExpansionOptional = plugin.getCloudExpansionManager().findCloudExpansionByName(identifier);
-            if (cloudExpansionOptional.isPresent()) {
-                CloudExpansion cloudExpansion = cloudExpansionOptional.get();
-                cloudExpansion.setHasExpansion(true);
-                cloudExpansion.setShouldUpdate(!cloudExpansion.getLatestVersion().equals(expansion.getVersion()));
-            }
-        }
-
-        return true;
     }
 
-    @ApiStatus.Internal
+    // Avoid loading two external expansions with the same identifier
-    public boolean unregister(@NotNull final PlaceholderExpansion expansion) {
+    if (expansion.getExpansionType() == PlaceholderExpansion.Type.EXTERNAL && expansions.containsKey(identifier)) {
-        if (expansions.remove(expansion.getIdentifier().toLowerCase(Locale.ROOT)) == null) {
+      Msg.warn("Failed to load external expansion %s. Identifier is already in use.", expansion.getIdentifier());
-            return false;
+      return false;
-        }
-
-        Bukkit.getPluginManager().callEvent(new ExpansionUnregisterEvent(expansion));
-
-        if (expansion instanceof Listener) {
-            HandlerList.unregisterAll((Listener) expansion);
-        }
-
-        if (expansion instanceof Taskable) {
-            ((Taskable) expansion).stop();
-        }
-
-        if (expansion instanceof Cacheable) {
-            ((Cacheable) expansion).clear();
-        }
-
-        if (plugin.getPlaceholderAPIConfig().isCloudEnabled()) {
-            plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName())
-                    .ifPresent(cloud -> {
-                        cloud.setHasExpansion(false);
-                        cloud.setShouldUpdate(false);
-                    });
-        }
-
-        return true;
     }
 
-    private void registerAll(@NotNull final CommandSender sender) {
+    if (expansion instanceof Configurable) {
-        Msg.info("Placeholder expansion registration initializing...");
+      Map<String, Object> defaults = ((Configurable) expansion).getDefaults();
+      String pre = "expansions." + identifier + ".";
+      FileConfiguration cfg = plugin.getConfig();
+      boolean save = false;
 
-        Futures.onMainThread(plugin, findExpansionsOnDisk(), (classes, exception) -> {
+      if (defaults != null) {
-            if (exception != null) {
+        for (Map.Entry<String, Object> entries : defaults.entrySet()) {
-                Msg.severe("Failed to load class files of expansion.", exception);
+          if (entries.getKey() == null || entries.getKey().isEmpty()) {
-                return;
+            continue;
+          }
+
+          if (entries.getValue() == null) {
+            if (cfg.contains(pre + entries.getKey())) {
+              save = true;
+              cfg.set(pre + entries.getKey(), null);
             }
-
+          } else {
-            final List<PlaceholderExpansion> registered = classes.stream()
+            if (!cfg.contains(pre + entries.getKey())) {
-                    .filter(Objects::nonNull)
+              save = true;
-                    .map(this::register)
+              cfg.set(pre + entries.getKey(), entries.getValue());
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .collect(Collectors.toList());
-
-            final long needsUpdate = registered.stream()
-                    .map(expansion -> plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName()).orElse(null))
-                    .filter(Objects::nonNull)
-                    .filter(CloudExpansion::shouldUpdate)
-                    .count();
-
-            StringBuilder message = new StringBuilder(registered.size() == 0 ? "&6" : "&a")
-                    .append(registered.size())
-                    .append(' ')
-                    .append("placeholder hook(s) registered!");
-
-            if (needsUpdate > 0) {
-                message.append(' ')
-                        .append("&6")
-                        .append(needsUpdate)
-                        .append(' ')
-                        .append("placeholder hook(s) have an update available.");
             }
-
+          }
-
-            Msg.msg(sender, message.toString());
-
-            Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent(registered));
-        });
-    }
-
-    private void unregisterAll() {
-        for (final PlaceholderExpansion expansion : Sets.newHashSet(expansions.values())) {
-            if (expansion.persist()) {
-                continue;
-            }
-
-            expansion.unregister();
         }
+      }
+
+      if (save) {
+        plugin.saveConfig();
+        plugin.reloadConfig();
+      }
     }
 
-    @NotNull
+    if (expansion instanceof VersionSpecific) {
-    public CompletableFuture<@NotNull List<@Nullable Class<? extends PlaceholderExpansion>>> findExpansionsOnDisk() {
+      VersionSpecific nms = (VersionSpecific) expansion;
-        File[] files = folder.listFiles((dir, name) -> name.endsWith(".jar"));
+      Msg.warn("Nag Author(s) %s of expansion %s about their usage of the deprecated " 
-        if (files == null) {
+          + "VersionSpecific interface!", expansion.getAuthor(), expansion.getIdentifier());
-            return CompletableFuture.completedFuture(Collections.emptyList());
+      Msg.warn("They should switch to a new method of determining the Server version.");
+      if (!nms.isCompatibleWith(PlaceholderAPIPlugin.getServerVersion())) {
+        Msg.warn("Your server version is incompatible with expansion %s %s",
+            expansion.getIdentifier(), expansion.getVersion());
+        return false;
+      }
+    }
+
+    final PlaceholderExpansion removed = getExpansion(identifier);
+    if (removed != null && !removed.unregister()) {
+      return false;
+    }
+
+    final ExpansionRegisterEvent event = new ExpansionRegisterEvent(expansion);
+    Bukkit.getPluginManager().callEvent(event);
+
+    if (event.isCancelled()) {
+      return false;
+    }
+
+    expansionsLock.lock();
+    try {
+      expansions.put(identifier, expansion);
+    } finally {
+      expansionsLock.unlock();
+    }
+
+    if (expansion instanceof Listener) {
+      Bukkit.getPluginManager().registerEvents(((Listener) expansion), plugin);
+    }
+    
+    Msg.info(
+            "Successfully registered %s expansion: %s [%s]",
+            expansion.getExpansionType().name().toLowerCase(),
+            expansion.getIdentifier(),
+            expansion.getVersion()
+    );
+
+    if (expansion instanceof Taskable) {
+      ((Taskable) expansion).start();
+    }
+
+    // Check eCloud for updates only if the expansion is external
+    if (plugin.getPlaceholderAPIConfig().isCloudEnabled() && expansion.getExpansionType() == PlaceholderExpansion.Type.EXTERNAL) {
+      final Optional<CloudExpansion> cloudExpansionOptional = plugin.getCloudExpansionManager().findCloudExpansionByName(identifier);
+      if (cloudExpansionOptional.isPresent()) {
+        CloudExpansion cloudExpansion = cloudExpansionOptional.get();
+        cloudExpansion.setHasExpansion(true);
+        cloudExpansion.setShouldUpdate(!cloudExpansion.getLatestVersion().equals(expansion.getVersion()));
+      }
+    }
+
+    return true;
+  }
+
+  @ApiStatus.Internal
+  public boolean unregister(@NotNull final PlaceholderExpansion expansion) {
+    if (expansion.getExpansionType() == Type.INTERNAL || expansion.persist()) {
+      if (expansion.getExpansionType() == Type.EXTERNAL && expansion.persist()) {
+        Msg.warn("Nag Author(s) %s about their external expansion %s having persist set to true",
+            expansion.getAuthor(), expansion.getIdentifier());
+      }
+
+      return true;
+    }
+
+    if (expansions.remove(expansion.getIdentifier().toLowerCase(Locale.ROOT)) == null) {
+      return false;
+    }
+
+    Bukkit.getPluginManager().callEvent(new ExpansionUnregisterEvent(expansion));
+
+    if (expansion instanceof Listener) {
+      HandlerList.unregisterAll((Listener) expansion);
+    }
+
+    if (expansion instanceof Taskable) {
+      ((Taskable) expansion).stop();
+    }
+
+    if (expansion instanceof Cacheable) {
+      ((Cacheable) expansion).clear();
+    }
+
+    if (plugin.getPlaceholderAPIConfig().isCloudEnabled()) {
+      plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName())
+          .ifPresent(cloud -> {
+            cloud.setHasExpansion(false);
+            cloud.setShouldUpdate(false);
+          });
+    }
+
+    return true;
+  }
+
+  private void registerAll(@NotNull final CommandSender sender) {
+    Msg.info("Placeholder expansion registration initializing...");
+
+    Futures.onMainThread(plugin, findExpansionsOnDisk(), (classes, exception) -> {
+      if (exception != null) {
+        Msg.severe("Failed to load class files of expansion.", exception);
+        return;
+      }
+      
+      final List<PlaceholderExpansion> registered = classes.stream()
+          .filter(Objects::nonNull)
+          .map(this::register)
+          .filter(Optional::isPresent)
+          .map(Optional::get)
+          .collect(Collectors.toList());
+
+      final long needsUpdate = registered.stream()
+          .map(expansion -> plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName()).orElse(null))
+          .filter(Objects::nonNull)
+          .filter(CloudExpansion::shouldUpdate)
+          .count();
+
+      StringBuilder message = new StringBuilder(registered.size() == 0 ? "&6" : "&a")
+          .append(registered.size())
+          .append(' ')
+          .append("placeholder hook(s) registered!");
+      
+      if (needsUpdate > 0) {
+        message.append(' ')
+            .append("&6")
+            .append(needsUpdate)
+            .append(' ')
+            .append("placeholder hook(s) have an update available.");
+      }
+      
+      
+      Msg.msg(sender, message.toString());
+
+      Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent(registered));
+    });
+  }
+
+  private void unregisterAll() {
+    for (final PlaceholderExpansion expansion : Sets.newHashSet(expansions.values())) {
+      expansion.unregister();
+    }
+  }
+
+  @NotNull
+  public CompletableFuture<@NotNull List<@Nullable Class<? extends PlaceholderExpansion>>> findExpansionsOnDisk() {
+    File[] files = folder.listFiles((dir, name) -> name.endsWith(".jar"));
+    if (files == null) {
+      return CompletableFuture.completedFuture(Collections.emptyList());
+    }
+    
+    return Arrays.stream(files)
+        .map(this::findExpansionInFile)
+        .collect(Futures.collector());
+  }
+
+  @NotNull
+  public CompletableFuture<@Nullable Class<? extends PlaceholderExpansion>> findExpansionInFile(
+      @NotNull final File file) {
+    return CompletableFuture.supplyAsync(() -> {
+      try {
+        final Class<? extends PlaceholderExpansion> expansionClass = FileUtil.findClass(file, PlaceholderExpansion.class);
+
+        if (expansionClass == null) {
+          Msg.severe("Failed to load expansion %s, as it does not have a class which"
+              + " extends PlaceholderExpansion", file.getName());
+          return null;
         }
 
-        return Arrays.stream(files)
+        Set<MethodSignature> expansionMethods = Arrays.stream(expansionClass.getDeclaredMethods())
-                .map(this::findExpansionInFile)
+                .map(method -> new MethodSignature(method.getName(), method.getParameterTypes()))
-                .collect(Futures.collector());
+                .collect(Collectors.toSet());
-    }
+        if (!expansionMethods.containsAll(ABSTRACT_EXPANSION_METHODS)) {
-
+          Msg.severe("Failed to load expansion %s, as it does not have the required"
-    @NotNull
+              + " methods declared for a PlaceholderExpansion.", file.getName());
-    public CompletableFuture<@Nullable Class<? extends PlaceholderExpansion>> findExpansionInFile(
+          return null;
-            @NotNull final File file) {
-        return CompletableFuture.supplyAsync(() -> {
-            try {
-                final Class<? extends PlaceholderExpansion> expansionClass = FileUtil.findClass(file, PlaceholderExpansion.class);
-
-                if (expansionClass == null) {
-                    Msg.severe("Failed to load expansion %s, as it does not have a class which"
-                            + " extends PlaceholderExpansion", file.getName());
-                    return null;
-                }
-
-                Set<MethodSignature> expansionMethods = Arrays.stream(expansionClass.getDeclaredMethods())
-                        .map(method -> new MethodSignature(method.getName(), method.getParameterTypes()))
-                        .collect(Collectors.toSet());
-                if (!expansionMethods.containsAll(ABSTRACT_EXPANSION_METHODS)) {
-                    Msg.severe("Failed to load expansion %s, as it does not have the required"
-                            + " methods declared for a PlaceholderExpansion.", file.getName());
-                    return null;
-                }
-
-                return expansionClass;
-            } catch (VerifyError | NoClassDefFoundError e) {
-                Msg.severe("Failed to load expansion %s (is a dependency missing?)", e, file.getName());
-                return null;
-            } catch (Exception e) {
-                plugin.getLogger().log(Level.SEVERE, "Failed to load expansion file: " + file.getAbsolutePath(), e);
-                return null;
-            }
-        });
-    }
-
-
-    @Nullable
-    public PlaceholderExpansion createExpansionInstance(
-            @NotNull final Class<? extends PlaceholderExpansion> clazz) throws LinkageError {
-        try {
-            return clazz.getDeclaredConstructor().newInstance();
-        } catch (final Exception ex) {
-            if (ex.getCause() instanceof LinkageError) {
-                throw ((LinkageError) ex.getCause());
-            }
-
-            Msg.warn("There was an issue with loading an expansion.");
-            return null;
-        }
-    }
-
-
-    @EventHandler
-    public void onQuit(@NotNull final PlayerQuitEvent event) {
-        for (final PlaceholderExpansion expansion : getExpansions()) {
-            if (!(expansion instanceof Cleanable)) {
-                continue;
-            }
-
-            ((Cleanable) expansion).cleanup(event.getPlayer());
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onPluginDisable(@NotNull final PluginDisableEvent event) {
-        final String name = event.getPlugin().getName();
-        if (name.equals(plugin.getName())) {
-            return;
         }
 
-        for (final PlaceholderExpansion expansion : getExpansions()) {
+        return expansionClass;
-            if (!name.equalsIgnoreCase(expansion.getRequiredPlugin())) {
+      } catch (VerifyError | NoClassDefFoundError e) {
-                continue;
+        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);
+      }
+    });
+  }
 
-            expansion.unregister();
+
-            Msg.info("Unregistered placeholder expansion %s", expansion.getIdentifier());
+  @Nullable
-            Msg.info("Reason: required plugin %s was disabled.", name);
+  public PlaceholderExpansion createExpansionInstance(
-        }
+      @NotNull final Class<? extends PlaceholderExpansion> clazz) throws LinkageError {
+    try {
+      return clazz.getDeclaredConstructor().newInstance();
+    } catch (final Exception ex) {
+      if (ex.getCause() instanceof LinkageError) {
+        throw ((LinkageError) ex.getCause());
+      }
+      
+      Msg.warn("There was an issue with loading an expansion.");
+      return null;
     }
+  }
+
+
+  @EventHandler
+  public void onQuit(@NotNull final PlayerQuitEvent event) {
+    for (final PlaceholderExpansion expansion : getExpansions()) {
+      if (!(expansion instanceof Cleanable)) {
+        continue;
+      }
+
+      ((Cleanable) expansion).cleanup(event.getPlayer());
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGH)
+  public void onPluginDisable(@NotNull final PluginDisableEvent event) {
+    final String name = event.getPlugin().getName();
+    if (name.equals(plugin.getName())) {
+      return;
+    }
+
+    for (final PlaceholderExpansion expansion : getExpansions()) {
+      if (!name.equalsIgnoreCase(expansion.getRequiredPlugin())) {
+        continue;
+      }
+
+      expansion.unregister();
+      Msg.info("Unregistered placeholder expansion %s", expansion.getIdentifier());
+      Msg.info("Reason: required plugin %s was disabled.", name);
+    }
+  }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/listeners/ServerLoadEventListener.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,19 +30,19 @@ import org.jetbrains.annotations.NotNull;
 
 public final class ServerLoadEventListener implements Listener {
 
-    @NotNull
+  @NotNull
-    private final PlaceholderAPIPlugin plugin;
+  private final PlaceholderAPIPlugin plugin;
 
-    public ServerLoadEventListener(@NotNull final PlaceholderAPIPlugin plugin) {
+  public ServerLoadEventListener(@NotNull final PlaceholderAPIPlugin plugin) {
-        this.plugin = plugin;
+    this.plugin = plugin;
 
-        Bukkit.getPluginManager().registerEvents(this, plugin);
+    Bukkit.getPluginManager().registerEvents(this, plugin);
-    }
+  }
 
-    @EventHandler
+  @EventHandler
-    public void onServerLoad(@NotNull final ServerLoadEvent event) {
+  public void onServerLoad(@NotNull final ServerLoadEvent event) {
-        HandlerList.unregisterAll(this);
+    HandlerList.unregisterAll(this);
-        plugin.getLocalExpansionManager().load(Bukkit.getConsoleSender());
+    plugin.getLocalExpansionManager().load(Bukkit.getConsoleSender());
-    }
+  }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@ 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;
@@ -31,108 +30,108 @@ import org.jetbrains.annotations.Nullable;
 
 public final class CharsReplacer implements Replacer {
 
-    @NotNull
+  @NotNull
-    private final Closure closure;
+  private final Closure closure;
 
-    public CharsReplacer(@NotNull final Closure closure) {
+  public CharsReplacer(@NotNull final Closure closure) {
-        this.closure = closure;
+    this.closure = closure;
-    }
+  }
 
 
-    @NotNull
+  @NotNull
-    @Override
+  @Override
-    public String apply(@NotNull final String text, @Nullable final OfflinePlayer player,
+  public String apply(@NotNull final String text, @Nullable final OfflinePlayer player,
-                        @NotNull final Function<String, @Nullable PlaceholderExpansion> lookup) {
+      @NotNull final Function<String, @Nullable PlaceholderExpansion> lookup) {
-        final char[] chars = text.toCharArray();
+    final char[] chars = text.toCharArray();
-        final StringBuilder builder = new StringBuilder(text.length());
+    final StringBuilder builder = new StringBuilder(text.length());
 
-        final StringBuilder identifier = new StringBuilder();
+    final StringBuilder identifier = new StringBuilder();
-        final StringBuilder parameters = new StringBuilder();
+    final StringBuilder parameters = new StringBuilder();
 
-        for (int i = 0; i < chars.length; i++) {
+    for (int i = 0; i < chars.length; i++) {
-            final char l = chars[i];
+      final char l = chars[i];
 
-            if (l != closure.head || i + 1 >= chars.length) {
+      if (l != closure.head || i + 1 >= chars.length) {
-                builder.append(l);
+        builder.append(l);
-                continue;
+        continue;
-            }
+      }
 
-            boolean identified = false;
+      boolean identified = false;
-            boolean invalid = true;
+      boolean invalid = true;
-            boolean hadSpace = false;
+      boolean hadSpace = false;
 
-            while (++i < chars.length) {
+      while (++i < chars.length) {
-                final char p = chars[i];
+        final char p = chars[i];
 
-                if (p == ' ' && !identified) {
+        if (p == ' ' && !identified) {
-                    hadSpace = true;
+          hadSpace = true;
-                    break;
+          break;
-                }
+        }
-                if (p == closure.tail) {
+        if (p == closure.tail) {
-                    invalid = false;
+          invalid = false;
-                    break;
+          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) {
-                builder.append(closure.head).append(identifierString);
-
-                if (identified) {
-                    builder.append('_').append(parametersString);
-                }
-
-                if (hadSpace) {
-                    builder.append(' ');
-                }
-                continue;
-            }
-
-            final PlaceholderExpansion placeholder = lookup.apply(lowercaseIdentifierString);
-            if (placeholder == null) {
-                builder.append(closure.head).append(identifierString);
-
-                if (identified) {
-                    builder.append('_');
-                }
-
-                builder.append(parametersString).append(closure.tail);
-                continue;
-            }
-
-            final String replacement = placeholder.onRequest(player, parametersString);
-            if (replacement == null) {
-                builder.append(closure.head).append(identifierString);
-
-                if (identified) {
-                    builder.append('_');
-                }
-
-                builder.append(parametersString).append(closure.tail);
-                continue;
-            }
-
-            builder.append(replacement);
         }
 
-        return builder.toString();
+        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) {
+        builder.append(closure.head).append(identifierString);
+
+        if (identified) {
+          builder.append('_').append(parametersString);
+        }
+
+        if (hadSpace) {
+          builder.append(' ');
+        }
+        continue;
+      }
+
+      final PlaceholderExpansion placeholder = lookup.apply(lowercaseIdentifierString);
+      if (placeholder == null) {
+        builder.append(closure.head).append(identifierString);
+
+        if (identified) {
+          builder.append('_');
+        }
+
+        builder.append(parametersString).append(closure.tail);
+        continue;
+      }
+
+      final String replacement = placeholder.onRequest(player, parametersString);
+      if (replacement == null) {
+        builder.append(closure.head).append(identifierString);
+
+        if (identified) {
+          builder.append('_');
+        }
+
+        builder.append(parametersString).append(closure.tail);
+        continue;
+      }
+
+      builder.append(replacement);
     }
 
+    return builder.toString();
+  }
+
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
 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;
@@ -29,22 +28,22 @@ import org.jetbrains.annotations.Nullable;
 
 public interface Replacer {
 
-    @NotNull
+  @NotNull
-    String apply(@NotNull final String text, @Nullable final OfflinePlayer player,
+  String apply(@NotNull final String text, @Nullable final OfflinePlayer player,
-                 @NotNull final Function<String, @Nullable PlaceholderExpansion> lookup);
+      @NotNull final Function<String, @Nullable PlaceholderExpansion> lookup);
 
 
-    enum Closure {
+  enum Closure {
-        BRACKET('{', '}'),
+    BRACKET('{', '}'),
-        PERCENT('%', '%');
+    PERCENT('%', '%');
 
 
-        public final char head, tail;
+    public final char head, tail;
 
-        Closure(final char head, final char tail) {
+    Closure(final char head, final char tail) {
-            this.head = head;
+      this.head = head;
-            this.tail = tail;
+      this.tail = tail;
-        }
     }
+  }
 
 }

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

@@ -1,180 +0,0 @@
-/*
- * 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

@@ -1,42 +0,0 @@
-/*
- * 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

@@ -1,71 +0,0 @@
-/*
- * 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

@@ -1,129 +0,0 @@
-/*
- * 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

@@ -1,57 +0,0 @@
-/*
- * 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

@@ -1,220 +0,0 @@
-/*
- * 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

@@ -1,41 +0,0 @@
-/*
- * 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

@@ -1,346 +0,0 @@
-/*
- * 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 and 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 and 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 and 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 and 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 and 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 and 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 and 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 and 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 and 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 and 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 and 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 and 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(FoliaandPaper) 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

@@ -1,53 +0,0 @@
-/*
- * 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

@@ -1,12 +0,0 @@
-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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,11 +25,7 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import java.util.Arrays;
 import javax.net.ssl.HttpsURLConnection;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
 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;
@@ -38,93 +34,91 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
 public class UpdateChecker implements Listener {
-    private static final String MODRINTH_URL = "https://api.modrinth.com/v2/project/lKEzGugV/version";
 
-    private static final int RESOURCE_ID = 6245;
+  private final int RESOURCE_ID = 6245;
-    private final PlaceholderAPIPlugin plugin;
+  private final PlaceholderAPIPlugin plugin;
-    private final TaskScheduler scheduler;
+  private final String pluginVersion;
-    private final String pluginVersion;
+  private String spigotVersion;
-    private String modrinthVersion;
+  private boolean updateAvailable;
-    private boolean updateAvailable;
 
-    public UpdateChecker(PlaceholderAPIPlugin plugin) {
+  public UpdateChecker(PlaceholderAPIPlugin i) {
-        this.plugin = plugin;
+    plugin = i;
-        scheduler = plugin.getScheduler();
+    pluginVersion = i.getDescription().getVersion();
-        pluginVersion = plugin.getDescription().getVersion();
+  }
+
+  public boolean hasUpdateAvailable() {
+    return updateAvailable;
+  }
+
+  public String getSpigotVersion() {
+    return spigotVersion;
+  }
+
+  public void fetch() {
+    Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+      try {
+        HttpsURLConnection con = (HttpsURLConnection) new URL(
+            "https://api.spigotmc.org/legacy/update.php?resource=" + RESOURCE_ID).openConnection();
+        con.setRequestMethod("GET");
+        spigotVersion = new BufferedReader(new InputStreamReader(con.getInputStream())).readLine();
+      } catch (Exception ex) {
+        plugin.getLogger().info("Failed to check for updates on spigot.");
+        return;
+      }
+
+      if (spigotVersion == null || spigotVersion.isEmpty()) {
+        return;
+      }
+
+      updateAvailable = spigotIsNewer();
+
+      if (!updateAvailable) {
+        return;
+      }
+
+      Bukkit.getScheduler().runTask(plugin, () -> {
+        plugin.getLogger()
+            .info("An update for PlaceholderAPI (v" + getSpigotVersion() + ") is available at:");
+        plugin.getLogger()
+            .info("https://www.spigotmc.org/resources/placeholderapi." + RESOURCE_ID + "/");
+        Bukkit.getPluginManager().registerEvents(this, plugin);
+      });
+    });
+  }
+
+  private boolean spigotIsNewer() {
+    if (spigotVersion == null || spigotVersion.isEmpty()) {
+      return false;
     }
 
-    public boolean hasUpdateAvailable() {
+    int[] plV = toReadable(pluginVersion);
-        return updateAvailable;
+    int[] spV = toReadable(spigotVersion);
+
+    if (plV[0] < spV[0]) {
+      return true;
+    } else if ((plV[1] < spV[1])) {
+      return true;
+    } else {
+      return plV[2] < spV[2];
+    }
+  }
+
+  private int[] toReadable(String version) {
+    if (version.contains("-DEV")) {
+      version = version.split("-DEV")[0];
     }
 
-    public String getModrinthVersion() {
+    return Arrays.stream(version.split("\\.")).mapToInt(Integer::parseInt).toArray();
-        return modrinthVersion;
+  }
-    }
+
-
+  @EventHandler(priority = EventPriority.MONITOR)
-    public void fetch() {
+  public void onJoin(PlayerJoinEvent e) {
-        scheduler.runTaskAsynchronously(() -> {
+    if (e.getPlayer().hasPermission("placeholderapi.updatenotify")) {
-            try {
+      Msg.msg(e.getPlayer(),
-                HttpsURLConnection con = (HttpsURLConnection) new URL(MODRINTH_URL).openConnection();
+          "&bAn update for &fPlaceholder&7API &e(&fPlaceholder&7API &fv" + getSpigotVersion()
-                con.setRequestMethod("GET");
+              + "&e)"
-                final JsonElement json = JsonParser.parseReader(new BufferedReader(new InputStreamReader(con.getInputStream())));
+          , "&bis available at &ehttps://www.spigotmc.org/resources/placeholderapi." + RESOURCE_ID
-                modrinthVersion = json.getAsJsonArray().get(0).getAsJsonObject().get("version_number").getAsString();
+              + "/");
-            } catch (Exception ex) {
-                plugin.getLogger().info("Failed to check for updates on modrinth.");
-                return;
-            }
-
-            if (modrinthVersion == null || modrinthVersion.isEmpty()) {
-                return;
-            }
-
-            updateAvailable = modrinthIsNewer();
-
-            if (!updateAvailable) {
-                return;
-            }
-
-            scheduler.runTask(() -> {
-                plugin.getLogger()
-                        .info("An update for PlaceholderAPI (v" + getModrinthVersion() + ") is available at:");
-                plugin.getLogger()
-                        .info("https://modrinth.com/plugin/placeholderapi");
-                Bukkit.getPluginManager().registerEvents(this, plugin);
-            });
-        });
-    }
-
-    private boolean modrinthIsNewer() {
-        if (modrinthVersion == null || modrinthVersion.isEmpty()) {
-            return false;
-        }
-
-        int[] plV = toReadable(pluginVersion);
-        int[] spV = toReadable(modrinthVersion);
-
-        if (plV[0] < spV[0]) {
-            return true;
-        } else if ((plV[1] < spV[1])) {
-            return true;
-        } else {
-            return plV[2] < spV[2];
-        }
-    }
-
-    private int[] toReadable(String version) {
-        if (version.contains("-DEV")) {
-            version = version.split("-DEV")[0];
-        }
-
-        return Arrays.stream(version.split("\\.")).mapToInt(Integer::parseInt).toArray();
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onJoin(PlayerJoinEvent e) {
-        if (e.getPlayer().hasPermission("placeholderapi.updatenotify")) {
-            Msg.msg(e.getPlayer(),
-                    "&bAn update for &fPlaceholder&7API &e(&fPlaceholder&7API &fv" + getModrinthVersion()
-                            + "&e)"
-                    , "&bis available at &ehttps://modrinth.com/plugin/placeholderapi");
-        }
     }
+  }
 }

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

@@ -1,80 +0,0 @@
-package me.clip.placeholderapi.util;
-
-import com.google.common.hash.Hashing;
-import com.google.common.io.Files;
-import com.google.common.io.Resources;
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-
-public final class ExpansionSafetyCheck {
-    private static final String MESSAGE =
-            "\n###############################################\n" +
-                    "###############################################\n" +
-                    "PlaceholderAPI performs checks at startup and /papi reload for known malicious expansions. If you're seeing this message, there are the following malicious expansions in plugins/PlaceholderAPI/expansions.\n" +
-                    "%s" +
-                    "To prevent further infection PlaceholderAPI has stopped the server.\n" +
-                    "If you're seeing this message after updating PAPI, your server may have been infected for some time, so best practice is a complete system wipe and reinstall of your server software and plugins to be safe.\n" +
-                    "If you're seeing this after downloading an expansion however, PAPI hasn't loaded any of the malicious expansions above so you should be safe to simply delete the expansion in question.\n" +
-                    "###############################################\n" +
-                    "###############################################";
-
-    private final PlaceholderAPIPlugin main;
-
-    public ExpansionSafetyCheck(@NotNull final PlaceholderAPIPlugin main) {
-        this.main = main;
-    }
-
-    public boolean runChecks() {
-        if (!main.getPlaceholderAPIConfig().detectMaliciousExpansions()) {
-            return false;
-        }
-
-        final File expansionsFolder = new File(main.getDataFolder(), "expansions");
-
-        if (!expansionsFolder.exists()) {
-            return false;
-        }
-
-        final Set<String> knownMaliciousExpansions;
-
-        try {
-            final String hashes = Resources.toString(new URL("https://check.placeholderapi.com"), StandardCharsets.UTF_8);
-            knownMaliciousExpansions = Arrays.stream(hashes.split("\n")).collect(Collectors.toSet());
-        } catch (Exception e) {
-            main.getLogger().log(Level.SEVERE, "Failed to download anti malware hash check list from https://check.placeholderapi.com", e);
-            return false;
-        }
-
-        final Set<String> maliciousPaths = new HashSet<>();
-
-        for (File file : expansionsFolder.listFiles()) {
-            try {
-                final String hash = Hashing.sha256().hashBytes(Files.asByteSource(file).read()).toString();
-
-                if (knownMaliciousExpansions.contains(hash)) {
-                    maliciousPaths.add(file.getAbsolutePath());
-                }
-            } catch (Exception e) {
-                main.getLogger().log(Level.SEVERE, "Error occurred while trying to read " + file.getAbsolutePath(), e);
-            }
-        }
-
-        if (maliciousPaths.isEmpty()) {
-            return false;
-        }
-
-        main.getLogger().severe(String.format(MESSAGE, maliciousPaths.stream().map(p -> "HASH OF " + p + " MATCHES KNOWN MALICIOUS EXPANSION DELETE IMMEDIATELY\n").collect(Collectors.joining())));
-
-        main.getServer().shutdown();
-        return true;
-    }
-}

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,44 +34,44 @@ import java.util.jar.JarInputStream;
 
 public class FileUtil {
 
-    @Nullable
+  @Nullable
-    public static <T> Class<? extends T> findClass(@NotNull final File file,
+  public static <T> Class<? extends T> findClass(@NotNull final File file,
-                                                   @NotNull final Class<T> clazz) throws IOException, ClassNotFoundException {
+      @NotNull final Class<T> clazz) throws IOException, ClassNotFoundException {
-        if (!file.exists()) {
+    if (!file.exists()) {
-            return null;
+      return null;
-        }
-
-        final URL jar = file.toURI().toURL();
-        final URLClassLoader loader = new URLClassLoader(new URL[]{jar}, clazz.getClassLoader());
-        final List<String> matches = new ArrayList<>();
-        final List<Class<? extends T>> classes = new ArrayList<>();
-
-        try (final JarInputStream stream = new JarInputStream(jar.openStream())) {
-            JarEntry entry;
-            while ((entry = stream.getNextJarEntry()) != null) {
-                final String name = entry.getName();
-                if (name.isEmpty() || !name.endsWith(".class")) {
-                    continue;
-                }
-
-                matches.add(name.substring(0, name.lastIndexOf('.')).replace('/', '.'));
-            }
-
-            for (final String match : matches) {
-                try {
-                    final Class<?> loaded = loader.loadClass(match);
-                    if (clazz.isAssignableFrom(loaded)) {
-                        classes.add(loaded.asSubclass(clazz));
-                    }
-                } catch (final NoClassDefFoundError ignored) {
-                }
-            }
-        }
-        if (classes.isEmpty()) {
-            loader.close();
-            return null;
-        }
-        return classes.get(0);
     }
 
+    final URL jar = file.toURI().toURL();
+    final URLClassLoader loader = new URLClassLoader(new URL[]{jar}, clazz.getClassLoader());
+    final List<String> matches = new ArrayList<>();
+    final List<Class<? extends T>> classes = new ArrayList<>();
+
+    try (final JarInputStream stream = new JarInputStream(jar.openStream())) {
+      JarEntry entry;
+      while ((entry = stream.getNextJarEntry()) != null) {
+        final String name = entry.getName();
+        if (name.isEmpty() || !name.endsWith(".class")) {
+          continue;
+        }
+
+        matches.add(name.substring(0, name.lastIndexOf('.')).replace('/', '.'));
+      }
+
+      for (final String match : matches) {
+        try {
+          final Class<?> loaded = loader.loadClass(match);
+          if (clazz.isAssignableFrom(loaded)) {
+            classes.add(loaded.asSubclass(clazz));
+          }
+        } catch (final NoClassDefFoundError ignored) {
+        }
+      }
+    }
+    if (classes.isEmpty()) {
+        loader.close();
+        return null;
+    }
+    return classes.get(0);
+  }
+
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,6 @@ import static java.util.stream.IntStream.range;
 
 import java.util.List;
 import java.util.Optional;
-
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -37,35 +36,35 @@ import org.jetbrains.annotations.NotNull;
  */
 public final class Format {
 
-    private Format() {}
+  private Format() {}
 
-    @NotNull
+  @NotNull
-    public static Optional<List<String>> tablify(@NotNull final Align align,
+  public static Optional<List<String>> tablify(@NotNull final Align align,
-                                                 @NotNull final List<List<String>> rows) {
+      @NotNull final List<List<String>> rows) {
-        return findSpacing(rows)
+    return findSpacing(rows)
-                .map(spacing -> buildFormat(align, spacing))
+        .map(spacing -> buildFormat(align, spacing))
-                .map(format -> rows.stream()
+        .map(format -> rows.stream()
-                        .map(
+            .map(
-                                row -> String.format(format, row.toArray()).substring(align == Align.RIGHT ? 2 : 0))
+                row -> String.format(format, row.toArray()).substring(align == Align.RIGHT ? 2 : 0))
-                        .collect(toList()));
+            .collect(toList()));
-    }
+  }
 
-    @NotNull
+  @NotNull
-    private static String buildFormat(@NotNull final Align align, final int[] spacing) {
+  private static String buildFormat(@NotNull final Align align, final int[] spacing) {
-        return stream(spacing)
+    return stream(spacing)
-                .mapToObj(space -> "%" + (align == Align.LEFT ? "-" : "") + (space + 2) + "s")
+        .mapToObj(space -> "%" + (align == Align.LEFT ? "-" : "") + (space + 2) + "s")
-                .collect(joining());
+        .collect(joining());
-    }
+  }
 
-    @NotNull
+  @NotNull
-    private static Optional<int[]> findSpacing(@NotNull final List<List<String>> rows) {
+  private static Optional<int[]> findSpacing(@NotNull final List<List<String>> rows) {
-        return rows.stream()
+    return rows.stream()
-                .map(row -> row.stream().mapToInt(String::length).toArray())
+        .map(row -> row.stream().mapToInt(String::length).toArray())
-                .reduce((l, r) -> range(0, min(l.length, r.length)).map(i -> max(l[i], r[i])).toArray());
+        .reduce((l, r) -> range(0, min(l.length, r.length)).map(i -> max(l[i], r[i])).toArray());
-    }
+  }
 
-    public enum Align {
+  public enum Align {
-        LEFT, RIGHT
+    LEFT, RIGHT
-    }
+  }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,53 +27,51 @@ 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;
 
 public final class Futures {
 
-    private Futures() {}
+  private Futures() {}
 
 
-    public static <T> void onMainThread(@NotNull final PlaceholderAPIPlugin plugin,
+  public static <T> void onMainThread(@NotNull final Plugin plugin,
-                                        @NotNull final CompletableFuture<T> future,
+      @NotNull final CompletableFuture<T> future,
-                                        @NotNull final BiConsumer<T, Throwable> consumer) {
+      @NotNull final BiConsumer<T, Throwable> consumer) {
-        future.whenComplete((value, exception) -> {
+    future.whenComplete((value, exception) -> {
-            if (Bukkit.isPrimaryThread()) {
+      if (Bukkit.isPrimaryThread()) {
-                consumer.accept(value, exception);
+        consumer.accept(value, exception);
-            } else {
+      } else {
-                plugin.getScheduler().runTask(() -> consumer.accept(value, exception));
+        Bukkit.getScheduler().runTask(plugin, () -> consumer.accept(value, exception));
-            }
+      }
-        });
+    });
-    }
+  }
 
 
-    @NotNull
+  @NotNull
-    public static <T> Collector<CompletableFuture<T>, ?, CompletableFuture<List<T>>> collector() {
+  public static <T> Collector<CompletableFuture<T>, ?, CompletableFuture<List<T>>> collector() {
-        return Collectors.collectingAndThen(Collectors.toList(), Futures::of);
+    return Collectors.collectingAndThen(Collectors.toList(), Futures::of);
-    }
+  }
 
 
-    @NotNull
+  @NotNull
-    public static <T> CompletableFuture<List<T>> of(
+  public static <T> CompletableFuture<List<T>> of(
-            @NotNull final Stream<CompletableFuture<T>> futures) {
+      @NotNull final Stream<CompletableFuture<T>> futures) {
-        return of(futures.collect(Collectors.toList()));
+    return of(futures.collect(Collectors.toList()));
-    }
+  }
 
-    @NotNull
+  @NotNull
-    public static <T> CompletableFuture<List<T>> of(
+  public static <T> CompletableFuture<List<T>> of(
-            @NotNull final Collection<CompletableFuture<T>> futures) {
+      @NotNull final Collection<CompletableFuture<T>> futures) {
-        return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
+    return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
-                .thenApplyAsync($ -> awaitCompletion(futures));
+        .thenApplyAsync($ -> awaitCompletion(futures));
-    }
+  }
 
-    @NotNull
+  @NotNull
-    private static <T> List<T> awaitCompletion(
+  private static <T> List<T> awaitCompletion(
-            @NotNull final Collection<CompletableFuture<T>> futures) {
+      @NotNull final Collection<CompletableFuture<T>> futures) {
-        return futures.stream().map(CompletableFuture::join).collect(Collectors.toList());
+    return futures.stream().map(CompletableFuture::join).collect(Collectors.toList());
-    }
+  }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@ 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;
@@ -32,49 +31,49 @@ import org.jetbrains.annotations.NotNull;
 
 public final class Msg {
   
-    public static void log(Level level, String msg, Object... args) {
+  public static void log(Level level, String msg, Object... args) {
-        PlaceholderAPIPlugin.getInstance().getLogger().log(level, String.format(msg, args));
+    PlaceholderAPIPlugin.getInstance().getLogger().log(level, String.format(msg, args));
+  }
+  
+  public static void info(String msg, Object... args) {
+    log(Level.INFO, msg, args);
+  }
+  
+  public static void warn(String msg, Object... args) {
+    log(Level.WARNING, msg, args);
+  }
+  
+  public static void warn(String msg, Throwable throwable, Object... args){
+    PlaceholderAPIPlugin.getInstance().getLogger().log(Level.WARNING, String.format(msg, args), throwable);
+  }
+  
+  public static void severe(String msg, Object... args) {
+    log(Level.SEVERE, msg, args);
+  }
+  
+  public static void severe(String msg, Throwable throwable, Object... args) {
+    PlaceholderAPIPlugin.getInstance().getLogger().log(Level.SEVERE, String.format(msg, args), throwable);
+  }
+  
+  public static void msg(@NotNull final CommandSender sender, @NotNull final String... messages) {
+    if (messages.length == 0) {
+      return;
     }
 
-    public static void info(String msg, Object... args) {
+    sender.sendMessage(Arrays.stream(messages).map(Msg::color).collect(Collectors.joining("\n")));
-        log(Level.INFO, msg, args);
+  }
+
+  public static void broadcast(@NotNull final String... messages) {
+    if (messages.length == 0) {
+      return;
     }
 
-    public static void warn(String msg, Object... args) {
+    Bukkit.broadcastMessage(
-        log(Level.WARNING, msg, args);
+        Arrays.stream(messages).map(Msg::color).collect(Collectors.joining("\n")));
-    }
+  }
 
-    public static void warn(String msg, Throwable throwable, Object... args) {
+  public static String color(@NotNull final String text) {
-        PlaceholderAPIPlugin.getInstance().getLogger().log(Level.WARNING, String.format(msg, args), throwable);
+    return ChatColor.translateAlternateColorCodes('&', text);
-    }
+  }
-
-    public static void severe(String msg, Object... args) {
-        log(Level.SEVERE, msg, args);
-    }
-
-    public static void severe(String msg, Throwable throwable, Object... args) {
-        PlaceholderAPIPlugin.getInstance().getLogger().log(Level.SEVERE, String.format(msg, args), throwable);
-    }
-
-    public static void msg(@NotNull final CommandSender sender, @NotNull final String... messages) {
-        if (messages.length == 0) {
-            return;
-        }
-
-        sender.sendMessage(Arrays.stream(messages).map(Msg::color).collect(Collectors.joining("\n")));
-    }
-
-    public static void broadcast(@NotNull final String... messages) {
-        if (messages.length == 0) {
-            return;
-        }
-
-        Bukkit.broadcastMessage(
-                Arrays.stream(messages).map(Msg::color).collect(Collectors.joining("\n")));
-    }
-
-    public static String color(@NotNull final String text) {
-        return ChatColor.translateAlternateColorCodes('&', text);
-    }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@
 package me.clip.placeholderapi.util;
 
 public enum TimeFormat {
-    DAYS,
+  DAYS,
-    HOURS,
+  HOURS,
-    MINUTES,
+  MINUTES,
-    SECONDS
+  SECONDS
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,71 +26,71 @@ import java.util.StringJoiner;
 
 public class TimeUtil {
 
-    public static String getRemaining(final int seconds, final TimeFormat type) {
+  public static String getRemaining(final int seconds, final TimeFormat type) {
-        return getRemaining((long) seconds, type);
+    return getRemaining((long) seconds, type);
+  }
+
+  public static String getRemaining(final long seconds, final TimeFormat type) {
+    switch (type) {
+      default:
+        return String.valueOf(seconds);
+
+      case SECONDS:
+        return String.valueOf(seconds % 60);
+
+      case MINUTES:
+        return String.valueOf((seconds / 60) % 60);
+
+      case HOURS:
+        return String.valueOf((seconds / 3600) % 24);
+
+      case DAYS:
+        return String.valueOf(seconds / 86400);
+    }
+  }
+
+  /**
+   * Format the given value with s, m, h and d (seconds, minutes, hours and days)
+   *
+   * @param duration {@link Duration} (eg, Duration.of(20, {@link ChronoUnit#SECONDS}) for 20
+   *                 seconds)
+   * @return formatted time
+   */
+  public static String getTime(final Duration duration) {
+    return getTime(duration.getSeconds());
+  }
+
+  public static String getTime(final int seconds) {
+    return getTime((long) seconds);
+  }
+
+  public static String getTime(long seconds) {
+    final StringJoiner joiner = new StringJoiner(" ");
+
+    long minutes = seconds / 60;
+    long hours = minutes / 60;
+    final long days = hours / 24;
+
+    seconds %= 60;
+    minutes %= 60;
+    hours %= 24;
+
+    if (days > 0) {
+      joiner.add(days + "d");
     }
 
-    public static String getRemaining(final long seconds, final TimeFormat type) {
+    if (hours > 0) {
-        switch (type) {
+      joiner.add(hours + "h");
-            default:
-                return String.valueOf(seconds);
-
-            case SECONDS:
-                return String.valueOf(seconds % 60);
-
-            case MINUTES:
-                return String.valueOf((seconds / 60) % 60);
-
-            case HOURS:
-                return String.valueOf((seconds / 3600) % 24);
-
-            case DAYS:
-                return String.valueOf(seconds / 86400);
-        }
     }
 
-    /**
+    if (minutes > 0) {
-     * Format the given value with s, m, h and d (seconds, minutes, hours and days)
+      joiner.add(minutes + "m");
-     *
-     * @param duration {@link Duration} (eg, Duration.of(20, {@link ChronoUnit#SECONDS}) for 20
-     *                 seconds)
-     * @return formatted time
-     */
-    public static String getTime(final Duration duration) {
-        return getTime(duration.getSeconds());
     }
 
-    public static String getTime(final int seconds) {
+    if (seconds > 0) {
-        return getTime((long) seconds);
+      joiner.add(seconds + "s");
     }
 
-    public static String getTime(long seconds) {
+    return joiner.toString();
-        final StringJoiner joiner = new StringJoiner(" ");
+  }
-
-        long minutes = seconds / 60;
-        long hours = minutes / 60;
-        final long days = hours / 24;
-
-        seconds %= 60;
-        minutes %= 60;
-        hours %= 24;
-
-        if (days > 0) {
-            joiner.add(days + "d");
-        }
-
-        if (hours > 0) {
-            joiner.add(hours + "h");
-        }
-
-        if (minutes > 0) {
-            joiner.add(minutes + "m");
-        }
-
-        if (seconds > 0) {
-            joiner.add(seconds + "s");
-        }
-
-        return joiner.toString();
-    }
 }

src/main/resources/config.yml

@@ -6,8 +6,6 @@
 # Expansions: https://placeholderapi.com/ecloud
 # Wiki: https://wiki.placeholderapi.com/
 # Discord: https://helpch.at/discord
-# If you're seeing performance issues with plugins that use component replacement, or things don't look quite right,
-# switch to the replacer provided by adventure itself by changing use_adventure_provided_replacer to true
 # No placeholders are provided with this plugin by default.
 # Download placeholders: /papi ecloud
 check_updates: true
@@ -17,6 +15,4 @@ boolean:
   'true': 'yes'
   'false': 'no'
 date_format: MM/dd/yy HH:mm:ss
-detect_malicious_expansions: true
-use_adventure_provided_replacer: false
 debug: false

src/main/resources/plugin.yml

@@ -1,6 +1,5 @@
 name: PlaceholderAPI
 main: "me.clip.placeholderapi.PlaceholderAPIPlugin"
-folia-supported: true
 
 version: ${version}
 author: HelpChat

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

@@ -1,184 +0,0 @@
-/*
- * This file is part of PlaceholderAPI
- *
- * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
- *
- * PlaceholderAPI free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * PlaceholderAPI is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package me.clip.placeholderapi;
-
-import me.clip.placeholderapi.replacer.ComponentReplacer;
-import me.clip.placeholderapi.replacer.ExactReplacer;
-import me.clip.placeholderapi.replacer.RelationalExactReplacer;
-import me.clip.placeholderapi.replacer.Replacer;
-import net.kyori.adventure.text.Component;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static me.clip.placeholderapi.PlaceholderAPI.RELATIONAL_PLACEHOLDER_PATTERN;
-
-public final class PAPIComponents {
-    private static final Replacer PERCENT_EXACT_REPLACER = new ExactReplacer('%', '%');
-    private static final Replacer BRACKET_EXACT_REPLACER = new ExactReplacer('{', '}');
-    private static final RelationalExactReplacer RELATIONAL_EXACT_REPLACER = new RelationalExactReplacer();
-
-    /**
-     * Translates all placeholders into their corresponding values.
-     * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
-     *
-     * @param player Player to parse the placeholders against
-     * @param component Component to set the placeholder values in
-     * @return Component containing all translated placeholders
-     */
-    @NotNull
-    public static Component setPlaceholders(final OfflinePlayer player, @NotNull final Component component) {
-        if (PlaceholderAPIPlugin.getInstance().getPlaceholderAPIConfig().useAdventureProvidedReplacer()) {
-            return component.replaceText(config -> config.match(PlaceholderAPI.PLACEHOLDER_PATTERN).replacement((result, builder) ->
-                    builder.content(PERCENT_EXACT_REPLACER.apply(result.group(), player, PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()::getExpansion))));
-        }
-
-        return ComponentReplacer.replace(component, str -> PlaceholderAPI.setPlaceholders(player, str));
-    }
-
-    /**
-     * Translates all placeholders into their corresponding values.
-     * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
-     *
-     * @param player Player to parse the placeholders against
-     * @param components List of Components to set the placeholder values in
-     * @return List of Components containing all translated placeholders
-     */
-    @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());
-    }
-
-    /**
-     * Translates all placeholders into their corresponding values.
-     * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
-     *
-     * @param player Player to parse the placeholders against
-     * @param component Component to set the placeholder values in
-     * @return Component containing all translated placeholders
-     */
-    @NotNull
-    public static Component setPlaceholders(final Player player, @NotNull final Component component) {
-        return setPlaceholders((OfflinePlayer) player, component);
-    }
-
-    /**
-     * Translates all placeholders into their corresponding values.
-     * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
-     *
-     * @param player Player to parse the placeholders against
-     * @param components List of Components to set the placeholder values in
-     * @return List of components containing all translated placeholders
-     */
-    @NotNull
-    public static List<Component> setPlaceholders(final Player player, @NotNull final List<Component> components) {
-        return setPlaceholders((OfflinePlayer) player, components);
-    }
-
-    /**
-     * Translates all placeholders into their corresponding values.
-     * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
-     *
-     * @param player Player to parse the placeholders against
-     * @param component Component to set the placeholder values in
-     * @return Component containing all translated placeholders
-     */
-    @NotNull
-    public static Component setBracketPlaceholders(final OfflinePlayer player, @NotNull final Component component) {
-        if (PlaceholderAPIPlugin.getInstance().getPlaceholderAPIConfig().useAdventureReplacer()) {
-            return component.replaceText(config -> config.match(PlaceholderAPI.BRACKET_PLACEHOLDER_PATTERN).replacement((result, builder) ->
-                    builder.content(BRACKET_EXACT_REPLACER.apply(result.group(), player, PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()::getExpansion))));
-        }
-
-        return ComponentReplacer.replace(component, str -> PlaceholderAPI.setBracketPlaceholders(player, str));
-    }
-
-    /**
-     * Translates all placeholders into their corresponding values.
-     * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
-     *
-     * @param player Player to parse the placeholders against
-     * @param components List of Components to set the placeholder values in
-     * @return List of Components containing all translated placeholders
-     */
-    @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());
-    }
-
-    /**
-     * Translates all placeholders into their corresponding values.
-     * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
-     *
-     * @param player Player to parse the placeholders against
-     * @param component Component to set the placeholder values in
-     * @return Component containing all translated placeholders
-     */
-    @NotNull
-    public static Component setBracketPlaceholders(final Player player, @NotNull final Component component) {
-        return setBracketPlaceholders((OfflinePlayer) player, component);
-    }
-
-    /**
-     * Translates all placeholders into their corresponding values.
-     * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
-     *
-     * @param player Player to parse the placeholders against
-     * @param components List of Components to set the placeholder values in
-     * @return List of Components containing all translated placeholders
-     */
-    @NotNull
-    public static List<Component> setBracketPlaceholders(final Player player, @NotNull final List<Component> components) {
-        return setBracketPlaceholders((OfflinePlayer) player, components);
-    }
-
-    /**
-     * set relational placeholders in the text specified placeholders are matched with the pattern
-     * {@literal %<rel_(identifier)_(params)>%} when set with this method
-     *
-     * @param one First player to compare
-     * @param two Second player to compare
-     * @param component Component to parse the placeholders in
-     * @return The Component containing the parsed relational placeholders
-     */
-    public static Component setRelationalPlaceholders(Player one, Player two, Component component) {
-        //todo: custom replacer
-        return component.replaceText(config -> config.match(RELATIONAL_PLACEHOLDER_PATTERN).replacement((result, builder) ->
-                builder.content(RELATIONAL_EXACT_REPLACER.apply(result.group(2), one, two, PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()::getExpansion))));
-    }
-
-    /**
-     * Translate placeholders in the provided List based on the relation of the two provided players.
-     * <br>The pattern of a valid placeholder is {@literal %rel_<identifier>_<param>%}.
-     *
-     * @param one Player to compare
-     * @param two Player to compare
-     * @param components List of Components to parse the placeholder values to
-     * @return The List of Components containing the parsed relational placeholders
-     */
-    public static List<Component> setRelationalPlaceholders(Player one, Player two, List<Component> components) {
-        return components.stream().map(line -> setRelationalPlaceholders(one, two, line))
-                .collect(Collectors.toList());
-    }
-}

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

@@ -1,174 +0,0 @@
-package me.clip.placeholderapi.replacer;
-
-import net.kyori.adventure.key.Key;
-import net.kyori.adventure.nbt.api.BinaryTagHolder;
-import net.kyori.adventure.text.*;
-import net.kyori.adventure.text.event.ClickEvent;
-import net.kyori.adventure.text.event.DataComponentValue;
-import net.kyori.adventure.text.event.HoverEvent;
-import net.kyori.adventure.text.format.Style;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-public class ComponentReplacer {
-    @NotNull
-    public static Component replace(@NotNull final Component component, @NotNull final Function<String, String> replacer) {
-        return rebuild(component, replacer);
-    }
-
-    @NotNull
-    private static Component rebuild(@NotNull final Component component, @NotNull final Function<String, String> replacer) {
-        Component rebuilt;
-
-        if (component instanceof TextComponent) {
-            final TextComponent text = (TextComponent) component;
-            final String replaced = replacer.apply(text.content());
-
-            rebuilt = Component.text(replaced);
-        } else if (component instanceof TranslatableComponent) {
-            final TranslatableComponent translatable = (TranslatableComponent) component;
-            final List<Component> arguments = new ArrayList<>();
-
-            for (final ComponentLike arg : translatable.arguments()) {
-                arguments.add(rebuild(arg.asComponent(), replacer));
-            }
-
-            rebuilt = Component.translatable(translatable.key(), arguments);
-        } else if (component instanceof KeybindComponent) {
-            final KeybindComponent keybind = (KeybindComponent) component;
-            rebuilt = Component.keybind(keybind.keybind());
-        } else if (component instanceof ScoreComponent) {
-            final ScoreComponent score = (ScoreComponent) component;
-            rebuilt = Component.score(score.name(), score.objective());
-        } else if (component instanceof SelectorComponent) {
-            final SelectorComponent selector = (SelectorComponent) component;
-            rebuilt = Component.selector(selector.pattern());
-        } else {
-            rebuilt = Component.empty();
-        }
-
-        rebuilt = rebuilt.style(rebuildStyle(component.style(), replacer));
-
-        if (!component.children().isEmpty()) {
-            final List<Component> children = new ArrayList<>();
-            for (Component child : component.children()) {
-                children.add(rebuild(child, replacer));
-            }
-            rebuilt = rebuilt.children(children);
-        }
-
-        return rebuilt;
-    }
-
-    @NotNull
-    private static Style rebuildStyle(@NotNull final Style style, @NotNull final Function<String, String> replacer) {
-        final Style.Builder builder = style.toBuilder();
-        final ClickEvent click = style.clickEvent();
-
-        if (click != null) {
-            builder.clickEvent(rebuildClickEvent(click, replacer));
-        }
-
-        final HoverEvent<?> hover = style.hoverEvent();
-
-        if (hover != null) {
-            builder.hoverEvent(rebuildHoverEvent(hover, replacer));
-        }
-
-        return builder.build();
-    }
-
-    @NotNull
-    private static ClickEvent rebuildClickEvent(@NotNull final ClickEvent click, @NotNull final Function<String, String> replacer) {
-        final ClickEvent.Payload payload = click.payload();
-
-        if (!(payload instanceof ClickEvent.Payload.Text)) {
-            return click;
-        }
-
-        final String original = ((ClickEvent.Payload.Text) payload).value();
-        final String replaced = replacer.apply(original);
-
-        final ClickEvent.Action action = click.action();
-
-        switch (action) {
-            case OPEN_URL:
-                return ClickEvent.openUrl(replaced);
-            case OPEN_FILE:
-                return ClickEvent.openFile(replaced);
-            case RUN_COMMAND:
-                return ClickEvent.runCommand(replaced);
-            case SUGGEST_COMMAND:
-                return ClickEvent.suggestCommand(replaced);
-            case COPY_TO_CLIPBOARD:
-                return ClickEvent.copyToClipboard(replaced);
-            default:
-                return click;
-        }
-    }
-
-    @NotNull
-    private static HoverEvent<?> rebuildHoverEvent(@NotNull final HoverEvent<?> hover, @NotNull final Function<String, String> replacer) {
-        final Object value = hover.value();
-
-        if (value instanceof Component) {
-            final Component rebuilt = rebuild((Component) value, replacer);
-            return HoverEvent.showText(rebuilt);
-        }
-
-        if (value instanceof HoverEvent.ShowItem) {
-            return rebuildShowItem((HoverEvent.ShowItem) value, replacer);
-        }
-
-        if (value instanceof HoverEvent.ShowEntity) {
-            final HoverEvent.ShowEntity entity = (HoverEvent.ShowEntity) value;
-
-            Component rebuiltName = null;
-            if (entity.name() != null) {
-                rebuiltName = rebuild(entity.name(), replacer);
-            }
-
-            return HoverEvent.showEntity(entity.type(), entity.id(), rebuiltName);
-        }
-
-        return hover;
-    }
-
-    @NotNull
-    private static HoverEvent<?> rebuildShowItem(@NotNull final HoverEvent.ShowItem item, @NotNull final Function<String, String> replacer) {
-        final BinaryTagHolder nbt = item.nbt();
-
-        if (nbt != null && !nbt.string().isEmpty()) {
-            final String replaced = replacer.apply(nbt.string());
-
-            return HoverEvent.showItem(item.item(), item.count(), BinaryTagHolder.binaryTagHolder(replaced));
-        }
-
-        //I'm not 100% sure this is how we're meant to support data components but let's give it a go and see if it causes any issues :)
-        final Map<Key, DataComponentValue> components = item.dataComponents();
-
-        if (!components.isEmpty()) {
-            final Map<Key, DataComponentValue> rebuilt = new HashMap<>();
-
-            for (final Map.Entry<Key, DataComponentValue> entry : components.entrySet()) {
-                final DataComponentValue value = entry.getValue();
-
-                if (!(value instanceof BinaryTagHolder)) {
-                    rebuilt.put(entry.getKey(), value);
-                    continue;
-                }
-
-                rebuilt.put(entry.getKey(), BinaryTagHolder.binaryTagHolder(replacer.apply(((BinaryTagHolder) value).string())));
-            }
-
-            return HoverEvent.showItem(item.item(), item.count(), rebuilt);
-        }
-
-        return HoverEvent.showItem(item);
-    }
-}

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

@@ -1,76 +0,0 @@
-/*
- * This file is part of PlaceholderAPI
- *
- * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
- *
- * PlaceholderAPI free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * PlaceholderAPI is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-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 final class ExactReplacer implements Replacer {
-    private static final Pattern DELIMITER = Pattern.compile("_");
-
-    private final char start;
-    private final char end;
-
-    public ExactReplacer(final char start, final char end) {
-        this.start = start;
-        this.end = end;
-    }
-
-    @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 start + text + end;
-        }
-
-        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 start + text + end;
-        }
-
-        return result;
-    }
-}

src/paper/java/me/clip/placeholderapi/replacer/RelationalExactReplacer.java

@@ -1,73 +0,0 @@
-/*
- * This file is part of PlaceholderAPI
- *
- * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
- *
- * PlaceholderAPI free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * PlaceholderAPI is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package me.clip.placeholderapi.replacer;
-
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import me.clip.placeholderapi.expansion.Relational;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.function.Function;
-import java.util.regex.Pattern;
-
-public final class RelationalExactReplacer {
-    private static final Pattern DELIMITER = Pattern.compile("_");
-
-    @NotNull
-    public String apply(@NotNull String text, @Nullable final Player player1,
-                        @Nullable final Player player2, @NotNull final Function<String,
-                        @Nullable PlaceholderExpansion> lookup) {
-        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 "%rel_" + text + '%';
-        }
-
-        if (!(expansion instanceof Relational)) {
-            return "%rel_" + text + '%';
-        }
-
-        final String params;
-
-        if (text.endsWith("_")) {
-            params = "";
-        } else {
-            params = text.substring(text.indexOf('_') + 1);
-        }
-
-        final String result = ((Relational) expansion).onPlaceholderRequest(player1, player2, params);
-
-        if (result == null) {
-            return "%rel_" + text + '%';
-        }
-
-        return result;
-    }
-}

src/test/java/me/clip/placeholderapi/Values.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,64 +30,64 @@ import org.jetbrains.annotations.Nullable;
 
 public interface Values {
 
-    String SMALL_TEXT = "My name is %player_name%";
+  String SMALL_TEXT = "My name is %player_name%";
-    String LARGE_TEXT = "My name is %player_name% and my location is (%player_x%, %player_y%, %player_z%), this placeholder is invalid %server_name%";
+  String LARGE_TEXT = "My name is %player_name% and my location is (%player_x%, %player_y%, %player_z%), this placeholder is invalid %server_name%";
 
-    ImmutableMap<String, PlaceholderExpansion> PLACEHOLDERS = ImmutableMap.<String, PlaceholderExpansion>builder()
+  ImmutableMap<String, PlaceholderExpansion> PLACEHOLDERS = ImmutableMap.<String, PlaceholderExpansion>builder()
-            .put("player", new MockPlayerPlaceholderExpansion())
+      .put("player", new MockPlayerPlaceholderExpansion())
-            .build();
+      .build();
 
 
-    Replacer CHARS_REPLACER = new CharsReplacer(Replacer.Closure.PERCENT);
+  Replacer CHARS_REPLACER = new CharsReplacer(Replacer.Closure.PERCENT);
 
 
-    final class MockPlayerPlaceholderExpansion extends PlaceholderExpansion {
+  final class MockPlayerPlaceholderExpansion extends PlaceholderExpansion {
 
-        public static final String PLAYER_X = "10";
+    public static final String PLAYER_X = "10";
-        public static final String PLAYER_Y = "20";
+    public static final String PLAYER_Y = "20";
-        public static final String PLAYER_Z = "30";
+    public static final String PLAYER_Z = "30";
-        public static final String PLAYER_NAME = "Sxtanna";
+    public static final String PLAYER_NAME = "Sxtanna";
 
 
-        @NotNull
+    @NotNull
-        @Override
+    @Override
-        public String getIdentifier() {
+    public String getIdentifier() {
-            return "player";
+      return "player";
-        }
-
-        @NotNull
-        @Override
-        public String getAuthor() {
-            return "Sxtanna";
-        }
-
-        @NotNull
-        @Override
-        public String getVersion() {
-            return "1.0";
-        }
-
-        @Override
-        public String onRequest(@Nullable final OfflinePlayer player, @NotNull final String params) {
-            final String[] parts = params.split("_");
-            if (parts.length == 0) {
-                return null;
-            }
-
-            switch (parts[0]) {
-                case "name":
-                    return PLAYER_NAME;
-                case "x":
-                    return PLAYER_X;
-                case "y":
-                    return PLAYER_Y;
-                case "z":
-                    return PLAYER_Z;
-            }
-
-            return null;
-        }
-
     }
 
+    @NotNull
+    @Override
+    public String getAuthor() {
+      return "Sxtanna";
+    }
+
+    @NotNull
+    @Override
+    public String getVersion() {
+      return "1.0";
+    }
+
+    @Override
+    public String onRequest(@Nullable final OfflinePlayer player, @NotNull final String params) {
+      final String[] parts = params.split("_");
+      if (parts.length == 0) {
+        return null;
+      }
+
+      switch (parts[0]) {
+        case "name":
+          return PLAYER_NAME;
+        case "x":
+          return PLAYER_X;
+        case "y":
+          return PLAYER_Y;
+        case "z":
+          return PLAYER_Z;
+      }
+
+      return null;
+    }
+
+  }
+
 }

src/test/java/me/clip/placeholderapi/replacer/ReplacerBenchmarks.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,14 +25,14 @@ import org.openjdk.jmh.annotations.Benchmark;
 
 public class ReplacerBenchmarks {
 
-    @Benchmark
+  @Benchmark
-    public void measureCharsReplacerSmallText() {
+  public void measureCharsReplacerSmallText() {
-        Values.CHARS_REPLACER.apply(Values.SMALL_TEXT, null, Values.PLACEHOLDERS::get);
+    Values.CHARS_REPLACER.apply(Values.SMALL_TEXT, null, Values.PLACEHOLDERS::get);
-    }
+  }
 
-    @Benchmark
+  @Benchmark
-    public void measureCharsReplacerLargeText() {
+  public void measureCharsReplacerLargeText() {
-        Values.CHARS_REPLACER.apply(Values.LARGE_TEXT, null, Values.PLACEHOLDERS::get);
+    Values.CHARS_REPLACER.apply(Values.LARGE_TEXT, null, Values.PLACEHOLDERS::get);
-    }
+  }
 
 }

src/test/java/me/clip/placeholderapi/replacer/ReplacerUnitTester.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,33 +31,33 @@ import org.junit.jupiter.api.Test;
 
 public final class ReplacerUnitTester {
 
-    @Test
+  @Test
-    void testCharsReplacerProducesExpectedSingleValue() {
+  void testCharsReplacerProducesExpectedSingleValue() {
-        assertEquals(PLAYER_NAME,
+    assertEquals(PLAYER_NAME,
-                Values.CHARS_REPLACER.apply("%player_name%", null, Values.PLACEHOLDERS::get));
+        Values.CHARS_REPLACER.apply("%player_name%", null, Values.PLACEHOLDERS::get));
-    }
+  }
 
-    @Test
+  @Test
-    void testCharsReplacerProducesExpectedSentence() {
+  void testCharsReplacerProducesExpectedSentence() {
-        assertEquals(String.format(
+    assertEquals(String.format(
-                        "My name is %s and my location is (%s, %s, %s), this placeholder is invalid %%server_name%%",
+        "My name is %s and my location is (%s, %s, %s), this placeholder is invalid %%server_name%%",
-                        PLAYER_NAME, PLAYER_X, PLAYER_Y, PLAYER_Z),
+        PLAYER_NAME, PLAYER_X, PLAYER_Y, PLAYER_Z),
-                Values.CHARS_REPLACER.apply(Values.LARGE_TEXT, null, Values.PLACEHOLDERS::get));
+        Values.CHARS_REPLACER.apply(Values.LARGE_TEXT, null, Values.PLACEHOLDERS::get));
-    }
+  }
 
-    @Test
+  @Test
-    void testResultsAreTheSameAsReplacement() {
+  void testResultsAreTheSameAsReplacement() {
-        final String resultChars = Values.CHARS_REPLACER
+    final String resultChars = Values.CHARS_REPLACER
-                .apply("%player_name%", null, Values.PLACEHOLDERS::get);
+        .apply("%player_name%", null, Values.PLACEHOLDERS::get);
 
-        assertEquals(PLAYER_NAME, resultChars);
+    assertEquals(PLAYER_NAME, resultChars);
-    }
+  }
 
-    @Test
+  @Test
-    void testCharsReplacerIgnoresMalformed() {
+  void testCharsReplacerIgnoresMalformed() {
-        final String text = "10% and %hello world 15%";
+    final String text = "10% and %hello world 15%";
 
-        assertEquals(text, Values.CHARS_REPLACER.apply(text, null, Values.PLACEHOLDERS::get));
+    assertEquals(text, Values.CHARS_REPLACER.apply(text, null, Values.PLACEHOLDERS::get));
-    }
+  }
 
 }