Split up NetworkingManager to NetworkingManagerComponents

Author: TwoTenPvP

MLAPI/Data/NetworkingConfiguration.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Security.Cryptography;
 using UnityEngine.Networking;

MLAPI/MLAPI.csproj

@@ -56,6 +56,8 @@
     <Compile Include="MonoBehaviours\Core\NetworkedObject.cs" />
     <Compile Include="Data\NetworkingConfiguration.cs" />
     <Compile Include="MonoBehaviours\Core\NetworkingManager.cs" />
+    <Compile Include="NetworkingManagerComponents\MessageManager.cs" />
+    <Compile Include="NetworkingManagerComponents\SpawnManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using UnityEngine;
-using System.Linq;
+using MLAPI.NetworkingManagerComponents;
 
 namespace MLAPI
 {
@@ -29,6 +28,13 @@ protected bool isClient
                 return NetworkingManager.singleton.isClient;
             }
         }
+        protected bool isHost
+        {
+            get
+            {
+                return NetworkingManager.singleton.isHost;
+            }
+        }
         protected NetworkedObject networkedObject
         {
             get
@@ -62,14 +68,14 @@ public int ownerClientId
 
         public int RegisterMessageHandler(string name, Action<int, byte[]> action)
         {
-            int counter = NetworkingManager.singleton.AddIncomingMessageHandler(name, action);
+            int counter = MessageManager.AddIncomingMessageHandler(name, action);
             registeredMessageHandlers.Add(name, counter);
             return counter;
         }
 
         public void DeregisterMessageHandler(string name, int counter)
         {
-            NetworkingManager.singleton.RemoveIncomingMessageHandler(name, counter);
+            MessageManager.RemoveIncomingMessageHandler(name, counter);
         }
 
         private void OnDestroy()
@@ -84,7 +90,7 @@ public void SendToServer(string messageType, string channelName, byte[] data)
         {
             if (isServer)
             {
-                NetworkingManager.singleton.InvokeMessageHandlers(messageType, data, -1);
+                MessageManager.InvokeMessageHandlers(messageType, data, -1);
             }
             else
             {
@@ -154,7 +160,7 @@ public void SendToClients(string messageType, string channelName, byte[] data)
 
         public NetworkedObject GetNetworkedObject(uint networkId)
         {
-            return NetworkingManager.singleton.SpawnedObjects[networkId];
+            return SpawnManager.spawnedObjects[networkId];
         }
     }
 }

MLAPI/MonoBehaviours/Core/NetworkedObject.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using MLAPI.NetworkingManagerComponents;
+using UnityEngine;
 
 namespace MLAPI
 {
@@ -31,19 +32,19 @@ public bool IsOwner
 
         private void OnDestroy()
         {
-            NetworkingManager.singleton.OnDestroyObject(NetworkId, false);
+            SpawnManager.OnDestroyObject(NetworkId, false);
         }
 
         internal bool isSpawned = false;
 
         public void Spawn()
         {
-            NetworkingManager.singleton.OnSpawnObject(this);
+            SpawnManager.OnSpawnObject(this);
         }
 
         public void SpawnWithOwnership(int clientId)
         {
-            NetworkingManager.singleton.OnSpawnObject(this, clientId);
+            SpawnManager.OnSpawnObject(this, clientId);
         }
     }
 }