From 61e54f282ec8aba94f5b442499c21ed1fd1990bf Mon Sep 17 00:00:00 2001
From: Mathis Ginkel <m.ginkel@stud.unibas.ch>
Date: Thu, 2 Apr 2026 10:20:03 +0200
Subject: [PATCH 01/10] Resolve Conflicts

---
 .../casono/client/chat/ChatController.java    |  62 ++++++
 .../cs108/casono/client/chat/ChatModel.java   |  67 ++++++
 .../cs108/casono/client/chat/Message.java     | 136 ++++++++++++
 .../casono/client/network/ClientService.java  | 210 ++++++++++++++++++
 .../client/ui/chatui/ChatController.java      |  90 --------
 .../client/ui/chatui/ChatViewController.java  |  87 ++++++++
 .../gameuicomponents/chatui/chatbox.fxml      |  58 +++++
 .../gameuicomponents/chatui/chatui.css        | 155 +++++++++++++
 .../client/chat/ChatControllerTest.java       |  28 +++
 9 files changed, 803 insertions(+), 90 deletions(-)
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
 delete mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatController.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
 create mode 100644 src/main/resources/ui-structure/gameuicomponents/chatui/chatbox.fxml
 create mode 100644 src/main/resources/ui-structure/gameuicomponents/chatui/chatui.css
 create mode 100644 src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatControllerTest.java

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
new file mode 100644
index 0000000..ac2bb0e
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
@@ -0,0 +1,62 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.chat;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
+import java.util.List;
+
+/**
+ * responsible for the transferring of messages from the server to the ChatModel
+ * or from the ChatViewController to the server
+ */
+public class ChatController {
+
+    private final String username;
+    private final ClientService clientService;
+
+    private ChatModel chatModel;
+
+    private int game_id;
+
+    public ChatController(String username, ClientService clientService) {
+        this.username = username;
+        this.clientService = clientService;
+    }
+
+    public void createChat(int game_id) {
+        chatModel = new ChatModel(ChatModel.ChatType.GLOBAL, username);
+        this.game_id = game_id;
+    }
+
+    public ChatModel getChatModel() {
+        return chatModel;
+    }
+
+    /**
+     * method to send a message, the ChatViewController received to the server
+     */
+    public void sendMessage(String msg, String username) {
+        Message message = new Message(Message.MessageType.GLOBAL, 0, username, null, msg);
+        onSendToNetwork(message);
+    }
+
+    /**
+     * method to get all messages from the server
+     */
+    public Boolean receiveMessage() {
+        List<Message> newMessages = clientService.getMessages();
+        if (!newMessages.isEmpty()) {
+            for (Message msg : newMessages) {
+                chatModel.addMessage(msg);
+            }
+            return true;
+        } else { return false; }
+    }
+
+    /**
+     * method to send a message to the server
+     * @param message
+     */
+    public void onSendToNetwork(Message message) {
+        clientService.sendMessage(message);
+    }
+
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
new file mode 100644
index 0000000..0c2f075
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
@@ -0,0 +1,67 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.chat;
+
+import java.util.ArrayList;
+
+/**
+ * ChatModel, stores the data for a specific chat
+ *
+ * Holds the current state of a chat
+ */
+
+public class ChatModel {
+
+    public ArrayList<Message> messages;
+
+    public ChatType chattype;
+
+    public String username;
+
+    public int count;
+
+    public enum ChatType {
+        GLOBAL,
+        LOBBY,
+        WHISPER
+    }
+
+    /**
+     * Creates a new ChatModel, given a username of the client
+     * @param chattype
+     * @param username
+     */
+
+    public ChatModel(ChatType chattype, String username) {
+        this.messages = new ArrayList<Message>();
+        this.chattype = chattype;
+        this.username = username;
+        this.count = 0;
+    }
+
+    /**
+     * method, used by the ChatViewController, to access all new messages, that are stored in the ChatModel
+     */
+    public synchronized String viewNextMessage() {
+        count--;
+        Message msg = messages.getLast();
+        return String.format("[%s] %s: %s", msg.timestamp, msg.user, msg.getMessage());
+    }
+
+    /**
+     * Adds a new message
+     * method used by the ChatController
+     * @param msg
+     */
+    public synchronized void addMessage(Message msg) {
+        messages.add(msg);
+        count++;
+    }
+
+    /**
+     * method to send all current messages to the ChatViewController, if needed
+     */
+    public void addCompleteChat() {
+        for (int i = 0; i < this.messages.size(); i++) {
+            Message msg = this.messages.get(i);
+        }
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
new file mode 100644
index 0000000..8fb2b0e
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
@@ -0,0 +1,136 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.chat;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Message Object for internal handling of Chat-Messages
+ * TODO: Should be used on both sides of the network
+ */
+
+public class Message {
+    private final MessageType type;
+    private final String message;
+    public String user;
+    public String timestamp;
+    public int game_id = 0;
+    public String target = null;
+    public enum MessageType {
+        GLOBAL, LOBBY, WHISPER
+    };
+
+    /**
+     * Constructor for creating Messages with all information given
+     * @param type - Either global, local or whisper
+     * @param game_id - lobby id, or null, if the type is global
+     * @param user - username
+     * @param target - username of the target user, for whisper chat
+     * @param message
+     */
+
+    public Message(MessageType type, int game_id, String user, String target, String timestamp, String message) {
+        this.type = type;
+        this.game_id = game_id;
+        this.user = user;
+        this.target = target;
+        this.timestamp = timestamp;
+        this.message = message;
+    }
+
+    /**
+     * Constructor for creating the Messages of the current user, using this client -> time of writing is being recorded
+     * @param type - Either global, local or whisper
+     * @param game_id - lobby id, or null, if the type is global
+     * @param user - username
+     * @param target - username of the target user, for whisper chat
+     * @param message
+     */
+
+    public Message(MessageType type, int game_id, String user, String target, String message) {
+        this.type = type;
+        this.game_id = game_id;
+        this.user = user;
+        this.target = target;
+        this.message = message;
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
+        this.timestamp = now.format(formatter);
+    }
+
+
+    public String getMessage() {
+        return message;
+    }
+
+    public MessageType getMessageType() {
+        return type;
+    }
+
+    /*
+     * Method to test the system
+     * @return - String representation of the Message instance, as for example "player1: Hello World"
+
+    public String toString() {
+        return String.format("%s: %s", this.user, this.message);
+    }
+    */
+    /**
+     * Method to create the request representation of the message object, to be sent to the server
+     * @return - request as specified in the network protocol, as String
+     */
+    public String toArgsString() {
+        return String.format("TYPE=%s GAME=%d USER=%s TARGET=%s TIME=%s TEXT=%s",
+                this.type.toString(), this.game_id, this.user, this.target, this.timestamp, this.message);
+    }
+
+
+    /**
+     * Pattern, to analyze the response String with the given parameters
+     */
+    public static Pattern msgRex = Pattern.compile(
+            "TYPE=(?<type>\\w+) GAME=(?<game>\\w+) USER=(?<user>\\w+) TARGET=(?<target>\\w+) TIME=(?<time>[0-9:.]+) TEXT=(?<text>.*)$");
+
+    /**
+     * Method to create a Message Object, from the information given by the String
+     * @param response - String that got sent as a response from the server
+     * @return - New Message Object
+     */
+    public static Message toMessage(String response) {
+        Matcher m = msgRex.matcher(response);
+        if (! m.matches()) {
+            throw new RuntimeException("Can not parse message: '" + response+"'");
+        }
+        String typeString=m.group("type");
+
+        switch (typeString) {
+            case "GLOBAL":
+                return new Message(MessageType.GLOBAL,
+                        0,
+                        m.group("user"),
+                        null,
+                        m.group("time"),
+                        m.group("text"));
+
+            case "LOBBY":
+                return new Message(MessageType.LOBBY,
+                        Integer.parseInt(m.group("game")),
+                        m.group("user"),
+                        null,
+                        m.group("time"),
+                        m.group("text"));
+
+            case "WHISPER":
+                return new Message(MessageType.WHISPER,
+                        Integer.parseInt(m.group("game")),
+                        m.group("user"),
+                        m.group("target"),
+                        m.group("time"),
+                        m.group("text"));
+
+            default:
+                throw new RuntimeException("Unknown message type " + typeString);
+        }
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
new file mode 100644
index 0000000..b7dab20
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
@@ -0,0 +1,210 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.network;
+
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.NetworkManager;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.RawPacket;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TcpTransport;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+
+/**
+ * Responsible for the transferring of the data from the Client to the Server and the other way around
+ */
+
+public class ClientService {
+
+    private final TcpTransport clienttcptransport;
+    private final Socket socket;
+
+    private final String ip;
+    private final int port;
+
+    private final ExecutorService executor;
+
+    public static ArrayList<String> response;
+    private final AtomicInteger idGenerator;
+    private final Logger logger;
+
+    /**
+     * Creates a new ClientSession with a Socket, a Reader and Writer of the Input- and the Outputstream and a pool of threads to send requests and receive responses.
+     * @param ip : ip-adress of the server
+     * @param port : port of the server
+     */
+
+    public ClientService(String ip, int port) {
+
+        this.ip = ip;
+        this.port = port;
+        this.idGenerator = new AtomicInteger(0);
+        this.logger = LogManager.getLogger(NetworkManager.class);
+
+        try {
+            socket = new Socket(this.ip, this.port);
+            logger.info("Connected at port " + this.port);
+            clienttcptransport = new TcpTransport(socket);
+        }
+        catch (IOException i) {
+            throw new RuntimeException(i);
+        }
+
+        executor = Executors.newSingleThreadExecutor();
+    }
+
+    /**
+     * Sends a ping to the server
+     * Returns nothing, the method processMessage() already handles the cases "+OK" or "-ERROR"
+     */
+
+    public void ping() {
+        processMessage("PING");
+    }
+
+    /**
+     * Sends a login request to the server to create a new user on the server
+     * @param username
+     * @return - a new username, if the same username is already used by someone else
+     */
+
+    public String login(String username) {
+        String msg = "LOGIN USERNAME=" + username;
+        return processMessage(msg);
+    }
+
+    /**
+     * Send a Request to get the number of Messages currently in the Queue for the client.
+     * Then proceeds, if needed, to get the messages by sending
+     */
+
+    public List<Message> getMessages() {
+        String countStr = processMessage("GET_MESSAGE_COUNT");
+        int count = Integer.parseInt(countStr);
+        System.out.println("Got " + count + " messages");
+        List<Message> messages = new ArrayList<>();
+        for (int i = 0; i < count; i++) {
+            String  message = processMessage("GET_NEXT_MESSAGE");
+            if (message != null) {
+                Message message1 = Message.toMessage(message);
+                messages.add(message1);
+            }
+        }
+        return messages;
+    }
+
+    /**
+     * Sends a Request to the Server containing all relevant information of the message the client wrote.
+     * @param message
+     * @return
+     */
+
+    public void sendMessage(Message message) {
+        String request = "SEND_MESSAGE " + message.toArgsString();
+        processMessage(request);
+    }
+
+    /**
+     * Sends the Requests to the server and waits for the response
+     * If the response is "+OK" it proceeds normal
+     * If the response "-ERROR" it throws a runtime exception
+     * @param message
+     * @return - The response as a string, if it has to be returned
+     * (+OK will not be returned)
+     */
+
+    private String processMessage(String message) {
+        AtomicReference<String> response = new AtomicReference<>();
+        sendRequest(() -> {
+            try {
+                writeToTransport(message);
+                String responseLine=null;
+                do {
+                    responseLine = clienttcptransport.read().payload();
+                    System.out.println("Raw message '" + responseLine + "'");
+                    if ("+OK".equals(responseLine)) {
+                        return;
+                    } else if (("-ERROR").equals(responseLine)) {
+                        throw new RuntimeException(responseLine);
+                    }
+                    response.set(responseLine);
+                } while(true);
+            } catch (Exception e) {
+                throw getRuntimeException(e);
+            }
+        });
+        return response.get();
+    }
+
+    /**
+     *
+     * @param request
+     */
+
+    private void sendRequest(Runnable request) {
+        Future<?> future = executor.submit(request);
+        try {
+            future.get();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        } catch (ExecutionException e) {
+            throw getRuntimeException(e);
+        }
+    }
+
+    /**
+     * Returns a Runtime Exceptions thrown by the sendRequest method
+     * @param e - an Exception
+     * @return - a Runtime Exception
+     */
+
+    private static RuntimeException getRuntimeException(Exception e) {
+        Throwable reason = e.getCause();
+        RuntimeException re;
+        if (reason == null) {
+            reason = e;
+        } else if (reason instanceof RuntimeException rte) {
+            re = rte;
+        }
+        re = new RuntimeException(reason);
+        return re;
+    }
+
+    /**
+     * Closes the Socket and shuts down the Threadpool associated with that Socket-Connection.
+     */
+
+    public void closeSocket() {
+        try {
+            executor.shutdown();
+            clienttcptransport.close();
+            socket.close();
+        } catch (IOException j) {
+            System.out.println(j);
+        }
+
+    }
+
+    /**
+     * Method to write with the tcp transport to the server
+     * @param s - Message to be sent
+     * @throws IOException
+     */
+
+    private void writeToTransport(String s) throws IOException {
+        int id = this.idGenerator.incrementAndGet();
+        this.clienttcptransport.write(new RawPacket(id, s));
+    }
+
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatController.java
deleted file mode 100644
index 1f7abe3..0000000
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
-
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.VBox;
-
-/**
- * Controller-Klasse für das Chat-System innerhalb der Spieloberfläche.
- *
- * <p>Verwaltet das Anzeigen von Chatnachrichten, das Eingabefeld für eigene Nachrichten sowie den
- * Senden-Button. Unterstützt drei Arten von Nachrichten: - Player-to-Player (Privat) - Lobby-Chat
- * (Raum) - Globaler Chat (Serverweit)
- *
- * <p>Nachrichten werden in einem {@link VBox}-Container als {@link Label} angezeigt. Eigene
- * Nachrichten werden über {@link #onSendToNetwork(String)} an das Netzwerkprotokoll weitergeleitet,
- * während eingehende Nachrichten über {@link #receiveMessage(String, String)} verarbeitet und
- * angezeigt werden.
- *
- * <p>Hinweis: Einige TODOs stehen in der zugehörigen FXML-Datei
- */
-public class ChatController {
-
-    @FXML private VBox chatVBox;
-
-    @FXML private TextField inputField;
-
-    @FXML private Button sendButton;
-
-    @FXML private ScrollPane chatScrollPane;
-
-    private static final int CHAT_PADDING = 20;
-
-    /** Initialisiert den ChatController nach dem Laden der FXML. */
-    public void initialize() {
-        inputField.setOnAction(event -> sendMessage());
-        chatScrollPane.vvalueProperty().bind(chatVBox.heightProperty());
-    }
-
-    /** Standardkonstruktor. Wird von FXML verwendet. */
-    public ChatController() {
-        // default constructor for FXML
-    }
-
-    /**
-     * Diese Methode wird vom Senden-Button oder Enter ausgelöst. Sie gibt die eigene Nachricht an
-     * das Netzwerkprotokoll weiter.
-     */
-    @FXML
-    private void sendMessage() {
-        String message = inputField.getText().trim();
-        if (!message.isEmpty()) {
-            inputField.clear();
-
-            // Hier wird die eigene Nachricht ans Netzwerkprotokoll übergeben
-            onSendToNetwork(message);
-        }
-    }
-
-    /**
-     * Diese Funktion muss vom Netzwerkprotokoll aufgerufen werden, wenn eine neue Nachricht von
-     * einem anderen Spieler kommt.
-     *
-     * @param player Name des Spielers
-     * @param message Nachricht des Spielers
-     */
-    public void receiveMessage(String player, String message) {
-        String time = LocalTime.now().format(DateTimeFormatter.ofPattern("HH:mm"));
-        Label label = new Label("[" + time + "] " + player + ": " + message);
-        label.getStyleClass().add("info-text");
-        label.setWrapText(true); // Zeilenumbruch aktivieren
-        label.maxWidthProperty().bind(chatVBox.widthProperty().subtract(CHAT_PADDING));
-        chatVBox.getChildren().add(label);
-    }
-
-    /**
-     * Schnittstelle zum Netzwerkprotokoll. Diese Funktion wird automatisch aufgerufen, wenn der
-     * Benutzer eine eigene Nachricht sendet.
-     *
-     * @param message Nachricht, die der Benutzer abgeschickt hat
-     */
-    public void onSendToNetwork(String message) {
-        // TODO: Netzwerkcode einfügen
-        receiveMessage("Du", message);
-    }
-}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
new file mode 100644
index 0000000..607204d
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
@@ -0,0 +1,87 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatController;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatModel;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.VBox;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * Responsible for the presentation of the ChatModel to the Client
+ */
+
+public class ChatViewController {
+
+    private final ChatModel chatmodel;
+    private final String username;
+    private final ChatController controller;
+    private final Timer timer;
+
+    @FXML private VBox chatVBox;
+
+    @FXML private TextField inputField;
+
+    @FXML private ScrollPane chatScrollPane;
+
+    @FXML private Button sendButton;
+
+    @FXML private Button refreshButton;
+
+    private static final int CHAT_PADDING = 20;
+
+    public ChatViewController() {
+        this(null, null ,null);
+    }
+
+    public ChatViewController(String username, ChatModel chatmodel, ChatController controller) {
+        this.username = username;
+        this.chatmodel = chatmodel;
+        this.controller = controller;
+        this.timer = new Timer();
+        timer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                System.err.println("tick");
+                if (controller.receiveMessage()) {
+                    showMessage();
+                }
+            }
+        }, 0, 1000);
+    }
+
+    @FXML
+    public void initialize() {
+        inputField.setOnAction(event -> sendMessage());
+        sendButton.setOnAction(event -> sendMessage());
+        refreshButton.setOnAction(event -> showMessage());
+        chatScrollPane.vvalueProperty().bind(chatVBox.heightProperty());
+    }
+
+    public void showMessage() {
+        while (chatmodel.count > 0) {
+            String msg = chatmodel.viewNextMessage();
+            Label label = new Label(msg);
+            label.getStyleClass().add("info-text");
+            label.setWrapText(true);
+            label.maxWidthProperty().bind(chatVBox.widthProperty().subtract(CHAT_PADDING));
+            chatVBox.getChildren().add(label);
+        }
+
+    }
+
+    public void sendMessage() {
+        String message = inputField.getText().trim();
+        if (!message.isEmpty()) {
+            inputField.clear();
+            this.controller.sendMessage(message, username);
+        }
+    }
+
+    public void endController() { timer.cancel(); }
+}
diff --git a/src/main/resources/ui-structure/gameuicomponents/chatui/chatbox.fxml b/src/main/resources/ui-structure/gameuicomponents/chatui/chatbox.fxml
new file mode 100644
index 0000000..fd1cc59
--- /dev/null
+++ b/src/main/resources/ui-structure/gameuicomponents/chatui/chatbox.fxml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<!--
+    Dieses Fenster wird später mit den Serveranfragen verknüpft,
+    um Nachrichten von Mitspielern und Systemmeldungen in Echtzeit anzuzeigen.
+
+    Der Chat unterscheidet intern zwischen:
+    - Player-to-Player (Privater 2-Personen-Chat)
+    - Lobby-Chat (Aktueller Raum)
+    - Globaler Chat (Gesamter Server)
+
+    Features, die später implementiert werden sollen:
+    - Schicke Chat-Bubbles mit Namen und Uhrzeit.
+-->
+
+<VBox xmlns="http://javafx.com/javafx/21"
+      xmlns:fx="http://javafx.com/fxml/1"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatViewController"
+      alignment="CENTER"
+      stylesheets="@chatui.css">
+
+    <!-- Innenabstand: Schafft oben, rechts und unten 30 Pixel Platz, links nur 10 Pixel (asymmetrisch) -->
+    <padding>
+        <Insets top="30" right="30" bottom="30" left="10"/>
+    </padding>
+
+    <children>
+        <VBox VBox.vgrow="ALWAYS"
+              styleClass="chat-box"
+              spacing="10"
+              maxWidth="Infinity">
+
+            <children>
+                <Label text="== CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
+                <Region minHeight="4" styleClass="chat-separator"/>
+
+                <!-- Chatnachrichten werden hier hinzugefügt -->
+                <ScrollPane fx:id="chatScrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER" VBox.vgrow="ALWAYS" styleClass="chat-scroll-pane">
+                    <content>
+                        <VBox fx:id="chatVBox" spacing="10" styleClass="chat-VBox"/>
+                    </content>
+                </ScrollPane>
+
+                <!-- Eingabebereich -->
+                <HBox spacing="10">
+                    <!-- TODO: Größe des TextFields dynamisch anpassen -->
+                    <TextField fx:id="inputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..." styleClass="gray-input-field" onAction="#sendMessage"/>
+                    <Button fx:id="sendButton" text="SENDEN" onAction="#sendMessage" styleClass="yellow-button"/>
+                    <Button fx:id="refreshButton" text="NEU" onAction="#showMessage" styleClass="yellow-button"/>
+                </HBox>
+            </children>
+        </VBox>
+    </children>
+</VBox>
\ No newline at end of file
diff --git a/src/main/resources/ui-structure/gameuicomponents/chatui/chatui.css b/src/main/resources/ui-structure/gameuicomponents/chatui/chatui.css
new file mode 100644
index 0000000..826aa7b
--- /dev/null
+++ b/src/main/resources/ui-structure/gameuicomponents/chatui/chatui.css
@@ -0,0 +1,155 @@
+.chat-box {
+    -fx-background-color: #0d9e3b;
+    -fx-background-radius: 58;
+    -fx-border-radius: 50;
+    -fx-border-color: #5c3d10 #3d260a #3d260a #5c3d10;
+    -fx-border-width: 12;
+    -fx-padding: 20;
+    -fx-effect: dropshadow(one-pass-box, rgba(0,0,0,1), 0, 0, 15, 15);
+}
+
+.chat-header {
+    -fx-text-fill: #ffffff;
+    -fx-font-size: 22px;
+    -fx-font-weight: bold;
+    -fx-padding: 0 0 10 0;
+    -fx-effect: dropshadow(one-pass-box, #000000, 0, 0, 3, 3);
+}
+
+.chat-separator {
+    -fx-background-color: #ffffff;
+    -fx-min-height: 4px;
+    -fx-effect: dropshadow(one-pass-box, #000000, 0, 0, 3, 3);
+}
+
+.black-input-field {
+    -fx-background-color: #1a1a1a;
+    -fx-text-fill: #ffffff;
+    -fx-font-family: "Courier New";
+    -fx-font-weight: bold;
+    -fx-background-radius: 8;
+    -fx-border-radius: 8;
+    -fx-border-color: #444444;
+    -fx-border-width: 2;
+    -fx-padding: 5 12;
+}
+
+.black-input-field:hover {
+    -fx-translate-y: -3;
+    -fx-effect: dropshadow(one-pass-box, rgba(0, 0, 0, 0.8), 0, 0, 3, 3);
+}
+
+
+.black-input-field:focused {
+    -fx-border-color: #ffffff;
+    -fx-background-color: #000000;
+}
+
+.gray-input-field {
+    -fx-background-color: #333333;
+    -fx-text-fill: #ffffff;
+    -fx-font-family: "Courier New";
+    -fx-font-weight: bold;
+    -fx-background-radius: 8;
+    -fx-border-radius: 8;
+    -fx-border-color: #666666;
+    -fx-color-color: #cccccc;
+    -fx-border-width: 2;
+    -fx-padding: 5 12;
+}
+
+.gray-input-field:hover {
+    -fx-translate-y: -3;
+    -fx-effect: dropshadow(one-pass-box, rgba(0, 0, 0, 0.8), 0, 0, 3, 3);
+}
+
+.gray-input-field:focused {
+    -fx-border-color: #ffffff;
+    -fx-background-color: #333333;
+}
+
+.yellow-button {
+    -fx-background-color: #b8860b;
+    -fx-border-color: #ffd700;
+    -fx-text-fill: #ffffff;
+}
+
+.red-button {
+    -fx-background-color: #8b0000;
+    -fx-border-color: #ff4444;
+    -fx-text-fill: #ffffff;
+}
+
+.gray-button {
+    -fx-background-color: #333333;
+    -fx-border-color: #666666;
+    -fx-text-fill: #cccccc;
+}
+
+.gray-button, .yellow-button, .red-button {
+    -fx-background-radius: 12;
+    -fx-border-radius: 12;
+    -fx-font-family: "Courier New";
+    -fx-font-weight: bold;
+    -fx-border-width: 2;
+    -fx-padding: 6 15;
+    -fx-cursor: hand;
+}
+
+.gray-button:hover, .yellow-button:hover, .red-button:hover {
+    -fx-translate-y: -3;
+    -fx-effect: dropshadow(one-pass-box, rgba(0, 0, 0, 0.8), 0, 0, 3, 3);
+}
+
+.chat-scroll-pane {
+    -fx-background-color: transparent;
+    -fx-background: transparent;
+    -fx-border-color: transparent;
+}
+
+.chat-VBox {
+    -fx-background-color: transparent;
+    -fx-background: transparent;
+}
+.scroll-pane {
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+}
+
+.scroll-pane .scroll-bar:vertical {
+    -fx-background-color: transparent;
+}
+
+.scroll-pane .scroll-bar .track {
+    -fx-background-color: #5c3d10;
+    -fx-background-insets: 0;
+    -fx-background-radius: 5;
+}
+
+.scroll-pane .scroll-bar .thumb {
+    -fx-background-color: #3d260a;
+    -fx-background-insets: 0;
+    -fx-background-radius: 5;
+    -fx-pref-width: 6;
+    -fx-pref-height: 6;
+    -fx-padding: 0;
+}
+
+.scroll-pane .scroll-bar:horizontal {
+    -fx-background-color: transparent;
+}
+
+.scroll-pane .scroll-bar:horizontal .track {
+    -fx-background-color: #5c3d10;
+    -fx-background-radius: 5;
+}
+
+.scroll-pane .scroll-bar:horizontal .thumb {
+    -fx-background-color: #3d260a;
+    -fx-background-radius: 5;
+    -fx-pref-height: 6;
+}
+
+.scroll-pane .scroll-bar:horizontal .thumb:hover {
+    -fx-pref-height: 10;
+}
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatControllerTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatControllerTest.java
new file mode 100644
index 0000000..a18c5b7
--- /dev/null
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatControllerTest.java
@@ -0,0 +1,28 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.chat;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
+import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI;
+import ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui.Casinomainui;
+import ch.unibas.dmi.dbis.cs108.casono.server.ServerApp;
+import javafx.application.Application;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class ChatControllerTest {
+
+    @BeforeEach
+    public void setup() {
+    }
+
+    @AfterEach
+    public void teardown() {
+
+    }
+
+    @Test
+    public void testChatController() {
+        Client client = new Client("user1");
+        client.startApplication();
+    }
+}

From 79831b046caa611025d5b9fa2ce9dd02af105c1d Mon Sep 17 00:00:00 2001
From: Mathis Ginkel <m.ginkel@stud.unibas.ch>
Date: Thu, 2 Apr 2026 10:22:51 +0200
Subject: [PATCH 02/10] Fix: small changes in ClientService

---
 .../cs108/casono/client/network/ClientService.java   | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
index b7dab20..c26163b 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
@@ -17,8 +17,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 
 /**
@@ -30,14 +28,10 @@ public class ClientService {
     private final TcpTransport clienttcptransport;
     private final Socket socket;
 
-    private final String ip;
-    private final int port;
-
     private final ExecutorService executor;
 
     public static ArrayList<String> response;
     private final AtomicInteger idGenerator;
-    private final Logger logger;
 
     /**
      * Creates a new ClientSession with a Socket, a Reader and Writer of the Input- and the Outputstream and a pool of threads to send requests and receive responses.
@@ -47,14 +41,10 @@ public class ClientService {
 
     public ClientService(String ip, int port) {
 
-        this.ip = ip;
-        this.port = port;
         this.idGenerator = new AtomicInteger(0);
-        this.logger = LogManager.getLogger(NetworkManager.class);
 
         try {
-            socket = new Socket(this.ip, this.port);
-            logger.info("Connected at port " + this.port);
+            socket = new Socket(ip, port);
             clienttcptransport = new TcpTransport(socket);
         }
         catch (IOException i) {

From a9dcd79b388f7492881ff6da28d1e50f5b565b56 Mon Sep 17 00:00:00 2001
From: Mathis Ginkel <m.ginkel@stud.unibas.ch>
Date: Thu, 2 Apr 2026 18:11:28 +0200
Subject: [PATCH 03/10] Add: client chat architecture for lobby and global chat

---
 .../casono/client/chat/ChatController.java    |  58 ++++-----
 .../cs108/casono/client/chat/ChatModel.java   |  36 ++---
 .../cs108/casono/client/chat/ChatType.java    |   7 +
 .../cs108/casono/client/chat/Message.java     |  87 +++++++------
 .../casono/client/network/ClientService.java  | 111 ++++++++--------
 .../client/ui/chatui/ChatViewController.java  | 123 ++++++++++--------
 .../client/ui/chatui/GlobalChatView.java      |  69 ++++++++++
 .../client/ui/chatui/LobbyChatView.java       |  72 ++++++++++
 .../client/ui/chatui/WhisperChatView.java     |   3 +
 .../resources/ui-structure/Casinogameui.fxml  |  14 +-
 .../ui-structure/components/Chatbox.fxml      |  57 --------
 .../components/chatui/chatbox.fxml            |  51 ++++++++
 .../{Chatui.css => chatui/chatui.css}         |   0
 .../components/chatui/globalchat.fxml         |  40 ++++++
 .../components/chatui/lobbychat.fxml          |  37 ++++++
 .../components/chatui/whisperchat.fxml        |  35 +++++
 .../client/chat/ChatControllerTest.java       |  28 ----
 17 files changed, 539 insertions(+), 289 deletions(-)
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatType.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/WhisperChatView.java
 delete mode 100644 src/main/resources/ui-structure/components/Chatbox.fxml
 create mode 100644 src/main/resources/ui-structure/components/chatui/chatbox.fxml
 rename src/main/resources/ui-structure/components/{Chatui.css => chatui/chatui.css} (100%)
 create mode 100644 src/main/resources/ui-structure/components/chatui/globalchat.fxml
 create mode 100644 src/main/resources/ui-structure/components/chatui/lobbychat.fxml
 create mode 100644 src/main/resources/ui-structure/components/chatui/whisperchat.fxml
 delete mode 100644 src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatControllerTest.java

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
index ac2bb0e..9a04d44 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
@@ -1,62 +1,58 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.chat;
 
 import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
- * responsible for the transferring of messages from the server to the ChatModel
- * or from the ChatViewController to the server
+ * responsible for the transferring of messages from the server to the ChatModel or from the
+ * ChatViewController to the server
  */
 public class ChatController {
 
     private final String username;
     private final ClientService clientService;
 
-    private ChatModel chatModel;
-
-    private int game_id;
+    private final ArrayList<ChatModel> chatModelArrayList;
 
     public ChatController(String username, ClientService clientService) {
         this.username = username;
         this.clientService = clientService;
+        chatModelArrayList = new ArrayList<>();
+        chatModelArrayList.add(new ChatModel(ChatType.GLOBAL, username));
     }
 
-    public void createChat(int game_id) {
-        chatModel = new ChatModel(ChatModel.ChatType.GLOBAL, username);
-        this.game_id = game_id;
+    public void createLobbyChat(int lobbyId, ChatType chatType) {
+        ChatModel chatModel = new ChatModel(chatType, username, lobbyId);
+        chatModelArrayList.add(chatModel);
     }
 
-    public ChatModel getChatModel() {
-        return chatModel;
-    }
-
-    /**
-     * method to send a message, the ChatViewController received to the server
-     */
-    public void sendMessage(String msg, String username) {
-        Message message = new Message(Message.MessageType.GLOBAL, 0, username, null, msg);
-        onSendToNetwork(message);
-    }
-
-    /**
-     * method to get all messages from the server
-     */
+    /** method to get all messages from the server */
     public Boolean receiveMessage() {
         List<Message> newMessages = clientService.getMessages();
         if (!newMessages.isEmpty()) {
             for (Message msg : newMessages) {
-                chatModel.addMessage(msg);
+                switch (msg.getMessageType()) {
+                    case ChatType.GLOBAL:
+                        chatModelArrayList.get(0).addMessage(msg);
+                    case ChatType.LOBBY:
+                        ChatModel chatModel = chatModelArrayList.get(1);
+                        if (chatModel != null && chatModel.lobbyId == msg.lobbyId) {
+                            chatModel.addMessage(msg);
+                        }
+                    case ChatType.WHISPER:
+                        // TODO: Check, if target person is user and if yes, iterate through all
+                        // whisper chats.
+                }
             }
             return true;
-        } else { return false; }
+        } else {
+            return false;
+        }
     }
 
-    /**
-     * method to send a message to the server
-     * @param message
-     */
-    public void onSendToNetwork(Message message) {
+    /** method to send a message to the server */
+    public void sendMessageToNetwork(Message message) {
         clientService.sendMessage(message);
     }
-
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
index 0c2f075..6fd4177 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
@@ -5,31 +5,26 @@ import java.util.ArrayList;
 /**
  * ChatModel, stores the data for a specific chat
  *
- * Holds the current state of a chat
+ * <p>Holds the current state of a chat
  */
-
 public class ChatModel {
 
     public ArrayList<Message> messages;
 
-    public ChatType chattype;
+    private ChatType chattype;
 
     public String username;
 
     public int count;
 
-    public enum ChatType {
-        GLOBAL,
-        LOBBY,
-        WHISPER
-    }
+    public int lobbyId;
 
     /**
      * Creates a new ChatModel, given a username of the client
+     *
      * @param chattype
      * @param username
      */
-
     public ChatModel(ChatType chattype, String username) {
         this.messages = new ArrayList<Message>();
         this.chattype = chattype;
@@ -37,8 +32,21 @@ public class ChatModel {
         this.count = 0;
     }
 
+    public ChatModel(ChatType chattype, String username, int lobbyId) {
+        this.messages = new ArrayList<Message>();
+        this.chattype = chattype;
+        this.username = username;
+        this.count = 0;
+        this.lobbyId = lobbyId;
+    }
+
+    public ChatType getChattype() {
+        return chattype;
+    }
+
     /**
-     * method, used by the ChatViewController, to access all new messages, that are stored in the ChatModel
+     * method, used by the ChatViewController, to access all new messages, that are stored in the
+     * ChatModel
      */
     public synchronized String viewNextMessage() {
         count--;
@@ -47,8 +55,8 @@ public class ChatModel {
     }
 
     /**
-     * Adds a new message
-     * method used by the ChatController
+     * Adds a new message method used by the ChatController
+     *
      * @param msg
      */
     public synchronized void addMessage(Message msg) {
@@ -56,9 +64,7 @@ public class ChatModel {
         count++;
     }
 
-    /**
-     * method to send all current messages to the ChatViewController, if needed
-     */
+    /** method to send all current messages to the ChatViewController, if needed */
     public void addCompleteChat() {
         for (int i = 0; i < this.messages.size(); i++) {
             Message msg = this.messages.get(i);
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatType.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatType.java
new file mode 100644
index 0000000..c234da5
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatType.java
@@ -0,0 +1,7 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.chat;
+
+public enum ChatType {
+    GLOBAL,
+    LOBBY,
+    WHISPER
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
index 8fb2b0e..60cb568 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
@@ -6,33 +6,35 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * Message Object for internal handling of Chat-Messages
- * TODO: Should be used on both sides of the network
+ * Message Object for internal handling of Chat-Messages TODO: Should be used on both sides of the
+ * network
  */
-
 public class Message {
-    private final MessageType type;
+    private final ChatType type;
     private final String message;
     public String user;
     public String timestamp;
-    public int game_id = 0;
+    public int lobbyId = 0;
     public String target = null;
-    public enum MessageType {
-        GLOBAL, LOBBY, WHISPER
-    };
 
     /**
      * Constructor for creating Messages with all information given
+     *
      * @param type - Either global, local or whisper
-     * @param game_id - lobby id, or null, if the type is global
+     * @param lobbyId - lobby id, or null, if the typChatType
      * @param user - username
      * @param target - username of the target user, for whisper chat
      * @param message
      */
-
-    public Message(MessageType type, int game_id, String user, String target, String timestamp, String message) {
+    public Message(
+            ChatType type,
+            int lobbyId,
+            String user,
+            String target,
+            String timestamp,
+            String message) {
         this.type = type;
-        this.game_id = game_id;
+        this.lobbyId = lobbyId;
         this.user = user;
         this.target = target;
         this.timestamp = timestamp;
@@ -40,17 +42,18 @@ public class Message {
     }
 
     /**
-     * Constructor for creating the Messages of the current user, using this client -> time of writing is being recorded
+     * Constructor for creating the Messages of the current user, using this client -> time of
+     * writing is being recorded
+     *
      * @param type - Either global, local or whisper
-     * @param game_id - lobby id, or null, if the type is global
+     * @param lobbyId - lobby id, or null, if the type is global
      * @param user - username
      * @param target - username of the target user, for whisper chat
      * @param message
      */
-
-    public Message(MessageType type, int game_id, String user, String target, String message) {
+    public Message(ChatType type, int lobbyId, String user, String target, String message) {
         this.type = type;
-        this.game_id = game_id;
+        this.lobbyId = lobbyId;
         this.user = user;
         this.target = target;
         this.message = message;
@@ -59,54 +62,54 @@ public class Message {
         this.timestamp = now.format(formatter);
     }
 
-
     public String getMessage() {
         return message;
     }
 
-    public MessageType getMessageType() {
+    public ChatType getMessageType() {
         return type;
     }
 
-    /*
-     * Method to test the system
-     * @return - String representation of the Message instance, as for example "player1: Hello World"
-
-    public String toString() {
-        return String.format("%s: %s", this.user, this.message);
-    }
-    */
     /**
      * Method to create the request representation of the message object, to be sent to the server
+     *
      * @return - request as specified in the network protocol, as String
      */
     public String toArgsString() {
-        return String.format("TYPE=%s GAME=%d USER=%s TARGET=%s TIME=%s TEXT=%s",
-                this.type.toString(), this.game_id, this.user, this.target, this.timestamp, this.message);
+        return String.format(
+                "TYPE=%s GAME=%d USER=%s TARGET=%s TIME=%s TEXT=%s",
+                this.type.toString(),
+                this.lobbyId,
+                this.user,
+                this.target,
+                this.timestamp,
+                this.message);
     }
 
-
-    /**
-     * Pattern, to analyze the response String with the given parameters
-     */
-    public static Pattern msgRex = Pattern.compile(
-            "TYPE=(?<type>\\w+) GAME=(?<game>\\w+) USER=(?<user>\\w+) TARGET=(?<target>\\w+) TIME=(?<time>[0-9:.]+) TEXT=(?<text>.*)$");
+    /** Pattern, to analyze the response String with the given parameters */
+    public static Pattern msgRex =
+            Pattern.compile(
+                    "TYPE=(?<type>\\w+) " + "GAME=(?<game>\\w+) " +
+                            "USER=(?<user>\\w+) " + "TARGET=(?<target>\\w+) " +
+                            "TIME=(?<time>[0-9:.]+) " + "TEXT=(?<text>.*)$");
 
     /**
      * Method to create a Message Object, from the information given by the String
+     *
      * @param response - String that got sent as a response from the server
      * @return - New Message Object
      */
     public static Message toMessage(String response) {
         Matcher m = msgRex.matcher(response);
-        if (! m.matches()) {
-            throw new RuntimeException("Can not parse message: '" + response+"'");
+        if (!m.matches()) {
+            throw new RuntimeException("Can not parse message: '" + response + "'");
         }
-        String typeString=m.group("type");
+        String typeString = m.group("type");
 
         switch (typeString) {
             case "GLOBAL":
-                return new Message(MessageType.GLOBAL,
+                return new Message(
+                        ChatType.GLOBAL,
                         0,
                         m.group("user"),
                         null,
@@ -114,7 +117,8 @@ public class Message {
                         m.group("text"));
 
             case "LOBBY":
-                return new Message(MessageType.LOBBY,
+                return new Message(
+                        ChatType.LOBBY,
                         Integer.parseInt(m.group("game")),
                         m.group("user"),
                         null,
@@ -122,7 +126,8 @@ public class Message {
                         m.group("text"));
 
             case "WHISPER":
-                return new Message(MessageType.WHISPER,
+                return new Message(
+                        ChatType.WHISPER,
                         Integer.parseInt(m.group("game")),
                         m.group("user"),
                         m.group("target"),
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
index c26163b..aaf1332 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
@@ -1,9 +1,11 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.network;
 
-
-import ch.unibas.dmi.dbis.cs108.casono.server.network.NetworkManager;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.RawPacket;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TcpTransport;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import java.io.IOException;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.List;
@@ -11,18 +13,13 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-
-import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
-
-
 /**
- * Responsible for the transferring of the data from the Client to the Server and the other way around
+ * Responsible for the transferring of the data from the Client to the Server and the other way
+ * around
  */
-
 public class ClientService {
 
     private final TcpTransport clienttcptransport;
@@ -32,60 +29,63 @@ public class ClientService {
 
     public static ArrayList<String> response;
     private final AtomicInteger idGenerator;
+    private final Logger logger;
 
     /**
-     * Creates a new ClientSession with a Socket, a Reader and Writer of the Input- and the Outputstream and a pool of threads to send requests and receive responses.
+     * Creates a new ClientSession with a Socket, a Reader and Writer of the Input- and the
+     * Outputstream and a pool of threads to send requests and receive responses.
+     *
      * @param ip : ip-adress of the server
      * @param port : port of the server
      */
-
     public ClientService(String ip, int port) {
 
         this.idGenerator = new AtomicInteger(0);
 
+        this.logger = LogManager.getLogger(ClientService.class);
+
         try {
             socket = new Socket(ip, port);
             clienttcptransport = new TcpTransport(socket);
-        }
-        catch (IOException i) {
+            logger.info("Connected to server at " + ip);
+        } catch (IOException i) {
             throw new RuntimeException(i);
         }
 
         executor = Executors.newSingleThreadExecutor();
+
     }
 
     /**
-     * Sends a ping to the server
-     * Returns nothing, the method processMessage() already handles the cases "+OK" or "-ERROR"
+     * Sends a ping to the server Returns nothing, the method processMessage() already handles the
+     * cases "+OK" or "-ERROR"
      */
-
     public void ping() {
         processMessage("PING");
     }
 
     /**
      * Sends a login request to the server to create a new user on the server
+     *
      * @param username
      * @return - a new username, if the same username is already used by someone else
      */
-
     public String login(String username) {
         String msg = "LOGIN USERNAME=" + username;
         return processMessage(msg);
     }
 
     /**
-     * Send a Request to get the number of Messages currently in the Queue for the client.
-     * Then proceeds, if needed, to get the messages by sending
+     * Send a Request to get the number of Messages currently in the Queue for the client. Then
+     * proceeds, if needed, to get the messages by sending
      */
-
     public List<Message> getMessages() {
         String countStr = processMessage("GET_MESSAGE_COUNT");
         int count = Integer.parseInt(countStr);
-        System.out.println("Got " + count + " messages");
+        logger.info("Got " + count + " messages");
         List<Message> messages = new ArrayList<>();
         for (int i = 0; i < count; i++) {
-            String  message = processMessage("GET_NEXT_MESSAGE");
+            String message = processMessage("GET_NEXT_MESSAGE");
             if (message != null) {
                 Message message1 = Message.toMessage(message);
                 messages.add(message1);
@@ -95,53 +95,50 @@ public class ClientService {
     }
 
     /**
-     * Sends a Request to the Server containing all relevant information of the message the client wrote.
+     * Sends a Request to the Server containing all relevant information of the message the client
+     * wrote.
+     *
      * @param message
-     * @return
      */
-
     public void sendMessage(Message message) {
         String request = "SEND_MESSAGE " + message.toArgsString();
         processMessage(request);
     }
 
     /**
-     * Sends the Requests to the server and waits for the response
-     * If the response is "+OK" it proceeds normal
-     * If the response "-ERROR" it throws a runtime exception
+     * Sends the Requests to the server and waits for the response If the response is "+OK" it
+     * proceeds normal If the response "-ERROR" it throws a runtime exception
+     *
      * @param message
-     * @return - The response as a string, if it has to be returned
-     * (+OK will not be returned)
+     * @return - The response as a string, if it has to be returned (+OK will not be returned)
      */
-
     private String processMessage(String message) {
         AtomicReference<String> response = new AtomicReference<>();
-        sendRequest(() -> {
-            try {
-                writeToTransport(message);
-                String responseLine=null;
-                do {
-                    responseLine = clienttcptransport.read().payload();
-                    System.out.println("Raw message '" + responseLine + "'");
-                    if ("+OK".equals(responseLine)) {
-                        return;
-                    } else if (("-ERROR").equals(responseLine)) {
-                        throw new RuntimeException(responseLine);
+        sendRequest(
+                () -> {
+                    try {
+                        writeToTransport(message);
+                        String responseLine = null;
+                        do {
+                            responseLine = clienttcptransport.read().payload();
+                            logger.info("Raw message '" + responseLine + "'");
+                            if ("+OK".equals(responseLine)) {
+                                return;
+                            } else if (("-ERROR").equals(responseLine)) {
+                                throw new RuntimeException(responseLine);
+                            }
+                            response.set(responseLine);
+                        } while (true);
+                    } catch (Exception e) {
+                        throw getRuntimeException(e);
                     }
-                    response.set(responseLine);
-                } while(true);
-            } catch (Exception e) {
-                throw getRuntimeException(e);
-            }
-        });
+                });
         return response.get();
     }
 
     /**
-     *
      * @param request
      */
-
     private void sendRequest(Runnable request) {
         Future<?> future = executor.submit(request);
         try {
@@ -155,10 +152,10 @@ public class ClientService {
 
     /**
      * Returns a Runtime Exceptions thrown by the sendRequest method
+     *
      * @param e - an Exception
      * @return - a Runtime Exception
      */
-
     private static RuntimeException getRuntimeException(Exception e) {
         Throwable reason = e.getCause();
         RuntimeException re;
@@ -171,30 +168,26 @@ public class ClientService {
         return re;
     }
 
-    /**
-     * Closes the Socket and shuts down the Threadpool associated with that Socket-Connection.
-     */
-
+    /** Closes the Socket and shuts down the Threadpool associated with that Socket-Connection. */
     public void closeSocket() {
         try {
             executor.shutdown();
             clienttcptransport.close();
             socket.close();
+            logger.info("Socket closed");
         } catch (IOException j) {
-            System.out.println(j);
+            logger.debug(j);
         }
-
     }
 
     /**
      * Method to write with the tcp transport to the server
+     *
      * @param s - Message to be sent
      * @throws IOException
      */
-
     private void writeToTransport(String s) throws IOException {
         int id = this.idGenerator.incrementAndGet();
         this.clienttcptransport.write(new RawPacket(id, s));
     }
-
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
index 607204d..5d7683e 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
@@ -2,86 +2,107 @@ package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
 
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatController;
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatModel;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.VBox;
-
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatType;
 import java.util.Timer;
 import java.util.TimerTask;
+import javafx.fxml.FXML;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ToggleButton;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.layout.VBox;
 
-/**
- * Responsible for the presentation of the ChatModel to the Client
- */
-
+/** Responsible for the presentation of the ChatModel to the Client */
 public class ChatViewController {
 
-    private final ChatModel chatmodel;
+    private final GlobalChatView globalChatView;
+
+    private LobbyChatView lobbyChatView;
+
     private final String username;
+
     private final ChatController controller;
+
     private final Timer timer;
 
-    @FXML private VBox chatVBox;
+    private Boolean lobbyActivated;
 
-    @FXML private TextField inputField;
+    @FXML private VBox whisperChatVBox;
 
-    @FXML private ScrollPane chatScrollPane;
+    @FXML private VBox whisperChat;
 
-    @FXML private Button sendButton;
+    @FXML private ToggleButton changeGlobalChatButton;
 
-    @FXML private Button refreshButton;
+    @FXML private ToggleButton changeLobbyChatButton;
+
+    @FXML private ToggleButton changeWhisperChatButton;
+
+    @FXML private ButtonBar buttonBar;
+
+    private static final int REFRESH_TIME = 1000;
 
     private static final int CHAT_PADDING = 20;
 
     public ChatViewController() {
-        this(null, null ,null);
+        this(null, null, null);
     }
 
-    public ChatViewController(String username, ChatModel chatmodel, ChatController controller) {
+    public ChatViewController(
+            String username, ChatModel globalChatModel, ChatController controller) {
         this.username = username;
-        this.chatmodel = chatmodel;
         this.controller = controller;
+        this.globalChatView =
+                new GlobalChatView(username, new ChatModel(ChatType.GLOBAL, username), controller);
         this.timer = new Timer();
-        timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                System.err.println("tick");
-                if (controller.receiveMessage()) {
-                    showMessage();
-                }
-            }
-        }, 0, 1000);
+        timer.schedule(
+                new TimerTask() {
+                    @Override
+                    public void run() {
+                        if (controller.receiveMessage()) {
+                            globalChatView.showGlobalMessage();
+                            if (lobbyActivated) {
+                                lobbyChatView.showLobbyMessage();
+                            }
+                        }
+                    }
+                },
+                0,
+                REFRESH_TIME);
     }
 
     @FXML
-    public void initialize() {
-        inputField.setOnAction(event -> sendMessage());
-        sendButton.setOnAction(event -> sendMessage());
-        refreshButton.setOnAction(event -> showMessage());
-        chatScrollPane.vvalueProperty().bind(chatVBox.heightProperty());
+    public void initialize() {}
+
+    @FXML
+    public void setLobbyChat(int lobbyId) {
+        this.lobbyChatView =
+                new LobbyChatView(
+                        username, new ChatModel(ChatType.LOBBY, username), controller, lobbyId);
+
+        changeGlobalChatButton.setOnAction(event -> switchChat("globalChatButton"));
+        changeLobbyChatButton.setOnAction(event -> switchChat("lobbyChatButton"));
+        changeWhisperChatButton.setOnAction(event -> switchChat("whisperChatButton"));
+
+        ToggleGroup toggleGroup = new ToggleGroup();
+        changeGlobalChatButton.setToggleGroup(toggleGroup);
+        changeLobbyChatButton.setToggleGroup(toggleGroup);
+        changeWhisperChatButton.setToggleGroup(toggleGroup);
+        this.lobbyActivated = true;
     }
 
-    public void showMessage() {
-        while (chatmodel.count > 0) {
-            String msg = chatmodel.viewNextMessage();
-            Label label = new Label(msg);
-            label.getStyleClass().add("info-text");
-            label.setWrapText(true);
-            label.maxWidthProperty().bind(chatVBox.widthProperty().subtract(CHAT_PADDING));
-            chatVBox.getChildren().add(label);
-        }
+    @FXML
+    public void switchChat(String button) {
+        switch (button) {
+            case "globalChatButton":
+                globalChatView.setVisibility(true);
+                lobbyChatView.setVisibility(false);
 
-    }
+            case "lobbyChatButton":
+                globalChatView.setVisibility(false);
+                lobbyChatView.setVisibility(true);
 
-    public void sendMessage() {
-        String message = inputField.getText().trim();
-        if (!message.isEmpty()) {
-            inputField.clear();
-            this.controller.sendMessage(message, username);
+            case "whisperChatButton":
+                globalChatView.setVisibility(false);
+                lobbyChatView.setVisibility(false);
         }
     }
-
-    public void endController() { timer.cancel(); }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java
new file mode 100644
index 0000000..5483de1
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java
@@ -0,0 +1,69 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatController;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatModel;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatType;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.VBox;
+
+public class GlobalChatView {
+
+    private final String username;
+    private ChatModel globalChatModel;
+
+    private final ChatController controller;
+
+    @FXML private Button globalChatSendButton;
+
+    @FXML private TextField globalChatInputField;
+
+    @FXML private VBox globalChatVBox;
+
+    @FXML private VBox globalChat;
+
+    @FXML private ScrollPane globalChatScrollPane;
+
+    private static final int CHAT_PADDING = 20;
+
+    public GlobalChatView(String username, ChatModel globalChatModel, ChatController controller) {
+        this.username = username;
+        this.controller = controller;
+        this.globalChatModel = globalChatModel;
+    }
+
+    @FXML
+    public void initialize() {
+        globalChatInputField.setOnAction(event -> sendGlobalMessage());
+        globalChatSendButton.setOnAction(event -> sendGlobalMessage());
+        globalChatScrollPane.vvalueProperty().bind(globalChatVBox.heightProperty());
+    }
+
+    public void sendGlobalMessage() {
+        String message = globalChatInputField.getText().trim();
+        if (!message.isEmpty()) {
+            globalChatInputField.clear();
+            Message msg = new Message(ChatType.GLOBAL, 0, username, null, message);
+            controller.sendMessageToNetwork(msg);
+        }
+    }
+
+    public void showGlobalMessage() {
+        for (int i = 0; i < globalChatModel.count; i++) {
+            String msg = globalChatModel.viewNextMessage();
+            Label label = new Label(msg);
+            label.getStyleClass().add("info-text");
+            label.setWrapText(true);
+            label.maxWidthProperty().bind(globalChatVBox.widthProperty().subtract(CHAT_PADDING));
+            globalChatVBox.getChildren().add(label);
+        }
+    }
+
+    public void setVisibility(Boolean bool) {
+        globalChatVBox.setVisible(bool);
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java
new file mode 100644
index 0000000..21d7097
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java
@@ -0,0 +1,72 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatController;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatModel;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatType;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.VBox;
+
+public class LobbyChatView {
+
+    private final String username;
+    private final int lobbyId;
+    private ChatModel lobbyChatModel;
+
+    private final ChatController controller;
+
+    @FXML private Button lobbyChatSendButton;
+
+    @FXML private TextField lobbyChatInputField;
+
+    @FXML private VBox lobbyChatVBox;
+
+    @FXML private VBox lobbyChat;
+
+    @FXML private ScrollPane lobbyChatScrollPane;
+
+    private static final int CHAT_PADDING = 20;
+
+    public LobbyChatView(
+            String username, ChatModel lobbyChatModel, ChatController controller, int lobbyId) {
+        this.username = username;
+        this.controller = controller;
+        this.lobbyChatModel = lobbyChatModel;
+        this.lobbyId = lobbyId;
+    }
+
+    @FXML
+    public void initialize() {
+        lobbyChatInputField.setOnAction(event -> sendLobbyMessage());
+        lobbyChatSendButton.setOnAction(event -> sendLobbyMessage());
+        lobbyChatScrollPane.vvalueProperty().bind(lobbyChatVBox.heightProperty());
+    }
+
+    public void sendLobbyMessage() {
+        String message = lobbyChatInputField.getText().trim();
+        if (!message.isEmpty()) {
+            lobbyChatInputField.clear();
+            Message msg = new Message(ChatType.LOBBY, lobbyId, username, null, message);
+            controller.sendMessageToNetwork(msg);
+        }
+    }
+
+    public void showLobbyMessage() {
+        for (int i = 0; i < lobbyChatModel.count; i++) {
+            String msg = lobbyChatModel.viewNextMessage();
+            Label label = new Label(msg);
+            label.getStyleClass().add("info-text");
+            label.setWrapText(true);
+            label.maxWidthProperty().bind(lobbyChatVBox.widthProperty().subtract(CHAT_PADDING));
+            lobbyChatVBox.getChildren().add(label);
+        }
+    }
+
+    public void setVisibility(Boolean bool) {
+        lobbyChatVBox.setVisible(bool);
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/WhisperChatView.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/WhisperChatView.java
new file mode 100644
index 0000000..f4bdc9c
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/WhisperChatView.java
@@ -0,0 +1,3 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
+
+public class WhisperChatView {}
diff --git a/src/main/resources/ui-structure/Casinogameui.fxml b/src/main/resources/ui-structure/Casinogameui.fxml
index 08bbf56..0949137 100644
--- a/src/main/resources/ui-structure/Casinogameui.fxml
+++ b/src/main/resources/ui-structure/Casinogameui.fxml
@@ -5,12 +5,12 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.image.*?>
 
-<!-- Hauptcontainer: Verknüpft die UI mit dem CasinoGameController und lädt Casinogameui.css -->
+<!-- Hauptcontainer: Verknüpft die UI mit dem CasinoGameController und lädt casinogameui.css -->
 <AnchorPane xmlns="http://javafx.com/javafx/21"
             xmlns:fx="http://javafx.com/fxml/1"
             fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameController"
             styleClass="background"
-            stylesheets="@Casinogameui.css">
+            stylesheets="@casinogameui.css">
 
     <GridPane prefWidth="1200" prefHeight="800" AnchorPane.topAnchor="0" AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0">
         <columnConstraints>
@@ -78,14 +78,14 @@
             </VBox>
 
             <!-- TODO: Platzhalter: Chat-Box in Spalte 2: -->
-            <fx:include source="components/Chatbox.fxml" GridPane.columnIndex="2"/>
+            <fx:include source="components/chatui/chatbox.fxml" GridPane.columnIndex="2"/>
 
         </children>
     </GridPane>
 
     <!-- verschiebbare Taskbar -->
     <AnchorPane>
-        <fx:include fx:id="taskbarInclude" source="gameuicomponents/Taskbar.fxml"/>
+        <fx:include fx:id="taskbarInclude" source="gameuicomponents/taskbar.fxml"/>
     </AnchorPane>
 
     <!-- Gegner-Status 1: Eines von drei Panels, das Icon, Name und Kontostand des Mitspielers anzeigt -->
@@ -99,7 +99,7 @@
         </columnConstraints>
 
         <children>
-            <fx:include source="gameuicomponents/Playerstatus.fxml" GridPane.columnIndex="1"/>
+            <fx:include source="gameuicomponents/playerstatus.fxml" GridPane.columnIndex="1"/>
         </children>
     </GridPane>
 
@@ -114,7 +114,7 @@
         </columnConstraints>
 
         <children>
-            <fx:include source="gameuicomponents/Playerstatus.fxml" GridPane.columnIndex="1"/>
+            <fx:include source="gameuicomponents/playerstatus.fxml" GridPane.columnIndex="1"/>
         </children>
     </GridPane>
 
@@ -129,7 +129,7 @@
         </columnConstraints>
 
         <children>
-            <fx:include source="gameuicomponents/Playerstatus.fxml" GridPane.columnIndex="1"/>
+            <fx:include source="gameuicomponents/playerstatus.fxml" GridPane.columnIndex="1"/>
         </children>
     </GridPane>
 </AnchorPane>
diff --git a/src/main/resources/ui-structure/components/Chatbox.fxml b/src/main/resources/ui-structure/components/Chatbox.fxml
deleted file mode 100644
index c61e28e..0000000
--- a/src/main/resources/ui-structure/components/Chatbox.fxml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.geometry.Insets?>
-
-<!--
-    Dieses Fenster wird später mit den Serveranfragen verknüpft,
-    um Nachrichten von Mitspielern und Systemmeldungen in Echtzeit anzuzeigen.
-
-    Der Chat unterscheidet intern zwischen:
-    - Player-to-Player (Privater 2-Personen-Chat)
-    - Lobby-Chat (Aktueller Raum)
-    - Globaler Chat (Gesamter Server)
-
-    Features, die später implementiert werden sollen:
-    - Schicke Chat-Bubbles mit Namen und Uhrzeit.
--->
-
-<VBox xmlns="http://javafx.com/javafx/21"
-      xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatController"
-      alignment="CENTER"
-      stylesheets="@Chatui.css">
-
-    <!-- Innenabstand: Schafft oben, rechts und unten 30 Pixel Platz, links nur 10 Pixel (asymmetrisch) -->
-    <padding>
-        <Insets top="30" right="30" bottom="30" left="10"/>
-    </padding>
-
-    <children>
-        <VBox VBox.vgrow="ALWAYS"
-              styleClass="chat-box"
-              spacing="10"
-              maxWidth="Infinity">
-
-            <children>
-                <Label text="== CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
-                <Region minHeight="4" styleClass="chat-separator"/>
-
-                <!-- Chatnachrichten werden hier hinzugefügt -->
-                <ScrollPane fx:id="chatScrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER" VBox.vgrow="ALWAYS" styleClass="chat-scroll-pane">
-                    <content>
-                        <VBox fx:id="chatVBox" spacing="10" styleClass="chat-VBox"/>
-                    </content>
-                </ScrollPane>
-
-                <!-- Eingabebereich -->
-                <HBox spacing="10">
-                    <!-- TODO: Größe des TextFields dynamisch anpassen -->
-                    <TextField fx:id="inputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..." styleClass="gray-input-field" onAction="#sendMessage"/>
-                    <Button fx:id="sendButton" text="SENDEN" onAction="#sendMessage" styleClass="yellow-button"/>
-                </HBox>
-            </children>
-        </VBox>
-    </children>
-</VBox>
\ No newline at end of file
diff --git a/src/main/resources/ui-structure/components/chatui/chatbox.fxml b/src/main/resources/ui-structure/components/chatui/chatbox.fxml
new file mode 100644
index 0000000..d58b480
--- /dev/null
+++ b/src/main/resources/ui-structure/components/chatui/chatbox.fxml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.geometry.Insets?>
+
+<!--
+    Dieses Fenster wird später mit den Serveranfragen verknüpft,
+    um Nachrichten von Mitspielern und Systemmeldungen in Echtzeit anzuzeigen.
+
+    Der Chat unterscheidet intern zwischen:
+    - Player-to-Player (Privater 2-Personen-Chat)
+    - Lobby-Chat (Aktueller Raum)
+    - Globaler Chat (Gesamter Server)
+
+    Features, die später implementiert werden sollen:
+    - Schicke Chat-Bubbles mit Namen und Uhrzeit.
+-->
+
+<VBox xmlns="http://javafx.com/javafx/21"
+      xmlns:fx="http://javafx.com/fxml/1"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatViewController"
+      alignment="CENTER"
+      stylesheets="@chatui.css">
+
+    <!-- Innenabstand: Schafft oben, rechts und unten 30 Pixel Platz, links nur 10 Pixel (asymmetrisch) -->
+    <padding>
+        <Insets top="30" right="30" bottom="30" left="10"/>
+    </padding>
+
+    <children>
+
+        <fx:include source="globalchat.fxml"/>
+
+        <fx:include source="lobbychat.fxml"/>
+
+        <fx:include source="whisperchat.fxml"/>
+
+        <ButtonBar fx:id="buttonBar">
+            <padding>
+                <Insets>...</Insets>
+            </padding>
+            <buttons>
+                <ToggleButton fx:id="changeGlobalChatButton" text="Global Chat" onAction="#" styleClass="yellow-button"/>
+                <ToggleButton fx:id="changeLobbyChatButton" text="Lobby Chat" onAction="#" styleClass="yellow-button"/>
+                <ToggleButton fx:id="changeWhisperChatButton" text="Whisper Chat" onAction="#" styleClass="yellow-button"/>
+            </buttons>
+        </ButtonBar>
+
+    </children>
+</VBox>
\ No newline at end of file
diff --git a/src/main/resources/ui-structure/components/Chatui.css b/src/main/resources/ui-structure/components/chatui/chatui.css
similarity index 100%
rename from src/main/resources/ui-structure/components/Chatui.css
rename to src/main/resources/ui-structure/components/chatui/chatui.css
diff --git a/src/main/resources/ui-structure/components/chatui/globalchat.fxml b/src/main/resources/ui-structure/components/chatui/globalchat.fxml
new file mode 100644
index 0000000..73c2325
--- /dev/null
+++ b/src/main/resources/ui-structure/components/chatui/globalchat.fxml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<!-- VBox for the global chat, should only be visible when activated via changeGlobalChatButton-->
+<VBox fx:id="globalChatVBox"
+      VBox.vgrow="ALWAYS"
+      styleClass="chat-box"
+      spacing="10"
+      maxWidth="Infinity"
+      visible="true"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.GlobalChatView">
+
+    <children>
+        <Label text="== GLOBAL CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
+        <Region minHeight="4" styleClass="chat-separator"/>
+
+        <!-- Chatnachrichten werden hier hinzugefügt -->
+        <ScrollPane fx:id="globalChatScrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER"
+                    VBox.vgrow="ALWAYS" styleClass="chat-scroll-pane">
+            <content>
+                <VBox fx:id="globalChat" spacing="10" styleClass="chat-VBox"/>
+            </content>
+        </ScrollPane>
+
+        <!-- Eingabebereich -->
+        <HBox spacing="10">
+            <!-- TODO: Größe des TextFields dynamisch anpassen -->
+            <TextField fx:id="globalChatInputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..."
+                       styleClass="gray-input-field" onAction="#sendGlobalMessage"/>
+            <Button fx:id="globalChatSendButton" text="SENDEN" onAction="#sendGlobalMessage"
+                    styleClass="yellow-button"/>
+        </HBox>
+    </children>
+</VBox>
+
diff --git a/src/main/resources/ui-structure/components/chatui/lobbychat.fxml b/src/main/resources/ui-structure/components/chatui/lobbychat.fxml
new file mode 100644
index 0000000..7bbe557
--- /dev/null
+++ b/src/main/resources/ui-structure/components/chatui/lobbychat.fxml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<!-- VBox for the lobby chat, should only be visible when activated via changeLobbyChatButton-->
+
+<VBox fx:id="lobbyChatVBox"
+      VBox.vgrow="ALWAYS"
+      styleClass="chat-box"
+      spacing="10"
+      maxWidth="Infinity"
+      visible="false"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.LobbyChatView">
+
+    <children>
+        <Label text="== LOBBY CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
+        <Region minHeight="4" styleClass="chat-separator"/>
+
+        <!-- Chatnachrichten werden hier hinzugefügt -->
+        <ScrollPane fx:id="lobbyChatScrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER" VBox.vgrow="ALWAYS" styleClass="chat-scroll-pane">
+            <content>
+                <VBox fx:id="lobbyChat" spacing="10" styleClass="chat-VBox"/>
+            </content>
+        </ScrollPane>
+
+        <!-- Eingabebereich -->
+        <HBox spacing="10">
+            <!-- TODO: Größe des TextFields dynamisch anpassen -->
+            <TextField fx:id="lobbyChatInputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..." styleClass="gray-input-field" onAction="#sendLobbyMessage"/>
+            <Button fx:id="lobbyChatSendButton" text="SENDEN" onAction="#sendLobbyMessage" styleClass="yellow-button"/>
+        </HBox>
+    </children>
+</VBox>
diff --git a/src/main/resources/ui-structure/components/chatui/whisperchat.fxml b/src/main/resources/ui-structure/components/chatui/whisperchat.fxml
new file mode 100644
index 0000000..9994dd1
--- /dev/null
+++ b/src/main/resources/ui-structure/components/chatui/whisperchat.fxml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<!-- VBox for the whisper chat, should only be visible when activated via changeWhisperChatButton-->
+
+<VBox fx:id="whisperChatVBox"
+      VBox.vgrow="ALWAYS"
+      styleClass="chat-box"
+      spacing="10"
+      maxWidth="Infinity"
+      visible="false">
+
+    <children>
+        <Label text="== WHISPER CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
+        <Region minHeight="4" styleClass="chat-separator"/>
+        <!-- Chatnachrichten werden hier hinzugefügt
+        <ScrollPane fx:id="chatScrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER" VBox.vgrow="ALWAYS" styleClass="chat-scroll-pane">
+            <content>
+                <VBox fx:id="chatVBox" spacing="10" styleClass="chat-VBox"/>
+            </content>
+        </ScrollPane>
+
+
+        <HBox spacing="10">
+            <TextField fx:id="inputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..." styleClass="gray-input-field" onAction="#sendMessage"/>
+            <Button fx:id="sendButton" text="SENDEN" onAction="#sendMessage" styleClass="yellow-button"/>
+        </HBox>
+        -->
+    </children>
+</VBox>
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatControllerTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatControllerTest.java
deleted file mode 100644
index a18c5b7..0000000
--- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatControllerTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.client.chat;
-
-import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
-import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI;
-import ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui.Casinomainui;
-import ch.unibas.dmi.dbis.cs108.casono.server.ServerApp;
-import javafx.application.Application;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-public class ChatControllerTest {
-
-    @BeforeEach
-    public void setup() {
-    }
-
-    @AfterEach
-    public void teardown() {
-
-    }
-
-    @Test
-    public void testChatController() {
-        Client client = new Client("user1");
-        client.startApplication();
-    }
-}

From ce71992e175ac636e5cb0590f5ba9dccfef6ef08 Mon Sep 17 00:00:00 2001
From: Julian Kropff <j.kropff@stud.unibas.ch>
Date: Thu, 2 Apr 2026 10:54:47 +0200
Subject: [PATCH 04/10] Add: Client Network Architecture Documentation

---
 .../networking/client-network-architecture.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 documents/docs/networking/client-network-architecture.md

diff --git a/documents/docs/networking/client-network-architecture.md b/documents/docs/networking/client-network-architecture.md
new file mode 100644
index 0000000..a6bdb28
--- /dev/null
+++ b/documents/docs/networking/client-network-architecture.md
@@ -0,0 +1,19 @@
+# Client Nework Architecture
+
+```text
+client/
+ └── network/
+      ├── LobbyClient.java
+      ├── ChatClient.java
+      ├── GameClient.java
+      └── ClientService.java
+```
+
+## LobbyClient.java
+
+## ChatClient.java
+
+## GameClient.java
+
+## ClientService.java
+

From eda51f8ac5583f7560697a8c981382cbe1ca62c8 Mon Sep 17 00:00:00 2001
From: Mathis Ginkel <m.ginkel@stud.unibas.ch>
Date: Thu, 2 Apr 2026 11:16:40 +0200
Subject: [PATCH 05/10] Add: CoreClient and ChatClient

---
 .../casono/client/chat/ChatController.java    | 14 +++--
 .../casono/client/network/ChatClient.java     | 45 ++++++++++++++++
 .../casono/client/network/ClientService.java  | 51 +------------------
 .../casono/client/network/CoreClient.java     | 17 +++++++
 4 files changed, 73 insertions(+), 54 deletions(-)
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
index 9a04d44..71ae97b 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
@@ -1,5 +1,6 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.chat;
 
+import ch.unibas.dmi.dbis.cs108.casono.client.network.ChatClient;
 import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
 import java.util.ArrayList;
 import java.util.List;
@@ -14,12 +15,14 @@ public class ChatController {
     private final ClientService clientService;
 
     private final ArrayList<ChatModel> chatModelArrayList;
+    private final ChatClient chatClient;
 
     public ChatController(String username, ClientService clientService) {
         this.username = username;
         this.clientService = clientService;
         chatModelArrayList = new ArrayList<>();
         chatModelArrayList.add(new ChatModel(ChatType.GLOBAL, username));
+        chatClient = new ChatClient(clientService);
     }
 
     public void createLobbyChat(int lobbyId, ChatType chatType) {
@@ -29,7 +32,7 @@ public class ChatController {
 
     /** method to get all messages from the server */
     public Boolean receiveMessage() {
-        List<Message> newMessages = clientService.getMessages();
+        List<Message> newMessages = chatClient.getMessages();
         if (!newMessages.isEmpty()) {
             for (Message msg : newMessages) {
                 switch (msg.getMessageType()) {
@@ -51,8 +54,11 @@ public class ChatController {
         }
     }
 
-    /** method to send a message to the server */
-    public void sendMessageToNetwork(Message message) {
-        clientService.sendMessage(message);
+    /**
+     * method to send a message to the server
+     * @param message
+     */
+    public void onSendToNetwork(Message message) {
+        chatClient.sendMessage(message);
     }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
new file mode 100644
index 0000000..b9f30c4
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
@@ -0,0 +1,45 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.network;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChatClient {
+
+    private ClientService clientService;
+
+    public ChatClient(ClientService clientService) {
+        this.clientService = clientService;
+    }
+
+    /**
+     * sends a message to the server
+     * @param message
+     */
+
+    public void sendMessage(Message message) {
+        String request = "SEND_MESSAGE " + message.toArgsString();
+        clientService.processCommand(request);
+    }
+
+    /**
+     * Send a Request to get the number of Messages currently in the Queue for the client.
+     * Then proceeds, if needed, to get the messages by sending
+     */
+
+    public List<Message> getMessages() {
+        String countStr = clientService.processCommand("GET_MESSAGE_COUNT");
+        int count = Integer.parseInt(countStr);
+        System.out.println("Got " + count + " messages");
+        List<Message> messages = new ArrayList<>();
+        for (int i = 0; i < count; i++) {
+            String  message = clientService.processCommand("GET_NEXT_MESSAGE");
+            if (message != null) {
+                Message message1 = Message.toMessage(message);
+                messages.add(message1);
+            }
+        }
+        return messages;
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
index aaf1332..df64b61 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
@@ -8,7 +8,6 @@ import org.apache.logging.log4j.Logger;
 import java.io.IOException;
 import java.net.Socket;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -56,54 +55,6 @@ public class ClientService {
 
     }
 
-    /**
-     * Sends a ping to the server Returns nothing, the method processMessage() already handles the
-     * cases "+OK" or "-ERROR"
-     */
-    public void ping() {
-        processMessage("PING");
-    }
-
-    /**
-     * Sends a login request to the server to create a new user on the server
-     *
-     * @param username
-     * @return - a new username, if the same username is already used by someone else
-     */
-    public String login(String username) {
-        String msg = "LOGIN USERNAME=" + username;
-        return processMessage(msg);
-    }
-
-    /**
-     * Send a Request to get the number of Messages currently in the Queue for the client. Then
-     * proceeds, if needed, to get the messages by sending
-     */
-    public List<Message> getMessages() {
-        String countStr = processMessage("GET_MESSAGE_COUNT");
-        int count = Integer.parseInt(countStr);
-        logger.info("Got " + count + " messages");
-        List<Message> messages = new ArrayList<>();
-        for (int i = 0; i < count; i++) {
-            String message = processMessage("GET_NEXT_MESSAGE");
-            if (message != null) {
-                Message message1 = Message.toMessage(message);
-                messages.add(message1);
-            }
-        }
-        return messages;
-    }
-
-    /**
-     * Sends a Request to the Server containing all relevant information of the message the client
-     * wrote.
-     *
-     * @param message
-     */
-    public void sendMessage(Message message) {
-        String request = "SEND_MESSAGE " + message.toArgsString();
-        processMessage(request);
-    }
 
     /**
      * Sends the Requests to the server and waits for the response If the response is "+OK" it
@@ -112,7 +63,7 @@ public class ClientService {
      * @param message
      * @return - The response as a string, if it has to be returned (+OK will not be returned)
      */
-    private String processMessage(String message) {
+    protected String processCommand(String message) {
         AtomicReference<String> response = new AtomicReference<>();
         sendRequest(
                 () -> {
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java
new file mode 100644
index 0000000..92902bc
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java
@@ -0,0 +1,17 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.network;
+
+public class CoreClient {
+    private final ClientService clientService;
+
+    public CoreClient(ClientService clientservice) {
+        this.clientService = clientservice;
+    }
+
+    public void ping() {
+        clientService.processCommand("PING");
+    }
+
+    public void login(String user) {
+        clientService.processCommand("LOGIN USERNAME=" + user);
+    }
+}
\ No newline at end of file

From 60ed1ced919e593c7acf8877bea83855677118f2 Mon Sep 17 00:00:00 2001
From: Julian Kropff <j.kropff@stud.unibas.ch>
Date: Thu, 2 Apr 2026 16:08:24 +0200
Subject: [PATCH 06/10] Add: initial client structure for game and network

---
 .../dbis/cs108/casono/client/game/Card.java   |   9 ++
 .../cs108/casono/client/game/GameState.java   |  23 ++++
 .../dbis/cs108/casono/client/game/Player.java |  17 +++
 .../casono/client/network/ChatClient.java     |  30 ++++-
 .../casono/client/network/ClientService.java  |  45 +++++--
 .../casono/client/network/CoreClient.java     |  24 +++-
 .../casono/client/network/GameClient.java     | 125 ++++++++++++++++++
 .../casono/client/network/LobbyClient.java    |  64 +++++++++
 8 files changed, 315 insertions(+), 22 deletions(-)
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/game/Card.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/game/GameState.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/game/Player.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/GameClient.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/LobbyClient.java

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/game/Card.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/game/Card.java
new file mode 100644
index 0000000..1d2a7f4
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/game/Card.java
@@ -0,0 +1,9 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.game;
+
+/**
+ * Represents a playing card with a value and suit.
+ */
+public class Card {
+    public String value;
+    public String suit;
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/game/GameState.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/game/GameState.java
new file mode 100644
index 0000000..8cd2183
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/game/GameState.java
@@ -0,0 +1,23 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.game;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.game.Card;
+import ch.unibas.dmi.dbis.cs108.casono.client.game.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents the current state of the poker game, including the phase, pot
+ * size, current bet, dealer position,
+ * active player, community cards, and player information.
+ */
+public class GameState {
+    public String phase;
+    public int pot;
+    public int currentBet;
+    public int dealer;
+    public int activePlayer;
+
+    public List<Card> communityCards = new ArrayList<>();
+    public List<Player> players = new ArrayList<>();
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/game/Player.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/game/Player.java
new file mode 100644
index 0000000..2702d97
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/game/Player.java
@@ -0,0 +1,17 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.game;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents a player in the poker game, including their name, chip count,
+ * current bet, state (e.g., "active", "folded"), and their hole cards.
+ */
+public class Player {
+    public String name;
+    public int chips;
+    public int bet;
+    public String state;
+
+    public List<Card> cards = new ArrayList<>();
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
index b9f30c4..e5a17cb 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
@@ -5,36 +5,52 @@ import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * The ChatClient class is responsible for sending messages to the server and
+ * retrieving messages from the server. It uses the ClientService to send
+ * commands and receive responses from the server.
+ */
 public class ChatClient {
 
     private ClientService clientService;
 
+    /**
+     * Constructs a ChatClient with the given ClientService for communication.
+     *
+     * @param clientService The ClientService instance used to send commands and
+     *                      receive responses from the server.
+     */
     public ChatClient(ClientService clientService) {
         this.clientService = clientService;
     }
 
     /**
-     * sends a message to the server
-     * @param message
+     * Send a Message to the server by converting it to a string format and
+     * sending a "SEND_MESSAGE" command with the message content as arguments.
+     *
+     * @param message The Message object to be sent to the server.
      */
-
     public void sendMessage(Message message) {
         String request = "SEND_MESSAGE " + message.toArgsString();
         clientService.processCommand(request);
     }
 
     /**
-     * Send a Request to get the number of Messages currently in the Queue for the client.
-     * Then proceeds, if needed, to get the messages by sending
+     * Retrieve messages from the server by first sending a "GET_MESSAGE_COUNT"
+     * command to determine how many messages are available and then sending
+     * "GET_NEXT_MESSAGE" commands in a loop to retrieve each message. The
+     * retrieved messages are parsed into Message objects and returned as a list.
+     *
+     * @return A list of Message objects representing the messages retrieved from
+     *         the server.
      */
-
     public List<Message> getMessages() {
         String countStr = clientService.processCommand("GET_MESSAGE_COUNT");
         int count = Integer.parseInt(countStr);
         System.out.println("Got " + count + " messages");
         List<Message> messages = new ArrayList<>();
         for (int i = 0; i < count; i++) {
-            String  message = clientService.processCommand("GET_NEXT_MESSAGE");
+            String message = clientService.processCommand("GET_NEXT_MESSAGE");
             if (message != null) {
                 Message message1 = Message.toMessage(message);
                 messages.add(message1);
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
index df64b61..e5785a9 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
@@ -16,8 +16,11 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
- * Responsible for the transferring of the data from the Client to the Server and the other way
- * around
+ * The ClientService class is responsible for managing the connection to the
+ * server,
+ * sending commands, and receiving responses. It uses a TcpTransport to
+ * communicate
+ * with the server and an ExecutorService to handle asynchronous requests.
  */
 public class ClientService {
 
@@ -29,13 +32,13 @@ public class ClientService {
     public static ArrayList<String> response;
     private final AtomicInteger idGenerator;
     private final Logger logger;
-
-    /**
-     * Creates a new ClientSession with a Socket, a Reader and Writer of the Input- and the
-     * Outputstream and a pool of threads to send requests and receive responses.
+    /*
+     * Constructs a ClientService with the given server IP and port. It establishes
+     * a socket connection to the server and initializes the TcpTransport and
+     * ExecutorService for communication.
      *
-     * @param ip : ip-adress of the server
-     * @param port : port of the server
+     * @param ip   The IP address of the server to connect to.
+     * @param port The port number of the server to connect to.
      */
     public ClientService(String ip, int port) {
 
@@ -55,7 +58,6 @@ public class ClientService {
 
     }
 
-
     /**
      * Sends the Requests to the server and waits for the response If the response is "+OK" it
      * proceeds normal If the response "-ERROR" it throws a runtime exception
@@ -88,7 +90,13 @@ public class ClientService {
     }
 
     /**
-     * @param request
+     * Helper method to send a request to the server using the ExecutorService. It
+     * submits the request as a Runnable task and waits for its completion. If
+     * the task is interrupted or encounters an execution exception, it throws a
+     * RuntimeException with the appropriate cause.
+     *
+     * @param request The Runnable task representing the request to be sent to the
+     *                server.
      */
     private void sendRequest(Runnable request) {
         Future<?> future = executor.submit(request);
@@ -102,10 +110,14 @@ public class ClientService {
     }
 
     /**
-     * Returns a Runtime Exceptions thrown by the sendRequest method
+     * Helper method to extract the cause of an exception and return it as a
+     * RuntimeException. If the cause is null, it returns the original exception as
+     * a RuntimeException. If the cause is already a RuntimeException, it returns
+     * it directly. Otherwise, it wraps the cause in a new RuntimeException and
+     * returns it.
      *
-     * @param e - an Exception
-     * @return - a Runtime Exception
+     * @param e The exception from which to extract the cause.
+     * @return A RuntimeException representing the cause of the original exception.
      */
     private static RuntimeException getRuntimeException(Exception e) {
         Throwable reason = e.getCause();
@@ -119,7 +131,12 @@ public class ClientService {
         return re;
     }
 
-    /** Closes the Socket and shuts down the Threadpool associated with that Socket-Connection. */
+    /**
+     * Closes the socket connection to the server and shuts down the
+     * ExecutorService.
+     * It also closes the TcpTransport used for communication. If any IOException
+     * occurs during this process, it prints the exception to the console.
+     */
     public void closeSocket() {
         try {
             executor.shutdown();
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java
index 92902bc..2db2111 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java
@@ -1,17 +1,39 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.network;
 
+/**
+ * The CoreClient class provides basic functionalities for communicating with
+ * the
+ * server, such as sending a ping command to check connectivity and logging in
+ * with a username. It uses the ClientService to send commands and receive
+ * responses from the server.
+ */
 public class CoreClient {
     private final ClientService clientService;
 
+    /**
+     * Constructs a CoreClient with the given ClientService for communication.
+     *
+     * @param clientservice The ClientService instance used to send commands and
+     *                      receive responses from the server.
+     */
     public CoreClient(ClientService clientservice) {
         this.clientService = clientservice;
     }
 
+    /**
+     * Sends a "PING" command to the server to check connectivity. The server
+     * should respond with a "PONG" message if the connection is successful.
+     */
     public void ping() {
         clientService.processCommand("PING");
     }
 
+    /**
+     * Logs in to the server with the given username by sending a "LOGIN" command.
+     *
+     * @param user The username to log in with.
+     */
     public void login(String user) {
         clientService.processCommand("LOGIN USERNAME=" + user);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/GameClient.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/GameClient.java
new file mode 100644
index 0000000..0ae8225
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/GameClient.java
@@ -0,0 +1,125 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.network;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.game.Card;
+import ch.unibas.dmi.dbis.cs108.casono.client.game.GameState;
+import ch.unibas.dmi.dbis.cs108.casono.client.game.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The GameClient class is responsible for communicating with the server to
+ * retrieve the current game state. It sends a command to the server and
+ * parses the response into a structured GameState object.
+ */
+public class GameClient {
+
+    private final ClientService client;
+
+    /**
+     * Constructs a GameClient with the given ClientService for communication.
+     *
+     * @param client The ClientService instance used to send commands and receive
+     *               responses from the server.
+     */
+    public GameClient(ClientService client) {
+        this.client = client;
+    }
+
+    /**
+     * Retrieves the current game state from the server by sending a command and
+     * parsing the response.
+     *
+     * @return A GameState object representing the current state of the game.
+     */
+    public GameState getGameState() {
+        String response = client.processCommand("GET_GAME_STATE");
+        return parseGameState(response);
+    }
+
+    /**
+     * Parses the raw response from the server into a structured GameState object.
+     *
+     * @param input The raw response string from the server.
+     * @return A GameState object representing the current state of the game.
+     */
+    private GameState parseGameState(String input) {
+
+        GameState state = new GameState();
+
+        String[] lines = input.split("\n");
+
+        Player currentPlayer = null;
+        Card currentCard = null;
+
+        for (String rawLine : lines) {
+
+            String line = rawLine.trim();
+
+            if (line.startsWith("+OK") || line.equals("END")) {
+                continue;
+            }
+
+            if (line.startsWith("PHASE=")) {
+                state.phase = line.split("=")[1];
+            }
+
+            else if (line.startsWith("POT=")) {
+                state.pot = Integer.parseInt(line.split("=")[1]);
+            }
+
+            else if (line.startsWith("CURRENT_BET=")) {
+                state.currentBet = Integer.parseInt(line.split("=")[1]);
+            }
+
+            else if (line.startsWith("DEALER=")) {
+                state.dealer = Integer.parseInt(line.split("=")[1]);
+            }
+
+            else if (line.startsWith("ACTIVE_PLAYER=")) {
+                state.activePlayer = Integer.parseInt(line.split("=")[1]);
+            }
+
+            else if (line.startsWith("PLAYER")) {
+                currentPlayer = new Player();
+                state.players.add(currentPlayer);
+            }
+
+            else if (line.startsWith("NAME=") && currentPlayer != null) {
+                currentPlayer.name = line.split("=")[1];
+            }
+
+            else if (line.startsWith("CHIPS=") && currentPlayer != null) {
+                currentPlayer.chips = Integer.parseInt(line.split("=")[1]);
+            }
+
+            else if (line.startsWith("BET=") && currentPlayer != null) {
+                currentPlayer.bet = Integer.parseInt(line.split("=")[1]);
+            }
+
+            else if (line.startsWith("STATE=") && currentPlayer != null) {
+                currentPlayer.state = line.split("=")[1];
+            }
+
+            else if (line.startsWith("CARD")) {
+                currentCard = new Card();
+
+                if (currentPlayer != null) {
+                    currentPlayer.cards.add(currentCard);
+                } else {
+                    state.communityCards.add(currentCard);
+                }
+            }
+
+            else if (line.startsWith("VALUE=") && currentCard != null) {
+                currentCard.value = line.split("=")[1];
+            }
+
+            else if (line.startsWith("SUIT=") && currentCard != null) {
+                currentCard.suit = line.split("=")[1];
+            }
+        }
+
+        return state;
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/LobbyClient.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/LobbyClient.java
new file mode 100644
index 0000000..996f767
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/LobbyClient.java
@@ -0,0 +1,64 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.network;
+
+/**
+ * The LobbyClient class is responsible for communicating with the server to
+ * manage game lobbies. It provides methods to create a lobby, join a lobby,
+ * and fetch the current status of a lobby by sending appropriate commands to
+ * the server and processing the responses.
+ */
+public class LobbyClient {
+    private final ClientService client;
+
+    /**
+     * Constructs a LobbyClient with the given ClientService for communication.
+     *
+     * @param client The ClientService instance used to send commands and receive
+     *               responses from the server.
+     */
+    public LobbyClient(ClientService client) {
+        this.client = client;
+    }
+
+    /**
+     * Fetch the current status of the lobby with the given id from the server.
+     *
+     * @param lobbyId The id of the lobby to fetch the status for.
+     * @return A string representing the current status of the lobby, as returned
+     *         by the server.
+     */
+    public String fetchLobbyStatusString(int lobbyId) {
+        return client.processCommand("GET_LOBBY_STATUS ID=" + lobbyId);
+    }
+
+    /**
+     * Request the server to create a new lobby and return the id of the newly
+     * created lobby.
+     *
+     * @return The id of the newly created lobby, as returned by the server.
+     */
+    public int createLobby() {
+        String response = client.processCommand("CREATE_LOBBY");
+        return Integer.parseInt(response);
+    }
+
+    /**
+     * Request the server to return the id of the lobby that the client is
+     * currently in.
+     *
+     * @return The id of the lobby that the client is currently in, as returned by
+     *         the server.
+     */
+    public int getLobbyId() {
+        String response = client.processCommand("GET_LOBBY_ID");
+        return Integer.parseInt(response);
+    }
+
+    /**
+     * Request the server to join the lobby with the given id.
+     *
+     * @param lobbyId The id of the lobby to join.
+     */
+    public void joinLobby(int lobbyId) {
+        client.processCommand("JOIN_LOBBY ID=" + lobbyId);
+    }
+}

From 73756b7d246d1044f1254edbd544882d5f504f6e Mon Sep 17 00:00:00 2001
From: Julian Kropff <j.kropff@stud.unibas.ch>
Date: Thu, 2 Apr 2026 16:10:33 +0200
Subject: [PATCH 07/10] Add: documentation for client network architecture

---
 .../networking/client-network-architecture.md | 242 +++++++++++++++++-
 1 file changed, 236 insertions(+), 6 deletions(-)

diff --git a/documents/docs/networking/client-network-architecture.md b/documents/docs/networking/client-network-architecture.md
index a6bdb28..38733fe 100644
--- a/documents/docs/networking/client-network-architecture.md
+++ b/documents/docs/networking/client-network-architecture.md
@@ -1,19 +1,249 @@
 # Client Nework Architecture
+<!-- vim-markdown-toc GFM -->
+
+* [Architecture Overview](#architecture-overview)
+    * [network/Card.java](#networkcardjava)
+    * [network/GameState.java](#networkgamestatejava)
+    * [network/Player.java](#networkplayerjava)
+    * [network/ChatClient.java](#networkchatclientjava)
+        * [ChatClient(ClientService clientService)](#chatclientclientservice-clientservice)
+        * [sendMessage(Message message)](#sendmessagemessage-message)
+        * [getMessages()](#getmessages)
+    * [network/ClientService.java](#networkclientservicejava)
+        * [ClientService(String ip, int port)](#clientservicestring-ip-int-port)
+        * [processCommand(String message)](#processcommandstring-message)
+        * [sendRequest(Runnable request)](#sendrequestrunnable-request)
+        * [getRuntimeException(Exception e)](#getruntimeexceptionexception-e)
+        * [closeSocket()](#closesocket)
+        * [writeToTransport(String s) throws IOException](#writetotransportstring-s-throws-ioexception)
+    * [network/CoreClient.java](#networkcoreclientjava)
+        * [CoreClient(ClientService clientservice)](#coreclientclientservice-clientservice)
+        * [ping()](#ping)
+        * [login(String user)](#loginstring-user)
+    * [network/GameClient.java](#networkgameclientjava)
+        * [GameClient(ClientService client)](#gameclientclientservice-client)
+        * [getGameState()](#getgamestate)
+        * [parseGameState(String input)](#parsegamestatestring-input)
+        * [Example server response](#example-server-response)
+    * [network/LobbyClient.java](#networklobbyclientjava)
+        * [LobbyClient(ClientService client)](#lobbyclientclientservice-client)
+        * [fetchLobbyStatusString(int lobbyId)](#fetchlobbystatusstringint-lobbyid)
+        * [createLobby()](#createlobby)
+        * [getLobbyId()](#getlobbyid)
+        * [joinLobby(int lobbyId)](#joinlobbyint-lobbyid)
+
+<!-- vim-markdown-toc -->
+
+## Architecture Overview
 
 ```text
 client/
+ ├── game/
+ │    ├── Card.java
+ │    ├── GameState.java
+ │    └── Player.java
+ │
  └── network/
-      ├── LobbyClient.java
       ├── ChatClient.java
+      ├── ClientService.java
+      ├── CoreClient.java
       ├── GameClient.java
-      └── ClientService.java
+      └── LobbyClient.java
 ```
 
-## LobbyClient.java
+### game/Card.java
 
-## ChatClient.java
+Represents a playing card with a value and suit.
 
-## GameClient.java
+### game/GameState.java
 
-## ClientService.java
+Represents the current state of the poker game, including the phase, pot size, current bet, dealer position, active player, community cards, and player information.
 
+### game/Player.java
+
+Represents a player in the poker game, including their name, chip count, current bet, state (e.g., `active`, `folded`), and their hole cards.
+
+### network/ChatClient.java
+
+The ChatClient class is responsible for sending messages to the server and retrieving messages from the server. It uses the ClientService to send commands and receive responses from the server.
+
+#### ChatClient(ClientService clientService)
+
+Constructs a ChatClient with the given ClientService for communication.
+ 
+- **Parameter (`clientService`)**: The ClientService instance used to send commands and receive responses from the server.
+
+#### sendMessage(Message message)
+
+Send a Message to the server by converting it to a string format and sending a `SEND_MESSAGE` command with the message content as arguments.
+ 
+- **Parameter (`message`)**: message The Message object to be sent to the server.
+
+#### getMessages()
+
+Retrieve messages from the server by first sending a `GET_MESSAGE_COUNT` command to determine how many messages are available and then sending `GET_NEXT_MESSAGE` commands in a loop to retrieve each message. The retrieved messages are parsed into Message objects and returned as a list.
+ 
+- **Parameter (`A`)**: list of Message objects representing the messages retrieved from the server.
+
+### network/ClientService.java
+
+The ClientService class is responsible for managing the connection to the server, sending commands, and receiving responses. It uses a TcpTransport to
+communicate with the server and an ExecutorService to handle asynchronous requests.
+
+#### ClientService(String ip, int port)
+
+Constructs a ClientService with the given server IP and port. It establishes a socket connection to the server and initializes the TcpTransport and ExecutorService for communication.
+
+- **Parameter (`ip`)**: The IP address of the server to connect to.
+- **Parameter (`port`)**: The port number of the server to connect to.
+
+#### processCommand(String message)
+
+Sends a command to the server and waits for the response. The command is sent using the TcpTransport, and the response is read in a loop until a valid response is received. The method handles `+OK` and `-ERROR` responses from the server and returns the actual response content.
+
+- **Parameter (`message`)**: The command message to be sent to the server.
+- **Return**: The response from the server as a string.
+
+#### sendRequest(Runnable request)
+
+Helper method to send a request to the server using the ExecutorService. It submits the request as a Runnable task and waits for its completion. If the task is interrupted or encounters an execution exception, it throws a
+RuntimeException with the appropriate cause.
+ 
+- **Parameter (`request`)**: The Runnable task representing the request to be sent to the server.
+
+#### getRuntimeException(Exception e)
+
+Helper method to extract the cause of an exception and return it as a RuntimeException. If the cause is null, it returns the original exception as a RuntimeException. If the cause is already a RuntimeException, it returns it directly. Otherwise, it wraps the cause in a new RuntimeException and returns it.
+ 
+- **Parameter (`e`)**: The exception from which to extract the cause.
+- **Return**: A RuntimeException representing the cause of the original exception.
+
+#### closeSocket()
+
+Closes the socket connection to the server and shuts down the ExecutorService. It also closes the TcpTransport used for communication. If any IOException occurs during this process, it prints the exception to the console.
+
+#### writeToTransport(String s) throws IOException
+
+Helper method to write a command string to the TcpTransport. It generates a unique ID for the command using the idGenerator and sends a RawPacket containing the ID and the command string to the server. If an IOException occurs during this process, it throws a RuntimeException with the cause.
+ 
+- **Parameter (`s`)**: The command string to be sent to the server.
+- **Throws IOException**: If an I/O error occurs while writing to the transport.
+
+### network/CoreClient.java
+
+The CoreClient class provides basic functionalities for communicating with the server, such as sending a ping command to check connectivity and logging in with a username. It uses the ClientService to send commands and receive responses from the server.
+
+#### CoreClient(ClientService clientservice)
+
+Constructs a CoreClient with the given ClientService for communication.
+
+- **Parameter (`clientservice`)**: The ClientService instance used to send commands and receive responses from the server.
+
+#### ping()
+
+Sends a `PING` command to the server to check connectivity. The server should respond with a `PONG` message if the connection is successful.
+
+#### login(String user)
+
+Logs in to the server with the given username by sending a `LOGIN` command.
+
+- **Parameter (`user`)**: The username to log in with.
+
+### network/GameClient.java
+
+The GameClient class is responsible for communicating with the server to retrieve the current game state. It sends a command to the server and parses the response into a structured GameState object.
+
+#### GameClient(ClientService client)
+
+Constructs a GameClient with the given ClientService for communication.
+
+- **Parameter (`client`)**: The ClientService instance used to send commands and receive responses from the server.
+
+#### getGameState()
+
+Retrieves the current game state from the server by sending a command and parsing the response.
+
+- **Return**: A GameState object representing the current state of the game.
+
+#### parseGameState(String input)
+
+Parses the raw response from the server into a structured GameState object.
+
+- **Parameter (`input`)**: The raw response string from the server.
+- **Return**: A GameState object representing the current state of the game.
+
+#### Example server response
+
+```text
++OK
+    PHASE=FLO P
+    POT=150
+    CURRENT_BET=50
+    DEALER=0
+    ACTIVE_PLAYER=1
+    CARDS
+        CARD 
+            VALUE=10
+            SUIT=H
+        CARD 
+            VALUE=7
+            SUIT=S
+        CARD 
+            VALUE=A
+            SUIT=D
+    PLAYERS
+        PLAYER
+            NAME=Max
+            CHIPS=1200
+            BET=50
+            STATE=ACTIVE
+            CARDS
+                CARD 
+                    VALUE=K
+                    SUIT=H
+                CARD 
+                    VALUE=3
+                    SUIT=C
+        PLAYER
+            NAME=Anna
+            CHIPS=800
+            BET=0
+            STATE=FOLDED
+            CARDS
+END
+```
+
+### network/LobbyClient.java
+
+The LobbyClient class is responsible for communicating with the server to manage game lobbies. It provides methods to create a lobby, join a lobby, and fetch the current status of a lobby by sending appropriate commands to the server and processing the responses.
+
+#### LobbyClient(ClientService client)
+
+Constructs a LobbyClient with the given ClientService for communication.
+
+- **Parameter (`client`)**: The ClientService instance used to send commands and receive responses from the server.
+
+#### fetchLobbyStatusString(int lobbyId)
+
+Fetch the current status of the lobby with the given id from the server.
+
+- **Parameter (`lobbyId`)**: The id of the lobby to fetch the status for.
+- **Return**: A string representing the current status of the lobby, as returned by the server.
+
+#### createLobby()
+
+Request the server to create a new lobby and return the id of the newly created lobby.
+
+- **Return**: The id of the newly created lobby, as returned by the server.
+
+#### getLobbyId()
+
+Request the server to return the id of the lobby that the client is currently in.
+
+- **Return**: The id of the lobby that the client is currently in, as returned by the server.
+
+#### joinLobby(int lobbyId)
+
+Request the server to join the lobby with the given id.
+ 
+- **Parameter (`lobbyId`)**: The id of the lobby to join.

From aca61cbd523ec37d33638fc91f1a882eca1d70e0 Mon Sep 17 00:00:00 2001
From: Jona Walpert <jona.walpert@stud.unibas.ch>
Date: Thu, 2 Apr 2026 16:31:27 +0200
Subject: [PATCH 08/10] Add: first (non functioning) modified version of lobby
 button controlelr with abckend conenction

---
 .../ui/lobbyui/LobbyButtonGridManager.java    | 243 ++++++++++++++++--
 1 file changed, 218 insertions(+), 25 deletions(-)

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java
index 3f75b0f..eb5d143 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java
@@ -5,6 +5,11 @@ package ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui;
  * ButtonID to LobbyID.
  */
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ThreadLocalRandom;
+import ch.unibas.dmi.dbis.cs108.casono.client.network.LobbyClient;
+import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
+import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
@@ -13,7 +18,8 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 /**
- * Manages the grid for lobby buttons and rendering. Uses LobbyButtonTranslationManager for mapping
+ * Manages the grid for lobby buttons and rendering. Uses
+ * LobbyButtonTranslationManager for mapping
  * ButtonID to LobbyID.
  */
 public class LobbyButtonGridManager {
@@ -36,24 +42,61 @@ public class LobbyButtonGridManager {
     /** Path to the button image. */
     private static final String BUTTON_IMAGE_PATH = "/images/logo.png";
 
+    /** Image for a lobby in CREATED state. */
+    /** Default fallback image. */
+    private static final String BUTTON_FALLBACK_IMAGE = "/images/lobbypictures/error.png";
+
+    /**
+     * Template for per-button images. Use: button index and status
+     * (created|running). Example:
+     * /images/lobby_1_created.png
+     */
+    private static final String BUTTON_IMAGE_TEMPLATE = "/images/lobbypictures/lobby_%d_%s.png";
+
+    /** Cache for loaded Images keyed by resource path. */
+    private final ConcurrentHashMap<String, Image> imageCache = new ConcurrentHashMap<>();
+
     /** Max random lobby id. */
     private static final int MAX_RANDOM_LOBBY_ID = 10000;
 
+    private final LobbyClient lobbyClient;
+
     /**
      * Constructor for the GridManager.
      *
-     * @param gridPane the GridPane for rendering
+     * @param gridPane           the GridPane for rendering
      * @param translationManager the manager for mapping ButtonID to LobbyID
      */
     public LobbyButtonGridManager(
             GridPane gridPane, LobbyButtonTranslationManager translationManager) {
-        this.gridPane = gridPane;
-        // Singleton immer verwenden
-        this.translationManager = LobbyButtonTranslationManager.getInstance();
+        this(gridPane, translationManager, createDefaultLobbyClient());
     }
 
     /**
-     * Renders all lobby buttons in the grid. Creates a button for each mapping with image and event
+     * Constructor that accepts a `LobbyClient` implementation.
+     */
+    public LobbyButtonGridManager(
+            GridPane gridPane, LobbyButtonTranslationManager translationManager, LobbyClient lobbyClient) {
+        this.gridPane = gridPane;
+        // Always use the singleton
+        this.translationManager = LobbyButtonTranslationManager.getInstance();
+        this.lobbyClient = lobbyClient;
+    }
+
+    private static LobbyClient createDefaultLobbyClient() {
+        String host = System.getProperty("casono.server.host", "127.0.0.1");
+        int port = 1337;
+        try {
+            port = Integer.parseInt(System.getProperty("casono.server.port", "1337"));
+        } catch (NumberFormatException e) {
+            // use default port if parsing fails
+        }
+        return new LobbyClient(new ClientService(host, port));
+    }
+
+    /**
+     * Renders all lobby buttons in the grid. Creates a button for each mapping with
+     * image and event
      * handler.
      */
     public void renderLobbyButtons() {
@@ -66,12 +109,15 @@ public class LobbyButtonGridManager {
         }
         for (Map.Entry<Integer, Integer> entry : mapping.entrySet()) {
             int buttonId = entry.getKey();
+            int lobbyId = entry.getValue();
             Button btn = new Button();
             btn.setId("lobbyBtn-" + buttonId);
-            ImageView imageView =
-                    new ImageView(new Image(getClass().getResourceAsStream(BUTTON_IMAGE_PATH)));
+            // Set image based on lobby status (initial)
+            LobbyStatus initialStatus = getLobbyStatus(lobbyId);
+            Image image = safeLoadImage(getImagePathForButton(buttonId, initialStatus));
+            ImageView imageView = new ImageView(image);
             imageView.setPreserveRatio(true);
-            // Dynamische Breite: Bindung an die Zellengröße
+            // Dynamic width: bind to the cell size
             imageView
                     .fitWidthProperty()
                     .bind(gridPane.widthProperty().divide(COLS).subtract(BUTTON_WIDTH_MARGIN));
@@ -85,9 +131,9 @@ public class LobbyButtonGridManager {
             GridPane.setVgrow(btn, javafx.scene.layout.Priority.ALWAYS);
             btn.setOnAction(
                     e -> {
-                        Integer lobbyId = translationManager.getLobbyIdForButton(buttonId);
-                        if (lobbyId != null) {
-                            joinLobby(lobbyId);
+                        Integer targetLobbyId = translationManager.getLobbyIdForButton(buttonId);
+                        if (targetLobbyId != null) {
+                            joinLobby(targetLobbyId);
                         }
                     });
             int row = index / COLS;
@@ -97,16 +143,141 @@ public class LobbyButtonGridManager {
         }
     }
 
+    /** Possible lobby statuses. */
+    private enum LobbyStatus {
+        CREATED,
+        RUNNING
+    }
+
     /**
-     * Placeholder for lobby creation logic. Returns a generated lobbyId.
+     * Return the current status of a lobby.
+     *
+     * @param lobbyId the lobby id to query
+     * @return the lobby status (mapped from server string; CREATED or RUNNING)
+     */
+    public LobbyStatus getLobbyStatus(int lobbyId) {
+        String serverStatus = lobbyClient.fetchLobbyStatusString(lobbyId);
+        LobbyStatus parsed = parseLobbyStatus(serverStatus);
+        if (parsed == null) {
+            // Defensive fallback
+            LOGGER.error("Unrecognized lobby status '{}' for lobby {}. Defaulting to CREATED.", serverStatus, lobbyId);
+            return LobbyStatus.CREATED;
+        }
+        return parsed;
+    }
+
+    /**
+     * Parse a status string returned by the server into the local enum.
+     * Accepts case-insensitive values like "created" / "CREATED" / "running".
+     * Returns null if the string is not recognized.
+     */
+    private LobbyStatus parseLobbyStatus(String statusStr) {
+        if (statusStr == null)
+            return null;
+        try {
+            return LobbyStatus.valueOf(statusStr.trim().toUpperCase());
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    private String getImagePathForStatus(LobbyStatus status) {
+        return status == LobbyStatus.CREATED
+                ? String.format(BUTTON_IMAGE_TEMPLATE, 0, "created")
+                : String.format(BUTTON_IMAGE_TEMPLATE, 0, "running");
+    }
+
+    private String getImagePathForButton(int buttonId, LobbyStatus status) {
+        String statusStr = status == LobbyStatus.CREATED ? "created" : "running";
+        return String.format(BUTTON_IMAGE_TEMPLATE, buttonId, statusStr);
+    }
+
+    private Image safeLoadImage(String path) {
+        // Return cached image if present
+        Image cached = imageCache.get(path);
+        if (cached != null) {
+            return cached;
+        }
+        // Attempt to load the requested resource
+        java.io.InputStream is = getClass().getResourceAsStream(path);
+        if (is == null) {
+            LOGGER.debug(
+                    "Image resource not found: {}. Falling back to {}",
+                    path,
+                    BUTTON_FALLBACK_IMAGE);
+            is = getClass().getResourceAsStream(BUTTON_FALLBACK_IMAGE);
+        }
+        Image loaded = null;
+        try {
+            if (is != null) {
+                loaded = new Image(is);
+            } else {
+                LOGGER.error(
+                        "Both requested image '{}' and fallback '{}' are missing. No image will be set.",
+                        path,
+                        BUTTON_FALLBACK_IMAGE);
+            }
+        } catch (Exception e) {
+            LOGGER.error("Failed to load image '{}'", path, e);
+        }
+        if (loaded == null) {
+            // leave
+            // null
+        }
+        if (loaded != null) {
+            imageCache.put(path, loaded);
+        }
+        return loaded;
+    }
+
+    /** Update all lobby buttons' images according to the current lobby statuses. */
+    public void updateLobbyButtonImages() {
+        // Run on FX thread to be safe
+        javafx.application.Platform.runLater(
+                () -> {
+                    Map<Integer, Integer> mapping = translationManager.getButtonIdToLobbyId();
+                    for (Map.Entry<Integer, Integer> entry : mapping.entrySet()) {
+                        int buttonId = entry.getKey();
+                        int lobbyId = entry.getValue();
+                        LobbyStatus status = getLobbyStatus(lobbyId);
+                        String path = getImagePathForButton(buttonId, status);
+                        for (Node node : gridPane.getChildren()) {
+                            if (node instanceof Button
+                                    && ("lobbyBtn-" + buttonId).equals(node.getId())) {
+                                Button btn = (Button) node;
+                                ImageView iv = new ImageView(safeLoadImage(path));
+                                iv.setPreserveRatio(true);
+                                iv.fitWidthProperty()
+                                        .bind(
+                                                gridPane.widthProperty()
+                                                        .divide(COLS)
+                                                        .subtract(BUTTON_WIDTH_MARGIN));
+                                iv.setSmooth(true);
+                                btn.setGraphic(iv);
+                                break;
+                            }
+                        }
+                    }
+                });
+    }
+
+    /**
+     * Creates a new lobby via the LobbyClient.
      *
      * @return The generated lobbyId
      */
     public int createLobby() {
-        // TODO: Replace with actual lobby creation logic
-        int lobbyId = (int) (Math.random() * MAX_RANDOM_LOBBY_ID + 1);
-        LOGGER.info("Lobby created: {}", lobbyId);
-        return lobbyId;
+        try {
+            int lobbyId = lobbyClient.createLobby();
+            LOGGER.info("Lobby created via LobbyClient: {}", lobbyId);
+            return lobbyId;
+        } catch (Exception e) {
+            LOGGER.error("Failed to create lobby via LobbyClient: {}", e.getMessage());
+            // Fallback: generate a local id so UI can continue to work in offline mode
+            int lobbyId = (int) (Math.random() * MAX_RANDOM_LOBBY_ID + 1);
+            LOGGER.warn("Falling back to local generated lobby id: {}", lobbyId);
+            return lobbyId;
+        }
     }
 
     /**
@@ -115,20 +286,41 @@ public class LobbyButtonGridManager {
      * @param lobbyId The lobbyId to join
      */
     public void joinLobby(int lobbyId) {
-        // Game-UI starten und Lobby-UI schließen
+        // Request server to join the lobby (blackbox client may throw on failure)
         LOGGER.info("Joining lobby: {}", lobbyId);
+        try {
+            lobbyClient.joinLobby(lobbyId);
+        } catch (Exception e) {
+            LOGGER.error("LobbyClient failed to join lobby {}: {}", lobbyId, e.getMessage());
+            return;
+        }
         javafx.application.Platform.runLater(
                 () -> {
-                    // Lobby-Stage schließen
-                    javafx.stage.Stage currentStage =
-                            (javafx.stage.Stage) gridPane.getScene().getWindow();
-                    currentStage.close();
-                    // Game-UI starten
+                    // Hide lobby stage (do not close) so we can return later
+                    javafx.scene.Scene scene = gridPane.getScene();
+                    javafx.stage.Stage currentStage = (javafx.stage.Stage) scene.getWindow();
+                    currentStage.hide();
+                    // Prepare game stage and set a handler so that when it is closed the lobby is
+                    // shown and updated
+                    javafx.stage.Stage gameStage = new javafx.stage.Stage();
+                    gameStage.setOnHidden(
+                            ev -> {
+                                try {
+                                    currentStage.show();
+                                    updateLobbyButtonImages();
+                                } catch (Exception ex) {
+                                    LOGGER.error(
+                                            "Error while returning to lobby: {}", ex.getMessage());
+                                }
+                            });
+                    // Start the Game UI using the prepared stage
                     try {
                         new ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI()
-                                .start(new javafx.stage.Stage());
+                                .start(gameStage);
                     } catch (Exception e) {
-                        LOGGER.error("Fehler beim Starten der Game-UI: {}", e.getMessage());
+                        LOGGER.error("Error starting Game UI: {}", e.getMessage());
+                        // If starting fails, show the lobby again
+                        currentStage.show();
                     }
                 });
     }
@@ -141,4 +333,5 @@ public class LobbyButtonGridManager {
     public javafx.scene.layout.GridPane getGridPane() {
         return gridPane;
     }
+
 }

From d1d2fb30e8cf5e1226f041af3383259e805882c8 Mon Sep 17 00:00:00 2001
From: Mathis Ginkel <m.ginkel@stud.unibas.ch>
Date: Fri, 3 Apr 2026 15:52:03 +0200
Subject: [PATCH 09/10] Fix: small changes to ChatUI

---
 .../dbis/cs108/casono/client/ClientApp.java   |  4 ++
 .../casono/client/chat/ChatController.java    |  4 ++
 .../client/ui/chatui/ChatViewController.java  | 26 +++++++-----
 .../client/ui/chatui/GlobalChatView.java      | 10 +++--
 .../client/ui/chatui/LobbyChatView.java       |  2 +-
 .../resources/ui-structure/Casinomainui.fxml  |  2 +-
 .../components/chatui/chatbox.fxml            | 34 ++++++++-------
 .../components/chatui/globalchat.fxml         | 41 +++++++++----------
 .../components/chatui/lobbychat.fxml          |  4 +-
 .../components/chatui/whisperchat.fxml        |  4 +-
 .../cs108/casono/client/chat/ChatTest.java    | 11 +++++
 11 files changed, 85 insertions(+), 57 deletions(-)
 create mode 100644 src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatTest.java

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ClientApp.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ClientApp.java
index d5e2e2a..fa680ba 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ClientApp.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ClientApp.java
@@ -38,4 +38,8 @@ public class ClientApp {
         LOGGER.info("You've selected the client. It will connect port {} at host {}", port, host);
         Launcher.main(new String[] {});
     }
+
+    public static void main(String[] args) {
+        start(args[0]);
+    }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
index 71ae97b..c3a809f 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
@@ -25,6 +25,10 @@ public class ChatController {
         chatClient = new ChatClient(clientService);
     }
 
+    public ChatModel getChatModel(int index) {
+        return chatModelArrayList.get(index);
+    }
+
     public void createLobbyChat(int lobbyId, ChatType chatType) {
         ChatModel chatModel = new ChatModel(chatType, username, lobbyId);
         chatModelArrayList.add(chatModel);
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
index 5d7683e..17d07ec 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
@@ -3,18 +3,23 @@ package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatController;
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatModel;
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatType;
+
+import java.net.URL;
+import java.util.ResourceBundle;
 import java.util.Timer;
 import java.util.TimerTask;
 import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.VBox;
 
 /** Responsible for the presentation of the ChatModel to the Client */
-public class ChatViewController {
+public class ChatViewController implements Initializable {
 
-    private final GlobalChatView globalChatView;
+    private final ChatModel globalChatModel;
+    private GlobalChatView globalChatView;
 
     private LobbyChatView lobbyChatView;
 
@@ -26,10 +31,6 @@ public class ChatViewController {
 
     private Boolean lobbyActivated;
 
-    @FXML private VBox whisperChatVBox;
-
-    @FXML private VBox whisperChat;
-
     @FXML private ToggleButton changeGlobalChatButton;
 
     @FXML private ToggleButton changeLobbyChatButton;
@@ -50,9 +51,8 @@ public class ChatViewController {
             String username, ChatModel globalChatModel, ChatController controller) {
         this.username = username;
         this.controller = controller;
-        this.globalChatView =
-                new GlobalChatView(username, new ChatModel(ChatType.GLOBAL, username), controller);
         this.timer = new Timer();
+        this.globalChatModel = globalChatModel;
         timer.schedule(
                 new TimerTask() {
                     @Override
@@ -69,10 +69,14 @@ public class ChatViewController {
                 REFRESH_TIME);
     }
 
-    @FXML
-    public void initialize() {}
+    
+    @Override
+    public void initialize(URL location, ResourceBundle resourceBundle) {
+        this.globalChatView =
+                new GlobalChatView(username, globalChatModel, controller);
+
+    }
 
-    @FXML
     public void setLobbyChat(int lobbyId) {
         this.lobbyChatView =
                 new LobbyChatView(
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java
index 5483de1..dab5782 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java
@@ -4,6 +4,8 @@ import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatController;
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatModel;
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatType;
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
@@ -28,6 +30,8 @@ public class GlobalChatView {
 
     @FXML private ScrollPane globalChatScrollPane;
 
+    final BooleanProperty isContentVisible = new SimpleBooleanProperty(true);
+
     private static final int CHAT_PADDING = 20;
 
     public GlobalChatView(String username, ChatModel globalChatModel, ChatController controller) {
@@ -36,11 +40,11 @@ public class GlobalChatView {
         this.globalChatModel = globalChatModel;
     }
 
-    @FXML
     public void initialize() {
         globalChatInputField.setOnAction(event -> sendGlobalMessage());
         globalChatSendButton.setOnAction(event -> sendGlobalMessage());
         globalChatScrollPane.vvalueProperty().bind(globalChatVBox.heightProperty());
+        globalChatVBox.visibleProperty().bind(isContentVisible);
     }
 
     public void sendGlobalMessage() {
@@ -48,7 +52,7 @@ public class GlobalChatView {
         if (!message.isEmpty()) {
             globalChatInputField.clear();
             Message msg = new Message(ChatType.GLOBAL, 0, username, null, message);
-            controller.sendMessageToNetwork(msg);
+            controller.onSendToNetwork(msg);
         }
     }
 
@@ -64,6 +68,6 @@ public class GlobalChatView {
     }
 
     public void setVisibility(Boolean bool) {
-        globalChatVBox.setVisible(bool);
+        this.isContentVisible.set(bool);
     }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java
index 21d7097..7163d9d 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java
@@ -51,7 +51,7 @@ public class LobbyChatView {
         if (!message.isEmpty()) {
             lobbyChatInputField.clear();
             Message msg = new Message(ChatType.LOBBY, lobbyId, username, null, message);
-            controller.sendMessageToNetwork(msg);
+            controller.onSendToNetwork(msg);
         }
     }
 
diff --git a/src/main/resources/ui-structure/Casinomainui.fxml b/src/main/resources/ui-structure/Casinomainui.fxml
index 7cae21e..1ec9a0f 100644
--- a/src/main/resources/ui-structure/Casinomainui.fxml
+++ b/src/main/resources/ui-structure/Casinomainui.fxml
@@ -106,7 +106,7 @@
             </VBox>
 
             <!-- RECHTER BEREICH (Info-Box) -->
-            <fx:include source="components/Chatbox.fxml" GridPane.columnIndex="2"/>
+            <fx:include source="components/chatui/chatbox.fxml" GridPane.columnIndex="2"/>
         </children>
     </GridPane>
 </AnchorPane>
diff --git a/src/main/resources/ui-structure/components/chatui/chatbox.fxml b/src/main/resources/ui-structure/components/chatui/chatbox.fxml
index d58b480..e090466 100644
--- a/src/main/resources/ui-structure/components/chatui/chatbox.fxml
+++ b/src/main/resources/ui-structure/components/chatui/chatbox.fxml
@@ -14,10 +14,10 @@
     - Globaler Chat (Gesamter Server)
 
     Features, die später implementiert werden sollen:
-    - Schicke Chat-Bubbles mit Namen und Uhrzeit.
+    - Schicke Chat-Bubbles mit Namen und Uhrzeit./home/mathis/dev/Gruppe-13/src/main/resources/ui-structure/gameuicomponents/chatui
 -->
 
-<VBox xmlns="http://javafx.com/javafx/21"
+<StackPane xmlns="http://javafx.com/javafx/21"
       xmlns:fx="http://javafx.com/fxml/1"
       fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatViewController"
       alignment="CENTER"
@@ -28,24 +28,22 @@
         <Insets top="30" right="30" bottom="30" left="10"/>
     </padding>
 
-    <children>
 
-        <fx:include source="globalchat.fxml"/>
+    <fx:include source="globalchat.fxml"/>
 
-        <fx:include source="lobbychat.fxml"/>
+    <fx:include source="lobbychat.fxml"/>
 
-        <fx:include source="whisperchat.fxml"/>
+    <fx:include source="whisperchat.fxml"/>
 
-        <ButtonBar fx:id="buttonBar">
-            <padding>
-                <Insets>...</Insets>
-            </padding>
-            <buttons>
-                <ToggleButton fx:id="changeGlobalChatButton" text="Global Chat" onAction="#" styleClass="yellow-button"/>
-                <ToggleButton fx:id="changeLobbyChatButton" text="Lobby Chat" onAction="#" styleClass="yellow-button"/>
-                <ToggleButton fx:id="changeWhisperChatButton" text="Whisper Chat" onAction="#" styleClass="yellow-button"/>
-            </buttons>
-        </ButtonBar>
+    <ButtonBar fx:id="buttonBar">
+        <padding>
+            <Insets>...</Insets>
+        </padding>
+        <buttons>
+            <ToggleButton fx:id="changeGlobalChatButton" text="Global Chat" onAction="#switchChat" styleClass="yellow-button"/>
+            <ToggleButton fx:id="changeLobbyChatButton" text="Lobby Chat" styleClass="yellow-button"/>
+            <ToggleButton fx:id="changeWhisperChatButton" text="Whisper Chat" styleClass="yellow-button"/>
+        </buttons>
+    </ButtonBar>
 
-    </children>
-</VBox>
\ No newline at end of file
+</StackPane>
\ No newline at end of file
diff --git a/src/main/resources/ui-structure/components/chatui/globalchat.fxml b/src/main/resources/ui-structure/components/chatui/globalchat.fxml
index 73c2325..906855b 100644
--- a/src/main/resources/ui-structure/components/chatui/globalchat.fxml
+++ b/src/main/resources/ui-structure/components/chatui/globalchat.fxml
@@ -7,7 +7,9 @@
 <?import javafx.scene.layout.*?>
 
 <!-- VBox for the global chat, should only be visible when activated via changeGlobalChatButton-->
-<VBox fx:id="globalChatVBox"
+<VBox xmlns="http://javafx.com/javafx/21"
+      xmlns:fx="http://javafx.com/fxml/1"
+      fx:id="globalChatVBox"
       VBox.vgrow="ALWAYS"
       styleClass="chat-box"
       spacing="10"
@@ -15,26 +17,23 @@
       visible="true"
       fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.GlobalChatView">
 
-    <children>
-        <Label text="== GLOBAL CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
-        <Region minHeight="4" styleClass="chat-separator"/>
+    <Label text="== GLOBAL CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
+    <Region minHeight="4" styleClass="chat-separator"/>
+    <!-- Chatnachrichten werden hier hinzugefügt -->
+    <ScrollPane fx:id="globalChatScrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER"
+                VBox.vgrow="ALWAYS" styleClass="chat-scroll-pane">
+        <content>
+            <VBox fx:id="globalChat" spacing="10" styleClass="chat-VBox"/>
+        </content>
+    </ScrollPane>
 
-        <!-- Chatnachrichten werden hier hinzugefügt -->
-        <ScrollPane fx:id="globalChatScrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER"
-                    VBox.vgrow="ALWAYS" styleClass="chat-scroll-pane">
-            <content>
-                <VBox fx:id="globalChat" spacing="10" styleClass="chat-VBox"/>
-            </content>
-        </ScrollPane>
-
-        <!-- Eingabebereich -->
-        <HBox spacing="10">
-            <!-- TODO: Größe des TextFields dynamisch anpassen -->
-            <TextField fx:id="globalChatInputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..."
-                       styleClass="gray-input-field" onAction="#sendGlobalMessage"/>
-            <Button fx:id="globalChatSendButton" text="SENDEN" onAction="#sendGlobalMessage"
-                    styleClass="yellow-button"/>
-        </HBox>
-    </children>
+    <!-- Eingabebereich -->
+    <HBox spacing="10">
+        <!-- TODO: Größe des TextFields dynamisch anpassen -->
+        <TextField fx:id="globalChatInputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..."
+                   styleClass="gray-input-field" onAction="#sendGlobalMessage"/>
+        <Button fx:id="globalChatSendButton" text="SENDEN" onAction="#sendGlobalMessage"
+                styleClass="yellow-button"/>
+    </HBox>
 </VBox>
 
diff --git a/src/main/resources/ui-structure/components/chatui/lobbychat.fxml b/src/main/resources/ui-structure/components/chatui/lobbychat.fxml
index 7bbe557..3488296 100644
--- a/src/main/resources/ui-structure/components/chatui/lobbychat.fxml
+++ b/src/main/resources/ui-structure/components/chatui/lobbychat.fxml
@@ -8,7 +8,9 @@
 
 <!-- VBox for the lobby chat, should only be visible when activated via changeLobbyChatButton-->
 
-<VBox fx:id="lobbyChatVBox"
+<VBox xmlns="http://javafx.com/javafx/21"
+      xmlns:fx="http://javafx.com/fxml/1"
+      fx:id="lobbyChatVBox"
       VBox.vgrow="ALWAYS"
       styleClass="chat-box"
       spacing="10"
diff --git a/src/main/resources/ui-structure/components/chatui/whisperchat.fxml b/src/main/resources/ui-structure/components/chatui/whisperchat.fxml
index 9994dd1..18953e8 100644
--- a/src/main/resources/ui-structure/components/chatui/whisperchat.fxml
+++ b/src/main/resources/ui-structure/components/chatui/whisperchat.fxml
@@ -8,7 +8,9 @@
 
 <!-- VBox for the whisper chat, should only be visible when activated via changeWhisperChatButton-->
 
-<VBox fx:id="whisperChatVBox"
+<VBox xmlns="http://javafx.com/javafx/21"
+      xmlns:fx="http://javafx.com/fxml/1"
+      fx:id="whisperChatVBox"
       VBox.vgrow="ALWAYS"
       styleClass="chat-box"
       spacing="10"
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatTest.java
new file mode 100644
index 0000000..31f9964
--- /dev/null
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatTest.java
@@ -0,0 +1,11 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.chat;
+
+import org.junit.jupiter.api.Test;
+
+public class ChatTest {
+
+    @Test
+    public void chatTest() {
+        Client.main(new String[]{"mathis"});
+    }
+}

From 509aa71d9fd704f2a15ed9221b295729a08116e6 Mon Sep 17 00:00:00 2001
From: Mathis Ginkel <m.ginkel@stud.unibas.ch>
Date: Tue, 7 Apr 2026 22:08:16 +0200
Subject: [PATCH 10/10] Add: Implement Commands for Chat Protocol

---
 build.gradle                                  |   2 +-
 .../casono/client/chat/ChatController.java    |  86 +++++++++----
 .../cs108/casono/client/chat/ChatModel.java   |  61 +++++----
 .../cs108/casono/client/chat/Message.java     |  60 +++++++--
 .../casono/client/network/ChatClient.java     |  13 +-
 .../casono/client/network/ClientService.java  |  32 +++--
 .../casono/client/network/CoreClient.java     |   1 -
 .../client/ui/chatui/ChatBoxController.java   |  63 +++++++++
 .../client/ui/chatui/ChatViewController.java  | 120 +++++++-----------
 .../client/ui/chatui/GlobalChatView.java      |  73 -----------
 .../client/ui/chatui/LobbyChatView.java       |  72 -----------
 .../client/ui/chatui/WhisperChatView.java     |   3 -
 .../client/ui/lobbyui/Casinomainui.java       |   4 +-
 .../dbis/cs108/casono/server/ServerApp.java   |  35 ++++-
 .../check_nick/CheckUsernameParser.java       |   2 +-
 .../check_nick/CheckUsernameResponse.java     |   4 +-
 .../check_nick/UsernameAvailability.java      |   2 +-
 .../GetMessageCountHandler.java               |  40 ++++++
 .../GetMessageCountParser.java                |  13 ++
 .../GetMessageCountRequest.java               |  10 ++
 .../GetMessageCountResponse.java              |  13 ++
 .../GetNextMessageHandler.java                |  41 ++++++
 .../GetNextMessageParser.java                 |  13 ++
 .../GetNextMessageRequest.java                |  10 ++
 .../GetNextMessageResponse.java               |  14 ++
 .../send_message/SendMessageHandler.java      |  30 +++++
 .../send_message/SendMessageParser.java       |  13 ++
 .../send_message/SendMessageRequest.java      |  19 +++
 .../server/domain/message/MessageManager.java |   4 +-
 .../cs108/casono/server/domain/user/User.java |  11 +-
 .../protocol/response/SuccessResponse.java    |   4 +-
 .../components/chatui/chatbox.fxml            |  56 +++-----
 .../chatui/{globalchat.fxml => chattab.fxml}  |  24 ++--
 .../components/chatui/lobbychat.fxml          |  39 ------
 .../components/chatui/whisperchat.fxml        |  37 ------
 .../dbis/cs108/casono/client/chat/Chat.java   |   9 ++
 .../casono/client/chat/ChatApplication.java   |  48 +++++++
 .../cs108/casono/client/chat/ChatTest.java    |   2 +-
 38 files changed, 644 insertions(+), 439 deletions(-)
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatBoxController.java
 delete mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java
 delete mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java
 delete mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/WhisperChatView.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountHandler.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountParser.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountRequest.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountResponse.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageHandler.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageParser.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageRequest.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageResponse.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageHandler.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageParser.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageRequest.java
 rename src/main/resources/ui-structure/components/chatui/{globalchat.fxml => chattab.fxml} (52%)
 delete mode 100644 src/main/resources/ui-structure/components/chatui/lobbychat.fxml
 delete mode 100644 src/main/resources/ui-structure/components/chatui/whisperchat.fxml
 create mode 100644 src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Chat.java
 create mode 100644 src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatApplication.java

diff --git a/build.gradle b/build.gradle
index 4360c82..6f82563 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     // Source: https://mvnrepository.com/artifact/org.apache.logging.log4j
     implementation("org.apache.logging.log4j:log4j-api:2.25.3")
     runtimeOnly("org.apache.logging.log4j:log4j-core:2.25.3")
-
+    implementation("org.jspecify:jspecify:1.0.0")
     // Source: https://mvnrepository.com/artifact/org.fusesource.jansi/jansi
     runtimeOnly("org.fusesource.jansi:jansi:2.4.2")
 
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
index c3a809f..a3861a5 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
@@ -2,8 +2,15 @@ package ch.unibas.dmi.dbis.cs108.casono.client.chat;
 
 import ch.unibas.dmi.dbis.cs108.casono.client.network.ChatClient;
 import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
-import java.util.ArrayList;
+import ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatBoxController;
+import org.jspecify.annotations.Nullable;
+
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.Map;
 import java.util.List;
+import java.util.LinkedHashMap;
+
 
 /**
  * responsible for the transferring of messages from the server to the ChatModel or from the
@@ -12,49 +19,84 @@ import java.util.List;
 public class ChatController {
 
     private final String username;
-    private final ClientService clientService;
 
-    private final ArrayList<ChatModel> chatModelArrayList;
     private final ChatClient chatClient;
 
+    public ChatBoxController getChatBoxController() {
+        return chatBoxController;
+    }
+
+    private final ChatBoxController chatBoxController;
+    private int lobbyId = -1;
+    private final Timer timer;
+
+
+    public record ChatKey(ChatType type, @Nullable String targetUser){
+        public ChatKey(ChatType type){
+            this(type, null);
+        }
+    }
+
+    public Map<ChatKey, ChatModel> getChatModelMap() {
+        return chatModelMap;
+    }
+
+    private Map<ChatKey, ChatModel> chatModelMap;
+
+    private static final long REFRESH_TIME = 1000;
+
     public ChatController(String username, ClientService clientService) {
         this.username = username;
-        this.clientService = clientService;
-        chatModelArrayList = new ArrayList<>();
-        chatModelArrayList.add(new ChatModel(ChatType.GLOBAL, username));
         chatClient = new ChatClient(clientService);
+        chatModelMap = new LinkedHashMap<>();
+        this.chatBoxController = new ChatBoxController(username, this);
+        this.timer = new Timer();
+        timer.schedule(
+                new TimerTask() {
+                    @Override
+                    public void run() {
+                        clientService.ping();
+                        receiveMessage();
+                    }
+                },
+                0,
+                REFRESH_TIME);
     }
 
-    public ChatModel getChatModel(int index) {
-        return chatModelArrayList.get(index);
-    }
-
-    public void createLobbyChat(int lobbyId, ChatType chatType) {
-        ChatModel chatModel = new ChatModel(chatType, username, lobbyId);
-        chatModelArrayList.add(chatModel);
+    public void setLobbyChat(int lobbyId) {
+        this.lobbyId = lobbyId;
+        ChatModel lobbyChatModel = new ChatModel(ChatType.LOBBY, username, lobbyId, null);
+        chatModelMap.put(new ChatKey(ChatType.LOBBY), lobbyChatModel);
     }
 
     /** method to get all messages from the server */
-    public Boolean receiveMessage() {
+    public void receiveMessage() {
         List<Message> newMessages = chatClient.getMessages();
         if (!newMessages.isEmpty()) {
             for (Message msg : newMessages) {
                 switch (msg.getMessageType()) {
                     case ChatType.GLOBAL:
-                        chatModelArrayList.get(0).addMessage(msg);
+                        chatModelMap.get(new ChatKey(ChatType.GLOBAL)).addMessage(msg);
                     case ChatType.LOBBY:
-                        ChatModel chatModel = chatModelArrayList.get(1);
-                        if (chatModel != null && chatModel.lobbyId == msg.lobbyId) {
-                            chatModel.addMessage(msg);
+                        if (msg.lobbyId == lobbyId) {
+                            chatModelMap.computeIfAbsent(new ChatKey(ChatType.LOBBY),
+                                    (_key) -> new ChatModel(ChatType.LOBBY, username, msg.lobbyId, null)).addMessage(msg);
                         }
                     case ChatType.WHISPER:
                         // TODO: Check, if target person is user and if yes, iterate through all
-                        // whisper chats.
+                        if (msg.target.equals(username)) {
+                            if (chatModelMap.containsKey(new ChatKey(ChatType.WHISPER, msg.sender))) {
+                                chatModelMap.get(new ChatKey(ChatType.WHISPER, msg.sender)).addMessage(msg);
+                            } else {
+                                ChatModel value = new ChatModel(ChatType.WHISPER, username, -1, msg.sender);
+                                chatModelMap.put(new ChatKey(ChatType.WHISPER, msg.sender), value);
+                                chatBoxController.addWhisperChat(msg.sender, value);
+                            }
+                        }
+
+
                 }
             }
-            return true;
-        } else {
-            return false;
         }
     }
 
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
index 6fd4177..894d957 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
@@ -1,5 +1,9 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.chat;
 
+import ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatViewController;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+
 import java.util.ArrayList;
 
 /**
@@ -11,33 +15,30 @@ public class ChatModel {
 
     public ArrayList<Message> messages;
 
-    private ChatType chattype;
+    private final ChatType chattype;
 
-    public String username;
+    /**
+     * The person currently using this client
+     */
+    public final String username;
 
-    public int count;
+    /**
+     * The person to send the message to
+     * If the chat is a whisper chat
+     */
+    private final String target;
+
+    private final IntegerProperty count;
 
     public int lobbyId;
 
-    /**
-     * Creates a new ChatModel, given a username of the client
-     *
-     * @param chattype
-     * @param username
-     */
-    public ChatModel(ChatType chattype, String username) {
+    public ChatModel(ChatType chattype, String username, int lobbyId, String target) {
         this.messages = new ArrayList<Message>();
         this.chattype = chattype;
         this.username = username;
-        this.count = 0;
-    }
-
-    public ChatModel(ChatType chattype, String username, int lobbyId) {
-        this.messages = new ArrayList<Message>();
-        this.chattype = chattype;
-        this.username = username;
-        this.count = 0;
+        this.count = new SimpleIntegerProperty(0);
         this.lobbyId = lobbyId;
+        this.target = target;
     }
 
     public ChatType getChattype() {
@@ -49,9 +50,9 @@ public class ChatModel {
      * ChatModel
      */
     public synchronized String viewNextMessage() {
-        count--;
+        count.subtract(1);
         Message msg = messages.getLast();
-        return String.format("[%s] %s: %s", msg.timestamp, msg.user, msg.getMessage());
+        return String.format("[%s] %s: %s", msg.timestamp, msg.sender, msg.getMessage());
     }
 
     /**
@@ -61,13 +62,21 @@ public class ChatModel {
      */
     public synchronized void addMessage(Message msg) {
         messages.add(msg);
-        count++;
+        count.add(1);
     }
 
-    /** method to send all current messages to the ChatViewController, if needed */
-    public void addCompleteChat() {
-        for (int i = 0; i < this.messages.size(); i++) {
-            Message msg = this.messages.get(i);
-        }
+
+    public void addListener(ChatViewController chatViewController) {
+        count.addListener(
+                (_count, _p, n) ->
+                {
+                    if(n.intValue() > 0) {
+                        chatViewController.showMessage();
+                    }
+                });
+    }
+
+    public String getTarget() {
+        return target;
     }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
index 60cb568..7869271 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
@@ -1,7 +1,11 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.chat;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter;
+import org.jspecify.annotations.NonNull;
+
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -12,7 +16,7 @@ import java.util.regex.Pattern;
 public class Message {
     private final ChatType type;
     private final String message;
-    public String user;
+    public String sender;
     public String timestamp;
     public int lobbyId = 0;
     public String target = null;
@@ -22,20 +26,20 @@ public class Message {
      *
      * @param type - Either global, local or whisper
      * @param lobbyId - lobby id, or null, if the typChatType
-     * @param user - username
+     * @param sender - username
      * @param target - username of the target user, for whisper chat
      * @param message
      */
     public Message(
             ChatType type,
             int lobbyId,
-            String user,
+            String sender,
             String target,
             String timestamp,
             String message) {
         this.type = type;
         this.lobbyId = lobbyId;
-        this.user = user;
+        this.sender = sender;
         this.target = target;
         this.timestamp = timestamp;
         this.message = message;
@@ -47,14 +51,14 @@ public class Message {
      *
      * @param type - Either global, local or whisper
      * @param lobbyId - lobby id, or null, if the type is global
-     * @param user - username
+     * @param sender - username
      * @param target - username of the target user, for whisper chat
      * @param message
      */
-    public Message(ChatType type, int lobbyId, String user, String target, String message) {
+    public Message(ChatType type, int lobbyId, String sender, String target, String message) {
         this.type = type;
         this.lobbyId = lobbyId;
-        this.user = user;
+        this.sender = sender;
         this.target = target;
         this.message = message;
         LocalDateTime now = LocalDateTime.now();
@@ -77,10 +81,10 @@ public class Message {
      */
     public String toArgsString() {
         return String.format(
-                "TYPE=%s GAME=%d USER=%s TARGET=%s TIME=%s TEXT=%s",
+                "TYPE=%s GAME=%d USER=%s TARGET=%s TIME=%s TEXT='%s'",
                 this.type.toString(),
                 this.lobbyId,
-                this.user,
+                this.sender,
                 this.target,
                 this.timestamp,
                 this.message);
@@ -91,7 +95,7 @@ public class Message {
             Pattern.compile(
                     "TYPE=(?<type>\\w+) " + "GAME=(?<game>\\w+) " +
                             "USER=(?<user>\\w+) " + "TARGET=(?<target>\\w+) " +
-                            "TIME=(?<time>[0-9:.]+) " + "TEXT=(?<text>.*)$");
+                            "TIME=(?<time>[0-9:.]+) " + "TEXT='(?<text>([^']|\\')+)'");
 
     /**
      * Method to create a Message Object, from the information given by the String
@@ -138,4 +142,40 @@ public class Message {
                 throw new RuntimeException("Unknown message type " + typeString);
         }
     }
+
+    public static Message toMessage(List<RequestParameter> parameters) {
+        String typeString = getParString(parameters, "TYPE");
+        ChatType type = ChatType.valueOf(typeString);
+        return switch (type) {
+            case GLOBAL -> new Message(ChatType.GLOBAL,
+                    0,
+                    getParString(parameters, "USER"),
+                    null,
+                    getParString(parameters, "TIME"),
+                    getParString(parameters, "TEXT")
+            );
+            case LOBBY -> new Message(ChatType.LOBBY,
+                    Integer.parseInt(getParString(parameters, "GAME")),
+                    getParString(parameters, "USER"),
+                    null,
+                    getParString(parameters, "TIME"),
+                    getParString(parameters, "TEXT")
+            );
+            case WHISPER -> new Message(ChatType.WHISPER,
+                    Integer.parseInt(getParString(parameters, "GAME")),
+                    getParString(parameters, "USER"),
+                    getParString(parameters, "TARGET"),
+                    getParString(parameters, "TIME"),
+                    getParString(parameters, "TEXT")
+            );
+        };
+
+    }
+
+    private static @NonNull String getParString(List<RequestParameter> parameters, String keyString) {
+        return parameters.stream().filter((p) -> "TYPE".equals(p.key()))
+                .findFirst()
+                .map(RequestParameter::value)
+                .orElseThrow(() -> new RuntimeException("No " + keyString + " found"));
+    }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
index e5a17cb..8284077 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
@@ -4,6 +4,8 @@ import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * The ChatClient class is responsible for sending messages to the server and
@@ -12,7 +14,7 @@ import java.util.List;
  */
 public class ChatClient {
 
-    private ClientService clientService;
+    private final ClientService clientService;
 
     /**
      * Constructs a ChatClient with the given ClientService for communication.
@@ -46,7 +48,11 @@ public class ChatClient {
      */
     public List<Message> getMessages() {
         String countStr = clientService.processCommand("GET_MESSAGE_COUNT");
-        int count = Integer.parseInt(countStr);
+        Matcher m = countRex.matcher(countStr);
+        if (!m.matches()) {
+            throw new RuntimeException("Can not parse response: " + countStr);
+        }
+        int count = Integer.parseInt(m.group("count"));
         System.out.println("Got " + count + " messages");
         List<Message> messages = new ArrayList<>();
         for (int i = 0; i < count; i++) {
@@ -58,4 +64,7 @@ public class ChatClient {
         }
         return messages;
     }
+
+    public static Pattern countRex = Pattern.compile("COUNT=(?<count>[0-9]+)");
 }
+// (?<key>\w+)='(?<string>([^']|\')+)'|(?<primVal>[\d\w]+)
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
index e5785a9..b347ad6 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
@@ -1,10 +1,10 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.network;
 
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.RawPacket;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TcpTransport;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+
 import java.io.IOException;
 import java.net.Socket;
 import java.util.ArrayList;
@@ -71,16 +71,24 @@ public class ClientService {
                 () -> {
                     try {
                         writeToTransport(message);
-                        String responseLine = null;
+                        String responseText = null;
                         do {
-                            responseLine = clienttcptransport.read().payload();
-                            logger.info("Raw message '" + responseLine + "'");
-                            if ("+OK".equals(responseLine)) {
-                                return;
-                            } else if (("-ERROR").equals(responseLine)) {
-                                throw new RuntimeException(responseLine);
+                            responseText = clienttcptransport.read().payload();
+                            logger.info("Raw message '" + responseText + "'");
+                            for(String line: responseText.split("\n")) {
+                                if ("+OK".equals(line)) {
+                                    return;
+                                } else if (("-ERROR").equals(responseText)) {
+                                    throw new RuntimeException(responseText);
+                                } else {
+                                    String start = response.get();
+                                    if(start == null) {
+                                        response.set(line);
+                                    } else {
+                                        response.set(start + "\n" + line);
+                                    }
+                                }
                             }
-                            response.set(responseLine);
                         } while (true);
                     } catch (Exception e) {
                         throw getRuntimeException(e);
@@ -158,4 +166,10 @@ public class ClientService {
         int id = this.idGenerator.incrementAndGet();
         this.clienttcptransport.write(new RawPacket(id, s));
     }
+
+    public void ping() {
+        processCommand("PING");
+    }
+
+
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java
index 2db2111..99827f6 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java
@@ -9,7 +9,6 @@ package ch.unibas.dmi.dbis.cs108.casono.client.network;
  */
 public class CoreClient {
     private final ClientService clientService;
-
     /**
      * Constructs a CoreClient with the given ClientService for communication.
      *
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatBoxController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatBoxController.java
new file mode 100644
index 0000000..020bffa
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatBoxController.java
@@ -0,0 +1,63 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatController;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatModel;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatType;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+import javafx.scene.layout.VBox;
+
+import java.io.IOException;
+import java.net.URL;
+
+public class ChatBoxController {
+
+    private String username;
+
+    private ChatController chatController;
+
+    @FXML private VBox chatBox;
+
+    @FXML private TabPane ChatTabPane;
+
+    private FXMLLoader fxmlLoader;
+
+    private String ressource =  "/ui-structure/components/chatui/chattab.fxml";
+
+
+    public ChatBoxController(String username, ChatController chatController) {
+        this.username = username;
+        this.chatController = chatController;
+    }
+
+    @FXML
+    public void initialize() {
+        ChatModel globalChatModel = new ChatModel(ChatType.GLOBAL, username, -1, null);
+        chatController.getChatModelMap().put(new ChatController.ChatKey(ChatType.GLOBAL), globalChatModel);
+        addChatTab("GLOBAL", globalChatModel);
+        //TODO: Button to add new Whisper Chat
+    }
+
+
+    public void addWhisperChat(String target, ChatModel chatModel) {
+        chatController.getChatModelMap().put(new ChatController.ChatKey(ChatType.WHISPER, target), chatModel);
+        addChatTab(target, chatModel);
+    }
+
+
+    public void addChatTab(String title, ChatModel chatModel) {
+        URL resource = getClass().getResource(ressource);
+        FXMLLoader fxmlLoader = new FXMLLoader(resource);
+        ChatViewController chatViewController = new ChatViewController(username, chatModel, chatController);
+        chatModel.addListener(chatViewController);
+        try {
+            fxmlLoader.setController(chatViewController);
+            Tab newChat = new Tab(title, fxmlLoader.load());
+            this.ChatTabPane.getTabs().add(newChat);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
index 17d07ec..eaf6e94 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
@@ -2,45 +2,40 @@ package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
 
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatController;
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatModel;
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatType;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
 
 import java.net.URL;
 import java.util.ResourceBundle;
-import java.util.Timer;
-import java.util.TimerTask;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.ButtonBar;
-import javafx.scene.control.ToggleButton;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.VBox;
 
 /** Responsible for the presentation of the ChatModel to the Client */
 public class ChatViewController implements Initializable {
 
-    private final ChatModel globalChatModel;
-    private GlobalChatView globalChatView;
+    @FXML private Button sendButton;
 
-    private LobbyChatView lobbyChatView;
+    @FXML private TextField inputField;
+
+    @FXML private VBox chatVBox;
+
+    @FXML private HBox controlBar;
+
+    @FXML private ScrollPane scrollPane;
+
+    @FXML private VBox Chat;
+
+    private final ChatModel chatModel;
 
     private final String username;
 
     private final ChatController controller;
 
-    private final Timer timer;
-
-    private Boolean lobbyActivated;
-
-    @FXML private ToggleButton changeGlobalChatButton;
-
-    @FXML private ToggleButton changeLobbyChatButton;
-
-    @FXML private ToggleButton changeWhisperChatButton;
-
-    @FXML private ButtonBar buttonBar;
-
-    private static final int REFRESH_TIME = 1000;
-
     private static final int CHAT_PADDING = 20;
 
     public ChatViewController() {
@@ -48,65 +43,38 @@ public class ChatViewController implements Initializable {
     }
 
     public ChatViewController(
-            String username, ChatModel globalChatModel, ChatController controller) {
+            String username, ChatModel chatModel, ChatController controller) {
         this.username = username;
         this.controller = controller;
-        this.timer = new Timer();
-        this.globalChatModel = globalChatModel;
-        timer.schedule(
-                new TimerTask() {
-                    @Override
-                    public void run() {
-                        if (controller.receiveMessage()) {
-                            globalChatView.showGlobalMessage();
-                            if (lobbyActivated) {
-                                lobbyChatView.showLobbyMessage();
-                            }
-                        }
-                    }
-                },
-                0,
-                REFRESH_TIME);
+        this.chatModel = chatModel;
     }
 
     
     @Override
     public void initialize(URL location, ResourceBundle resourceBundle) {
-        this.globalChatView =
-                new GlobalChatView(username, globalChatModel, controller);
-
+        inputField.setOnAction(event -> sendMessage());
+        sendButton.setOnAction(event -> sendMessage());
+        scrollPane.vvalueProperty().bind(chatVBox.heightProperty());
     }
 
-    public void setLobbyChat(int lobbyId) {
-        this.lobbyChatView =
-                new LobbyChatView(
-                        username, new ChatModel(ChatType.LOBBY, username), controller, lobbyId);
-
-        changeGlobalChatButton.setOnAction(event -> switchChat("globalChatButton"));
-        changeLobbyChatButton.setOnAction(event -> switchChat("lobbyChatButton"));
-        changeWhisperChatButton.setOnAction(event -> switchChat("whisperChatButton"));
-
-        ToggleGroup toggleGroup = new ToggleGroup();
-        changeGlobalChatButton.setToggleGroup(toggleGroup);
-        changeLobbyChatButton.setToggleGroup(toggleGroup);
-        changeWhisperChatButton.setToggleGroup(toggleGroup);
-        this.lobbyActivated = true;
-    }
-
-    @FXML
-    public void switchChat(String button) {
-        switch (button) {
-            case "globalChatButton":
-                globalChatView.setVisibility(true);
-                lobbyChatView.setVisibility(false);
-
-            case "lobbyChatButton":
-                globalChatView.setVisibility(false);
-                lobbyChatView.setVisibility(true);
-
-            case "whisperChatButton":
-                globalChatView.setVisibility(false);
-                lobbyChatView.setVisibility(false);
+    public void sendMessage() {
+        String message = inputField.getText().trim();
+        if (!message.isEmpty()) {
+            inputField.clear();
+            Message msg = new Message(chatModel.getChattype(), chatModel.lobbyId, username, chatModel.getTarget(), message);
+            controller.onSendToNetwork(msg);
         }
     }
+
+    public void showMessage() {
+        String msg = chatModel.viewNextMessage();
+        Label label = new Label(msg);
+        label.getStyleClass().add("info-text");
+        label.setWrapText(true);
+        label.maxWidthProperty().bind(chatVBox.widthProperty().subtract(CHAT_PADDING));
+        chatVBox.getChildren().add(label);
+    }
+
+
+
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java
deleted file mode 100644
index dab5782..0000000
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
-
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatController;
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatModel;
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatType;
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.VBox;
-
-public class GlobalChatView {
-
-    private final String username;
-    private ChatModel globalChatModel;
-
-    private final ChatController controller;
-
-    @FXML private Button globalChatSendButton;
-
-    @FXML private TextField globalChatInputField;
-
-    @FXML private VBox globalChatVBox;
-
-    @FXML private VBox globalChat;
-
-    @FXML private ScrollPane globalChatScrollPane;
-
-    final BooleanProperty isContentVisible = new SimpleBooleanProperty(true);
-
-    private static final int CHAT_PADDING = 20;
-
-    public GlobalChatView(String username, ChatModel globalChatModel, ChatController controller) {
-        this.username = username;
-        this.controller = controller;
-        this.globalChatModel = globalChatModel;
-    }
-
-    public void initialize() {
-        globalChatInputField.setOnAction(event -> sendGlobalMessage());
-        globalChatSendButton.setOnAction(event -> sendGlobalMessage());
-        globalChatScrollPane.vvalueProperty().bind(globalChatVBox.heightProperty());
-        globalChatVBox.visibleProperty().bind(isContentVisible);
-    }
-
-    public void sendGlobalMessage() {
-        String message = globalChatInputField.getText().trim();
-        if (!message.isEmpty()) {
-            globalChatInputField.clear();
-            Message msg = new Message(ChatType.GLOBAL, 0, username, null, message);
-            controller.onSendToNetwork(msg);
-        }
-    }
-
-    public void showGlobalMessage() {
-        for (int i = 0; i < globalChatModel.count; i++) {
-            String msg = globalChatModel.viewNextMessage();
-            Label label = new Label(msg);
-            label.getStyleClass().add("info-text");
-            label.setWrapText(true);
-            label.maxWidthProperty().bind(globalChatVBox.widthProperty().subtract(CHAT_PADDING));
-            globalChatVBox.getChildren().add(label);
-        }
-    }
-
-    public void setVisibility(Boolean bool) {
-        this.isContentVisible.set(bool);
-    }
-}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java
deleted file mode 100644
index 7163d9d..0000000
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
-
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatController;
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatModel;
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatType;
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.VBox;
-
-public class LobbyChatView {
-
-    private final String username;
-    private final int lobbyId;
-    private ChatModel lobbyChatModel;
-
-    private final ChatController controller;
-
-    @FXML private Button lobbyChatSendButton;
-
-    @FXML private TextField lobbyChatInputField;
-
-    @FXML private VBox lobbyChatVBox;
-
-    @FXML private VBox lobbyChat;
-
-    @FXML private ScrollPane lobbyChatScrollPane;
-
-    private static final int CHAT_PADDING = 20;
-
-    public LobbyChatView(
-            String username, ChatModel lobbyChatModel, ChatController controller, int lobbyId) {
-        this.username = username;
-        this.controller = controller;
-        this.lobbyChatModel = lobbyChatModel;
-        this.lobbyId = lobbyId;
-    }
-
-    @FXML
-    public void initialize() {
-        lobbyChatInputField.setOnAction(event -> sendLobbyMessage());
-        lobbyChatSendButton.setOnAction(event -> sendLobbyMessage());
-        lobbyChatScrollPane.vvalueProperty().bind(lobbyChatVBox.heightProperty());
-    }
-
-    public void sendLobbyMessage() {
-        String message = lobbyChatInputField.getText().trim();
-        if (!message.isEmpty()) {
-            lobbyChatInputField.clear();
-            Message msg = new Message(ChatType.LOBBY, lobbyId, username, null, message);
-            controller.onSendToNetwork(msg);
-        }
-    }
-
-    public void showLobbyMessage() {
-        for (int i = 0; i < lobbyChatModel.count; i++) {
-            String msg = lobbyChatModel.viewNextMessage();
-            Label label = new Label(msg);
-            label.getStyleClass().add("info-text");
-            label.setWrapText(true);
-            label.maxWidthProperty().bind(lobbyChatVBox.widthProperty().subtract(CHAT_PADDING));
-            lobbyChatVBox.getChildren().add(label);
-        }
-    }
-
-    public void setVisibility(Boolean bool) {
-        lobbyChatVBox.setVisible(bool);
-    }
-}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/WhisperChatView.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/WhisperChatView.java
deleted file mode 100644
index f4bdc9c..0000000
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/WhisperChatView.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
-
-public class WhisperChatView {}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/Casinomainui.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/Casinomainui.java
index 0088781..608e5a0 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/Casinomainui.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/Casinomainui.java
@@ -1,12 +1,14 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui;
 
 /** Main UI application for Casono. Loads the main FXML layout and sets up the stage. */
-import java.io.IOException;
+
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
+import java.io.IOException;
+
 /**
  * JavaFX Application class for the Casono main UI.
  *
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java
index 1b5f62a..4b005a9 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java
@@ -9,9 +9,18 @@ import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.login.LoginRequest;
 import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.logout.LogoutHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.logout.LogoutParser;
 import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.logout.LogoutRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count.GetMessageCountHandler;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count.GetMessageCountParser;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count.GetMessageCountRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message.GetNextMessageHandler;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message.GetNextMessageParser;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message.GetNextMessageRequest;
 import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.ping.PingHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.ping.PingParser;
 import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.ping.PingRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message.SendMessageHandler;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message.SendMessageParser;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message.SendMessageRequest;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserCleanupJob;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.NetworkManager;
@@ -22,12 +31,13 @@ import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher.ResponseDispatcher;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionDisconnectJob;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionManager;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import java.time.Duration;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 /** Application class for starting the server. */
 public class ServerApp {
@@ -36,7 +46,7 @@ public class ServerApp {
     private static final int USER_CLEANUP_JOB_RECONNECT_THRESHOLD = 10;
     private static final int SESSION_DISCONNECT_JOB_DELAY = 0;
     private static final int SESSION_DISCONNECT_JOB_PERIOD = 2;
-    private static final int SESSION_DISCONNECT_JOB_TIMEOUT = 5;
+    private static final int SESSION_DISCONNECT_JOB_TIMEOUT = 30;
 
     public static void start(String arg) {
         int port = Integer.parseInt(arg);
@@ -105,5 +115,24 @@ public class ServerApp {
         parserDispatcher.register("LOGOUT", new LogoutParser());
         commandRouter.register(
                 LogoutRequest.class, new LogoutHandler(responseDispatcher, userRegistry));
+        parserDispatcher.register("SEND_MESSAGE", new SendMessageParser());
+        commandRouter.register(
+                SendMessageRequest.class,
+                new SendMessageHandler(responseDispatcher, userRegistry)
+        );
+
+
+        parserDispatcher.register("GET_MESSAGE_COUNT", new GetMessageCountParser());
+        commandRouter.register(
+                GetMessageCountRequest.class,
+                new GetMessageCountHandler(responseDispatcher, userRegistry)
+        );
+
+
+        parserDispatcher.register("GET_NEXT_MESSAGE", new GetNextMessageParser());
+        commandRouter.register(
+                GetNextMessageRequest.class,
+                new GetNextMessageHandler(responseDispatcher, userRegistry)
+        );
     }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameParser.java
index 20624c0..a60f499 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameParser.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameParser.java
@@ -3,7 +3,7 @@ package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParser;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor.RequestParameterAccessor;
-
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick.CheckUsernameRequest;
 /** Parses a primitive request into a {@link CheckUsernameRequest}. */
 public class CheckUsernameParser implements CommandParser<CheckUsernameRequest> {
     /**
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameResponse.java
index 5018323..5901a80 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameResponse.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameResponse.java
@@ -2,7 +2,7 @@ package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick;
 
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.SuccessResponse;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBodyBuilder;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody;
 
 /** Response indicating the availability status of a username check. */
 public class CheckUsernameResponse extends SuccessResponse {
@@ -13,6 +13,6 @@ public class CheckUsernameResponse extends SuccessResponse {
      * @param availability the availability status of the requested username
      */
     public CheckUsernameResponse(RequestContext context, UsernameAvailability availability) {
-        super(context, new ResponseBodyBuilder().param("STATUS", availability).build());
+        super(context, ResponseBody.builder().param("STATUS", availability).build());
     }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/UsernameAvailability.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/UsernameAvailability.java
index df3d358..c728971 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/UsernameAvailability.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/UsernameAvailability.java
@@ -1,7 +1,7 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick;
 
 /** Represents the availability status of a username */
-enum UsernameAvailability {
+public enum UsernameAvailability {
     /** Username is available */
     FREE,
 
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountHandler.java
new file mode 100644
index 0000000..9467c1d
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountHandler.java
@@ -0,0 +1,40 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.ErrorResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher.ResponseDispatcher;
+
+import java.util.Optional;
+
+public class GetMessageCountHandler implements CommandHandler<GetMessageCountRequest> {
+    public final ResponseDispatcher responseDispatcher;
+    private final UserRegistry userRegistry;
+
+    public GetMessageCountHandler(ResponseDispatcher responseDispatcher, UserRegistry userRegistry) {
+        this.responseDispatcher = responseDispatcher;
+        this.userRegistry = userRegistry;
+    }
+
+    @Override
+    public void execute(GetMessageCountRequest request) {
+        Optional<User> user = userRegistry.getBySessionId(request.getSessionId());
+        if (user.isPresent()) {
+            int count = user.get().getMessageCount();
+            GetMessageCountResponse response = new GetMessageCountResponse(
+                    request.getContext(),
+                    count
+            );
+            responseDispatcher.dispatch(response);
+        } else {
+            ErrorResponse response = new ErrorResponse(
+                    request.getContext(),
+                    "",
+                    "user could not be identified by SessionId"
+
+            );
+            responseDispatcher.dispatch(response);
+        }
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountParser.java
new file mode 100644
index 0000000..35a09ec
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountParser.java
@@ -0,0 +1,13 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParser;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor.RequestParameterAccessor;
+
+public class GetMessageCountParser implements CommandParser<GetMessageCountRequest> {
+    @Override
+    public GetMessageCountRequest parse(PrimitiveRequest primitiveRequest) {
+        RequestParameterAccessor accessor = new RequestParameterAccessor(primitiveRequest.parameters());
+        return new GetMessageCountRequest(primitiveRequest.context());
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountRequest.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountRequest.java
new file mode 100644
index 0000000..36deee8
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountRequest.java
@@ -0,0 +1,10 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
+
+public class GetMessageCountRequest extends Request {
+    public GetMessageCountRequest(RequestContext context) {
+        super(context);
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountResponse.java
new file mode 100644
index 0000000..8524f94
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountResponse.java
@@ -0,0 +1,13 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.SuccessResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBodyBuilder;
+
+public class GetMessageCountResponse extends SuccessResponse {
+    public GetMessageCountResponse(RequestContext context, int count) {
+        super(context, new ResponseBodyBuilder()
+                .param("COUNT", count)
+                .build());
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageHandler.java
new file mode 100644
index 0000000..8d235a9
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageHandler.java
@@ -0,0 +1,41 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.ErrorResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher.ResponseDispatcher;
+
+import java.util.Optional;
+
+public class GetNextMessageHandler implements CommandHandler<GetNextMessageRequest> {
+    public final ResponseDispatcher responseDispatcher;
+    private final UserRegistry userRegistry;
+
+    public GetNextMessageHandler(ResponseDispatcher responseDispatcher, UserRegistry userRegistry) {
+        this.responseDispatcher = responseDispatcher;
+        this.userRegistry = userRegistry;
+    }
+
+    @Override
+    public void execute(GetNextMessageRequest request) {
+        Optional<User> user = userRegistry.getBySessionId(request.getSessionId());
+        if (user.isPresent()) {
+            Message msg = user.get().dequeMessage();
+            GetNextMessageResponse response = new GetNextMessageResponse(
+                    request.getContext(),
+                    msg
+            );
+            responseDispatcher.dispatch(response);
+        } else {
+            ErrorResponse response = new ErrorResponse(
+                    request.getContext(),
+                    "",
+                    "user could not be identified by SessionId"
+
+            );
+            responseDispatcher.dispatch(response);
+        }
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageParser.java
new file mode 100644
index 0000000..7b24831
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageParser.java
@@ -0,0 +1,13 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParser;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor.RequestParameterAccessor;
+
+public class GetNextMessageParser implements CommandParser<GetNextMessageRequest> {
+    @Override
+    public GetNextMessageRequest parse(PrimitiveRequest primitiveRequest) {
+        RequestParameterAccessor accessor = new RequestParameterAccessor(primitiveRequest.parameters());
+        return new GetNextMessageRequest(primitiveRequest.context());
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageRequest.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageRequest.java
new file mode 100644
index 0000000..92ec136
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageRequest.java
@@ -0,0 +1,10 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
+
+public class GetNextMessageRequest extends Request {
+    public GetNextMessageRequest(RequestContext context) {
+        super(context);
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageResponse.java
new file mode 100644
index 0000000..f01aaf0
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageResponse.java
@@ -0,0 +1,14 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.SuccessResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody;
+
+public class GetNextMessageResponse extends SuccessResponse {
+    public GetNextMessageResponse(RequestContext context, Message msg) {
+        super(context, ResponseBody.builder()
+                .param("MESSAGE", msg.toArgsString())
+                .build());
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageHandler.java
new file mode 100644
index 0000000..60d4332
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageHandler.java
@@ -0,0 +1,30 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message;
+
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.OkResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher.ResponseDispatcher;
+
+public class SendMessageHandler implements CommandHandler<SendMessageRequest> {
+    public final ResponseDispatcher responseDispatcher;
+    private final UserRegistry userRegistry;
+
+    public SendMessageHandler(ResponseDispatcher responseDispatcher, UserRegistry userRegistry) {
+        this.responseDispatcher = responseDispatcher;
+        this.userRegistry = userRegistry;
+    }
+
+    @Override
+    public void execute(SendMessageRequest request) {
+        Message message = request.getMessage();
+        broadcast(message);
+        OkResponse response = new OkResponse(request.getContext());
+        responseDispatcher.dispatch(response);
+    }
+    public void broadcast(Message message) {
+        userRegistry.getAllUsers().forEach(user -> user.enqueueMessage(message));
+    }
+
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageParser.java
new file mode 100644
index 0000000..723d91c
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageParser.java
@@ -0,0 +1,13 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParser;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
+
+public class SendMessageParser implements CommandParser<SendMessageRequest> {
+    @Override
+    public SendMessageRequest parse(PrimitiveRequest primitiveRequest) {
+        Message msg = Message.toMessage(primitiveRequest.parameters());
+        return new SendMessageRequest(primitiveRequest.context(), msg);
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageRequest.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageRequest.java
new file mode 100644
index 0000000..a6e0c31
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageRequest.java
@@ -0,0 +1,19 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
+
+public class SendMessageRequest extends Request {
+
+    private final Message msg;
+
+    public SendMessageRequest(RequestContext context, Message msg) {
+        super(context);
+        this.msg = msg;
+    }
+
+    public Message getMessage() {
+        return msg;
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/message/MessageManager.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/message/MessageManager.java
index b3ba0da..5435142 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/message/MessageManager.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/message/MessageManager.java
@@ -1,7 +1,7 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.domain.message;
-
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 
+/** NOT USED **/
 public class MessageManager {
     private final UserRegistry userRegistry;
 
@@ -10,6 +10,6 @@ public class MessageManager {
     }
 
     public void broadcast(Message message) {
-        userRegistry.getAllUsers().forEach(user -> user.enqueueMessage(message));
+        //userRegistry.getAllUsers().forEach(user -> user.enqueueMessage(message));
     }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/User.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/User.java
index dc42ac3..d1510cd 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/User.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/User.java
@@ -1,12 +1,9 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.domain.user;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.domain.message.Message;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId;
 import java.time.Instant;
-import java.util.ArrayDeque;
-import java.util.List;
-import java.util.Optional;
-import java.util.Queue;
+import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 /** Represents an authenticated user on the server. */
@@ -88,6 +85,10 @@ public class User {
         messages.add(message);
     }
 
+    public synchronized int getMessageCount() { return messages.size(); }
+
+    public synchronized Message dequeMessage() throws NoSuchElementException { return messages.remove(); }
+
     public synchronized List<Message> dequeueAllMessages(Message message) {
         List<Message> allMessages = new ArrayDeque<>(messages).stream().toList();
         messages.clear();
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java
index 9b96860..a4956b8 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java
@@ -9,14 +9,14 @@ import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.
  * <p>Implementations of this class use the {@code +OK} prefix. It provides a protected constructor
  * so subclasses can supply the response body content.
  */
-public abstract class SuccessResponse extends Response {
+public class SuccessResponse extends Response {
     /**
      * Create a successful response with the provided body.
      *
      * @param context the RequestContext of the request
      * @param body the response body
      */
-    protected SuccessResponse(RequestContext context, ResponseBody body) {
+    public SuccessResponse(RequestContext context, ResponseBody body) {
         super(context, body);
     }
 
diff --git a/src/main/resources/ui-structure/components/chatui/chatbox.fxml b/src/main/resources/ui-structure/components/chatui/chatbox.fxml
index e090466..10a683c 100644
--- a/src/main/resources/ui-structure/components/chatui/chatbox.fxml
+++ b/src/main/resources/ui-structure/components/chatui/chatbox.fxml
@@ -4,46 +4,30 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 
-<!--
-    Dieses Fenster wird später mit den Serveranfragen verknüpft,
-    um Nachrichten von Mitspielern und Systemmeldungen in Echtzeit anzuzeigen.
-
-    Der Chat unterscheidet intern zwischen:
-    - Player-to-Player (Privater 2-Personen-Chat)
-    - Lobby-Chat (Aktueller Raum)
-    - Globaler Chat (Gesamter Server)
-
-    Features, die später implementiert werden sollen:
-    - Schicke Chat-Bubbles mit Namen und Uhrzeit./home/mathis/dev/Gruppe-13/src/main/resources/ui-structure/gameuicomponents/chatui
--->
-
-<StackPane xmlns="http://javafx.com/javafx/21"
+<VBox xmlns="http://javafx.com/javafx/21"
       xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatViewController"
-      alignment="CENTER"
-      stylesheets="@chatui.css">
+      fx:id="chatBox"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatBoxController"
+      VBox.vgrow="ALWAYS"
+      styleClass="chat-box"
+      spacing="10"
+      maxWidth="Infinity">
 
-    <!-- Innenabstand: Schafft oben, rechts und unten 30 Pixel Platz, links nur 10 Pixel (asymmetrisch) -->
-    <padding>
-        <Insets top="30" right="30" bottom="30" left="10"/>
-    </padding>
+    <children>
+        <HBox>
+            <children>
+                <Label text="== CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
+                <Region minHeight="4" styleClass="chat-separator"/>
+            </children>
+
+        </HBox>
+
+        <TabPane fx:id="ChatTabPane">
+        </TabPane>
 
 
-    <fx:include source="globalchat.fxml"/>
 
-    <fx:include source="lobbychat.fxml"/>
+    </children>
 
-    <fx:include source="whisperchat.fxml"/>
 
-    <ButtonBar fx:id="buttonBar">
-        <padding>
-            <Insets>...</Insets>
-        </padding>
-        <buttons>
-            <ToggleButton fx:id="changeGlobalChatButton" text="Global Chat" onAction="#switchChat" styleClass="yellow-button"/>
-            <ToggleButton fx:id="changeLobbyChatButton" text="Lobby Chat" styleClass="yellow-button"/>
-            <ToggleButton fx:id="changeWhisperChatButton" text="Whisper Chat" styleClass="yellow-button"/>
-        </buttons>
-    </ButtonBar>
-
-</StackPane>
\ No newline at end of file
+</VBox>
\ No newline at end of file
diff --git a/src/main/resources/ui-structure/components/chatui/globalchat.fxml b/src/main/resources/ui-structure/components/chatui/chattab.fxml
similarity index 52%
rename from src/main/resources/ui-structure/components/chatui/globalchat.fxml
rename to src/main/resources/ui-structure/components/chatui/chattab.fxml
index 906855b..94f8124 100644
--- a/src/main/resources/ui-structure/components/chatui/globalchat.fxml
+++ b/src/main/resources/ui-structure/components/chatui/chattab.fxml
@@ -9,30 +9,26 @@
 <!-- VBox for the global chat, should only be visible when activated via changeGlobalChatButton-->
 <VBox xmlns="http://javafx.com/javafx/21"
       xmlns:fx="http://javafx.com/fxml/1"
-      fx:id="globalChatVBox"
-      VBox.vgrow="ALWAYS"
-      styleClass="chat-box"
-      spacing="10"
-      maxWidth="Infinity"
-      visible="true"
-      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.GlobalChatView">
+      fx:id="chatVBox">
 
-    <Label text="== GLOBAL CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
+    <Label text="== CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
     <Region minHeight="4" styleClass="chat-separator"/>
+
     <!-- Chatnachrichten werden hier hinzugefügt -->
-    <ScrollPane fx:id="globalChatScrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER"
+    <ScrollPane fx:id="scrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER"
                 VBox.vgrow="ALWAYS" styleClass="chat-scroll-pane">
         <content>
-            <VBox fx:id="globalChat" spacing="10" styleClass="chat-VBox"/>
+            <VBox fx:id="Chat" spacing="10" styleClass="chat-VBox"/>
         </content>
     </ScrollPane>
 
     <!-- Eingabebereich -->
-    <HBox spacing="10">
+    <HBox spacing="10"
+          fx:id="controlBar">
         <!-- TODO: Größe des TextFields dynamisch anpassen -->
-        <TextField fx:id="globalChatInputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..."
-                   styleClass="gray-input-field" onAction="#sendGlobalMessage"/>
-        <Button fx:id="globalChatSendButton" text="SENDEN" onAction="#sendGlobalMessage"
+        <TextField fx:id="inputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..."
+                   styleClass="gray-input-field" onAction="#sendMessage"/>
+        <Button fx:id="sendButton" text="SENDEN" onAction="#sendMessage"
                 styleClass="yellow-button"/>
     </HBox>
 </VBox>
diff --git a/src/main/resources/ui-structure/components/chatui/lobbychat.fxml b/src/main/resources/ui-structure/components/chatui/lobbychat.fxml
deleted file mode 100644
index 3488296..0000000
--- a/src/main/resources/ui-structure/components/chatui/lobbychat.fxml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<!-- VBox for the lobby chat, should only be visible when activated via changeLobbyChatButton-->
-
-<VBox xmlns="http://javafx.com/javafx/21"
-      xmlns:fx="http://javafx.com/fxml/1"
-      fx:id="lobbyChatVBox"
-      VBox.vgrow="ALWAYS"
-      styleClass="chat-box"
-      spacing="10"
-      maxWidth="Infinity"
-      visible="false"
-      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.LobbyChatView">
-
-    <children>
-        <Label text="== LOBBY CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
-        <Region minHeight="4" styleClass="chat-separator"/>
-
-        <!-- Chatnachrichten werden hier hinzugefügt -->
-        <ScrollPane fx:id="lobbyChatScrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER" VBox.vgrow="ALWAYS" styleClass="chat-scroll-pane">
-            <content>
-                <VBox fx:id="lobbyChat" spacing="10" styleClass="chat-VBox"/>
-            </content>
-        </ScrollPane>
-
-        <!-- Eingabebereich -->
-        <HBox spacing="10">
-            <!-- TODO: Größe des TextFields dynamisch anpassen -->
-            <TextField fx:id="lobbyChatInputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..." styleClass="gray-input-field" onAction="#sendLobbyMessage"/>
-            <Button fx:id="lobbyChatSendButton" text="SENDEN" onAction="#sendLobbyMessage" styleClass="yellow-button"/>
-        </HBox>
-    </children>
-</VBox>
diff --git a/src/main/resources/ui-structure/components/chatui/whisperchat.fxml b/src/main/resources/ui-structure/components/chatui/whisperchat.fxml
deleted file mode 100644
index 18953e8..0000000
--- a/src/main/resources/ui-structure/components/chatui/whisperchat.fxml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<!-- VBox for the whisper chat, should only be visible when activated via changeWhisperChatButton-->
-
-<VBox xmlns="http://javafx.com/javafx/21"
-      xmlns:fx="http://javafx.com/fxml/1"
-      fx:id="whisperChatVBox"
-      VBox.vgrow="ALWAYS"
-      styleClass="chat-box"
-      spacing="10"
-      maxWidth="Infinity"
-      visible="false">
-
-    <children>
-        <Label text="== WHISPER CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
-        <Region minHeight="4" styleClass="chat-separator"/>
-        <!-- Chatnachrichten werden hier hinzugefügt
-        <ScrollPane fx:id="chatScrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER" VBox.vgrow="ALWAYS" styleClass="chat-scroll-pane">
-            <content>
-                <VBox fx:id="chatVBox" spacing="10" styleClass="chat-VBox"/>
-            </content>
-        </ScrollPane>
-
-
-        <HBox spacing="10">
-            <TextField fx:id="inputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..." styleClass="gray-input-field" onAction="#sendMessage"/>
-            <Button fx:id="sendButton" text="SENDEN" onAction="#sendMessage" styleClass="yellow-button"/>
-        </HBox>
-        -->
-    </children>
-</VBox>
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Chat.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Chat.java
new file mode 100644
index 0000000..15b81d7
--- /dev/null
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Chat.java
@@ -0,0 +1,9 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.chat;
+
+import javafx.application.Application;
+
+public class Chat {
+     public static void main(String[] args) {
+         Application.launch(ChatApplication.class);
+     }
+}
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatApplication.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatApplication.java
new file mode 100644
index 0000000..77b2e33
--- /dev/null
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatApplication.java
@@ -0,0 +1,48 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.chat;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
+import ch.unibas.dmi.dbis.cs108.casono.client.network.CoreClient;
+import ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatBoxController;
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+
+public class ChatApplication extends Application {
+
+    private static final int SCENE_WIDTH = 1200;
+    private static final int SCENE_HEIGHT = 800;
+    String ip = "localhost";
+    String username = "mathis";
+    int port = 5000;
+
+    public ChatApplication() {}
+
+    public void start(Stage stage) throws IOException {
+        FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/ui-structure/components/chatui/chatbox.fxml"));
+        ClientService clientService = new ClientService(ip, port);
+        CoreClient coreClient = new CoreClient(clientService);
+        // TODO login UI
+        coreClient.login(username);
+        ChatController chatController = new ChatController(username, clientService);
+        fxmlLoader.setControllerFactory(type -> {
+                if (type == ChatBoxController.class) {
+                    return chatController.getChatBoxController();
+                } else {
+                    try {
+                        return type.getConstructor().newInstance();
+                    } catch (Throwable e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+        });
+
+        Scene scene = new Scene(fxmlLoader.load(), SCENE_WIDTH, SCENE_HEIGHT);
+        stage.setTitle("Chat");
+        stage.setScene(scene);
+        stage.show();
+    }
+
+}
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatTest.java
index 31f9964..b781cda 100644
--- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatTest.java
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatTest.java
@@ -6,6 +6,6 @@ public class ChatTest {
 
     @Test
     public void chatTest() {
-        Client.main(new String[]{"mathis"});
+
     }
 }