Merge branch 'Grasscutters:development' into development

.github/workflows/build.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - "stable"
+      - "development"
   pull_request:
     types:
       - opened
@@ -25,4 +26,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: Grasscutter
-          path: grasscutter.jar
+          path: grasscutter-*-dev.jar

build.gradle

@@ -23,6 +23,8 @@ plugins {
     id 'com.google.protobuf' version "0.8.18"
     id 'idea'
 
+    id 'eclipse'
+
     // Apply the application plugin to add support for building a CLI application
     id 'application'
 
@@ -189,6 +191,14 @@ idea {
     }
 }
 
+eclipse {
+    classpath {
+        file.whenMerged { cp ->
+            cp.entries.add( new org.gradle.plugins.ide.eclipse.model.SourceFolder('src/generated/main/java', null) )
+        }
+    }
+}
+
 signing {
     sign publishing.publications.mavenJava
 }
@@ -198,3 +208,7 @@ javadoc {
         options.addBooleanOption('html5', true)
     }
 }
+
+processResources {
+    dependsOn "generateProto"
+}

proto/AvatarDataNotify.proto

@@ -17,7 +17,7 @@ message AvatarDataNotify {
 	repeated AvatarInfo avatar_list = 1;
 	map<uint32, AvatarTeam> avatar_team_map = 2;
 	uint32 cur_avatar_team_id = 3;
-	uint64 choose_avatar_guid = 4;
+	fixed64 choose_avatar_guid = 4;
 	repeated uint64 temp_avatar_guid_list = 5;
 	repeated uint32 owned_flycloak_list = 6;
 	repeated uint32 owned_costume_list = 7;

proto/ChangeMailStarNotify.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message ChangeMailStarNotify {
+  repeated uint32 mail_id_list = 1;
+  bool is_star = 2;
+}

proto/DelMailReq.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message DelMailReq {
+  repeated uint32 mail_id_list = 1;
+}

proto/DelMailRsp.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message DelMailRsp {
+  int32 retcode = 1;
+  repeated uint32 mail_id_list = 2;
+}

proto/EquipParam.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message EquipParam {
+  uint32 item_id = 1;
+  uint32 item_num = 2;
+  uint32 item_level = 3;
+  uint32 promote_level = 4;
+}

proto/GetAllMailReq.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message GetAllMailReq {
+  bool is_gift_mail = 1;
+}

proto/GetAllMailRsp.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "MailData.proto";
+
+message GetAllMailRsp {
+  int32 retcode = 1;
+  repeated MailData mail_list = 2;
+  bool is_truncated = 3;
+}

proto/GetMailItemReq.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message GetMailItemReq {
+  repeated uint32 mail_id_list = 1;
+}

proto/GetMailItemRsp.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "EquipParam.proto";
+
+message GetMailItemRsp {
+  int32 retcode = 1;
+  repeated uint32 mail_id_list = 2;
+  repeated EquipParam item_list = 3;
+}

proto/MailChangeNotify.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "MailData.proto";
+
+message MailChangeNotify {
+  repeated MailData mail_list = 1;
+  repeated uint32 del_mail_id_list = 2;
+}

proto/MailData.proto

@@ -0,0 +1,20 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "MailTextContent.proto";
+import "MailItem.proto";
+
+message MailData {
+  uint32 mail_id = 1;
+  MailTextContent mail_text_content = 4;
+  repeated MailItem item_list = 7;
+  uint32 send_time = 8;
+  uint32 expire_time = 9;
+  uint32 importance = 10;
+  bool is_read = 11;
+  bool is_attachment_got = 12;
+  uint32 config_id = 13;
+  repeated string argument_list = 14;
+  uint32 state_value = 15;
+}

proto/MailItem.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "ItemParam.proto";
+import "MaterialDeleteInfo.proto";
+
+message MailItem {
+  ItemParam item_param = 1;
+  MaterialDeleteInfo delete_info = 2;
+}

proto/MailTextContent.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message MailTextContent {
+  string title = 1;
+  string content = 2;
+  string sender = 3;
+}

proto/ReadMailNotify.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+message ReadMailNotify {
+  repeated uint32 mail_id_list = 1;
+}

src/main/java/emu/grasscutter/GameConstants.java

@@ -5,7 +5,7 @@ import java.util.Arrays;
 import emu.grasscutter.utils.Position;
 import emu.grasscutter.utils.Utils;
 
-public final class GenshinConstants {
+public final class GameConstants {
 	public static String VERSION = "2.6.0";
 	
 	public static final int MAX_TEAMS = 4;

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

@@ -1,7 +1,7 @@
 package emu.grasscutter.command;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 
@@ -12,7 +12,7 @@ public interface CommandHandler {
      * @param player  The player to send the message to, or null for the server console.
      * @param message The message to send.
      */
-    static void sendMessage(GenshinPlayer player, String message) {
+    static void sendMessage(Player player, String message) {
         if (player == null) {
             Grasscutter.getLogger().info(message);
         } else {
@@ -25,6 +25,6 @@ public interface CommandHandler {
      * @param sender The player/console that invoked the command.
      * @param args The arguments to the command.
      */
-    default void execute(GenshinPlayer sender, List<String> args) {
+    default void execute(Player sender, List<String> args) {
     }
 }

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

@@ -2,7 +2,8 @@ package emu.grasscutter.command;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.Account;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;
+
 import org.reflections.Reflections;
 
 import java.util.*;
@@ -103,7 +104,7 @@ public final class CommandMap {
      * @param player     The player invoking the command or null for the server console.
      * @param rawMessage The messaged used to invoke the command.
      */
-    public void invoke(GenshinPlayer player, String rawMessage) {
+    public void invoke(Player player, String rawMessage) {
         rawMessage = rawMessage.trim();
         if (rawMessage.length() == 0) {
             CommandHandler.sendMessage(player, "No command specified.");

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;

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);
         }
 

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;

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;

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;

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.Avatar;
-import emu.grasscutter.game.avatar.GenshinAvatar;
+import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.inventory.GenshinItem;
 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<>();
+        List<GameItem> itemList = new ArrayList<>();
-        for (ItemData itemdata: GenshinData.getItemDataMap().values()) {
+        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);
+                        item.setLevel(90);
-                        genshinItem.setPromoteLevel(6);
+                        item.setPromoteLevel(6);
-                        genshinItem.setRefinement(4);
+                        item.setRefinement(4);
                     }
-                    genshinItemList.add(genshinItem);
+                    itemList.add(item);
                 }
             }
             else {
-                GenshinItem genshinItem = new GenshinItem(itemdata);
+                GameItem item = new GameItem(itemdata);
-                genshinItem.setCount(amount);
+                item.setCount(amount);
-                genshinItemList.add(genshinItem);
+                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));
             }
         }
     }

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.Avatar;
-import emu.grasscutter.game.avatar.GenshinAvatar;
+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);
 

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.GameItem;
-import emu.grasscutter.game.inventory.GenshinItem;
+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.getInventory().addItems(items, ActionReason.SubfieldDrop);
-            player.sendPacket(new PacketItemAddHintNotify(items, ActionReason.SubfieldDrop));
         } else {
-            GenshinItem genshinItem = new GenshinItem(itemData);
+            GameItem item = new GameItem(itemData);
-            genshinItem.setCount(amount);
+            item.setCount(amount);
-            player.getInventory().addItem(genshinItem);
+            player.getInventory().addItem(item, ActionReason.SubfieldDrop);
-            player.sendPacket(new PacketItemAddHintNotify(genshinItem, ActionReason.SubfieldDrop));
         }
     }
 }

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;

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;

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 -> {

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;

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) {
+    public void execute(Player sender, List<String> args) {
-        GenshinScene scene;
+        Scene mainScene;
-        GenshinPlayer genshinPlayer;
+        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)));
+                    targetPlayer = Grasscutter.getGameServer().getPlayerByUid(Integer.parseInt(args.get(0)));
-                    if (genshinPlayer == null) {
+                    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)));
+                    targetPlayer = Grasscutter.getGameServer().getPlayerByUid(Integer.parseInt(args.get(0)));
-                    if (genshinPlayer == null) {
+                    if (targetPlayer == null) {
                         CommandHandler.sendMessage(sender, "Player not found or offline.");
                         return;
                     }
-                    GenshinScene genshinScene = sender.getWorld().getSceneById(Integer.parseInt(args.get(1)));
+                    Scene scene = sender.getWorld().getSceneById(Integer.parseInt(args.get(1)));
-                    if (genshinScene == null) {
+                    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));
+                    .forEach(entity -> mainScene.killEntity(entity, 0));
-            CommandHandler.sendMessage(sender, "Killing all monsters in scene " + scene.getId());
+            CommandHandler.sendMessage(sender, "Killing all monsters in scene " + mainScene.getId());
         } catch (NumberFormatException ignored) {
             CommandHandler.sendMessage(sender, "Invalid arguments.");
         }

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;

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) {
+    public void execute(Player sender, List<String> args) {
-        Map<Integer, GenshinPlayer> playersMap = Grasscutter.getGameServer().getPlayers();
+        Map<Integer, Player> playersMap = Grasscutter.getGameServer().getPlayers();
 
         CommandHandler.sendMessage(sender, String.format("There are %s player(s) online:", playersMap.size()));
 

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;

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;

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();

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.Avatar;
-import emu.grasscutter.game.avatar.GenshinAvatar;
 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();

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();
     }
 }

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();
+            }
+        }
+    }
+}

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;

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.data.GameData;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.avatar.GenshinAvatar;
+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();
 		

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;

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) {

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;

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...");
         }
 

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.Avatar;
-import emu.grasscutter.game.avatar.GenshinAvatar;
 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();

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;

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;

src/main/java/emu/grasscutter/data/GameData.java

