Merge branch 'Grasscutters:development' into development

src/main/java/emu/grasscutter/server/packet/recv/HandlerGetMailItemReq.java

+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.GetMailItemReqOuterClass;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketGetMailItemRsp;
+
+@Opcodes(PacketOpcodes.GetMailItemReq)
+public class HandlerGetMailItemReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        GetMailItemReqOuterClass.GetMailItemReq req = GetMailItemReqOuterClass.GetMailItemReq.parseFrom(payload);
+        session.send(new PacketGetMailItemRsp(session.getPlayer(), req.getMailIdListList()));
+    }
+
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerBlacklistReq.java

 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.packet.PacketHandler;
@@ -11,7 +11,7 @@ public class HandlerGetPlayerBlacklistReq extends PacketHandler {
 	
 	@Override
 	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-		session.send(new GenshinPacket(PacketOpcodes.GetPlayerBlacklistRsp).buildHeader(3));
+		session.send(new BasePacket(PacketOpcodes.GetPlayerBlacklistRsp).buildHeader(3));
 	}
 
 }

src/main/java/emu/grasscutter/server/packet/recv/HandlerMarkMapReq.java

 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.World;
 import emu.grasscutter.game.props.EnterReason;
+import emu.grasscutter.game.world.World;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;

src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java

 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.game.inventory.GenshinItem;
+import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq;

src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerLoginReq.java

 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq;
@@ -30,12 +30,12 @@ public class HandlerPlayerLoginReq extends PacketHandler {
 		}
 		
 		// Load character from db
-		GenshinPlayer player = DatabaseHelper.getPlayerById(session.getAccount().getPlayerUid());
+		Player player = DatabaseHelper.getPlayerById(session.getAccount().getPlayerUid());
 		
 		if (player == null) {
 			// Send packets
 			session.setState(SessionState.PICKING_CHARACTER);
-			session.send(new GenshinPacket(PacketOpcodes.DoSetPlayerBornDataNotify));
+			session.send(new BasePacket(PacketOpcodes.DoSetPlayerBornDataNotify));
 		} else {
 			// Set character
 			session.setPlayer(player);

src/main/java/emu/grasscutter/server/packet/recv/HandlerPrivateChatReq.java

@@ -19,8 +19,6 @@ public class HandlerPrivateChatReq extends PacketHandler {
 		} else if (content == PrivateChatReq.ContentCase.ICON) {
 			session.getServer().getChatManager().sendPrivateMessage(session.getPlayer(), req.getTargetUid(), req.getIcon());
 		}
-		
-		//session.send(new GenshinPacket(PacketOpcodes.PrivateChatRsp)); // Unused by server
 	}
 
 }

src/main/java/emu/grasscutter/server/packet/recv/HandlerReadMailNotify.java

+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.mail.Mail;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.GetAllMailReqOuterClass;
+import emu.grasscutter.net.proto.ReadMailNotifyOuterClass;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketMailChangeNotify;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Opcodes(PacketOpcodes.ReadMailNotify)
+public class HandlerReadMailNotify extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        ReadMailNotifyOuterClass.ReadMailNotify req = ReadMailNotifyOuterClass.ReadMailNotify.parseFrom(payload);
+
+        List<Mail> updatedMail = new ArrayList<>();
+
+        for (int mailId : req.getMailIdListList()) {
+            Mail message = session.getPlayer().getMail(mailId);
+
+            message.isRead = true;
+
+            session.getPlayer().replaceMailByIndex(mailId, message);
+            updatedMail.add(message);
+        }
+
+        session.send(new PacketMailChangeNotify(session.getPlayer(), updatedMail));
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneEntityDrownReq.java

+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.entity.EntityAvatar;
+import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.game.props.LifeState;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.SceneEntityDrownReqOuterClass.SceneEntityDrownReq;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketSceneEntityDrownRsp;
+
+@Opcodes(PacketOpcodes.SceneEntityDrownReq)
+public class HandlerSceneEntityDrownReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        SceneEntityDrownReq req = SceneEntityDrownReq.parseFrom(payload);
+
+        GameEntity entity = session.getPlayer().getScene().getEntityById(req.getEntityId());
+
+        if (entity == null || !(entity instanceof EntityMonster || entity instanceof EntityAvatar)) {
+        	return;
+        }
+        
+        entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, 0);
+
+        //TODO: make a list somewhere of all entities to remove per tick rather than one by one
+        session.getPlayer().getScene().killEntity(entity, 0);
+        session.getPlayer().getScene().broadcastPacket(new PacketSceneEntityDrownRsp(req.getEntityId()));
+    }
+
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneInitFinishReq.java

 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.game.GenshinPlayer.SceneLoadState;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.player.Player.SceneLoadState;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.packet.PacketHandler;
