Removed Deprecated Methods

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

@@ -22,22 +22,18 @@ package me.clip.placeholderapi;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.List;
-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 {
@@ -288,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.11.0")
-  public static boolean registerExpansion(PlaceholderExpansion expansion)
-  {
-    return expansion.register();
-  }
-
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.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.11.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.11.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.11.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.11.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.11.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.11.0")
-  public static Set<String> getRegisteredPlaceholderPlugins() {
-    return getRegisteredIdentifiers();
-  }
-
-  /**
-   * @deprecated Will be removed in a future release.
-   * 
-   * @return always null
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.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.11.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.11.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.11.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.11.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.11.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.11.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.11.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.11.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.11.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.11.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.11.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.11.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.11.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.11.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/expansion/PlaceholderExpansion.java

@@ -27,7 +27,6 @@ import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.PlaceholderHook;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -82,7 +81,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    */
   @Nullable
   public String getRequiredPlugin() {
-    return getPlugin();
+    return null;
   }
 
   /**
@@ -397,39 +396,4 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
     return String.format("PlaceholderExpansion[name: '%s', author: '%s', version: '%s']", getName(),
         getAuthor(), getVersion());
   }
-
-  // === Deprecated API ===
-
-  /**
-   * @deprecated As of versions greater than 2.8.7, use {@link #getRequiredPlugin()}
-   *
-   * @return The plugin name.
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.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.11.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.11.0")
-  public String getLink() {
-    return null;
-  }
 }