Split the NetworkingManager components to smaller namespaces

TwoTenPvP · TwoTenPvP · commit 679c56a62f58 · 2018-04-01T12:24:54.000+02:00
diff --git a/MLAPI/MLAPI.csproj b/MLAPI/MLAPI.csproj
@@ -73,26 +73,26 @@
     <Compile Include="Data\TrackedPointData.cs" />
     <Compile Include="MonoBehaviours\Prototyping\NetworkedAnimator.cs" />
     <Compile Include="MonoBehaviours\Prototyping\NetworkedNavMeshAgent.cs" />
-    <Compile Include="NetworkingManagerComponents\BinarySerializer.cs" />
-    <Compile Include="NetworkingManagerComponents\CryptographyHelper.cs" />
-    <Compile Include="NetworkingManagerComponents\DiffieHellman.cs" />
-    <Compile Include="NetworkingManagerComponents\EllipticCurve.cs" />
-    <Compile Include="NetworkingManagerComponents\LagCompensationManager.cs" />
+    <Compile Include="NetworkingManagerComponents\Binary\BinarySerializer.cs" />
+    <Compile Include="NetworkingManagerComponents\Cryptography\CryptographyHelper.cs" />
+    <Compile Include="NetworkingManagerComponents\Cryptography\DiffieHellman.cs" />
+    <Compile Include="NetworkingManagerComponents\Cryptography\EllipticCurve.cs" />
+    <Compile Include="NetworkingManagerComponents\Core\LagCompensationManager.cs" />
     <Compile Include="MonoBehaviours\Core\NetworkedBehaviour.cs" />
     <Compile Include="Data\NetworkedClient.cs" />
     <Compile Include="MonoBehaviours\Core\NetworkedObject.cs" />
     <Compile Include="Data\NetworkingConfiguration.cs" />
     <Compile Include="MonoBehaviours\Core\NetworkingManager.cs" />
     <Compile Include="MonoBehaviours\Core\TrackedObject.cs" />
     <Compile Include="MonoBehaviours\Prototyping\NetworkedTransform.cs" />
-    <Compile Include="NetworkingManagerComponents\MessageManager.cs" />
-    <Compile Include="NetworkingManagerComponents\NetworkPoolManager.cs" />
-    <Compile Include="NetworkingManagerComponents\NetworkSceneManager.cs" />
-    <Compile Include="NetworkingManagerComponents\SpawnManager.cs" />
+    <Compile Include="NetworkingManagerComponents\Core\MessageManager.cs" />
+    <Compile Include="NetworkingManagerComponents\Core\NetworkPoolManager.cs" />
+    <Compile Include="NetworkingManagerComponents\Core\NetworkSceneManager.cs" />
+    <Compile Include="NetworkingManagerComponents\Core\SpawnManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="NetworkingManagerComponents\ClientIdManager.cs" />
+    <Compile Include="NetworkingManagerComponents\Core\ClientIdManager.cs" />
     <Compile Include="Data\ClientIdKey.cs" />
-    <Compile Include="NetworkingManagerComponents\MessageChunker.cs" />
+    <Compile Include="NetworkingManagerComponents\Binary\MessageChunker.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs b/MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs
@@ -1,12 +1,13 @@
 ﻿using System;
 using System.Collections.Generic;
 using UnityEngine;
-using MLAPI.NetworkingManagerComponents;
 using System.Reflection;
 using MLAPI.Attributes;
 using System.Linq;
 using System.IO;
 using MLAPI.Data;
