From ba6a9fc798cdec6d90d6a4cf99e079ae0dedf5e0 Mon Sep 17 00:00:00 2001 From: tester233 <1804830236@qq.com> Date: Tue, 31 May 2022 17:18:54 +0800 Subject: [PATCH] Usage: Unified specification --- .../command/commands/EnterDungeonCommand.java | 2 +- .../emu/grasscutter/command/commands/QuestCommand.java | 2 +- .../grasscutter/command/commands/WeatherCommand.java | 2 +- src/main/resources/languages/en-US.json | 10 +++++----- src/main/resources/languages/pl-PL.json | 2 +- src/main/resources/languages/zh-CN.json | 8 ++++---- src/main/resources/languages/zh-TW.json | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java b/src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java index bf34b660e..33e25dca3 100644 --- a/src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java @@ -8,7 +8,7 @@ import java.util.List; import static emu.grasscutter.utils.Language.translate; -@Command(label = "enterdungeon", usage = "enterdungeon ", aliases = {"dungeon"}, permission = "player.enterdungeon", permissionTargeted = "player.enterdungeon.others", description = "commands.enter_dungeon.description") +@Command(label = "enterdungeon", usage = "enterdungeon ", aliases = {"dungeon"}, permission = "player.enterdungeon", permissionTargeted = "player.enterdungeon.others", description = "commands.enter_dungeon.description") public final class EnterDungeonCommand implements CommandHandler { @Override diff --git a/src/main/java/emu/grasscutter/command/commands/QuestCommand.java b/src/main/java/emu/grasscutter/command/commands/QuestCommand.java index b85ed9f61..f9a555149 100644 --- a/src/main/java/emu/grasscutter/command/commands/QuestCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/QuestCommand.java @@ -10,7 +10,7 @@ import java.util.List; import static emu.grasscutter.utils.Language.translate; -@Command(label = "quest", usage = "quest [quest id]", permission = "player.quest", permissionTargeted = "player.quest.others", description = "commands.quest.description") +@Command(label = "quest", usage = "quest [questId]", permission = "player.quest", permissionTargeted = "player.quest.others", description = "commands.quest.description") public final class QuestCommand implements CommandHandler { @Override diff --git a/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java b/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java index f9a398a06..18fef9293 100644 --- a/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java @@ -11,7 +11,7 @@ import java.util.List; import static emu.grasscutter.utils.Language.translate; -@Command(label = "weather", usage = "weather [climateId]", aliases = {"w"}, permission = "player.weather", permissionTargeted = "player.weather.others", description = "commands.weather.description") +@Command(label = "weather", usage = "weather ", aliases = {"w"}, permission = "player.weather", permissionTargeted = "player.weather.others", description = "commands.weather.description") public final class WeatherCommand implements CommandHandler { @Override diff --git a/src/main/resources/languages/en-US.json b/src/main/resources/languages/en-US.json index 269b10c7b..667490539 100644 --- a/src/main/resources/languages/en-US.json +++ b/src/main/resources/languages/en-US.json @@ -139,7 +139,7 @@ "description": "Forces someone to join the world of others" }, "enter_dungeon": { - "usage": "Usage: enterdungeon ", + "usage": "Usage: enterdungeon ", "changed": "Changed to dungeon %s.", "not_found_error": "Dungeon does not exist.", "in_dungeon_error": "You are already in that dungeon.", @@ -159,7 +159,7 @@ "description": "Gives the player a specified artifact" }, "giveChar": { - "usage": "Usage: givechar [level]", + "usage": "Usage: givechar [level]", "given": "Given %s with level %s to %s.", "invalid_avatar_id": "Invalid avatar ID.", "invalid_avatar_level": "Invalid avatar level.", @@ -227,7 +227,7 @@ "description": "Get coordinates" }, "quest": { - "usage": "quest [quest ID]", + "usage": "quest [questID]", "added": "Quest %s added.", "finished": "Finished quest %s.", "not_found": "Quest not found.", @@ -250,7 +250,7 @@ "description": "Reset target player's shop refresh time" }, "sendMail": { - "usage": "Usage: sendmail [templateId]", + "usage": "Usage: sendmail [templateId]", "user_not_exist": "The user with an ID of '%s' does not exist.", "start_composition": "Starting composition of message.\nPlease use '/sendmail ' to continue.\nYou can use '/sendmail stop' at any time.", "templates": "Mail templates coming soon implemented...", @@ -362,7 +362,7 @@ "description": "Change the player's position" }, "weather": { - "usage": "Usage: weather <weatherID> [climateID]", + "usage": "Usage: weather <weatherID> <climateID>", "success": "Changed weather to %s with climate %s.", "invalid_id": "Invalid ID.", "description": "Changes the weather" diff --git a/src/main/resources/languages/pl-PL.json b/src/main/resources/languages/pl-PL.json index eb139c4ba..f3853ab89 100644 --- a/src/main/resources/languages/pl-PL.json +++ b/src/main/resources/languages/pl-PL.json @@ -290,7 +290,7 @@ "success": "Przeteleportowano %s do %s, %s, %s w scenie %s" }, "weather": { - "usage": "Użycie: weather <ID pogody> [ID klimatu]", + "usage": "Użycie: weather <ID pogody> <ID klimatu>", "success": "Zmieniono pogodę na %s z klimatem %s", "invalid_id": "Błędne ID." }, diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json index 20367261a..9b5037970 100644 --- a/src/main/resources/languages/zh-CN.json +++ b/src/main/resources/languages/zh-CN.json @@ -331,9 +331,9 @@ }, "team": { "usage": "用法：team <add|remove|set> [角色ID,...] [索引|first|last|索引-索引,...]", - "invalid_usage": "无效用法。", + "invalid_usage": "无效的用法。", "add_usage": "用法(add)：team add <角色ID,...> [索引]", - "invalid_index": "无效索引。", + "invalid_index": "无效的索引。", "add_too_much": "服务端仅允许你队伍里至多有 %d 名角色。", "failed_to_add_avatar": "无法根据ID %s 添加角色。", "remove_usage": "用法(remove)：team remove <索引|first|last|索引-索引,...>", @@ -361,7 +361,7 @@ "description": "改变指定玩家的位置" }, "weather": { - "usage": "用法：weather <天气ID> [气候ID]", + "usage": "用法：weather <天气ID> <气候ID>", "success": "已更改天气为 %s，气候为 %s。", "invalid_id": "无效的天气ID。", "description": "更改天气" @@ -369,7 +369,7 @@ "drop": { "command_usage": "用法：drop <物品ID|物品名称> [数量]", "success": "已丢下 %s 个 %s。", - "description": "在你附近丢下一个物品" + "description": "在你的附近丢下物品" }, "help": { "usage": "用法：", diff --git a/src/main/resources/languages/zh-TW.json b/src/main/resources/languages/zh-TW.json index 2149881dc..1c1d06420 100644 --- a/src/main/resources/languages/zh-TW.json +++ b/src/main/resources/languages/zh-TW.json @@ -139,7 +139,7 @@ "description": "強制傳送指定用戶到他人的世界。" }, "enter_dungeon": { - "usage": "用法：enterdungeon <dungeon id>", + "usage": "用法：enterdungeon <dungeonId>", "changed": "已進入祕境 %s", "not_found_error": "此祕境不存在。", "in_dungeon_error": "你已經在祕境中了。", @@ -366,7 +366,7 @@ "description": "將玩家的位置傳送到你所指定的座標。" }, "weather": { - "usage": "用法：weather <weatherId> [climateId]", + "usage": "用法：weather <weatherId> <climateId>", "success": "已將當前天氣設定為 %s ，氣候則為 %s 。", "invalid_id": "無效的ID。", "description": "更改目前的天氣。"