update

Changing GhostAdapter to GhostObject

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Editor/NetworkObjectEditor.cs

@@ -29,18 +29,18 @@ public class NetworkObjectEditor : UnityEditor.Editor
 
 #if UNIFIED_NETCODE
         /// <summary>
-        /// Register for the GhostAdapter removal event.
+        /// Register for the GhostObject removal event.
         /// </summary>
         [InitializeOnLoadMethod]
         private static void OnApplicationStart()
         {
-            GhostAdapterEditor.OnGhostAdapterPreRemoval = OnGhostAdapterPreRemoval;
+            GhostObjectEditor.OnGhostAdapterPreRemoval = OnGhostAdapterPreRemoval;
         }
 
         /// <summary>
-        /// Callback to remove the GhostBehaviours prior to removing GhostAdapter.
+        /// Callback to remove the GhostBehaviours prior to removing GhostObject.
         /// </summary>
-        /// <param name="gameObject">The <see cref="GameObject"/> with the <see cref="GhostAdapter"/> component being removed.</param>
+        /// <param name="gameObject">The <see cref="GameObject"/> with the <see cref="GhostObject"/> component being removed.</param>
         private static void OnGhostAdapterPreRemoval(GameObject gameObject)
         {
             var ghostBehaviours = gameObject.GetComponentsInChildren<GhostBehaviour>();
@@ -49,7 +49,7 @@ private static void OnGhostAdapterPreRemoval(GameObject gameObject)
                 DestroyImmediate(ghostBehaviours[i], true);
             }
             var networkObject = gameObject.GetComponent<NetworkObject>();
-            networkObject.GhostAdapter = null;
+            networkObject.GhostObject = null;
             networkObject.HasGhost = false;
             networkObject.HadBridge = true;
         }

com.unity.netcode.gameobjects/Runtime/Components/Helpers/NetworkObjectBridge.cs

@@ -11,7 +11,7 @@ namespace Unity.Netcode
     /// specific to the N4E-spawned hybrid prefab instance that has the matching <see cref="NetworkObjectId"/>.
     /// </summary>
 
-    [DefaultExecutionOrder(GhostAdapterExecutionOrder.ExecutionOrder + 1)]
+    [DefaultExecutionOrder(GhostObjectExecutionOrder.ExecutionOrder + 1)]
     //BREAK --- Fix this on UNIFIED side 1st
     public partial class NetworkObjectBridge : GhostBehaviour
     {
@@ -23,7 +23,7 @@ private void OnValidate()
         {
             hideFlags = HideFlags.HideInInspector;
 
-            var ghostAdapter = GetComponent<GhostAdapter>();
+            var ghostAdapter = GetComponent<GhostObject>();
             if (ghostAdapter == null)
             {
                 return;

com.unity.netcode.gameobjects/Runtime/Connection/NetworkClient.cs

@@ -52,7 +52,7 @@ public class NetworkClient
         /// <summary>
         /// The ClientId of the NetworkClient
         /// </summary>
-        public ulong ClientId;
+        public ulong ClientId { get; internal set; }
 
         /// <summary>
         /// The PlayerObject of the Client

com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs

@@ -365,7 +365,7 @@ private void CheckForInScenePlaced()
 #if UNIFIED_NETCODE
         [HideInInspector]
         [SerializeField]
-        internal GhostAdapter GhostAdapter;
+        internal GhostObject GhostObject;
 
         [HideInInspector]
         [SerializeField]
@@ -388,16 +388,16 @@ private void OnApplicationUpdate()
         internal void UnifiedValidation()
         {
             NetworkObjectBridge = GetComponent<NetworkObjectBridge>();
-            GhostAdapter = GetComponent<GhostAdapter>();
+            GhostObject = GetComponent<GhostObject>();
 
-            HasGhost = GhostAdapter != null;
+            HasGhost = GhostObject != null;
             if (HasGhost)
             {
                 //TODO: Needs to be validated once develop-2.0.0 is merged.
                 if (InScenePlaced)
                 {
                     Debug.LogError($"This experimental version of NGO does not support hybrid in-scene placed objects.");
-                    Destroy(GhostAdapter);
+                    Destroy(GhostObject);
                     HasGhost = false;
                     return;
                 }
@@ -420,7 +420,7 @@ public void ApplyScale(Vector3 scale)
         {
             if (HasGhost)
             {
-                GhostAdapter.ApplyPostTransformMatrixScale(scale);
+                GhostObject.ApplyPostTransformMatrixScale(scale);
             }
         }
 #endif
@@ -3933,7 +3933,7 @@ private void InitGhost()
                 return;
             }
 
-            if (!HasGhost || !NetworkObjectBridge || GhostAdapter.IsPrefab())
+            if (!HasGhost || !NetworkObjectBridge || GhostObject.IsPrefab())
             {
                 // Nothing to register
                 return;
@@ -3944,7 +3944,7 @@ private void InitGhost()
             {
                 Debug.Log($"[{nameof(NetworkObject)}] GhostBridge {name} detected and instantiated.");
             }
-            if (GhostAdapter.WasInitialized && NetworkObjectBridge.NetworkObjectId.Value != 0)
+            if (GhostObject.WasInitialized && NetworkObjectBridge.NetworkObjectId.Value != 0)
             {
                 NetworkManager.SpawnManager.GhostSpawnManager.RegisterGhostBridge(NetworkObjectBridge.NetworkObjectId.Value, this);
             }

com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetcodeIntegrationTest.cs

@@ -2455,7 +2455,7 @@ protected GameObject CreateHybridPrefab(string baseName, bool moveToDDOL = true)
 
             // NetworkObject Ghost specific settings
             no.HasGhost = true;
-            no.GhostAdapter = adapter;
+            no.GhostObject = adapter;
             no.HadBridge = true;
             no.NetworkObjectBridge = bridge;