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

feat: initial work on 1.21

README.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 1,000,000 times and has been used concurrently on over 40,000 servers, which makes it a must-have for a server of any type or scale.
+PlaceholderAPI has been downloaded over 1,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.

build.gradle.kts

@@ -4,11 +4,11 @@ plugins {
     `java-library`
     `maven-publish`
     id("com.github.hierynomus.license") version "0.16.1"
-    id("com.github.johnrengelman.shadow") version "8.1.0"
+    id("io.github.goooler.shadow") version "8.1.7"
 }
 
 group = "me.clip"
-version = "2.11.6-DEV-${System.getProperty("BUILD_NUMBER")}"
+version = "2.11.7-DEV-${System.getProperty("BUILD_NUMBER")}"
 
 description = "An awesome placeholder provider!"
 
@@ -24,9 +24,9 @@ repositories {
 
 dependencies {
     implementation("org.bstats:bstats-bukkit:3.0.1")
-    implementation("net.kyori:adventure-platform-bukkit:4.3.2")
+    implementation("net.kyori:adventure-platform-bukkit:4.3.3")
 
-    compileOnly("org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
     compileOnlyApi("org.jetbrains:annotations:23.0.0")
 
     testImplementation("org.openjdk.jmh:jmh-core:1.32")
@@ -71,6 +71,7 @@ tasks {
 
     withType<JavaCompile> {
         options.encoding = "UTF-8"
+        options.release = 8
     }
 
     withType<Javadoc> {
@@ -88,6 +89,8 @@ tasks {
 
         relocate("org.bstats", "me.clip.placeholderapi.metrics")
         relocate("net.kyori", "me.clip.placeholderapi.libs.kyori")
+
+        exclude("META-INF/versions/**")
     }
 
     test {

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

gradlew.bat

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

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

@@ -68,7 +68,6 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
       version = 'v' + version.replace('.', '_').replace("_" + minor, "") + '_' + "R" + (minor - 1);
     }
 
-
     boolean isSpigot;
     try {
       Class.forName("org.spigotmc.SpigotConfig");

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

@@ -87,7 +87,8 @@ public final class CommandParse extends PlaceholderCommand {
       final boolean command) {
     if (params.size() < 2) {
       Msg.msg(sender,
-          "&cYou must supply a target, and a message: &b/papi " + (broadcast ? "bcparse" : "parse")
+          "&cYou must provide a target and message: &b/papi "
+              + (command ? "cmdparse" : (broadcast ? "bcparse" : "parse")) 
               + " &7{target} &a{message}");
       return;
     }
@@ -132,24 +133,49 @@ public final class CommandParse extends PlaceholderCommand {
       @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}");
+          "&cYou must supply two targets, and a message: &b/papi parserel &7{target one} " 
+              + "{target two} &a{message}");
       return;
     }
     
-    final OfflinePlayer targetOne = resolvePlayer(params.get(0));
-    if (targetOne == null || !targetOne.isOnline()) {
+    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;
+      }
+      
+      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;
     }
     
-    final OfflinePlayer targetTwo = resolvePlayer(params.get(1));
-    if (targetTwo == null || !targetTwo.isOnline()) {
+    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) targetOne), ((Player) targetTwo),
+        .setRelationalPlaceholders((Player) playerOne, (Player) playerTwo,
             String.join(" ", params.subList(2, params.size())));
     
     sender.sendMessage(message);

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

@@ -50,7 +50,8 @@ public enum NMSVersion {
   SPIGOT_1_20_R1("v1_20_R1"),
   SPIGOT_1_20_R2("v1_20_R2"),
   SPIGOT_1_20_R3("v1_20_R3"),
-  SPIGOT_1_20_R4("v1_20_R4");
+  SPIGOT_1_20_R4("v1_20_R4"),
+  SPIGOT_1_21_R1("v1_21_R1");
 
   private final String version;
 

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

@@ -110,7 +110,12 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    * 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;
   }

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

@@ -46,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;
@@ -264,6 +265,9 @@ public final class LocalExpansionManager implements Listener {
 
     if (expansion instanceof VersionSpecific) {
       VersionSpecific nms = (VersionSpecific) expansion;
+      Msg.warn("Nag Author(s) %s of expansion %s about their usage of the deprecated " 
+          + "VersionSpecific interface!", expansion.getAuthor(), expansion.getIdentifier());
+      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());
@@ -320,6 +324,15 @@ public final class LocalExpansionManager implements Listener {
 
   @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;
     }
@@ -393,10 +406,6 @@ public final class LocalExpansionManager implements Listener {
 
   private void unregisterAll() {
     for (final PlaceholderExpansion expansion : Sets.newHashSet(expansions.values())) {
-      if (expansion.persist()) {
-        continue;
-      }
-
       expansion.unregister();
     }
   }