Merge pull request #1 from Grasscutters/development

merge

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.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 BasePacket {
+
+    public PacketCombineRsp() {
+        super(PacketOpcodes.CombineRsp);
+
+        CombineRspOuterClass.CombineRsp proto = CombineRspOuterClass.CombineRsp.newBuilder()
+                .setRetcode(RetcodeOuterClass.Retcode.RET_SVR_ERROR_VALUE).build();
+
+
+        this.setData(proto);
+    }
+
+    public PacketCombineRsp(int retcode) {
+        super(PacketOpcodes.CombineRsp);
+
+        CombineRspOuterClass.CombineRsp proto = CombineRspOuterClass.CombineRsp.newBuilder()
+                .setRetcode(retcode).build();
+
+
+        this.setData(proto);
+    }
+
+    public PacketCombineRsp(CombineReqOuterClass.CombineReq combineReq,
+                            Iterable<ItemParamOuterClass.ItemParam> costItemList,
+                            Iterable<ItemParamOuterClass.ItemParam> resultItemList,
+                            Iterable<ItemParamOuterClass.ItemParam> totalRandomItemList,
+                            Iterable<ItemParamOuterClass.ItemParam> totalReturnItemList,
+                            Iterable<ItemParamOuterClass.ItemParam> totalExtraItemList) {
+
+        super(PacketOpcodes.CombineRsp);
+
+        CombineRspOuterClass.CombineRsp proto = CombineRspOuterClass.CombineRsp.newBuilder()
+                .setRetcode(RetcodeOuterClass.Retcode.RET_SUCC_VALUE)
+                .setCombineId(combineReq.getCombineId())
+                .setCombineCount(combineReq.getCombineCount())
+                .setAvatarGuid(combineReq.getAvatarGuid())
+                .addAllCostItemList(costItemList)
+                .addAllResultItemList(resultItemList)
+                .addAllTotalRandomItemList(totalRandomItemList)
+                .addAllTotalReturnItemList(totalReturnItemList)
+                .addAllTotalExtraItemList(totalExtraItemList)
+                .build();
+
+        this.setData(proto);
+    }
+
+
+
+}

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,12 +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);
@@ -33,7 +34,7 @@ public class PacketDoGachaRsp extends GenshinPacket {
 		super(PacketOpcodes.DoGachaRsp);
 
 		DoGachaRsp p = DoGachaRsp.newBuilder()
-				.setRetcode(1)
+				.setRetcode(RetcodeOuterClass.Retcode.RET_SVR_ERROR_VALUE)
 				.build();
 		
 		this.setData(p);

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

src/main/java/emu/grasscutter/server/packet/send/PacketEnterSceneReadyRsp.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.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp;
 
-public class PacketEnterSceneReadyRsp extends GenshinPacket {
+public class PacketEnterSceneReadyRsp extends BasePacket {
 
-	public PacketEnterSceneReadyRsp(GenshinPlayer player) {
+	public PacketEnterSceneReadyRsp(Player player) {
 		super(PacketOpcodes.EnterSceneReadyRsp, 11);
 		
 		EnterSceneReadyRsp p = EnterSceneReadyRsp.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketEnterWorldAreaRsp.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.EnterWorldAreaReqOuterClass.EnterWorldAreaReq;
 import emu.grasscutter.net.proto.EnterWorldAreaRspOuterClass.EnterWorldAreaRsp;
 
-public class PacketEnterWorldAreaRsp extends GenshinPacket {
+public class PacketEnterWorldAreaRsp extends BasePacket {
 
 	public PacketEnterWorldAreaRsp(int clientSequence, EnterWorldAreaReq enterWorld) {
 		super(PacketOpcodes.EnterWorldAreaRsp, clientSequence);

src/main/java/emu/grasscutter/server/packet/send/PacketEntityAiSyncNotify.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.AiSyncInfoOuterClass.AiSyncInfo;
 import emu.grasscutter.net.proto.EntityAiSyncNotifyOuterClass.EntityAiSyncNotify;
 
-public class PacketEntityAiSyncNotify extends GenshinPacket {
+public class PacketEntityAiSyncNotify extends BasePacket {
 	
 	public PacketEntityAiSyncNotify(EntityAiSyncNotify notify) {
 		super(PacketOpcodes.EntityAiSyncNotify, true);

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

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.entity.GenshinEntity;
+import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify;
 
-public class PacketEntityFightPropUpdateNotify extends GenshinPacket {
+public class PacketEntityFightPropUpdateNotify extends BasePacket {
 	
-	public PacketEntityFightPropUpdateNotify(GenshinEntity entity, FightProperty prop) {
+	public PacketEntityFightPropUpdateNotify(GameEntity entity, FightProperty prop) {
 		super(PacketOpcodes.EntityFightPropUpdateNotify);
 		
 		EntityFightPropUpdateNotify proto = EntityFightPropUpdateNotify.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketEvtAvatarSitDownNotify.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.EvtAvatarSitDownNotifyOuterClass.EvtAvatarSitDownNotify;
 
-public class PacketEvtAvatarSitDownNotify extends GenshinPacket {
+public class PacketEvtAvatarSitDownNotify extends BasePacket {
 
     public PacketEvtAvatarSitDownNotify(EvtAvatarSitDownNotify notify) {
         super(PacketOpcodes.EvtAvatarSitDownNotify);

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

 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp;
 import emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType;
+import emu.grasscutter.net.proto.RetcodeOuterClass;
 
-public class PacketGadgetInteractRsp extends GenshinPacket {
+public class PacketGadgetInteractRsp extends BasePacket {
 	public PacketGadgetInteractRsp(EntityGadget gadget, InteractType interact) {
 		super(PacketOpcodes.GadgetInteractRsp);
 
@@ -23,7 +24,7 @@ public class PacketGadgetInteractRsp extends GenshinPacket {
 		super(PacketOpcodes.GadgetInteractRsp);
 
 		GadgetInteractRsp proto = GadgetInteractRsp.newBuilder()
-				.setRetcode(1)
+				.setRetcode(RetcodeOuterClass.Retcode.RET_SVR_ERROR_VALUE)
 				.build();
 		
 		this.setData(proto);

src/main/java/emu/grasscutter/server/packet/send/PacketGetActivityInfoRsp.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.GetActivityInfoRspOuterClass.GetActivityInfoRsp;
 
-public class PacketGetActivityInfoRsp extends GenshinPacket {
+public class PacketGetActivityInfoRsp extends BasePacket {
 	public PacketGetActivityInfoRsp() {
 		super(PacketOpcodes.GetActivityInfoRsp);