Implement support for multiple scenes in a world

src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDestroyGadgetNotify.java

@@ -18,7 +18,7 @@ public class HandlerEvtDestroyGadgetNotify extends PacketHandler {
 			return;
 		}
 
-		session.getPlayer().getWorld().onPlayerDestroyGadget(notify.getEntityId());
+		session.getPlayer().getScene().onPlayerDestroyGadget(notify.getEntityId());
 	}
 
 }

src/main/java/emu/grasscutter/server/packet/recv/HandlerMarkMapReq.java

 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.Grasscutter;
+import emu.grasscutter.game.World;
+import emu.grasscutter.game.props.EnterReason;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
 import emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq;
 import emu.grasscutter.net.proto.OperationOuterClass.Operation;
 import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketPlayerEnterSceneNotify;
 import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
 
 @Opcodes(PacketOpcodes.MarkMapReq)
@@ -19,14 +23,18 @@ public class HandlerMarkMapReq extends PacketHandler {
 		if (req.getOp() != Operation.Add) {
 			return;
 		}
-		
+
 		session.getPlayer().getPos().setX(req.getMark().getPos().getX());
 		session.getPlayer().getPos().setZ(req.getMark().getPos().getZ());
 		session.getPlayer().getPos().setY(300);
 		
-		Grasscutter.getLogger().info("Player [" + session.getPlayer().getId() + ":" + session.getPlayer().getNickname() + "] tp to " + session.getPlayer().getPos());
+		Grasscutter.getLogger().info("Player [" + session.getPlayer().getId() + ":" + session.getPlayer().getNickname() + "] tp to " + session.getPlayer().getPos() + " Scene id: " + req.getMark().getSceneId());
 		
-		session.getPlayer().getWorld().broadcastPacket(new PacketSceneEntityAppearNotify(session.getPlayer()));
+		if (req.getMark().getSceneId() != session.getPlayer().getSceneId()) {
+			session.getPlayer().getWorld().transferPlayerToScene(session.getPlayer(), req.getMark().getSceneId(), session.getPlayer().getPos());
+		} else {
+			session.getPlayer().getScene().broadcastPacket(new PacketSceneEntityAppearNotify(session.getPlayer()));
+		}
 	}
 
 }

src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneInitFinishReq.java

@@ -14,6 +14,7 @@ import emu.grasscutter.server.packet.send.PacketSceneInitFinishRsp;
 import emu.grasscutter.server.packet.send.PacketScenePlayerInfoNotify;
 import emu.grasscutter.server.packet.send.PacketSceneTeamUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketSceneTimeNotify;
+import emu.grasscutter.server.packet.send.PacketSceneUnlockInfoNotify;
 import emu.grasscutter.server.packet.send.PacketServerTimeNotify;
 import emu.grasscutter.server.packet.send.PacketSyncScenePlayTeamEntityNotify;
 import emu.grasscutter.server.packet.send.PacketSyncTeamEntityNotify;
