Merge remote-tracking branch 'upstream/main'

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

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

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.GenshinConstants;
+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.net.packet.GenshinPacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType;
@@ -13,11 +13,11 @@ public class PacketStoreWeightLimitNotify extends GenshinPacket {
 
 		StoreWeightLimitNotify p = StoreWeightLimitNotify.newBuilder()
 				.setStoreType(StoreType.StorePack)
-				.setWeightLimit(GenshinConstants.LIMIT_ALL)
-				.setWeaponCountLimit(GenshinConstants.LIMIT_WEAPON)
-				.setReliquaryCountLimit(GenshinConstants.LIMIT_RELIC)
-				.setMaterialCountLimit(GenshinConstants.LIMIT_MATERIAL)
-				.setFurnitureCountLimit(GenshinConstants.LIMIT_FURNITURE)
+				.setWeightLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitAll)
+				.setWeaponCountLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitWeapon)
+				.setReliquaryCountLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitRelic)
+				.setMaterialCountLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitMaterial)
+				.setFurnitureCountLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitFurniture)
 				.build();
 		
 		this.setData(p);

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