Merge branch 'dev-scene'

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

@@ -17,7 +17,7 @@ public class PacketWorldPlayerInfoNotify extends GenshinPacket {
 			GenshinPlayer p = world.getPlayers().get(i);
 			
 			proto.addPlayerInfoList(p.getOnlinePlayerInfo());
-			proto.addPlayerUidList(p.getId());
+			proto.addPlayerUidList(p.getUid());
 		}
 		
 		this.setData(proto.build());

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

@@ -17,7 +17,7 @@ public class PacketWorldPlayerRTTNotify extends GenshinPacket {
 		for (GenshinPlayer player : world.getPlayers()) {
 			proto.addPlayerRttList(
 					PlayerRTTInfo.newBuilder()
-							.setUid(player.getId())
+							.setUid(player.getUid())
 							.setRtt(10) // TODO - put player ping here
 			);
 		}

src/main/java/emu/grasscutter/tools/Tools.java

@@ -20,6 +20,7 @@ import emu.grasscutter.data.ResourceLoader;
 import emu.grasscutter.data.def.AvatarData;
 import emu.grasscutter.data.def.ItemData;
 import emu.grasscutter.data.def.MonsterData;
+import emu.grasscutter.data.def.SceneData;
 
 public final class Tools {
 	
@@ -63,6 +64,17 @@ public final class Tools {
 			
 			writer.println();
 			
+			writer.println("// Scenes");
+			list = new ArrayList<>(GenshinData.getSceneDataMap().keySet());
+			Collections.sort(list); 
+			
+			for (Integer id : list) {
+				SceneData data = GenshinData.getSceneDataMap().get(id);
+				writer.println(data.getId() + " : " + data.getScriptData());
+			}
+			
+			writer.println();
+			
 			writer.println("// Monsters");
 			list = new ArrayList<>(GenshinData.getMonsterDataMap().keySet());
 			Collections.sort(list); 

src/main/java/emu/grasscutter/utils/Utils.java

@@ -165,8 +165,6 @@ public final class Utils {
 		// Check for game data.
 		if(!fileExists(dataFolder))
 			createFolder(dataFolder);
-		if(!fileExists(dataFolder + "AbilityEmbryos.json"))
-			copyFromResources("data/AbilityEmbryos.json", dataFolder);
 
 		if(exit) System.exit(1);
 	}