@@ -29,13 +30,14 @@ public class HandlerSceneInitFinishReq extends PacketHandler {
 		session.send(new PacketServerTimeNotify());
 		session.send(new PacketWorldPlayerInfoNotify(session.getPlayer().getWorld()));
 		session.send(new PacketWorldDataNotify(session.getPlayer().getWorld()));
+		session.send(new PacketSceneUnlockInfoNotify());
 		session.send(new GenshinPacket(PacketOpcodes.SceneForceUnlockNotify));
 		session.send(new PacketHostPlayerNotify(session.getPlayer().getWorld()));
 		
 		session.send(new PacketSceneTimeNotify(session.getPlayer()));
-		session.send(new PacketPlayerGameTimeNotify(session.getPlayer().getWorld(), session.getPlayer()));
+		session.send(new PacketPlayerGameTimeNotify(session.getPlayer()));
 		session.send(new PacketPlayerEnterSceneInfoNotify(session.getPlayer()));
-		session.send(new PacketSceneAreaWeatherNotify(session.getPlayer().getWorld(), session.getPlayer()));
+		session.send(new PacketSceneAreaWeatherNotify(session.getPlayer()));
 		session.send(new PacketScenePlayerInfoNotify(session.getPlayer().getWorld()));
 		session.send(new PacketSceneTeamUpdateNotify(session.getPlayer()));
 		

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.net.packet.PacketOpcodes;
@@ -7,11 +8,11 @@ import emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp;
 
 public class PacketChangeGameTimeRsp extends GenshinPacket {
 	
-	public PacketChangeGameTimeRsp(World world) {
+	public PacketChangeGameTimeRsp(GenshinPlayer player) {
 		super(PacketOpcodes.ChangeGameTimeRsp);
 		
 		ChangeGameTimeRsp proto = ChangeGameTimeRsp.newBuilder()
-				.setCurGameTime(world.getTime())
+				.setCurGameTime(player.getScene().getTime())
 				.build();
 		
 		this.setData(proto);

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

@@ -16,8 +16,8 @@ public class PacketGetSceneAreaRsp extends GenshinPacket {
 		this.buildHeader(0);
 		
 		GetSceneAreaRsp p = GetSceneAreaRsp.newBuilder()
-				.setSceneId(3)
-				.addAllAreaIdList(Arrays.stream(new int[] {1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19}).boxed().collect(Collectors.toList()))
+				.setSceneId(sceneId)
+				.addAllAreaIdList(Arrays.stream(new int[] {1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,100,101,102,103,200,210,300}).boxed().collect(Collectors.toList()))
 				.addCityInfoList(CityInfo.newBuilder().setCityId(1).setLevel(1).build())
 				.addCityInfoList(CityInfo.newBuilder().setCityId(2).setLevel(1).build())
 				.addCityInfoList(CityInfo.newBuilder().setCityId(3).setLevel(1).build())

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

@@ -29,10 +29,6 @@ public class PacketPlayerEnterSceneNotify extends GenshinPacket {
 				.setWorldLevel(player.getWorldLevel())
 				.setEnterReason(EnterReason.Login.getValue())
 				.setIsFirstLoginEnterScene(player.isFirstLoginEnterScene())
-				.addSceneTagIdList(102)
-				.addSceneTagIdList(107)
-				.addSceneTagIdList(113)
-				.addSceneTagIdList(117)
 				.setUnk1(1)
 				.setUnk2("3-" + player.getId() + "-" + (int) (System.currentTimeMillis() / 1000) + "-" + 18402)
 				.build();

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

@@ -8,11 +8,11 @@ import emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNo
 
 public class PacketPlayerGameTimeNotify extends GenshinPacket {
 	
-	public PacketPlayerGameTimeNotify(World world, GenshinPlayer player) {
+	public PacketPlayerGameTimeNotify(GenshinPlayer player) {
 		super(PacketOpcodes.PlayerGameTimeNotify);
 		
 		PlayerGameTimeNotify proto = PlayerGameTimeNotify.newBuilder()
-				.setGameTime(world.getTime())
+				.setGameTime(player.getScene().getTime())
 				.setUid(player.getId())
 				.build();
 		

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

@@ -8,12 +8,12 @@ import emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeath
 
 public class PacketSceneAreaWeatherNotify extends GenshinPacket {
 	
-	public PacketSceneAreaWeatherNotify(World world, GenshinPlayer player) {
+	public PacketSceneAreaWeatherNotify(GenshinPlayer player) {
 		super(PacketOpcodes.SceneAreaWeatherNotify);
 		
 		SceneAreaWeatherNotify proto = SceneAreaWeatherNotify.newBuilder()
 				.setWeatherAreaId(1)
-				.setClimateType(world.getClimate().getValue())
+				.setClimateType(player.getScene().getClimate().getValue())
 				.build();
 		
 		this.setData(proto);

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

@@ -21,7 +21,7 @@ public class PacketScenePlayerInfoNotify extends GenshinPacket {
 					.setUid(p.getId())
 					.setPeerId(p.getPeerId())
 					.setName(p.getNickname())
-					.setSceneId(world.getSceneId())
+					.setSceneId(p.getSceneId())
 					.setOnlinePlayerInfo(p.getOnlinePlayerInfo())
 					.build();
 			

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

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.SceneUnlockInfoNotifyOuterClass.SceneUnlockInfoNotify;
+import emu.grasscutter.net.proto.SceneUnlockInfoOuterClass.SceneUnlockInfo;
+
+public class PacketSceneUnlockInfoNotify extends GenshinPacket {
+	
+	public PacketSceneUnlockInfoNotify() {
+		super(PacketOpcodes.SceneUnlockInfoNotify); // Rename opcode later
+
+		SceneUnlockInfoNotify proto = SceneUnlockInfoNotify.newBuilder()
+				.addUnlockInfos(SceneUnlockInfo.newBuilder().setSceneId(1))
+				.addUnlockInfos(SceneUnlockInfo.newBuilder().setSceneId(3))
+				.addUnlockInfos(SceneUnlockInfo.newBuilder().setSceneId(4))
+				.addUnlockInfos(SceneUnlockInfo.newBuilder().setSceneId(5))
+				.addUnlockInfos(SceneUnlockInfo.newBuilder().setSceneId(6))
+				.addUnlockInfos(SceneUnlockInfo.newBuilder().setSceneId(7))
+				.build();
+		
+		this.setData(proto);
+	}
+}