Merge pull request #1 from Grasscutters/development

merge

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

 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.props.OpenState;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.OpenStateUpdateNotifyOuterClass.OpenStateUpdateNotify;
 
-public class PacketOpenStateUpdateNotify extends GenshinPacket {
+public class PacketOpenStateUpdateNotify extends BasePacket {
 	
 	public PacketOpenStateUpdateNotify() {
 		super(PacketOpcodes.OpenStateUpdateNotify);

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

src/main/java/emu/grasscutter/server/packet/send/PacketPingRsp.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.PingRspOuterClass.PingRsp;
 
-public class PacketPingRsp extends GenshinPacket {
+public class PacketPingRsp extends BasePacket {
 
 	public PacketPingRsp(int clientSeq, int time) {
 		super(PacketOpcodes.PingRsp, clientSeq);

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpNotify.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.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify;
 
-public class PacketPlayerApplyEnterMpNotify extends GenshinPacket {
+public class PacketPlayerApplyEnterMpNotify extends BasePacket {
 	
-	public PacketPlayerApplyEnterMpNotify(GenshinPlayer srcPlayer) {
+	public PacketPlayerApplyEnterMpNotify(Player srcPlayer) {
 		super(PacketOpcodes.PlayerApplyEnterMpNotify);
 
 		PlayerApplyEnterMpNotify proto = PlayerApplyEnterMpNotify.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpResultNotify.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.PlayerApplyEnterMpReasonOuterClass.PlayerApplyEnterMpReason;
+import emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass;
 import emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify;
 
-public class PacketPlayerApplyEnterMpResultNotify extends GenshinPacket {
+public class PacketPlayerApplyEnterMpResultNotify extends BasePacket {
 	
-	public PacketPlayerApplyEnterMpResultNotify(GenshinPlayer target, boolean isAgreed, PlayerApplyEnterMpReason reason) {
+	public PacketPlayerApplyEnterMpResultNotify(Player target, boolean isAgreed, PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason reason) {
 		super(PacketOpcodes.PlayerApplyEnterMpResultNotify);
 
 		PlayerApplyEnterMpResultNotify proto = PlayerApplyEnterMpResultNotify.newBuilder()
@@ -21,7 +22,7 @@ public class PacketPlayerApplyEnterMpResultNotify extends GenshinPacket {
 		this.setData(proto);
 	}
 	
-	public PacketPlayerApplyEnterMpResultNotify(int targetId, String targetName, boolean isAgreed, PlayerApplyEnterMpReason reason) {
+	public PacketPlayerApplyEnterMpResultNotify(int targetId, String targetName, boolean isAgreed, PlayerApplyEnterMpResultNotify.Reason reason) {
 		super(PacketOpcodes.PlayerApplyEnterMpResultNotify);
 
 		PlayerApplyEnterMpResultNotify proto = PlayerApplyEnterMpResultNotify.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpResultRsp.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.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp;
 
-public class PacketPlayerApplyEnterMpResultRsp extends GenshinPacket {
+public class PacketPlayerApplyEnterMpResultRsp extends BasePacket {
 	
 	public PacketPlayerApplyEnterMpResultRsp(int applyUid, boolean isAgreed) {
 		super(PacketOpcodes.PlayerApplyEnterMpResultRsp);

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

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerChatNotify.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.ChatInfoOuterClass.ChatInfo;
 import emu.grasscutter.net.proto.PlayerChatNotifyOuterClass.PlayerChatNotify;
 import emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint;
 
-public class PacketPlayerChatNotify extends GenshinPacket {
+public class PacketPlayerChatNotify extends BasePacket {
 	
-	public PacketPlayerChatNotify(GenshinPlayer sender, int channelId, String message) {
+	public PacketPlayerChatNotify(Player sender, int channelId, String message) {
 		super(PacketOpcodes.PlayerChatNotify);
 		
 		ChatInfo info = ChatInfo.newBuilder()
@@ -26,7 +26,7 @@ public class PacketPlayerChatNotify extends GenshinPacket {
 		this.setData(proto);
 	}
 	
-	public PacketPlayerChatNotify(GenshinPlayer sender, int channelId, int emote) {
+	public PacketPlayerChatNotify(Player sender, int channelId, int emote) {
 		super(PacketOpcodes.PlayerChatNotify);
 		
 		ChatInfo info = ChatInfo.newBuilder()
@@ -43,7 +43,7 @@ public class PacketPlayerChatNotify extends GenshinPacket {
 		this.setData(proto);
 	}
 	
-	public PacketPlayerChatNotify(GenshinPlayer sender, int channelId, SystemHint systemHint) {
+	public PacketPlayerChatNotify(Player sender, int channelId, ChatInfo.SystemHint systemHint) {
 		super(PacketOpcodes.PlayerChatNotify);
 		
 		ChatInfo info = ChatInfo.newBuilder()

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

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerDataNotify.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.PlayerDataNotifyOuterClass.PlayerDataNotify;
 import emu.grasscutter.net.proto.PropValueOuterClass.PropValue;
 
-public class PacketPlayerDataNotify extends GenshinPacket {
+public class PacketPlayerDataNotify extends BasePacket {
 	
-	public PacketPlayerDataNotify(GenshinPlayer player) {
+	public PacketPlayerDataNotify(Player player) {
 		super(PacketOpcodes.PlayerDataNotify, 2);
 		
 		PlayerDataNotify.Builder p = PlayerDataNotify.newBuilder()
 				.setNickName(player.getNickname())
-				.setClientTime(System.currentTimeMillis())
+				.setServerTime(System.currentTimeMillis())
 				.setIsFirstLoginToday(true)
 				.setRegionId(player.getRegionId());
 				

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

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.GenshinPlayer;
 import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.game.inventory.GenshinItem;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AbilityControlBlockOuterClass;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
 import emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo;
 import emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo;
 import emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify;
 import emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo;
 
-public class PacketPlayerEnterSceneInfoNotify extends GenshinPacket {
+public class PacketPlayerEnterSceneInfoNotify extends BasePacket {
 	
-	public PacketPlayerEnterSceneInfoNotify(GenshinPlayer player) {
+	public PacketPlayerEnterSceneInfoNotify(Player player) {
 		super(PacketOpcodes.PlayerEnterSceneInfoNotify);
 		
 		AbilitySyncStateInfo empty = AbilitySyncStateInfo.newBuilder().build();
@@ -26,7 +27,7 @@ public class PacketPlayerEnterSceneInfoNotify extends GenshinPacket {
 				TeamEnterSceneInfo.newBuilder()
 					.setTeamEntityId(player.getTeamManager().getEntityId()) // 150995833
 					.setTeamAbilityInfo(empty)
-					.setUnk(empty)
+					.setAbilityControlBlock(AbilityControlBlockOuterClass.AbilityControlBlock.newBuilder().build())
 		);
 		proto.setMpLevelEntityInfo(
 				MPLevelEntityInfo.newBuilder()
@@ -36,7 +37,7 @@ public class PacketPlayerEnterSceneInfoNotify extends GenshinPacket {
 		);
 		
 		for (EntityAvatar avatarEntity : player.getTeamManager().getActiveTeam()) {
-			GenshinItem weapon = avatarEntity.getAvatar().getWeapon();
+			GameItem weapon = avatarEntity.getAvatar().getWeapon();
 			long weaponGuid = weapon != null ? weapon.getGuid() : 0;
 			
 			AvatarEnterSceneInfo avatarInfo = AvatarEnterSceneInfo.newBuilder()

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

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.GenshinPlayer.SceneLoadState;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.player.Player.SceneLoadState;
 import emu.grasscutter.game.props.EnterReason;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
 import emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify;
 import emu.grasscutter.utils.Position;
 import emu.grasscutter.utils.Utils;
 
-public class PacketPlayerEnterSceneNotify extends GenshinPacket {
+public class PacketPlayerEnterSceneNotify extends BasePacket {
 	
 	// Login
-	public PacketPlayerEnterSceneNotify(GenshinPlayer player) {
+	public PacketPlayerEnterSceneNotify(Player player) {
 		super(PacketOpcodes.PlayerEnterSceneNotify);
 		
 		player.setSceneLoadState(SceneLoadState.LOADING);
@@ -23,25 +23,25 @@ public class PacketPlayerEnterSceneNotify extends GenshinPacket {
 				.setSceneId(player.getSceneId())
 				.setPos(player.getPos().toProto())
 				.setSceneBeginTime(System.currentTimeMillis())
-				.setType(EnterType.EnterSelf)
+				.setType(EnterType.ENTER_SELF)
 				.setTargetUid(player.getUid())
 				.setEnterSceneToken(player.getEnterSceneToken())
 				.setWorldLevel(player.getWorldLevel())
 				.setEnterReason(EnterReason.Login.getValue())
 				.setIsFirstLoginEnterScene(player.isFirstLoginEnterScene())
-				.setUnk1(1)
-				.setUnk2("3-" + player.getUid() + "-" + (int) (System.currentTimeMillis() / 1000) + "-" + 18402)
+				.setWorldType(1)
+				.setSceneTransaction("3-" + player.getUid() + "-" + (int) (System.currentTimeMillis() / 1000) + "-" + 18402)
 				.build();
 		
 		this.setData(proto);
 	}
 	
-	public PacketPlayerEnterSceneNotify(GenshinPlayer player, EnterType type, EnterReason reason, int newScene, Position newPos) {
+	public PacketPlayerEnterSceneNotify(Player player, EnterType type, EnterReason reason, int newScene, Position newPos) {
 		this(player, player, type, reason, newScene, newPos);
 	}
 	
 	// Teleport or go somewhere
-	public PacketPlayerEnterSceneNotify(GenshinPlayer player, GenshinPlayer target, EnterType type, EnterReason reason, int newScene, Position newPos) {
+	public PacketPlayerEnterSceneNotify(Player player, Player target, EnterType type, EnterReason reason, int newScene, Position newPos) {
 		super(PacketOpcodes.PlayerEnterSceneNotify);
 		
 		player.setEnterSceneToken(Utils.randomRange(1000, 99999));
@@ -62,8 +62,8 @@ public class PacketPlayerEnterSceneNotify extends GenshinPacket {
 				.addSceneTagIdList(109)
 				.addSceneTagIdList(113)
 				.addSceneTagIdList(117)
-				.setUnk1(1)
-				.setUnk2(newScene + "-" + target.getUid() + "-" + (int) (System.currentTimeMillis() / 1000) + "-" + 18402)
+				.setWorldType(1)
+				.setSceneTransaction(newScene + "-" + target.getUid() + "-" + (int) (System.currentTimeMillis() / 1000) + "-" + 18402)
 				.build();
 		
 		this.setData(proto);

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGameTimeNotify.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.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify;
 
-public class PacketPlayerGameTimeNotify extends GenshinPacket {
+public class PacketPlayerGameTimeNotify extends BasePacket {
 	
-	public PacketPlayerGameTimeNotify(GenshinPlayer player) {
+	public PacketPlayerGameTimeNotify(Player player) {
 		super(PacketOpcodes.PlayerGameTimeNotify);
 		
 		PlayerGameTimeNotify proto = PlayerGameTimeNotify.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGetForceQuitBanInfoRsp.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.PlayerGetForceQuitBanInfoRspOuterClass.PlayerGetForceQuitBanInfoRsp;
 
-public class PacketPlayerGetForceQuitBanInfoRsp extends GenshinPacket {
+public class PacketPlayerGetForceQuitBanInfoRsp extends BasePacket {
 	
 	public PacketPlayerGetForceQuitBanInfoRsp(int retcode) {
 		super(PacketOpcodes.PlayerGetForceQuitBanInfoRsp);

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

@@ -2,11 +2,11 @@ package emu.grasscutter.server.packet.send;
 
 import java.util.Set;
 
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.PlayerLevelRewardUpdateNotifyOuterClass.PlayerLevelRewardUpdateNotify;
 
-public class PacketPlayerLevelRewardUpdateNotify extends GenshinPacket {
+public class PacketPlayerLevelRewardUpdateNotify extends BasePacket {
 	
 	public PacketPlayerLevelRewardUpdateNotify(Set<Integer> rewardedLevels) {
 		super(PacketOpcodes.PlayerLevelRewardUpdateNotify);

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

@@ -2,7 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import com.google.protobuf.ByteString;
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp;
 import emu.grasscutter.net.proto.QueryCurrRegionHttpRspOuterClass;
@@ -14,7 +14,7 @@ import java.io.File;
 import java.net.URL;
 import java.util.Base64;
 
-public class PacketPlayerLoginRsp extends GenshinPacket {
+public class PacketPlayerLoginRsp extends BasePacket {
 
 	private static QueryCurrRegionHttpRspOuterClass.QueryCurrRegionHttpRsp regionCache;
 
@@ -40,8 +40,8 @@ public class PacketPlayerLoginRsp extends GenshinPacket {
 					QueryCurrRegionHttpRspOuterClass.QueryCurrRegionHttpRsp regionQuery = QueryCurrRegionHttpRspOuterClass.QueryCurrRegionHttpRsp.parseFrom(decodedCurRegion);
 
 					RegionInfo serverRegion = regionQuery.getRegionInfo().toBuilder()
-							.setIp((Grasscutter.getConfig().getGameServerOptions().PublicIp.isEmpty() ? Grasscutter.getConfig().getGameServerOptions().Ip : Grasscutter.getConfig().getGameServerOptions().PublicIp))
-							.setPort(Grasscutter.getConfig().getGameServerOptions().PublicPort != 0 ? Grasscutter.getConfig().getGameServerOptions().PublicPort : Grasscutter.getConfig().getGameServerOptions().Port)
+							.setGateserverIp((Grasscutter.getConfig().getGameServerOptions().PublicIp.isEmpty() ? Grasscutter.getConfig().getGameServerOptions().Ip : Grasscutter.getConfig().getGameServerOptions().PublicIp))
+							.setGateserverPort(Grasscutter.getConfig().getGameServerOptions().PublicPort != 0 ? Grasscutter.getConfig().getGameServerOptions().PublicPort : Grasscutter.getConfig().getGameServerOptions().Port)
 							.setSecretKey(ByteString.copyFrom(FileUtils.read(Grasscutter.getConfig().KEY_FOLDER + "dispatchSeed.bin")))
 							.build();
 
@@ -64,7 +64,7 @@ public class PacketPlayerLoginRsp extends GenshinPacket {
 				.setClientSilenceDataVersion(info.getClientSilenceDataVersion())
 				.setClientMd5(info.getClientDataMd5())
 				.setClientSilenceMd5(info.getClientSilenceDataMd5())
-				.setResVersionConfig(info.getConfig())
+				.setResVersionConfig(info.getResVersionConfig())
 				.setClientVersionSuffix(info.getClientVersionSuffix())
 				.setClientSilenceVersionSuffix(info.getClientSilenceVersionSuffix())
 				.setIsScOpen(false)

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

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.player.Player;
 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.PlayerPropNotifyOuterClass.PlayerPropNotify;
 import emu.grasscutter.utils.ProtoHelper;
 
-public class PacketPlayerPropNotify extends GenshinPacket {
+public class PacketPlayerPropNotify extends BasePacket {
 	
-	public PacketPlayerPropNotify(GenshinPlayer player, PlayerProperty prop) {
+	public PacketPlayerPropNotify(Player player, PlayerProperty prop) {
 		super(PacketOpcodes.PlayerPropNotify);
 		
 		this.buildHeader(0);

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

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

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.GenshinConstants;
+import emu.grasscutter.GameConstants;
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.inventory.GenshinItem;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.ItemOuterClass.Item;
 import emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify;
 import emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType;
 
-public class PacketPlayerStoreNotify extends GenshinPacket {
+public class PacketPlayerStoreNotify extends BasePacket {
 	
-	public PacketPlayerStoreNotify(GenshinPlayer player) {
+	public PacketPlayerStoreNotify(Player player) {
 		super(PacketOpcodes.PlayerStoreNotify);
 		
 		this.buildHeader(2);
 		
 		PlayerStoreNotify.Builder p = PlayerStoreNotify.newBuilder()
-				.setStoreType(StoreType.StorePack)
+				.setStoreType(StoreType.STORE_PACK)
 				.setWeightLimit(Grasscutter.getConfig().getGameServerOptions().InventoryLimitAll);
 		
-		for (GenshinItem item : player.getInventory()) {
+		for (GameItem item : player.getInventory()) {
 			Item itemProto = item.toProto();
 			p.addItemList(itemProto);
 		}

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerTimeNotify.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.PlayerTimeNotifyOuterClass.PlayerTimeNotify;
 
-public class PacketPlayerTimeNotify extends GenshinPacket {
+public class PacketPlayerTimeNotify extends BasePacket {
 	
-	public PacketPlayerTimeNotify(GenshinPlayer player) {
+	public PacketPlayerTimeNotify(Player player) {
 		super(PacketOpcodes.PlayerTimeNotify);
 
 		PlayerTimeNotify proto = PlayerTimeNotify.newBuilder()