Renamed internal MLAPI channel

TwoTenPvP · TwoTenPvP · commit ae0f5233daff · 2018-03-09T10:41:58.000+01:00
diff --git a/MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs b/MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs
@@ -333,7 +333,7 @@ internal void FlushToClient(int clientId)
                         }
                     }
                 }
-                NetworkingManager.singleton.Send(clientId, "MLAPI_SYNC_VAR_UPDATE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.ToArray());
+                NetworkingManager.singleton.Send(clientId, "MLAPI_SYNC_VAR_UPDATE", "MLAPI_INTERNAL", stream.ToArray());
             }
         }
 
@@ -426,7 +426,7 @@ internal void SyncVarUpdate()
                             }
                         }
                     }
-                    NetworkingManager.singleton.Send("MLAPI_SYNC_VAR_UPDATE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.ToArray());
+                    NetworkingManager.singleton.Send("MLAPI_SYNC_VAR_UPDATE", "MLAPI_INTERNAL", stream.ToArray());
                 }
                 lastSyncTime = Time.time;
             }
diff --git a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
@@ -108,7 +108,7 @@ private ConnectionConfig Init(NetworkingConfiguration netConfig)
             ConnectionConfig cConfig = new ConnectionConfig();
 
             //MLAPI channels and messageTypes
-            NetworkConfig.Channels.Add("MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", QosType.ReliableFragmentedSequenced);
+            NetworkConfig.Channels.Add("MLAPI_INTERNAL", QosType.ReliableFragmentedSequenced);
             NetworkConfig.Channels.Add("MLAPI_POSITION_UPDATE", QosType.StateUpdate);
             NetworkConfig.Channels.Add("MLAPI_ANIMATION_UPDATE", QosType.ReliableSequenced);
             MessageManager.messageTypes.Add("MLAPI_CONNECTION_REQUEST", 0);
@@ -356,7 +356,7 @@ private void Update()
                                                 writer.Write(NetworkConfig.ConnectionData);
                                             }
                                         }
-                                        Send(clientId, "MLAPI_CONNECTION_REQUEST", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", writeStream.GetBuffer());
+                                        Send(clientId, "MLAPI_CONNECTION_REQUEST", "MLAPI_INTERNAL", writeStream.GetBuffer());
                                     }
                                 }
                                 break;
@@ -1087,7 +1087,7 @@ private void OnClientDisconnect(int clientId)
                     {
                         writer.Write(clientId);
                     }
-                    Send("MLAPI_CLIENT_DISCONNECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer(), clientId);
+                    Send("MLAPI_CLIENT_DISCONNECT", "MLAPI_INTERNAL", stream.GetBuffer(), clientId);
                 }   
             }
         }
@@ -1166,7 +1166,7 @@ private void HandleApproval(int clientId, bool approved)
                             }
                         }
                     }
-                    Send(clientId, "MLAPI_CONNECTION_APPROVED", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", writeStream.GetBuffer());
+                    Send(clientId, "MLAPI_CONNECTION_APPROVED", "MLAPI_INTERNAL", writeStream.GetBuffer());
                 }
 
                 //Inform old clients of the new player
@@ -1192,7 +1192,7 @@ private void HandleApproval(int clientId, bool approved)
                             writer.Write(clientId);
                         }
                     }
-                    Send("MLAPI_ADD_OBJECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer(), clientId);
+                    Send("MLAPI_ADD_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer(), clientId);
                 }
                 //Flush syncvars:
                 foreach (KeyValuePair<uint, NetworkedObject> networkedObject in SpawnManager.spawnedObjects)
diff --git a/MLAPI/NetworkingManagerComponents/NetworkPoolManager.cs b/MLAPI/NetworkingManagerComponents/NetworkPoolManager.cs
@@ -58,7 +58,7 @@ public static GameObject SpawnPoolObject(string poolName, Vector3 position, Quat
                     writer.Write(rotation.eulerAngles.y);
                     writer.Write(rotation.eulerAngles.z);
                 }
-                NetworkingManager.singleton.Send("MLAPI_SPAWN_POOL_OBJECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());
+                NetworkingManager.singleton.Send("MLAPI_SPAWN_POOL_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer());
             }
             return go;
         }
@@ -77,7 +77,7 @@ public static void DestroyPoolObject(NetworkedObject netObject)
                 {
                     writer.Write(netObject.NetworkId);
                 }
-                NetworkingManager.singleton.Send("MLAPI_DESTROY_POOL_OBJECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());
+                NetworkingManager.singleton.Send("MLAPI_DESTROY_POOL_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer());
             }
         }
     }
diff --git a/MLAPI/NetworkingManagerComponents/NetworkSceneManager.cs b/MLAPI/NetworkingManagerComponents/NetworkSceneManager.cs
@@ -55,7 +55,7 @@ public static void SwitchScene(string sceneName)
                 {
                     writer.Write(sceneNameToIndex[sceneName]);
                 }
-                NetworkingManager.singleton.Send("MLAPI_SWITCH_SCENE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());
+                NetworkingManager.singleton.Send("MLAPI_SWITCH_SCENE", "MLAPI_INTERNAL", stream.GetBuffer());
             }
         }
 
