update

Removing all of the original prefab registration flow, per request within unified PR, to remove the code on the unified side that this code depends on.

Author: NoelStephensUnity

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

@@ -64,16 +64,6 @@ public override bool Initialize(string defaultWorldName)
                 }
 
                 networkManager.NetcodeWorld = (NetcodeWorld)LastCreatedWorld;
-#if UNIFIED_NGO_REGISTERS_PREFABS
-                if (networkManager.NetworkConfig.Prefabs.HasPendingGhostPrefabs)
-                {
-                    if (networkManager.LogLevel <= LogLevel.Developer)
-                    {
-                        NetworkLog.LogInfo($"[{nameof(UnifiedBootstrap)}] Registering hybrid prefabs...");
-                    }
-                    networkManager.NetworkConfig.Prefabs.RegisterGhostPrefabs(networkManager);
-                }
-#endif
             }
             else
             {

com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabs.cs

@@ -47,11 +47,6 @@ public class NetworkPrefabs
         [NonSerialized]
         private List<NetworkPrefab> m_Prefabs = new List<NetworkPrefab>();
 
-#if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-        [NonSerialized]
-        internal Dictionary<uint, NetworkPrefab> PrefabTable = new Dictionary<uint, NetworkPrefab>();
-#endif
-
         [NonSerialized]
         private List<NetworkPrefab> m_RuntimeAddedPrefabs = new List<NetworkPrefab>();
 
@@ -62,18 +57,12 @@ private void AddTriggeredByNetworkPrefabList(NetworkPrefab networkPrefab)
                 // Don't add this to m_RuntimeAddedPrefabs
                 // This prefab is now in the PrefabList, so if we shutdown and initialize again, we'll pick it up from there.
                 m_Prefabs.Add(networkPrefab);
-#if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-                PrefabTable.TryAdd(networkPrefab.SourcePrefabGlobalObjectIdHash, networkPrefab);
-#endif
             }
         }
 
         private void RemoveTriggeredByNetworkPrefabList(NetworkPrefab networkPrefab)
         {
             m_Prefabs.Remove(networkPrefab);
-#if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-            PrefabTable.Remove(networkPrefab.SourcePrefabGlobalObjectIdHash);
-#endif
         }
 
         /// <summary>
@@ -106,9 +95,6 @@ public void Initialize(bool warnInvalid = true)
         {
             m_Prefabs.Clear();
             NetworkPrefabsLists.RemoveAll(x => x == null);
-#if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-            PrefabTable.Clear();
-#endif
             foreach (var list in NetworkPrefabsLists)
             {
                 list.OnAdd += AddTriggeredByNetworkPrefabList;
@@ -141,16 +127,10 @@ public void Initialize(bool warnInvalid = true)
                 if (AddPrefabRegistration(networkPrefab))
                 {
                     m_Prefabs.Add(networkPrefab);
-#if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-                    PrefabTable.TryAdd(networkPrefab.SourcePrefabGlobalObjectIdHash, networkPrefab);
-#endif
                 }
                 else
                 {
                     removeList?.Add(networkPrefab);
-#if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-                    PrefabTable.Remove(networkPrefab.SourcePrefabGlobalObjectIdHash);
-#endif
                 }
             }
 
@@ -159,16 +139,10 @@ public void Initialize(bool warnInvalid = true)
                 if (AddPrefabRegistration(networkPrefab))
                 {
                     m_Prefabs.Add(networkPrefab);
-#if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-                    PrefabTable.TryAdd(networkPrefab.SourcePrefabGlobalObjectIdHash, networkPrefab);
-#endif
                 }
                 else
                 {
                     removeList?.Add(networkPrefab);
-#if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-                    PrefabTable.Remove(networkPrefab.SourcePrefabGlobalObjectIdHash);
-#endif
                 }
             }
 
@@ -201,9 +175,6 @@ public bool Add(NetworkPrefab networkPrefab)
             {
                 m_Prefabs.Add(networkPrefab);
                 m_RuntimeAddedPrefabs.Add(networkPrefab);
-#if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-                PrefabTable.TryAdd(networkPrefab.SourcePrefabGlobalObjectIdHash, networkPrefab);
-#endif
                 return true;
             }
 
