Merge remote-tracking branch 'upstream/development'

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

+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.avatar.GenshinAvatar;
+import emu.grasscutter.game.entity.EntityAvatar;
+
+import java.util.List;
+
+@Command(label = "resetconst", usage = "resetconst [all]",
+        description = "Resets the constellation level on your current active character, will need to relog after using the command to see any changes.",
+        aliases = {"resetconstellation"}, permission = "player.resetconstellation")
+public class ResetConst implements CommandHandler {
+
+    @Override
+    public void execute(GenshinPlayer sender, List<String> args) {
+        if (sender == null) {
+            CommandHandler.sendMessage(null, "Run this command in-game.");
+            return;
+        }
+
+        if (args.size() > 0 && args.get(0).equalsIgnoreCase("all")) {
+            sender.getAvatars().forEach(this::resetConstellation);
+            sender.dropMessage("Reset all avatars' constellations.");
+        } else {
+            EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity();
+            if (entity == null) {
+                return;
+            }
+
+            GenshinAvatar avatar = entity.getAvatar();
+            this.resetConstellation(avatar);
+
+            sender.dropMessage("Constellations for " + avatar.getAvatarData().getName() + " have been reset. Please relog to see changes.");
+        }
+    }
+
+    private void resetConstellation(GenshinAvatar avatar) {
+        avatar.getTalentIdList().clear();
+        avatar.setCoreProudSkillLevel(0);
+        avatar.recalcStats();
+        avatar.save();
+    }
+}
\ No newline at end of file

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

+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.GenshinPlayer;
+
+import java.util.List;
+
+@Command(label = "restart", usage = "restart - Restarts the current session")
+public class Restart implements CommandHandler {
+
+    @Override
+    public void execute(GenshinPlayer sender, List<String> args) {
+        sender.getSession().close();
+    }
+}

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

+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.GenshinPlayer;
+
+import java.util.List;
+
+@Command(label = "say", usage = "say <player> <message>", description = "Sends a message to a player as the server",
+        aliases = {"sendservmsg", "sendservermessage", "sendmessage"}, permission = "server.sendmessage")
+public class SendMessage implements CommandHandler {
+
+    @Override
+    public void execute(GenshinPlayer sender, List<String> args) {
+        if (args.size() < 2) {
+            CommandHandler.sendMessage(null, "Usage: sendmessage <player> <message>");
+            return;
+        }
+
+        try {
+            int target = Integer.parseInt(args.get(0));
+            String message = String.join(" ", args.subList(1, args.size()));
+
+            GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+            if (targetPlayer == null) {
+                CommandHandler.sendMessage(sender, "Player not found.");
+                return;
+            }
+
+            CommandHandler.sendMessage(targetPlayer, message);
+            CommandHandler.sendMessage(sender, "Message sent.");
+        } catch (NumberFormatException ignored) {
+            CommandHandler.sendMessage(sender, "Invalid player ID.");
+        }
+    }
+}
\ No newline at end of file

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

