Reworked Object spawning system

Author: TwoTenPvP

MLAPI/Data/NetworkConfig.cs

@@ -50,11 +50,13 @@ public class NetworkConfig
         /// <summary>
         /// A list of spawnable prefabs
         /// </summary>
-        public List<GameObject> SpawnablePrefabs = new List<GameObject>();
+        public List<NetworkedPrefab> NetworkedPrefabs = new List<NetworkedPrefab>();
+        internal Dictionary<string, int> NetworkPrefabIds;
+        internal Dictionary<int, string> NetworkPrefabNames;
         /// <summary>
         /// The default player prefab
         /// </summary>
-        public GameObject PlayerPrefab;
+        public string PlayerPrefabName;
         /// <summary>
         /// The size of the receive message buffer. This is the max message size.
         /// </summary>
@@ -132,7 +134,7 @@ public class NetworkConfig
         /// <summary>
         /// Wheter or not to enable scene switching
         /// </summary>
-        public bool EnableSceneSwitching = false;
+        public bool EnableSceneSwitching = true;
 
         private byte[] ConfigHash = null;
         /// <summary>
@@ -172,7 +174,10 @@ public byte[] GetConfig(bool cache = true)
                     }
                     if(HandleObjectSpawning)
                     {
-                        writer.Write(SpawnablePrefabs.Count);
+                        for (int i = 0; i < NetworkedPrefabs.Count; i++)
+                        {
+                            writer.Write(NetworkedPrefabs[i].name);
+                        }
                     }
                     writer.Write(HandleObjectSpawning);
                     writer.Write(EnableEncryption);

MLAPI/Data/NetworkPool.cs

@@ -8,13 +8,13 @@ internal class NetworkPool
         internal GameObject[] objects;
         internal ushort poolId;
 
-        internal NetworkPool(int prefabIndex, uint size, ushort poolIndex)
+        internal NetworkPool(int prefabId, uint size, ushort poolIndex)
         {
             objects = new GameObject[size];
             poolId = poolIndex;
             for (int i = 0; i < size; i++)
             {
-                GameObject go = Object.Instantiate(NetworkingManager.singleton.NetworkConfig.SpawnablePrefabs[prefabIndex], Vector3.zero, Quaternion.identity);
+                GameObject go = MonoBehaviour.Instantiate(NetworkingManager.singleton.NetworkConfig.NetworkedPrefabs[prefabId].prefab, Vector3.zero, Quaternion.identity);
                 go.GetComponent<NetworkedObject>()._isPooledObject = true;
                 go.GetComponent<NetworkedObject>().poolId = poolId;
                 go.GetComponent<NetworkedObject>().Spawn();

MLAPI/Data/NetworkedPrefab.cs

@@ -0,0 +1,12 @@
+using System;
+using UnityEngine;
+
+namespace MLAPI.Data
+{
+    [Serializable]
+    public class NetworkedPrefab
+    {
+        public string name;
+        public GameObject prefab;
+    }
+}

MLAPI/MLAPI.csproj

@@ -71,6 +71,7 @@
     <Compile Include="Data\FieldType.cs" />
     <Compile Include="Attributes\SyncedVar.cs" />
     <Compile Include="Data\NetworkConfig.cs" />
+    <Compile Include="Data\NetworkedPrefab.cs" />
     <Compile Include="Data\NetworkPool.cs" />
     <Compile Include="Data\TrackedPointData.cs" />
     <Compile Include="Data\TransportHost.cs" />

MLAPI/MonoBehaviours/Core/NetworkedObject.cs

@@ -12,6 +12,15 @@ namespace MLAPI.MonoBehaviours.Core
     [AddComponentMenu("MLAPI/NetworkedObject", -99)]
     public sealed class NetworkedObject : MonoBehaviour
     {
+        private void OnValidate()
+        {
+            if(string.IsNullOrEmpty(NetworkedPrefabName))
+            {
+                Debug.LogWarning("MLAPI: The networked object " + gameObject.name + " has not been assigned a networkedPrefabName. Setting it to " + gameObject.name);
+                NetworkedPrefabName = gameObject.name;
+            }
+        }
+
         /// <summary>
         /// Gets the unique ID of this object that is synced across the network
         /// </summary>
@@ -35,16 +44,9 @@ public uint OwnerClientId
         }
         internal uint ownerClientId = new NetId(0, 0, false, true).GetClientId();
         /// <summary>
-        /// The index of the prefab used to spawn this in the spawnablePrefabs list
+        /// The name of the NetworkedPrefab
         /// </summary>
-        public int SpawnablePrefabIndex
-        {
-            get
-            {
-                return spawnablePrefabIndex;
-            }
-        }
-        internal int spawnablePrefabIndex;
+        public string NetworkedPrefabName = string.Empty;
         /// <summary>
         /// Gets if this object is a player object
         /// </summary>
@@ -57,11 +59,6 @@ public bool isPlayerObject
         }
         internal bool _isPlayerObject = false;
         /// <summary>
-        /// Gets or sets if this object should be replicated across the network. Can only be changed before the object is spawned
-        /// </summary>
-        [SerializeField]
-        public bool ServerOnly = false;
-        /// <summary>
         /// Gets if this object is part of a pool
         /// </summary>
         public bool isPooledObject
@@ -115,7 +112,7 @@ public bool isSpawned
             }
         }
         internal bool _isSpawned = false;
-        internal bool sceneObject = false;
+        internal bool? sceneObject = null;
 
         private void OnDestroy()
         {
@@ -129,7 +126,7 @@ private void OnDestroy()
         public void Spawn()
         {
             if (NetworkingManager.singleton != null)
-                SpawnManager.OnSpawnObject(this);
+                SpawnManager.SpawnPrefabIndexServer(this);
         }
         /// <summary>
         /// Spawns an object across the network with a given owner. Can only be called from server
@@ -138,7 +135,7 @@ public void Spawn()
         public void SpawnWithOwnership(uint clientId)
         {
             if (NetworkingManager.singleton != null)
-                SpawnManager.OnSpawnObject(this, clientId);
+                SpawnManager.SpawnPrefabIndexServer(this, clientId);
         }
         /// <summary>
         /// Removes all ownership of an object from any client. Can only be called from server