UPGRADE TO 1.1.0 POG

Merge `development` into `stable`

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.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 proto = DelMailRsp.newBuilder()
+        		.addAllMailIdList(toDeleteIds)
+        		.build();
+        
+        this.setData(proto);
+    }
+}
\ 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/PacketDungeonChallengeBeginNotify.java

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.dungeons.DungeonChallenge;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify;
+
+public class PacketDungeonChallengeBeginNotify extends BasePacket {
+	
+	public PacketDungeonChallengeBeginNotify(DungeonChallenge challenge) {
+		super(PacketOpcodes.DungeonChallengeBeginNotify, true);
+
+		DungeonChallengeBeginNotify proto = DungeonChallengeBeginNotify.newBuilder()
+				.setChallengeId(challenge.getChallengeId())
+				.setChallengeIndex(challenge.getChallengeIndex())
+				.setGroupId(challenge.getGroup().id)
+				.addParamList(challenge.getObjective())
+				.addParamList(challenge.getTimeLimit())
+				.build();
+		
+		this.setData(proto);
+	}
+}

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

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.dungeons.DungeonChallenge;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify;
+
+public class PacketDungeonChallengeFinishNotify extends BasePacket {
+	
+	public PacketDungeonChallengeFinishNotify(DungeonChallenge challenge) {
+		super(PacketOpcodes.DungeonChallengeFinishNotify, true);
+
+		DungeonChallengeFinishNotify proto = DungeonChallengeFinishNotify.newBuilder()
+				.setChallengeIndex(challenge.getChallengeIndex())
+				.setIsSuccess(challenge.isSuccess())
+				.setUnk1(2)
+				.build();
+		
+		this.setData(proto);
+	}
+}

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

+package emu.grasscutter.server.packet.send;
+
+import java.util.Arrays;
+
+import emu.grasscutter.data.common.PointData;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo;
+import emu.grasscutter.net.proto.DungeonEntryInfoRspOuterClass.DungeonEntryInfoRsp;
+
+public class PacketDungeonEntryInfoRsp extends BasePacket {
+	
+	public PacketDungeonEntryInfoRsp(Player player, PointData pointData) {
+		super(PacketOpcodes.DungeonEntryInfoRsp);
+
+		DungeonEntryInfoRsp.Builder proto = DungeonEntryInfoRsp.newBuilder()
+				.setPointId(pointData.getId());
+		
+		if (pointData.getDungeonIds() != null) {
+			for (int dungeonId : pointData.getDungeonIds()) {
+				DungeonEntryInfo info = DungeonEntryInfo.newBuilder().setDungeonId(dungeonId).build();
+				proto.addDungeonEntryList(info);
+			}
+		}
+
+		this.setData(proto);
+	}
+	
+	public PacketDungeonEntryInfoRsp() {
+		super(PacketOpcodes.DungeonEntryInfoRsp);
+
+		DungeonEntryInfoRsp proto = DungeonEntryInfoRsp.newBuilder()
+				.setRetcode(1)
+				.build();
+		
+		this.setData(proto);
+	}
+}

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

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.dungeons.DungeonChallenge;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNotify;
+import emu.grasscutter.net.proto.ItemParamOuterClass;
+import emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify;
+
+public class PacketDungeonSettleNotify extends BasePacket {
+	
+	public PacketDungeonSettleNotify(DungeonChallenge challenge) {
+		super(PacketOpcodes.DungeonSettleNotify);
+
+		DungeonSettleNotify proto = DungeonSettleNotify.newBuilder()
+				.setDungeonId(challenge.getScene().getDungeonData().getId())
+				.setIsSuccess(challenge.isSuccess())
+				.setCloseTime(challenge.getScene().getAutoCloseTime())
+				.setResult(challenge.isSuccess() ? 1 : 0)
+				.build();
+		
+		this.setData(proto);
+	}
+
+	public PacketDungeonSettleNotify(DungeonChallenge challenge,
+									 boolean canJump,
+									 boolean hasNextLevel,
+									 int nextFloorId
+	) {
+		super(PacketOpcodes.DungeonSettleNotify);
+
+		var continueStatus = TowerLevelEndNotify.ContinueStateType.CONTINUE_STATE_CAN_NOT_CONTINUE_VALUE;
+		if(challenge.isSuccess() && canJump){
+			continueStatus = hasNextLevel ? TowerLevelEndNotify.ContinueStateType.CONTINUE_STATE_CAN_ENTER_NEXT_LEVEL_VALUE
+					:  TowerLevelEndNotify.ContinueStateType.CONTINUE_STATE_CAN_ENTER_NEXT_FLOOR_VALUE;
+		}
+
+		var towerLevelEndNotify = TowerLevelEndNotify.newBuilder()
+				.setIsSuccess(challenge.isSuccess())
+				.setContinueState(continueStatus)
+				.addFinishedStarCondList(1)
+				.addFinishedStarCondList(2)
+				.addFinishedStarCondList(3)
+				.addRewardItemList(ItemParamOuterClass.ItemParam.newBuilder()
+						.setItemId(201)
+						.setCount(1000)
+						.build())
+				;
+		if(nextFloorId > 0){
+			towerLevelEndNotify.setNextFloorId(nextFloorId);
+		}
+
+		DungeonSettleNotify proto = DungeonSettleNotify.newBuilder()
+				.setDungeonId(challenge.getScene().getDungeonData().getId())
+				.setIsSuccess(challenge.isSuccess())
+				.setCloseTime(challenge.getScene().getAutoCloseTime())
+				.setResult(challenge.isSuccess() ? 1 : 0)
+				.setTowerLevelEndNotify(towerLevelEndNotify.build())
+				.build();
+
+		this.setData(proto);
+	}
+}

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