Removed Deprecated Methods

.github/label-commenter-config.yml

@@ -38,9 +38,8 @@ labels:
           - Currently used Versions of your server and PlaceholderAPI
           - Currently installed Expansions
           - Currently installed Plugins
-          - Any additional information requested by users in this issue.
           
-          The easiest way to provide those information is through the `/papi dump` command which posts the required information to https://paste.helpch.at and gives a URL to share.
+          The easiest way to provide those information is through the `/papi dumb` command which posts the required information to https://paste.helpch.at and gives a URL to share.
     unlabeled:
       issue:
         body: |-
@@ -77,15 +76,6 @@ labels:
           
           Don't hesitate to ask us any questions.
         action: close
-  - name: 'Type: Invalid (Wiki)'
-    labeled:
-      pr:
-        body: |-
-          Your Wiki Pull request has been marked as **invalid**.
-          
-          Pull requests targeting the wiki need to be based of and target the `docs/wiki` branch of this repository.
-          More information can be found on the [Wiki README](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/docs/wiki/wiki/README.md).
-        action: close
   - name: 'Target: Wiki'
     labeled:
       issue:

README.md

@@ -28,9 +28,9 @@
 # Information 
 [PlaceholderAPI][spigot] is a plugin for Spigot servers that allows server owners to display information from various plugins with a uniform format. 
 
-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. 
+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 150+ 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 750,000 times and has been used concurrently on over 35,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

@@ -8,7 +8,7 @@ plugins {
 }
 
 group "me.clip"
-version "2.11.2-DEV-${System.getProperty("BUILD_NUMBER")}"
+version "2.10.10-DEV-${System.getProperty("BUILD_NUMBER")}"
 
 description "An awesome placeholder provider!"
 