+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.entity.EntityAvatar;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
+
+import java.util.List;
+
+@Command(label = "setstats", usage = "setstats <hp|def|atk|em|er|crate|cdmg> <value>",
+        aliases = {"stats"})
+public class SetStats implements CommandHandler {
+
+    @Override
+    public void execute(GenshinPlayer sender, List<String> args) {
+        if (sender == null) {
+            CommandHandler.sendMessage(null, "Run this command in-game.");
+            return;
+        }
+
+        String stat = args.get(0);
+        switch (stat) {
+            default:
+                CommandHandler.sendMessage(sender, "Usage: setstats|stats <hp|def|atk|em|er|crate|cdmg> <value>");
+                return;
+            case "hp":
+                try {
+                    int health = Integer.parseInt(args.get(1));
+                    EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity();
+                    entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, health);
+                    entity.getWorld().broadcastPacket(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP));
+                    CommandHandler.sendMessage(sender, "HP set to " + health + ".");
+                } catch (NumberFormatException ignored) {
+                    CommandHandler.sendMessage(sender, "Invalid HP value.");
+                    return;
+                }
+                break;
+            case "def":
+                try {
+                    int def = Integer.parseInt(args.get(1));
+                    EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity();
+                    entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_DEFENSE, def);
+                    entity.getWorld().broadcastPacket(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_DEFENSE));
+                    CommandHandler.sendMessage(sender, "DEF set to " + def + ".");
+                } catch (NumberFormatException ignored) {
+                    CommandHandler.sendMessage(sender, "Invalid DEF value.");
+                    return;
+                }
+                break;
+            case "atk":
+                try {
+                    int atk = Integer.parseInt(args.get(1));
+                    EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity();
+                    entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_ATTACK, atk);
+                    entity.getWorld().broadcastPacket(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_ATTACK));
+                    CommandHandler.sendMessage(sender, "ATK set to " + atk + ".");
+                } catch (NumberFormatException ignored) {
+                    CommandHandler.sendMessage(sender, "Invalid ATK value.");
+                    return;
+                }
+                break;
+            case "em":
+                try {
+                    int em = Integer.parseInt(args.get(1));
+                    EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity();
+                    entity.setFightProperty(FightProperty.FIGHT_PROP_ELEMENT_MASTERY, em);
+                    entity.getWorld().broadcastPacket(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_ELEMENT_MASTERY));
+                    CommandHandler.sendMessage(sender, "Elemental Mastery set to " + em + ".");
+                } catch (NumberFormatException ignored) {
+                    CommandHandler.sendMessage(sender, "Invalid EM value.");
+                    return;
+                }
+                break;
+            case "er":
+                try {
+                    float er = Integer.parseInt(args.get(1));
+                    EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity();
+                    float erecharge = er / 10000;
+                    entity.setFightProperty(FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY, erecharge);
+                    entity.getWorld().broadcastPacket(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY));
+                    float iger = erecharge * 100;
+                    CommandHandler.sendMessage(sender, "Energy recharge set to " + iger + "%.");
+                } catch (NumberFormatException ignored) {
+                    CommandHandler.sendMessage(sender, "Invalid ER value.");
+                    return;
+                }
+                break;
+            case "crate":
+                try {
+                    float cr = Integer.parseInt(args.get(1));
+                    EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity();
+                    float crate = cr / 10000;
+                    entity.setFightProperty(FightProperty.FIGHT_PROP_CRITICAL, crate);
+                    entity.getWorld().broadcastPacket(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CRITICAL));
+                    float igcrate = crate * 100;
+                    CommandHandler.sendMessage(sender, "Crit Rate set to " + igcrate + "%.");
+                } catch (NumberFormatException ignored) {
+                    CommandHandler.sendMessage(sender, "Invalid Crit Rate value.");
+                    return;
+                }
+                break;
+            case "cdmg":
+                try {
+                    float cdmg = Integer.parseInt(args.get(1));
+                    EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity();
+                    float cdamage = cdmg / 10000;
+                    entity.setFightProperty(FightProperty.FIGHT_PROP_CRITICAL_HURT, cdamage);
+                    entity.getWorld().broadcastPacket(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CRITICAL_HURT));
+                    float igcdmg = cdamage * 100;
+                    CommandHandler.sendMessage(sender, "Crit DMG set to " + igcdmg + "%");
+                } catch (NumberFormatException ignored) {
+                    CommandHandler.sendMessage(sender, "Invalid Crit DMG value.");
+                    return;
+                }
+                break;
+        }
+    }
+}

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

+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.props.PlayerProperty;
+
+import java.util.List;
+
+@Command(label = "setworldlevel", usage = "setworldlevel <level>",
+        description = "Sets your world level (Relog to see proper effects)",
+        aliases = {"setworldlvl"}, permission = "player.setworldlevel")
+public class SetWorldLevel implements CommandHandler {
+
+    @Override
+    public void execute(GenshinPlayer sender, List<String> args) {
+        if (sender == null) {
+            CommandHandler.sendMessage(null, "Run this command in-game.");
+            return; // TODO: set player's world level from console or other players
+        }
+
+        if (args.size() < 1) {
+            CommandHandler.sendMessage(sender, "Usage: setworldlevel <level>");
+            return;
+        }
+
+        try {
+            int level = Integer.parseInt(args.get(0));
+
+            // Set in both world and player props
+            sender.getWorld().setWorldLevel(level);
+            sender.setProperty(PlayerProperty.PROP_PLAYER_WORLD_LEVEL, level);
+
+            sender.dropMessage("World level set to " + level + ".");
+        } catch (NumberFormatException ignored) {
+            CommandHandler.sendMessage(null, "Invalid world level.");
+        }
+    }
+}

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

