Using annotation key translation

src/main/java/emu/grasscutter/command/Command.java

@@ -9,7 +9,7 @@ public @interface Command {
 
     String usage() default "No usage specified";
 
-    String description() default "No description specified";
+    String description() default "commands.generic.no_description_specified";
 
     String[] aliases() default {};
 

src/main/java/emu/grasscutter/command/CommandHandler.java

@@ -7,8 +7,6 @@ import java.util.List;
 
 public interface CommandHandler {
 
-    default String description() { return null; };
-
     /**
      * Send a message to the target.
      *

src/main/java/emu/grasscutter/command/CommandMap.java

@@ -85,14 +85,6 @@ public final class CommandMap {
         return new LinkedHashMap<>(this.annotations);
     }
 
-    public HashMap<CommandHandler, Command> getHandlersAndAnnotations() {
-        HashMap<CommandHandler, Command> hashMap = new HashMap<>();
-        this.commands.forEach((key, handler) -> {
-            hashMap.put(handler, this.annotations.get(key));
-        });
-        return hashMap;
-    }
-
     /**
      * Returns a list of all registered commands.
      *

src/main/java/emu/grasscutter/command/commands/AccountCommand.java

@@ -9,14 +9,9 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "account", usage = "account <create|delete> <username> [uid]")
+@Command(label = "account", usage = "account <create|delete> <username> [uid]", description = "commands.account.description")
 public final class AccountCommand implements CommandHandler {
 
-    @Override
-    public String description() {
-        return translate("commands.account.description");
-    }
-
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (sender != null) {

src/main/java/emu/grasscutter/command/commands/BroadcastCommand.java

@@ -9,14 +9,9 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "broadcast", usage = "broadcast <message>", aliases = {"b"}, permission = "server.broadcast")
+@Command(label = "broadcast", usage = "broadcast <message>", aliases = {"b"}, permission = "server.broadcast", description = "commands.broadcast.description")
 public final class BroadcastCommand implements CommandHandler {
 
-    @Override
-    public String description() {
-        return translate("commands.broadcast.description");
-    }
-
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (args.size() < 1) {

src/main/java/emu/grasscutter/command/commands/ChangeSceneCommand.java

@@ -8,12 +8,8 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "changescene", usage = "changescene <scene id>", aliases = {"scene"}, permission = "player.changescene")
+@Command(label = "changescene", usage = "changescene <scene id>", aliases = {"scene"}, permission = "player.changescene", description = "commands.changescene.description")
 public final class ChangeSceneCommand implements CommandHandler {
-    @Override
-    public String description() {
-        return translate("commands.changescene.description");
-    }
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {

src/main/java/emu/grasscutter/command/commands/ClearCommand.java

@@ -13,15 +13,11 @@ import java.util.List;
 import static emu.grasscutter.utils.Language.translate;
 
 @Command(label = "clear", usage = "clear <all|wp|art|mat>", //Merged /clearartifacts and /clearweapons to /clear <args> [uid]
+        description = "commands.clear.description",
         aliases = {"clear"}, permission = "player.clearinv")
 
 public final class ClearCommand implements CommandHandler {
 
-    @Override
-    public String description() {
-        return translate("commands.clear.description");
-    }
-
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (targetPlayer == null) {

src/main/java/emu/grasscutter/command/commands/CoopCommand.java

@@ -9,12 +9,8 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "coop", usage = "coop [host UID]", permission = "server.coop")
+@Command(label = "coop", usage = "coop [host UID]", permission = "server.coop", description = "commands.coop.description")
 public final class CoopCommand implements CommandHandler {
-    @Override
-    public String description() {
-        return translate("commands.coop.description");
-    }
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {

src/main/java/emu/grasscutter/command/commands/DropCommand.java

@@ -13,14 +13,9 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "drop", usage = "drop <itemId|itemName> [amount]", aliases = {"d", "dropitem"}, permission = "server.drop")
+@Command(label = "drop", usage = "drop <itemId|itemName> [amount]", aliases = {"d", "dropitem"}, permission = "server.drop", description = "commands.drop.description")
 public final class DropCommand implements CommandHandler {
 
-    @Override
-    public String description() {
-        return translate("commands.drop.description");
-    }
-
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (targetPlayer == null) {

src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java

@@ -8,12 +8,8 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "enterdungeon", usage = "enterdungeon <dungeon id>", aliases = {"dungeon"}, permission = "player.enterdungeon")
+@Command(label = "enterdungeon", usage = "enterdungeon <dungeon id>", aliases = {"dungeon"}, permission = "player.enterdungeon", description = "commands.enter_dungeon.description")
 public final class EnterDungeonCommand implements CommandHandler {
-    @Override
-    public String description() {
-        return translate("commands.enter_dungeon.description");
-    }
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {

src/main/java/emu/grasscutter/command/commands/GiveAllCommand.java

@@ -15,14 +15,9 @@ import java.util.*;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "giveall", usage = "giveall [amount]", aliases = {"givea"}, permission = "player.giveall", threading = true)
+@Command(label = "giveall", usage = "giveall [amount]", aliases = {"givea"}, permission = "player.giveall", threading = true, description = "commands.giveAll.description")
 public final class GiveAllCommand implements CommandHandler {
 
-    @Override
-    public String description() {
-        return translate("commands.giveAll.description");
-    }
-
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (targetPlayer == null) {

src/main/java/emu/grasscutter/command/commands/GiveArtifactCommand.java

@@ -16,12 +16,8 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "giveart", usage = "giveart <artifactId> <mainPropId> [<appendPropId>[,<times>]]... [level]", aliases = {"gart"}, permission = "player.giveart")
+@Command(label = "giveart", usage = "giveart <artifactId> <mainPropId> [<appendPropId>[,<times>]]... [level]", aliases = {"gart"}, permission = "player.giveart", description = "commands.giveArtifact.description")
 public final class GiveArtifactCommand implements CommandHandler {
-	@Override
-	public String description() {
-		return translate("commands.giveArtifact.description");
-	}
 
 	@Override
 	public void execute(Player sender, Player targetPlayer, List<String> args) {

src/main/java/emu/grasscutter/command/commands/GiveCharCommand.java

@@ -12,14 +12,9 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "givechar", usage = "givechar <avatarId> [level]", aliases = {"givec"}, permission = "player.givechar")
+@Command(label = "givechar", usage = "givechar <avatarId> [level]", aliases = {"givec"}, permission = "player.givechar", description = "commands.giveChar.description")
 public final class GiveCharCommand implements CommandHandler {
 
-    @Override
-    public String description() {
-        return translate("commands.giveChar.description");
-    }
-
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (targetPlayer == null) {

src/main/java/emu/grasscutter/command/commands/GiveCommand.java

@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
 import static emu.grasscutter.utils.Language.translate;
 
 @Command(label = "give", usage = "give <itemId|itemName> [amount] [level]", aliases = {
-        "g", "item", "giveitem"}, permission = "player.give")
+        "g", "item", "giveitem"}, permission = "player.give", description = "commands.give.description")
 public final class GiveCommand implements CommandHandler {
     Pattern lvlRegex = Pattern.compile("l(?:vl?)?(\\d+)");  // Java is a joke of a proglang that doesn't have raw string literals
     Pattern refineRegex = Pattern.compile("r(\\d+)");
@@ -31,11 +31,6 @@ public final class GiveCommand implements CommandHandler {
         return -1;
     }
 
-    @Override
-    public String description() {
-        return translate("commands.give.description");
-    }
-
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (targetPlayer == null) {

src/main/java/emu/grasscutter/command/commands/GodModeCommand.java

@@ -8,14 +8,9 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "godmode", usage = "godmode [on|off|toggle]", permission = "player.godmode")
+@Command(label = "godmode", usage = "godmode [on|off|toggle]", permission = "player.godmode", description = "commands.godmode.description")
 public final class GodModeCommand implements CommandHandler {
 
-    @Override
-    public String description() {
-        return translate("commands.godmode.description");
-    }
-
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (targetPlayer == null) {

src/main/java/emu/grasscutter/command/commands/HealCommand.java

@@ -11,12 +11,8 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "heal", usage = "heal|h", aliases = {"h"}, permission = "player.heal")
+@Command(label = "heal", usage = "heal|h", aliases = {"h"}, permission = "player.heal", description = "commands.heal.description")
 public final class HealCommand implements CommandHandler {
-    @Override
-    public String description() {
-        return translate("commands.heal.description");
-    }
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {

src/main/java/emu/grasscutter/command/commands/HelpCommand.java

@@ -10,26 +10,21 @@ import java.util.*;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "help", usage = "help [command]")
+@Command(label = "help", usage = "help [command]", description = "commands.help.description")
 public final class HelpCommand implements CommandHandler {
 
-    @Override
-    public String description() {
-        return translate("commands.help.description");
-    }
-
     @Override
     public void execute(Player player, Player targetPlayer, List<String> args) {
         if (args.size() < 1) {
             HashMap<String, CommandHandler> handlers = CommandMap.getInstance().getHandlers();
-            HashMap<Command, CommandHandler> annotations = new HashMap<>();
+            List<Command> annotations = new ArrayList<>();
             for (String key : handlers.keySet()) {
                 Command annotation = handlers.get(key).getClass().getAnnotation(Command.class);
 
                 if (!Arrays.asList(annotation.aliases()).contains(key)) {
                     if (player != null && !Objects.equals(annotation.permission(), "") && !player.getAccount().hasPermission(annotation.permission()))
                         continue;
-                    annotations.put(annotation, handlers.get(key));
+                    annotations.add(annotation);
                 }
             }
 
@@ -43,7 +38,7 @@ public final class HelpCommand implements CommandHandler {
             } else {
                 Command annotation = handler.getClass().getAnnotation(Command.class);
 
-                builder.append("   ").append(handler.description() == null ? annotation.description(): handler.description()).append("\n");
+                builder.append("   ").append(translate(annotation.description())).append("\n");
                 builder.append(translate("commands.help.usage")).append(annotation.usage());
                 if (annotation.aliases().length >= 1) {
                     builder.append("\n").append(translate("commands.help.aliases"));
@@ -60,12 +55,12 @@ public final class HelpCommand implements CommandHandler {
         }
     }
 
-    void SendAllHelpMessage(Player player, HashMap<Command, CommandHandler> annotations) {
+    void SendAllHelpMessage(Player player, List<Command> annotations) {
         if (player == null) {
             StringBuilder builder = new StringBuilder("\n" + translate("commands.help.available_commands") + "\n");
-            annotations.forEach((annotation, handler) -> {
+            annotations.forEach(annotation -> {
                 builder.append(annotation.label()).append("\n");
-                builder.append("   ").append(handler.description() == null ? annotation.description() : handler.description()).append("\n");
+                builder.append("   ").append(translate(annotation.description())).append("\n");
                 builder.append(translate("commands.help.usage")).append(annotation.usage());
                 if (annotation.aliases().length >= 1) {
                     builder.append("\n").append(translate("commands.help.aliases"));
@@ -80,9 +75,9 @@ public final class HelpCommand implements CommandHandler {
             CommandHandler.sendMessage(null, builder.toString());
         } else {
             CommandHandler.sendMessage(player, translate("commands.help.available_commands"));
-            annotations.forEach((annotation, handler) -> {
+            annotations.forEach(annotation -> {
                 StringBuilder builder = new StringBuilder(annotation.label()).append("\n");
-                builder.append("   ").append(handler.description() == null ? annotation.description() : handler.description()).append("\n");
+                builder.append("   ").append(translate(annotation.description())).append("\n");
                 builder.append(translate("commands.help.usage")).append(annotation.usage());
                 if (annotation.aliases().length >= 1) {
                     builder.append("\n").append(translate("commands.help.aliases"));

src/main/java/emu/grasscutter/command/commands/KickCommand.java

@@ -8,14 +8,9 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "kick", usage = "kick", permission = "server.kick")
+@Command(label = "kick", usage = "kick", permission = "server.kick", description = "commands.kick.description")
 public final class KickCommand implements CommandHandler {
 
-    @Override
-    public String description() {
-        return translate("commands.kick.description");
-    }
-
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (targetPlayer == null) {

src/main/java/emu/grasscutter/command/commands/KillAllCommand.java

@@ -12,14 +12,9 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "killall", usage = "killall [sceneId]", permission = "server.killall")
+@Command(label = "killall", usage = "killall [sceneId]", permission = "server.killall", description = "commands.kill.description")
 public final class KillAllCommand implements CommandHandler {
 
-    @Override
-    public String description() {
-        return translate("commands.kill.description");
-    }
-
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (targetPlayer == null) {

src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java

@@ -13,14 +13,9 @@ import java.util.List;
 
 import static emu.grasscutter.utils.Language.translate;
 
-@Command(label = "killcharacter", usage = "killcharacter", aliases = {"suicide", "kill"}, permission = "player.killcharacter")
+@Command(label = "killcharacter", usage = "killcharacter", aliases = {"suicide", "kill"}, permission = "player.killcharacter", description = "commands.list.description")
 public final class KillCharacterCommand implements CommandHandler {
 
-    @Override
-    public String description() {
-        return translate("commands.killCharacter.description");
-    }
-
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (targetPlayer == null) {