Merge branch 'Grasscutters:development' into development

src/main/java/emu/grasscutter/server/packet/send/PacketAvatarWearFlycloakRsp.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.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 
-public class PacketAvatarWearFlycloakRsp extends GenshinPacket {
+public class PacketAvatarWearFlycloakRsp extends BasePacket {
 	public PacketAvatarWearFlycloakRsp(long avatarGuid, int costumeId) {
 		super(PacketOpcodes.AvatarWearFlycloakRsp);
 

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

@@ -2,13 +2,13 @@ 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.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp;
 import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 
-public class PacketCalcWeaponUpgradeReturnItemsRsp extends GenshinPacket {
+public class PacketCalcWeaponUpgradeReturnItemsRsp extends BasePacket {
 	
 	public PacketCalcWeaponUpgradeReturnItemsRsp(long itemGuid, List<ItemParam> returnItems) {
 		super(PacketOpcodes.CalcWeaponUpgradeReturnItemsRsp);

src/main/java/emu/grasscutter/server/packet/send/PacketCardProductRewardNotify.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.CardProductRewardNotifyOuterClass.CardProductRewardNotify;
 
-public class PacketCardProductRewardNotify extends GenshinPacket {
+public class PacketCardProductRewardNotify extends BasePacket {
 
     public PacketCardProductRewardNotify(int remainsDay) {
         super(PacketOpcodes.CardProductRewardNotify);

src/main/java/emu/grasscutter/server/packet/send/PacketChangeAvatarRsp.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.ChangeAvatarRspOuterClass.ChangeAvatarRsp;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 
-public class PacketChangeAvatarRsp extends GenshinPacket {
+public class PacketChangeAvatarRsp extends BasePacket {
 	
 	public PacketChangeAvatarRsp(long guid) {
 		super(PacketOpcodes.ChangeAvatarRsp);

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

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.World;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.world.World;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp;
 
-public class PacketChangeGameTimeRsp extends GenshinPacket {
+public class PacketChangeGameTimeRsp extends BasePacket {
 	
-	public PacketChangeGameTimeRsp(GenshinPlayer player) {
+	public PacketChangeGameTimeRsp(Player player) {
 		super(PacketOpcodes.ChangeGameTimeRsp);
 		
 		ChangeGameTimeRsp proto = ChangeGameTimeRsp.newBuilder()

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

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.TeamInfo;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.player.TeamInfo;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp;
 
-public class PacketChangeMpTeamAvatarRsp extends GenshinPacket {
+public class PacketChangeMpTeamAvatarRsp extends BasePacket {
 	
-	public PacketChangeMpTeamAvatarRsp(GenshinPlayer player, TeamInfo teamInfo) {
+	public PacketChangeMpTeamAvatarRsp(Player player, TeamInfo teamInfo) {
 		super(PacketOpcodes.ChangeMpTeamAvatarRsp);
 		
 		ChangeMpTeamAvatarRsp.Builder proto = ChangeMpTeamAvatarRsp.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketChangeTeamNameRsp.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.ChangeTeamNameRspOuterClass.ChangeTeamNameRsp;
 
-public class PacketChangeTeamNameRsp extends GenshinPacket {
+public class PacketChangeTeamNameRsp extends BasePacket {
 	
 	public PacketChangeTeamNameRsp(int teamId, String teamName) {
 		super(PacketOpcodes.ChangeTeamNameRsp);

src/main/java/emu/grasscutter/server/packet/send/PacketChooseCurAvatarTeamRsp.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.ChooseCurAvatarTeamRspOuterClass.ChooseCurAvatarTeamRsp;
 
-public class PacketChooseCurAvatarTeamRsp extends GenshinPacket {
+public class PacketChooseCurAvatarTeamRsp extends BasePacket {
 	
 	public PacketChooseCurAvatarTeamRsp(int teamId) {
 		super(PacketOpcodes.ChooseCurAvatarTeamRsp);

src/main/java/emu/grasscutter/server/packet/send/PacketClientAbilityInitFinishNotify.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.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
 import emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify;
 
-public class PacketClientAbilityInitFinishNotify extends GenshinPacket {
+public class PacketClientAbilityInitFinishNotify extends BasePacket {
 	
 	public PacketClientAbilityInitFinishNotify(List<AbilityInvokeEntry> entries) {
 		super(PacketOpcodes.ClientAbilityInitFinishNotify, true);

src/main/java/emu/grasscutter/server/packet/send/PacketCombatInvocationsNotify.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.CombatInvocationsNotifyOuterClass.CombatInvocationsNotify;
 import emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry;
 
-public class PacketCombatInvocationsNotify extends GenshinPacket {
+public class PacketCombatInvocationsNotify extends BasePacket {
 	
 	public PacketCombatInvocationsNotify(CombatInvokeEntry entry) {
 		super(PacketOpcodes.CombatInvocationsNotify, true);

src/main/java/emu/grasscutter/server/packet/send/PacketCombineRsp.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.CombineReqOuterClass;
 import emu.grasscutter.net.proto.CombineRspOuterClass;
 import emu.grasscutter.net.proto.ItemParamOuterClass;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 
-public class PacketCombineRsp extends GenshinPacket {
+public class PacketCombineRsp extends BasePacket {
 
     public PacketCombineRsp() {
         super(PacketOpcodes.CombineRsp);

src/main/java/emu/grasscutter/server/packet/send/PacketDealAddFriendRsp.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.DealAddFriendResultTypeOuterClass.DealAddFriendResultType;
 import emu.grasscutter.net.proto.DealAddFriendRspOuterClass.DealAddFriendRsp;
 
-public class PacketDealAddFriendRsp extends GenshinPacket {
+public class PacketDealAddFriendRsp extends BasePacket {
 	
 	public PacketDealAddFriendRsp(int targetUid, DealAddFriendResultType result) {
 		super(PacketOpcodes.DealAddFriendRsp);

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

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.DelMailRspOuterClass.DelMailRsp;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PacketDelMailRsp  extends BasePacket {
+
+    public PacketDelMailRsp(Player player, List<Integer> toDeleteIds) {
+        super(PacketOpcodes.DelMailRsp);
+
+        DelMailRsp.Builder proto = DelMailRsp.newBuilder();
+
+        List<Integer> deletedIds = new ArrayList<>();
+
+        for(int mailId : toDeleteIds) {
+            if(player.deleteMail(mailId)) {
+                deletedIds.add(mailId);
+            }
+        }
+
+        this.setData(proto.build());
+        player.getSession().send(new PacketMailChangeNotify(player, null, deletedIds));
+    }
+}
\ No newline at end of file

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

@@ -2,11 +2,11 @@ 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.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify;
 
-public class PacketDelTeamEntityNotify extends GenshinPacket {
+public class PacketDelTeamEntityNotify extends BasePacket {
 	
 	public PacketDelTeamEntityNotify(int sceneId, int teamEntityId) {
 		super(PacketOpcodes.DelTeamEntityNotify);

src/main/java/emu/grasscutter/server/packet/send/PacketDeleteFriendNotify.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.DeleteFriendNotifyOuterClass.DeleteFriendNotify;
 
-public class PacketDeleteFriendNotify extends GenshinPacket {
+public class PacketDeleteFriendNotify extends BasePacket {
 	
 	public PacketDeleteFriendNotify(int targetUid) {
 		super(PacketOpcodes.DeleteFriendNotify);

src/main/java/emu/grasscutter/server/packet/send/PacketDeleteFriendRsp.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.DeleteFriendRspOuterClass.DeleteFriendRsp;
 
-public class PacketDeleteFriendRsp extends GenshinPacket {
+public class PacketDeleteFriendRsp extends BasePacket {
 	
 	public PacketDeleteFriendRsp(int targetUid) {
 		super(PacketOpcodes.DeleteFriendRsp);

src/main/java/emu/grasscutter/server/packet/send/PacketDestroyMaterialRsp.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.DestroyMaterialRspOuterClass.DestroyMaterialRsp;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 
-public class PacketDestroyMaterialRsp extends GenshinPacket {
+public class PacketDestroyMaterialRsp extends BasePacket {
 	
 	public PacketDestroyMaterialRsp(Int2IntOpenHashMap returnMaterialMap) {
 		super(PacketOpcodes.DestroyMaterialRsp);

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

@@ -3,13 +3,13 @@ package emu.grasscutter.server.packet.send;
 import java.util.List;
 
 import emu.grasscutter.game.gacha.GachaBanner;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp;
 import emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 
-public class PacketDoGachaRsp extends GenshinPacket {
+public class PacketDoGachaRsp extends BasePacket {
 	
 	public PacketDoGachaRsp(GachaBanner banner, List<GachaItem> list) {
 		super(PacketOpcodes.DoGachaRsp);

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

 package emu.grasscutter.server.packet.send;
 
-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.PacketOpcodes;
 import emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp;
 
-public class PacketEnterSceneDoneRsp extends GenshinPacket {
+public class PacketEnterSceneDoneRsp extends BasePacket {
 
-	public PacketEnterSceneDoneRsp(GenshinPlayer player) {
+	public PacketEnterSceneDoneRsp(Player player) {
 		super(PacketOpcodes.EnterSceneDoneRsp);
 
 		EnterSceneDoneRsp p = EnterSceneDoneRsp.newBuilder()

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

 package emu.grasscutter.server.packet.send;
 
-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.PacketOpcodes;
 import emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify;
 
-public class PacketEnterScenePeerNotify extends GenshinPacket {
+public class PacketEnterScenePeerNotify extends BasePacket {
 
-	public PacketEnterScenePeerNotify(GenshinPlayer player) {
+	public PacketEnterScenePeerNotify(Player player) {
 		super(PacketOpcodes.EnterScenePeerNotify);
 		
 		EnterScenePeerNotify proto = EnterScenePeerNotify.newBuilder()