Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import lombok.Getter;
import me.confuser.banmanager.bukkit.listeners.*;
import me.confuser.banmanager.bukkit.placeholders.PAPIPlaceholderResolver;
import me.confuser.banmanager.bukkit.placeholders.PAPIPlaceholders;
import me.confuser.banmanager.common.BanManagerPlugin;
import me.confuser.banmanager.common.commands.CommonCommand;
Expand Down Expand Up @@ -150,6 +151,8 @@ public void setupListeners() {

if(Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
new PAPIPlaceholders(plugin).register();
plugin.setPlaceholderResolver(new PAPIPlaceholderResolver());
plugin.getLogger().info("PlaceholderAPI support enabled for messages");
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package me.confuser.banmanager.bukkit.placeholders;

import me.clip.placeholderapi.PlaceholderAPI;
import me.confuser.banmanager.common.CommonPlayer;
import me.confuser.banmanager.common.PlaceholderResolver;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;

public class PAPIPlaceholderResolver implements PlaceholderResolver {
@Override
public String resolve(CommonPlayer player, String message) {
Player bukkitPlayer = Bukkit.getPlayer(player.getUniqueId());
if (bukkitPlayer == null) return message;
return PlaceholderAPI.setPlaceholders(bukkitPlayer, message);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ public class BanManagerPlugin {
@Getter
private Runner syncRunner;

@Setter
@Getter
private PlaceholderResolver placeholderResolver;

public BanManagerPlugin(PluginInfo pluginInfo, CommonLogger logger, File dataFolder, CommonScheduler scheduler, CommonServer server, CommonMetrics metrics) {
this.pluginInfo = pluginInfo;
this.logger = logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package me.confuser.banmanager.common;

@FunctionalInterface
public interface PlaceholderResolver {
String resolve(CommonPlayer player, String message);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

import lombok.EqualsAndHashCode;
import lombok.Getter;
import me.confuser.banmanager.common.BanManagerPlugin;
import me.confuser.banmanager.common.CommonLogger;
import me.confuser.banmanager.common.CommonPlayer;
import me.confuser.banmanager.common.PlaceholderResolver;
import me.confuser.banmanager.common.commands.CommonSender;
import me.confuser.banmanager.common.configs.Config;
import me.confuser.banmanager.common.configuration.file.YamlConfiguration;
Expand Down Expand Up @@ -101,7 +103,13 @@ public boolean sendTo(CommonPlayer player) {
if (player == null) return false;
if (!player.isOnline()) return false;

player.sendMessage(message);
String resolved = message;
PlaceholderResolver resolver = BanManagerPlugin.getInstance().getPlaceholderResolver();
if (resolver != null) {
resolved = resolver.resolve(player, message);
}

player.sendMessage(resolved);

return true;
}
Expand All @@ -115,4 +123,3 @@ public String toString() {
return message;
}
}