Added per NetworkedVar channel

Author: TwoTenPvP

MLAPI/Data/NetworkedCollections/NetworkedDictionary.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using MLAPI.MonoBehaviours.Core;
 using MLAPI.NetworkingManagerComponents.Binary;
+using MLAPI.NetworkingManagerComponents.Core;
 
 namespace MLAPI.Data.NetworkedCollections
 {
@@ -34,6 +35,11 @@ public void ResetDirty()
             dirtyEvents.Clear();
         }
 
+        public string GetChannel()
+        {
+            return Settings.SendChannel;
+        }
+
         public void SetDeltaFromReader(BitReader reader)
         {
             ushort deltaCount = reader.ReadUShort();

MLAPI/Data/NetworkedCollections/NetworkedList.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using MLAPI.MonoBehaviours.Core;
 using MLAPI.NetworkingManagerComponents.Binary;
+using MLAPI.NetworkingManagerComponents.Core;
 
 namespace MLAPI.Data.NetworkedCollections
 {
@@ -39,6 +40,11 @@ public bool IsDirty()
             return dirtyEvents.Count > 0;
         }
 
+        public string GetChannel()
+        {
+            return Settings.SendChannel;
+        }
+
         public bool CanClientWrite(uint clientId)
         {
             switch (Settings.WritePermission)

MLAPI/Data/NetworkedVar.cs

@@ -1,5 +1,6 @@
 using MLAPI.NetworkingManagerComponents.Binary;
 using MLAPI.MonoBehaviours.Core;
+using MLAPI.NetworkingManagerComponents.Core;
 
 namespace MLAPI.Data
 {
@@ -106,10 +107,16 @@ public void WriteFieldToWriter(BitWriter writer)
         {
             //TODO: Write field
         }
+
+        public string GetChannel()
+        {
+            return Settings.SendChannel;
+        }
     }
 
     public interface INetworkedVar
     {
+        string GetChannel();
         void ResetDirty();
         bool IsDirty();
         bool CanClientWrite(uint clientId);

MLAPI/Data/NetworkedVarMeta.cs

@@ -1,4 +1,6 @@
-namespace MLAPI.Data
+using MLAPI.Data.Transports;
+
+namespace MLAPI.Data
 {
     public class NetworkedVarSettings
     {
@@ -8,8 +10,9 @@ public class NetworkedVarSettings
         public NetworkedVarPermissionsDelegate ReadPermissionCallback = null;
         public bool SendOnChange = false;
         public float SendDelay = 0.1f;
+        public string SendChannel = "MLAPI_INTERNAL";
 
-        internal NetworkedVarSettings()
+        public NetworkedVarSettings()
         {
 
         }
@@ -24,4 +27,4 @@ public enum NetworkedVarPermission
         OwnerOnly,
         Custom
     }
-}
+}

MLAPI/Data/NonAllocExtensions.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace MLAPI.Data
+{
+    class NonAllocExtensions
+    {
+    }
+}

MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs

@@ -928,6 +928,8 @@ private bool SetDirtyness()
         #region NetworkedVar
 
         private bool networkedVarInit = false;
+        private readonly List<HashSet<int>> channelMappedVarIndexes = new List<HashSet<int>>();
+        private readonly List<string> channelsForVarGroups = new List<string>();
         internal readonly List<INetworkedVar> networkedVarFields = new List<INetworkedVar>();
         internal void NetworkedVarInit()
         {
@@ -956,34 +958,62 @@ internal void NetworkedVarInit()
                     networkedVarFields.Add(instance);
                 }
             }
+
+            //Create index map for channels
+            Dictionary<string, int> firstLevelIndex = new Dictionary<string, int>();
+            int secondLevelCounter = 0;
+            for (int i = 0; i < networkedVarFields.Count; i++)
+            {
+                string channel = networkedVarFields[i].GetChannel(); //Cache this here. Some developers are stupid. You don't know what shit they will do in their methods
+                if (!firstLevelIndex.ContainsKey(channel))
+                {
+                    firstLevelIndex.Add(channel, secondLevelCounter);
+                    channelsForVarGroups.Add(channel);
+                    secondLevelCounter++;
+                }
+                channelMappedVarIndexes[firstLevelIndex[channel]].Add(i);
+            }
         }
 
         internal void NetworkedVarUpdate()
         {
+            if (!networkedVarInit)
+                NetworkedVarInit();
             //TODO: Do this efficiently.
 
             for (int i = 0; i < NetworkingManager.singleton.ConnectedClientsList.Count; i++)
             {
-                using (BitWriter writer = BitWriter.Get())
+                //This iterates over every "channel group".
+                for (int j = 0; j < channelMappedVarIndexes.Count; j++)
                 {
-                    writer.WriteUInt(networkId);
-                    writer.WriteUShort(networkedObject.GetOrderIndex(this));
-
-                    uint clientId = NetworkingManager.singleton.ConnectedClientsList[i].ClientId;
-                    for (int j = 0; j < networkedVarFields.Count; j++)
+                    using (BitWriter writer = BitWriter.Get())
                     {
-                        bool isDirty = networkedVarFields[j].IsDirty(); //cache this here. You never know what operations users will do in the dirty methods
-                        writer.WriteBool(isDirty);
-                        if (isDirty && (!isServer || networkedVarFields[j].CanClientRead(clientId)))
+                        writer.WriteUInt(networkId);
+                        writer.WriteUShort(networkedObject.GetOrderIndex(this));
+
+                        uint clientId = NetworkingManager.singleton.ConnectedClientsList[i].ClientId;
+                        for (int k = 0; k < networkedVarFields.Count; k++)
                         {
-                            networkedVarFields[j].WriteDeltaToWriter(writer);
+                            if (!channelMappedVarIndexes[j].Contains(k))
+                            {
+                                //This var does not belong to the currently iterating channel group.
+                                writer.WriteBool(false);
+                                continue;
+                            }
+
+                            bool isDirty = networkedVarFields[k].IsDirty(); //cache this here. You never know what operations users will do in the dirty methods
+                            writer.WriteBool(isDirty);
+                            if (isDirty && (!isServer || networkedVarFields[k].CanClientRead(clientId)))
+                            {
+                                networkedVarFields[k].WriteDeltaToWriter(writer);
+                            }
                         }
-                    }
 
-                    if (isServer)
-                        InternalMessageHandler.Send(clientId, "MLAPI_NETWORKED_VAR_DELTA", "MLAPI_INTERNAL", writer, null);
-                    else
-                        InternalMessageHandler.Send(NetworkingManager.singleton.NetworkConfig.NetworkTransport.ServerNetId, "MLAPI_NETWORKED_VAR_DELTA", "MLAPI_INTERNAL", writer, null);
+                        if (isServer)
+                            InternalMessageHandler.Send(clientId, "MLAPI_NETWORKED_VAR_DELTA", channelsForVarGroups[j], writer, null);
+                        else
+                            InternalMessageHandler.Send(NetworkingManager.singleton.NetworkConfig.NetworkTransport.ServerNetId, "MLAPI_NETWORKED_VAR_DELTA", channelsForVarGroups[j], writer, null);
+                    }
                 }
             }