Skip to content

Commit 89e666d

Browse files
TwoTenPvPTwoTenPvP
committed
Moved send and message handle methods to own class
1 parent f805714 commit 89e666d

File tree

9 files changed

+851
-747
lines changed

9 files changed

+851
-747
lines changed

‎MLAPI/MLAPI.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@
9797
<Compile Include="Data\NetId.cs" />
9898
<Compile Include="NetworkingManagerComponents\Binary\MessageChunker.cs" />
9999
<Compile Include="Data\MessageType.cs" />
100+
<Compile Include="NetworkingManagerComponents\Core\InternalMessageHandler.Send.cs" />
101+
<Compile Include="NetworkingManagerComponents\Core\InternalMessageHandler.Receive.cs" />
102+
<Compile Include="NetworkingManagerComponents\Core\InternalMessageHandler.cs" />
100103
</ItemGroup>
101104
<ItemGroup>
102105
<None Include="packages.config" />

‎MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ internal void FlushToClient(uint clientId)
450450
}
451451
}
452452
}
453-
NetworkingManager.singleton.Send(clientId, "MLAPI_SYNC_VAR_UPDATE", "MLAPI_INTERNAL", stream.ToArray());
453+
InternalMessageHandler.Send(clientId, "MLAPI_SYNC_VAR_UPDATE", "MLAPI_INTERNAL", stream.ToArray());
454454
}
455455
}
456456

@@ -555,7 +555,7 @@ internal void SyncVarUpdate()
555555
}
556556
}
557557
}
558-
NetworkingManager.singleton.Send("MLAPI_SYNC_VAR_UPDATE", "MLAPI_INTERNAL", stream.ToArray());
558+
InternalMessageHandler.Send("MLAPI_SYNC_VAR_UPDATE", "MLAPI_INTERNAL", stream.ToArray());
559559
}
560560
lastSyncTime = NetworkingManager.singleton.NetworkTime;
561561
}
@@ -695,7 +695,7 @@ protected void SendToServer(string messageType, string channelName, byte[] data)
695695
Debug.LogWarning("MLAPI: Server can not send messages to server.");
696696
return;
697697
}
698-
NetworkingManager.singleton.Send(NetId.ServerNetId.GetClientId(), messageType, channelName, data);
698+
InternalMessageHandler.Send(NetId.ServerNetId.GetClientId(), messageType, channelName, data);
699699
}
700700

701701
/// <summary>
@@ -728,7 +728,7 @@ protected void SendToServerTarget(string messageType, string channelName, byte[]
728728
Debug.LogWarning("MLAPI: Server can not send messages to server.");
729729
return;
730730
}
731-
NetworkingManager.singleton.Send(NetId.ServerNetId.GetClientId(), messageType, channelName, data, networkId, networkedObject.GetOrderIndex(this));
731+
InternalMessageHandler.Send(NetId.ServerNetId.GetClientId(), messageType, channelName, data, networkId, networkedObject.GetOrderIndex(this));
732732
}
733733

734734
/// <summary>
@@ -761,7 +761,7 @@ protected void SendToLocalClient(string messageType, string channelName, byte[]
761761
Debug.LogWarning("MLAPI: Invalid Passthrough send. Ensure AllowPassthroughMessages are turned on and that the MessageType " + messageType + " is registered as a passthroughMessageType");
762762
return;
763763
}
764-
NetworkingManager.singleton.Send(ownerClientId, messageType, channelName, data);
764+
InternalMessageHandler.Send(ownerClientId, messageType, channelName, data);
765765
}
766766

767767
/// <summary>
@@ -794,7 +794,7 @@ protected void SendToLocalClientTarget(string messageType, string channelName, b
794794
Debug.LogWarning("MLAPI: Invalid Passthrough send. Ensure AllowPassthroughMessages are turned on and that the MessageType " + messageType + " is registered as a passthroughMessageType");
795795
return;
796796
}
797-
NetworkingManager.singleton.Send(ownerClientId, messageType, channelName, data, networkId, networkedObject.GetOrderIndex(this));
797+
InternalMessageHandler.Send(ownerClientId, messageType, channelName, data, networkId, networkedObject.GetOrderIndex(this));
798798
}
799799

800800
/// <summary>
@@ -827,7 +827,7 @@ protected void SendToNonLocalClients(string messageType, string channelName, byt
827827
Debug.LogWarning("MLAPI: Sending messages from client to other clients is not yet supported");
828828
return;
829829
}
830-
NetworkingManager.singleton.Send(messageType, channelName, data, ownerClientId);
830+
InternalMessageHandler.Send(messageType, channelName, data, ownerClientId);
831831
}
832832

