From 21478b0a33e2938bc860384c2382fa4cb41e489a Mon Sep 17 00:00:00 2001 From: RDsatan Date: Tue, 17 May 2022 11:46:51 +0800 Subject: [PATCH] fixed --- .../grasscutter/command/commands/TeamCommand.java | 7 ++++--- src/main/resources/languages/en-US.json | 13 ++----------- src/main/resources/languages/zh-CN.json | 13 ++----------- 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/src/main/java/emu/grasscutter/command/commands/TeamCommand.java b/src/main/java/emu/grasscutter/command/commands/TeamCommand.java index 8ba44f7bf..6dc8448d1 100644 --- a/src/main/java/emu/grasscutter/command/commands/TeamCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/TeamCommand.java @@ -14,8 +14,8 @@ import java.util.HashSet; import static emu.grasscutter.utils.Language.translate; import static emu.grasscutter.Configuration.*; -@Command(label = "team", usage = "team [avatarId,...] [index|first|last|index-index,...]", permission = "player.team", - permissionTargeted = "player.team.others", description = "commands.team.description") +@Command(label = "team", usage = "team [avatarId,...] [index|first|last|index-index,...]", +permission = "player.team", permissionTargeted = "player.team.others", description = "commands.team.description") public final class TeamCommand implements CommandHandler { private static final int BASE_AVATARID = 10000000; @@ -50,7 +50,8 @@ public final class TeamCommand implements CommandHandler { return; } - targetPlayer.getTeamManager().updateTeamEntities(new PacketChangeMpTeamAvatarRsp(targetPlayer, targetPlayer.getTeamManager().getCurrentTeamInfo())); + targetPlayer.getTeamManager().updateTeamEntities( + new PacketChangeMpTeamAvatarRsp(targetPlayer, targetPlayer.getTeamManager().getCurrentTeamInfo())); } private boolean addCommand(Player sender, Player targetPlayer, List args) { diff --git a/src/main/resources/languages/en-US.json b/src/main/resources/languages/en-US.json index 69f29eb0f..65111c363 100644 --- a/src/main/resources/languages/en-US.json +++ b/src/main/resources/languages/en-US.json @@ -181,10 +181,6 @@ "success": "All characters have been healed.", "description": "Heal all characters in your current team." }, - "join": { - "usage": "Usage: join [AvatarIDs] such as\"join 10000038 10000039\"", - "description": "force join avatar into your team" - }, "kick": { "player_kick_player": "Player [%s:%s] has kicked player [%s:%s]", "server_kick_player": "Kicking player [%s:%s]", @@ -237,11 +233,6 @@ "reload_done": "Reload complete.", "description": "Reload server config" }, - "remove": { - "usage": "Usage: remove [indexOfYourTeam] index start from 1", - "invalid_index": "The index number is illegal. It starts from 1 and the maximum value is the number of roles in the team", - "description": "force remove avatar into your team. Such as `remove 1 2`." - }, "resetConst": { "reset_all": "Reset all avatars' constellations.", "success": "Constellations for %s have been reset. Please relog to see changes.", @@ -336,11 +327,11 @@ "invalid_usage": "invalid usage", "add_usage": "usage(add): team add [index]", "invalid_index": "index is invalid", - "add_too_much": "server is only allow you to add %d avatar(s)", + "add_too_much": "server is only allow you to have at most %d avatar(s) in your team", "failed_to_add_avatar": "failed to add avatar by id: %s", "remove_usage": "usage(remove): team remove ", "failed_parse_index": "failed to parse index: %s", - "remove_too_much": "you can't remove so much avatars", + "remove_too_much": "you can't remove so many avatars, your team list will be empty for this", "ignore_index": "ignored index(es): %s", "set_usage": "usage(set): team set ", "index_out_of_range": "index your specified is out of range", diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json index ea0adb8e2..cd572c095 100644 --- a/src/main/resources/languages/zh-CN.json +++ b/src/main/resources/languages/zh-CN.json @@ -180,10 +180,6 @@ "success": "已治疗所有角色。", "description": "治疗当前队伍的角色" }, - "join": { - "usage": "用法：join <角色IDs> 例如\"join 10000038 10000039\"空格分开", - "description": "强制将角色加入到当前队伍中" - }, "kick": { "player_kick_player": "玩家 [%s:%s] 已将 [%s:%s] 踢出。", "server_kick_player": "正在踢出玩家 [%s:%s]...", @@ -236,11 +232,6 @@ "reload_done": "重载完成。", "description": "重载配置文件和数据" }, - "remove": { - "usage": "用法: remove [多个角色在队伍中的序号] 序号从1开始", - "invalid_index": "序号不合法，从1开始，最大值为队内角色数量", - "description": "强制将某个角色从当前队伍中移除。例如`remove 1 2`表示将1号和2号角色从队伍中移除" - }, "resetConst": { "reset_all": "重置所有角色的命座。", "success": "已重置 %s 的命座，重新登录后生效。", @@ -335,11 +326,11 @@ "invalid_usage": "无效用法", "add_usage": "用法(add): team add [index]", "invalid_index": "无效索引", - "add_too_much": "服务端仅支持你添加%d个角色", + "add_too_much": "服务端仅允许你队伍里至多有%d名角色", "failed_to_add_avatar": "无法根据id %s 添加角色", "remove_usage": "用法(remove): team remove ", "failed_parse_index": "无法解析索引: %s", - "remove_too_much": "你不能删除那么多角色", + "remove_too_much": "你不能删除那么多角色，你的队伍列表将会变空", "ignore_index": "忽略的索引列表: %s", "set_usage": "用法(set): team set ", "index_out_of_range": "你指定的索引超出了范围",