@@ -31,7 +31,7 @@ public class HandlerSceneInitFinishReq extends PacketHandler {
 		session.send(new PacketWorldPlayerInfoNotify(session.getPlayer().getWorld()));
 		session.send(new PacketWorldDataNotify(session.getPlayer().getWorld()));
 		session.send(new PacketSceneUnlockInfoNotify());
-		session.send(new GenshinPacket(PacketOpcodes.SceneForceUnlockNotify));
+		session.send(new BasePacket(PacketOpcodes.SceneForceUnlockNotify));
 		session.send(new PacketHostPlayerNotify(session.getPlayer().getWorld()));
 		
 		session.send(new PacketSceneTimeNotify(session.getPlayer()));

src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneTransToPointReq.java

 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.custom.ScenePointEntry;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
@@ -19,7 +19,7 @@ public class HandlerSceneTransToPointReq extends PacketHandler {
 		SceneTransToPointReq req = SceneTransToPointReq.parseFrom(payload);
 		
 		String code = req.getSceneId() + "_" + req.getPointId();
-		ScenePointEntry scenePointEntry = GenshinData.getScenePointEntries().get(code);
+		ScenePointEntry scenePointEntry = GameData.getScenePointEntries().get(code);
 		
 		if (scenePointEntry != null) {
 			float x = scenePointEntry.getPointData().getTranPos().getX();

src/main/java/emu/grasscutter/server/packet/recv/HandlerSetEntityClientDataNotify.java

 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify;
@@ -20,7 +20,7 @@ public class HandlerSetEntityClientDataNotify extends PacketHandler {
 		// Make sure packet is a valid proto before replaying it to the other players
 		SetEntityClientDataNotify notif = SetEntityClientDataNotify.parseFrom(payload);
 		
-		GenshinPacket packet = new GenshinPacket(PacketOpcodes.SetEntityClientDataNotify, true);
+		BasePacket packet = new BasePacket(PacketOpcodes.SetEntityClientDataNotify, true);
 		packet.setData(notif);
 		
 		session.getPlayer().getScene().broadcastPacketToOthers(session.getPlayer(), packet);

src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBornDataReq.java

 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.GenshinConstants;
+import emu.grasscutter.GameConstants;
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.avatar.GenshinAvatar;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.SetPlayerBornDataReqOuterClass.SetPlayerBornDataReq;
@@ -24,9 +24,9 @@ public class HandlerSetPlayerBornDataReq extends PacketHandler {
 		// Sanity checks
 		int avatarId = req.getAvatarId();
 		int startingSkillDepot = 0;
-		if (avatarId == GenshinConstants.MAIN_CHARACTER_MALE) {
+		if (avatarId == GameConstants.MAIN_CHARACTER_MALE) {
 			startingSkillDepot = 504;
-		} else if (avatarId == GenshinConstants.MAIN_CHARACTER_FEMALE) {
+		} else if (avatarId == GameConstants.MAIN_CHARACTER_FEMALE) {
 			startingSkillDepot = 704;
 		} else {
 			return;
@@ -38,7 +38,7 @@ public class HandlerSetPlayerBornDataReq extends PacketHandler {
 		}
 		
 		// Create character
-		GenshinPlayer player = new GenshinPlayer(session);
+		Player player = new Player(session);
 		player.setNickname(nickname);
 		
 		try {
@@ -47,8 +47,8 @@ public class HandlerSetPlayerBornDataReq extends PacketHandler {
 			
 			// Create avatar
 			if (player.getAvatars().getAvatarCount() == 0) {
-				GenshinAvatar mainCharacter = new GenshinAvatar(avatarId);
-				mainCharacter.setSkillDepot(GenshinData.getAvatarSkillDepotDataMap().get(startingSkillDepot));
+				Avatar mainCharacter = new Avatar(avatarId);
+				mainCharacter.setSkillDepot(GameData.getAvatarSkillDepotDataMap().get(startingSkillDepot));
 				player.addAvatar(mainCharacter);
 				player.setMainCharacterId(avatarId);
 				player.setHeadImage(avatarId);
@@ -68,7 +68,7 @@ public class HandlerSetPlayerBornDataReq extends PacketHandler {
 			session.setState(SessionState.ACTIVE);
 			
 			// Born resp packet
-			session.send(new GenshinPacket(PacketOpcodes.SetPlayerBornDataRsp));
+			session.send(new BasePacket(PacketOpcodes.SetPlayerBornDataRsp));
 		} catch (Exception e) {
 			Grasscutter.getLogger().error("Error creating player object: ", e);
 			session.close();

src/main/java/emu/grasscutter/server/packet/recv/HandlerTakePlayerLevelRewardReq.java

@@ -5,9 +5,9 @@ import java.util.List;
 import java.util.Set;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.GenshinData;
+import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.RewardItemData;
-import emu.grasscutter.game.inventory.GenshinItem;
+import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketHandler;
@@ -24,15 +24,15 @@ public class HandlerTakePlayerLevelRewardReq extends PacketHandler {
         TakePlayerLevelRewardReq req = TakePlayerLevelRewardReq.parseFrom(payload);
 
         int level = req.getLevel();
-        int rewardId = GenshinData.getPlayerLevelDataMap().get(level).getRewardId();
+        int rewardId = GameData.getPlayerLevelDataMap().get(level).getRewardId();
 
         if (rewardId != 0) {
-            List<RewardItemData> rewardItems = GenshinData.getRewardDataMap().get(rewardId).getRewardItemList();
-            List<GenshinItem> items = new LinkedList<>();
+            List<RewardItemData> rewardItems = GameData.getRewardDataMap().get(rewardId).getRewardItemList();
+            List<GameItem> items = new LinkedList<>();
             for (RewardItemData rewardItem : rewardItems) {
                 if (rewardItem != null) {
                     if (rewardItem.getItemId() != 0) {
-                        items.add(new GenshinItem(rewardItem.getItemId(), rewardItem.getItemCount()));
+                        items.add(new GameItem(rewardItem.getItemId(), rewardItem.getItemCount()));
                     }
                 }
             }

src/main/java/emu/grasscutter/server/packet/recv/HandlerUseItemReq.java

 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.game.inventory.GenshinItem;
+import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.UseItemReqOuterClass.UseItemReq;
@@ -15,7 +15,7 @@ public class HandlerUseItemReq extends PacketHandler {
 	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
 		UseItemReq req = UseItemReq.parseFrom(payload);
 		
-		GenshinItem useItem = session.getServer().getInventoryManager().useItem(session.getPlayer(), req.getTargetGuid(), req.getGuid(), req.getCount());
+		GameItem useItem = session.getServer().getInventoryManager().useItem(session.getPlayer(), req.getTargetGuid(), req.getGuid(), req.getCount());
 		if (useItem != null) {
 			session.send(new PacketUseItemRsp(req.getTargetGuid(), useItem));
 		} else {

src/main/java/emu/grasscutter/server/packet/send/Packet.java

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 
-public class Packet extends GenshinPacket {
+public class Packet extends BasePacket {
 	
 	public Packet() {
 		super(PacketOpcodes.NONE);

src/main/java/emu/grasscutter/server/packet/send/PacketAbilityChangeNotify.java

 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify;
 
-public class PacketAbilityChangeNotify extends GenshinPacket {
+public class PacketAbilityChangeNotify extends BasePacket {
 	
 	public PacketAbilityChangeNotify(EntityAvatar entity) {
 		super(PacketOpcodes.AbilityChangeNotify, true);

src/main/java/emu/grasscutter/server/packet/send/PacketAbilityInvocationsNotify.java

@@ -2,12 +2,12 @@ package emu.grasscutter.server.packet.send;
 
 import java.util.List;
 
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.AbilityInvocationsNotifyOuterClass.AbilityInvocationsNotify;
 import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
 
-public class PacketAbilityInvocationsNotify extends GenshinPacket {
+public class PacketAbilityInvocationsNotify extends BasePacket {
 	
 	public PacketAbilityInvocationsNotify(AbilityInvokeEntry entry) {
 		super(PacketOpcodes.AbilityInvocationsNotify, true);

src/main/java/emu/grasscutter/server/packet/send/PacketAskAddFriendNotify.java

 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.friends.Friendship;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify;
 
-public class PacketAskAddFriendNotify extends GenshinPacket {
+public class PacketAskAddFriendNotify extends BasePacket {
 	
 	public PacketAskAddFriendNotify(Friendship friendship) {
 		super(PacketOpcodes.AskAddFriendNotify);

src/main/java/emu/grasscutter/server/packet/send/PacketAskAddFriendRsp.java

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp;
 
-public class PacketAskAddFriendRsp extends GenshinPacket {
+public class PacketAskAddFriendRsp extends BasePacket {
 	
 	public PacketAskAddFriendRsp(int targetUid) {
 		super(PacketOpcodes.AskAddFriendRsp);

src/main/java/emu/grasscutter/server/packet/send/PacketAvatarAddNotify.java

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.avatar.GenshinAvatar;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify;
 
-public class PacketAvatarAddNotify extends GenshinPacket {
+public class PacketAvatarAddNotify extends BasePacket {
 	
-	public PacketAvatarAddNotify(GenshinAvatar avatar, boolean addedToTeam) {
+	public PacketAvatarAddNotify(Avatar avatar, boolean addedToTeam) {
 		super(PacketOpcodes.AvatarAddNotify);
 		
 		AvatarAddNotify proto = AvatarAddNotify.newBuilder()