@@ -231,9 +202,6 @@ public void Remove(NetworkPrefab prefab)
             m_RuntimeAddedPrefabs.Remove(prefab);
             OverrideToNetworkPrefab.Remove(prefab.TargetPrefabGlobalObjectIdHash);
             NetworkPrefabOverrideLinks.Remove(prefab.SourcePrefabGlobalObjectIdHash);
-#if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-            PrefabTable.Remove(prefab.SourcePrefabGlobalObjectIdHash);
-#endif
         }
 
         /// <summary>
@@ -311,50 +279,6 @@ public bool Contains(NetworkPrefab prefab)
 
 #if UNIFIED_NETCODE
         internal bool HasGhostPrefabs { get; private set; }
-
-#if UNIFIED_NGO_REGISTERS_PREFABS
-        /// <summary>
-        /// TODO: Either keep or remove prior to freeze.
-        /// Leaving this here in case we have to control when things get registered.
-        /// </summary>
-        internal bool HasPendingGhostPrefabs { get; private set; }
-        private List<NetworkPrefab> m_PendingGhostRegistration = new List<NetworkPrefab>();
-        /// <summary>
-        /// UNIFIED-POC<br />
-        /// Hybrid NetworkObject-Ghost Prefab Registration<br />
-        /// </summary>
-        /// <remarks>
-        /// When <see cref="NetworkObject.HasGhost"/> is true, <see cref="NetworkPrefab"/>s
-        /// will mark themselves as having a ghost during <see cref="NetworkPrefab.Validate(int)"/>.
-        /// After validation, if a network prefab's <see cref="NetworkPrefab.HasGhost"/> value is
-        /// set, then it is added to <see cref="m_PendingGhostRegistration"/>.
-        /// Within <see cref="NetworkManager.NetworkUpdate(NetworkUpdateStage)"/> during the <see cref="NetworkUpdateStage.EarlyUpdate"/>,
-        /// if <see cref="HasPendingGhostPrefabs"/> is true then <see cref="RegisterGhostPrefabs(NetworkManager)"/> will be invoked.
-        /// This will repeat until the hosted single world instance is created.
-        /// </remarks>
-        /// <param name="networkManager"></param>
-        internal void RegisterGhostPrefabs(NetworkManager networkManager)
-        {
-            if (!HasPendingGhostPrefabs)
-            {
-                Debug.LogWarning($"Should not be invoking!");
-                return;
-            }
-            var isHost = networkManager.IsHost;
-            for (int i = m_PendingGhostRegistration.Count - 1; i >= 0; i--)
-            {
-                var networkPrefab = m_PendingGhostRegistration[i];
-
-                // Returns false if the single world is not available yet
-                if (NetCode.Netcode.RegisterPrefabSingleWorld(networkPrefab.Prefab, isHost, networkManager.NetcodeWorld))
-                {
-                    Debug.Log($"[{nameof(NetworkPrefabs)}][{nameof(RegisterGhostPrefabs)}] Registered hybrid spawned object: {networkPrefab.Prefab.name}");
-                    m_PendingGhostRegistration.RemoveAt(i);
-                }
-            }
-            HasPendingGhostPrefabs = m_PendingGhostRegistration.Count > 0;
-        }
-#endif
 #endif
 
 
@@ -380,11 +304,6 @@ private bool AddPrefabRegistration(NetworkPrefab networkPrefab)
             if (networkPrefab.HasGhost)
             {
                 HasGhostPrefabs = true;
-
-#if UNIFIED_NGO_REGISTERS_PREFABS
-                HasPendingGhostPrefabs = true;
-                m_PendingGhostRegistration.TryAdd(networkPrefab);
-#endif
             }
 #endif
 

com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs

@@ -421,19 +421,6 @@ public void AddNetworkPrefab(GameObject prefab)
             {
                 m_NetworkManager.DeferredMessageManager.ProcessTriggers(IDeferredNetworkMessageManager.TriggerType.OnAddPrefab, networkObject.GlobalObjectIdHash);
             }
-
-#if UNIFIED_NGO_REGISTERS_PREFABS
-            if (m_NetworkManager.IsListening)
-            {
-                var ghost = prefab.GetComponent<GhostAdapter>();
-                if (ghost)
-                {
-                    m_NetworkManager.InitializeNetcodeWorld();
-                    NetCode.Netcode.RegisterPrefabSingleWorld(prefab, m_NetworkManager.IsHost,
-                        m_NetworkManager.NetcodeWorld);
-                }
-            }
-#endif
         }
 
         /// <summary>