@@ -32,7 +32,7 @@ dependencies {
     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"
+    testImplementation "org.junit.jupiter:junit-jupiter-engine:5.8.1"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.1"
 }
 

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -22,23 +22,18 @@ package me.clip.placeholderapi;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.List;
-import java.util.Locale;
-import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.clip.placeholderapi.expansion.Relational;
-import me.clip.placeholderapi.expansion.manager.LocalExpansionManager;
 import me.clip.placeholderapi.replacer.CharsReplacer;
 import me.clip.placeholderapi.replacer.Replacer;
 import me.clip.placeholderapi.replacer.Replacer.Closure;
 import me.clip.placeholderapi.util.Msg;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 public final class PlaceholderAPI {
@@ -82,7 +77,7 @@ public final class PlaceholderAPI {
    */
   @NotNull
   public static List<String> setPlaceholders(final OfflinePlayer player,
-      @NotNull final List<String> text) {
+      @NotNull final List<@NotNull String> text) {
     return text.stream().map(line -> setPlaceholders(player, line)).collect(Collectors.toList());
   }
 
@@ -137,7 +132,7 @@ public final class PlaceholderAPI {
    */
   @NotNull
   public static List<String> setBracketPlaceholders(final OfflinePlayer player,
-      @NotNull final List<String> text) {
+      @NotNull final List<@NotNull String> text) {
     return text.stream().map(line -> setBracketPlaceholders(player, line))
         .collect(Collectors.toList());
   }
@@ -186,7 +181,7 @@ public final class PlaceholderAPI {
         continue;
       }
 
-      String identifier = format.substring(0, index).toLowerCase(Locale.ROOT);
+      String identifier = format.substring(0, index).toLowerCase();
       String params = format.substring(index + 1);
       final PlaceholderExpansion expansion = PlaceholderAPIPlugin.getInstance()
           .getLocalExpansionManager().getExpansion(identifier);
@@ -289,335 +284,4 @@ public final class PlaceholderAPI {
   public static boolean containsBracketPlaceholders(String text) {
     return text != null && BRACKET_PLACEHOLDER_PATTERN.matcher(text).find();
   }
-
-  // === Deprecated API ===
-
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static boolean registerExpansion(PlaceholderExpansion expansion)
-  {
-    return expansion.register();
-  }
-
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static boolean unregisterExpansion(PlaceholderExpansion expansion)
-  {
-    return expansion.unregister();
-  }
-
-  /**
-   * Get map of registered placeholders
-   * 
-   * @deprecated Use {@link LocalExpansionManager#getExpansions()} instead.
-   *
-   * @return Map of registered placeholders
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static Map<String, PlaceholderHook> getPlaceholders() {
-    return PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()
-        .getExpansions().stream()
-        .collect(Collectors.toMap(PlaceholderExpansion::getIdentifier, ex -> ex));
-  }
-
-  /**
-   * @deprecated Please use {@link PlaceholderExpansion} to
-   * register placeholders instead
-   * 
-   * @param plugin The Plugin to register with this {@link PlaceholderHook}
-   * @param placeholderHook The {@link PlaceholderHook} to register
-   * @return always false
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static boolean registerPlaceholderHook(Plugin plugin, PlaceholderHook placeholderHook) {
-    PlaceholderAPIPlugin.getInstance().getLogger().warning(plugin.getName()
-        + " is attempting to register placeholders via a PlaceholderHook class which is no longer supported!"
-        + " Please reach out to " + plugin.getDescription().getAuthors().toString()
-        + " and let them know that they need to update ASAP!");
-    return false;
-  }
-
-  /**
-   * @deprecated Please use {@link PlaceholderExpansion} to
-   * register placeholders instead
-   * 
-   * @param identifier The identifier to use for the {@link PlaceholderHook}
-   * @param placeholderHook The {@link PlaceholderHook} to register
-   * @return always false
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static boolean registerPlaceholderHook(String identifier,
-      PlaceholderHook placeholderHook) {
-    PlaceholderAPIPlugin.getInstance().getLogger().warning(identifier
-        + " is attempting to register placeholders via a PlaceholderHook class which is no longer supported!");
-    return false;
-  }
-
-  /**
-   * @deprecated Please use {@link PlaceholderExpansion} to
-   * unregister placeholders instead
-   * 
-   * @param plugin The plugin to unregister
-   * @return always false
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static boolean unregisterPlaceholderHook(Plugin plugin) {
-    PlaceholderAPIPlugin.getInstance().getLogger().warning(plugin.getName()
-        + " is attempting to unregister placeholders via the PlaceholderAPI class which is no longer supported!"
-        + " Please reach out to " + plugin.getDescription().getAuthors().toString()
-        + " and let them know that they need to update ASAP!");
-    return false;
-  }
-
-  /**
-   * @deprecated Please use {@link PlaceholderExpansion} to
-   * unregister placeholders instead
-   * 
-   * @param identifier The identifier to unregister
-   * @return always false
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static boolean unregisterPlaceholderHook(String identifier) {
-    PlaceholderAPIPlugin.getInstance().getLogger().warning(identifier
-        + " is attempting to unregister placeholders through the PlaceholderAPI class which is no longer supported!");
-    return false;
-  }
-
-  /**
-   * @deprecated Will be removed in a future release.
-   * 
-   * @return Set of registered identifiers
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static Set<String> getRegisteredPlaceholderPlugins() {
-    return getRegisteredIdentifiers();
-  }
-
-  /**
-   * @deprecated Will be removed in a future release.
-   * 
-   * @return always null
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static Set<String> getExternalPlaceholderPlugins() {
-    return null;
-  }
-
-  /**
-   * @deprecated Please use {@link #setPlaceholders(OfflinePlayer, String)} instead
-   * 
-   * @param player The offline player to parse the placeholders against
-   * @param text The text to parse
-   * @param pattern The Pattern to use
-   * @param colorize If PlaceholderAPI should also parse color codes
-   * @return String with the parsed placeholders
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static String setPlaceholders(OfflinePlayer player,
-      String text, Pattern pattern, boolean colorize) {
-    return setPlaceholders(player, text);
-  }
-
-  /**
-   * @deprecated Please use {@link #setPlaceholders(OfflinePlayer, List)} instead
-   * 
-   * @param player The offline player to parse the placeholders against
-   * @param text The List of text to parse
-   * @param pattern The Pattern to use
-   * @param colorize If PlaceholderAPI should also parse color codes
-   * @return String with the parsed placeholders
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static List<String> setPlaceholders(OfflinePlayer player,
-      List<String> text, Pattern pattern, boolean colorize) {
-    return setPlaceholders(player, text);
-  }
-
-  /**
-   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead.
-   *
-   * @param player The offline player to parse the placeholders against
-   * @param text The List of text to parse
-   * @param colorize If PlaceholderAPI should also parse color codes
-   * @return String with the parsed placeholders
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static List<String> setPlaceholders(OfflinePlayer player, List<String> text,
-      boolean colorize) {
-    return setPlaceholders(player, text);
-  }
-
-  /**
-   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead.
-   *
-   * @param player The offline player to parse the placeholders against
-   * @param text The List of text to parse
-   * @param pattern The Pattern to use
-   * @return String with the parsed placeholders
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static List<String> setPlaceholders(OfflinePlayer player, List<String> text,
-      Pattern pattern) {
-    return setPlaceholders(player, text);
-  }
-  /**
-   * @deprecated Will be removed in a future release.
-   *
-   * @param player The offline player to parse the placeholders against
-   * @param text The text to parse
-   * @param colorize If PlaceholderAPI should also parse color codes
-   * @return String with the parsed placeholders
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static String setPlaceholders(Player player, String text, boolean colorize) {
-    return setPlaceholders(player, text);
-  }
-
-  /**
-   * @deprecated Will be removed in a future release.
-   *
-   * @param player The offline player to parse the placeholders against
-   * @param text The List of text to parse
-   * @param colorize If PlaceholderAPI should also parse color codes
-   * @return String with the parsed placeholders
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static List<String> setPlaceholders(Player player, List<String> text, boolean colorize) {
-    return setPlaceholders(player, text);
-  }
-
-  /**
-   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
-   *
-   * @param player The offline player to parse the placeholders against
-   * @param text The text to parse
-   * @param colorize If PlaceholderAPI should also parse color codes
-   * @return String with the parsed placeholders
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static String setPlaceholders(OfflinePlayer player, String text, boolean colorize) {
-    return setPlaceholders(player, text);
-  }
-
-  /**
-   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
-   *
-   * @param player The offline player to parse the placeholders against
-   * @param text The text to parse
-   * @param pattern The Pattern to use
-   * @return String with the parsed placeholders
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static String setPlaceholders(OfflinePlayer player, String text, Pattern pattern) {
-    return setPlaceholders(player, text);
-  }
-
-  /**
-   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead.
-   *
-   * @param player The offline player to parse the placeholders against
-   * @param text The List of text to parse
-   * @param colorize If PlaceholderAPI should also parse color codes
-   * @return String with the parsed placeholders
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static List<String> setBracketPlaceholders(OfflinePlayer player, List<String> text,
-      boolean colorize) {
-    return setBracketPlaceholders(player, text);
-  }
-
-  /**
-   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
-   *
-   * @param player The offline player to parse the placeholders against
-   * @param text The text to parse
-   * @param colorize If PlaceholderAPI should also parse color codes
-   * @return String with the parsed placeholders
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static String setBracketPlaceholders(OfflinePlayer player, String text, boolean colorize) {
-    return setBracketPlaceholders(player, text);
-  }
-
-  /**
-   * @deprecated Will be removed in a future release.
-   *
-   * @param player The offline player to parse the placeholders against
-   * @param text The text to parse
-   * @param colorize If PlaceholderAPI should also parse color codes
-   * @return String with the parsed placeholders
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static String setBracketPlaceholders(Player player, String text, boolean colorize) {
-    return setBracketPlaceholders(player, text);
-  }
-
-  /**
-   * @deprecated Will be removed in a future release.
-   *
-   * @param player The offline player to parse the placeholders against
-   * @param text The List of text to parse
-   * @param colorize If PlaceholderAPI should also parse color codes
-   * @return String with the parsed placeholders
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static List<String> setBracketPlaceholders(Player player, List<String> text,
-      boolean colorize) {
-    return setBracketPlaceholders(player, text);
-  }
-
-  /**
-   * set relational placeholders in the text specified placeholders are matched with the pattern
-   * {@literal %<rel_(identifier)_(params)>%} when set with this method
-   *
-   * @param one Player to compare
-   * @param two Player to compare
-   * @param text Text to parse the placeholders in
-   * @param colorize If color codes ({@literal &[0-1a-fk-o]}) should be translated
-   * @return The text containing the parsed relational placeholders
-   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static String setRelationalPlaceholders(Player one, Player two, String text,
-      boolean colorize) {
-    return setRelationalPlaceholders(one, two, text);
-  }
-
-  /**
-   * 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>_<params>%}.
-   *
-   * @param one First player to compare
-   * @param two Second player to compare
-   * @param text Text to parse the placeholders in
-   * @param colorize If color codes ({@literal &[0-1a-fk-o]}) should be translated
-   * @return The text containing the parsed relational placeholders
-   * @deprecated Use {@link #setRelationalPlaceholders(Player, Player, List)} instead.
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static List<String> setRelationalPlaceholders(Player one, Player two, List<String> text,
-      boolean colorize) {
-    return setRelationalPlaceholders(one, two, text);
-  }
 }

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -33,6 +33,7 @@ import me.clip.placeholderapi.expansion.manager.LocalExpansionManager;
 import me.clip.placeholderapi.listeners.ServerLoadEventListener;
 import me.clip.placeholderapi.updatechecker.UpdateChecker;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import net.kyori.adventure.text.serializer.craftbukkit.MinecraftComponentSerializer;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.AdvancedPie;
 import org.bstats.charts.SimplePie;
@@ -248,7 +249,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
     try {
       Class.forName("org.bukkit.event.server.ServerLoadEvent");
       new ServerLoadEventListener(this);
-    } catch (final ClassNotFoundException ignored) {
+    } catch (final ExceptionInInitializerError | ClassNotFoundException ignored) {
       Bukkit.getScheduler()
           .runTaskLater(this, () -> getLocalExpansionManager().load(Bukkit.getConsoleSender()), 1);
     }

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -25,22 +25,9 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-@Deprecated
 public abstract class PlaceholderHook {
 
-  /**
-   * Please see {@link me.clip.placeholderapi.expansion.PlaceholderExpansion#parsePlaceholders(OfflinePlayer, String) PlaceholderExpansion#parsePlaceholder(OfflinePlayer, String)}
-   * for a full description of what this method is used for.
-   * 
-   * @param player Possibly-null OfflinePlayer instance to use.
-   * @param params String after {@code %<expansion>_} and before the second percent symbol.
-   * @return Possibly-null String depending on the Expansions returned value.
-   * @deprecated Planned for removal in 2.14.0
-   *             <br>Please use {@link me.clip.placeholderapi.expansion.PlaceholderExpansion#parsePlaceholders(OfflinePlayer, String) parsePlaceholders(OfflinePlayer, String)}
-   *             instead
-   */
   @Nullable
-  @Deprecated
   public String onRequest(final OfflinePlayer player, @NotNull final String params) {
     if (player != null && player.isOnline()) {
       return onPlaceholderRequest((Player) player, params);
@@ -49,20 +36,7 @@ public abstract class PlaceholderHook {
     return onPlaceholderRequest(null, params);
   }
 
-  /**
-   * Please see {@link me.clip.placeholderapi.expansion.PlaceholderExpansion#parsePlaceholders(Player, String) PlaceholderExpansion#parsePlaceholder(Player, String)}
-   * for a full description of what this method is used for.
-   *
-   * @param player Possibly-null Player instance to use.
-   * @param params String after {@code %<expansion>_} and before the second percent symbol.
-   * @return Possibly-null String depending on the Expansions returned value.
-   * 
-   * @deprecated Planned for removal in 2.14.0
-   *             <br>Please use {@link me.clip.placeholderapi.expansion.PlaceholderExpansion#parsePlaceholders(Player, String) parsePlaceholders(Player, String)}
-   *             instead
-   */
   @Nullable
-  @Deprecated
   public String onPlaceholderRequest(final Player player, @NotNull final String params) {
     return null;
   }

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -23,7 +23,6 @@ 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;
@@ -62,7 +61,7 @@ public abstract class PlaceholderCommand {
     if (parameter == null) {
       possible.forEach(suggestions::add);
     } else {
-      possible.filter(suggestion -> suggestion.toLowerCase(Locale.ROOT).startsWith(parameter.toLowerCase(Locale.ROOT)))
+      possible.filter(suggestion -> suggestion.toLowerCase().startsWith(parameter.toLowerCase()))
           .forEach(suggestions::add);
     }
   }

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -27,7 +27,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Stream;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
@@ -96,7 +95,7 @@ public final class PlaceholderCommandRouter implements CommandExecutor, TabCompl
       return true;
     }
 
-    final String search = args[0].toLowerCase(Locale.ROOT);
+    final String search = args[0].toLowerCase();
     final PlaceholderCommand target = commands.get(search);
 
     if (target == null) {
@@ -122,10 +121,10 @@ public final class PlaceholderCommandRouter implements CommandExecutor, TabCompl
     final List<String> suggestions = new ArrayList<>();
 
     if (args.length > 1) {
-      final PlaceholderCommand target = this.commands.get(args[0].toLowerCase(Locale.ROOT));
+      final PlaceholderCommand target = this.commands.get(args[0].toLowerCase());
 
       if (target != null) {
-        target.complete(plugin, sender, args[0].toLowerCase(Locale.ROOT),
+        target.complete(plugin, sender, args[0].toLowerCase(),
             Arrays.asList(Arrays.copyOfRange(args, 1, args.length)), suggestions);
       }
 

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -24,7 +24,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import java.util.Collection;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Stream;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
@@ -101,7 +100,7 @@ public final class CommandECloud extends PlaceholderCommand {
       return;
     }
 
-    final String search = params.get(0).toLowerCase(Locale.ROOT);
+    final String search = params.get(0).toLowerCase();
     final PlaceholderCommand target = commands.get(search);
 
     if (target == null) {
@@ -137,7 +136,7 @@ public final class CommandECloud extends PlaceholderCommand {
       return; // send sub commands
     }
 
-    final String search = params.get(0).toLowerCase(Locale.ROOT);
+    final String search = params.get(0).toLowerCase();
     final PlaceholderCommand target = commands.get(search);
 
     if (target == null) {

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -87,7 +87,7 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
   @NotNull
   private static Collection<CloudExpansion> getExpansions(@NotNull final String target,
       @NotNull final PlaceholderAPIPlugin plugin) {
-    switch (target.toLowerCase(Locale.ROOT)) {
+    switch (target.toLowerCase()) {
       case "all":
         return plugin.getCloudExpansionManager().getCloudExpansions().values();
       case "installed":
@@ -112,7 +112,7 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
 
   public static void addExpansionTitle(@NotNull final StringBuilder builder,
       @NotNull final String target, final int page) {
-    switch (target.toLowerCase(Locale.ROOT)) {
+    switch (target.toLowerCase()) {
       case "all":
         builder.append("&bAll Expansions");
         break;

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -21,8 +21,6 @@
 package me.clip.placeholderapi.commands.impl.cloud;
 
 import java.util.List;
-import java.util.Locale;
-
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.util.Msg;
@@ -43,7 +41,7 @@ public final class CommandECloudToggle extends PlaceholderCommand {
     final boolean desiredState;
     final boolean currentState = plugin.getPlaceholderAPIConfig().isCloudEnabled();
 
-    switch (alias.toLowerCase(Locale.ROOT)) {
+    switch (alias.toLowerCase()) {
       case "enable":
         desiredState = true;
         break;

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -23,7 +23,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;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -129,7 +128,7 @@ public final class CommandECloudUpdate extends PlaceholderCommand {
     installed.removeIf(expansion -> !expansion.shouldUpdate());
 
     if (!installed.isEmpty() && (params.isEmpty() || "all"
-        .startsWith(params.get(0).toLowerCase(Locale.ROOT)))) {
+        .startsWith(params.get(0).toLowerCase()))) {
       suggestions.add("all");
     }
 

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -165,7 +165,7 @@ public final class CommandDump extends PlaceholderCommand {
 
     final String[] jars = plugin.getLocalExpansionManager()
         .getExpansionsFolder()
-        .list((dir, name) -> name.toLowerCase(Locale.ROOT).endsWith(".jar"));
+        .list((dir, name) -> name.toLowerCase().endsWith(".jar"));
 
     for (final String jar : jars) {
       builder.append("  ")

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -45,9 +45,9 @@ public final class CommandHelp extends PlaceholderCommand {
     Msg.msg(sender,
         "&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/player name> <message>",
         "  &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",
         "&b/papi &fdump",
         "  &7&oDump all relevant information needed to help debug issues into a paste link.",
@@ -55,7 +55,7 @@ public final class CommandHelp extends PlaceholderCommand {
         "  &7&oView information for a specific expansion",
         "&b/papi &flist",
         "  &7&oList active expansions",
-        "&b/papi &fparse &9<me|--null|player name> <message>",
+        "&b/papi &fparse &9<me/player name> <message>",
         "  &7&oParse a message with placeholders",
         "&b/papi &fparserel &9<player one> <player two> <message>",
         "  &7&oParse a message with relational placeholders",

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -22,7 +22,6 @@ package me.clip.placeholderapi.commands.impl.local;
 
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Stream;
 import me.clip.placeholderapi.PlaceholderAPI;
@@ -50,7 +49,7 @@ public final class CommandParse extends PlaceholderCommand {
   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)) {
+    switch (alias.toLowerCase()) {
       case "parserel":
         evaluateParseRelation(sender, params);
         break;
@@ -70,7 +69,7 @@ public final class CommandParse extends PlaceholderCommand {
   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)) {
+    switch (alias.toLowerCase()) {
       case "parserel":
         completeParseRelation(params, suggestions);
         break;
@@ -93,7 +92,7 @@ public final class CommandParse extends PlaceholderCommand {
       return;
     }
 
-    OfflinePlayer player;
+    @NotNull final OfflinePlayer player;
 
     if ("me".equalsIgnoreCase(params.get(0))) {
       if (!(sender instanceof Player)) {
@@ -102,8 +101,6 @@ public final class CommandParse extends PlaceholderCommand {
       }
 
       player = ((Player) sender);
-    } else if ("--null".equalsIgnoreCase(params.get(0))) {
-      player = null;
     } else {
       final OfflinePlayer target = resolvePlayer(params.get(0));
       if (target == null) {
@@ -164,14 +161,10 @@ public final class CommandParse extends PlaceholderCommand {
       @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)))) {
+          .startsWith(params.get(0).toLowerCase()))) {
         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));
 

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -26,10 +26,7 @@ import java.util.logging.Level;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.PlaceholderHook;
 import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -84,7 +81,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    */
   @Nullable
   public String getRequiredPlugin() {
-    return getPlugin();
+    return null;
   }
 
   /**
@@ -399,95 +396,4 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
     return String.format("PlaceholderExpansion[name: '%s', author: '%s', version: '%s']", getName(),
         getAuthor(), getVersion());
   }
-
-  /**
-   * This method is called first whenever PlaceholderAPI finds a valid placeholder with a matching expansion.
-   * <br>When called, the provided OfflinePlayer instance can be one of 3 possible states:
-   * 
-   * <ul>
-   *   <li>Not null and online</li>
-   *   <li>Not null and offline</li>
-   *   <li>Null</li>
-   * </ul>
-   * 
-   * When not overridden by the called expansion will the method as of now call
-   * {@link PlaceholderHook#onRequest(OfflinePlayer, String) PlaceholderHook#onRequest(OfflinePlayer, String)}.
-   * <br>This behaviour will change in a future version to call {@link #parsePlaceholders(Player, String) parsePlaceholders(Player, String)}
-   * with the OfflinePlayer either being casted to a Player (When online), or {@link null}.
-   * 
-   * <p>To use this method in your PlaceholderExpansion, override it and return either a String or {@code null}.
-   * <br>When {@code null} is returned will PlaceholderAPI see it as an "invalid placeholder" and return
-   * the content as-is in the final String.
-   * 
-   * @param player The OfflinePlayer to use.
-   * @param params The parameters of the placeholder, right after the first underscore.
-   * @return Parsed placeholder, or null depending on the Expansion's handling of it.
-   */
-  @Nullable
-  public String parsePlaceholders(@Nullable OfflinePlayer player, @NotNull String params) {
-    return this.onRequest(player, params);
-  }
-
-  /**
-   * This method is called whenever PlaceholderAPI finds a valid placeholder with a matching expansion
-   * AND {@link #parsePlaceholders(OfflinePlayer, String) parsePlaceholder(OfflinePlayer, String)} isn't
-   * overridden by the expansion in question.
-   * <br>When called, the provided Player instance can be one of 2 possible states:
-   * 
-   * <ul>
-   *   <li>Not null and online</li>
-   *   <li>Null</li>
-   * </ul>
-   *
-   * When not overridden by the called expansion will the method as of now call
-   * {@link PlaceholderHook#onPlaceholderRequest(Player, String) PlaceholderHook#onPlaceholderRequest(Player, String)}.
-   * <br>This behaviour will change in a future version to instead return {@code null}.
-   * 
-   * <p>To use this method in your PlaceholderExpansion, override it and return either a String or {@code null}.
-   * <br>When {@code null} is returned will PlaceholderAPI see it as an "invalid placeholder" and return
-   * the content as-is in the final String.
-   * 
-   * @param player The Player to use. May be null
-   * @param params The parameters of the placeholder, right after the first underscore.
-   * @return Parsed placeholder, or null depending on the Expansion's handling of it.
-   */
-  @Nullable
-  public String parsePlaceholders(@Nullable Player player, @NotNull String params){
-    return this.onPlaceholderRequest(player, params);
-  }
-  
-  // === 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;
-  }
 }

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -21,29 +21,23 @@
 package me.clip.placeholderapi.expansion;
 
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
- * This interface should be used when your {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansion}
- * should support relational placeholders.
+ * Implementing this interface allows your {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansion}
+ * to be used as a relational placeholder expansion.
  * 
- * <p>The difference between relational placeholders and normal ones is, that relational ones start
- * with a {@code rel_} prefix and have two Players provided, instead of one.
- * <br>The main purpose is to return a String based on the "relationship" between the two players
- * (i.e. if both are within the same world).
+ * <p>Relational placeholders take two Players as input and are always prefixed with {@code rel_},
+ * so {@code %foo_bar%} becomes {@code %rel_foo_bar%}
  */
 public interface Relational {
 
   /**
-   * This method will be called whenever a valid placeholder in the format {@code %rel_<expansion>_<identifier>%}
-   * is found.
+   * This method is called whenever a placeholder starting with {@code rel_} is called.
    * 
-   * @param one The first player to use for comparison.
-   * @param two The second player to use for comparison
-   * @param identifier String right after {@code %rel_<expansion>_} and before the second percent symbol.
-   * @return Possibly-null String, depending on what the expansion returns.
+   * @param one The first 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>%)
+   * @return Parsed String from the expansion.
    */
-  @Nullable
-  String onPlaceholderRequest(Player one, Player two, @NotNull String identifier);
+  String onPlaceholderRequest(Player one, Player two, String identifier);
 }

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -171,7 +171,7 @@ public class CloudExpansion {
     this.versions = versions;
   }
 
-  public static class Version {
+  public class Version {
 
     private String url, version, release_notes;
 

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -37,7 +37,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -89,7 +88,7 @@ public final class CloudExpansionManager {
 
   @NotNull
   private static String toIndexName(@NotNull final String name) {
-    return name.toLowerCase(Locale.ROOT).replace(' ', '_');
+    return name.toLowerCase().replace(' ', '_');
   }
 
   @NotNull

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -125,7 +125,7 @@ public final class LocalExpansionManager implements Listener {
   public PlaceholderExpansion getExpansion(@NotNull final String identifier) {
     expansionsLock.lock();
     try {
-      return expansions.get(identifier.toLowerCase(Locale.ROOT));
+      return expansions.get(identifier.toLowerCase());
     } finally {
       expansionsLock.unlock();
     }
@@ -193,7 +193,7 @@ public final class LocalExpansionManager implements Listener {
 
   @ApiStatus.Internal
   public boolean register(@NotNull final PlaceholderExpansion expansion) {
-    final String identifier = expansion.getIdentifier().toLowerCase(Locale.ROOT);
+    final String identifier = expansion.getIdentifier().toLowerCase();
 
     if (!expansion.canRegister()) {
       return false;

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

@@ -1,23 +1,3 @@
-/*
- * This file is part of PlaceholderAPI
- *
- * PlaceholderAPI
- * Copyright (c) 2015 - 2021 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.expansion.manager;
 
 import java.util.Arrays;

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -39,6 +39,16 @@ public final class ServerLoadEventListener implements Listener {
     Bukkit.getPluginManager().registerEvents(this, plugin);
   }
 
+  /**
+   * This method will be called when the server is first loaded
+   * <p>
+   * The goal of the method is to register all the expansions as soon as possible especially before
+   * players can join
+   * <p>
+   * This will ensure no issues with expansions and hooks.
+   *
+   * @param event the server load event
+   */
   @EventHandler
   public void onServerLoad(@NotNull final ServerLoadEvent event) {
     HandlerList.unregisterAll(this);

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

@@ -1,137 +1,178 @@
-/*
- * This file is part of PlaceholderAPI
- *
- * PlaceholderAPI
- * Copyright (c) 2015 - 2021 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 java.util.Locale;
-import java.util.function.Function;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import org.bukkit.ChatColor;
-import org.bukkit.OfflinePlayer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public final class CharsReplacer implements Replacer {
-
-  @NotNull
-  private final Closure closure;
-
-  public CharsReplacer(@NotNull final Closure closure) {
-    this.closure = closure;
-  }
-
-
-  @NotNull
-  @Override
-  public String apply(@NotNull final String text, @Nullable final OfflinePlayer player,
-      @NotNull final Function<String, @Nullable PlaceholderExpansion> lookup) {
-    final char[] chars = text.toCharArray();
-    final StringBuilder builder = new StringBuilder(text.length());
-
-    final StringBuilder identifier = new StringBuilder();
-    final StringBuilder parameters = new StringBuilder();
-
-    for (int i = 0; i < chars.length; i++) {
-      final char l = chars[i];
-
-      if (l != closure.head || i + 1 >= chars.length) {
-        builder.append(l);
-        continue;
-      }
-
-      boolean identified = false;
-      boolean invalid = true;
-      boolean hadSpace = false;
-
-      while (++i < chars.length) {
-        final char p = chars[i];
-
-        if (p == ' ' && !identified) {
-          hadSpace = true;
-          break;
-        }
-        if (p == closure.tail) {
-          invalid = false;
-          break;
-        }
-
-        if (p == '_' && !identified) {
-          identified = true;
-          continue;
-        }
-
-        if (identified) {
-          parameters.append(p);
-        } else {
-          identifier.append(p);
-        }
-      }
-
-      final String identifierString = identifier.toString();
-      final String lowercaseIdentifierString = identifierString.toLowerCase(Locale.ROOT);
-      final String parametersString = parameters.toString();
-
-      identifier.setLength(0);
-      parameters.setLength(0);
-
-      if (invalid) {
-        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.parsePlaceholders(player, parametersString);
-      if (replacement == null) {
-        builder.append(closure.head).append(identifierString);
-
-        if (identified) {
-          builder.append('_');
-        }
-
-        builder.append(parametersString).append(closure.tail);
-        continue;
-      }
-
-      builder.append(ChatColor.translateAlternateColorCodes('&', replacement));
-    }
-
-    return builder.toString();
-  }
-
-}
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
+ *
+ * PlaceholderAPI is 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 java.util.function.Function;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public final class CharsReplacer implements Replacer {
+
+  @NotNull
+  private final Closure closure;
+
+  public CharsReplacer(@NotNull final Closure closure) {
+    this.closure = closure;
+  }
+
+
+  @NotNull
+  @Override
+  public String apply(@NotNull final String text, @Nullable final OfflinePlayer player,
+      @NotNull final Function<String, @Nullable PlaceholderExpansion> lookup) {
+    final char[] chars = text.toCharArray();
+    final StringBuilder builder = new StringBuilder(text.length());
+
+    final StringBuilder identifier = new StringBuilder();
+    final StringBuilder parameters = new StringBuilder();
+
+    for (int i = 0; i < chars.length; i++) {
+      final char l = chars[i];
+      
+      if (l == '&' && ++i < chars.length) {
+        final char c = Character.toLowerCase(chars[i]);
+
+        if (c != '0' && c != '1' && c != '2' && c != '3' && c != '4' && c != '5' && c != '6'
+            && c != '7' && c != '8' && c != '9' && c != 'a' && c != 'b' && c != 'c' && c != 'd'
+            && c != 'e' && c != 'f' && c != 'k' && c != 'l' && c != 'm' && c != 'n' && c != 'o' && c != 'r'
+            && c != 'x') {
+          builder.append(l).append(chars[i]);
+        } else {
+          builder.append(ChatColor.COLOR_CHAR);
+
+          if (c != 'x') {
+            builder.append(chars[i]);
+            continue;
+          }
+
+          if ((i > 1 && chars[i - 2] == '\\') /*allow escaping &x*/) {
+            builder.setLength(builder.length() - 2);
+            builder.append('&').append(chars[i]);
+            continue;
+          }
+
+          builder.append(c);
+
+          int j = 0;
+          while (++j <= 6) {
+            if (i + j >= chars.length) {
+              break;
+            }
+
+            final char x = chars[i + j];
+            builder.append(ChatColor.COLOR_CHAR).append(x);
+          }
+
+          if (j == 7) {
+            i += 6;
+          } else {
+            builder.setLength(builder.length() - (j * 2)); // undo &x parsing
+          }
+        }
+        continue;
+      }
+
+      if (l != closure.head || i + 1 >= chars.length) {
+        builder.append(l);
+        continue;
+      }
+
+      boolean identified = false;
+      boolean oopsitsbad = true;
+      boolean hadSpace = false;
+
+      while (++i < chars.length) {
+        final char p = chars[i];
+
+        if (p == ' ' && !identified) {
+          hadSpace = true;
+          break;
+        }
+        if (p == closure.tail) {
+          oopsitsbad = false;
+          break;
+        }
+
+        if (p == '_' && !identified) {
+          identified = true;
+          continue;
+        }
+
+        if (identified) {
+          parameters.append(p);
+        } else {
+          identifier.append(p);
+        }
+      }
+
+      final String identifierString = identifier.toString().toLowerCase();
+      final String parametersString = parameters.toString();
+
+      identifier.setLength(0);
+      parameters.setLength(0);
+
+      if (oopsitsbad) {
+        builder.append(closure.head).append(identifierString);
+
+        if (identified) {
+          builder.append('_').append(parametersString);
+        }
+
+        if (hadSpace) {
+          builder.append(' ');
+        }
+        continue;
+      }
+
+      final PlaceholderExpansion placeholder = lookup.apply(identifierString);
+      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(ChatColor.translateAlternateColorCodes('&', replacement));
+    }
+
+    return builder.toString();
+  }
+
+}

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -61,7 +61,7 @@ public final class RegexReplacer implements Replacer {
         continue;
       }
 
-      final String requested = expansion.parsePlaceholders(player, parameters);
+      final String requested = expansion.onRequest(player, parameters);
       matcher.appendReplacement(builder, requested != null ? requested : matcher.group(0));
     }
     while (matcher.find());

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.
@@ -50,7 +50,7 @@ public final class Format {
   }
 
   @NotNull
-  private static String buildFormat(@NotNull final Align align, final int[] spacing) {
+  private static String buildFormat(@NotNull final Align align, @NotNull final int[] spacing) {
     return stream(spacing)
         .mapToObj(space -> "%" + (align == Align.LEFT ? "-" : "") + (space + 2) + "s")
         .collect(joining());

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is 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.

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

@@ -88,4 +88,12 @@ public final class ReplacerUnitTester {
     assertEquals(text, Values.CHARS_REPLACER.apply(text, null, Values.PLACEHOLDERS::get));
   }
 
+  @Test
+  void testCharsReplacerHandlesEscapedHex() {
+    final String text = "\\&xffffffThis should not change.";
+
+    assertEquals(text.substring(1),
+        Values.CHARS_REPLACER.apply(text, null, Values.PLACEHOLDERS::get));
+  }
+
 }