Merge branch 'Grasscutters:development' into development

2026-03-26 09:32:45 +01:00 · 2022-04-27 20:31:40 +08:00
parent 6a5d97a3fa d1fc8c1faa
commit fa9d703d44
279 changed files with 2243 additions and 1405 deletions
--- a/src/main/java/emu/grasscutter/command/commands/AccountCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/AccountCommand.java
@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;

 import java.util.List;

@@ -12,7 +12,7 @@ import java.util.List;
 public final class AccountCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (sender != null) {
            CommandHandler.sendMessage(sender, "This command can only be run from the console.");
            return;
--- a/src/main/java/emu/grasscutter/command/commands/BroadcastCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/BroadcastCommand.java
@@ -3,7 +3,7 @@ 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 emu.grasscutter.game.player.Player;

 import java.util.List;

@@ -12,7 +12,7 @@ import java.util.List;
 public final class BroadcastCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (args.size() < 1) {
            CommandHandler.sendMessage(sender, "Usage: broadcast <message>");
            return;
@@ -20,7 +20,7 @@ public final class BroadcastCommand implements CommandHandler {

        String message = String.join(" ", args.subList(0, args.size()));

-        for (GenshinPlayer p : Grasscutter.getGameServer().getPlayers().values()) {
+        for (Player p : Grasscutter.getGameServer().getPlayers().values()) {
            CommandHandler.sendMessage(p, message);
        }

--- a/src/main/java/emu/grasscutter/command/commands/ChangeSceneCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ChangeSceneCommand.java
@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;

 import java.util.List;

@@ -10,7 +10,7 @@ import java.util.List;
        description = "Changes your scene", aliases = {"scene"}, permission = "player.changescene")
 public final class ChangeSceneCommand implements CommandHandler {
    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (sender == null) {
            CommandHandler.sendMessage(null, "Run this command in-game.");
            return;
--- a/src/main/java/emu/grasscutter/command/commands/ClearCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ClearCommand.java
@@ -3,9 +3,9 @@ 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 emu.grasscutter.game.inventory.Inventory;
 import emu.grasscutter.game.inventory.ItemType;
+import emu.grasscutter.game.player.Player;

 import java.util.List;

@@ -16,7 +16,7 @@ import java.util.List;
 public final class ClearCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        int target;
        if (sender == null) {
            CommandHandler.sendMessage(null, "Run this command in-game.");
@@ -27,7 +27,7 @@ public final class ClearCommand implements CommandHandler {
        Inventory playerInventory = sender.getInventory();
            try {
                target = Integer.parseInt(args.get(0));
-                GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+                Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
                if (targetPlayer == null) {
                    target = sender.getUid();
                } else {
@@ -92,7 +92,7 @@ public final class ClearCommand implements CommandHandler {
                return;
            }

-        GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+        Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
        if (targetPlayer == null) {
            CommandHandler.sendMessage(sender, "Player not found.");
            return;
--- a/src/main/java/emu/grasscutter/command/commands/DropCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/DropCommand.java
@@ -2,10 +2,10 @@ package emu.grasscutter.command.commands;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.ItemData;
-import emu.grasscutter.game.GenshinPlayer;
 import emu.grasscutter.game.entity.EntityItem;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.utils.Position;

 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.List;
 public final class DropCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (sender == null) {
            CommandHandler.sendMessage(null, "Run this command in-game.");
            return;
@@ -31,7 +31,7 @@ public final class DropCommand implements CommandHandler {
            int amount = 1;
            if (args.size() > 1) amount = Integer.parseInt(args.get(1));

-            ItemData itemData = GenshinData.getItemDataMap().get(item);
+            ItemData itemData = GameData.getItemDataMap().get(item);
            if (itemData == null) {
                CommandHandler.sendMessage(sender, "Invalid item id.");
                return;
--- a/src/main/java/emu/grasscutter/command/commands/GiveAllCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/GiveAllCommand.java
@@ -3,13 +3,13 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.AvatarData;
 import emu.grasscutter.data.def.ItemData;
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.avatar.GenshinAvatar;
-import emu.grasscutter.game.inventory.GenshinItem;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.inventory.ItemType;
+import emu.grasscutter.game.player.Player;

 import java.util.*;

@@ -18,7 +18,7 @@ import java.util.*;
 public class GiveAllCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        int target, amount = 99999;

        switch (args.size()) {
@@ -63,7 +63,7 @@ public class GiveAllCommand implements CommandHandler {
                return;
        }

-        GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+        Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
        if (targetPlayer == null) {
            CommandHandler.sendMessage(sender, "Player not found.");
            return;
@@ -73,14 +73,14 @@ public class GiveAllCommand implements CommandHandler {
        CommandHandler.sendMessage(sender, "Giving all items done");
    }

-    public void giveAllItems(GenshinPlayer player, int amount) {
+    public void giveAllItems(Player player, int amount) {
        CommandHandler.sendMessage(player, "Giving all items...");

-        for (AvatarData avatarData: GenshinData.getAvatarDataMap().values()) {
+        for (AvatarData avatarData: GameData.getAvatarDataMap().values()) {
            //Exclude test avatar
            if (isTestAvatar(avatarData.getId())) continue;

-            GenshinAvatar avatar = new GenshinAvatar(avatarData);
+            Avatar avatar = new Avatar(avatarData);
            avatar.setLevel(90);
            avatar.setPromoteLevel(6);
            for (int i = 1; i <= 6; ++i) {
@@ -92,41 +92,41 @@ public class GiveAllCommand implements CommandHandler {
        }

        //some test items
-        List<GenshinItem> genshinItemList = new ArrayList<>();
-        for (ItemData itemdata: GenshinData.getItemDataMap().values()) {
+        List<GameItem> itemList = new ArrayList<>();
+        for (ItemData itemdata: GameData.getItemDataMap().values()) {
            //Exclude test item
            if (isTestItem(itemdata.getId())) continue;

            if (itemdata.isEquip()) {
                for (int i = 0; i < 10; ++i) {
-                    GenshinItem genshinItem = new GenshinItem(itemdata);
+                    GameItem item = new GameItem(itemdata);
                    if (itemdata.getItemType() == ItemType.ITEM_WEAPON) {
-                        genshinItem.setLevel(90);
-                        genshinItem.setPromoteLevel(6);
-                        genshinItem.setRefinement(4);
+                        item.setLevel(90);
+                        item.setPromoteLevel(6);
+                        item.setRefinement(4);
                    }
-                    genshinItemList.add(genshinItem);
+                    itemList.add(item);
                }
            }
            else {
-                GenshinItem genshinItem = new GenshinItem(itemdata);
-                genshinItem.setCount(amount);
-                genshinItemList.add(genshinItem);
+                GameItem item = new GameItem(itemdata);
+                item.setCount(amount);
+                itemList.add(item);
            }
        }
        int packetNum = 20;
-        int itemLength = genshinItemList.size();
+        int itemLength = itemList.size();
        int number = itemLength / packetNum;
        int remainder = itemLength % packetNum;
        int offset = 0;
        for (int i = 0; i < packetNum; ++i) {
            if (remainder > 0) {
-                player.getInventory().addItems(genshinItemList.subList(i * number + offset, (i + 1) * number + offset + 1));
+                player.getInventory().addItems(itemList.subList(i * number + offset, (i + 1) * number + offset + 1));
                --remainder;
                ++offset;
            }
            else {
-                player.getInventory().addItems(genshinItemList.subList(i * number + offset, (i + 1) * number + offset));
+                player.getInventory().addItems(itemList.subList(i * number + offset, (i + 1) * number + offset));
            }
        }
    }
--- a/src/main/java/emu/grasscutter/command/commands/GiveCharCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/GiveCharCommand.java
@@ -3,10 +3,10 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.AvatarData;
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.avatar.GenshinAvatar;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.player.Player;

 import java.util.List;

@@ -15,7 +15,7 @@ import java.util.List;
 public final class GiveCharCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        int target, avatarId, level = 1, ascension;

        if (sender == null && args.size() < 2) {
@@ -61,13 +61,13 @@ public final class GiveCharCommand implements CommandHandler {
                break;
        }

-        GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+        Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
        if (targetPlayer == null) {
            CommandHandler.sendMessage(sender, "Player not found.");
            return;
        }

-        AvatarData avatarData = GenshinData.getAvatarDataMap().get(avatarId);
+        AvatarData avatarData = GameData.getAvatarDataMap().get(avatarId);
        if (avatarData == null) {
            CommandHandler.sendMessage(sender, "Invalid avatar id.");
            return;
@@ -80,7 +80,7 @@ public final class GiveCharCommand implements CommandHandler {
            ascension = (int) Math.ceil(level / 10f) - 3;
        }

-        GenshinAvatar avatar = new GenshinAvatar(avatarId);
+        Avatar avatar = new Avatar(avatarId);
        avatar.setLevel(level);
        avatar.setPromoteLevel(ascension);

--- a/src/main/java/emu/grasscutter/command/commands/GiveCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/GiveCommand.java
@@ -3,10 +3,10 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.ItemData;
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.inventory.GenshinItem;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.server.packet.send.PacketItemAddHintNotify;

@@ -18,7 +18,7 @@ import java.util.List;
 public final class GiveCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        int target, item, lvl, amount = 1;
        if (sender == null && args.size() < 2) {
            CommandHandler.sendMessage(null, "Usage: give <player> <itemId|itemName> [amount] [level]");
@@ -99,14 +99,14 @@ public final class GiveCommand implements CommandHandler {
                break;
        }

-        GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+        Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);

        if (targetPlayer == null) {
            CommandHandler.sendMessage(sender, "Player not found.");
            return;
        }

-        ItemData itemData = GenshinData.getItemDataMap().get(item);
+        ItemData itemData = GameData.getItemDataMap().get(item);
        if (itemData == null) {
            CommandHandler.sendMessage(sender, "Invalid item id.");
            return;
@@ -121,11 +121,11 @@ public final class GiveCommand implements CommandHandler {
                    String.format("Given %s with level %s %s times to %s", item, lvl, amount, target));
    }

-    private void item(GenshinPlayer player, ItemData itemData, int amount, int lvl) {
+    private void item(Player player, ItemData itemData, int amount, int lvl) {
        if (itemData.isEquip()) {
-            List<GenshinItem> items = new LinkedList<>();
+            List<GameItem> items = new LinkedList<>();
            for (int i = 0; i < amount; i++) {
-                GenshinItem item = new GenshinItem(itemData);
+                GameItem item = new GameItem(itemData);
                item.setCount(amount);
                item.setLevel(lvl);
                item.setPromoteLevel(0);
@@ -144,13 +144,11 @@ public final class GiveCommand implements CommandHandler {
                }
                items.add(item);
            }
-            player.getInventory().addItems(items);
-            player.sendPacket(new PacketItemAddHintNotify(items, ActionReason.SubfieldDrop));
+            player.getInventory().addItems(items, ActionReason.SubfieldDrop);
        } else {
-            GenshinItem genshinItem = new GenshinItem(itemData);
-            genshinItem.setCount(amount);
-            player.getInventory().addItem(genshinItem);
-            player.sendPacket(new PacketItemAddHintNotify(genshinItem, ActionReason.SubfieldDrop));
+            GameItem item = new GameItem(itemData);
+            item.setCount(amount);
+            player.getInventory().addItem(item, ActionReason.SubfieldDrop);
        }
    }
 }
--- a/src/main/java/emu/grasscutter/command/commands/GodModeCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/GodModeCommand.java
@@ -3,7 +3,7 @@ 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 emu.grasscutter.game.player.Player;

 import java.util.List;

@@ -12,7 +12,7 @@ import java.util.List;
 public final class GodModeCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (sender == null) {
            CommandHandler.sendMessage(null, "Run this command in-game.");
            return; // TODO: toggle player's godmode statue from console or other players
@@ -32,7 +32,7 @@ public final class GodModeCommand implements CommandHandler {
        } else {
            target = sender.getUid();
        }
-        GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+        Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
        if (targetPlayer == null) {
            CommandHandler.sendMessage(sender, "Player not found.");
            return;
--- a/src/main/java/emu/grasscutter/command/commands/HealCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/HealCommand.java
@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.server.packet.send.PacketAvatarFightPropUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketAvatarLifeStateChangeNotify;
@@ -13,7 +13,7 @@ import java.util.List;
        description = "Heal all characters in your current team.", permission = "player.heal")
 public final class HealCommand implements CommandHandler {
    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (sender == null) {
            CommandHandler.sendMessage(null, "Run this command in-game.");
            return;
--- a/src/main/java/emu/grasscutter/command/commands/HelpCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/HelpCommand.java
@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.command.CommandMap;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;

 import java.util.*;

@@ -12,7 +12,7 @@ import java.util.*;
 public final class HelpCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer player, List<String> args) {
+    public void execute(Player player, List<String> args) {
        if (args.size() < 1) {
            HashMap<String, CommandHandler> handlers = CommandMap.getInstance().getHandlers();
            List<Command> annotations = new ArrayList<>();
@@ -53,7 +53,7 @@ public final class HelpCommand implements CommandHandler {
        }
    }

-    void SendAllHelpMessage(GenshinPlayer player, List<Command> annotations) {
+    void SendAllHelpMessage(Player player, List<Command> annotations) {
        if (player == null) {
            StringBuilder builder = new StringBuilder("\nAvailable commands:\n");
            annotations.forEach(annotation -> {
--- a/src/main/java/emu/grasscutter/command/commands/KickCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/KickCommand.java
@@ -3,7 +3,7 @@ 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 emu.grasscutter.game.player.Player;

 import java.util.List;

@@ -12,10 +12,10 @@ import java.util.List;
 public final class KickCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        int target = Integer.parseInt(args.get(0));

-        GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+        Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
        if (targetPlayer == null) {
            CommandHandler.sendMessage(sender, "Player not found.");
            return;
--- a/src/main/java/emu/grasscutter/command/commands/KillAllCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/KillAllCommand.java
@@ -3,9 +3,9 @@ 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 emu.grasscutter.game.GenshinScene;
 import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.world.Scene;

 import java.util.List;

@@ -14,9 +14,9 @@ import java.util.List;
 public final class KillAllCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
-        GenshinScene scene;
-        GenshinPlayer genshinPlayer;
+    public void execute(Player sender, List<String> args) {
+        Scene mainScene;
+        Player targetPlayer;

        try {
            switch (args.size()) {
@@ -25,38 +25,38 @@ public final class KillAllCommand implements CommandHandler {
                        CommandHandler.sendMessage(null, "Usage: killall [playerUid] [sceneId]");
                        return;
                    }
-                    scene = sender.getScene();
+                    mainScene = sender.getScene();
                    break;
                case 1: // [playerUid]
-                    genshinPlayer = Grasscutter.getGameServer().getPlayerByUid(Integer.parseInt(args.get(0)));
-                    if (genshinPlayer == null) {
+                    targetPlayer = Grasscutter.getGameServer().getPlayerByUid(Integer.parseInt(args.get(0)));
+                    if (targetPlayer == null) {
                        CommandHandler.sendMessage(sender, "Player not found or offline.");
                        return;
                    }
-                    scene = genshinPlayer.getScene();
+                    mainScene = targetPlayer.getScene();
                    break;
                case 2: // [playerUid] [sceneId]
-                    genshinPlayer = Grasscutter.getGameServer().getPlayerByUid(Integer.parseInt(args.get(0)));
-                    if (genshinPlayer == null) {
+                    targetPlayer = Grasscutter.getGameServer().getPlayerByUid(Integer.parseInt(args.get(0)));
+                    if (targetPlayer == null) {
                        CommandHandler.sendMessage(sender, "Player not found or offline.");
                        return;
                    }
-                    GenshinScene genshinScene = sender.getWorld().getSceneById(Integer.parseInt(args.get(1)));
-                    if (genshinScene == null) {
+                    Scene scene = sender.getWorld().getSceneById(Integer.parseInt(args.get(1)));
+                    if (scene == null) {
                        CommandHandler.sendMessage(sender, "Scene not found in player world");
                        return;
                    }
-                    scene = genshinScene;
+                    mainScene = scene;
                    break;
                default:
                    CommandHandler.sendMessage(sender, "Usage: killall [playerUid] [sceneId]");
                    return;
            }

-            scene.getEntities().values().stream()
+            mainScene.getEntities().values().stream()
                    .filter(entity -> entity instanceof EntityMonster)
-                    .forEach(entity -> scene.killEntity(entity, 0));
-            CommandHandler.sendMessage(sender, "Killing all monsters in scene " + scene.getId());
+                    .forEach(entity -> mainScene.killEntity(entity, 0));
+            CommandHandler.sendMessage(sender, "Killing all monsters in scene " + mainScene.getId());
        } catch (NumberFormatException ignored) {
            CommandHandler.sendMessage(sender, "Invalid arguments.");
        }
--- a/src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java
@@ -3,8 +3,8 @@ 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 emu.grasscutter.game.entity.EntityAvatar;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.game.props.LifeState;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
@@ -17,7 +17,7 @@ import java.util.List;
 public final class KillCharacterCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        int target;
        if (sender == null) {
            // from console
@@ -48,7 +48,7 @@ public final class KillCharacterCommand implements CommandHandler {
            }
        }

-        GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+        Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
        if (targetPlayer == null) {
            CommandHandler.sendMessage(sender, "Player not found or offline.");
            return;
--- a/src/main/java/emu/grasscutter/command/commands/ListCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ListCommand.java
@@ -3,7 +3,7 @@ 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 emu.grasscutter.game.player.Player;

 import java.util.List;
 import java.util.Map;
@@ -12,8 +12,8 @@ import java.util.Map;
 public final class ListCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
-        Map<Integer, GenshinPlayer> playersMap = Grasscutter.getGameServer().getPlayers();
+    public void execute(Player sender, List<String> args) {
+        Map<Integer, Player> playersMap = Grasscutter.getGameServer().getPlayers();

        CommandHandler.sendMessage(sender, String.format("There are %s player(s) online:", playersMap.size()));

--- a/src/main/java/emu/grasscutter/command/commands/PermissionCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/PermissionCommand.java
@@ -4,7 +4,7 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.Account;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;

 import java.util.List;

@@ -13,7 +13,7 @@ import java.util.List;
 public final class PermissionCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (args.size() < 3) {
            CommandHandler.sendMessage(sender, "Usage: permission <add|remove> <username> <permission>");
            return;
--- a/src/main/java/emu/grasscutter/command/commands/PositionCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/PositionCommand.java
@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;

 import java.util.List;

@@ -11,7 +11,7 @@ import java.util.List;
 public final class PositionCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (sender == null) {
            CommandHandler.sendMessage(null, "Run this command in-game.");
            return;
--- a/src/main/java/emu/grasscutter/command/commands/ReloadCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ReloadCommand.java
@@ -3,7 +3,7 @@ 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 emu.grasscutter.game.player.Player;

 import java.util.List;

@@ -12,7 +12,7 @@ import java.util.List;
 public final class ReloadCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        CommandHandler.sendMessage(sender, "Reloading config.");
        Grasscutter.loadConfig();
        Grasscutter.getGameServer().getGachaManager().load();
--- a/src/main/java/emu/grasscutter/command/commands/ResetConstCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ResetConstCommand.java
@@ -2,9 +2,9 @@ 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.avatar.Avatar;
 import emu.grasscutter.game.entity.EntityAvatar;
+import emu.grasscutter.game.player.Player;

 import java.util.List;

@@ -14,7 +14,7 @@ import java.util.List;
 public final class ResetConstCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (sender == null) {
            CommandHandler.sendMessage(null, "Run this command in-game.");
            return;
@@ -29,14 +29,14 @@ public final class ResetConstCommand implements CommandHandler {
                return;
            }

-            GenshinAvatar avatar = entity.getAvatar();
+            Avatar 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) {
+    private void resetConstellation(Avatar avatar) {
        avatar.getTalentIdList().clear();
        avatar.setCoreProudSkillLevel(0);
        avatar.recalcStats();
--- a/src/main/java/emu/grasscutter/command/commands/RestartCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/RestartCommand.java
@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;

 import java.util.List;

@@ -10,7 +10,7 @@ import java.util.List;
 public final class RestartCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        sender.getSession().close();
    }
 }
--- a/src/main/java/emu/grasscutter/command/commands/SendMailCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SendMailCommand.java
@@ -0,0 +1,210 @@
+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.database.DatabaseHelper;
+import emu.grasscutter.game.mail.Mail;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.server.packet.send.PacketMailChangeNotify;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+
+@Command(label = "sendmail", usage = "sendmail <userId|all|help> [templateId]",
+        description = "Sends mail to the specified user. The usage of this command changes based on it's composition state.", permission = "server.sendmail")
+public class SendMailCommand implements CommandHandler {
+
+    // TODO: You should be able to do /sendmail and then just send subsequent messages until you finish
+    //  However, due to the current nature of the command system, I don't think this is possible without rewriting
+    //  the command system (again). For now this will do
+
+    // Key = User that is constructing the mail.
+    private static HashMap<Integer, MailBuilder> mailBeingConstructed = new HashMap<Integer, MailBuilder>();
+
+    // Yes this is awful and I hate it.
+    @Override
+    public void execute(Player sender, List<String> args) {
+        int senderId;
+        if(sender != null) {
+            senderId = sender.getUid();
+        } else {
+            senderId = -1;
+        }
+
+        if (!mailBeingConstructed.containsKey(senderId)) {
+            switch (args.size()) {
+                case 1 -> {
+                    MailBuilder mailBuilder;
+                    switch (args.get(0).toLowerCase()) {
+                        case "help" -> {
+                            CommandHandler.sendMessage(sender, this.getClass().getAnnotation(Command.class).description() + "\nUsage: " + this.getClass().getAnnotation(Command.class).usage());
+                            return;
+                        }
+                        case "all" -> mailBuilder = new MailBuilder(true, new Mail());
+                        default -> {
+                            if (DatabaseHelper.getPlayerById(Integer.parseInt(args.get(0))) != null) {
+                                mailBuilder = new MailBuilder(Integer.parseInt(args.get(0)), new Mail());
+                                break;
+                            } else {
+                                CommandHandler.sendMessage(sender, "The user with an id of '" + args.get(0) + "' does not exist");
+                                return;
+                            }
+                        }
+                    }
+                    mailBeingConstructed.put(senderId, mailBuilder);
+                    CommandHandler.sendMessage(sender, "Starting composition of message.\nPlease use `/sendmail <title>` to continue.\nYou can use `/sendmail stop` at any time");
+                }
+                case 2 -> CommandHandler.sendMessage(sender, "Mail templates coming soon implemented...");
+                default -> CommandHandler.sendMessage(sender, "Invalid arguments.\nUsage `/sendmail <userId|all|help> [templateId]`");
+            }
+        } else {
+            MailBuilder mailBuilder = mailBeingConstructed.get(senderId);
+
+            if (args.size() >= 1) {
+                switch (args.get(0).toLowerCase()) {
+                    case "stop" -> {
+                        mailBeingConstructed.remove(senderId);
+                        CommandHandler.sendMessage(sender, "Message sending cancelled");
+                        return;
+                    }
+                    case "finish" -> {
+                        if (mailBuilder.constructionStage == 3) {
+                            if (mailBuilder.sendToAll == false) {
+                                Grasscutter.getGameServer().getPlayerByUid(mailBuilder.recipient, true).sendMail(mailBuilder.mail);
+                                CommandHandler.sendMessage(sender, "Message sent to user " + mailBuilder.recipient + "!");
+                            } else {
+                                for (Player player : DatabaseHelper.getAllPlayers()) {
+                                    Grasscutter.getGameServer().getPlayerByUid(player.getUid(), true).sendMail(mailBuilder.mail);
+                                }
+                                CommandHandler.sendMessage(sender, "Message sent to all users!");
+                            }
+                            mailBeingConstructed.remove(senderId);
+                        } else {
+                            CommandHandler.sendMessage(sender, "Message composition not at final stage.\nPlease use `/sendmail " + getConstructionArgs(mailBuilder.constructionStage) + "` or `/sendmail stop` to cancel");
+                        }
+                        return;
+                    }
+                    case "help" -> {
+                        CommandHandler.sendMessage(sender, "Please use `/sendmail " + getConstructionArgs(mailBuilder.constructionStage) + "`");
+                        return;
+                    }
+                    default -> {
+                        switch (mailBuilder.constructionStage) {
+                            case 0 -> {
+                                String title = String.join(" ", args.subList(0, args.size()));
+                                mailBuilder.mail.mailContent.title = title;
+                                CommandHandler.sendMessage(sender, "Message title set as '" + title + "'.\nUse '/sendmail <content>' to continue.");
+                                mailBuilder.constructionStage++;
+                            }
+                            case 1 -> {
+                                String contents = String.join(" ", args.subList(0, args.size()));
+                                mailBuilder.mail.mailContent.content = contents;
+                                CommandHandler.sendMessage(sender, "Message contents set as '" + contents + "'.\nUse '/sendmail <sender>' to continue.");
+                                mailBuilder.constructionStage++;
+                            }
+                            case 2 -> {
+                                String msgSender = String.join(" ", args.subList(0, args.size()));
+                                mailBuilder.mail.mailContent.sender = msgSender;
+                                CommandHandler.sendMessage(sender, "Message sender set as '" + msgSender + "'.\nUse '/sendmail <itemId|itemName|finish> [amount] [level]' to continue.");
+                                mailBuilder.constructionStage++;
+                            }
+                            case 3 -> {
+                                // Literally just copy-pasted from the give command lol.
+                                int item, lvl, amount = 1;
+                                switch (args.size()) {
+                                    default -> { // *No args*
+                                        CommandHandler.sendMessage(sender, "Usage: give [player] <itemId|itemName> [amount]");
+                                        return;
+                                    }
+                                    case 1 -> { // <itemId|itemName>
+                                        try {
+                                            item = Integer.parseInt(args.get(0));
+                                            lvl = 1;
+                                        } catch (NumberFormatException ignored) {
+                                            // TODO: Parse from item name using GM Handbook.
+                                            CommandHandler.sendMessage(sender, "Invalid item id.");
+                                            return;
+                                        }
+                                    }
+                                    case 2 -> { // <itemId|itemName> [amount]
+                                        lvl = 1;
+                                        item = Integer.parseInt(args.get(0));
+                                        amount = Integer.parseInt(args.get(1));
+                                    }
+                                    case 3 -> { // <itemId|itemName> [amount] [level]
+                                        try {
+                                            item = Integer.parseInt(args.get(0));
+                                            amount = Integer.parseInt(args.get(1));
+                                            lvl = Integer.parseInt(args.get(2));
+
+                                        } catch (NumberFormatException ignored) {
+                                            // TODO: Parse from item name using GM Handbook.
+                                            CommandHandler.sendMessage(sender, "Invalid item or player ID.");
+                                            return;
+                                        }
+                                    }
+                                }
+                                mailBuilder.mail.itemList.add(new Mail.MailItem(item, amount, lvl));
+                                CommandHandler.sendMessage(sender, String.format("Attached %s of %s (level %s) to the message.\nContinue adding more items or use `/sendmail finish` to send the message.", amount, item, lvl));
+                            }
+                        }
+                    }
+                }
+            } else {
+                CommandHandler.sendMessage(sender, "Invalid arguments \n Please use `/sendmail " + getConstructionArgs(mailBuilder.constructionStage));
+            }
+        }
+    }
+
+    private String getConstructionArgs(int stage) {
+        switch (stage) {
+            case 0 -> {
+                return "<title>";
+            }
+            case 1 -> {
+                return "<message>";
+            }
+            case 2 -> {
+                return "<sender>";
+
+            }
+            case 3 -> {
+                return "<itemId|itemName|finish> [amount] [level]";
+            }
+            default -> {
+                Thread.dumpStack();
+                return "ERROR: invalid construction stage " + stage + ". Check console for stacktrace.";
+            }
+        }
+    }
+
+    public static class MailBuilder {
+        public int recipient;
+        public boolean sendToAll;
+        public int constructionStage;
+        public Mail mail;
+
+        public MailBuilder(int recipient, Mail mail) {
+            this.recipient = recipient;
+            this.sendToAll = false;
+            this.constructionStage = 0;
+            this.mail = mail;
+        }
+
+        public MailBuilder(boolean sendToAll, Mail mail) {
+            if (sendToAll) {
+                this.recipient = 0;
+                this.sendToAll = true;
+                this.constructionStage = 0;
+                this.mail = mail;
+            } else {
+                Grasscutter.getLogger().error("Please use MailBuilder(int, mail) when not sending to all");
+                Thread.dumpStack();
+            }
+        }
+    }
+}
--- a/src/main/java/emu/grasscutter/command/commands/SendMessageCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SendMessageCommand.java
@@ -3,7 +3,7 @@ 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 emu.grasscutter.game.player.Player;

 import java.util.List;

@@ -12,7 +12,7 @@ import java.util.List;
 public final class SendMessageCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (args.size() < 2) {
            CommandHandler.sendMessage(null, "Usage: sendmessage <player> <message>");
            return;
@@ -22,7 +22,7 @@ public final class SendMessageCommand implements CommandHandler {
            int target = Integer.parseInt(args.get(0));
            String message = String.join(" ", args.subList(1, args.size()));

-            GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+            Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
            if (targetPlayer == null) {
                CommandHandler.sendMessage(sender, "Player not found.");
                return;
--- a/src/main/java/emu/grasscutter/command/commands/SetFetterLevelCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SetFetterLevelCommand.java
@@ -4,9 +4,9 @@ import java.util.List;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.data.GenshinData;
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.avatar.GenshinAvatar;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.packet.send.PacketAvatarFetterDataNotify;

@Command(label = "setfetterlevel", usage = "setfetterlevel <level>",
@@ -15,7 +15,7 @@ import emu.grasscutter.server.packet.send.PacketAvatarFetterDataNotify;
 public final class SetFetterLevelCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (sender == null) {
            CommandHandler.sendMessage(null, "Run this command in-game.");
            return;
@@ -32,11 +32,11 @@ public final class SetFetterLevelCommand implements CommandHandler {
                CommandHandler.sendMessage(sender, "Fetter level must be between 0 and 10.");
                return;
            }
-            GenshinAvatar avatar = sender.getTeamManager().getCurrentAvatarEntity().getAvatar();
+            Avatar avatar = sender.getTeamManager().getCurrentAvatarEntity().getAvatar();

            avatar.setFetterLevel(fetterLevel);
            if (fetterLevel != 10) {
-                avatar.setFetterExp(GenshinData.getAvatarFetterLevelDataMap().get(fetterLevel).getExp());
+                avatar.setFetterExp(GameData.getAvatarFetterLevelDataMap().get(fetterLevel).getExp());
            }
 		    avatar.save();
 		
--- a/src/main/java/emu/grasscutter/command/commands/SetStatsCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SetStatsCommand.java
@@ -2,8 +2,8 @@ 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.player.Player;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;

@@ -14,7 +14,7 @@ import java.util.List;
 public final class SetStatsCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (sender == null) {
            CommandHandler.sendMessage(null, "Run this command in-game.");
            return;
--- a/src/main/java/emu/grasscutter/command/commands/SetWorldLevelCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SetWorldLevelCommand.java
@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.PlayerProperty;

 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
 public final class SetWorldLevelCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player 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
@@ -29,7 +29,7 @@ public final class SetWorldLevelCommand implements CommandHandler {

            // Set in both world and player props
            sender.getWorld().setWorldLevel(level);
-            sender.setProperty(PlayerProperty.PROP_PLAYER_WORLD_LEVEL, level);
+            sender.setWorldLevel(level);

            sender.dropMessage("World level set to " + level + ".");
        } catch (NumberFormatException ignored) {
--- a/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java
@@ -2,10 +2,10 @@ package emu.grasscutter.command.commands;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.MonsterData;
-import emu.grasscutter.game.GenshinPlayer;
 import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.utils.Position;

 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.List;
 public final class SpawnCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (sender == null) {
            CommandHandler.sendMessage(null, "Run this command in-game.");
            return;
@@ -31,7 +31,7 @@ public final class SpawnCommand implements CommandHandler {
            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);
+            MonsterData entityData = GameData.getMonsterDataMap().get(entity);
            if (entityData == null) {
                CommandHandler.sendMessage(sender, "Invalid entity id.");
                return;
--- a/src/main/java/emu/grasscutter/command/commands/StopCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/StopCommand.java
@@ -3,7 +3,7 @@ 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 emu.grasscutter.game.player.Player;

 import java.util.List;

@@ -12,9 +12,9 @@ import java.util.List;
 public final class StopCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        CommandHandler.sendMessage(null, "Server shutting down...");
-        for (GenshinPlayer p : Grasscutter.getGameServer().getPlayers().values()) {
+        for (Player p : Grasscutter.getGameServer().getPlayers().values()) {
            CommandHandler.sendMessage(p, "Server shutting down...");
        }

--- a/src/main/java/emu/grasscutter/command/commands/TalentCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/TalentCommand.java
@@ -3,9 +3,9 @@ package emu.grasscutter.command.commands;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.def.AvatarSkillDepotData;
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.avatar.GenshinAvatar;
+import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.EntityAvatar;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.packet.send.PacketAvatarSkillChangeNotify;
 import emu.grasscutter.server.packet.send.PacketAvatarSkillUpgradeRsp;

@@ -16,7 +16,7 @@ import java.util.List;
 public final class TalentCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (sender == null) {
            CommandHandler.sendMessage(null, "Run this command in-game.");
            return;
@@ -41,7 +41,7 @@ public final class TalentCommand implements CommandHandler {
                        int skillId = Integer.parseInt(args.get(1));
                        int nextLevel = Integer.parseInt(args.get(2));
                        EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity();
-                        GenshinAvatar avatar = entity.getAvatar(); 
+                        Avatar avatar = entity.getAvatar(); 
                        int skillIdNorAtk = avatar.getData().getSkillDepot().getSkills().get(0);
                        int skillIdE = avatar.getData().getSkillDepot().getSkills().get(1);
                        int skillIdQ = avatar.getData().getSkillDepot().getEnergySkill();
@@ -97,7 +97,7 @@ public final class TalentCommand implements CommandHandler {
            case "n": case "e": case "q":
                try {
                    EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity();
-                    GenshinAvatar avatar = entity.getAvatar();
+                    Avatar avatar = entity.getAvatar();
                    AvatarSkillDepotData SkillDepot = avatar.getData().getSkillDepot();
                    int skillId;
                    switch (cmdSwitch) {
@@ -135,7 +135,7 @@ public final class TalentCommand implements CommandHandler {
                break;
            case "getid":           
                    EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity();
-                    GenshinAvatar avatar = entity.getAvatar(); 
+                    Avatar avatar = entity.getAvatar(); 
                    int skillIdNorAtk = avatar.getData().getSkillDepot().getSkills().get(0);
                    int skillIdE = avatar.getData().getSkillDepot().getSkills().get(1);
                    int skillIdQ = avatar.getData().getSkillDepot().getEnergySkill();
--- a/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java
@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.utils.Position;

 import java.util.List;
@@ -12,7 +12,7 @@ import java.util.List;
 public final class TeleportCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (sender == null) {
            CommandHandler.sendMessage(null, "Run this command in-game.");
            return;
--- a/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java
@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;

 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ClimateType;
 import emu.grasscutter.server.packet.send.PacketSceneAreaWeatherNotify;

@@ -13,7 +13,7 @@ import java.util.List;
 public final class WeatherCommand implements CommandHandler {

    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
+    public void execute(Player sender, List<String> args) {
        if (sender == null) {
            CommandHandler.sendMessage(null, "Run this command in-game.");
            return;