diff --git a/MafiaCommon/Packets/ConnectPacket.cs b/MafiaCommon/Packets/ConnectPacket.cs index 87eac7c..00da2e8 100644 --- a/MafiaCommon/Packets/ConnectPacket.cs +++ b/MafiaCommon/Packets/ConnectPacket.cs @@ -1,12 +1,10 @@ -using System; - -namespace MafiaCommon.Packets +namespace MafiaCommon.Packets { public class ConnectPacket : Packet { - public readonly String Name; + public readonly string Name; - public ConnectPacket(String name) : base(PacketType.Connect) + public ConnectPacket(string name) : base(PacketType.Connect) { Name = name; } diff --git a/MafiaCommon/Packets/Packet.cs b/MafiaCommon/Packets/Packet.cs index 4571b0e..b5ca17e 100644 --- a/MafiaCommon/Packets/Packet.cs +++ b/MafiaCommon/Packets/Packet.cs @@ -3,8 +3,8 @@ public class Packet { public readonly PacketType PacketType; - - public Packet(PacketType type) + + protected Packet(PacketType type) { PacketType = type; } diff --git a/MafiaCommon/Packets/PacketConverter.cs b/MafiaCommon/Packets/PacketConverter.cs index 1d36f03..6712755 100644 --- a/MafiaCommon/Packets/PacketConverter.cs +++ b/MafiaCommon/Packets/PacketConverter.cs @@ -1,79 +1,48 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; +using System.Linq; using System.Text; using Newtonsoft.Json; using Newtonsoft.Json.Linq; namespace MafiaCommon.Packets { - public class PacketConverter + public static class PacketConverter { - public static byte[] toBytes(Packet packet) + public static byte[] ToBytes(Packet packet) { return Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(packet)+","); } - public static List toPacket(String jsons) + public static List ToPacket(string jsons) { - List packets = new List(); jsons = jsons.Substring(0, jsons.Length - 1); jsons = "[" + jsons + "]"; - foreach (JObject packet in (JArray) JsonConvert.DeserializeObject(jsons)) - { - packets.Add(ConvertPacket(packet)); - } - return packets; + return (from JObject packet in (JArray) JsonConvert.DeserializeObject(jsons) select ConvertPacket(packet)).ToList(); } - public static Packet ConvertPacket(JObject json) + private static Packet ConvertPacket(JObject json) { - PacketType packetType = json.GetValue("PacketType") + var packetType = json.GetValue("PacketType") .ToObject(); - Packet packet = null; - switch (packetType) + Packet packet = packetType switch { - case PacketType.ServerShutdown: - packet = json.ToObject(); - break; - case PacketType.Connect: - packet = json.ToObject(); - break; - case PacketType.Welcome: - packet = json.ToObject(); - break; - case PacketType.Disconnect: - packet = json.ToObject(); - break; - case PacketType.PlayerConnected: - packet = json.ToObject(); - break; - case PacketType.PlayerDisconnected: - packet = json.ToObject(); - break; - case PacketType.MessageReceivePacket: - packet = json.ToObject(); - break; - case PacketType.MessageSendPacket: - packet = json.ToObject(); - break; - case PacketType.GameStartPacket: - packet = json.ToObject(); - break; - case PacketType.EndGame: - packet = json.ToObject(); - break; - case PacketType.DisconnectPlayer: - packet = json.ToObject(); - break; - case PacketType.Vote: - packet = json.ToObject(); - break; - case PacketType.GameStateChanged: - packet = json.ToObject(); - break; - } + PacketType.ServerShutdown => json.ToObject(), + PacketType.Connect => json.ToObject(), + PacketType.Welcome => json.ToObject(), + PacketType.Disconnect => json.ToObject(), + PacketType.PlayerConnected => json.ToObject(), + PacketType.PlayerDisconnected => json.ToObject(), + PacketType.MessageReceivePacket => json.ToObject(), + PacketType.MessageSendPacket => json.ToObject(), + PacketType.GameStartPacket => json.ToObject(), + PacketType.EndGame => json.ToObject(), + PacketType.DisconnectPlayer => json.ToObject(), + PacketType.Vote => json.ToObject(), + PacketType.GameStateChanged => json.ToObject(), + _ => null + }; return packet; } diff --git a/MafiaCommon/Packets/ServerShutdownPacket.cs b/MafiaCommon/Packets/ServerShutdownPacket.cs index c1bf388..ab38976 100644 --- a/MafiaCommon/Packets/ServerShutdownPacket.cs +++ b/MafiaCommon/Packets/ServerShutdownPacket.cs @@ -1,12 +1,10 @@ -using System; - -namespace MafiaCommon.Packets +namespace MafiaCommon.Packets { public class ServerShutdownPacket : Packet { - public readonly String Reason; + public readonly string Reason; - public ServerShutdownPacket(String reason) : base(PacketType.ServerShutdown) + public ServerShutdownPacket(string reason) : base(PacketType.ServerShutdown) { Reason = reason; } diff --git a/MafiaCommon/Packets/WelcomePacket.cs b/MafiaCommon/Packets/WelcomePacket.cs index ee69f39..fa6f5d3 100644 --- a/MafiaCommon/Packets/WelcomePacket.cs +++ b/MafiaCommon/Packets/WelcomePacket.cs @@ -1,14 +1,12 @@ -using System; - -namespace MafiaCommon.Packets +namespace MafiaCommon.Packets { public class WelcomePacket : Packet { - public readonly String ServerName; + public readonly string ServerName; public readonly int Players; public readonly int MaxPlayers; - public WelcomePacket(String serverName, int players, int maxPlayers) : base(PacketType.Welcome) + public WelcomePacket(string serverName, int players, int maxPlayers) : base(PacketType.Welcome) { ServerName = serverName; Players = players; diff --git a/MafiaGame/ServerConnection.cs b/MafiaGame/ServerConnection.cs index ccd5283..d626e44 100644 --- a/MafiaGame/ServerConnection.cs +++ b/MafiaGame/ServerConnection.cs @@ -47,7 +47,7 @@ namespace MafiaGame return; } - _socket.Send(PacketConverter.toBytes(new ConnectPacket(Settings.Config().Nick))); + _socket.Send(PacketConverter.ToBytes(new ConnectPacket(Settings.Config().Nick))); _thread.IsBackground = true; _thread.Start(); connected = true; @@ -55,20 +55,20 @@ namespace MafiaGame public void SendMessage(ChatType chatType, string text) { - _socket.Send(PacketConverter.toBytes(new MessageSendPacket(chatType, text))); + _socket.Send(PacketConverter.ToBytes(new MessageSendPacket(chatType, text))); } public void Disconnect() { connected = false; - _socket.Send(PacketConverter.toBytes(new DisconnectPlayerPacket())); + _socket.Send(PacketConverter.ToBytes(new DisconnectPlayerPacket())); _thread.Interrupt(); _socket.Close(); } public void Vote(int id) { - _socket.Send(PacketConverter.toBytes(new VotePacket(id))); + _socket.Send(PacketConverter.ToBytes(new VotePacket(id))); } private void serverListener() @@ -105,7 +105,7 @@ namespace MafiaGame { Console.WriteLine(builder.ToString()); - List packets = PacketConverter.toPacket(builder.ToString()); + List packets = PacketConverter.ToPacket(builder.ToString()); foreach (Packet packet in packets) { WorkPacket(packet); diff --git a/MafiaServer/PlayerSocketWorker.cs b/MafiaServer/PlayerSocketWorker.cs index 0e934da..6e67f09 100644 --- a/MafiaServer/PlayerSocketWorker.cs +++ b/MafiaServer/PlayerSocketWorker.cs @@ -31,7 +31,7 @@ namespace MafiaServer builder.Append(Encoding.UTF8.GetString(data, 0, bytes)); } while (_socket.Available > 0); - var packet = PacketConverter.toPacket(builder.ToString())[0]; + var packet = PacketConverter.ToPacket(builder.ToString())[0]; if (packet.GetType() == typeof(ConnectPacket)) { PlayerName = ((ConnectPacket) packet).Name; @@ -47,7 +47,7 @@ namespace MafiaServer { try { - _socket.Send(PacketConverter.toBytes(packet)); + _socket.Send(PacketConverter.ToBytes(packet)); } catch (Exception e) { @@ -77,7 +77,7 @@ namespace MafiaServer Console.WriteLine(builder.ToString()); - List packets = PacketConverter.toPacket(builder.ToString()); + List packets = PacketConverter.ToPacket(builder.ToString()); foreach (Packet packet in packets) { WorkPacket(packet); diff --git a/MafiaServer/Server.cs b/MafiaServer/Server.cs index d9d8461..c140c15 100644 --- a/MafiaServer/Server.cs +++ b/MafiaServer/Server.cs @@ -39,7 +39,7 @@ namespace MafiaServer { if (socket.Connected) { - socket.Send(PacketConverter.toBytes(new ServerShutdownPacket(reason))); + socket.Send(PacketConverter.ToBytes(new ServerShutdownPacket(reason))); } } }