diff --git a/pom.xml b/pom.xml index fc65b4c..1b1f335 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ cc.carm.plugin userprefix - 3.2.2 + 3.2.3 UserPrefix 轻便、高效、实时的用户前缀系统。 diff --git a/src/main/java/cc/carm/plugin/userprefix/conf/PluginMessages.java b/src/main/java/cc/carm/plugin/userprefix/conf/PluginMessages.java index b230948..6d23b38 100644 --- a/src/main/java/cc/carm/plugin/userprefix/conf/PluginMessages.java +++ b/src/main/java/cc/carm/plugin/userprefix/conf/PluginMessages.java @@ -8,11 +8,11 @@ public class PluginMessages extends ConfigurationRoot { public static final class COMMAND_USAGE extends ConfigurationRoot { - public static ConfiguredMessageList CONSOLE = ConfiguredMessageList.asStrings().defaults( + public static final ConfiguredMessageList CONSOLE = ConfiguredMessageList.asStrings().defaults( "&f请输入 &b/prefix <玩家ID> &f为指定玩家打开前缀GUI。" ).build(); - public static ConfiguredMessageList ADMIN = ConfiguredMessageList.asStrings().defaults( + public static final ConfiguredMessageList ADMIN = ConfiguredMessageList.asStrings().defaults( "&3&l用户前缀系统 &f帮助", "&8# &f/upa list", "&8- &7查看当前前缀列表。", @@ -23,52 +23,52 @@ public class PluginMessages extends ConfigurationRoot { "&8- &7重载前缀配置。" ).build(); - public static ConfiguredMessageList NO_PERM = ConfiguredMessageList.asStrings() + public static final ConfiguredMessageList NO_PERM = ConfiguredMessageList.asStrings() .defaults("&c&l抱歉!&f但您没有权限使用该指令。") .build(); } - public static ConfiguredMessageList NOT_ONLINE = ConfiguredMessageList.asStrings() + public static final ConfiguredMessageList NOT_ONLINE = ConfiguredMessageList.asStrings() .defaults("&7玩家 &b%(player) &7并不在线。") .params("player").build(); - public static ConfiguredMessageList SELECTED = ConfiguredMessageList.asStrings() + public static final ConfiguredMessageList SELECTED = ConfiguredMessageList.asStrings() .defaults("&7您选择了 &f%(name) &7作为当前显示的前缀。") .params("name").build(); - public static ConfiguredMessageList EXPIRED = ConfiguredMessageList.asStrings() + public static final ConfiguredMessageList EXPIRED = ConfiguredMessageList.asStrings() .defaults( "&7您先前使用的前缀 &f%(oldName) &7已到期。", "&7现在已为您重新调整为 &f%(newName) &7。" ).params("oldName", "newName").build(); - public static ConfiguredMessageList REMOVED = ConfiguredMessageList.asStrings() + public static final ConfiguredMessageList REMOVED = ConfiguredMessageList.asStrings() .defaults("&7您先前使用的前缀已被移除,现在已为您重新调整为 &f%(newName) &7。") .params("newName").build(); public static final class RELOAD extends ConfigurationRoot { - public static ConfiguredMessageList SUCCESS = ConfiguredMessageList.asStrings() + public static final ConfiguredMessageList SUCCESS = ConfiguredMessageList.asStrings() .defaults("&a&l重载完成!&7耗时 &f%(time)ms&7,共加载了 &b%(count) &7个前缀。") .params("time", "count").build(); - public static ConfiguredMessageList FAILED = ConfiguredMessageList.asStrings() + public static final ConfiguredMessageList FAILED = ConfiguredMessageList.asStrings() .defaults("&c&l重载出错!&7错误提示为 &8“&r%(error)&8”。") .params("error").build(); } public static final class SET extends ConfigurationRoot { - public static ConfiguredMessageList SUCCESS = ConfiguredMessageList.asStrings() + public static final ConfiguredMessageList SUCCESS = ConfiguredMessageList.asStrings() .defaults("&a&l设置成功!&7成功设定玩家 &b%(player) &f的前缀为 &r%(prefix) &f。") .params("player", "prefix").build(); - public static ConfiguredMessageList PREFIX_NOT_FOUND = ConfiguredMessageList.asStrings() + public static final ConfiguredMessageList PREFIX_NOT_FOUND = ConfiguredMessageList.asStrings() .defaults("&c&l无法设置!&7不存在ID为 &b%(prefix) &7的前缀。") .params("prefix").build(); - public static ConfiguredMessageList NO_PERM = ConfiguredMessageList.asStrings() + public static final ConfiguredMessageList NO_PERM = ConfiguredMessageList.asStrings() .defaults("&c&l无法设置!&7玩家 &b%(player) &7并没有前缀 &r%(prefix) &7的前缀。") .params("player", "prefix") .build(); @@ -79,10 +79,10 @@ public class PluginMessages extends ConfigurationRoot { @HeaderComment("管理员使用的 “/upa list” 指令的格式") public static final class LIST extends ConfigurationRoot { - public static ConfiguredMessageList HEADER = ConfiguredMessageList.asStrings() + public static final ConfiguredMessageList HEADER = ConfiguredMessageList.asStrings() .defaults("&3&l用户前缀系统 &f前缀列表").build(); - public static ConfiguredMessageList VALUE = ConfiguredMessageList.asStrings().defaults( + public static final ConfiguredMessageList VALUE = ConfiguredMessageList.asStrings().defaults( "&8#%(weight) &f%(identifier)", "&8- &7显示名 &r%(name) &7权限 &r%(permission)", "&8- &7内容示例&r %(content) %(sender_name)" diff --git a/src/main/java/cc/carm/plugin/userprefix/manager/UserManager.java b/src/main/java/cc/carm/plugin/userprefix/manager/UserManager.java index f287bce..7e40c1b 100644 --- a/src/main/java/cc/carm/plugin/userprefix/manager/UserManager.java +++ b/src/main/java/cc/carm/plugin/userprefix/manager/UserManager.java @@ -131,13 +131,13 @@ public class UserManager { UserPrefixExpireEvent.call(player, currentPrefix); // 发送消息 - PluginMessages.EXPIRED.send(player, newPrefix.getName(), currentPrefix.getName()); + PluginMessages.EXPIRED.send(player, currentPrefix.getName(), newPrefix.getName()); // 播放声音 PluginConfig.SOUNDS.PREFIX_EXPIRED.playTo(player); } else { // 当前前缀为空,则代表是旧的前缀不存在了, - PluginMessages.REMOVED.send(player, newPrefix.getName(), currentPrefixData); + PluginMessages.REMOVED.send(player, newPrefix.getName()); } UserPrefixChangeEvent.call(player, currentPrefix, newPrefix, (after) -> {