fixed a bunch of shit

Game Server/Classes/System/PlayerManager.py

@@ -0,0 +1,52 @@
+import json
+from Classes.Objects.Player import Player
+
+class Player:
+    __queue:list
+    __users:list
+    def __init__(self):
+        self.__queue = []
+        self.__users = []
+
+    def getQueue(self) -> list:
+        return self.__queue
+
+    def addToQueue(self, user):
+        if self.isInQueue(user["id"]):
+            self.__queue.append(user)
+
+    def isInQueue(self, user:int) -> bool:
+        for user in self.__queue:
+            if int(user["id"]) == user:
+                return user
+            
+    def isInQueue(self, user:str) -> bool:
+        for user in self.__queue:
+            if user["username"] == user:
+                return user
+    
+    def createUser(self, user:json):
+        self.__users.append(user)
+
+    def createUser(self, user:json):
+        if self.getUser(user["username"]) == None:
+            self.__users.append(Player(user["username"]))
+
+    def removeUser(self, user:int):
+        self.__users.remove(user)
+
+    def removeUser(self, user:str):
+        self.__users.remove(user)
+
+    def getUsers(self) -> list:
+        return self.__users
+
+    def getUser(self, user:int) -> (any | None):
+        for user in self.__users:
+            if int(user["id"]) == user:
+                return user
+            
+    def getUser(self, user:str) -> (any | None):
+        for user in self.__users:
+            if user["name"] == user:
+                return user

Game Server/Classes/System/Server.py

@@ -0,0 +1,120 @@
+import json
+import socket
+import threading
+
+class Server:
+
+    __address:str
+    __tcpPort:str
+    __udpPort:str
+    __tcpSocket:socket
+    __udpSocket:socket
+    __TCPclientThread:threading.Thread
+    __UDPclientThread:threading.Thread
+
+    def __init__(self, address:str, tcpPort:str, udpPort:str):
+        self.__address = address
+        self.__tcpPort = tcpPort
+        self.__udpPort = udpPort
+        self.__tcpSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.__udpSocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        
+        self.startServer()
+
+    # handles starting the server and assigning socket values to the local reference
+    def startServer(self):
+        self.__tcpSocket.bind(self.__address, self.__tcpPort)
+        self.__tcpSocket.listen()
+        print(f"tcp server started on: {self.__address}:{self.__tcpPort}")
+
+        self.__udpSocket.bind(self.__address, self.__udpPort)
+        self.__udpSocket.listen()
+        print(f"tcp server started on: {self.__address}:{self.__udpPort}")
+
+        # server loop forwards connection to handleConnection
+        while True:
+            # accept incoming connection
+            # TODO: validate this connection is a valid game connection
+            clientTcpSocket, clientTcpAddress = self.__tcpSocket.accept()
+
+            # create network thread for connection
+            self.__TCPClientThread = threading.Thread(target=self.handleTCPConnection, args=(clientTcpSocket, clientTcpAddress))
+            self.__TCPClientThread.start()
+
+            clientUdpSocket, clientUdpAddress = self.__udpSocket.accept()
+            self.__UDPClientThread = threading.Thread(target=self.handleUDPConnection, args=(clientUdpSocket, clientUdpAddress))
+            self.__UDPClientThread.start()
+
+
+    # handles ticking the game loop server side converting data and passing of to the event handler
+    def handleTCPConnection(self, socket:socket, address):
+        # states that a connection has been established
+        print(f"Connected with {address}")
+
+        # Communication with client
+        while True:
+            data = socket.recv(1024)
+            if not data:
+                break
+
+            # decode message for handling
+            message = data.decode()
+            messageJson = json.loads(message)
+
+            if messageJson["user"] in self.__users:
+                self.handleTCPEvents(messageJson)
+            else:
+                break
+
+            print(f"received message from {address}: {message}")
+
+    # handles ticking the game loop server side converting data and passing of to the event handler
+    def handleUDPConnection(self, socket:socket, address):
+        # states that a connection has been established
+        print(f"Connected with {address}")
+
+        # Communication with client
+        while True:
+            data = socket.recv(1024)
+            if not data:
+                break
+
+            # decode message for handling
+            message = data.decode()
+            messageJson = json.loads(message)
+
+            if messageJson["user"] in self.__users:
+                self.handleUDPEvents(messageJson)
+            else:
+                break
+
+            print(f"received message from {address}: {message}")
+
+    # handles passing of event data to the right functions
+    def handleTCPEvents(self, event):
+        # decide which event should be performed
+        if event["event"] == "login":
+            pass
+        elif event["event"] == "join_queue":
+            # count queue
+            # move start game if 2 players are in the queue
+            # remove player from the queue once game starts
+            pass
+        elif event["event"] == "leave_queue":
+            # just remove player from the queue
+            pass
+
+    def handleUDPEvents(self, event):
+        if event["event"] == "placeCard":
+            pass
+        elif event["event"] == "removeCard":
+            pass
+        elif event["event"] == "attackCard":
+            pass
+        elif event["event"] == "attackPlayer":
+            pass
+        elif event["event"] == "activateeffectCard":
+            pass
+        elif event["event"] == "activatemonstereffect":
+            pass
+