Merge pull request #1 from Grasscutters/development

merge

src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFightPropNotify.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.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify;
 
-public class PacketAvatarFightPropNotify extends GenshinPacket {
+public class PacketAvatarFightPropNotify extends BasePacket {
 	
-	public PacketAvatarFightPropNotify(GenshinAvatar avatar) {
+	public PacketAvatarFightPropNotify(Avatar avatar) {
 		super(PacketOpcodes.AvatarFightPropNotify);
 		
 		AvatarFightPropNotify proto = AvatarFightPropNotify.newBuilder()

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

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.avatar.GenshinAvatar;
+import emu.grasscutter.game.avatar.Avatar;
 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.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify;
 
-public class PacketAvatarFightPropUpdateNotify extends GenshinPacket {
+public class PacketAvatarFightPropUpdateNotify extends BasePacket {
 	
-	public PacketAvatarFightPropUpdateNotify(GenshinAvatar avatar, FightProperty prop) {
+	public PacketAvatarFightPropUpdateNotify(Avatar avatar, FightProperty prop) {
 		super(PacketOpcodes.AvatarFightPropUpdateNotify);
 		
 		AvatarFightPropUpdateNotify proto = AvatarFightPropUpdateNotify.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketAvatarFlycloakChangeNotify.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.AvatarFlycloakChangeNotifyOuterClass.AvatarFlycloakChangeNotify;
 
-public class PacketAvatarFlycloakChangeNotify extends GenshinPacket {
+public class PacketAvatarFlycloakChangeNotify extends BasePacket {
 	
-	public PacketAvatarFlycloakChangeNotify(GenshinAvatar avatar) {
+	public PacketAvatarFlycloakChangeNotify(Avatar avatar) {
 		super(PacketOpcodes.AvatarFlycloakChangeNotify);
 
 		 AvatarFlycloakChangeNotify proto = AvatarFlycloakChangeNotify.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketAvatarGainCostumeNotify.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.AvatarGainCostumeNotifyOuterClass.AvatarGainCostumeNotify;
 
-public class PacketAvatarGainCostumeNotify extends GenshinPacket {
+public class PacketAvatarGainCostumeNotify extends BasePacket {
 	
 	public PacketAvatarGainCostumeNotify(int costumeId) {
 		super(PacketOpcodes.AvatarGainCostumeNotify);

src/main/java/emu/grasscutter/server/packet/send/PacketAvatarGainFlycloakNotify.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.AvatarGainFlycloakNotifyOuterClass.AvatarGainFlycloakNotify;
 
-public class PacketAvatarGainFlycloakNotify extends GenshinPacket {
+public class PacketAvatarGainFlycloakNotify extends BasePacket {
 	
 	public PacketAvatarGainFlycloakNotify(int flycloak) {
 		super(PacketOpcodes.AvatarGainFlycloakNotify);

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

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.avatar.GenshinAvatar;
+import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.game.props.LifeState;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify;
 
-public class PacketAvatarLifeStateChangeNotify extends GenshinPacket {
+public class PacketAvatarLifeStateChangeNotify extends BasePacket {
 	
-	public PacketAvatarLifeStateChangeNotify(GenshinAvatar avatar) {
+	public PacketAvatarLifeStateChangeNotify(Avatar avatar) {
 		super(PacketOpcodes.AvatarLifeStateChangeNotify);
 
 		AvatarLifeStateChangeNotify proto = AvatarLifeStateChangeNotify.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketAvatarPromoteRsp.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.AvatarPromoteRspOuterClass.AvatarPromoteRsp;
 
-public class PacketAvatarPromoteRsp extends GenshinPacket {
+public class PacketAvatarPromoteRsp extends BasePacket {
 	
-	public PacketAvatarPromoteRsp(GenshinAvatar avatar) {
+	public PacketAvatarPromoteRsp(Avatar avatar) {
 		super(PacketOpcodes.AvatarPromoteRsp);
 
 		AvatarPromoteRsp proto = AvatarPromoteRsp.newBuilder()

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

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.avatar.GenshinAvatar;
+import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify;
 
-public class PacketAvatarPropNotify extends GenshinPacket {
-	public PacketAvatarPropNotify(GenshinAvatar avatar) {
+public class PacketAvatarPropNotify extends BasePacket {
+	public PacketAvatarPropNotify(Avatar avatar) {
 		super(PacketOpcodes.AvatarPropNotify);
 		
 		AvatarPropNotify proto = AvatarPropNotify.newBuilder()
@@ -22,7 +22,7 @@ public class PacketAvatarPropNotify extends GenshinPacket {
 		this.setData(proto);
 	}
 	
-	public PacketAvatarPropNotify(GenshinAvatar avatar, PlayerProperty prop, int value) {
+	public PacketAvatarPropNotify(Avatar avatar, PlayerProperty prop, int value) {
 		super(PacketOpcodes.AvatarPropNotify);
 
 		AvatarPropNotify proto = AvatarPropNotify.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillChangeNotify.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.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify;
 
-public class PacketAvatarSkillChangeNotify extends GenshinPacket {
+public class PacketAvatarSkillChangeNotify extends BasePacket {
 	
-	public PacketAvatarSkillChangeNotify(GenshinAvatar avatar, int skillId, int oldLevel, int curLevel) {
+	public PacketAvatarSkillChangeNotify(Avatar avatar, int skillId, int oldLevel, int curLevel) {
 		super(PacketOpcodes.AvatarSkillChangeNotify);
 		
 		AvatarSkillChangeNotify proto = AvatarSkillChangeNotify.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketAvatarSkillUpgradeRsp.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.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp;
 
-public class PacketAvatarSkillUpgradeRsp extends GenshinPacket {
+public class PacketAvatarSkillUpgradeRsp extends BasePacket {
 	
-	public PacketAvatarSkillUpgradeRsp(GenshinAvatar avatar, int skillId, int oldLevel, int newLevel) {
+	public PacketAvatarSkillUpgradeRsp(Avatar avatar, int skillId, int oldLevel, int newLevel) {
 		super(PacketOpcodes.AvatarSkillUpgradeRsp);
 
 		AvatarSkillUpgradeRsp proto = AvatarSkillUpgradeRsp.newBuilder()

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

@@ -2,17 +2,17 @@ package emu.grasscutter.server.packet.send;
 
 import java.util.Map.Entry;
 
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.TeamInfo;
-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.game.player.TeamInfo;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam;
 import emu.grasscutter.net.proto.AvatarTeamUpdateNotifyOuterClass.AvatarTeamUpdateNotify;
 
-public class PacketAvatarTeamUpdateNotify extends GenshinPacket {
+public class PacketAvatarTeamUpdateNotify extends BasePacket {
 	
-	public PacketAvatarTeamUpdateNotify(GenshinPlayer player) {
+	public PacketAvatarTeamUpdateNotify(Player player) {
 		super(PacketOpcodes.AvatarTeamUpdateNotify);
 
 		AvatarTeamUpdateNotify.Builder proto = AvatarTeamUpdateNotify.newBuilder();
@@ -23,7 +23,7 @@ public class PacketAvatarTeamUpdateNotify extends GenshinPacket {
 					.setTeamName(teamInfo.getName());
 			
 			for (int i = 0; i < teamInfo.getAvatars().size(); i++) {
-				GenshinAvatar avatar = player.getAvatars().getAvatarById(teamInfo.getAvatars().get(i));
+				Avatar avatar = player.getAvatars().getAvatarById(teamInfo.getAvatars().get(i));
 				avatarTeam.addAvatarGuidList(avatar.getGuid());
 			}
 			

src/main/java/emu/grasscutter/server/packet/send/PacketAvatarUnlockTalentNotify.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.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify;
 
-public class PacketAvatarUnlockTalentNotify extends GenshinPacket {
+public class PacketAvatarUnlockTalentNotify extends BasePacket {
 	
-	public PacketAvatarUnlockTalentNotify(GenshinAvatar avatar, int talentId) {
+	public PacketAvatarUnlockTalentNotify(Avatar avatar, int talentId) {
 		super(PacketOpcodes.AvatarUnlockTalentNotify);
 
 		AvatarUnlockTalentNotify proto = AvatarUnlockTalentNotify.newBuilder()

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

@@ -2,14 +2,14 @@ package emu.grasscutter.server.packet.send;
 
 import java.util.Map;
 
-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.AvatarUpgradeRspOuterClass.AvatarUpgradeRsp;
 
-public class PacketAvatarUpgradeRsp extends GenshinPacket {
+public class PacketAvatarUpgradeRsp extends BasePacket {
 	
-	public PacketAvatarUpgradeRsp(GenshinAvatar avatar, int oldLevel, Map<Integer, Float> oldFightPropMap) {
+	public PacketAvatarUpgradeRsp(Avatar avatar, int oldLevel, Map<Integer, Float> oldFightPropMap) {
 		super(PacketOpcodes.AvatarUpgradeRsp);
 		
 		this.buildHeader(0);

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);
 
@@ -20,7 +21,7 @@ public class PacketAvatarWearFlycloakRsp extends GenshinPacket {
 		super(PacketOpcodes.AvatarWearFlycloakRsp);
 
 		AvatarWearFlycloakRsp proto = AvatarWearFlycloakRsp.newBuilder()
-				.setRetcode(1)
+				.setRetcode(RetcodeOuterClass.Retcode.RET_SVR_ERROR_VALUE)
 				.build();
 		
 		this.setData(proto);

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.packet.Retcode;
 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);
@@ -25,7 +25,7 @@ public class PacketCalcWeaponUpgradeReturnItemsRsp extends GenshinPacket {
 		super(PacketOpcodes.CalcWeaponUpgradeReturnItemsRsp);
 		
 		CalcWeaponUpgradeReturnItemsRsp proto = CalcWeaponUpgradeReturnItemsRsp.newBuilder()
-				.setRetcode(Retcode.FAIL)
+				.setRetcode(RetcodeOuterClass.Retcode.RET_SVR_ERROR_VALUE)
 				.build();
 		
 		this.setData(proto);

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

+package emu.grasscutter.server.packet.send;
+
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.CardProductRewardNotifyOuterClass.CardProductRewardNotify;
+
+public class PacketCardProductRewardNotify extends BasePacket {
+
+    public PacketCardProductRewardNotify(int remainsDay) {
+        super(PacketOpcodes.CardProductRewardNotify);
+
+        CardProductRewardNotify proto = CardProductRewardNotify.newBuilder()
+                .setProductId("ys_chn_blessofmoon_tier5")
+                .setHcoin(90)
+                .setRemainDays(remainsDay)
+                .build();
+
+        // Hard code Product id keep cool 😎
+
+        this.setData(proto);
+    }
+
+}

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);
 
 		ChangeAvatarRsp p = ChangeAvatarRsp.newBuilder()
-				.setRetcode(0)
-				.setCurrGuid(guid)
+				.setRetcode(RetcodeOuterClass.Retcode.RET_SVR_ERROR_VALUE)
+				.setCurGuid(guid)
 				.build();
 		
 		this.setData(p);

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