diff --git a/MLAPI/NetworkingManagerComponents/SpawnManager.cs b/MLAPI/NetworkingManagerComponents/SpawnManager.cs
@@ -42,7 +42,7 @@ internal static void RemoveOwnership(uint netId)
                     writer.Write(netId);
                     writer.Write(-2);
                 }
-                netManager.Send("MLAPI_CHANGE_OWNER", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());
+                netManager.Send("MLAPI_CHANGE_OWNER", "MLAPI_INTERNAL", stream.GetBuffer());
             }
         }
 
@@ -59,7 +59,7 @@ internal static void ChangeOwnership(uint netId, int clientId)
                     writer.Write(netId);
                     writer.Write(clientId);
                 }
-                netManager.Send("MLAPI_CHANGE_OWNER", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());
+                netManager.Send("MLAPI_CHANGE_OWNER", "MLAPI_INTERNAL", stream.GetBuffer());
             }
         }
 
@@ -136,9 +136,9 @@ internal static void OnDestroyObject(uint networkId, bool destroyGameObject)
                         }
                         //If we are host, send to everyone except ourselves. Otherwise, send to all
                         if (netManager != null && netManager.isHost)
-                            netManager.Send("MLAPI_DESTROY_OBJECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer(), -1);
+                            netManager.Send("MLAPI_DESTROY_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer(), -1);
                         else
-                            netManager.Send("MLAPI_DESTROY_OBJECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());
+                            netManager.Send("MLAPI_DESTROY_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer());
                     }
                 }
             }
@@ -193,9 +193,9 @@ internal static void OnSpawnObject(NetworkedObject netObject, int? clientOwnerId
                 }
                 //If we are host, send to everyone except ourselves. Otherwise, send to all
                 if (netManager.isHost)
-                    netManager.Send("MLAPI_ADD_OBJECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer(), -1);
+                    netManager.Send("MLAPI_ADD_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer(), -1);
                 else
-                    netManager.Send("MLAPI_ADD_OBJECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());
+                    netManager.Send("MLAPI_ADD_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer());
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ internal void FlushToClient(int clientId)`
`333`	`333`	`}`
`334`	`334`	`}`
`335`	`335`	`}`
`336`		`- NetworkingManager.singleton.Send(clientId, "MLAPI_SYNC_VAR_UPDATE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.ToArray());`
	`336`	`+ NetworkingManager.singleton.Send(clientId, "MLAPI_SYNC_VAR_UPDATE", "MLAPI_INTERNAL", stream.ToArray());`
`337`	`337`	`}`
`338`	`338`	`}`
`339`	`339`
`@@ -426,7 +426,7 @@ internal void SyncVarUpdate()`
`426`	`426`	`}`
`427`	`427`	`}`
`428`	`428`	`}`
`429`		`- NetworkingManager.singleton.Send("MLAPI_SYNC_VAR_UPDATE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.ToArray());`
	`429`	`+ NetworkingManager.singleton.Send("MLAPI_SYNC_VAR_UPDATE", "MLAPI_INTERNAL", stream.ToArray());`
`430`	`430`	`}`
`431`	`431`	`lastSyncTime = Time.time;`
`432`	`432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ private ConnectionConfig Init(NetworkingConfiguration netConfig)`
`108`	`108`	`ConnectionConfig cConfig = new ConnectionConfig();`
`109`	`109`
`110`	`110`	`//MLAPI channels and messageTypes`
`111`		`- NetworkConfig.Channels.Add("MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", QosType.ReliableFragmentedSequenced);`
	`111`	`+ NetworkConfig.Channels.Add("MLAPI_INTERNAL", QosType.ReliableFragmentedSequenced);`
`112`	`112`	`NetworkConfig.Channels.Add("MLAPI_POSITION_UPDATE", QosType.StateUpdate);`
`113`	`113`	`NetworkConfig.Channels.Add("MLAPI_ANIMATION_UPDATE", QosType.ReliableSequenced);`
`114`	`114`	`MessageManager.messageTypes.Add("MLAPI_CONNECTION_REQUEST", 0);`
`@@ -356,7 +356,7 @@ private void Update()`
`356`	`356`	`writer.Write(NetworkConfig.ConnectionData);`
`357`	`357`	`}`
`358`	`358`	`}`
`359`		`- Send(clientId, "MLAPI_CONNECTION_REQUEST", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", writeStream.GetBuffer());`
	`359`	`+ Send(clientId, "MLAPI_CONNECTION_REQUEST", "MLAPI_INTERNAL", writeStream.GetBuffer());`
`360`	`360`	`}`
`361`	`361`	`}`
`362`	`362`	`break;`
`@@ -1087,7 +1087,7 @@ private void OnClientDisconnect(int clientId)`
`1087`	`1087`	`{`
`1088`	`1088`	`writer.Write(clientId);`
`1089`	`1089`	`}`
`1090`		`- Send("MLAPI_CLIENT_DISCONNECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer(), clientId);`
	`1090`	`+ Send("MLAPI_CLIENT_DISCONNECT", "MLAPI_INTERNAL", stream.GetBuffer(), clientId);`
`1091`	`1091`	`}`
`1092`	`1092`	`}`
`1093`	`1093`	`}`
`@@ -1166,7 +1166,7 @@ private void HandleApproval(int clientId, bool approved)`
`1166`	`1166`	`}`
`1167`	`1167`	`}`
`1168`	`1168`	`}`
`1169`		`- Send(clientId, "MLAPI_CONNECTION_APPROVED", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", writeStream.GetBuffer());`
	`1169`	`+ Send(clientId, "MLAPI_CONNECTION_APPROVED", "MLAPI_INTERNAL", writeStream.GetBuffer());`
`1170`	`1170`	`}`
`1171`	`1171`
`1172`	`1172`	`//Inform old clients of the new player`
`@@ -1192,7 +1192,7 @@ private void HandleApproval(int clientId, bool approved)`
`1192`	`1192`	`writer.Write(clientId);`
`1193`	`1193`	`}`
`1194`	`1194`	`}`
`1195`		`- Send("MLAPI_ADD_OBJECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer(), clientId);`
	`1195`	`+ Send("MLAPI_ADD_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer(), clientId);`
`1196`	`1196`	`}`
`1197`	`1197`	`//Flush syncvars:`
`1198`	`1198`	`foreach (KeyValuePair<uint, NetworkedObject> networkedObject in SpawnManager.spawnedObjects)`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public static GameObject SpawnPoolObject(string poolName, Vector3 position, Quat`
`58`	`58`	`writer.Write(rotation.eulerAngles.y);`
`59`	`59`	`writer.Write(rotation.eulerAngles.z);`
`60`	`60`	`}`
`61`		`- NetworkingManager.singleton.Send("MLAPI_SPAWN_POOL_OBJECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());`
	`61`	`+ NetworkingManager.singleton.Send("MLAPI_SPAWN_POOL_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer());`
`62`	`62`	`}`
`63`	`63`	`return go;`
`64`	`64`	`}`
`@@ -77,7 +77,7 @@ public static void DestroyPoolObject(NetworkedObject netObject)`
`77`	`77`	`{`
`78`	`78`	`writer.Write(netObject.NetworkId);`
`79`	`79`	`}`
`80`		`- NetworkingManager.singleton.Send("MLAPI_DESTROY_POOL_OBJECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());`
	`80`	`+ NetworkingManager.singleton.Send("MLAPI_DESTROY_POOL_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer());`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public static void SwitchScene(string sceneName)`
`55`	`55`	`{`
`56`	`56`	`writer.Write(sceneNameToIndex[sceneName]);`
`57`	`57`	`}`
`58`		`- NetworkingManager.singleton.Send("MLAPI_SWITCH_SCENE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());`
	`58`	`+ NetworkingManager.singleton.Send("MLAPI_SWITCH_SCENE", "MLAPI_INTERNAL", stream.GetBuffer());`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ internal static void RemoveOwnership(uint netId)`
`42`	`42`	`writer.Write(netId);`
`43`	`43`	`writer.Write(-2);`
`44`	`44`	`}`
`45`		`- netManager.Send("MLAPI_CHANGE_OWNER", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());`
	`45`	`+ netManager.Send("MLAPI_CHANGE_OWNER", "MLAPI_INTERNAL", stream.GetBuffer());`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`@@ -59,7 +59,7 @@ internal static void ChangeOwnership(uint netId, int clientId)`
`59`	`59`	`writer.Write(netId);`
`60`	`60`	`writer.Write(clientId);`
`61`	`61`	`}`
`62`		`- netManager.Send("MLAPI_CHANGE_OWNER", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());`
	`62`	`+ netManager.Send("MLAPI_CHANGE_OWNER", "MLAPI_INTERNAL", stream.GetBuffer());`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`@@ -136,9 +136,9 @@ internal static void OnDestroyObject(uint networkId, bool destroyGameObject)`
`136`	`136`	`}`
`137`	`137`	`//If we are host, send to everyone except ourselves. Otherwise, send to all`
`138`	`138`	`if (netManager != null && netManager.isHost)`
`139`		`- netManager.Send("MLAPI_DESTROY_OBJECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer(), -1);`
	`139`	`+ netManager.Send("MLAPI_DESTROY_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer(), -1);`
`140`	`140`	`else`
`141`		`- netManager.Send("MLAPI_DESTROY_OBJECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());`
	`141`	`+ netManager.Send("MLAPI_DESTROY_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer());`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`}`
`@@ -193,9 +193,9 @@ internal static void OnSpawnObject(NetworkedObject netObject, int? clientOwnerId`
`193`	`193`	`}`
`194`	`194`	`//If we are host, send to everyone except ourselves. Otherwise, send to all`
`195`	`195`	`if (netManager.isHost)`
`196`		`- netManager.Send("MLAPI_ADD_OBJECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer(), -1);`
	`196`	`+ netManager.Send("MLAPI_ADD_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer(), -1);`
`197`	`197`	`else`
`198`		`- netManager.Send("MLAPI_ADD_OBJECT", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());`
	`198`	`+ netManager.Send("MLAPI_ADD_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer());`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`	`}`