diff --git a/TcpDotNet.ClientIntegrationTest/GoodbyePacket.cs b/TcpDotNet.ClientIntegrationTest/GoodbyePacket.cs index d956a72..d79d97c 100644 --- a/TcpDotNet.ClientIntegrationTest/GoodbyePacket.cs +++ b/TcpDotNet.ClientIntegrationTest/GoodbyePacket.cs @@ -7,15 +7,13 @@ internal sealed class GoodbyePacket : Packet { public string Message { get; set; } - protected override Task DeserializeAsync(ProtocolReader reader) + protected override void Deserialize(ProtocolReader reader) { Message = reader.ReadString(); - return Task.CompletedTask; } - protected override Task SerializeAsync(ProtocolWriter writer) + protected override void Serialize(ProtocolWriter writer) { writer.Write(Message); - return Task.CompletedTask; } } diff --git a/TcpDotNet.ClientIntegrationTest/HelloPacket.cs b/TcpDotNet.ClientIntegrationTest/HelloPacket.cs index 5ec4a41..0b4f357 100644 --- a/TcpDotNet.ClientIntegrationTest/HelloPacket.cs +++ b/TcpDotNet.ClientIntegrationTest/HelloPacket.cs @@ -7,15 +7,13 @@ internal sealed class HelloPacket : Packet { public string Message { get; set; } - protected override Task DeserializeAsync(ProtocolReader reader) + protected override void Deserialize(ProtocolReader reader) { Message = reader.ReadString(); - return Task.CompletedTask; } - protected override Task SerializeAsync(ProtocolWriter writer) + protected override void Serialize(ProtocolWriter writer) { writer.Write(Message); - return Task.CompletedTask; } } diff --git a/TcpDotNet.ListenerIntegrationTest/GoodbyePacket.cs b/TcpDotNet.ListenerIntegrationTest/GoodbyePacket.cs index 3c52483..02baa10 100644 --- a/TcpDotNet.ListenerIntegrationTest/GoodbyePacket.cs +++ b/TcpDotNet.ListenerIntegrationTest/GoodbyePacket.cs @@ -7,15 +7,13 @@ internal sealed class GoodbyePacket : Packet { public string Message { get; set; } - protected override Task DeserializeAsync(ProtocolReader reader) + protected override void Deserialize(ProtocolReader reader) { Message = reader.ReadString(); - return Task.CompletedTask; } - protected override Task SerializeAsync(ProtocolWriter writer) + protected override void Serialize(ProtocolWriter writer) { writer.Write(Message); - return Task.CompletedTask; } } diff --git a/TcpDotNet.ListenerIntegrationTest/HelloPacket.cs b/TcpDotNet.ListenerIntegrationTest/HelloPacket.cs index 39c3ea9..80a958b 100644 --- a/TcpDotNet.ListenerIntegrationTest/HelloPacket.cs +++ b/TcpDotNet.ListenerIntegrationTest/HelloPacket.cs @@ -7,15 +7,13 @@ internal sealed class HelloPacket : Packet { public string Message { get; set; } - protected override Task DeserializeAsync(ProtocolReader reader) + protected override void Deserialize(ProtocolReader reader) { Message = reader.ReadString(); - return Task.CompletedTask; } - protected override Task SerializeAsync(ProtocolWriter writer) + protected override void Serialize(ProtocolWriter writer) { writer.Write(Message); - return Task.CompletedTask; } } diff --git a/TcpDotNet/BaseClientNode.cs b/TcpDotNet/BaseClientNode.cs index fa36b4d..4115eb4 100644 --- a/TcpDotNet/BaseClientNode.cs +++ b/TcpDotNet/BaseClientNode.cs @@ -96,7 +96,7 @@ public abstract class BaseClientNode : Node int length; try { - length = await Task.Run(() => networkReader.ReadInt32(), cancellationToken); + length = await Task.Run(networkReader.ReadInt32, cancellationToken); } catch (EndOfStreamException) { @@ -136,7 +136,7 @@ public abstract class BaseClientNode : Node return null; var packet = (Packet) constructor.Invoke(null); - await packet.DeserializeAsync(bufferReader); + packet.Deserialize(bufferReader); await targetStream.DisposeAsync(); if (RegisteredPacketHandlers.TryGetValue(packetType, out IReadOnlyCollection? handlers)) @@ -170,7 +170,7 @@ public abstract class BaseClientNode : Node await using var bufferWriter = new ProtocolWriter(targetStream); bufferWriter.Write(packet.Id); - await packet.SerializeAsync(bufferWriter); + packet.Serialize(bufferWriter); await targetStream.FlushAsync(cancellationToken); buffer.Position = 0; diff --git a/TcpDotNet/Protocol/Packet.cs b/TcpDotNet/Protocol/Packet.cs index c7ee131..e984dbc 100644 --- a/TcpDotNet/Protocol/Packet.cs +++ b/TcpDotNet/Protocol/Packet.cs @@ -29,11 +29,11 @@ public abstract class Packet /// Deserializes this packet from the specified reader. /// /// The reader from which this packet should be deserialized. - protected internal abstract Task DeserializeAsync(ProtocolReader reader); + protected internal abstract void Deserialize(ProtocolReader reader); /// /// Serializes this packet to the specified writer. /// /// The writer to which this packet should be serialized. - protected internal abstract Task SerializeAsync(ProtocolWriter writer); + protected internal abstract void Serialize(ProtocolWriter writer); } diff --git a/TcpDotNet/Protocol/Packets/ClientBound/DisconnectPacket.cs b/TcpDotNet/Protocol/Packets/ClientBound/DisconnectPacket.cs index 8984529..df2fe36 100644 --- a/TcpDotNet/Protocol/Packets/ClientBound/DisconnectPacket.cs +++ b/TcpDotNet/Protocol/Packets/ClientBound/DisconnectPacket.cs @@ -22,16 +22,14 @@ internal sealed class DisconnectPacket : Packet public DisconnectReason Reason { get; private set; } /// - protected internal override Task DeserializeAsync(ProtocolReader reader) + protected internal override void Deserialize(ProtocolReader reader) { Reason = (DisconnectReason) reader.ReadByte(); - return Task.CompletedTask; } /// - protected internal override Task SerializeAsync(ProtocolWriter writer) + protected internal override void Serialize(ProtocolWriter writer) { writer.Write((byte) Reason); - return Task.CompletedTask; } } diff --git a/TcpDotNet/Protocol/Packets/ClientBound/EncryptionRequestPacket.cs b/TcpDotNet/Protocol/Packets/ClientBound/EncryptionRequestPacket.cs index 412b0d1..c3960f5 100644 --- a/TcpDotNet/Protocol/Packets/ClientBound/EncryptionRequestPacket.cs +++ b/TcpDotNet/Protocol/Packets/ClientBound/EncryptionRequestPacket.cs @@ -41,26 +41,22 @@ internal sealed class EncryptionRequestPacket : Packet public byte[] PublicKey { get; private set; } /// - protected internal override Task DeserializeAsync(ProtocolReader reader) + protected internal override void Deserialize(ProtocolReader reader) { int length = reader.ReadInt32(); PublicKey = reader.ReadBytes(length); length = reader.ReadInt32(); Payload = reader.ReadBytes(length); - - return Task.CompletedTask; } /// - protected internal override Task SerializeAsync(ProtocolWriter writer) + protected internal override void Serialize(ProtocolWriter writer) { writer.Write(PublicKey.Length); writer.Write(PublicKey); writer.Write(Payload.Length); writer.Write(Payload); - - return Task.CompletedTask; } } diff --git a/TcpDotNet/Protocol/Packets/ClientBound/HandshakeResponsePacket.cs b/TcpDotNet/Protocol/Packets/ClientBound/HandshakeResponsePacket.cs index a62bd2a..0cc020e 100644 --- a/TcpDotNet/Protocol/Packets/ClientBound/HandshakeResponsePacket.cs +++ b/TcpDotNet/Protocol/Packets/ClientBound/HandshakeResponsePacket.cs @@ -36,18 +36,16 @@ internal sealed class HandshakeResponsePacket : Packet public int ProtocolVersion { get; private set; } /// - protected internal override Task DeserializeAsync(ProtocolReader reader) + protected internal override void Deserialize(ProtocolReader reader) { HandshakeResponse = (HandshakeResponse) reader.ReadByte(); ProtocolVersion = reader.ReadInt32(); - return Task.CompletedTask; } /// - protected internal override Task SerializeAsync(ProtocolWriter writer) + protected internal override void Serialize(ProtocolWriter writer) { writer.Write((byte) HandshakeResponse); writer.Write(ProtocolVersion); - return Task.CompletedTask; } } diff --git a/TcpDotNet/Protocol/Packets/ClientBound/PongPacket.cs b/TcpDotNet/Protocol/Packets/ClientBound/PongPacket.cs index 302c46d..7952016 100644 --- a/TcpDotNet/Protocol/Packets/ClientBound/PongPacket.cs +++ b/TcpDotNet/Protocol/Packets/ClientBound/PongPacket.cs @@ -27,17 +27,17 @@ public sealed class PongPacket : ResponsePacket public byte[] Payload { get; private set; } /// - protected internal override async Task DeserializeAsync(ProtocolReader reader) + protected internal override void Deserialize(ProtocolReader reader) { - await base.DeserializeAsync(reader); + base.Deserialize(reader); int length = reader.ReadInt32(); Payload = reader.ReadBytes(length); } /// - protected internal override async Task SerializeAsync(ProtocolWriter writer) + protected internal override void Serialize(ProtocolWriter writer) { - await base.SerializeAsync(writer); + base.Serialize(writer); writer.Write(Payload.Length); writer.Write(Payload); } diff --git a/TcpDotNet/Protocol/Packets/ClientBound/SessionExchangePacket.cs b/TcpDotNet/Protocol/Packets/ClientBound/SessionExchangePacket.cs index c99465b..e7679ac 100644 --- a/TcpDotNet/Protocol/Packets/ClientBound/SessionExchangePacket.cs +++ b/TcpDotNet/Protocol/Packets/ClientBound/SessionExchangePacket.cs @@ -24,16 +24,14 @@ internal sealed class SessionExchangePacket : Packet public Guid Session { get; private set; } /// - protected internal override Task DeserializeAsync(ProtocolReader reader) + protected internal override void Deserialize(ProtocolReader reader) { Session = reader.ReadGuid(); - return Task.CompletedTask; } /// - protected internal override Task SerializeAsync(ProtocolWriter writer) + protected internal override void Serialize(ProtocolWriter writer) { writer.Write(Session); - return Task.CompletedTask; } } diff --git a/TcpDotNet/Protocol/Packets/ServerBound/EncryptionResponsePacket.cs b/TcpDotNet/Protocol/Packets/ServerBound/EncryptionResponsePacket.cs index 9ecb1bd..935cca6 100644 --- a/TcpDotNet/Protocol/Packets/ServerBound/EncryptionResponsePacket.cs +++ b/TcpDotNet/Protocol/Packets/ServerBound/EncryptionResponsePacket.cs @@ -41,26 +41,22 @@ internal sealed class EncryptionResponsePacket : Packet /// - protected internal override Task DeserializeAsync(ProtocolReader reader) + protected internal override void Deserialize(ProtocolReader reader) { int length = reader.ReadInt32(); SharedSecret = reader.ReadBytes(length); length = reader.ReadInt32(); Payload = reader.ReadBytes(length); - - return Task.CompletedTask; } /// - protected internal override Task SerializeAsync(ProtocolWriter writer) + protected internal override void Serialize(ProtocolWriter writer) { writer.Write(SharedSecret.Length); writer.Write(SharedSecret); writer.Write(Payload.Length); writer.Write(Payload); - - return Task.CompletedTask; } } diff --git a/TcpDotNet/Protocol/Packets/ServerBound/HandshakeRequestPacket.cs b/TcpDotNet/Protocol/Packets/ServerBound/HandshakeRequestPacket.cs index f118ea2..82e4ef3 100644 --- a/TcpDotNet/Protocol/Packets/ServerBound/HandshakeRequestPacket.cs +++ b/TcpDotNet/Protocol/Packets/ServerBound/HandshakeRequestPacket.cs @@ -26,16 +26,14 @@ internal sealed class HandshakeRequestPacket : Packet public int ProtocolVersion { get; private set; } /// - protected internal override Task DeserializeAsync(ProtocolReader reader) + protected internal override void Deserialize(ProtocolReader reader) { ProtocolVersion = reader.ReadInt32(); - return Task.CompletedTask; } /// - protected internal override Task SerializeAsync(ProtocolWriter writer) + protected internal override void Serialize(ProtocolWriter writer) { writer.Write(ProtocolVersion); - return Task.CompletedTask; } } diff --git a/TcpDotNet/Protocol/Packets/ServerBound/PingPacket.cs b/TcpDotNet/Protocol/Packets/ServerBound/PingPacket.cs index 0a80a60..06eb33c 100644 --- a/TcpDotNet/Protocol/Packets/ServerBound/PingPacket.cs +++ b/TcpDotNet/Protocol/Packets/ServerBound/PingPacket.cs @@ -25,17 +25,17 @@ public sealed class PingPacket : RequestPacket public byte[] Payload { get; private set; } /// - protected internal override async Task DeserializeAsync(ProtocolReader reader) + protected internal override void Deserialize(ProtocolReader reader) { - await base.DeserializeAsync(reader); + base.Deserialize(reader); int length = reader.ReadInt32(); Payload = reader.ReadBytes(length); } /// - protected internal override async Task SerializeAsync(ProtocolWriter writer) + protected internal override void Serialize(ProtocolWriter writer) { - await base.SerializeAsync(writer); + base.Serialize(writer); writer.Write(Payload.Length); writer.Write(Payload); } diff --git a/TcpDotNet/Protocol/RequestPacket.cs b/TcpDotNet/Protocol/RequestPacket.cs index 6b17b4c..42f3bcf 100644 --- a/TcpDotNet/Protocol/RequestPacket.cs +++ b/TcpDotNet/Protocol/RequestPacket.cs @@ -12,16 +12,14 @@ public abstract class RequestPacket : Packet public long CallbackId { get; internal set; } /// - protected internal override Task DeserializeAsync(ProtocolReader reader) + protected internal override void Deserialize(ProtocolReader reader) { CallbackId = reader.ReadInt64(); - return Task.CompletedTask; } /// - protected internal override Task SerializeAsync(ProtocolWriter writer) + protected internal override void Serialize(ProtocolWriter writer) { writer.Write(CallbackId); - return Task.CompletedTask; } } diff --git a/TcpDotNet/Protocol/ResponsePacket.cs b/TcpDotNet/Protocol/ResponsePacket.cs index 6d675b7..7aade8b 100644 --- a/TcpDotNet/Protocol/ResponsePacket.cs +++ b/TcpDotNet/Protocol/ResponsePacket.cs @@ -21,16 +21,14 @@ public abstract class ResponsePacket : Packet public long CallbackId { get; private set; } /// - protected internal override Task DeserializeAsync(ProtocolReader reader) + protected internal override void Deserialize(ProtocolReader reader) { CallbackId = reader.ReadInt64(); - return Task.CompletedTask; } /// - protected internal override Task SerializeAsync(ProtocolWriter writer) + protected internal override void Serialize(ProtocolWriter writer) { writer.Write(CallbackId); - return Task.CompletedTask; } }