833833
/// <summary>
@@ -860,7 +860,7 @@ protected void SendToNonLocalClientsTarget(string messageType, string channelNam
860860
Debug.LogWarning("MLAPI: Sending messages from client to other clients is not yet supported");
861861
return;
862862
}
863-
NetworkingManager.singleton.Send(messageType, channelName, data, ownerClientId, networkId, networkedObject.GetOrderIndex(this));
863+
InternalMessageHandler.Send(messageType, channelName, data, ownerClientId, networkId, networkedObject.GetOrderIndex(this));
864864
}
865865

866866
/// <summary>
@@ -894,7 +894,7 @@ protected void SendToClient(uint clientId, string messageType, string channelNam
894894
Debug.LogWarning("MLAPI: Invalid Passthrough send. Ensure AllowPassthroughMessages are turned on and that the MessageType " + messageType + " is registered as a passthroughMessageType");
895895
return;
896896
}
897-
NetworkingManager.singleton.Send(clientId, messageType, channelName, data);
897+
InternalMessageHandler.Send(clientId, messageType, channelName, data);
898898
}
899899

900900
/// <summary>
@@ -929,7 +929,7 @@ protected void SendToClientTarget(uint clientId, string messageType, string chan
929929
Debug.LogWarning("MLAPI: Invalid Passthrough send. Ensure AllowPassthroughMessages are turned on and that the MessageType " + messageType + " is registered as a passthroughMessageType");
930930
return;
931931
}
932-
NetworkingManager.singleton.Send(clientId, messageType, channelName, data, networkId, networkedObject.GetOrderIndex(this));
932+
InternalMessageHandler.Send(clientId, messageType, channelName, data, networkId, networkedObject.GetOrderIndex(this));
933933
}
934934

935935
/// <summary>
@@ -964,7 +964,7 @@ protected void SendToClients(uint[] clientIds, string messageType, string channe
964964
Debug.LogWarning("MLAPI: Sending messages from client to other clients is not yet supported");
965965
return;
966966
}
967-
NetworkingManager.singleton.Send(clientIds, messageType, channelName, data);
967+
InternalMessageHandler.Send(clientIds, messageType, channelName, data);
968968
}
969969

970970
/// <summary>
@@ -999,7 +999,7 @@ protected void SendToClientsTarget(uint[] clientIds, string messageType, string
999999
Debug.LogWarning("MLAPI: Sending messages from client to other clients is not yet supported");
10001000
return;
10011001
}
1002-
NetworkingManager.singleton.Send(clientIds, messageType, channelName, data, networkId, networkedObject.GetOrderIndex(this));
1002+
InternalMessageHandler.Send(clientIds, messageType, channelName, data, networkId, networkedObject.GetOrderIndex(this));
10031003
}
10041004

10051005
/// <summary>
@@ -1034,7 +1034,7 @@ protected void SendToClients(List<uint> clientIds, string messageType, string ch
10341034
Debug.LogWarning("MLAPI: Sending messages from client to other clients is not yet supported");
10351035
return;
10361036
}
1037-
NetworkingManager.singleton.Send(clientIds, messageType, channelName, data);
1037+
InternalMessageHandler.Send(clientIds, messageType, channelName, data);
10381038
}
10391039

10401040
/// <summary>
@@ -1069,7 +1069,7 @@ protected void SendToClientsTarget(List<uint> clientIds, string messageType, str
10691069
Debug.LogWarning("MLAPI: Sending messages from client to other clients is not yet supported");
10701070
return;
10711071
}
1072-
NetworkingManager.singleton.Send(clientIds, messageType, channelName, data, networkId, networkedObject.GetOrderIndex(this));
1072+
InternalMessageHandler.Send(clientIds, messageType, channelName, data, networkId, networkedObject.GetOrderIndex(this));
10731073
}
10741074

10751075
/// <summary>
@@ -1103,7 +1103,7 @@ protected void SendToClients(string messageType, string channelName, byte[] data
11031103
Debug.LogWarning("MLAPI: Sending messages from client to other clients is not yet supported");
11041104
return;
11051105
}
1106-
NetworkingManager.singleton.Send(messageType, channelName, data);
1106+
InternalMessageHandler.Send(messageType, channelName, data);
11071107
}
11081108

11091109
/// <summary>
@@ -1136,7 +1136,7 @@ protected void SendToClientsTarget(string messageType, string channelName, byte[
11361136
Debug.LogWarning("MLAPI: Sending messages from client to other clients is not yet supported");
11371137
return;
11381138
}
1139-
NetworkingManager.singleton.Send(messageType, channelName, data, networkId, networkedObject.GetOrderIndex(this));
1139+
InternalMessageHandler.Send(messageType, channelName, data, networkId, networkedObject.GetOrderIndex(this));
11401140
}
11411141

11421142
/// <summary>

0 commit comments

Comments
 (0)