vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove need to define custom network header in upstream

Browse Source
This commit is contained in:
Evil Factory
2026-02-28 16:47:18 -03:00
parent de73a18637
commit 3192cc8b00
4 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/NetworkingService.cs
View File

@@ -18,7 +18,7 @@ partial class NetworkingService : INetworkingService, IEventServerConnected, IEv
public void OnReceivedServerNetMessage(IReadMessage netMessage, ServerPacketHeader serverPacketHeader)
{
if (serverPacketHeader != ServerPacketHeader.LUA_NET_MESSAGE)
if (serverPacketHeader != ServerHeader)
{
return;
}
@@ -46,7 +46,7 @@ partial class NetworkingService : INetworkingService, IEventServerConnected, IEv
if (GameMain.Client == null) { return; }
WriteOnlyMessage message = new WriteOnlyMessage();
message.WriteByte((byte)ClientPacketHeader.LUA_NET_MESSAGE);
message.WriteByte((byte)ClientHeader);
message.WriteByte((byte)ClientToServer.RequestSync);
GameMain.Client.ClientPeer.Send(message, DeliveryMethod.Reliable);
}
@@ -55,7 +55,7 @@ partial class NetworkingService : INetworkingService, IEventServerConnected, IEv
{
var message = new WriteOnlyMessage();
message.WriteByte((byte)ClientPacketHeader.LUA_NET_MESSAGE);
message.WriteByte((byte)ClientHeader);
if (idToPacket.ContainsKey(netId))
{
@@ -86,7 +86,7 @@ partial class NetworkingService : INetworkingService, IEventServerConnected, IEv
if (GameMain.Client == null) { return; }
WriteOnlyMessage message = new WriteOnlyMessage();
message.WriteByte((byte)ClientPacketHeader.LUA_NET_MESSAGE);
message.WriteByte((byte)ClientHeader);
message.WriteByte((byte)ClientToServer.RequestSingleNetId);
NetId.Write(message, netId);

10
Barotrauma/BarotraumaServer/ServerSource/LuaCs/Services/NetworkingService.cs
View File

@@ -19,7 +19,7 @@ partial class NetworkingService : INetworkingService, IEventClientRawNetMessageR
{
var message = new WriteOnlyMessage();
message.WriteByte((byte)ServerPacketHeader.LUA_NET_MESSAGE);
message.WriteByte((byte)ServerHeader);
if (idToPacket.ContainsKey(netId))
{
@@ -35,9 +35,9 @@ partial class NetworkingService : INetworkingService, IEventClientRawNetMessageR
return message;
}
public void OnReceivedClientNetMessage(IReadMessage netMessage, ClientPacketHeader serverPacketHeader, NetworkConnection sender)
public void OnReceivedClientNetMessage(IReadMessage netMessage, ClientPacketHeader clientPacketHeader, NetworkConnection sender)
{
if (serverPacketHeader != ClientPacketHeader.LUA_NET_MESSAGE)
if (clientPacketHeader != ClientHeader)
{
return;
}
@@ -134,7 +134,7 @@ partial class NetworkingService : INetworkingService, IEventClientRawNetMessageR
private void WriteIdToAll(ushort packet, NetId netId)
{
WriteOnlyMessage message = new WriteOnlyMessage();
message.WriteByte((byte)ServerPacketHeader.LUA_NET_MESSAGE);
message.WriteByte((byte)ServerHeader);
message.WriteByte((byte)ServerToClient.ReceiveNetIds);
message.WriteUInt16(1);
@@ -147,7 +147,7 @@ partial class NetworkingService : INetworkingService, IEventClientRawNetMessageR
private void WriteSync(Client client)
{
WriteOnlyMessage message = new WriteOnlyMessage();
message.WriteByte((byte)ServerPacketHeader.LUA_NET_MESSAGE);
message.WriteByte((byte)ServerHeader);
message.WriteByte((byte)ServerToClient.ReceiveNetIds);
message.WriteUInt16((ushort)packetToId.Count());

31
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/NetworkingService.cs
View File

@@ -6,6 +6,7 @@ using FluentResults;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
@@ -48,6 +49,36 @@ internal partial class NetworkingService : INetworkingService
ReceiveNetIds
}
private ClientPacketHeader? clientHeader = null;
public ClientPacketHeader ClientHeader
{
get
{
if (clientHeader == null)
{
byte lastHeader = (byte)Enum.GetValues(typeof(ClientPacketHeader)).Cast<ClientPacketHeader>().Last();
clientHeader = (ClientPacketHeader)(lastHeader + 1);
}
return (ClientPacketHeader)clientHeader;
}
}
private ServerPacketHeader? serverHeader = null;
public ServerPacketHeader ServerHeader
{
get
{
if (serverHeader == null)
{
byte lastHeader = (byte)Enum.GetValues(typeof(ServerPacketHeader)).Cast<ServerPacketHeader>().Last();
serverHeader = (ServerPacketHeader)(lastHeader + 1);
}
return (ServerPacketHeader)serverHeader;
}
}
private ConcurrentDictionary<INetworkSyncVar, NetId> netVars = [];

3
Barotrauma/BarotraumaShared/SharedSource/Networking/NetworkMember.cs
View File

@@ -46,7 +46,6 @@ namespace Barotrauma.Networking
TOGGLE_RESERVE_BENCH,
REQUEST_BACKUP_INDICES, // client wants a list of available backups for a save file
LUA_NET_MESSAGE
}
enum ClientNetSegment
@@ -105,8 +104,6 @@ namespace Barotrauma.Networking
UNLOCKRECIPE, //unlocking a fabrication recipe
SEND_BACKUP_INDICES, // the server sends a list of available backups for a save file
LUA_NET_MESSAGE
}
enum ServerNetSegment
{