Skip to content

Commit 0683f59

Browse files
committed
feat: update to LiteNetLib 2.0
1 parent 1a65749 commit 0683f59

34 files changed

Lines changed: 3909 additions & 3615 deletions

Plugins/LiteNetLib/BaseChannel.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@ namespace LiteNetLib
55
{
66
internal abstract class BaseChannel
77
{
8-
protected readonly NetPeer Peer;
8+
protected readonly LiteNetPeer Peer;
99
protected readonly Queue<NetPacket> OutgoingQueue = new Queue<NetPacket>(NetConstants.DefaultWindowSize);
1010
private int _isAddedToPeerChannelSendQueue;
1111

1212
public int PacketsInQueue => OutgoingQueue.Count;
1313

14-
protected BaseChannel(NetPeer peer)
15-
{
14+
protected BaseChannel(LiteNetPeer peer) =>
1615
Peer = peer;
17-
}
1816

1917
public void AddToQueue(NetPacket packet)
2018
{
@@ -28,9 +26,7 @@ public void AddToQueue(NetPacket packet)
2826
protected void AddToPeerChannelSendQueue()
2927
{
3028
if (Interlocked.CompareExchange(ref _isAddedToPeerChannelSendQueue, 1, 0) == 0)
31-
{
3229
Peer.AddToReliableChannelSendQueue(this);
33-
}
3430
}
3531

3632
public bool SendAndCheckQueue()
@@ -42,7 +38,8 @@ public bool SendAndCheckQueue()
4238
return hasPacketsToSend;
4339
}
4440

45-
protected abstract bool SendNextPackets();
41+
public abstract bool SendNextPackets();
42+
4643
public abstract bool ProcessPacket(NetPacket packet);
4744
}
4845
}

Plugins/LiteNetLib/ConnectionRequest.cs

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ internal enum ConnectionRequestResult
1414

1515
public class ConnectionRequest
1616
{
17-
private readonly NetManager _listener;
17+
private readonly LiteNetManager _listener;
1818
private int _used;
1919

2020
public NetDataReader Data => InternalPacket.Data;
@@ -37,19 +37,17 @@ internal void UpdateRequest(NetConnectRequestPacket connectRequest)
3737
InternalPacket = connectRequest;
3838
}
3939

40-
private bool TryActivate()
41-
{
42-
return Interlocked.CompareExchange(ref _used, 1, 0) == 0;
43-
}
40+
private bool TryActivate() =>
41+
Interlocked.CompareExchange(ref _used, 1, 0) == 0;
4442

45-
internal ConnectionRequest(IPEndPoint remoteEndPoint, NetConnectRequestPacket requestPacket, NetManager listener)
43+
internal ConnectionRequest(IPEndPoint remoteEndPoint, NetConnectRequestPacket requestPacket, LiteNetManager listener)
4644
{
4745
InternalPacket = requestPacket;
4846
RemoteEndPoint = remoteEndPoint;
4947
_listener = listener;
5048
}
5149

52-
public NetPeer AcceptIfKey(string key)
50+
public LiteNetPeer AcceptIfKey(string key)
5351
{
5452
if (!TryActivate())
5553
return null;
@@ -74,7 +72,7 @@ public NetPeer AcceptIfKey(string key)
7472
/// Accept connection and get new NetPeer as result
7573
/// </summary>
7674
/// <returns>Connected NetPeer</returns>
77-
public NetPeer Accept()
75+
public LiteNetPeer Accept()
7876
{
7977
if (!TryActivate())
8078
return null;
@@ -90,45 +88,28 @@ public void Reject(byte[] rejectData, int start, int length, bool force)
9088
_listener.OnConnectionSolved(this, rejectData, start, length);
9189
}
9290

93-
public void Reject(byte[] rejectData, int start, int length)
94-
{
91+
public void Reject(byte[] rejectData, int start, int length) =>
9592
Reject(rejectData, start, length, false);
96-
}
97-
9893

99-
public void RejectForce(byte[] rejectData, int start, int length)
100-
{
94+
public void RejectForce(byte[] rejectData, int start, int length) =>
10195
Reject(rejectData, start, length, true);
102-
}
10396

104-
public void RejectForce()
105-
{
97+
public void RejectForce() =>
10698
Reject(null, 0, 0, true);
107-
}
10899

109-
public void RejectForce(byte[] rejectData)
110-
{
100+
public void RejectForce(byte[] rejectData) =>
111101
Reject(rejectData, 0, rejectData.Length, true);
112-
}
113102

114-
public void RejectForce(NetDataWriter rejectData)
115-
{
103+
public void RejectForce(NetDataWriter rejectData) =>
116104
Reject(rejectData.Data, 0, rejectData.Length, true);
117-
}
118105

119-
public void Reject()
120-
{
106+
public void Reject() =>
121107
Reject(null, 0, 0, false);
122-
}
123108

124-
public void Reject(byte[] rejectData)
125-
{
109+
public void Reject(byte[] rejectData) =>
126110
Reject(rejectData, 0, rejectData.Length, false);
127-
}
128111

129-
public void Reject(NetDataWriter rejectData)
130-
{
112+
public void Reject(NetDataWriter rejectData) =>
131113
Reject(rejectData.Data, 0, rejectData.Length, false);
132-
}
133114
}
134115
}

0 commit comments

Comments
 (0)