@@ -16,7 +16,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
-public class GenshinData {
+public class GameData {
 	// BinOutputs
 	private static final Int2ObjectMap<String> abilityHashes = new Int2ObjectOpenHashMap<>();
 	private static final Map<String, AbilityEmbryoEntry> abilityEmbryos = new HashMap<>();
@@ -69,7 +69,7 @@ public class GenshinData {
 		Int2ObjectMap<?> map = null;
 		
 		try {
-			Field field = GenshinData.class.getDeclaredField(Utils.lowerCaseFirstChar(resourceDefinition.getSimpleName()) + "Map");
+			Field field = GameData.class.getDeclaredField(Utils.lowerCaseFirstChar(resourceDefinition.getSimpleName()) + "Map");
 			field.setAccessible(true);
 			
 			map = (Int2ObjectMap<?>) field.get(null);

src/main/java/emu/grasscutter/data/GameDepot.java

@@ -15,21 +15,21 @@ import emu.grasscutter.utils.WeightedList;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
-public class GenshinDepot {
+public class GameDepot {
 	private static Int2ObjectMap<WeightedList<ReliquaryMainPropData>> relicMainPropDepot = new Int2ObjectOpenHashMap<>();
 	private static Int2ObjectMap<List<ReliquaryAffixData>> relicAffixDepot = new Int2ObjectOpenHashMap<>();
 	
 	private static Int2ObjectMap<SpatialIndex<SpawnGroupEntry>> spawnLists = new Int2ObjectOpenHashMap<>();
 	
 	public static void load() {
-		for (ReliquaryMainPropData data : GenshinData.getReliquaryMainPropDataMap().values()) {
+		for (ReliquaryMainPropData data : GameData.getReliquaryMainPropDataMap().values()) {
 			if (data.getWeight() <= 0 || data.getPropDepotId() <= 0) {
 				continue;
 			}
 			WeightedList<ReliquaryMainPropData> list = relicMainPropDepot.computeIfAbsent(data.getPropDepotId(), k -> new WeightedList<>());
 			list.add(data.getWeight(), data);
 		}
-		for (ReliquaryAffixData data : GenshinData.getReliquaryAffixDataMap().values()) {
+		for (ReliquaryAffixData data : GameData.getReliquaryAffixDataMap().values()) {
 			if (data.getWeight() <= 0 || data.getDepotId() <= 0) {
 				continue;
 			}

src/main/java/emu/grasscutter/data/GameResource.java

@@ -1,6 +1,6 @@
 package emu.grasscutter.data;
 
-public abstract class GenshinResource {
+public abstract class GameResource {
 	
 	public int getId() {
 		return 0;

src/main/java/emu/grasscutter/data/ResourceLoader.java

@@ -27,7 +27,7 @@ public class ResourceLoader {
 
 	public static List<Class<?>> getResourceDefClasses() {
 		Reflections reflections = new Reflections(ResourceLoader.class.getPackage().getName());
-		Set<?> classes = reflections.getSubTypesOf(GenshinResource.class);
+		Set<?> classes = reflections.getSubTypesOf(GameResource.class);
 
 		List<Class<?>> classList = new ArrayList<>(classes.size());
 		classes.forEach(o -> {
@@ -50,12 +50,12 @@ public class ResourceLoader {
 		loadResources();
 		loadScenePoints();
 		// Process into depots
-		GenshinDepot.load();
+		GameDepot.load();
 		// Load spawn data
 		loadSpawnData();
 		// Custom - TODO move this somewhere else
 		try {
-			GenshinData.getAvatarSkillDepotDataMap().get(504).setAbilities(
+			GameData.getAvatarSkillDepotDataMap().get(504).setAbilities(
 				new AbilityEmbryoEntry(
 					"", 
 					new String[] {
@@ -68,7 +68,7 @@ public class ResourceLoader {
 						"Avatar_Player_WindBreathe_CameraController"
 					}
 			));
-			GenshinData.getAvatarSkillDepotDataMap().get(704).setAbilities(
+			GameData.getAvatarSkillDepotDataMap().get(704).setAbilities(
 				new AbilityEmbryoEntry(
 					"", 
 					new String[] {
@@ -95,7 +95,7 @@ public class ResourceLoader {
 			}
 
 			@SuppressWarnings("rawtypes")
-			Int2ObjectMap map = GenshinData.getMapByResourceDef(resourceDefinition);
+			Int2ObjectMap map = GameData.getMapByResourceDef(resourceDefinition);
 
 			if (map == null) {
 				continue;
@@ -123,7 +123,7 @@ public class ResourceLoader {
 			List list = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, c).getType());
 
 			for (Object o : list) {
-				GenshinResource res = (GenshinResource) o;
+				GameResource res = (GameResource) o;
 				res.onLoad();
 				map.put(res.getId(), res);
 			}
@@ -170,7 +170,7 @@ public class ResourceLoader {
 			}
 
 			for (ScenePointEntry entry : scenePointList) {
-				GenshinData.getScenePointEntries().put(entry.getName(), entry);
+				GameData.getScenePointEntries().put(entry.getName(), entry);
 			}
 		}
 	}
@@ -233,7 +233,7 @@ public class ResourceLoader {
 		}
 
 		for (AbilityEmbryoEntry entry : embryoList) {
-			GenshinData.getAbilityEmbryoInfo().put(entry.getName(), entry);
+			GameData.getAbilityEmbryoInfo().put(entry.getName(), entry);
 		}
 	}
 	
@@ -260,7 +260,7 @@ public class ResourceLoader {
 			entry.getSpawns().stream().forEach(s -> {
 				s.setGroup(entry);
 			});
-			GenshinDepot.getSpawnListById(entry.getSceneId()).insert(entry, entry.getPos().getX(), entry.getPos().getZ());
+			GameDepot.getSpawnListById(entry.getSceneId()).insert(entry, entry.getPos().getX(), entry.getPos().getZ());
 		}
 	}
 	
@@ -328,7 +328,7 @@ public class ResourceLoader {
 		}
 		
 		for (OpenConfigEntry entry : list) {
-			GenshinData.getOpenConfigEntries().put(entry.getName(), entry);
+			GameData.getOpenConfigEntries().put(entry.getName(), entry);
 		}
 	}
 

src/main/java/emu/grasscutter/data/def/AvatarCostumeData.java

@@ -1,11 +1,11 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "AvatarCostumeExcelConfigData.json")
-public class AvatarCostumeData extends GenshinResource {
+public class AvatarCostumeData extends GameResource {
 	private int CostumeId;
 	private int ItemId;
     private int AvatarId;
@@ -25,6 +25,6 @@ public class AvatarCostumeData extends GenshinResource {
 	
 	@Override
 	public void onLoad() {
-		GenshinData.getAvatarCostumeDataItemIdMap().put(this.getItemId(), this);
+		GameData.getAvatarCostumeDataItemIdMap().put(this.getItemId(), this);
 	}
 }

src/main/java/emu/grasscutter/data/def/AvatarCurveData.java

@@ -4,12 +4,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.common.CurveInfo;
 
 @ResourceType(name = "AvatarCurveExcelConfigData.json")
-public class AvatarCurveData extends GenshinResource {
+public class AvatarCurveData extends GameResource {
 	private int Level;
 	private CurveInfo[] CurveInfos;
     

src/main/java/emu/grasscutter/data/def/AvatarData.java

@@ -2,8 +2,8 @@ package emu.grasscutter.data.def;
 
 import java.util.List;
 
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.common.PropGrowCurve;
@@ -15,7 +15,7 @@ import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
 
 @ResourceType(name = "AvatarExcelConfigData.json", loadPriority = LoadPriority.LOW)
-public class AvatarData extends GenshinResource {
+public class AvatarData extends GameResource {
 	
 	private String name;
 	private String IconName;
@@ -178,7 +178,7 @@ public class AvatarData extends GenshinResource {
     	if (growCurve == null) {
     		return 1f;
     	}
-    	AvatarCurveData curveData = GenshinData.getAvatarCurveDataMap().get(level);
+    	AvatarCurveData curveData = GameData.getAvatarCurveDataMap().get(level);
     	if (curveData == null) {
     		return 1f;
     	}
@@ -211,24 +211,24 @@ public class AvatarData extends GenshinResource {
 
 	@Override
 	public void onLoad() {
-    	this.skillDepot = GenshinData.getAvatarSkillDepotDataMap().get(this.SkillDepotId);
+    	this.skillDepot = GameData.getAvatarSkillDepotDataMap().get(this.SkillDepotId);
 
-        // Get fetters from GenshinData
+        // Get fetters from GameData
-        this.fetters = GenshinData.getFetterDataEntries().get(this.Id);
+        this.fetters = GameData.getFetterDataEntries().get(this.Id);
         
-        if (GenshinData.getFetterCharacterCardDataMap().get(this.Id) != null) {
+        if (GameData.getFetterCharacterCardDataMap().get(this.Id) != null) {
-            this.nameCardRewardId = GenshinData.getFetterCharacterCardDataMap().get(this.Id).getRewardId();
+            this.nameCardRewardId = GameData.getFetterCharacterCardDataMap().get(this.Id).getRewardId();
         }
 
-        if (GenshinData.getRewardDataMap().get(this.nameCardRewardId) != null) {
+        if (GameData.getRewardDataMap().get(this.nameCardRewardId) != null) {
-            this.nameCardId = GenshinData.getRewardDataMap().get(this.nameCardRewardId).getRewardItemList().get(0).getItemId();
+            this.nameCardId = GameData.getRewardDataMap().get(this.nameCardRewardId).getRewardItemList().get(0).getItemId();
         }
     	
-    	int size = GenshinData.getAvatarCurveDataMap().size();
+    	int size = GameData.getAvatarCurveDataMap().size();
     	this.hpGrowthCurve = new float[size];
     	this.attackGrowthCurve = new float[size];
     	this.defenseGrowthCurve = new float[size];
-    	for (AvatarCurveData curveData : GenshinData.getAvatarCurveDataMap().values()) {
+    	for (AvatarCurveData curveData : GameData.getAvatarCurveDataMap().values()) {
     		int level = curveData.getLevel() - 1;
     		for (PropGrowCurve growCurve : this.PropGrowCurves) {
     			FightProperty prop = FightProperty.getPropByName(growCurve.getType());
@@ -260,7 +260,7 @@ public class AvatarData extends GenshinResource {
     	if (split.length > 0) {
     		this.name = split[split.length - 1];
     		
-    		AbilityEmbryoEntry info = GenshinData.getAbilityEmbryoInfo().get(this.name);
+    		AbilityEmbryoEntry info = GameData.getAbilityEmbryoInfo().get(this.name);
     		if (info != null) {
     			this.abilities = new IntArrayList(info.getAbilities().length);
     			for (String ability : info.getAbilities()) {

src/main/java/emu/grasscutter/data/def/AvatarFetterLevelData.java

@@ -1,10 +1,10 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "AvatarFettersLevelExcelConfigData.json")
-public class AvatarFetterLevelData extends GenshinResource {
+public class AvatarFetterLevelData extends GameResource {
 	private int FetterLevel;
 	private int NeedExp;
 	

src/main/java/emu/grasscutter/data/def/AvatarFlycloakData.java

@@ -1,10 +1,10 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "AvatarFlycloakExcelConfigData.json")
-public class AvatarFlycloakData extends GenshinResource {
+public class AvatarFlycloakData extends GameResource {
 	private int FlycloakId;
     private long NameTextMapHash;
 

src/main/java/emu/grasscutter/data/def/AvatarLevelData.java

@@ -1,10 +1,10 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "AvatarLevelExcelConfigData.json")
-public class AvatarLevelData extends GenshinResource {
+public class AvatarLevelData extends GameResource {
 	private int Level;
 	private int Exp;
 	

src/main/java/emu/grasscutter/data/def/AvatarPromoteData.java

@@ -1,13 +1,13 @@
 package emu.grasscutter.data.def;
 
 import java.util.ArrayList;
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.common.FightPropData;
 import emu.grasscutter.data.common.ItemParamData;
 
 @ResourceType(name = "AvatarPromoteExcelConfigData.json")
-public class AvatarPromoteData extends GenshinResource {
+public class AvatarPromoteData extends GameResource {
 	
 	private int AvatarPromoteId;
 	private int PromoteLevel;

src/main/java/emu/grasscutter/data/def/AvatarSkillData.java

@@ -2,12 +2,12 @@ package emu.grasscutter.data.def;
 
 import java.util.List;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 
 @ResourceType(name = "AvatarSkillExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
-public class AvatarSkillData extends GenshinResource {
+public class AvatarSkillData extends GameResource {
 	private int Id;
     private	float CdTime;
     private int CostElemVal;

src/main/java/emu/grasscutter/data/def/AvatarSkillDepotData.java

@@ -2,8 +2,8 @@ package emu.grasscutter.data.def;
 
 import java.util.List;
 
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.custom.AbilityEmbryoEntry;
@@ -13,7 +13,7 @@ import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
 
 @ResourceType(name = "AvatarSkillDepotExcelConfigData.json", loadPriority = LoadPriority.HIGH)
-public class AvatarSkillDepotData extends GenshinResource {
+public class AvatarSkillDepotData extends GameResource {
 	
     private int Id;
     private int EnergySkill;
@@ -94,7 +94,7 @@ public class AvatarSkillDepotData extends GenshinResource {
 	
 	@Override
 	public void onLoad() {
-    	this.energySkillData = GenshinData.getAvatarSkillDataMap().get(this.EnergySkill);
+    	this.energySkillData = GameData.getAvatarSkillDataMap().get(this.EnergySkill);
     	if (getEnergySkillData() != null) {
     		this.elementType = ElementType.getTypeByName(getEnergySkillData().getCostElemType());
     	} else {

src/main/java/emu/grasscutter/data/def/AvatarTalentData.java

@@ -1,13 +1,13 @@
 package emu.grasscutter.data.def;
 
 import java.util.ArrayList;
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.common.FightPropData;
 
 @ResourceType(name = "AvatarTalentExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
-public class AvatarTalentData extends GenshinResource {
+public class AvatarTalentData extends GameResource {
 	private int TalentId;
 	private int PrevTalent;
     private long NameTextMapHash;

src/main/java/emu/grasscutter/data/def/EquipAffixData.java

@@ -1,12 +1,12 @@
 package emu.grasscutter.data.def;
 
 import java.util.ArrayList;
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.common.FightPropData;
 
 @ResourceType(name = "EquipAffixExcelConfigData.json")
-public class EquipAffixData extends GenshinResource {
+public class EquipAffixData extends GameResource {
 
 	private int AffixId;
     private int Id;

src/main/java/emu/grasscutter/data/def/FetterCharacterCardData.java

@@ -1,11 +1,11 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 
 @ResourceType(name = "FetterCharacterCardExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
-public class FetterCharacterCardData extends GenshinResource {
+public class FetterCharacterCardData extends GameResource {
     private int AvatarId;
     private int RewardId;
 

src/main/java/emu/grasscutter/data/def/FetterData.java

@@ -2,13 +2,13 @@ package emu.grasscutter.data.def;
 
 import java.util.List;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.common.OpenCondData;
 
 @ResourceType(name = {"FetterInfoExcelConfigData.json", "FettersExcelConfigData.json", "FetterStoryExcelConfigData.json"}, loadPriority = LoadPriority.HIGHEST)
-public class FetterData extends GenshinResource {
+public class FetterData extends GameResource {
     private int AvatarId;
     private int FetterId;
     private List<OpenCondData> OpenCond;

src/main/java/emu/grasscutter/data/def/GadgetData.java

@@ -1,10 +1,10 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "GadgetExcelConfigData.json")
-public class GadgetData extends GenshinResource {
+public class GadgetData extends GameResource {
 	private int Id;
 	
 	private String Type;

src/main/java/emu/grasscutter/data/def/ItemData.java

@@ -1,13 +1,13 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.game.props.FightProperty;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 
 @ResourceType(name = {"MaterialExcelConfigData.json", "WeaponExcelConfigData.json", "ReliquaryExcelConfigData.json"})
-public class ItemData extends GenshinResource {
+public class ItemData extends GameResource {
 	
 	private int Id;
     private int StackLimit = 1;

src/main/java/emu/grasscutter/data/def/MonsterCurveData.java

@@ -4,12 +4,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.common.CurveInfo;
 
 @ResourceType(name = "MonsterCurveExcelConfigData.json")
-public class MonsterCurveData extends GenshinResource {
+public class MonsterCurveData extends GameResource {
 	private int Level;
     private CurveInfo[] CurveInfos;
     

src/main/java/emu/grasscutter/data/def/MonsterData.java

@@ -2,14 +2,14 @@ package emu.grasscutter.data.def;
 
 import java.util.List;
 
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.common.PropGrowCurve;
 
 @ResourceType(name = "MonsterExcelConfigData.json", loadPriority = LoadPriority.LOW)
-public class MonsterData extends GenshinResource {
+public class MonsterData extends GameResource {
 	private int Id;
 	
 	private String MonsterName;
@@ -168,13 +168,13 @@ public class MonsterData extends GenshinResource {
 
 	@Override
 	public void onLoad() {
-		this.describeData = GenshinData.getMonsterDescribeDataMap().get(this.getDescribeId());
+		this.describeData = GameData.getMonsterDescribeDataMap().get(this.getDescribeId());
 		
 		for (int id : this.Equips) {
 			if (id == 0) {
 				continue;
 			}
-			GadgetData gadget = GenshinData.getGadgetDataMap().get(id);
+			GadgetData gadget = GameData.getGadgetDataMap().get(id);
 			if (gadget == null) {
 				continue;
 			}

src/main/java/emu/grasscutter/data/def/MonsterDescribeData.java

@@ -1,11 +1,11 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 
 @ResourceType(name = "MonsterDescribeExcelConfigData.json", loadPriority = LoadPriority.HIGH)
-public class MonsterDescribeData extends GenshinResource {
+public class MonsterDescribeData extends GameResource {
 	private int Id;
     private long NameTextMapHash;
     private int TitleID;

src/main/java/emu/grasscutter/data/def/NpcData.java

@@ -1,10 +1,10 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "NpcExcelConfigData.json")
-public class NpcData extends GenshinResource {
+public class NpcData extends GameResource {
 	private int Id;
 	
 	private String JsonName;

src/main/java/emu/grasscutter/data/def/PlayerLevelData.java

@@ -1,10 +1,10 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "PlayerLevelExcelConfigData.json")
-public class PlayerLevelData extends GenshinResource {
+public class PlayerLevelData extends GameResource {
 	private int Level;
 	private int Exp;
 	private int RewardId;

src/main/java/emu/grasscutter/data/def/ProudSkillData.java

@@ -3,13 +3,13 @@ package emu.grasscutter.data.def;
 import java.util.ArrayList;
 import java.util.List;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.common.FightPropData;
 import emu.grasscutter.data.common.ItemParamData;
 
 @ResourceType(name = "ProudSkillExcelConfigData.json")
-public class ProudSkillData extends GenshinResource {
+public class ProudSkillData extends GameResource {
 	
 	private int ProudSkillId;
     private int ProudSkillGroupId;

src/main/java/emu/grasscutter/data/def/ReliquaryAffixData.java

@@ -1,11 +1,11 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.game.props.FightProperty;
 
 @ResourceType(name = "ReliquaryAffixExcelConfigData.json")
-public class ReliquaryAffixData extends GenshinResource {
+public class ReliquaryAffixData extends GameResource {
 	private int Id;
 	
 	private int DepotId;

src/main/java/emu/grasscutter/data/def/ReliquaryLevelData.java

@@ -2,14 +2,14 @@ package emu.grasscutter.data.def;
 
 import java.util.List;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.game.props.FightProperty;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 @ResourceType(name = "ReliquaryLevelExcelConfigData.json")
-public class ReliquaryLevelData extends GenshinResource {
+public class ReliquaryLevelData extends GameResource {
 	private int id;
 	private Int2ObjectMap<Float> propMap;
 	

src/main/java/emu/grasscutter/data/def/ReliquaryMainPropData.java

@@ -1,11 +1,11 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.game.props.FightProperty;
 
 @ResourceType(name = "ReliquaryMainPropExcelConfigData.json")
-public class ReliquaryMainPropData extends GenshinResource {
+public class ReliquaryMainPropData extends GameResource {
 	private int Id;
 	
 	private int PropDepotId;

src/main/java/emu/grasscutter/data/def/ReliquarySetData.java

@@ -1,10 +1,10 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "ReliquarySetExcelConfigData.json")
-public class ReliquarySetData extends GenshinResource {
+public class ReliquarySetData extends GameResource {
 	private int SetId;
     private int[] SetNeedNum;
     private int EquipAffixId;

src/main/java/emu/grasscutter/data/def/RewardData.java

@@ -2,12 +2,12 @@ package emu.grasscutter.data.def;
 
 import java.util.List;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.common.RewardItemData;
 
 @ResourceType(name = "RewardExcelConfigData.json")
-public class RewardData extends GenshinResource {
+public class RewardData extends GameResource {
     public int RewardId;
     public List<RewardItemData> RewardItemList;
 

src/main/java/emu/grasscutter/data/def/SceneData.java

@@ -1,13 +1,13 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 import emu.grasscutter.game.props.SceneType;
 
 @ResourceType(name = "SceneExcelConfigData.json")
-public class SceneData extends GenshinResource {
+public class SceneData extends GameResource {
 	private int Id;
 	private SceneType SceneType;
 	private String ScriptData;

src/main/java/emu/grasscutter/data/def/WeaponCurveData.java

@@ -4,12 +4,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.common.CurveInfo;
 
 @ResourceType(name = "WeaponCurveExcelConfigData.json")
-public class WeaponCurveData extends GenshinResource {
+public class WeaponCurveData extends GameResource {
 	private int Level;
     private CurveInfo[] CurveInfos;
     

src/main/java/emu/grasscutter/data/def/WeaponLevelData.java

@@ -1,10 +1,10 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "WeaponLevelExcelConfigData.json")
-public class WeaponLevelData extends GenshinResource {
+public class WeaponLevelData extends GameResource {
 	private int Level;
 	private int[] RequiredExps;
 	

src/main/java/emu/grasscutter/data/def/WeaponPromoteData.java

@@ -1,13 +1,13 @@
 package emu.grasscutter.data.def;
 
 import java.util.ArrayList;
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.common.FightPropData;
 import emu.grasscutter.data.common.ItemParamData;
 
 @ResourceType(name = "WeaponPromoteExcelConfigData.json")
-public class WeaponPromoteData extends GenshinResource {
+public class WeaponPromoteData extends GameResource {
 	
 	private int WeaponPromoteId;
     private int PromoteLevel;

src/main/java/emu/grasscutter/data/def/WorldLevelData.java

@@ -1,10 +1,10 @@
 package emu.grasscutter.data.def;
 
-import emu.grasscutter.data.GenshinResource;
+import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 
 @ResourceType(name = "WorldLevelExcelConfigData.json")
-public class WorldLevelData extends GenshinResource {
+public class WorldLevelData extends GameResource {
 	private int Level;
 	private int MonsterLevel;
 	    

src/main/java/emu/grasscutter/database/DatabaseHelper.java

@@ -4,12 +4,12 @@ import java.util.List;
 
 import com.mongodb.client.result.DeleteResult;
 import dev.morphia.query.experimental.filters.Filters;
-import emu.grasscutter.GenshinConstants;
+import emu.grasscutter.GameConstants;
 import emu.grasscutter.game.Account;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.avatar.GenshinAvatar;
 import emu.grasscutter.game.friends.Friendship;
-import emu.grasscutter.game.inventory.GenshinItem;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
 
 public final class DatabaseHelper {
 	public static Account createAccount(String username) {
@@ -26,7 +26,7 @@ public final class DatabaseHelper {
 		// Make sure there are no id collisions
 		if (reservedId > 0) {
 			// Cannot make account with the same uid as the server console
-			if (reservedId == GenshinConstants.SERVER_CONSOLE_UID) {
+			if (reservedId == GameConstants.SERVER_CONSOLE_UID) {
 				return null;
 			}
 			exists = DatabaseHelper.getAccountByPlayerId(reservedId);
@@ -90,15 +90,19 @@ public final class DatabaseHelper {
 		return DatabaseManager.getDatastore().find(Account.class).filter(Filters.eq("username", username)).delete().getDeletedCount() > 0;
 	}
 
-	public static GenshinPlayer getPlayerById(int id) {
+	public static List<Player> getAllPlayers() {
-		return DatabaseManager.getDatastore().find(GenshinPlayer.class).filter(Filters.eq("_id", id)).first();
+		return DatabaseManager.getDatastore().find(Player.class).stream().toList();
+	}
+
+	public static Player getPlayerById(int id) {
+		return DatabaseManager.getDatastore().find(Player.class).filter(Filters.eq("_id", id)).first();
 	}
 
 	public static boolean checkPlayerExists(int id) {
-		return DatabaseManager.getDatastore().find(GenshinPlayer.class).filter(Filters.eq("_id", id)).first() != null;
+		return DatabaseManager.getDatastore().find(Player.class).filter(Filters.eq("_id", id)).first() != null;
 	}
 
-	public static synchronized GenshinPlayer createPlayer(GenshinPlayer character, int reservedId) {
+	public static synchronized Player createPlayer(Player character, int reservedId) {
 		// Check if reserved id
 		int id;
 		if (reservedId > 0 && !checkPlayerExists(reservedId)) {
@@ -123,42 +127,42 @@ public final class DatabaseHelper {
 			id = reservedId;
 		} else {
 			do {
-				id = DatabaseManager.getNextId(GenshinPlayer.class);
+				id = DatabaseManager.getNextId(Player.class);
 			}
 			while (checkPlayerExists(id));
 		}
 		return id;
 	}
 
-	public static void savePlayer(GenshinPlayer character) {
+	public static void savePlayer(Player character) {
 		DatabaseManager.getDatastore().save(character);
 	}
 
-	public static void saveAvatar(GenshinAvatar avatar) {
+	public static void saveAvatar(Avatar avatar) {
 		DatabaseManager.getDatastore().save(avatar);
 	}
 
-	public static List<GenshinAvatar> getAvatars(GenshinPlayer player) {
+	public static List<Avatar> getAvatars(Player player) {
-		return DatabaseManager.getDatastore().find(GenshinAvatar.class).filter(Filters.eq("ownerId", player.getUid())).stream().toList();
+		return DatabaseManager.getDatastore().find(Avatar.class).filter(Filters.eq("ownerId", player.getUid())).stream().toList();
 	}
 
-	public static void saveItem(GenshinItem item) {
+	public static void saveItem(GameItem item) {
 		DatabaseManager.getDatastore().save(item);
 	}
 
-	public static boolean deleteItem(GenshinItem item) {
+	public static boolean deleteItem(GameItem item) {
 		DeleteResult result = DatabaseManager.getDatastore().delete(item);
 		return result.wasAcknowledged();
 	}
 
-	public static List<GenshinItem> getInventoryItems(GenshinPlayer player) {
+	public static List<GameItem> getInventoryItems(Player player) {
-		return DatabaseManager.getDatastore().find(GenshinItem.class).filter(Filters.eq("ownerId", player.getUid())).stream().toList();
+		return DatabaseManager.getDatastore().find(GameItem.class).filter(Filters.eq("ownerId", player.getUid())).stream().toList();
 	}
-	public static List<Friendship> getFriends(GenshinPlayer player) {
+	public static List<Friendship> getFriends(Player player) {
 		return DatabaseManager.getDatastore().find(Friendship.class).filter(Filters.eq("ownerId", player.getUid())).stream().toList();
 	}
 
-	public static List<Friendship> getReverseFriends(GenshinPlayer player) {
+	public static List<Friendship> getReverseFriends(Player player) {
 		return DatabaseManager.getDatastore().find(Friendship.class).filter(Filters.eq("friendId", player.getUid())).stream().toList();
 	}
 

src/main/java/emu/grasscutter/database/DatabaseManager.java

@@ -13,10 +13,10 @@ import dev.morphia.mapping.MapperOptions;
 import dev.morphia.query.experimental.filters.Filters;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.Account;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.avatar.GenshinAvatar;
 import emu.grasscutter.game.friends.Friendship;
-import emu.grasscutter.game.inventory.GenshinItem;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
 
 public final class DatabaseManager {
 
@@ -27,7 +27,7 @@ public final class DatabaseManager {
 	private static Datastore dispatchDatastore;
 	
 	private static final Class<?>[] mappedClasses = new Class<?>[] {
-		DatabaseCounter.class, Account.class, GenshinPlayer.class, GenshinAvatar.class, GenshinItem.class, Friendship.class
+		DatabaseCounter.class, Account.class, Player.class, Avatar.class, GameItem.class, Friendship.class
 	};
     
     public static Datastore getDatastore() {

src/main/java/emu/grasscutter/game/CoopRequest.java

@@ -1,17 +1,19 @@
 package emu.grasscutter.game;
 
+import emu.grasscutter.game.player.Player;
+
 public class CoopRequest {
-	private final GenshinPlayer requester;
+	private final Player requester;
 	private final long requestTime;
 	private final long expireTime;
 	
-	public CoopRequest(GenshinPlayer requester) {
+	public CoopRequest(Player requester) {
 		this.requester = requester;
 		this.requestTime = System.currentTimeMillis();
 		this.expireTime = this.requestTime + 10000;
 	}
 
-	public GenshinPlayer getRequester() {
+	public Player getRequester() {
 		return requester;
 	}
 

src/main/java/emu/grasscutter/game/avatar/Avatar.java

@@ -16,7 +16,7 @@ import dev.morphia.annotations.PostLoad;
 import dev.morphia.annotations.PrePersist;
 import dev.morphia.annotations.Transient;
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.FightPropData;
 import emu.grasscutter.data.custom.OpenConfigEntry;
 import emu.grasscutter.data.def.AvatarData;
@@ -35,10 +35,10 @@ import emu.grasscutter.data.def.WeaponPromoteData;
 import emu.grasscutter.data.def.ItemData.WeaponProperty;
 import emu.grasscutter.data.def.ProudSkillData;
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.GenshinPlayer;
 import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.inventory.EquipType;
-import emu.grasscutter.game.inventory.GenshinItem;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ElementType;
 import emu.grasscutter.game.props.EntityIdType;
 import emu.grasscutter.game.props.FetterState;
@@ -57,11 +57,11 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 @Entity(value = "avatars", useDiscriminator = false)
-public class GenshinAvatar {
+public class Avatar {
 	@Id private ObjectId id;
 	@Indexed private int ownerId;	// Id of player that this avatar belongs to
 	
-	@Transient private GenshinPlayer owner;
+	@Transient private Player owner;
 	@Transient private AvatarData data;
 	@Transient private long guid;	// Player unique id
 	private int avatarId;			// Id of avatar
@@ -73,7 +73,7 @@ public class GenshinAvatar {
 	private int satiationPenalty; // ?
 	private float currentHp;
 	
-	@Transient private final Int2ObjectMap<GenshinItem> equips;
+	@Transient private final Int2ObjectMap<GameItem> equips;
 	@Transient private final Int2FloatOpenHashMap fightProp;
 	@Transient private Set<String> extraAbilityEmbryos;
 	
@@ -96,21 +96,21 @@ public class GenshinAvatar {
 	private int nameCardRewardId;
 	private int nameCardId;
 	
-	public GenshinAvatar() {
+	public Avatar() {
 		// Morhpia only!
 		this.equips = new Int2ObjectOpenHashMap<>();
 		this.fightProp = new Int2FloatOpenHashMap();
 		this.extraAbilityEmbryos = new HashSet<>();
 		this.proudSkillBonusMap = new HashMap<>(); 
-		this.fetters = new ArrayList<>(); // TODO Move to genshin avatar
+		this.fetters = new ArrayList<>(); // TODO Move to avatar
 	}
 	
 	// On creation
-	public GenshinAvatar(int avatarId) {
+	public Avatar(int avatarId) {
-		this(GenshinData.getAvatarDataMap().get(avatarId));
+		this(GameData.getAvatarDataMap().get(avatarId));
 	}
 	
-	public GenshinAvatar(AvatarData data) {
+	public Avatar(AvatarData data) {
 		this();
 		this.avatarId = data.getId();
 		this.nameCardRewardId = data.getNameCardRewardId();
@@ -143,7 +143,7 @@ public class GenshinAvatar {
 		this.onLoad();
 	}
 	
-	public GenshinPlayer getPlayer() {
+	public Player getPlayer() {
 		return this.owner;
 	}
 
@@ -163,10 +163,10 @@ public class GenshinAvatar {
 		return ownerId;
 	}
 
-	public void setOwner(GenshinPlayer player) {
+	public void setOwner(Player player) {
 		this.owner = player;
 		this.ownerId = player.getUid();
-		this.guid = player.getNextGenshinGuid();
+		this.guid = player.getNextGameGuid();
 	}
 	
 	public int getSatiation() {
@@ -229,19 +229,19 @@ public class GenshinAvatar {
 		this.promoteLevel = promoteLevel;
 	}
 
-	public Int2ObjectMap<GenshinItem> getEquips() {
+	public Int2ObjectMap<GameItem> getEquips() {
 		return equips;
 	}
 	
-	public GenshinItem getEquipBySlot(EquipType slot) {
+	public GameItem getEquipBySlot(EquipType slot) {
 		return this.getEquips().get(slot.getValue());
 	}
 	
-	private GenshinItem getEquipBySlot(int slotId) {
+	private GameItem getEquipBySlot(int slotId) {
 		return this.getEquips().get(slotId);
 	}
 	
-	public GenshinItem getWeapon() {
+	public GameItem getWeapon() {
 		return this.getEquipBySlot(EquipType.EQUIP_WEAPON);
 	}
 
@@ -270,7 +270,7 @@ public class GenshinAvatar {
 			}
 			if (openData.getNeedAvatarPromoteLevel() <= this.getPromoteLevel()) {
 				int proudSkillId = (openData.getProudSkillGroupId() * 100) + 1;
-				if (GenshinData.getProudSkillDataMap().containsKey(proudSkillId)) {
+				if (GameData.getProudSkillDataMap().containsKey(proudSkillId)) {
 					this.getProudSkillList().add(proudSkillId);
 				}
 			}
@@ -385,7 +385,7 @@ public class GenshinAvatar {
 		return bornTime;
 	}
 	
-	public boolean equipItem(GenshinItem item, boolean shouldRecalc) {
+	public boolean equipItem(GameItem item, boolean shouldRecalc) {
 		EquipType itemEquipType = item.getItemData().getEquipType();
 		if (itemEquipType == EquipType.EQUIP_NONE) {
 			return false;
@@ -416,7 +416,7 @@ public class GenshinAvatar {
 	}
 	
 	public boolean unequipItem(EquipType slot) {
-		GenshinItem item = getEquips().remove(slot.getValue());
+		GameItem item = getEquips().remove(slot.getValue());
 		
 		if (item != null) {
 			item.setEquipCharacter(0);
@@ -434,7 +434,7 @@ public class GenshinAvatar {
 	public void recalcStats(boolean forceSendAbilityChange) {
 		// Setup
 		AvatarData data = this.getAvatarData();
-		AvatarPromoteData promoteData = GenshinData.getAvatarPromoteData(data.getAvatarPromoteId(), this.getPromoteLevel());
+		AvatarPromoteData promoteData = GameData.getAvatarPromoteData(data.getAvatarPromoteId(), this.getPromoteLevel());
 		Int2IntOpenHashMap setMap = new Int2IntOpenHashMap();
 		
 		// Extra ability embryos
@@ -476,21 +476,21 @@ public class GenshinAvatar {
 		// Artifacts
 		for (int slotId = 1; slotId <= 5; slotId++) {
 			// Get artifact
-			GenshinItem equip = this.getEquipBySlot(slotId);
+			GameItem equip = this.getEquipBySlot(slotId);
 			if (equip == null) {
 				continue;
 			}
 			// Artifact main stat
-			ReliquaryMainPropData mainPropData = GenshinData.getReliquaryMainPropDataMap().get(equip.getMainPropId());
+			ReliquaryMainPropData mainPropData = GameData.getReliquaryMainPropDataMap().get(equip.getMainPropId());
 			if (mainPropData != null) {
-				ReliquaryLevelData levelData = GenshinData.getRelicLevelData(equip.getItemData().getRankLevel(), equip.getLevel());
+				ReliquaryLevelData levelData = GameData.getRelicLevelData(equip.getItemData().getRankLevel(), equip.getLevel());
 				if (levelData != null) {
 					this.addFightProperty(mainPropData.getFightProp(), levelData.getPropValue(mainPropData.getFightProp()));
 				}	
 			}
 			// Artifact sub stats
 			for (int appendPropId : equip.getAppendPropIdList()) {
-				ReliquaryAffixData affixData = GenshinData.getReliquaryAffixDataMap().get(appendPropId);
+				ReliquaryAffixData affixData = GameData.getReliquaryAffixDataMap().get(appendPropId);
 				if (affixData != null) {
 					this.addFightProperty(affixData.getFightProp(), affixData.getPropValue());
 				}
@@ -503,7 +503,7 @@ public class GenshinAvatar {
 
 		// Set stuff
 		for (Int2IntOpenHashMap.Entry e : setMap.int2IntEntrySet()) {
-			ReliquarySetData setData = GenshinData.getReliquarySetDataMap().get(e.getIntKey());
+			ReliquarySetData setData = GameData.getReliquarySetDataMap().get(e.getIntKey());
 			if (setData == null) {
 				continue;
 			}
@@ -516,7 +516,7 @@ public class GenshinAvatar {
 				if (amount >= setData.getSetNeedNum()[setIndex]) {
 					int affixId = (setData.getEquipAffixId() * 10) + setIndex;
 					
-					EquipAffixData affix = GenshinData.getEquipAffixDataMap().get(affixId);
+					EquipAffixData affix = GameData.getEquipAffixDataMap().get(affixId);
 					if (affix == null) {
 						continue;
 					}
@@ -535,17 +535,17 @@ public class GenshinAvatar {
 		}
 		
 		// Weapon
-		GenshinItem weapon = this.getWeapon();
+		GameItem weapon = this.getWeapon();
 		if (weapon != null) {
 			// Add stats
-			WeaponCurveData curveData = GenshinData.getWeaponCurveDataMap().get(weapon.getLevel());
+			WeaponCurveData curveData = GameData.getWeaponCurveDataMap().get(weapon.getLevel());
 			if (curveData != null) {
 				for (WeaponProperty weaponProperty : weapon.getItemData().getWeaponProperties()) {
 					this.addFightProperty(weaponProperty.getFightProp(), weaponProperty.getInitValue() * curveData.getMultByProp(weaponProperty.getType()));
 				}
 			}
 			// Weapon promotion stats
-			WeaponPromoteData wepPromoteData = GenshinData.getWeaponPromoteData(weapon.getItemData().getWeaponPromoteId(), weapon.getPromoteLevel());
+			WeaponPromoteData wepPromoteData = GameData.getWeaponPromoteData(weapon.getItemData().getWeaponPromoteId(), weapon.getPromoteLevel());
 			if (wepPromoteData != null) {
 				for (FightPropData prop : wepPromoteData.getAddProps()) {
 					if (prop.getValue() == 0f || prop.getProp() == null) {
@@ -563,7 +563,7 @@ public class GenshinAvatar {
 					}
 					// Calculate affix id
 					int affixId = (af * 10) + weapon.getRefinement();
-					EquipAffixData affix = GenshinData.getEquipAffixDataMap().get(affixId);
+					EquipAffixData affix = GameData.getEquipAffixDataMap().get(affixId);
 					if (affix == null) {
 						continue;
 					}
@@ -580,7 +580,7 @@ public class GenshinAvatar {
 		}
 		
 		// Add proud skills and unlock them if needed
-		AvatarSkillDepotData skillDepot = GenshinData.getAvatarSkillDepotDataMap().get(this.getSkillDepotId());
+		AvatarSkillDepotData skillDepot = GameData.getAvatarSkillDepotDataMap().get(this.getSkillDepotId());
 		this.getProudSkillList().clear();
 		for (InherentProudSkillOpens openData : skillDepot.getInherentProudSkillOpens()) {
 			if (openData.getProudSkillGroupId() == 0) {
@@ -588,7 +588,7 @@ public class GenshinAvatar {
 			}
 			if (openData.getNeedAvatarPromoteLevel() <= this.getPromoteLevel()) {
 				int proudSkillId = (openData.getProudSkillGroupId() * 100) + 1;
-				if (GenshinData.getProudSkillDataMap().containsKey(proudSkillId)) {
+				if (GameData.getProudSkillDataMap().containsKey(proudSkillId)) {
 					this.getProudSkillList().add(proudSkillId);
 				}
 			}
@@ -596,7 +596,7 @@ public class GenshinAvatar {
 
 		// Proud skills
 		for (int proudSkillId : this.getProudSkillList()) {
-			ProudSkillData proudSkillData = GenshinData.getProudSkillDataMap().get(proudSkillId);
+			ProudSkillData proudSkillData = GameData.getProudSkillDataMap().get(proudSkillId);
 			if (proudSkillData == null) {
 				continue;
 			} 
@@ -613,7 +613,7 @@ public class GenshinAvatar {
 		// Constellations
 		if (this.getTalentIdList().size() > 0) {
 			for (int talentId : this.getTalentIdList()) {
-				AvatarTalentData avatarTalentData = GenshinData.getAvatarTalentDataMap().get(talentId);
+				AvatarTalentData avatarTalentData = GameData.getAvatarTalentDataMap().get(talentId);
 				if (avatarTalentData == null) {
 					return;
 				}
@@ -657,7 +657,7 @@ public class GenshinAvatar {
 			return;
 		}
 		
-		OpenConfigEntry entry = GenshinData.getOpenConfigEntries().get(openConfig);
+		OpenConfigEntry entry = GameData.getOpenConfigEntries().get(openConfig);
 		if (entry == null) {
 			if (forceAdd) {
 				// Add config string to ability skill list anyways
@@ -684,14 +684,14 @@ public class GenshinAvatar {
 				
 		if (this.getTalentIdList().size() > 0) {
 			for (int talentId : this.getTalentIdList()) {
-				AvatarTalentData avatarTalentData = GenshinData.getAvatarTalentDataMap().get(talentId);
+				AvatarTalentData avatarTalentData = GameData.getAvatarTalentDataMap().get(talentId);
 				
 				if (avatarTalentData == null || avatarTalentData.getOpenConfig() == null || avatarTalentData.getOpenConfig().length() == 0) {
 					continue;
 				}
 				
 				// Get open config to find which skill should be boosted
-				OpenConfigEntry entry = GenshinData.getOpenConfigEntries().get(avatarTalentData.getOpenConfig());
+				OpenConfigEntry entry = GameData.getOpenConfigEntries().get(avatarTalentData.getOpenConfig());
 				if (entry == null) {
 					continue;
 				}
@@ -712,7 +712,7 @@ public class GenshinAvatar {
 				}
 				
 				// Get proud skill group id
-				AvatarSkillData skillData = GenshinData.getAvatarSkillDataMap().get(skillId);
+				AvatarSkillData skillData = GameData.getAvatarSkillDataMap().get(skillId);
 				
 				if (skillData == null) {
 					continue;
@@ -785,7 +785,7 @@ public class GenshinAvatar {
 				.setWearingFlycloakId(this.getFlyCloak())
 				.setCostumeId(this.getCostume());
 		
-		for (GenshinItem item : this.getEquips().values()) {
+		for (GameItem item : this.getEquips().values()) {
 			avatarInfo.addEquipGuidList(item.getGuid());
 		}
 		

src/main/java/emu/grasscutter/game/avatar/AvatarProfileData.java

@@ -7,7 +7,7 @@ public class AvatarProfileData {
 	private int avatarId;
 	private int level;
 	
-	public AvatarProfileData(GenshinAvatar avatar) {
+	public AvatarProfileData(Avatar avatar) {
 		this.update(avatar);
 	}
 
@@ -19,7 +19,7 @@ public class AvatarProfileData {
 		return level;
 	}
 
-	public void update(GenshinAvatar avatar) {
+	public void update(Avatar avatar) {
 		this.avatarId = avatar.getAvatarId();
 		this.level = avatar.getLevel();
 	}

src/main/java/emu/grasscutter/game/avatar/AvatarStorage.java

@@ -3,12 +3,12 @@ package emu.grasscutter.game.avatar;
 import java.util.Iterator;
 import java.util.List;
 
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.AvatarData;
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.GenshinPlayer;
 import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.game.inventory.GenshinItem;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.packet.send.PacketAvatarChangeCostumeNotify;
 import emu.grasscutter.server.packet.send.PacketAvatarFlycloakChangeNotify;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@@ -16,22 +16,22 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 
-public class AvatarStorage implements Iterable<GenshinAvatar> {
+public class AvatarStorage implements Iterable<Avatar> {
-	private final GenshinPlayer player;
+	private final Player player;
-	private final Int2ObjectMap<GenshinAvatar> avatars;
+	private final Int2ObjectMap<Avatar> avatars;
-	private final Long2ObjectMap<GenshinAvatar> avatarsGuid;
+	private final Long2ObjectMap<Avatar> avatarsGuid;
 	
-	public AvatarStorage(GenshinPlayer player) {
+	public AvatarStorage(Player player) {
 		this.player = player;
 		this.avatars = new Int2ObjectOpenHashMap<>();
 		this.avatarsGuid = new Long2ObjectOpenHashMap<>();
 	}
 	
-	public GenshinPlayer getPlayer() {
+	public Player getPlayer() {
 		return player;
 	}
 
-	public Int2ObjectMap<GenshinAvatar> getAvatars() {
+	public Int2ObjectMap<Avatar> getAvatars() {
 		return avatars;
 	}
 	
@@ -39,11 +39,11 @@ public class AvatarStorage implements Iterable<GenshinAvatar> {
 		return this.avatars.size();
 	}
 	
-	public GenshinAvatar getAvatarById(int id) {
+	public Avatar getAvatarById(int id) {
 		return getAvatars().get(id);
 	}
 	
-	public GenshinAvatar getAvatarByGuid(long id) {
+	public Avatar getAvatarByGuid(long id) {
 		return avatarsGuid.get(id);
 	}
 	
@@ -51,7 +51,7 @@ public class AvatarStorage implements Iterable<GenshinAvatar> {
 		return getAvatars().containsKey(id);
 	}
 	
-	public boolean addAvatar(GenshinAvatar avatar) {
+	public boolean addAvatar(Avatar avatar) {
 		if (avatar.getAvatarData() == null || this.hasAvatar(avatar.getAvatarId())) {
 			return false;
 		}
@@ -68,14 +68,14 @@ public class AvatarStorage implements Iterable<GenshinAvatar> {
 		return true;
 	}
 	
-	public void addStartingWeapon(GenshinAvatar avatar) {
+	public void addStartingWeapon(Avatar avatar) {
 		// Make sure avatar owner is this player
 		if (avatar.getPlayer() != this.getPlayer()) {
 			return;
 		}
 		
 		// Create weapon
-		GenshinItem weapon = new GenshinItem(avatar.getAvatarData().getInitialWeapon());
+		GameItem weapon = new GameItem(avatar.getAvatarData().getInitialWeapon());
 		
 		if (weapon.getItemData() != null) {
 			this.getPlayer().getInventory().addItem(weapon);
@@ -85,7 +85,7 @@ public class AvatarStorage implements Iterable<GenshinAvatar> {
 	}
 	
 	public boolean wearFlycloak(long avatarGuid, int flycloakId) {
-		GenshinAvatar avatar = this.getAvatarByGuid(avatarGuid);
+		Avatar avatar = this.getAvatarByGuid(avatarGuid);
 
 		if (avatar == null || !getPlayer().getFlyCloakList().contains(flycloakId)) {
 			return false;
@@ -101,7 +101,7 @@ public class AvatarStorage implements Iterable<GenshinAvatar> {
 	}
 	
 	public boolean changeCostume(long avatarGuid, int costumeId) {
-		GenshinAvatar avatar = this.getAvatarByGuid(avatarGuid);
+		Avatar avatar = this.getAvatarByGuid(avatarGuid);
 
 		if (avatar == null) {
 			return false;
@@ -130,15 +130,15 @@ public class AvatarStorage implements Iterable<GenshinAvatar> {
 	}
 	
 	public void loadFromDatabase() {
-		List<GenshinAvatar> avatars = DatabaseHelper.getAvatars(getPlayer());
+		List<Avatar> avatars = DatabaseHelper.getAvatars(getPlayer());
 		
-		for (GenshinAvatar avatar : avatars) {
+		for (Avatar avatar : avatars) {
 			// Should never happen
 			if (avatar.getObjectId() == null) {
 				continue;
 			}
 			
-			AvatarData avatarData = GenshinData.getAvatarDataMap().get(avatar.getAvatarId());
+			AvatarData avatarData = GameData.getAvatarDataMap().get(avatar.getAvatarId());
 			if (avatarData == null) {
 				continue;
 			}
@@ -157,7 +157,7 @@ public class AvatarStorage implements Iterable<GenshinAvatar> {
 	}
 	
 	public void postLoad() {
-		for (GenshinAvatar avatar : this) {
+		for (Avatar avatar : this) {
 			// Weapon check
 			if (avatar.getWeapon() == null) {
 				this.addStartingWeapon(avatar);
@@ -168,7 +168,7 @@ public class AvatarStorage implements Iterable<GenshinAvatar> {
 	}
 
 	@Override
-	public Iterator<GenshinAvatar> iterator() {
+	public Iterator<Avatar> iterator() {
 		return getAvatars().values().iterator();
 	}
 }

src/main/java/emu/grasscutter/game/entity/EntityAvatar.java

@@ -1,18 +1,18 @@
 package emu.grasscutter.game.entity;
 
-import emu.grasscutter.GenshinConstants;
+import emu.grasscutter.GameConstants;
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.AvatarData;
 import emu.grasscutter.data.def.AvatarSkillDepotData;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.GenshinScene;
-import emu.grasscutter.game.World;
-import emu.grasscutter.game.avatar.GenshinAvatar;
 import emu.grasscutter.game.inventory.EquipType;
-import emu.grasscutter.game.inventory.GenshinItem;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.EntityIdType;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.World;
 import emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock;
 import emu.grasscutter.net.proto.AbilityEmbryoOuterClass.AbilityEmbryo;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
@@ -34,29 +34,29 @@ import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 
-public class EntityAvatar extends GenshinEntity {
+public class EntityAvatar extends GameEntity {
-	private final GenshinAvatar avatar;
+	private final Avatar avatar;
 	
 	private PlayerDieType killedType;
 	private int killedBy;
 	
-	public EntityAvatar(GenshinScene scene, GenshinAvatar avatar) {
+	public EntityAvatar(Scene scene, Avatar avatar) {
 		super(scene);
 		this.avatar = avatar;
 		this.id = getScene().getWorld().getNextEntityId(EntityIdType.AVATAR);
 		
-		GenshinItem weapon = this.getAvatar().getWeapon();
+		GameItem weapon = this.getAvatar().getWeapon();
 		if (weapon != null) {
 			weapon.setWeaponEntityId(getScene().getWorld().getNextEntityId(EntityIdType.WEAPON));
 		}
 	}
 	
-	public EntityAvatar(GenshinAvatar avatar) {
+	public EntityAvatar(Avatar avatar) {
 		super(null);
 		this.avatar = avatar;
 	}
 
-	public GenshinPlayer getPlayer() {
+	public Player getPlayer() {
 		return avatar.getPlayer();
 	}
 
@@ -70,7 +70,7 @@ public class EntityAvatar extends GenshinEntity {
 		return getPlayer().getRotation();
 	}
 
-	public GenshinAvatar getAvatar() {
+	public Avatar getAvatar() {
 		return avatar;
 	}
 	
@@ -122,7 +122,7 @@ public class EntityAvatar extends GenshinEntity {
 				.setCostumeId(this.getAvatar().getCostume())
 				.setBornTime(this.getAvatar().getBornTime());
 		
-		for (GenshinItem item : avatar.getEquips().values()) {
+		for (GameItem item : avatar.getEquips().values()) {
 			if (item.getItemData().getEquipType() == EquipType.EQUIP_WEAPON) {
 				avatarInfo.setWeapon(item.createSceneWeaponInfo());
 			} else {
@@ -187,17 +187,17 @@ public class EntityAvatar extends GenshinEntity {
 				AbilityEmbryo emb = AbilityEmbryo.newBuilder()
 						.setAbilityId(++embryoId)
 						.setAbilityNameHash(id)
-						.setAbilityOverrideNameHash(GenshinConstants.DEFAULT_ABILITY_NAME)
+						.setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
 						.build();
 				abilityControlBlock.addAbilityEmbryoList(emb);
 			}
 		}
 		// Add default abilities 
-		for (int id : GenshinConstants.DEFAULT_ABILITY_HASHES) {
+		for (int id : GameConstants.DEFAULT_ABILITY_HASHES) {
 			AbilityEmbryo emb = AbilityEmbryo.newBuilder()
 					.setAbilityId(++embryoId)
 					.setAbilityNameHash(id)
-					.setAbilityOverrideNameHash(GenshinConstants.DEFAULT_ABILITY_NAME)
+					.setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
 					.build();
 			abilityControlBlock.addAbilityEmbryoList(emb);
 		}
@@ -206,18 +206,18 @@ public class EntityAvatar extends GenshinEntity {
 			AbilityEmbryo emb = AbilityEmbryo.newBuilder()
 					.setAbilityId(++embryoId)
 					.setAbilityNameHash(id)
-					.setAbilityOverrideNameHash(GenshinConstants.DEFAULT_ABILITY_NAME)
+					.setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
 					.build();
 			abilityControlBlock.addAbilityEmbryoList(emb);
 		}
 		// Add skill depot abilities
-		AvatarSkillDepotData skillDepot = GenshinData.getAvatarSkillDepotDataMap().get(this.getAvatar().getSkillDepotId());
+		AvatarSkillDepotData skillDepot = GameData.getAvatarSkillDepotDataMap().get(this.getAvatar().getSkillDepotId());
 		if (skillDepot != null && skillDepot.getAbilities() != null) {
 			for (int id : skillDepot.getAbilities()) {
 				AbilityEmbryo emb = AbilityEmbryo.newBuilder()
 						.setAbilityId(++embryoId)
 						.setAbilityNameHash(id)
-						.setAbilityOverrideNameHash(GenshinConstants.DEFAULT_ABILITY_NAME)
+						.setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
 						.build();
 				abilityControlBlock.addAbilityEmbryoList(emb);
 			}
@@ -228,7 +228,7 @@ public class EntityAvatar extends GenshinEntity {
 				AbilityEmbryo emb = AbilityEmbryo.newBuilder()
 						.setAbilityId(++embryoId)
 						.setAbilityNameHash(Utils.abilityHash(skill))
-						.setAbilityOverrideNameHash(GenshinConstants.DEFAULT_ABILITY_NAME)
+						.setAbilityOverrideNameHash(GameConstants.DEFAULT_ABILITY_NAME)
 						.build();
 				abilityControlBlock.addAbilityEmbryoList(emb);
 			}

src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java

@@ -1,9 +1,9 @@
 package emu.grasscutter.game.entity;
 
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.GenshinScene;
-import emu.grasscutter.game.World;
 import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.World;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
 import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
 import emu.grasscutter.net.proto.ClientGadgetInfoOuterClass;
@@ -24,7 +24,7 @@ import emu.grasscutter.utils.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 
 public class EntityClientGadget extends EntityGadget {
-	private final GenshinPlayer owner;
+	private final Player owner;
 	
 	private final Position pos;
 	private final Position rot;
@@ -36,7 +36,7 @@ public class EntityClientGadget extends EntityGadget {
 	private int targetEntityId;
 	private boolean asyncLoad;
 	
-	public EntityClientGadget(GenshinScene scene, GenshinPlayer player, EvtCreateGadgetNotify notify) {
+	public EntityClientGadget(Scene scene, Player player, EvtCreateGadgetNotify notify) {
 		super(scene);
 		this.owner = player;
 		this.id = notify.getEntityId();
@@ -55,7 +55,7 @@ public class EntityClientGadget extends EntityGadget {
 		return configId;
 	}
 	
-	public GenshinPlayer getOwner() {
+	public Player getOwner() {
 		return owner;
 	}
 	

src/main/java/emu/grasscutter/game/entity/EntityGadget.java

@@ -1,11 +1,11 @@
 package emu.grasscutter.game.entity;
 
-import emu.grasscutter.game.GenshinScene;
+import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.game.World;
+import emu.grasscutter.game.world.World;
 
-public abstract class EntityGadget extends GenshinEntity {
+public abstract class EntityGadget extends GameEntity {
 
-	public EntityGadget(GenshinScene scene) {
+	public EntityGadget(Scene scene) {
 		super(scene);
 	}
 	

src/main/java/emu/grasscutter/game/entity/EntityItem.java

@@ -1,12 +1,12 @@
 package emu.grasscutter.game.entity;
 
 import emu.grasscutter.data.def.ItemData;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.GenshinScene;
+import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.World;
-import emu.grasscutter.game.inventory.GenshinItem;
 import emu.grasscutter.game.props.EntityIdType;
 import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.World;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
 import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
 import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
@@ -28,16 +28,16 @@ public class EntityItem extends EntityGadget {
 	private final Position pos;
 	private final Position rot;
 	
-	private final GenshinItem item;
+	private final GameItem item;
 	private final long guid;
 	
-	public EntityItem(GenshinScene scene, GenshinPlayer player, ItemData itemData, Position pos, int count) {
+	public EntityItem(Scene scene, Player player, ItemData itemData, Position pos, int count) {
 		super(scene);
 		this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
 		this.pos = new Position(pos);
 		this.rot = new Position();
-		this.guid = player.getNextGenshinGuid();
+		this.guid = player.getNextGameGuid();
-		this.item = new GenshinItem(itemData, count);
+		this.item = new GameItem(itemData, count);
 	}
 	
 	@Override
@@ -45,7 +45,7 @@ public class EntityItem extends EntityGadget {
 		return this.id;
 	}
 	
-	private GenshinItem getItem() {
+	private GameItem getItem() {
 		return this.item;
 	}
 

src/main/java/emu/grasscutter/game/entity/EntityMonster.java

@@ -1,14 +1,14 @@
 package emu.grasscutter.game.entity;
 
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.PropGrowCurve;
 import emu.grasscutter.data.def.MonsterCurveData;
 import emu.grasscutter.data.def.MonsterData;
-import emu.grasscutter.game.GenshinScene;
-import emu.grasscutter.game.World;
 import emu.grasscutter.game.props.EntityIdType;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.World;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
 import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
 import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
@@ -27,7 +27,7 @@ import emu.grasscutter.utils.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 
-public class EntityMonster extends GenshinEntity {
+public class EntityMonster extends GameEntity {
 	private final MonsterData monsterData;
 	private final Int2FloatOpenHashMap fightProp;
 	
@@ -41,7 +41,7 @@ public class EntityMonster extends GenshinEntity {
 	private int configId;
 	private int poseId;
 	
-	public EntityMonster(GenshinScene scene, MonsterData monsterData, Position pos, int level) {
+	public EntityMonster(Scene scene, MonsterData monsterData, Position pos, int level) {
 		super(scene);
 		this.id = getWorld().getNextEntityId(EntityIdType.MONSTER);
 		this.monsterData = monsterData;
@@ -160,7 +160,7 @@ public class EntityMonster extends GenshinEntity {
 		this.setFightProperty(FightProperty.FIGHT_PROP_ICE_SUB_HURT, data.getIceSubHurt());
 		
 		// Level curve
-		MonsterCurveData curve = GenshinData.getMonsterCurveDataMap().get(this.getLevel());
+		MonsterCurveData curve = GameData.getMonsterCurveDataMap().get(this.getLevel());
 		if (curve != null) {
 			for (PropGrowCurve growCurve : data.getPropGrowCurves()) {
 				FightProperty prop = FightProperty.getPropByName(growCurve.getType());

src/main/java/emu/grasscutter/game/entity/GameEntity.java

@@ -1,10 +1,10 @@
 package emu.grasscutter.game.entity;
 
-import emu.grasscutter.game.GenshinScene;
-import emu.grasscutter.game.World;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.game.props.LifeState;
+import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.game.world.SpawnDataEntry;
+import emu.grasscutter.game.world.World;
 import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
 import emu.grasscutter.net.proto.MotionStateOuterClass.MotionState;
 import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
@@ -12,16 +12,16 @@ import emu.grasscutter.net.proto.VectorOuterClass.Vector;
 import emu.grasscutter.utils.Position;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 
-public abstract class GenshinEntity {
+public abstract class GameEntity {
 	protected int id;
-	private final GenshinScene scene;
+	private final Scene scene;
 	private SpawnDataEntry spawnEntry;
 	
 	private MotionState moveState;
 	private int lastMoveSceneTimeMs;
 	private int lastMoveReliableSeq;
 	
-	public GenshinEntity(GenshinScene scene) {
+	public GameEntity(Scene scene) {
 		this.scene = scene;
 		this.moveState = MotionState.MOTION_NONE;
 	}
@@ -34,7 +34,7 @@ public abstract class GenshinEntity {
 		return this.getScene().getWorld();
 	}
 
-	public GenshinScene getScene() {
+	public Scene getScene() {
 		return this.scene;
 	}
 	

src/main/java/emu/grasscutter/game/friends/FriendsList.java

@@ -3,7 +3,7 @@ package emu.grasscutter.game.friends;
 import java.util.List;
 
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType;
 import emu.grasscutter.server.packet.send.PacketAskAddFriendNotify;
 import emu.grasscutter.server.packet.send.PacketAskAddFriendRsp;
@@ -14,20 +14,20 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public class FriendsList {
-	private final GenshinPlayer player;
+	private final Player player;
 	
 	private final Int2ObjectMap<Friendship> friends;
 	private final Int2ObjectMap<Friendship> pendingFriends;
 	
 	private boolean loaded = false;
 	
-	public FriendsList(GenshinPlayer player) {
+	public FriendsList(Player player) {
 		this.player = player;
 		this.friends = new Int2ObjectOpenHashMap<Friendship>();
 		this.pendingFriends = new Int2ObjectOpenHashMap<Friendship>();
 	}
 	
-	public GenshinPlayer getPlayer() {
+	public Player getPlayer() {
 		return player;
 	}
 	
@@ -83,7 +83,7 @@ public class FriendsList {
 			return;
 		}
 
-		GenshinPlayer target = getPlayer().getSession().getServer().getPlayerByUid(targetUid, true);
+		Player target = getPlayer().getSession().getServer().getPlayerByUid(targetUid, true);
 		if (target == null) {
 			return; // Should never happen
 		}
@@ -143,7 +143,7 @@ public class FriendsList {
 		myFriendship.delete();
 		
 		Friendship theirFriendship = null;
-		GenshinPlayer friend = myFriendship.getFriendProfile().getPlayer();
+		Player friend = myFriendship.getFriendProfile().getPlayer();
 		if (friend != null) {
 			// Friend online
 			theirFriendship = friend.getFriendsList().getFriendById(this.getPlayer().getUid());
@@ -165,7 +165,7 @@ public class FriendsList {
 	}
 	
 	public synchronized void sendFriendRequest(int targetUid) {
-		GenshinPlayer target = getPlayer().getSession().getServer().getPlayerByUid(targetUid, true);
+		Player target = getPlayer().getSession().getServer().getPlayerByUid(targetUid, true);
 
 		if (target == null || target == this.getPlayer()) {
 			return;
@@ -220,7 +220,7 @@ public class FriendsList {
 		friendship.setOwner(getPlayer());
 
 		// Check if friend is online
-		GenshinPlayer friend = getPlayer().getSession().getServer().getPlayerByUid(friendship.getFriendProfile().getUid());
+		Player friend = getPlayer().getSession().getServer().getPlayerByUid(friendship.getFriendProfile().getUid());
 		if (friend != null) {
 			// Set friend to online mode
 			friendship.setFriendProfile(friend);

src/main/java/emu/grasscutter/game/friends/Friendship.java

@@ -5,7 +5,7 @@ import org.bson.types.ObjectId;
 
 import dev.morphia.annotations.*;
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief;
 import emu.grasscutter.net.proto.FriendOnlineStateOuterClass.FriendOnlineState;
 import emu.grasscutter.net.proto.HeadImageOuterClass.HeadImage;
@@ -14,7 +14,7 @@ import emu.grasscutter.net.proto.HeadImageOuterClass.HeadImage;
 public class Friendship {
 	@Id private ObjectId id;
 	
-	@Transient private GenshinPlayer owner;
+	@Transient private Player owner;
 	
 	@Indexed private int ownerId;
 	@Indexed private int friendId;
@@ -26,7 +26,7 @@ public class Friendship {
 	@Deprecated // Morphia use only
 	public Friendship() { }
 	
-	public Friendship(GenshinPlayer owner, GenshinPlayer friend, GenshinPlayer asker) {
+	public Friendship(Player owner, Player friend, Player asker) {
 		this.setOwner(owner);
 		this.ownerId = owner.getUid();
 		this.friendId = friend.getUid();
@@ -34,11 +34,11 @@ public class Friendship {
 		this.askerId = asker.getUid();
 	}
 
-	public GenshinPlayer getOwner() {
+	public Player getOwner() {
 		return owner;
 	}
 
-	public void setOwner(GenshinPlayer owner) {
+	public void setOwner(Player owner) {
 		this.owner = owner;
 	}
 
@@ -70,7 +70,7 @@ public class Friendship {
 		return profile;
 	}
 	
-	public void setFriendProfile(GenshinPlayer character) {
+	public void setFriendProfile(Player character) {
 		if (character == null || this.friendId != character.getUid()) return;
 		this.profile = character.getProfile();
 	}

src/main/java/emu/grasscutter/game/friends/PlayerProfile.java

@@ -1,12 +1,12 @@
 package emu.grasscutter.game.friends;
 
 import dev.morphia.annotations.*;
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.utils.Utils;
 
 @Entity
 public class PlayerProfile {
-	@Transient private GenshinPlayer player;
+	@Transient private Player player;
 	
 	@AlsoLoad("id") private int uid;
 	private int nameCard;
@@ -22,7 +22,7 @@ public class PlayerProfile {
 	@Deprecated // Morphia only
 	public PlayerProfile() { }
 	
-	public PlayerProfile(GenshinPlayer player) {
+	public PlayerProfile(Player player) {
 		this.uid = player.getUid();
 		this.syncWithCharacter(player);
 	}
@@ -31,11 +31,11 @@ public class PlayerProfile {
 		return uid;
 	}
 
-	public GenshinPlayer getPlayer() {
+	public Player getPlayer() {
 		return player;
 	}
 	
-	public synchronized void setPlayer(GenshinPlayer player) {
+	public synchronized void setPlayer(Player player) {
 		this.player = player;
 	}
 	
@@ -83,7 +83,7 @@ public class PlayerProfile {
 		return this.getPlayer() != null;
 	}
 
-	public void syncWithCharacter(GenshinPlayer player) {
+	public void syncWithCharacter(Player player) {
 		if (player == null) {
 			return;
 		}

src/main/java/emu/grasscutter/game/gacha/GachaManager.java

@@ -12,13 +12,13 @@ import com.google.gson.reflect.TypeToken;
 
 import com.sun.nio.file.SensitivityWatchEventModifier;
 import emu.grasscutter.Grasscutter;
-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.avatar.Avatar;
-import emu.grasscutter.game.avatar.GenshinAvatar;
+import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.inventory.GenshinItem;
 import emu.grasscutter.game.inventory.ItemType;
 import emu.grasscutter.game.inventory.MaterialType;
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem;
 import emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem;
 import emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp;
@@ -89,7 +89,7 @@ public class GachaManager {
 		}
 	}
 	
-	public synchronized void doPulls(GenshinPlayer player, int gachaType, int times) {
+	public synchronized void doPulls(Player player, int gachaType, int times) {
 		// Sanity check
 		if (times != 10 && times != 1) {
 			return;
@@ -108,7 +108,7 @@ public class GachaManager {
 
 		// Spend currency
 		if (banner.getCostItem() > 0) {
-			GenshinItem costItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(banner.getCostItem());
+			GameItem costItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(banner.getCostItem());
 			if (costItem == null || costItem.getCount() < times) {
 				return;
 			}
@@ -191,7 +191,7 @@ public class GachaManager {
 		int stardust = 0, starglitter = 0;
 		
 		for (int itemId : wonItems) {
-			ItemData itemData = GenshinData.getItemDataMap().get(itemId);
+			ItemData itemData = GameData.getItemDataMap().get(itemId);
 			if (itemData == null) {
 				continue;
 			}
@@ -204,11 +204,11 @@ public class GachaManager {
 			// Const check
 			if (itemData.getMaterialType() == MaterialType.MATERIAL_AVATAR) {
 				int avatarId = (itemData.getId() % 1000) + 10000000;
-				GenshinAvatar avatar = player.getAvatars().getAvatarById(avatarId);
+				Avatar avatar = player.getAvatars().getAvatarById(avatarId);
 				if (avatar != null) {
 					int constLevel = avatar.getCoreProudSkillLevel();
 					int constItemId = itemData.getId() + 100;
-					GenshinItem constItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(constItemId);
+					GameItem constItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(constItemId);
 					if (constItem != null) {
 						constLevel += constItem.getCount();
 					}
@@ -249,7 +249,7 @@ public class GachaManager {
 			}
 
 			// Create item
-			GenshinItem item = new GenshinItem(itemData);
+			GameItem item = new GameItem(itemData);
 			gachaItem.setGachaItem(item.toItemParam());
 			player.getInventory().addItem(item);