From 38fad8c94e5fd506deaf43e097587aeb24f80757 Mon Sep 17 00:00:00 2001 From: Benjo Date: Fri, 19 Feb 2021 18:16:27 +0100 Subject: [PATCH] made it basic>game --- Arch/DatePrefix.cs | 2 +- Arch/Packet.cs | 4 ++-- Arch/ProtocolManager.cs | 4 ++-- Arch/SendData.cs | 4 ++-- Arch/ThreadManager.cs | 6 +++--- Game/GameManager.cs | 4 ++-- Game/Player.cs | 2 +- Management/Client.cs | 6 +++--- Management/Constants.cs | 2 +- Management/Room.cs | 4 ++-- Management/RoomHandle.cs | 6 +++--- Management/RoomSend.cs | 10 +++++----- Management/Server.cs | 7 +++---- Management/ServerHandle.cs | 6 +++--- Management/ServerSend.cs | 8 ++++---- PacketTypes/ClientDefaultPacket.cs | 2 +- PacketTypes/ClientGamePacket.cs | 2 +- PacketTypes/ClientRoomPacket.cs | 2 +- PacketTypes/PacketType.cs | 2 +- PacketTypes/ServerDefaultPacket.cs | 2 +- PacketTypes/ServerGamePacket.cs | 2 +- PacketTypes/ServerRoomPacket.cs | 2 +- Program.cs | 4 ++-- 23 files changed, 46 insertions(+), 47 deletions(-) diff --git a/Arch/DatePrefix.cs b/Arch/DatePrefix.cs index 3141f34..a45fc40 100644 --- a/Arch/DatePrefix.cs +++ b/Arch/DatePrefix.cs @@ -2,7 +2,7 @@ using System.IO; using System.Text; -namespace BasicServer.Arch { +namespace GameServer.Arch { public class DatePrefix : TextWriter { diff --git a/Arch/Packet.cs b/Arch/Packet.cs index f34b90a..6544e0c 100644 --- a/Arch/Packet.cs +++ b/Arch/Packet.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Numerics; using System.Text; -using BasicServer.Management; +using GameServer.Management; -namespace BasicServer.Arch { +namespace GameServer.Arch { public sealed class Packet : IDisposable { private List _buffer; diff --git a/Arch/ProtocolManager.cs b/Arch/ProtocolManager.cs index fe3ccc4..8a0922a 100644 --- a/Arch/ProtocolManager.cs +++ b/Arch/ProtocolManager.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Net; using System.Net.Sockets; -using BasicServer.Management; +using GameServer.Management; -namespace BasicServer.Arch { +namespace GameServer.Arch { public static class Listener { private static TcpListener _tcpListener; diff --git a/Arch/SendData.cs b/Arch/SendData.cs index 3be7748..8bc67d7 100644 --- a/Arch/SendData.cs +++ b/Arch/SendData.cs @@ -1,8 +1,8 @@ using System; using System.Linq; -using BasicServer.Management; +using GameServer.Management; -namespace BasicServer.Arch { +namespace GameServer.Arch { public static class SendData { public static void SendTcpData(int toClient, Packet packet) { packet.WriteLength(); diff --git a/Arch/ThreadManager.cs b/Arch/ThreadManager.cs index 4933b7e..25a8cb3 100644 --- a/Arch/ThreadManager.cs +++ b/Arch/ThreadManager.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Threading; -using BasicServer.Game; -using BasicServer.Management; +using GameServer.Game; +using GameServer.Management; -namespace BasicServer.Arch { +namespace GameServer.Arch { internal static class ThreadManager { private static readonly List ToExecuteOnMainThread = new(); diff --git a/Game/GameManager.cs b/Game/GameManager.cs index 8a0ce0f..6c1a191 100644 --- a/Game/GameManager.cs +++ b/Game/GameManager.cs @@ -1,6 +1,6 @@ -using BasicServer.Management; +using GameServer.Management; -namespace BasicServer.Game { +namespace GameServer.Game { public class GameManager { private Room Room { get; } diff --git a/Game/Player.cs b/Game/Player.cs index dc2b8d8..c6ee82b 100644 --- a/Game/Player.cs +++ b/Game/Player.cs @@ -1,4 +1,4 @@ -namespace BasicServer.Game { +namespace GameServer.Game { public class Player { public int Id { get; } diff --git a/Management/Client.cs b/Management/Client.cs index e482d14..5822bb3 100644 --- a/Management/Client.cs +++ b/Management/Client.cs @@ -1,9 +1,9 @@ using System; -using BasicServer.Arch; -using BasicServer.Game; +using GameServer.Arch; +using GameServer.Game; using GameServer.Management; -namespace BasicServer.Management { +namespace GameServer.Management { public class Client { public readonly int Id; diff --git a/Management/Constants.cs b/Management/Constants.cs index 0a6a1ec..cacd42f 100644 --- a/Management/Constants.cs +++ b/Management/Constants.cs @@ -1,4 +1,4 @@ -namespace BasicServer.Management { +namespace GameServer.Management { public static class Constants { public const int TicksPerSec = 64; public const int MsPerTick = 1000 / TicksPerSec; diff --git a/Management/Room.cs b/Management/Room.cs index bfa2009..1bd68f1 100644 --- a/Management/Room.cs +++ b/Management/Room.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using BasicServer.Game; +using GameServer.Game; -namespace BasicServer.Management { +namespace GameServer.Management { public class Room { public class ClientProperties { diff --git a/Management/RoomHandle.cs b/Management/RoomHandle.cs index 0befb65..93874f2 100644 --- a/Management/RoomHandle.cs +++ b/Management/RoomHandle.cs @@ -1,7 +1,7 @@ using System; -using BasicServer; -using BasicServer.Arch; -using BasicServer.Management; +using GameServer; +using GameServer.Arch; +using GameServer.Management; namespace GameServer.Management { public static class RoomHandle { diff --git a/Management/RoomSend.cs b/Management/RoomSend.cs index dc757b8..93baf4c 100644 --- a/Management/RoomSend.cs +++ b/Management/RoomSend.cs @@ -1,10 +1,10 @@ using System; -using BasicServer.Arch; -using BasicServer.PacketTypes; -using static BasicServer.Arch.SendData; -using static BasicServer.PacketTypes.ServerRoomPacket; +using GameServer.Arch; +using GameServer.PacketTypes; +using static GameServer.Arch.SendData; +using static GameServer.PacketTypes.ServerRoomPacket; -namespace BasicServer.Management { +namespace GameServer.Management { public static class RoomSend { private static Packet CreatePacket(ServerRoomPacket type) { return new((int)PacketType.Room, (int)type); diff --git a/Management/Server.cs b/Management/Server.cs index 9562e29..a11693e 100644 --- a/Management/Server.cs +++ b/Management/Server.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; -using BasicServer.Arch; -using BasicServer.Management; -using BasicServer.PacketTypes; +using GameServer.Arch; using GameServer.Management; +using GameServer.PacketTypes; -namespace BasicServer { +namespace GameServer { internal static class Server { public delegate void PacketHandler(int fromClient, Packet packet); diff --git a/Management/ServerHandle.cs b/Management/ServerHandle.cs index 4c71d7e..ee9e11e 100644 --- a/Management/ServerHandle.cs +++ b/Management/ServerHandle.cs @@ -1,8 +1,8 @@ using System; -using BasicServer.Arch; -using BasicServer.Management; +using GameServer.Arch; +using GameServer.Management; -namespace BasicServer { +namespace GameServer { public static class ServerHandle { public static void WelcomeReceived(int fromClientId, Packet packet) { diff --git a/Management/ServerSend.cs b/Management/ServerSend.cs index 03084c5..ff5ec25 100644 --- a/Management/ServerSend.cs +++ b/Management/ServerSend.cs @@ -1,7 +1,7 @@ -using BasicServer.Arch; -using BasicServer.PacketTypes; -using static BasicServer.Arch.SendData; -using static BasicServer.PacketTypes.ServerDefaultPacket; +using GameServer.Arch; +using GameServer.PacketTypes; +using static GameServer.Arch.SendData; +using static GameServer.PacketTypes.ServerDefaultPacket; namespace GameServer.Management { internal static class ServerSend { diff --git a/PacketTypes/ClientDefaultPacket.cs b/PacketTypes/ClientDefaultPacket.cs index ce43d4c..949a2fa 100644 --- a/PacketTypes/ClientDefaultPacket.cs +++ b/PacketTypes/ClientDefaultPacket.cs @@ -1,4 +1,4 @@ -namespace BasicServer.PacketTypes { +namespace GameServer.PacketTypes { public enum ClientDefaultPacket { DWelcomeReceived = 1, } diff --git a/PacketTypes/ClientGamePacket.cs b/PacketTypes/ClientGamePacket.cs index 8a0e547..be7ba82 100644 --- a/PacketTypes/ClientGamePacket.cs +++ b/PacketTypes/ClientGamePacket.cs @@ -1,4 +1,4 @@ -namespace BasicServer.PacketTypes { +namespace GameServer.PacketTypes { public enum ClientGamePacket { } diff --git a/PacketTypes/ClientRoomPacket.cs b/PacketTypes/ClientRoomPacket.cs index bc841c6..bbe74b6 100644 --- a/PacketTypes/ClientRoomPacket.cs +++ b/PacketTypes/ClientRoomPacket.cs @@ -1,4 +1,4 @@ -namespace BasicServer.PacketTypes { +namespace GameServer.PacketTypes { public enum ClientRoomPacket { RList = 1, RCreate, diff --git a/PacketTypes/PacketType.cs b/PacketTypes/PacketType.cs index 91eb51d..dbec81a 100644 --- a/PacketTypes/PacketType.cs +++ b/PacketTypes/PacketType.cs @@ -1,4 +1,4 @@ -namespace BasicServer.PacketTypes { +namespace GameServer.PacketTypes { public enum PacketType { Default = 1, Room, diff --git a/PacketTypes/ServerDefaultPacket.cs b/PacketTypes/ServerDefaultPacket.cs index e7757ab..ac4b9db 100644 --- a/PacketTypes/ServerDefaultPacket.cs +++ b/PacketTypes/ServerDefaultPacket.cs @@ -1,4 +1,4 @@ -namespace BasicServer.PacketTypes { +namespace GameServer.PacketTypes { public enum ServerDefaultPacket { DWelcome = 1, } diff --git a/PacketTypes/ServerGamePacket.cs b/PacketTypes/ServerGamePacket.cs index 5a07edd..69da03b 100644 --- a/PacketTypes/ServerGamePacket.cs +++ b/PacketTypes/ServerGamePacket.cs @@ -1,4 +1,4 @@ -namespace BasicServer.PacketTypes { +namespace GameServer.PacketTypes { public enum ServerGamePacket { } diff --git a/PacketTypes/ServerRoomPacket.cs b/PacketTypes/ServerRoomPacket.cs index 95cfd53..9c073af 100644 --- a/PacketTypes/ServerRoomPacket.cs +++ b/PacketTypes/ServerRoomPacket.cs @@ -1,4 +1,4 @@ -namespace BasicServer.PacketTypes { +namespace GameServer.PacketTypes { public enum ServerRoomPacket { RList = 1, RCreated, diff --git a/Program.cs b/Program.cs index 636d0c8..bed6012 100644 --- a/Program.cs +++ b/Program.cs @@ -1,9 +1,9 @@ using System; using System.Threading; using System.Threading.Tasks; -using BasicServer.Arch; +using GameServer.Arch; -namespace BasicServer { +namespace GameServer { internal static class Program { private static void Main() { Console.Title = "Game Server";