Release 2.11.1

Merge pull request #772 from PlaceholderAPI/fix/771-identifier-replacement
Fix #771
2026-11-04 08:52:06 -05:00 · 2021-12-27 01:32:00 -08:00 · 2021-12-27 15:21:30 +08:00 · 2021-12-24 12:34:36 +08:00 · 2021-12-24 12:32:01 +08:00 · 2021-12-24 12:26:22 +08:00
56 changed files with 109 additions and 96 deletions
@@ -8,7 +8,7 @@ plugins {
 }

 group "me.clip"
-version "2.11.0"
+version "2.11.1"

 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.1"
+    testImplementation "org.junit.jupiter:junit-jupiter-engine:5.8.2"
    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.1"
 }

@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -292,14 +292,14 @@ public final class PlaceholderAPI {
  // === Deprecated API ===

  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static boolean registerExpansion(PlaceholderExpansion expansion)
  {
    return expansion.register();
  }

  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static boolean unregisterExpansion(PlaceholderExpansion expansion)
  {
    return expansion.unregister();
@@ -313,7 +313,7 @@ public final class PlaceholderAPI {
   * @return Map of registered placeholders
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static Map<String, PlaceholderHook> getPlaceholders() {
    return PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()
        .getExpansions().stream()
@@ -329,7 +329,7 @@ public final class PlaceholderAPI {
   * @return always false
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @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!"
@@ -347,7 +347,7 @@ public final class PlaceholderAPI {
   * @return always false
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static boolean registerPlaceholderHook(String identifier,
      PlaceholderHook placeholderHook) {
    PlaceholderAPIPlugin.getInstance().getLogger().warning(identifier
@@ -363,7 +363,7 @@ public final class PlaceholderAPI {
   * @return always false
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @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!"
@@ -380,7 +380,7 @@ public final class PlaceholderAPI {
   * @return always false
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @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!");
@@ -393,7 +393,7 @@ public final class PlaceholderAPI {
   * @return Set of registered identifiers
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static Set<String> getRegisteredPlaceholderPlugins() {
    return getRegisteredIdentifiers();
  }
@@ -404,7 +404,7 @@ public final class PlaceholderAPI {
   * @return always null
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static Set<String> getExternalPlaceholderPlugins() {
    return null;
  }
@@ -419,7 +419,7 @@ public final class PlaceholderAPI {
   * @return String with the parsed placeholders
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static String setPlaceholders(OfflinePlayer player,
      String text, Pattern pattern, boolean colorize) {
    return setPlaceholders(player, text);
@@ -435,7 +435,7 @@ public final class PlaceholderAPI {
   * @return String with the parsed placeholders
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static List<String> setPlaceholders(OfflinePlayer player,
      List<String> text, Pattern pattern, boolean colorize) {
    return setPlaceholders(player, text);
@@ -450,7 +450,7 @@ public final class PlaceholderAPI {
   * @return String with the parsed placeholders
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static List<String> setPlaceholders(OfflinePlayer player, List<String> text,
      boolean colorize) {
    return setPlaceholders(player, text);
@@ -465,7 +465,7 @@ public final class PlaceholderAPI {
   * @return String with the parsed placeholders
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static List<String> setPlaceholders(OfflinePlayer player, List<String> text,
      Pattern pattern) {
    return setPlaceholders(player, text);
@@ -479,7 +479,7 @@ public final class PlaceholderAPI {
   * @return String with the parsed placeholders
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static String setPlaceholders(Player player, String text, boolean colorize) {
    return setPlaceholders(player, text);
  }
@@ -493,7 +493,7 @@ public final class PlaceholderAPI {
   * @return String with the parsed placeholders
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static List<String> setPlaceholders(Player player, List<String> text, boolean colorize) {
    return setPlaceholders(player, text);
  }
@@ -507,7 +507,7 @@ public final class PlaceholderAPI {
   * @return String with the parsed placeholders
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static String setPlaceholders(OfflinePlayer player, String text, boolean colorize) {
    return setPlaceholders(player, text);
  }
@@ -521,7 +521,7 @@ public final class PlaceholderAPI {
   * @return String with the parsed placeholders
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static String setPlaceholders(OfflinePlayer player, String text, Pattern pattern) {
    return setPlaceholders(player, text);
  }
@@ -535,7 +535,7 @@ public final class PlaceholderAPI {
   * @return String with the parsed placeholders
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static List<String> setBracketPlaceholders(OfflinePlayer player, List<String> text,
      boolean colorize) {
    return setBracketPlaceholders(player, text);
@@ -550,7 +550,7 @@ public final class PlaceholderAPI {
   * @return String with the parsed placeholders
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static String setBracketPlaceholders(OfflinePlayer player, String text, boolean colorize) {
    return setBracketPlaceholders(player, text);
  }
@@ -564,7 +564,7 @@ public final class PlaceholderAPI {
   * @return String with the parsed placeholders
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static String setBracketPlaceholders(Player player, String text, boolean colorize) {
    return setBracketPlaceholders(player, text);
  }
@@ -578,7 +578,7 @@ public final class PlaceholderAPI {
   * @return String with the parsed placeholders
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static List<String> setBracketPlaceholders(Player player, List<String> text,
      boolean colorize) {
    return setBracketPlaceholders(player, text);
@@ -596,7 +596,7 @@ public final class PlaceholderAPI {
   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public static String setRelationalPlaceholders(Player one, Player two, String text,
      boolean colorize) {
    return setRelationalPlaceholders(one, two, text);
@@ -614,7 +614,7 @@ public final class PlaceholderAPI {
   * @deprecated Use {@link #setRelationalPlaceholders(Player, Player, List)} instead.
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @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);
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -31,15 +31,7 @@ import java.util.Map;
 import java.util.stream.Stream;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.impl.cloud.CommandECloud;
-import me.clip.placeholderapi.commands.impl.local.CommandDump;
-import me.clip.placeholderapi.commands.impl.local.CommandExpansionRegister;
-import me.clip.placeholderapi.commands.impl.local.CommandExpansionUnregister;
-import me.clip.placeholderapi.commands.impl.local.CommandHelp;
-import me.clip.placeholderapi.commands.impl.local.CommandInfo;
-import me.clip.placeholderapi.commands.impl.local.CommandList;
-import me.clip.placeholderapi.commands.impl.local.CommandParse;
-import me.clip.placeholderapi.commands.impl.local.CommandReload;
-import me.clip.placeholderapi.commands.impl.local.CommandVersion;
+import me.clip.placeholderapi.commands.impl.local.*;
 import me.clip.placeholderapi.util.Msg;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -406,7 +406,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
   * @return The plugin name.
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public String getPlugin() {
    return null;
  }
@@ -417,7 +417,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
   * @return The description of the expansion.
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public String getDescription() {
    return null;
  }
@@ -428,7 +428,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
   * @return The link for the expansion.
   */
  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
  public String getLink() {
    return null;
  }
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -1,3 +1,23 @@
+/*
+ * 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;
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -126,14 +126,15 @@ public final class CharsReplacer implements Replacer {
        }
      }

-      final String identifierString = identifier.toString().toLowerCase();
+      final String identifierString = identifier.toString();
+      final String lowercaseIdentifierString = identifierString.toLowerCase();
      final String parametersString = parameters.toString();

      identifier.setLength(0);
      parameters.setLength(0);

      if (oopsitsbad) {
-        builder.append(closure.head).append(identifier);
+        builder.append(closure.head).append(identifierString);

        if (identified) {
          builder.append('_').append(parametersString);
@@ -145,9 +146,9 @@ public final class CharsReplacer implements Replacer {
        continue;
      }

-      final PlaceholderExpansion placeholder = lookup.apply(identifierString);
+      final PlaceholderExpansion placeholder = lookup.apply(lowercaseIdentifierString);
      if (placeholder == null) {
-        builder.append(closure.head).append(identifierString);
+        builder.append(closure.head).append(lowercaseIdentifierString);

        if (identified) {
          builder.append('_');
@@ -159,7 +160,7 @@ public final class CharsReplacer implements Replacer {

      final String replacement = placeholder.onRequest(player, parametersString);
      if (replacement == null) {
-        builder.append(closure.head).append(identifierString);
+        builder.append(closure.head).append(lowercaseIdentifierString);

        if (identified) {
          builder.append('_');
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
@@ -4,7 +4,7 @@
 * PlaceholderAPI
 * Copyright (c) 2015 - 2021 PlaceholderAPI Team
 *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * 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.
Author	SHA1	Message	Date
Glare	358a3bcab3	Release 2.11.1	2021-12-27 01:32:00 -08:00
PiggyPiglet	ca088227c3	Merge pull request #772 from PlaceholderAPI/fix/771-identifier-replacement Fix #771	2021-12-27 15:21:30 +08:00
PiggyPiglet	850633e792	Fix #771	2021-12-24 12:34:36 +08:00
PiggyPiglet	348b075ac5	added glare's fancy pants dev string to ver	2021-12-24 12:32:01 +08:00
PiggyPiglet	ce18d3b597	update licenses & bump deprecation ver	2021-12-24 12:26:22 +08:00
PiggyPiglet	9d66d9d9a1	bump ver	2021-12-24 12:24:40 +08:00