+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.def.MonsterData;
+import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.utils.Position;
+
+import java.util.List;
+
+@Command(label = "spawn", usage = "spawn <entityId|entityName> [level] [amount]",
+        description = "Spawns an entity near you", permission = "server.spawn")
+public class Spawn implements CommandHandler {
+
+    @Override
+    public void execute(GenshinPlayer sender, List<String> args) {
+        if (sender == null) {
+            CommandHandler.sendMessage(null, "Run this command in-game.");
+            return;
+        }
+
+        if (args.size() < 1) {
+            CommandHandler.sendMessage(sender, "Usage: spawn <entityId|entityName> [amount]");
+            return;
+        }
+
+        try {
+            int entity = Integer.parseInt(args.get(0));
+            int level = args.size() > 1 ? Integer.parseInt(args.get(1)) : 1;
+            int amount = args.size() > 2 ? Integer.parseInt(args.get(2)) : 1;
+
+            MonsterData entityData = GenshinData.getMonsterDataMap().get(entity);
+            if (entityData == null) {
+                CommandHandler.sendMessage(sender, "Invalid entity id.");
+                return;
+            }
+
+            float range = (5f + (.1f * amount));
+            for (int i = 0; i < amount; i++) {
+                Position pos = sender.getPos().clone().addX((float) (Math.random() * range) - (range / 2)).addY(3f).addZ((float) (Math.random() * range) - (range / 2));
+                EntityMonster monster = new EntityMonster(sender.getScene(), entityData, pos, level);
+                sender.getScene().addEntity(monster);
+            }
+            CommandHandler.sendMessage(sender, String.format("Spawned %s of %s.", amount, entity));
+        } catch (NumberFormatException ignored) {
+            CommandHandler.sendMessage(sender, "Invalid item or player ID.");
+        }
+    }
+}

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

+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.GenshinPlayer;
+
+import java.util.List;
+
+@Command(label = "stop", usage = "stop",
+        description = "Stops the server", permission = "server.stop")
+public class Stop implements CommandHandler {
+
+    @Override
+    public void execute(GenshinPlayer sender, List<String> args) {
+        CommandHandler.sendMessage(null, "Server shutting down...");
+        for (GenshinPlayer p : Grasscutter.getGameServer().getPlayers().values()) {
+            CommandHandler.sendMessage(p, "Server shutting down...");
+        }
+
+        System.exit(1);
+    }
+}

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

+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.props.ClimateType;
+import emu.grasscutter.server.packet.send.PacketSceneAreaWeatherNotify;
+
+import java.util.List;
+
+@Command(label = "weather", usage = "weather <weatherId>",
+        description = "Changes the weather.", aliases = {"w"}, permission = "player.weather")
+public class Weather implements CommandHandler {
+
+    @Override
+    public void execute(GenshinPlayer sender, List<String> args) {
+        if (sender == null) {
+            CommandHandler.sendMessage(null, "Run this command in-game.");
+            return;
+        }
+
+        if (args.size() < 1) {
+            CommandHandler.sendMessage(sender, "Usage: weather <weatherId>");
+            return;
+        }
+
+        try {
+            int weatherId = Integer.parseInt(args.get(0));
+
+            ClimateType climate = ClimateType.getTypeByValue(weatherId);
+
+            sender.getScene().setClimate(climate);
+            sender.getScene().broadcastPacket(new PacketSceneAreaWeatherNotify(sender));
+            CommandHandler.sendMessage(sender, "Changed weather to " + weatherId);
+        } catch (NumberFormatException ignored) {
+            CommandHandler.sendMessage(sender, "Invalid weather ID.");
+        }
+    }
+}

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

