Update PlaceholderAPI support

Author: jamezrin

addon/pom.xml

@@ -20,8 +20,8 @@
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
         <repository>
-            <id>extendedclip-repo</id>
-            <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+            <id>placeholderapi</id>
+            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
     </repositories>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.8.2</version>
+            <version>2.10.5</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java

@@ -4,16 +4,16 @@
 
 public class PlayerBalancerAddon extends JavaPlugin {
     private PluginMessageManager manager;
-    private PlaceholderHandler handler;
+    private PlayerBalancerPlaceholderExpansion expansion;
 
     @Override
     public void onEnable() {
         manager = new PluginMessageManager(this);
         getCommand("spb").setExecutor(new MainCommand(this));
 
         if (getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
-            handler = new PlaceholderHandler(this);
-            handler.hook();
+            expansion = new PlayerBalancerPlaceholderExpansion(this);
+            expansion.register();
         }
     }
 

…yerbalanceraddon/PlaceholderHandler.java …/PlayerBalancerPlaceholderExpansion.javaaddon/src/main/java/com/jaimemartz/playerbalanceraddon/PlaceholderHandler.java renamed to addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerPlaceholderExpansion.java addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlaceholderHandler.java renamed to addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerPlaceholderExpansion.java

@@ -1,24 +1,23 @@
 package com.jaimemartz.playerbalanceraddon;
 
-import me.clip.placeholderapi.external.EZPlaceholderHook;
-import org.bukkit.entity.Player;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.bukkit.OfflinePlayer;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class PlaceholderHandler extends EZPlaceholderHook {
+public class PlayerBalancerPlaceholderExpansion extends PlaceholderExpansion {
     private final Map<String, Integer> sectionPlayerCounts = new LinkedHashMap<>();
     private final PlayerBalancerAddon plugin;
 
-    public PlaceholderHandler(PlayerBalancerAddon plugin) {
-        super(plugin, "balancer");
+    public PlayerBalancerPlaceholderExpansion(PlayerBalancerAddon plugin) {
         this.plugin = plugin;
     }
 
     @Override
-    public String onPlaceholderRequest(Player player, String identifier) {
-        if (identifier.startsWith("playercount_")) {
-            String section = identifier.split("playercount_")[1];
+    public String onRequest(OfflinePlayer player, String identifier) {
+        if (identifier.startsWith("pc")) {
+            String section = identifier.split("pc_")[1];
 
             if (section == null)
                 return null;
@@ -34,4 +33,19 @@ public String onPlaceholderRequest(Player player, String identifier) {
 
         return null;
     }
+
+    @Override
+    public String getIdentifier() {
+        return "pb";
+    }
+
+    @Override
+    public String getAuthor() {
+        return "Jamezrin <jaime@jamezrin.name>";
+    }
+
+    @Override
+    public String getVersion() {
+        return "bundled";
+    }
 }

balancer/src/main/java/com/jaimemartz/playerbalancer/helper/PasteHelper.java

@@ -108,7 +108,7 @@ public void send(PlayerBalancer plugin, CommandSender sender) {
             try {
                 url = paste(plugin);
             } catch (PasteException e) {
-                sender.sendMessage(new ComponentBuilder("An pastebin exception occurred: " + e.getMessage())
+                sender.sendMessage(new ComponentBuilder("An exception occurred while trying to send the paste: " + e.getMessage())
                         .color(ChatColor.RED)
                         .create()
                 );