diff --git a/Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/NetworkingService.cs b/Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/NetworkingService.cs index 654e2c817..623bef305 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/NetworkingService.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/NetworkingService.cs @@ -50,7 +50,7 @@ partial class NetworkingService : INetworkingService throw new NotImplementedException(); } - public INetWriteMessage Start(Guid netId) + public IWriteMessage Start(Guid netId) { var message = new WriteOnlyMessage(); @@ -67,7 +67,7 @@ partial class NetworkingService : INetworkingService message.WriteBytes(netId.ToByteArray(), 0, 16); } - return message.ToNetWriteMessage(); + return message; } public void RequestId(Guid netId) diff --git a/Barotrauma/BarotraumaServer/ServerSource/LuaCs/Services/NetworkingService.cs b/Barotrauma/BarotraumaServer/ServerSource/LuaCs/Services/NetworkingService.cs index 683558d35..c5789827b 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/LuaCs/Services/NetworkingService.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/LuaCs/Services/NetworkingService.cs @@ -15,7 +15,7 @@ partial class NetworkingService : INetworkingService private ushort currentId = 0; - public INetWriteMessage Start(Guid netId) + public IWriteMessage Start(Guid netId) { var message = new WriteOnlyMessage(); @@ -32,7 +32,7 @@ partial class NetworkingService : INetworkingService message.WriteBytes(netId.ToByteArray(), 0, 16); } - return message.ToNetWriteMessage(); + return message; } public void NetMessageReceived(IReadMessage netMessage, ClientPacketHeader header, Client client = null) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Configuration/SettingList.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Configuration/SettingList.cs index 973a14abe..313c4f9b3 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Configuration/SettingList.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Configuration/SettingList.cs @@ -82,12 +82,12 @@ public class SettingList : ISettingList where T : IEquatable public Guid InstanceId { get; } public NetSync SyncType { get; } public ClientPermissions WritePermissions { get; } - public void ReadNetMessage(INetReadMessage message) + public void ReadNetMessage(IReadMessage message) { throw new NotImplementedException(); } - public void WriteNetMessage(INetWriteMessage message) + public void WriteNetMessage(IWriteMessage message) { throw new NotImplementedException(); } diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/ConfigInitializers.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/ConfigInitializers.cs index 388923d64..a4db95e52 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/ConfigInitializers.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/ConfigInitializers.cs @@ -2,6 +2,7 @@ using System.Numerics; using Barotrauma.LuaCs.Configuration; using Barotrauma.LuaCs.Data; +using Barotrauma.Networking; using FluentResults; using Microsoft.Xna.Framework; using Vector2 = Microsoft.Xna.Framework.Vector2; @@ -27,15 +28,15 @@ public class ConfigInitializers : IService public bool IsDisposed => false; private Result> CreateConfigEntry(IConfigInfo configInfo, - Action, INetReadMessage> readHandler, - Action, INetWriteMessage> writeHandler) + Action, IReadMessage> readHandler, + Action, IWriteMessage> writeHandler) where T : IEquatable { throw new NotImplementedException(); } private Result> CreateConfigList(IConfigInfo configInfo, - Action, INetReadMessage> readHandler, Action, INetWriteMessage> writeHandler) + Action, IReadMessage> readHandler, Action, IWriteMessage> writeHandler) where T : IEquatable { throw new NotImplementedException(); diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/NetworkingService.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/NetworkingService.cs index f4abb97d7..463821d96 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/NetworkingService.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/NetworkingService.cs @@ -46,28 +46,6 @@ internal partial class NetworkingService : INetworkingService #endif } - public void RegisterNetVar(INetworkSyncEntity netVar) - { - netVars[netVar.InstanceId] = netVar; - - netReceives[netVar.InstanceId] = (IReadMessage netMessage) => - { - INetReadMessage internalMind = new NetReadMessage(); - internalMind.SetMessage(netMessage); - netVar.ReadNetMessage(internalMind); - }; - } - - public void SendNetVar(INetworkSyncEntity netVar) - { - if (netVars.ContainsKey(netVar.InstanceId)) - { - INetWriteMessage message = Start(netVar.InstanceId); - netVar.WriteNetMessage(message); - Send(message.Message); - } - } - public void Receive(Guid netId, NetMessageReceived callback) { #if SERVER @@ -125,4 +103,14 @@ internal partial class NetworkingService : INetworkingService { IsDisposed = true; } + + public void RegisterNetVar(INetworkSyncEntity netVar) + { + throw new NotImplementedException(); + } + + public void SendNetVar(INetworkSyncEntity netVar) + { + throw new NotImplementedException(); + } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/_Interfaces/INetworkingService.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/_Interfaces/INetworkingService.cs index c89b5e63e..5d39e5e20 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/_Interfaces/INetworkingService.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/_Interfaces/INetworkingService.cs @@ -13,7 +13,7 @@ internal partial interface INetworkingService : IReusableService, ILuaCsNetworki bool IsActive { get; } bool IsSynchronized { get; } - public INetWriteMessage Start(Guid netId); + public IWriteMessage Start(Guid netId); public void Receive(Guid netId, NetMessageReceived action); #if SERVER public void Send(IWriteMessage netMessage, NetworkConnection connection = null, DeliveryMethod deliveryMethod = DeliveryMethod.Reliable);