-package emu.grasscutter.commands;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Retention(RetentionPolicy.RUNTIME) 
-public @interface Command {
-	String label() default "";
-
-	String usage() default "No usage specified";
-
-	String description() default "No description specified";
-	
-	String[] aliases() default {};
-	
-	Execution execution() default Execution.ALL;
-	
-	String permission() default "";
-
-	enum Execution {
-		ALL,
-		CONSOLE,
-		PLAYER
-	}
-}

src/main/java/emu/grasscutter/commands/ServerCommands.java

-package emu.grasscutter.commands;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.Account;
-import emu.grasscutter.game.GenshinPlayer;
-
-import java.util.*;
-
-/**
- * A container for server-related commands.
- */
-public final class ServerCommands {
-    @Command(label = "reload", usage = "reload", description = "Reload server config", permission = "server.reload")
-    public static class ReloadCommand implements CommandHandler {
-
-        @Override
-        public void execute(List<String> args) {
-            Grasscutter.getLogger().info("Reloading config.");
-            Grasscutter.loadConfig();
-            Grasscutter.getGameServer().getGachaManager().load();
-            Grasscutter.getDispatchServer().loadQueries();
-            Grasscutter.getLogger().info("Reload complete.");
-        }
-
-        @Override
-        public void execute(GenshinPlayer player, List<String> args) {
-            CommandHandler.sendMessage(player, "Reloading config.");
-            this.execute(args);
-            CommandHandler.sendMessage(player, "Reload complete.");
-        }
-    }
-
-    @Command(label = "kick", usage = "kick <player>", description = "Kicks the specified player from the server (WIP)", permission = "server.kick")
-    public static class KickCommand implements CommandHandler {
-        @Override
-        public void execute(List<String> args) {
-            this.execute(null, args);
-        }
-
-        @Override
-        public void execute(GenshinPlayer player, List<String> args) {
-            int target = Integer.parseInt(args.get(0));
-
-            GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
-            if(targetPlayer == null) {
-                CommandHandler.sendMessage(player, "Player not found.");
-                return;
-            }
-            
-            if(player != null) {
-                CommandHandler.sendMessage(null, String.format("Player [%s:%s] has kicked player [%s:%s]", player.getAccount().getPlayerId(), player.getAccount().getUsername(), target, targetPlayer.getAccount().getUsername()));
-            }
-            CommandHandler.sendMessage(player, String.format("Kicking player [%s:%s]", target, targetPlayer.getAccount().getUsername()));
-
-            targetPlayer.getSession().close();
-        }
-    }
-
-    @Command(label = "stop", usage = "stop", description = "Stops the server", permission = "server.stop")
-    public static class StopCommand implements CommandHandler {
-        @Override
-        public void execute(List<String> args) {
-            Grasscutter.getLogger().info("Server shutting down...");
-            for (GenshinPlayer p : Grasscutter.getGameServer().getPlayers().values()) {
-                p.dropMessage("Server shutting down...");
-            }
-
-            System.exit(1);
-        }
-    }
-
-    @Command(label = "broadcast", aliases = {"b"},
-            usage = "broadcast <message>", description = "Sends a message to all the players", permission = "server.broadcast")
-    public static class BroadcastCommand implements CommandHandler {
-        @Override
-        public void execute(List<String> args) {
-            if(args.size() < 1) {
-                CommandHandler.sendMessage(null, "Usage: broadcast <message>"); return;
-            }
-
-            String message = String.join(" ", args.subList(0, args.size()));
-
-            for (GenshinPlayer p : Grasscutter.getGameServer().getPlayers().values()) {
-                p.dropMessage(message);
-            }
-
-            CommandHandler.sendMessage(null, "Message sent.");
-        }
-
-        @Override
-        public void execute(GenshinPlayer player, List<String> args) {
-            if(args.size() < 1) {
-                CommandHandler.sendMessage(player, "Usage: broadcast <message>"); return;
-            }
-
-            String message = String.join(" ", args.subList(0, args.size()));
-
-            for (GenshinPlayer p : Grasscutter.getGameServer().getPlayers().values()) {
-                p.dropMessage(message);
-            }
-
-            CommandHandler.sendMessage(player, "Message sent.");
-        }
-    }
-
-    @Command(label = "sendmessage", aliases = {"sendmsg", "msg"}, 
-            usage = "sendmessage <player> <message>", description = "Sends a message to a player")
-    public static class SendMessageCommand implements CommandHandler {
-
-        @Override
-        public void execute(List<String> args) {
-            if(args.size() < 2) {
-                CommandHandler.sendMessage(null, "Usage: sendmessage <player> <message>"); return;
-            }
-            
-            try {
-                int target = Integer.parseInt(args.get(0));
-                String message = String.join(" ", args.subList(1, args.size()));
-
-                GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
-
-                if(targetPlayer == null) {
-                    CommandHandler.sendMessage(null, "Player not found."); return;
-                }
-                
-                targetPlayer.dropMessage(message);
-                CommandHandler.sendMessage(null, "Message sent.");
-            } catch (NumberFormatException ignored) {
-                CommandHandler.sendMessage(null, "Invalid player ID.");
-            }
-        }
-
-        @Override
-        public void execute(GenshinPlayer player, List<String> args) {
-            if(args.size() < 2) {
-                CommandHandler.sendMessage(player, "Usage: sendmessage <player> <message>"); return;
-            }
-
-            try {
-                int target = Integer.parseInt(args.get(0));
-                String message = String.join(" ", args.subList(1, args.size()));
-
-                GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
-
-                if(targetPlayer == null) {
-                    CommandHandler.sendMessage(player, "Player not found."); return;
-                }
-
-                targetPlayer.sendMessage(player, message);
-                CommandHandler.sendMessage(player, "Message sent.");
-            } catch (NumberFormatException ignored) {
-                CommandHandler.sendMessage(player, "Invalid player ID.");
-            }
-        }
-    }
-    
-    @Command(label = "account", 
-            usage = "account <create|delete> <username> [uid]",
-            description = "Modify user accounts", execution = Command.Execution.CONSOLE)
-    public static class AccountCommand implements CommandHandler {
-
-        @Override
-        public void execute(List<String> args) {
-            if(args.size() < 2) {
-                CommandHandler.sendMessage(null, "Usage: account <create|delete> <username> [uid]"); return;
-            }
-            
-            String action = args.get(0);
-            String username = args.get(1);
-            
-            switch(action) {
-                default:
-                    CommandHandler.sendMessage(null, "Usage: account <create|delete> <username> [uid]");
-                    return;
-                case "create":
-                    int uid = 0;
-                    if(args.size() > 2) {
-                        try {
-                            uid = Integer.parseInt(args.get(2));
-                        } catch (NumberFormatException ignored) {
-                            CommandHandler.sendMessage(null, "Invalid UID."); return;
-                        }
-                    }
-
-                    Account account = DatabaseHelper.createAccountWithId(username, uid);
-                    if(account == null) {
-                        CommandHandler.sendMessage(null, "Account already exists."); return;
-                    } else {
-                        CommandHandler.sendMessage(null, "Account created with UID " + account.getPlayerId() + ".");
-                        account.addPermission("*"); // Grant the player superuser permissions.
-                        account.save(); // Save account to database.
-                    }
-                    return;
-                case "delete":
-                    if(DatabaseHelper.deleteAccount(username)) {
-                        CommandHandler.sendMessage(null, "Account deleted."); return;
-                    } else CommandHandler.sendMessage(null, "Account not found.");
-                    return;
-            }
-        }
-    }
-    
-    @Command(label = "permission", 
-            usage = "permission <add|remove> <username> <permission>",
-            description = "Grants or removes a permission for a user", permission = "*")
-    public static class PermissionCommand implements CommandHandler {
-
-        @Override
-        public void execute(List<String> args) {
-            if(args.size() < 3) {
-                CommandHandler.sendMessage(null, "Usage: permission <add|remove> <username> <permission>"); return;
-            }
-            
-            String action = args.get(0);
-            String username = args.get(1);
-            String permission = args.get(2);
-            
-            Account account = Grasscutter.getGameServer().getAccountByName(username);
-            if(account == null) {
-                CommandHandler.sendMessage(null, "Account not found."); return;
-            }
-            
-            switch(action) {
-                default:
-                    CommandHandler.sendMessage(null, "Usage: permission <add|remove> <username> <permission>");
-                    break;
-                case "add":
-                    if(account.addPermission(permission)) {
-                        CommandHandler.sendMessage(null, "Permission added.");
-                    } else CommandHandler.sendMessage(null, "They already have this permission!");
-                    break;
-                case "remove":
-                    if(account.removePermission(permission)) {
-                        CommandHandler.sendMessage(null, "Permission removed.");
-                    } else CommandHandler.sendMessage(null, "They don't have this permission!");
-                    break;
-            }
-            
-            account.save();
-        }
-    }
-    
-    @Command(label = "help", 
-            usage = "help [command]", description = "Sends the help message or shows information about a specified command")
-    public static class HelpCommand implements CommandHandler {
-
-        @Override
-        public void execute(List<String> args) {
-            this.execute(null, args);
-        }
-
-        @Override
-        public void execute(GenshinPlayer player, List<String> args) {
-            if(args.size() < 1) {
-                HashMap<String, CommandHandler> handlers = CommandMap.getInstance().getHandlers();
-                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.add(annotation);
-                    }
-                }
-
-
-                SendAllHelpMessage(player, annotations);
-            } else {
-                String command = args.get(0);
-                CommandHandler handler = CommandMap.getInstance().getHandler(command);
-                StringBuilder builder = new StringBuilder(player == null ? "\nHelp - " : "Help - ").append(command).append(": \n");
-                if(handler == null) {
-                    builder.append("No command found.");
-                } else {
-                    Command annotation = handler.getClass().getAnnotation(Command.class);
-
-                    builder.append("   ").append(annotation.description()).append("\n");
-                    builder.append("   Usage: ").append(annotation.usage());
-                    if(annotation.aliases().length >= 1) {
-                        builder.append("\n").append("   Aliases: ");
-                        for (String alias : annotation.aliases()) {
-                            builder.append(alias).append(" ");
-                        }
-                    }
-                    if(player != null && !Objects.equals(annotation.permission(), "") && !player.getAccount().hasPermission(annotation.permission())) {
-                        builder.append("\n Warning: You do not have permission to run this command.");
-                    }
-                }
-
-                CommandHandler.sendMessage(player, builder.toString());
-            }
-        }
-
-        void SendAllHelpMessage(GenshinPlayer player, List<Command> annotations) {
-            if(player == null) {
-                StringBuilder builder = new StringBuilder("\nAvailable commands:\n");
-                annotations.forEach(annotation -> {
-                    if (annotation.execution() != Command.Execution.PLAYER) {
-                        builder.append(annotation.label()).append("\n");
-                        builder.append("   ").append(annotation.description()).append("\n");
-                        builder.append("   Usage: ").append(annotation.usage());
-                        if (annotation.aliases().length >= 1) {
-                            builder.append("\n").append("   Aliases: ");
-                            for (String alias : annotation.aliases()) {
-                                builder.append(alias).append(" ");
-                            }
-                        }
-
-                        builder.append("\n");
-                    }
-                });
-
-                CommandHandler.sendMessage(null, builder.toString());
-            } else {
-                CommandHandler.sendMessage(player, "Available commands:");
-                annotations.forEach(annotation -> {
-                    if (annotation.execution() != Command.Execution.CONSOLE) {
-                        StringBuilder builder = new StringBuilder(annotation.label()).append("\n");
-                        builder.append("   ").append(annotation.description()).append("\n");
-                        builder.append("   Usage: ").append(annotation.usage());
-                        if (annotation.aliases().length >= 1) {
-                            builder.append("\n").append("   Aliases: ");
-                            for (String alias : annotation.aliases()) {
-                                builder.append(alias).append(" ");
-                            }
-                        }
-
-                        CommandHandler.sendMessage(player, builder.toString());
-                    }
-                });
-            }
-        }
-    }
-}

src/main/java/emu/grasscutter/game/managers/ChatManager.java

 package emu.grasscutter.game.managers;
 
-import emu.grasscutter.commands.CommandMap;
+import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.game.GenshinPlayer;
 import emu.grasscutter.net.packet.GenshinPacket;
 import emu.grasscutter.server.game.GameServer;

src/main/java/emu/grasscutter/server/game/GameServer.java

@@ -6,7 +6,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import emu.grasscutter.GenshinConstants;
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.commands.CommandMap;
+import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.GenshinPlayer;