carm/UserPrefix
1
Fork 0
mirror of https://github.com/CarmJos/UserPrefix.git synced 2026-06-04 15:28:21 +08:00
Code Issues Releases Activity

feat(content): 为前缀内容支持PAPI。

Browse Source
This commit is contained in:
Carm Jos
2025-02-04 15:03:39 +08:00
parent 844f59af20
commit 3c19c8165f
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/cc/carm/plugin/userprefix/command/admin/ListCommand.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class ListCommand extends SubCommand<AdminCommand> {
PluginMessages.LIST.VALUE.send(sender,
value.getWeight(), value.getIdentifier(),
value.getName(), value.getPermission(),
value.getContent(), sender.getName()
value.getContent(sender), sender.getName()
);
}
return null;
src/main/java/cc/carm/plugin/userprefix/conf/prefix/PrefixConfig.java
+4 -3
View File
@@ -1,9 +1,10 @@
package cc.carm.plugin.userprefix.conf.prefix;
import cc.carm.lib.easyplugin.gui.configuration.GUIActionConfiguration;
import cc.carm.lib.easyplugin.utils.ColorParser;
import cc.carm.lib.easyplugin.utils.MessageUtils;
import cc.carm.lib.mineconfiguration.bukkit.value.item.PreparedItem;
import cc.carm.plugin.userprefix.manager.ServiceManager;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.Contract;
@@ -57,8 +58,8 @@ public class PrefixConfig {
}
@NotNull
public String getContent() {
return ColorParser.parse(content);
public String getContent(CommandSender viewer) {
return MessageUtils.setPlaceholders(viewer, content);
}
public int getWeight() {
src/main/java/cc/carm/plugin/userprefix/hooker/UserPrefixExpansion.java
+5 -1
View File
@@ -42,7 +42,11 @@ public class UserPrefixExpansion extends EasyPlaceholder {
public PlaceholderHandler handlePrefix(Function<PrefixConfig, Object> handler) {
return handlePlayer((player, args) -> handler.apply(UserPrefixAPI.getUserManager().getPrefix(player)));
}
public PlaceholderHandler handlePrefix(BiFunction<PrefixConfig, Player, Object> handler) {
return handlePlayer((player, args) -> handler.apply(UserPrefixAPI.getUserManager().getPrefix(player), player));
}
/**
* This is required or else PlaceholderAPI will unregister the Expansion on reload
*/
src/main/java/cc/carm/plugin/userprefix/manager/UserManager.java
+3 -3
View File
@@ -80,7 +80,7 @@ public class UserManager {
PrefixConfig playerPrefix = getPrefix(player);
boolean descOrder = PluginConfig.FUNCTIONS.NAME_PREFIX.ORDER_DESC.getNotNull();
tag.setPrefix(playerPrefix.getContent());
tag.setPrefix(playerPrefix.getContent(player));
tag.setOrder(descOrder ? 999 - playerPrefix.getWeight() : playerPrefix.getWeight());
Main.debugging("为玩家 " + player.getName() + " 设置了 " + player.getName() + "的前缀为 #" + playerPrefix.getWeight() + " " + playerPrefix.getName());
@@ -90,7 +90,7 @@ public class UserManager {
UserNameTag onlinePlayerTag = getNameTag(onlinePlayer);
if (onlinePlayerTag != null) {
onlinePlayerTag.setPrefix(player, playerPrefix.getContent());
onlinePlayerTag.setPrefix(player, playerPrefix.getContent(onlinePlayer));
onlinePlayerTag.setOrder(player, descOrder ? 999 - playerPrefix.getWeight() : playerPrefix.getWeight());
Main.debugging("为玩家 " + onlinePlayer.getName() + " 设置了 " + player.getName() + "的前缀为 #" + playerPrefix.getWeight() + " " + playerPrefix.getName());
@@ -98,7 +98,7 @@ public class UserManager {
if (loadOthers) {
PrefixConfig onlinePlayerPrefix = getPrefix(onlinePlayer);
tag.setPrefix(onlinePlayer, onlinePlayerPrefix.getContent());
tag.setPrefix(onlinePlayer, onlinePlayerPrefix.getContent(player));
tag.setOrder(onlinePlayer, descOrder ? 999 - onlinePlayerPrefix.getWeight() : onlinePlayerPrefix.getWeight());
Main.debugging("为玩家 " + player.getName() + " 设置了 " + onlinePlayer.getName() + "的前缀为 #" + onlinePlayerPrefix.getWeight() + " " + onlinePlayerPrefix.getName());
}