Skip to content

Commit dc04c51

Browse files
jamezrinjamezrin
committed
Update PlaceholderAPI support
1 parent 8f1fbd2 commit dc04c51

4 files changed

Lines changed: 29 additions & 15 deletions

File tree

‎addon/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
2121
</repository>
2222
<repository>
23-
<id>extendedclip-repo</id>
24-
<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
23+
<id>placeholderapi</id>
24+
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
2525
</repository>
2626
</repositories>
2727

@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>me.clip</groupId>
3737
<artifactId>placeholderapi</artifactId>
38-
<version>2.8.2</version>
38+
<version>2.10.5</version>
3939
<scope>provided</scope>
4040
</dependency>
4141
</dependencies>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
public class PlayerBalancerAddon extends JavaPlugin {
66
private PluginMessageManager manager;
7-
private PlaceholderHandler handler;
7+
private PlayerBalancerPlaceholderExpansion expansion;
88

99
@Override
1010
public void onEnable() {
1111
manager = new PluginMessageManager(this);
1212
getCommand("spb").setExecutor(new MainCommand(this));
1313

1414
if (getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
15-
handler = new PlaceholderHandler(this);
16-
handler.hook();
15+
expansion = new PlayerBalancerPlaceholderExpansion(this);
16+
expansion.register();
1717
}
1818
}
1919

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

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
package com.jaimemartz.playerbalanceraddon;
22

3-
import me.clip.placeholderapi.external.EZPlaceholderHook;
4-
import org.bukkit.entity.Player;
3+
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
4+
import org.bukkit.OfflinePlayer;
55

66
import java.util.LinkedHashMap;
77
import java.util.Map;
88

9-
public class PlaceholderHandler extends EZPlaceholderHook {
9+
public class PlayerBalancerPlaceholderExpansion extends PlaceholderExpansion {
1010
private final Map<String, Integer> sectionPlayerCounts = new LinkedHashMap<>();
1111
private final PlayerBalancerAddon plugin;
1212

13-
public PlaceholderHandler(PlayerBalancerAddon plugin) {
14-
super(plugin, "balancer");
13+
public PlayerBalancerPlaceholderExpansion(PlayerBalancerAddon plugin) {
1514
this.plugin = plugin;
1615
}
1716

1817
@Override
19-
public String onPlaceholderRequest(Player player, String identifier) {
20-
if (identifier.startsWith("playercount_")) {
21-
String section = identifier.split("playercount_")[1];
18+
public String onRequest(OfflinePlayer player, String identifier) {
19+
if (identifier.startsWith("pc")) {
20+
String section = identifier.split("pc_")[1];
2221

2322
if (section == null)
2423
return null;
@@ -34,4 +33,19 @@ public String onPlaceholderRequest(Player player, String identifier) {
3433

3534
return null;
3635
}
36+
37+
@Override
38+
public String getIdentifier() {
39+
return "pb";
40+
}
41+
42+
@Override
43+
public String getAuthor() {
44+
return "Jamezrin <jaime@jamezrin.name>";
45+
}
46+
47+
@Override
48+
public String getVersion() {
49+
return "bundled";
50+
}
3751
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void send(PlayerBalancer plugin, CommandSender sender) {
108108
try {
109109
url = paste(plugin);
110110
} catch (PasteException e) {
111-
sender.sendMessage(new ComponentBuilder("An pastebin exception occurred: " + e.getMessage())
111+
sender.sendMessage(new ComponentBuilder("An exception occurred while trying to send the paste: " + e.getMessage())
112112
.color(ChatColor.RED)
113113
.create()
114114
);

0 commit comments

Comments
 (0)