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 bf34b660..33e25dca 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 <dungeon id>", aliases = {"dungeon"}, permission = "player.enterdungeon", permissionTargeted = "player.enterdungeon.others", description = "commands.enter_dungeon.description")
+@Command(label = "enterdungeon", usage = "enterdungeon <dungeonId>", 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 b85ed9f6..f9a55514 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 <add|finish> [quest id]", permission = "player.quest", permissionTargeted = "player.quest.others", description = "commands.quest.description")
+@Command(label = "quest", usage = "quest <add|finish> [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 f9a398a0..18fef929 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 <weatherId> [climateId]", aliases = {"w"}, permission = "player.weather", permissionTargeted = "player.weather.others", description = "commands.weather.description")
+@Command(label = "weather", usage = "weather <weatherId> <climateId>", 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 269b10c7..66749053 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 <dungeon ID>",
+ "usage": "Usage: enterdungeon <dungeonID>",
"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 <player> <avatarId> [level]",
+ "usage": "Usage: givechar <player> <avatarID> [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 <add|finish> [quest ID]",
+ "usage": "quest <add|finish> [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 <userId|all|help> [templateId]",
+ "usage": "Usage: sendmail <userID|all|help> [templateId]",
"user_not_exist": "The user with an ID of '%s' does not exist.",
"start_composition": "Starting composition of message.\nPlease use '/sendmail <title>' 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 eb139c4b..f3853ab8 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 20367261..9b503797 100644
--- a/src/main/resources/languages/zh-CN.json
+++ b/src/main/resources/languages/zh-CN.json
@@ -331,9 +331,9 @@
},
"team": {
"usage": "鐢ㄦ硶锛歵eam <add|remove|set> [瑙掕壊ID,...] [绱㈠紩|first|last|绱㈠紩-绱㈠紩,...]",
- "invalid_usage": "鏃犳晥鐢ㄦ硶銆�",
+ "invalid_usage": "鏃犳晥鐨勭敤娉曘€�",
"add_usage": "鐢ㄦ硶(add)锛歵eam add <瑙掕壊ID,...> [绱㈠紩]",
- "invalid_index": "鏃犳晥绱㈠紩銆�",
+ "invalid_index": "鏃犳晥鐨勭储寮曘€�",
"add_too_much": "鏈嶅姟绔粎鍏佽浣犻槦浼嶉噷鑷冲鏈� %d 鍚嶈鑹层€�",
"failed_to_add_avatar": "鏃犳硶鏍规嵁ID %s 娣诲姞瑙掕壊銆�",
"remove_usage": "鐢ㄦ硶(remove)锛歵eam remove <绱㈠紩|first|last|绱㈠紩-绱㈠紩,...>",
@@ -361,7 +361,7 @@
"description": "鏀瑰彉鎸囧畾鐜╁鐨勪綅缃�"
},
"weather": {
- "usage": "鐢ㄦ硶锛歸eather <澶╂皵ID> [姘斿€橧D]",
+ "usage": "鐢ㄦ硶锛歸eather <澶╂皵ID> <姘斿€橧D>",
"success": "宸叉洿鏀瑰ぉ姘斾负 %s锛屾皵鍊欎负 %s銆�",
"invalid_id": "鏃犳晥鐨勫ぉ姘擨D銆�",
"description": "鏇存敼澶╂皵"
@@ -369,7 +369,7 @@
"drop": {
"command_usage": "鐢ㄦ硶锛歞rop <鐗╁搧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 2149881d..1c1d0642 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": "鐢ㄦ硶锛歟nterdungeon <dungeon id>",
+ "usage": "鐢ㄦ硶锛歟nterdungeon <dungeonId>",
"changed": "宸查€插叆绁曞 %s",
"not_found_error": "姝ょ澧冧笉瀛樺湪銆�",
"in_dungeon_error": "浣犲凡缍撳湪绁曞涓簡銆�",
@@ -366,7 +366,7 @@
"description": "灏囩帺瀹剁殑浣嶇疆鍌抽€佸埌浣犳墍鎸囧畾鐨勫骇妯欍€�"
},
"weather": {
- "usage": "鐢ㄦ硶锛歸eather <weatherId> [climateId]",
+ "usage": "鐢ㄦ硶锛歸eather <weatherId> <climateId>",
"success": "宸插皣鐣跺墠澶╂埃瑷畾鐐� %s 锛屾埃鍊欏墖鐐� %s 銆�",
"invalid_id": "鐒℃晥鐨処D銆�",
"description": "鏇存敼鐩墠鐨勫ぉ姘ｃ€�"
--
GitLab