Sync from upstream repo 01/17/2025 18:54:42

Source/Editor/ClientSimEditorRuntimeLinker.cs

@@ -1,5 +1,6 @@
 using UnityEditor;
 using UnityEngine;
+using VRC.SDKBase;
 
 namespace VRC.SDK3.ClientSim.Editor
 {
@@ -12,25 +13,38 @@ public static class ClientSimEditorRuntimeLinker
     {
         private static void ModeStateChanged(PlayModeStateChange state)
         {
+
+            if(state == PlayModeStateChange.EnteredPlayMode)
+            {
+                ClientSimMenu.openSettingsHook += ClientSimSettingsWindow.Init;
+                ClientSimMenu.checkValidSettingsHook += ClientSimProjectSettingsSetup.IsUsingCorrectSettings;
+            }
+
             // On exiting playmode, remove the Editor method hooks.
             if (state == PlayModeStateChange.ExitingPlayMode)
             {
                 ClientSimMenu.openSettingsHook -= ClientSimSettingsWindow.Init;
                 ClientSimMenu.checkValidSettingsHook -= ClientSimProjectSettingsSetup.IsUsingCorrectSettings;
-
-                EditorApplication.playModeStateChanged -= ModeStateChanged;
+            }
+
+            if (state == PlayModeStateChange.ExitingEditMode)
+            {
+                InitializeScene();
             }
         }
 
         // When entering playmode, set Editor method hooks.
         // Using this runtime initialized method due to timing issues with with Domain Reloading on and off.
-        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
-        private static void OnPlaymodeStart()
+        [InitializeOnLoadMethod]
+        private static void OnProjectLoadedInEditor()
         {
-            ClientSimMenu.openSettingsHook += ClientSimSettingsWindow.Init;
-            ClientSimMenu.checkValidSettingsHook += ClientSimProjectSettingsSetup.IsUsingCorrectSettings;
-
             EditorApplication.playModeStateChanged += ModeStateChanged;
         }
+
+
+        private static void InitializeScene()
+        {
+            ClientSimNetworkingUtilities.DoSceneSetup();
+        }
     }
 }

Source/Editor/Editors/ClientSimNetworkIdHolderEditor.cs

@@ -0,0 +1,72 @@
+using System;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using VRC.SDK3.ClientSim.Editor.VisualElements;
+
+namespace VRC.SDK3.ClientSim.Editor
+{
+    #if VRC_ENABLE_PLAYER_PERSISTENCE
+    [UnityEditor.CustomEditor(typeof(ClientSimNetworkIdHolder))]
+    public class ClientSimNetworkIdHolderEditor : UnityEditor.Editor
+    {
+        private VisualElement _List;
+        private IClientSimEventDispatcher _eventDispatcher;
+
+        public void OnEnable()
+        {
+            _eventDispatcher = ClientSimMain.GetInstance().GetEventDispatcher();
+            _eventDispatcher.Subscribe<ClientSimOnPlayerObjectUpdatedEvent>(OnPlayerObjectUpdated);
+        }
+
+        public override VisualElement CreateInspectorGUI()
+        {
+            VisualElement root = new VisualElement();
+            ClientSimNetworkIdHolder networkIdHolder = (ClientSimNetworkIdHolder) target;
+
+            if (networkIdHolder._components != null)
+            {
+                root.Add(new Label("Network Id: " + networkIdHolder._networkId.GetNetworkId()));
+                root.Add(new Label("Network Components"));
+                _List = new VisualElement();
+                for (int i = 0; i < networkIdHolder._components.Count; i++)
+                {
+                    if (ClientSimNetworkHolderInstanceElement.encodeDecoders.TryGetValue(networkIdHolder._components[i].GetType().FullName, out var encodeDecoder))
+                    {
+                        MonoBehaviour component = networkIdHolder._components[i];
+                        if(networkIdHolder._data.Count > i)
+                            _List.Add(encodeDecoder.GenerateFields(component,networkIdHolder._data[i].DataDictionary));
+                    }
+                }
+                root.Add(_List);
+            }
+
+            return root;
+        }
+
+        private void OnPlayerObjectUpdated(ClientSimOnPlayerObjectUpdatedEvent e)
+        {
+            ClientSimNetworkIdHolder networkIdHolder = (ClientSimNetworkIdHolder) target;
+            if ((ClientSimNetworkIdHolder)e.Data != networkIdHolder) return;
+
+            if (networkIdHolder._components != null)
+            {
+                for (int i = 0; i < networkIdHolder._components.Count; i++)
+                {
+                    if (ClientSimNetworkHolderInstanceElement.encodeDecoders.TryGetValue(networkIdHolder._components[i].GetType().FullName, out var encodeDecoder))
+                    {
+                        MonoBehaviour component = networkIdHolder._components[i];
+                        if(networkIdHolder._data.Count > i)
+                            encodeDecoder.UpdateFields(component,_List[i],networkIdHolder._data[i].DataDictionary);
+                    }
+                }
+            }
+        }
+
+        public void OnDisable()
+        {
+            _eventDispatcher?.Unsubscribe<ClientSimOnPlayerObjectUpdatedEvent>(OnPlayerObjectUpdated);
+        }
+    }
+#endif
+}