+using MLAPI.NetworkingManagerComponents.Binary;
+using MLAPI.NetworkingManagerComponents.Core;
 
 namespace MLAPI.MonoBehaviours.Core
 {
diff --git a/MLAPI/MonoBehaviours/Core/NetworkedObject.cs b/MLAPI/MonoBehaviours/Core/NetworkedObject.cs
@@ -1,4 +1,4 @@
-﻿using MLAPI.NetworkingManagerComponents;
+﻿using MLAPI.NetworkingManagerComponents.Core;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
diff --git a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
@@ -1,5 +1,4 @@
 ﻿using MLAPI.Data;
-using MLAPI.NetworkingManagerComponents;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -8,6 +7,8 @@
 using UnityEngine.Networking;
 using System.Linq;
 using System.Security.Cryptography;
+using MLAPI.NetworkingManagerComponents.Cryptography;
+using MLAPI.NetworkingManagerComponents.Core;
 
 namespace MLAPI.MonoBehaviours.Core
 {
diff --git a/MLAPI/MonoBehaviours/Core/TrackedObject.cs b/MLAPI/MonoBehaviours/Core/TrackedObject.cs
@@ -1,5 +1,5 @@
 ﻿using MLAPI.Data;
-using MLAPI.NetworkingManagerComponents;
+using MLAPI.NetworkingManagerComponents.Core;
 using System.Collections.Generic;
 using UnityEngine;
 
diff --git a/MLAPI/NetworkingManagerComponents/Binary/BinarySerializer.cs b/MLAPI/NetworkingManagerComponents/Binary/BinarySerializer.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using UnityEngine;
 
-namespace MLAPI.NetworkingManagerComponents
+namespace MLAPI.NetworkingManagerComponents.Binary
 {
     /// <summary>
     /// Helper class for serializing classes to binary
diff --git a/MLAPI/NetworkingManagerComponents/Binary/MessageChunker.cs b/MLAPI/NetworkingManagerComponents/Binary/MessageChunker.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 
-namespace MLAPI.NetworkingManagerComponents
+namespace MLAPI.NetworkingManagerComponents.Binary
 {
     /// <summary>
     /// Helper class to chunk messages
diff --git a/MLAPI/NetworkingManagerComponents/Core/ClientIdManager.cs b/MLAPI/NetworkingManagerComponents/Core/ClientIdManager.cs
@@ -1,8 +1,7 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using MLAPI.Data;
 
-namespace MLAPI.NetworkingManagerComponents
+namespace MLAPI.NetworkingManagerComponents.Core
 {
     internal static class ClientIdManager
     {
diff --git a/MLAPI/NetworkingManagerComponents/Core/LagCompensationManager.cs b/MLAPI/NetworkingManagerComponents/Core/LagCompensationManager.cs
@@ -4,7 +4,7 @@
 using UnityEngine;
 using UnityEngine.Networking;
 
-namespace MLAPI.NetworkingManagerComponents
+namespace MLAPI.NetworkingManagerComponents.Core
 {
     /// <summary>
     /// The main class for controlling lag compensation
diff --git a/MLAPI/NetworkingManagerComponents/Core/MessageManager.cs b/MLAPI/NetworkingManagerComponents/Core/MessageManager.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace MLAPI.NetworkingManagerComponents
+namespace MLAPI.NetworkingManagerComponents.Core
 {
     internal static class MessageManager
     {
diff --git a/MLAPI/NetworkingManagerComponents/Core/NetworkPoolManager.cs b/MLAPI/NetworkingManagerComponents/Core/NetworkPoolManager.cs
@@ -4,7 +4,7 @@
 using System.IO;
 using UnityEngine;
 
-namespace MLAPI.NetworkingManagerComponents
+namespace MLAPI.NetworkingManagerComponents.Core
 {
     /// <summary>
     /// Main class for managing network pools
diff --git a/MLAPI/NetworkingManagerComponents/Core/NetworkSceneManager.cs b/MLAPI/NetworkingManagerComponents/Core/NetworkSceneManager.cs
@@ -5,7 +5,7 @@
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
-namespace MLAPI.NetworkingManagerComponents
+namespace MLAPI.NetworkingManagerComponents.Core
 {
     /// <summary>
     /// Main class for managing network scenes
diff --git a/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs b/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using UnityEngine;
 
-namespace MLAPI.NetworkingManagerComponents
+namespace MLAPI.NetworkingManagerComponents.Core
 {
     internal static class SpawnManager
     {
diff --git a/MLAPI/NetworkingManagerComponents/Cryptography/CryptographyHelper.cs b/MLAPI/NetworkingManagerComponents/Cryptography/CryptographyHelper.cs
@@ -2,7 +2,7 @@
 using System.Security.Cryptography;
 using System.IO;
 
-namespace MLAPI.NetworkingManagerComponents
+namespace MLAPI.NetworkingManagerComponents.Cryptography
 {
     /// <summary>
     /// Helper class for encryption purposes
diff --git a/MLAPI/NetworkingManagerComponents/Cryptography/DiffieHellman.cs b/MLAPI/NetworkingManagerComponents/Cryptography/DiffieHellman.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using System.Security.Cryptography;
 
-namespace MLAPI.NetworkingManagerComponents
+namespace MLAPI.NetworkingManagerComponents.Cryptography
 {
     internal class EllipticDiffieHellman
     {
diff --git a/MLAPI/NetworkingManagerComponents/Cryptography/EllipticCurve.cs b/MLAPI/NetworkingManagerComponents/Cryptography/EllipticCurve.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using IntXLib;
 
-namespace MLAPI.NetworkingManagerComponents
+namespace MLAPI.NetworkingManagerComponents.Cryptography
 {
     internal class CurvePoint
     {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using MLAPI.NetworkingManagerComponents;`
	`1`	`+using MLAPI.NetworkingManagerComponents.Core;`
`2`	`2`	`using System;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using UnityEngine;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using System.Text;`
`7`	`7`	`using UnityEngine;`
`8`	`8`
`9`		`-namespace MLAPI.NetworkingManagerComponents`
	`9`	`+namespace MLAPI.NetworkingManagerComponents.Binary`
`10`	`10`	`{`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// Helper class for serializing classes to binary`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`
`4`		`-namespace MLAPI.NetworkingManagerComponents`
	`4`	`+namespace MLAPI.NetworkingManagerComponents.Binary`
`5`	`5`	`{`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// Helper class to chunk messages`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
	`1`	`+using System.Collections.Generic;`
`3`	`2`	`using MLAPI.Data;`
`4`	`3`
`5`		`-namespace MLAPI.NetworkingManagerComponents`
	`4`	`+namespace MLAPI.NetworkingManagerComponents.Core`
`6`	`5`	`{`
`7`	`6`	`internal static class ClientIdManager`
`8`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using UnityEngine;`
`5`	`5`	`using UnityEngine.Networking;`
`6`	`6`
`7`		`-namespace MLAPI.NetworkingManagerComponents`
	`7`	`+namespace MLAPI.NetworkingManagerComponents.Core`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// The main class for controlling lag compensation`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using UnityEngine;`
`5`	`5`
`6`		`-namespace MLAPI.NetworkingManagerComponents`
	`6`	`+namespace MLAPI.NetworkingManagerComponents.Core`
`7`	`7`	`{`
`8`	`8`	`internal static class MessageManager`
`9`	`9`	`{`