Skip to content

Commit

Permalink
fix(msg): 修复消息占位符顺序错误 #47
Browse files Browse the repository at this point in the history
  • Loading branch information
@CarmJos
CarmJos committed Oct 23, 2023
1 parent 53281b8 commit 9054161
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<groupId>cc.carm.plugin</groupId>
<artifactId>userprefix</artifactId>
<version>3.2.2</version>
<version>3.2.3</version>

<name>UserPrefix</name>
<description>轻便、高效、实时的用户前缀系统。</description>
Expand Down
28 changes: 14 additions & 14 deletions src/main/java/cc/carm/plugin/userprefix/conf/PluginMessages.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ public class PluginMessages extends ConfigurationRoot {

public static final class COMMAND_USAGE extends ConfigurationRoot {

public static ConfiguredMessageList<String> CONSOLE = ConfiguredMessageList.asStrings().defaults(
public static final ConfiguredMessageList<String> CONSOLE = ConfiguredMessageList.asStrings().defaults(
"&f请输入 &b/prefix <玩家ID> &f为指定玩家打开前缀GUI。"
).build();

public static ConfiguredMessageList<String> ADMIN = ConfiguredMessageList.asStrings().defaults(
public static final ConfiguredMessageList<String> ADMIN = ConfiguredMessageList.asStrings().defaults(
"&3&l用户前缀系统 &f帮助",
"&8# &f/upa list",
"&8- &7查看当前前缀列表。",
Expand All @@ -23,52 +23,52 @@ public static final class COMMAND_USAGE extends ConfigurationRoot {
"&8- &7重载前缀配置。"
).build();

public static ConfiguredMessageList<String> NO_PERM = ConfiguredMessageList.asStrings()
public static final ConfiguredMessageList<String> NO_PERM = ConfiguredMessageList.asStrings()
.defaults("&c&l抱歉！&f但您没有权限使用该指令。")
.build();

}

public static ConfiguredMessageList<String> NOT_ONLINE = ConfiguredMessageList.asStrings()
public static final ConfiguredMessageList<String> NOT_ONLINE = ConfiguredMessageList.asStrings()
.defaults("&7玩家 &b%(player) &7并不在线。")
.params("player").build();

public static ConfiguredMessageList<String> SELECTED = ConfiguredMessageList.asStrings()
public static final ConfiguredMessageList<String> SELECTED = ConfiguredMessageList.asStrings()
.defaults("&7您选择了 &f%(name) &7作为当前显示的前缀。")
.params("name").build();

public static ConfiguredMessageList<String> EXPIRED = ConfiguredMessageList.asStrings()
public static final ConfiguredMessageList<String> EXPIRED = ConfiguredMessageList.asStrings()
.defaults(
"&7您先前使用的前缀 &f%(oldName) &7已到期。",
"&7现在已为您重新调整为 &f%(newName) &7。"
).params("oldName", "newName").build();

public static ConfiguredMessageList<String> REMOVED = ConfiguredMessageList.asStrings()
public static final ConfiguredMessageList<String> REMOVED = ConfiguredMessageList.asStrings()
.defaults("&7您先前使用的前缀已被移除，现在已为您重新调整为 &f%(newName) &7。")
.params("newName").build();

public static final class RELOAD extends ConfigurationRoot {

public static ConfiguredMessageList<String> SUCCESS = ConfiguredMessageList.asStrings()
public static final ConfiguredMessageList<String> SUCCESS = ConfiguredMessageList.asStrings()
.defaults("&a&l重载完成！&7耗时 &f%(time)ms&7，共加载了 &b%(count) &7个前缀。")
.params("time", "count").build();

public static ConfiguredMessageList<String> FAILED = ConfiguredMessageList.asStrings()
public static final ConfiguredMessageList<String> FAILED = ConfiguredMessageList.asStrings()
.defaults("&c&l重载出错！&7错误提示为 &8“&r%(error)&8”。")
.params("error").build();
}

public static final class SET extends ConfigurationRoot {

public static ConfiguredMessageList<String> SUCCESS = ConfiguredMessageList.asStrings()
public static final ConfiguredMessageList<String> SUCCESS = ConfiguredMessageList.asStrings()
.defaults("&a&l设置成功！&7成功设定玩家 &b%(player) &f的前缀为 &r%(prefix) &f。")
.params("player", "prefix").build();

public static ConfiguredMessageList<String> PREFIX_NOT_FOUND = ConfiguredMessageList.asStrings()
public static final ConfiguredMessageList<String> PREFIX_NOT_FOUND = ConfiguredMessageList.asStrings()
.defaults("&c&l无法设置！&7不存在ID为 &b%(prefix) &7的前缀。")
.params("prefix").build();

public static ConfiguredMessageList<String> NO_PERM = ConfiguredMessageList.asStrings()
public static final ConfiguredMessageList<String> NO_PERM = ConfiguredMessageList.asStrings()
.defaults("&c&l无法设置！&7玩家 &b%(player) &7并没有前缀 &r%(prefix) &7的前缀。")
.params("player", "prefix")
.build();
Expand All @@ -79,10 +79,10 @@ public static final class SET extends ConfigurationRoot {
@HeaderComment("管理员使用的 “/upa list” 指令的格式")
public static final class LIST extends ConfigurationRoot {

public static ConfiguredMessageList<String> HEADER = ConfiguredMessageList.asStrings()
public static final ConfiguredMessageList<String> HEADER = ConfiguredMessageList.asStrings()
.defaults("&3&l用户前缀系统 &f前缀列表").build();

public static ConfiguredMessageList<String> VALUE = ConfiguredMessageList.asStrings().defaults(
public static final ConfiguredMessageList<String> VALUE = ConfiguredMessageList.asStrings().defaults(
"&8#%(weight) &f%(identifier)",
"&8- &7显示名 &r%(name) &7权限 &r%(permission)",
"&8- &7内容示例&r %(content) %(sender_name)"
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/cc/carm/plugin/userprefix/manager/UserManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@ public void checkPrefix(Player player, boolean updateView) {
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) -> {
Expand Down

0 comments on commit 9054161

Please sign in to comment.