From 7c9db30bca965e6b9745f609b3544d8e1557bc03 Mon Sep 17 00:00:00 2001 From: Tesutarin <105267106+Tesutarin@users.noreply.github.com> Date: Mon, 13 Jun 2022 13:52:59 +0800 Subject: [PATCH] KickCommand: Remove unnecessary subpermission --- .../command/commands/KickCommand.java | 2 +- src/main/resources/languages/en-US.json | 54 +++++++++---------- src/main/resources/languages/zh-CN.json | 54 +++++++++---------- src/main/resources/languages/zh-TW.json | 4 +- 4 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/main/java/emu/grasscutter/command/commands/KickCommand.java b/src/main/java/emu/grasscutter/command/commands/KickCommand.java index d71db0125..546fe905d 100644 --- a/src/main/java/emu/grasscutter/command/commands/KickCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/KickCommand.java @@ -8,7 +8,7 @@ import java.util.List; import static emu.grasscutter.utils.Language.translate; -@Command(label = "kick", usage = "kick", permission = "server.kick", permissionTargeted = "server.kick.others", description = "commands.kick.description") +@Command(label = "kick", usage = "kick", permission = "server.kick", description = "commands.kick.description") public final class KickCommand implements CommandHandler { @Override diff --git a/src/main/resources/languages/en-US.json b/src/main/resources/languages/en-US.json index 41a589b6c..0cca8d85d 100644 --- a/src/main/resources/languages/en-US.json +++ b/src/main/resources/languages/en-US.json @@ -140,6 +140,11 @@ "success": "Summoned %s to %s's world.", "description": "Forces someone to join the world of others. If no one is targeted, it sends you into co-op mode anyway." }, + "drop": { + "command_usage": "Usage: drop [amount]", + "success": "Dropped %s of %s.", + "description": "Drops an item near you" + }, "enter_dungeon": { "usage": "Usage: enterdungeon ", "changed": "Changed to dungeon %s.", @@ -181,19 +186,16 @@ "success": "Godmode is now %s for %s.", "description": "Prevents you from taking damage. Defaults to toggle." }, - "nostamina": { - "success": "NoStamina is now %s for %s.", - "description": "Keep your endurance to the maximum." - }, - "unlimitenergy": { - "success": "UnlimitEnergy is now %s for %s.", - "config_error": "Command is disabled, because energyUsage is false in config.json.", - "description": "Use the element does not waste energy" - }, "heal": { "success": "All characters have been healed.", "description": "Heal all characters in your current team." }, + "help": { + "usage": "Usage: ", + "aliases": "Aliases: ", + "available_commands": "Available commands: ", + "description": "Sends the help message or shows information about a specified command" + }, "kick": { "player_kick_player": "Player [%s:%s] has kicked player [%s:%s]", "server_kick_player": "Kicking player [%s:%s]...", @@ -220,6 +222,10 @@ "success": "There are %s player(s) online:", "description": "List online players" }, + "nostamina": { + "success": "NoStamina is now %s for %s.", + "description": "Keep your endurance to the maximum." + }, "permission": { "usage": "Usage: permission ", "add": "Permission added.", @@ -256,6 +262,9 @@ "success": "Reset complete.", "description": "Reset target player's shop refresh time" }, + "restart": { + "description": "Restarts the current session" + }, "sendMail": { "usage": "Usage: sendmail [templateID]", "user_not_exist": "The user with an ID of '%s' does not exist.", @@ -368,29 +377,20 @@ "success": "Teleported %s to %s, %s, %s in scene %s.", "description": "Change the player's position" }, + "unlimitenergy": { + "success": "UnlimitEnergy is now %s for %s.", + "config_error": "Command is disabled, because energyUsage is false in config.json.", + "description": "Use the element does not waste energy" + }, + "unlocktower": { + "success": "Abyss Corridor's Floors are all unlocked now.", + "description": "Unlock all levels of tower" + }, "weather": { "usage": "Usage: weather \nWeather types 0: None, 1: Sunny, 2: Cloudy, 3: Rain, 4: Thunderstorm, 5: Snow, 6: Mist", "success": "Changed climate type to %s with weather type %s.", "invalid_id": "Invalid ID.", "description": "Changes the weather" - }, - "drop": { - "command_usage": "Usage: drop [amount]", - "success": "Dropped %s of %s.", - "description": "Drops an item near you" - }, - "help": { - "usage": "Usage: ", - "aliases": "Aliases: ", - "available_commands": "Available commands: ", - "description": "Sends the help message or shows information about a specified command" - }, - "restart": { - "description": "Restarts the current session" - }, - "unlocktower": { - "success": "Unlock done.", - "description": "Unlock Abyss Corridor's Floors" } }, "gacha": { diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json index 90ec024fb..04904ee0a 100644 --- a/src/main/resources/languages/zh-CN.json +++ b/src/main/resources/languages/zh-CN.json @@ -140,6 +140,11 @@ "success": "已强制传送 %s 到 %s 的世界。", "description": "强制传送指定玩家到他人的世界。如果没有指定玩家，则会使你进入多人游戏状态" }, + "drop": { + "command_usage": "用法：drop <物品ID|物品名称> [数量]", + "success": "已丢下 %s 个 %s。", + "description": "在你附近丢下物品" + }, "enter_dungeon": { "usage": "用法：enterdungeon <秘境ID>", "changed": "已进入秘境 %s。", @@ -181,19 +186,16 @@ "success": "Godmode 已设为 %s。[用户：%s]", "description": "防止你受到伤害" }, - "nostamina": { - "success": "NoStamina 已设为 %s。[用户：%s]", - "description": "保持你的体力处于最高状态" - }, - "unlimitenergy": { - "success": "UnlimitEnergy 已设为 %s。[用户：%s]", - "config_error": "命令不可用。因为 config.json 中 energyUsage 为 false。", - "description": "使用元素爆发而不消耗能量" - }, "heal": { "success": "已治疗所有角色。", "description": "治疗当前队伍的角色" }, + "help": { + "usage": "用法：", + "aliases": "别名：", + "available_commands": "可用命令：", + "description": "发送帮助信息或显示指定命令的信息" + }, "kick": { "player_kick_player": "玩家 [%s:%s] 已将 [%s:%s] 踢出。", "server_kick_player": "正在踢出玩家 [%s:%s]...", @@ -220,6 +222,10 @@ "success": "目前在线人数：%s", "description": "查看所有玩家" }, + "nostamina": { + "success": "NoStamina 已设为 %s。[用户：%s]", + "description": "保持你的体力处于最高状态" + }, "permission": { "usage": "用法：permission <用户名> <权限>", "add": "权限已添加。", @@ -256,6 +262,9 @@ "success": "重置完成。", "description": "重置指定玩家的商店刷新时间" }, + "restart": { + "description": "重新启动服务器" + }, "sendMail": { "usage": "用法：sendmail <用户ID|all|help> [模板ID]", "user_not_exist": "用户 '%s' 不存在。", @@ -368,29 +377,20 @@ "success": "传送 %s 到坐标 %s, %s, %s，场景为 %s。", "description": "改变指定玩家的位置" }, + "unlimitenergy": { + "success": "UnlimitEnergy 已设为 %s。[用户：%s]", + "config_error": "命令不可用。因为 config.json 中 energyUsage 为 false。", + "description": "使用元素爆发而不消耗能量" + }, + "unlocktower": { + "success": "现已解锁深境回廊(1-8层)。", + "description": "解锁深境螺旋" + }, "weather": { "usage": "用法：weather <气候类型(天气ID)> <天气类型(气候ID)>\n天气类型 0: 无, 1: 晴天, 2: 多云, 3: 雨, 4: 雷雨, 5: 雪, 6: 雾", "success": "已更改气候类型为 %s，天气类型为 %s。", "invalid_id": "无效的ID。", "description": "更改天气" - }, - "drop": { - "command_usage": "用法：drop <物品ID|物品名称> [数量]", - "success": "已丢下 %s 个 %s。", - "description": "在你附近丢下物品" - }, - "help": { - "usage": "用法：", - "aliases": "别名：", - "available_commands": "可用命令：", - "description": "发送帮助信息或显示指定命令的信息" - }, - "restart": { - "description": "重新启动服务器" - }, - "unlocktower": { - "success": "解锁完成。", - "description": "解锁深境回廊(1-8层)" } }, "gacha": { diff --git a/src/main/resources/languages/zh-TW.json b/src/main/resources/languages/zh-TW.json index be41002fc..318f5c7ba 100644 --- a/src/main/resources/languages/zh-TW.json +++ b/src/main/resources/languages/zh-TW.json @@ -389,8 +389,8 @@ "description": "重新啟動伺服器。" }, "unlocktower": { - "success": "解鎖完成。", - "description": "解鎖深境迴廊。" + "success": "現已解鎖深境迴廊。", + "description": "解鎖深境螺旋。" } }, "gacha": {