feat: Synchronize game items

kinda
feat: Player disconnect handler
2026-02-03 21:40:13 +01:00 · 2026-02-03 20:52:36 +01:00 · 2026-02-03 09:54:23 +01:00 · 2026-02-02 22:04:54 +01:00 · 2026-02-02 21:59:55 +01:00 · 2026-02-02 21:06:46 +01:00
285 changed files with 5624 additions and 1936 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,42 +1 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-.kotlin
-
-### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
-.idea/FuzzierSettings.xml
-*.iws
-*.iml
-*.ipr
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-
-### Mac OS ###
-.DS_Store
-
 logs
--- a/.idea/FuzzierSettings.xml
+++ b/.idea/FuzzierSettings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="com.mituuz.fuzzier.FuzzierSettings">
+    <option name="modules">
+      <map>
+        <entry key="common" value="$PROJECT_DIR$" />
+        <entry key="game" value="$PROJECT_DIR$" />
+        <entry key="game (1)" value="$PROJECT_DIR$" />
+        <entry key="server" value="$PROJECT_DIR$" />
+      </map>
+    </option>
+    <option name="recentlySearchedFiles" value="rO0ABXNyABxqYXZheC5zd2luZy5EZWZhdWx0TGlzdE1vZGVsBgfGCGLvV2ICAAFMAAhkZWxlZ2F0ZXQAEkxqYXZhL3V0aWwvVmVjdG9yO3hyAB1qYXZheC5zd2luZy5BYnN0cmFjdExpc3RNb2RlbFrW+oYSs63tAgABTAAMbGlzdGVuZXJMaXN0dAAlTGphdmF4L3N3aW5nL2V2ZW50L0V2ZW50TGlzdGVuZXJMaXN0O3hwc3IAI2phdmF4LnN3aW5nLmV2ZW50LkV2ZW50TGlzdGVuZXJMaXN0kUjMLXPfDt4DAAB4cHB4c3IAEGphdmEudXRpbC5WZWN0b3LZl31bgDuvAQMAA0kAEWNhcGFjaXR5SW5jcmVtZW50SQAMZWxlbWVudENvdW50WwALZWxlbWVudERhdGF0ABNbTGphdmEvbGFuZy9PYmplY3Q7eHAAAAAAAAAAB3VyABNbTGphdmEubGFuZy5PYmplY3Q7kM5YnxBzKWwCAAB4cAAAAApzcgBIY29tLm1pdHV1ei5mdXp6aWVyLmVudGl0aWVzLkZ1enp5TWF0Y2hDb250YWluZXIkU2VyaWFsaXplZE1hdGNoQ29udGFpbmVy2S8sP5uny74CAARMAAhmaWxlUGF0aHQAEkxqYXZhL2xhbmcvU3RyaW5nO0wACGZpbGVuYW1lcQB+AA1MAA5tb2R1bGVCYXNlUGF0aHEAfgANTAAFc2NvcmV0ADxMY29tL21pdHV1ei9mdXp6aWVyL2VudGl0aWVzL0Z1enp5TWF0Y2hDb250YWluZXIkRnV6enlTY29yZTt4cHQARC9nYW1lL3NyYy9tYWluL2phdmEvY3ovanppdG5pay9jbGllbnQvdXRpbHMvZXZlbnRzL0V2ZW50TWFuYWdlci5qYXZhdAARRXZlbnRNYW5hZ2VyLmphdmF0ABYvaG9tZS9rdWJhL0NvZGluZy9nYW1lc3IAOmNvbS5taXR1dXouZnV6emllci5lbnRpdGllcy5GdXp6eU1hdGNoQ29udGFpbmVyJEZ1enp5U2NvcmUvP9P07ROG2QIABUkADWZpbGVuYW1lU2NvcmVJAA9tdWx0aU1hdGNoU2NvcmVJABBwYXJ0aWFsUGF0aFNjb3JlSQALc3RyZWFrU2NvcmVMABNoaWdobGlnaHRDaGFyYWN0ZXJzdAAPTGphdmEvdXRpbC9TZXQ7eHAAAAAMAAAAAAAAAAoAAAAHc3IAEWphdmEudXRpbC5IYXNoU2V0ukSFlZa4tzQDAAB4cHcMAAAAED9AAAAAAAAMc3IAEWphdmEubGFuZy5JbnRlZ2VyEuKgpPeBhzgCAAFJAAV2YWx1ZXhyABBqYXZhLmxhbmcuTnVtYmVyhqyVHQuU4IsCAAB4cAAAAABzcQB+ABgAAAABc3EAfgAYAAAAAnNxAH4AGAAAAANzcQB+ABgAAAAEc3EAfgAYAAAABXNxAH4AGAAAAAZzcQB+ABgAAAAHc3EAfgAYAAAACHNxAH4AGAAAAAlzcQB+ABgAAAAKc3EAfgAYAAAAC3hzcQB+AAx0AEQvZ2FtZS9zcmMvbWFpbi9qYXZhL2N6L2p6aXRuaWsvY2xpZW50L3NvY2tldC9Tb2NrZXRFdmVudE1hbmFnZXIuamF2YXQAF1NvY2tldEV2ZW50TWFuYWdlci5qYXZhdAAWL2hvbWUva3ViYS9Db2RpbmcvZ2FtZXNxAH4AEwAAABEAAAAAAAAAAAAAAApzcQB+ABZ3DAAAACA/QAAAAAAAEXEAfgAacQB+ABtxAH4AHHEAfgAdcQB+AB5xAH4AH3EAfgAgcQB+ACFxAH4AInEAfgAjcQB+ACRxAH4AJXNxAH4AGAAAAAxzcQB+ABgAAAANc3EAfgAYAAAADnNxAH4AGAAAAA9zcQB+ABgAAAAQeHNxAH4ADHQADS9nYW1lL3BvbS54bWx0AAdwb20ueG1sdAAWL2hvbWUva3ViYS9Db2RpbmcvZ2FtZXNxAH4AEwAAAAAAAAAAAAAAAAAAAAxzcQB+ABZ3DAAAAAE/QAAAAAAAAHhzcQB+AAx0AEkvZ2FtZS9zcmMvbWFpbi9qYXZhL2N6L2p6aXRuaWsvY2xpZW50L2Fubm90YXRpb25zL1NvY2tldEV2ZW50SGFuZGxlci5qYXZhdAAXU29ja2V0RXZlbnRIYW5kbGVyLmphdmF0ABYvaG9tZS9rdWJhL0NvZGluZy9nYW1lc3EAfgATAAAAEgAAAAAAAAAKAAAAEHNxAH4AFncMAAAAID9AAAAAAAAScQB+ABpxAH4AG3EAfgAccQB+AB1xAH4AHnEAfgAfcQB+ACBxAH4AIXEAfgAicQB+ACNxAH4AJHEAfgAlcQB+ACxxAH4ALXEAfgAucQB+AC9xAH4AMHNxAH4AGAAAABF4c3EAfgAMdAA/L2dhbWUvc3JjL21haW4vamF2YS9jei9qeml0bmlrL2NsaWVudC9nYW1lL3NldHVwL0dhbWVTZXR1cC5qYXZhdAAOR2FtZVNldHVwLmphdmF0ABYvaG9tZS9rdWJhL0NvZGluZy9nYW1lc3EAfgATAAAADAAAAAAAAAAAAAAABHNxAH4AFncMAAAAED9AAAAAAAAMc3EAfgAYAAAAAHNxAH4AGAAAAAFzcQB+ABgAAAACc3EAfgAYAAAAA3NxAH4AGAAAAARzcQB+ABgAAAAFc3EAfgAYAAAABnNxAH4AGAAAAAdzcQB+ABgAAAAIc3EAfgAYAAAACXNxAH4AGAAAAApzcQB+ABgAAAALeHNxAH4ADHQASS9nYW1lL3NyYy9tYWluL2phdmEvY3ovanppdG5pay9jbGllbnQvZ2FtZS9tb2JzL3Rhc2tzL3V0aWxzL0FTdGFyQWxnLmphdmF0AA1BU3RhckFsZy5qYXZhdAAWL2hvbWUva3ViYS9Db2RpbmcvZ2FtZXNxAH4AEwAAAAgAAAAAAAAACgAAAARzcQB+ABZ3DAAAABA/QAAAAAAACHEAfgBEcQB+AEVxAH4ARnEAfgBHcQB+AEhxAH4ASXEAfgBKcQB+AEt4c3EAfgAMdAA4L2dhbWUvc3JjL21haW4vamF2YS9jei9qeml0bmlrL2NsaWVudC91aS91dGlscy9HcmlkLmphdmF0AAlHcmlkLmphdmF0ABYvaG9tZS9rdWJhL0NvZGluZy9nYW1lc3EAfgATAAAACQAAAAAAAAAAAAAABnNxAH4AFncMAAAAED9AAAAAAAAJcQB+AERxAH4ARXEAfgBGcQB+AEdxAH4ASHEAfgBJcQB+AEpxAH4AS3EAfgBMeHBwcHg=" />
+  </component>
+</project>
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+      </profile>
+      <profile name="Annotation profile for common" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="false">
+          <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.42/lombok-1.18.42.jar" />
+        </processorPath>
+        <module name="common" />
+      </profile>
+      <profile name="Annotation profile for server" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="false">
+          <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.42/lombok-1.18.42.jar" />
+        </processorPath>
+        <module name="server" />
+      </profile>
+      <profile name="Annotation profile for game-parent" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="false">
+          <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.38/lombok-1.18.38.jar" />
+        </processorPath>
+        <module name="game (1)" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/common/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/game/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/game/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/server/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/server/src/main/resources" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
  </component>
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="be.0110.repo-releases" />
+      <option name="name" value="0110.be repository" />
+      <option name="url" value="https://mvn.0110.be/releases" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <list size="3">
-      <item index="0" class="java.lang.String" itemvalue="cz.jzitnik.annotations.EventHandler" />
-      <item index="1" class="java.lang.String" itemvalue="cz.jzitnik.annotations.ui.KeyboardPressHandler" />
-      <item index="2" class="java.lang.String" itemvalue="cz.jzitnik.annotations.ui.MouseHandler" />
-    </list>
-    <writeAnnotations>
-      <writeAnnotation name="cz.jzitnik.annotations.injectors.InjectConfig" />
-      <writeAnnotation name="cz.jzitnik.annotations.injectors.InjectDependency" />
-      <writeAnnotation name="cz.jzitnik.annotations.injectors.InjectState" />
-    </writeAnnotations>
-  </component>
  <component name="ExternalStorageConfigurationManager" enabled="true" />
  <component name="MavenProjectsManager">
    <option name="originalFiles">
@@ -20,7 +8,5 @@
      </list>
    </option>
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_25" default="true" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_25" default="true" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK" />
 </project>
--- a/common/.gitignore
+++ b/common/.gitignore
@@ -0,0 +1,39 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+.kotlin
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
--- a/common/.idea/.gitignore
+++ b/common/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
--- a/common/.idea/encodings.xml
+++ b/common/.idea/encodings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>
--- a/common/.idea/misc.xml
+++ b/common/.idea/misc.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_25" default="true" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
--- a/common/.idea/vcs.xml
+++ b/common/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>cz.jzitnik</groupId>
+        <artifactId>game-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>common</artifactId>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.42</version>
+                        </path>
+                    </annotationProcessorPaths>
+                    <source>25</source>
+                    <target>25</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>tools.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>3.0.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>tools.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>3.0.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.42</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.17</version>
+        </dependency>
+
+    </dependencies>
+</project>
--- a/common/src/main/java/cz/jzitnik/common/Config.java
+++ b/common/src/main/java/cz/jzitnik/common/Config.java
@@ -0,0 +1,5 @@
+package cz.jzitnik.common;
+
+public class Config {
+    public static final int WORLD_PASSWORD_LENGTH = 5;
+}
--- a/common/src/main/java/cz/jzitnik/common/models/coordinates/RoomCords.java
+++ b/common/src/main/java/cz/jzitnik/common/models/coordinates/RoomCords.java
@@ -1,20 +1,26 @@
-package cz.jzitnik.game.utils;
+package cz.jzitnik.common.models.coordinates;

-import cz.jzitnik.game.GameRoomPart;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;

+import java.io.Serializable;
 import java.util.List;

@Slf4j
@ToString
@Getter
-public class RoomCords implements Cloneable {
+public class RoomCords implements Cloneable, Serializable {
    private int x;
    private int y;

-    public RoomCords(int x, int y) {
+    @JsonCreator
+    public RoomCords(
+            @JsonProperty("x") int x,
+            @JsonProperty("y") int y
+    ) {
        updateCords(x, y);
    }

@@ -23,8 +29,17 @@ public class RoomCords implements Cloneable {
        this.y = y;
    }

-    public void updateCordsWithColliders(List<GameRoomPart> colliders, int x, int y) {
-        if (colliders.stream().anyMatch(collider -> collider.isWithin(new RoomCords(x, y)))) {
+    public void updateCords(RoomCords roomCords) {
+        updateCords(roomCords.getX(), roomCords.getY());
+    }
+
+    public void updateCordsWithColliders(List<RoomPart> colliders, int x, int y, RoomPart playerCollider) {
+        var normalizedPlayerCollider = new RoomPart(
+                new RoomCords(playerCollider.getStart().getX() + x, playerCollider.getStart().getY() + y),
+                new RoomCords(playerCollider.getEnd().getX() + x, playerCollider.getEnd().getY() + y)
+        );
+
+        if (colliders.stream().anyMatch(collider -> collider.isOverlapping(normalizedPlayerCollider))) {
            return;
        }
        updateCords(x, y);
@@ -41,6 +56,7 @@ public class RoomCords implements Cloneable {

    /**
     * Calculates the Euclidean distance between this coordinate and another.
+     *
     * @param other The other RoomCords instance
     * @return The distance as a double
     */
--- a/common/src/main/java/cz/jzitnik/common/models/coordinates/RoomPart.java
+++ b/common/src/main/java/cz/jzitnik/common/models/coordinates/RoomPart.java
@@ -0,0 +1,41 @@
+package cz.jzitnik.common.models.coordinates;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Data
+@ToString
+public class RoomPart implements Serializable {
+    private RoomCords start;
+    private RoomCords end;
+
+    @JsonCreator
+    public RoomPart(
+            @JsonProperty("start") RoomCords start,
+            @JsonProperty("end") RoomCords end
+    ) {
+        this.start = start;
+        this.end = end;
+    }
+
+    public boolean isWithin(RoomCords cords) {
+        return cords.getX() >= start.getX() &&
+                cords.getX() <= end.getX() &&
+                cords.getY() >= start.getY() &&
+                cords.getY() <= end.getY();
+    }
+
+    /**
+     * Checks if this GameRoomPart overlaps with another.
+     */
+    public boolean isOverlapping(RoomPart other) {
+        return start.getX() <= other.getEnd().getX() &&
+                end.getX() >= other.getStart().getX() &&
+                start.getY() <= other.getEnd().getY() &&
+                end.getY() >= other.getStart().getY();
+    }
+}
--- a/common/src/main/java/cz/jzitnik/common/models/player/PlayerCreation.java
+++ b/common/src/main/java/cz/jzitnik/common/models/player/PlayerCreation.java
@@ -0,0 +1,27 @@
+package cz.jzitnik.common.models.player;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import cz.jzitnik.common.models.coordinates.RoomCords;
+import cz.jzitnik.common.models.coordinates.RoomPart;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+@Getter
+public final class PlayerCreation implements Serializable {
+    @Setter
+    private int id;
+    private final RoomCords playerCords;
+    private final RoomPart collider;
+
+    @JsonCreator
+    public PlayerCreation(
+            @JsonProperty("playerCords") RoomCords playerCords,
+            @JsonProperty("collider") RoomPart collider
+    ) {
+        this.playerCords = playerCords;
+        this.collider = collider;
+    }
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/SocketMessage.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/SocketMessage.java
@@ -0,0 +1,6 @@
+package cz.jzitnik.common.socket;
+
+import java.io.Serializable;
+
+public interface SocketMessage extends Serializable {
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/messages/Test.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/messages/Test.java
@@ -0,0 +1,6 @@
+package cz.jzitnik.common.socket.messages;
+
+import cz.jzitnik.common.socket.SocketMessage;
+
+public class Test implements SocketMessage {
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/messages/game/connection/ConnectToAGame.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/messages/game/connection/ConnectToAGame.java
@@ -0,0 +1,6 @@
+package cz.jzitnik.common.socket.messages.game.connection;
+
+import cz.jzitnik.common.socket.SocketMessage;
+
+public record ConnectToAGame(String gamePass) implements SocketMessage {
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/messages/game/connection/ConnectToAGameResponse.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/messages/game/connection/ConnectToAGameResponse.java
@@ -0,0 +1,25 @@
+package cz.jzitnik.common.socket.messages.game.connection;
+
+import cz.jzitnik.common.models.player.PlayerCreation;
+import cz.jzitnik.common.socket.SocketMessage;
+
+import java.util.List;
+
+public record ConnectToAGameResponse(ResponseType responseType, PlayerCreation playerCreation, List<PlayerCreation> existingPlayers) implements SocketMessage {
+    private enum ResponseType {
+        GAME_DOES_NOT_EXIST,
+        SUCCESS
+    }
+
+    public ConnectToAGameResponse() {
+        this(ResponseType.GAME_DOES_NOT_EXIST, null, null);
+    }
+
+    public ConnectToAGameResponse(PlayerCreation playerCreation, List<PlayerCreation> existingPlayers) {
+        this(ResponseType.SUCCESS, playerCreation, existingPlayers);
+    }
+
+    public boolean success() {
+        return responseType == ResponseType.SUCCESS;
+    }
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/messages/game/creation/CreateGame.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/messages/game/creation/CreateGame.java
@@ -0,0 +1,6 @@
+package cz.jzitnik.common.socket.messages.game.creation;
+
+import cz.jzitnik.common.socket.SocketMessage;
+
+public class CreateGame implements SocketMessage {
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/messages/game/creation/CreateGameResponse.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/messages/game/creation/CreateGameResponse.java
@@ -0,0 +1,13 @@
+package cz.jzitnik.common.socket.messages.game.creation;
+
+import cz.jzitnik.common.models.player.PlayerCreation;
+import cz.jzitnik.common.socket.SocketMessage;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class CreateGameResponse implements SocketMessage {
+    private final String gamePassword;
+    private final PlayerCreation ownerPlayer;
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/messages/items/ItemTookFromChest.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/messages/items/ItemTookFromChest.java
@@ -0,0 +1,9 @@
+package cz.jzitnik.common.socket.messages.items;
+
+import cz.jzitnik.common.socket.SocketMessage;
+
+public record ItemTookFromChest(
+        String roomId, // For faster lookup i guess
+        int id
+) implements SocketMessage {
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/messages/player/PlayerArrivalChange.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/messages/player/PlayerArrivalChange.java
@@ -0,0 +1,8 @@
+package cz.jzitnik.common.socket.messages.player;
+
+import cz.jzitnik.common.models.coordinates.RoomCords;
+import cz.jzitnik.common.socket.SocketMessage;
+
+public record PlayerArrivalChange(int id, RoomCords playerCords, PlayerRotation playerRotation,
+                                  boolean arrived, boolean rerender) implements SocketMessage {
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/messages/player/PlayerDisconnected.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/messages/player/PlayerDisconnected.java
@@ -0,0 +1,6 @@
+package cz.jzitnik.common.socket.messages.player;
+
+import cz.jzitnik.common.socket.SocketMessage;
+
+public record PlayerDisconnected(int playerId) implements SocketMessage {
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/messages/player/PlayerJoined.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/messages/player/PlayerJoined.java
@@ -0,0 +1,7 @@
+package cz.jzitnik.common.socket.messages.player;
+
+import cz.jzitnik.common.models.player.PlayerCreation;
+import cz.jzitnik.common.socket.SocketMessage;
+
+public record PlayerJoined(PlayerCreation playerCreation) implements SocketMessage {
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/messages/player/PlayerMove.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/messages/player/PlayerMove.java
@@ -0,0 +1,7 @@
+package cz.jzitnik.common.socket.messages.player;
+
+import cz.jzitnik.common.models.coordinates.RoomCords;
+import cz.jzitnik.common.socket.SocketMessage;
+
+public record PlayerMove(RoomCords newCords, PlayerRotation playerRotation) implements SocketMessage {
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/messages/player/PlayerMovedInUrRoom.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/messages/player/PlayerMovedInUrRoom.java
@@ -0,0 +1,14 @@
+package cz.jzitnik.common.socket.messages.player;
+
+import cz.jzitnik.common.models.coordinates.RoomCords;
+import cz.jzitnik.common.socket.SocketMessage;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class PlayerMovedInUrRoom implements SocketMessage {
+    private int playerId;
+    private RoomCords cords;
+    private PlayerRotation playerRotation;
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/messages/player/PlayerRotation.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/messages/player/PlayerRotation.java
@@ -0,0 +1,5 @@
+package cz.jzitnik.common.socket.messages.player;
+
+public enum PlayerRotation {
+    FRONT, BACK, LEFT, RIGHT
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/messages/room/MovePlayerRoom.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/messages/room/MovePlayerRoom.java
@@ -0,0 +1,8 @@
+package cz.jzitnik.common.socket.messages.room;
+
+import cz.jzitnik.common.models.coordinates.RoomCords;
+import cz.jzitnik.common.socket.SocketMessage;
+
+public record MovePlayerRoom(String newRoomId, RoomCords oldCords, RoomCords newCords) implements SocketMessage {
+
+}
--- a/common/src/main/java/cz/jzitnik/common/socket/messages/room/MovePlayerRoomResponse.java
+++ b/common/src/main/java/cz/jzitnik/common/socket/messages/room/MovePlayerRoomResponse.java
@@ -0,0 +1,22 @@
+package cz.jzitnik.common.socket.messages.room;
+
+import cz.jzitnik.common.models.coordinates.RoomCords;
+import cz.jzitnik.common.socket.SocketMessage;
+import cz.jzitnik.common.socket.messages.player.PlayerRotation;
+
+import java.io.Serializable;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public record MovePlayerRoomResponse(Set<Registry> players) implements SocketMessage {
+    public record Registry(int id, RoomCords cords, PlayerRotation playerRotation) implements Serializable {}
+
+    public Optional<Registry> getById(int id) {
+        return players.stream().filter(registry -> registry.id == id).findFirst();
+    }
+
+    public Set<Integer> getIds() {
+        return players.stream().map(Registry::id).collect(Collectors.toSet());
+    }
+}
--- a/game/.gitignore
+++ b/game/.gitignore
@@ -0,0 +1,42 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+.kotlin
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+.idea/FuzzierSettings.xml
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
+
+logs
--- a/game/.idea/.gitignore
+++ b/game/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
--- a/game/.idea/encodings.xml
+++ b/game/.idea/encodings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/common/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/game/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/game/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/server/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/server/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>
--- a/game/.idea/misc.xml
+++ b/game/.idea/misc.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK" />
+</project>
--- a/game/.idea/vcs.xml
+++ b/game/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
--- a/game/pom.xml
+++ b/game/pom.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>cz.jzitnik</groupId>
+        <artifactId>game-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>game</artifactId>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.38</version>
+                        </path>
+                    </annotationProcessorPaths>
+                    <source>25</source>
+                    <target>25</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <transformers>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <mainClass>cz.jzitnik.client.Main</mainClass>
+                        </transformer>
+                    </transformers>
+                    <shadedArtifactAttached>false</shadedArtifactAttached>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <mainClass>cz.jzitnik.client.Main</mainClass>
+                    <classpathScope>compile</classpathScope>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>be.0110.repo-releases</id>
+            <name>0110.be repository</name>
+            <url>https://mvn.0110.be/releases</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>cz.jzitnik</groupId>
+            <artifactId>common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.42</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>0.10.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>33.5.0-jre</version>
+        </dependency>
+
+        <dependency>
+            <groupId>tools.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>3.0.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>tools.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>3.0.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>6.0.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>6.0.2</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.17</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.5.25</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.trilarion</groupId>
+            <artifactId>java-vorbis-support</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.googlecode.lanterna</groupId>
+            <artifactId>lanterna</artifactId>
+            <version>3.1.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>javacv-platform</artifactId>
+            <version>1.5.12</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>ffmpeg-platform</artifactId>
+            <version>7.1.1-1.5.12</version>
+        </dependency>
+
+        <dependency>
+            <groupId>be.tarsos.dsp</groupId>
+            <artifactId>core</artifactId>
+            <version>2.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>be.tarsos.dsp</groupId>
+            <artifactId>jvm</artifactId>
+            <version>2.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.tyrus.bundles</groupId>
+            <artifactId>tyrus-standalone-client</artifactId>
+            <version>2.2.2</version>
+        </dependency>
+    </dependencies>
+</project>
--- a/game/src/main/java/cz/jzitnik/client/Cli.java
+++ b/game/src/main/java/cz/jzitnik/client/Cli.java
@@ -1,18 +1,18 @@
-package cz.jzitnik;
+package cz.jzitnik.client;

 import com.googlecode.lanterna.input.KeyStroke;
 import com.googlecode.lanterna.screen.TerminalScreen;
 import com.googlecode.lanterna.terminal.DefaultTerminalFactory;
 import com.googlecode.lanterna.terminal.MouseCaptureMode;
-import cz.jzitnik.annotations.Dependency;
-import cz.jzitnik.annotations.injectors.InjectDependency;
-import cz.jzitnik.annotations.injectors.InjectState;
-import cz.jzitnik.events.KeyboardPressEvent;
-import cz.jzitnik.events.MouseAction;
-import cz.jzitnik.events.TerminalResizeEvent;
-import cz.jzitnik.states.RunningState;
-import cz.jzitnik.states.TerminalState;
-import cz.jzitnik.utils.events.EventManager;
+import cz.jzitnik.client.annotations.Dependency;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.annotations.injectors.InjectState;
+import cz.jzitnik.client.events.KeyboardPressEvent;
+import cz.jzitnik.client.events.MouseAction;
+import cz.jzitnik.client.events.TerminalResizeEvent;
+import cz.jzitnik.client.states.RunningState;
+import cz.jzitnik.client.states.TerminalState;
+import cz.jzitnik.client.utils.events.EventManager;
 import lombok.extern.slf4j.Slf4j;

 import java.io.IOException;
@@ -31,8 +31,7 @@ public class Cli implements Runnable {

    @Override
    public void run() {
-        eventManager.start(); // Start event manager thread
-
+        // Start event manager thread
        try (TerminalScreen terminal = new DefaultTerminalFactory()
                .setMouseCaptureMode(MouseCaptureMode.CLICK_RELEASE_DRAG_MOVE)
                .createScreen()) {
--- a/game/src/main/java/cz/jzitnik/client/Game.java
+++ b/game/src/main/java/cz/jzitnik/client/Game.java
@@ -0,0 +1,49 @@
+package cz.jzitnik.client;
+
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.game.setup.GameSetup;
+import cz.jzitnik.client.socket.Client;
+import cz.jzitnik.client.socket.SocketEventManager;
+import cz.jzitnik.client.utils.DependencyManager;
+import cz.jzitnik.client.utils.GlobalIOHandlerRepository;
+import cz.jzitnik.client.utils.ScheduledTaskManager;
+import cz.jzitnik.client.utils.ThreadManager;
+import cz.jzitnik.client.utils.events.EventManager;
+import jakarta.websocket.DeploymentException;
+import org.reflections.Reflections;
+
+import java.io.IOException;
+
+public class Game {
+    private final DependencyManager dependencyManager = new DependencyManager(new Reflections("cz.jzitnik.client"));
+
+    @InjectDependency
+    private GameSetup gameSetup;
+    @InjectDependency
+    private EventManager eventManager;
+    @InjectDependency
+    private SocketEventManager socketEventManager;
+    @InjectDependency
+    private Cli cli;
+    @InjectDependency
+    private ThreadManager threadManager;
+    @InjectDependency
+    private ScheduledTaskManager scheduledTaskManager;
+    @InjectDependency
+    private GlobalIOHandlerRepository globalIOHandlerRepository;
+
+    public void start() throws IOException {
+        dependencyManager.inject(this);
+
+        eventManager.start();
+        socketEventManager.start();
+
+        threadManager.startAll();
+        scheduledTaskManager.startAll();
+        globalIOHandlerRepository.setup();
+
+        gameSetup.setup();
+
+        cli.run();
+    }
+}
--- a/game/src/main/java/cz/jzitnik/client/Main.java
+++ b/game/src/main/java/cz/jzitnik/client/Main.java
@@ -0,0 +1,11 @@
+package cz.jzitnik.client;
+
+// events/handlers/MouseMoveEventHandler.java
+
+import java.io.IOException;
+
+public class Main {
+    public static void main(String[] args) throws IOException {
+        new Game().start();
+    }
+}
--- a/game/src/main/java/cz/jzitnik/client/annotations/Config.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/Config.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations;
+package cz.jzitnik.client.annotations;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -8,4 +8,5 @@ import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
 public @interface Config {
+    String value();
 }
--- a/game/src/main/java/cz/jzitnik/client/annotations/Dependency.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/Dependency.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations;
+package cz.jzitnik.client.annotations;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
--- a/game/src/main/java/cz/jzitnik/client/annotations/EventHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/EventHandler.java
@@ -1,6 +1,6 @@
-package cz.jzitnik.annotations;
+package cz.jzitnik.client.annotations;

-import cz.jzitnik.utils.events.Event;
+import cz.jzitnik.client.utils.events.Event;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
--- a/game/src/main/java/cz/jzitnik/client/annotations/PostInit.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/PostInit.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations;
+package cz.jzitnik.client.annotations;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
--- a/game/src/main/java/cz/jzitnik/client/annotations/ScheduledTask.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/ScheduledTask.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations;
+package cz.jzitnik.client.annotations;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
--- a/game/src/main/java/cz/jzitnik/client/annotations/SocketEventHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/SocketEventHandler.java
@@ -0,0 +1,14 @@
+package cz.jzitnik.client.annotations;
+
+import cz.jzitnik.common.socket.SocketMessage;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface SocketEventHandler {
+    Class<? extends SocketMessage> value();
+}
--- a/game/src/main/java/cz/jzitnik/client/annotations/State.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/State.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations;
+package cz.jzitnik.client.annotations;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
--- a/game/src/main/java/cz/jzitnik/client/annotations/ThreadRegistry.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/ThreadRegistry.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations;
+package cz.jzitnik.client.annotations;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
--- a/game/src/main/java/cz/jzitnik/client/annotations/injectors/InjectConfig.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/injectors/InjectConfig.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations.injectors;
+package cz.jzitnik.client.annotations.injectors;

 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
--- a/game/src/main/java/cz/jzitnik/client/annotations/injectors/InjectDependency.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/injectors/InjectDependency.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations.injectors;
+package cz.jzitnik.client.annotations.injectors;

 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
--- a/game/src/main/java/cz/jzitnik/client/annotations/injectors/InjectState.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/injectors/InjectState.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations.injectors;
+package cz.jzitnik.client.annotations.injectors;

 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
--- a/game/src/main/java/cz/jzitnik/client/annotations/ui/KeyboardPressHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/ui/KeyboardPressHandler.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations.ui;
+package cz.jzitnik.client.annotations.ui;

 import com.googlecode.lanterna.input.KeyType;

--- a/game/src/main/java/cz/jzitnik/client/annotations/ui/KeyboardPressHandlers.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/ui/KeyboardPressHandlers.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations.ui;
+package cz.jzitnik.client.annotations.ui;

 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
--- a/game/src/main/java/cz/jzitnik/client/annotations/ui/MouseHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/ui/MouseHandler.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations.ui;
+package cz.jzitnik.client.annotations.ui;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
--- a/game/src/main/java/cz/jzitnik/client/annotations/ui/MouseHandlerType.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/ui/MouseHandlerType.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations.ui;
+package cz.jzitnik.client.annotations.ui;

 public enum MouseHandlerType {
    CLICK,
--- a/game/src/main/java/cz/jzitnik/client/annotations/ui/Render.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/ui/Render.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations.ui;
+package cz.jzitnik.client.annotations.ui;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
--- a/game/src/main/java/cz/jzitnik/client/annotations/ui/UI.java
+++ b/game/src/main/java/cz/jzitnik/client/annotations/ui/UI.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.annotations.ui;
+package cz.jzitnik.client.annotations.ui;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
--- a/game/src/main/java/cz/jzitnik/client/config/CoreLogic.java
+++ b/game/src/main/java/cz/jzitnik/client/config/CoreLogic.java
@@ -0,0 +1,15 @@
+package cz.jzitnik.client.config;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import cz.jzitnik.client.annotations.Config;
+
+@Config("core_logic.yaml")
+public record CoreLogic(int itemDropDisappearMinutes) {
+    @JsonCreator
+    public CoreLogic(
+            @JsonProperty("itemDropDisappearMinutes") int itemDropDisappearMinutes
+    ) {
+        this.itemDropDisappearMinutes = itemDropDisappearMinutes;
+    }
+}
--- a/game/src/main/java/cz/jzitnik/client/config/Debugging.java
+++ b/game/src/main/java/cz/jzitnik/client/config/Debugging.java
@@ -0,0 +1,19 @@
+package cz.jzitnik.client.config;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import cz.jzitnik.client.annotations.Config;
+
+@Config("debugging.yaml")
+public record Debugging(boolean renderColliders, boolean renderPlayerCollider, boolean showPlayerCordsLogs) {
+    @JsonCreator
+    public Debugging(
+            @JsonProperty("renderColliders") boolean renderColliders,
+            @JsonProperty("renderPlayerCollider") boolean renderPlayerCollider,
+            @JsonProperty("showPlayerCordsLogs") boolean showPlayerCordsLogs
+    ) {
+        this.renderColliders = renderColliders;
+        this.renderPlayerCollider = renderPlayerCollider;
+        this.showPlayerCordsLogs = showPlayerCordsLogs;
+    }
+}
--- a/game/src/main/java/cz/jzitnik/client/config/MicrophoneConfig.java
+++ b/game/src/main/java/cz/jzitnik/client/config/MicrophoneConfig.java
@@ -0,0 +1,15 @@
+package cz.jzitnik.client.config;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import cz.jzitnik.client.annotations.Config;
+
+@Config("microphone.yaml")
+public record MicrophoneConfig(float volumeThreshold) {
+    @JsonCreator
+    public MicrophoneConfig(
+            @JsonProperty("volumeThreshold") float volumeThreshold
+    ) {
+        this.volumeThreshold = volumeThreshold;
+    }
+}
--- a/game/src/main/java/cz/jzitnik/client/config/PlayerConfig.java
+++ b/game/src/main/java/cz/jzitnik/client/config/PlayerConfig.java
@@ -0,0 +1,36 @@
+package cz.jzitnik.client.config;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import cz.jzitnik.client.annotations.Config;
+import cz.jzitnik.client.events.handlers.PlayerMoveEventHandler;
+
+@Config("player.yaml")
+public record PlayerConfig(
+        double playerReach,
+        int playerMoveDistance,
+        int playerMoveDistanceSprinting,
+        PlayerMoveEventHandler.SprintKey sprintKey,
+        int swingTimeMs,
+        int staminaIncreaseRateMs,
+        int staminaDelayMs
+) {
+    @JsonCreator
+    public PlayerConfig(
+            @JsonProperty("playerReach") double playerReach,
+            @JsonProperty("playerMoveDistance") int playerMoveDistance,
+            @JsonProperty("playerMoveDistanceSprinting") int playerMoveDistanceSprinting,
+            @JsonProperty("sprintKey") PlayerMoveEventHandler.SprintKey sprintKey,
+            @JsonProperty("swingTimeMs") int swingTimeMs,
+            @JsonProperty("staminaIncreaseRateMs") int staminaIncreaseRateMs,
+            @JsonProperty("staminaDelayMs") int staminaDelayMs
+    ) {
+        this.playerReach = playerReach;
+        this.playerMoveDistance = playerMoveDistance;
+        this.playerMoveDistanceSprinting = playerMoveDistanceSprinting;
+        this.sprintKey = sprintKey;
+        this.swingTimeMs = swingTimeMs;
+        this.staminaIncreaseRateMs = staminaIncreaseRateMs;
+        this.staminaDelayMs = staminaDelayMs;
+    }
+}
--- a/game/src/main/java/cz/jzitnik/client/config/ThreadPoolConfig.java
+++ b/game/src/main/java/cz/jzitnik/client/config/ThreadPoolConfig.java
@@ -0,0 +1,17 @@
+package cz.jzitnik.client.config;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import cz.jzitnik.client.annotations.Config;
+
+@Config("threads.yaml")
+public record ThreadPoolConfig(int eventThreadCount, int taskThreadCount) {
+    @JsonCreator
+    public ThreadPoolConfig(
+            @JsonProperty("eventThreadCount") int eventThreadCount,
+            @JsonProperty("taskThreadCount") int taskThreadCount
+    ) {
+        this.eventThreadCount = eventThreadCount;
+        this.taskThreadCount = taskThreadCount;
+    }
+}
--- a/game/src/main/java/cz/jzitnik/client/events/DroppedItemRerender.java
+++ b/game/src/main/java/cz/jzitnik/client/events/DroppedItemRerender.java
@@ -0,0 +1,7 @@
+package cz.jzitnik.client.events;
+
+import cz.jzitnik.client.game.objects.DroppedItem;
+import cz.jzitnik.client.utils.events.Event;
+
+public record DroppedItemRerender(DroppedItem droppedItem) implements Event {
+}
--- a/game/src/main/java/cz/jzitnik/client/events/ExitEvent.java
+++ b/game/src/main/java/cz/jzitnik/client/events/ExitEvent.java
@@ -1,6 +1,6 @@
-package cz.jzitnik.events;
+package cz.jzitnik.client.events;

-import cz.jzitnik.utils.events.Event;
+import cz.jzitnik.client.utils.events.Event;

 /** Custom event without any handler **/
 public class ExitEvent implements Event {
--- a/game/src/main/java/cz/jzitnik/client/events/FullRedrawEvent.java
+++ b/game/src/main/java/cz/jzitnik/client/events/FullRedrawEvent.java
@@ -0,0 +1,6 @@
+package cz.jzitnik.client.events;
+
+import cz.jzitnik.client.utils.events.Event;
+
+public class FullRedrawEvent implements Event {
+}
--- a/game/src/main/java/cz/jzitnik/client/events/FullRoomDraw.java
+++ b/game/src/main/java/cz/jzitnik/client/events/FullRoomDraw.java
@@ -1,7 +1,6 @@
-package cz.jzitnik.events;
+package cz.jzitnik.client.events;

-import cz.jzitnik.utils.events.Event;
-import lombok.AllArgsConstructor;
+import cz.jzitnik.client.utils.events.Event;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

--- a/game/src/main/java/cz/jzitnik/client/events/InventoryRerender.java
+++ b/game/src/main/java/cz/jzitnik/client/events/InventoryRerender.java
@@ -0,0 +1,6 @@
+package cz.jzitnik.client.events;
+
+import cz.jzitnik.client.utils.events.Event;
+
+public class InventoryRerender implements Event {
+}
--- a/game/src/main/java/cz/jzitnik/client/events/KeyboardPressEvent.java
+++ b/game/src/main/java/cz/jzitnik/client/events/KeyboardPressEvent.java
@@ -1,7 +1,7 @@
-package cz.jzitnik.events;
+package cz.jzitnik.client.events;

 import com.googlecode.lanterna.input.KeyStroke;
-import cz.jzitnik.utils.events.Event;
+import cz.jzitnik.client.utils.events.Event;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

--- a/game/src/main/java/cz/jzitnik/client/events/MouseAction.java
+++ b/game/src/main/java/cz/jzitnik/client/events/MouseAction.java
@@ -1,8 +1,8 @@
-package cz.jzitnik.events;
+package cz.jzitnik.client.events;

 import com.googlecode.lanterna.TerminalPosition;
 import com.googlecode.lanterna.input.MouseActionType;
-import cz.jzitnik.utils.events.Event;
+import cz.jzitnik.client.utils.events.Event;

 public class MouseAction extends com.googlecode.lanterna.input.MouseAction implements Event {
    public MouseAction(MouseActionType actionType, int button, TerminalPosition position) {
--- a/game/src/main/java/cz/jzitnik/client/events/MouseMoveEvent.java
+++ b/game/src/main/java/cz/jzitnik/client/events/MouseMoveEvent.java
@@ -1,6 +1,6 @@
-package cz.jzitnik.events;
+package cz.jzitnik.client.events;

-import cz.jzitnik.utils.events.Event;
+import cz.jzitnik.client.utils.events.Event;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

--- a/game/src/main/java/cz/jzitnik/client/events/PlayerMoveEvent.java
+++ b/game/src/main/java/cz/jzitnik/client/events/PlayerMoveEvent.java
@@ -1,7 +1,7 @@
-package cz.jzitnik.events;
+package cz.jzitnik.client.events;

 import com.googlecode.lanterna.input.KeyStroke;
-import cz.jzitnik.utils.events.Event;
+import cz.jzitnik.client.utils.events.Event;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

--- a/game/src/main/java/cz/jzitnik/client/events/RenderStats.java
+++ b/game/src/main/java/cz/jzitnik/client/events/RenderStats.java
@@ -0,0 +1,6 @@
+package cz.jzitnik.client.events;
+
+import cz.jzitnik.client.utils.events.Event;
+
+public class RenderStats implements Event {
+}
--- a/game/src/main/java/cz/jzitnik/client/events/RerenderPart.java
+++ b/game/src/main/java/cz/jzitnik/client/events/RerenderPart.java
@@ -1,6 +1,6 @@
-package cz.jzitnik.events;
+package cz.jzitnik.client.events;

-import cz.jzitnik.utils.events.Event;
+import cz.jzitnik.client.utils.events.Event;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

--- a/game/src/main/java/cz/jzitnik/client/events/RerenderScreen.java
+++ b/game/src/main/java/cz/jzitnik/client/events/RerenderScreen.java
@@ -1,13 +1,11 @@
-package cz.jzitnik.events;
+package cz.jzitnik.client.events;

 import com.googlecode.lanterna.TerminalPosition;
 import com.googlecode.lanterna.TerminalSize;
-import cz.jzitnik.utils.events.Event;
+import cz.jzitnik.client.utils.events.Event;
 import lombok.AllArgsConstructor;
 import lombok.Data;

-import java.awt.*;
-
 public record RerenderScreen(ScreenPart[] parts) implements Event {
    public RerenderScreen(ScreenPart part) {
        this(new ScreenPart[]{part});
--- a/game/src/main/java/cz/jzitnik/client/events/RoomChangeEvent.java
+++ b/game/src/main/java/cz/jzitnik/client/events/RoomChangeEvent.java
@@ -0,0 +1,7 @@
+package cz.jzitnik.client.events;
+
+import cz.jzitnik.client.events.handlers.FullRoomDrawHandler;
+import cz.jzitnik.client.utils.events.Event;
+
+public record RoomChangeEvent(FullRoomDrawHandler.DoorPosition door) implements Event {
+}
--- a/game/src/main/java/cz/jzitnik/client/events/SendSocketMessageEvent.java
+++ b/game/src/main/java/cz/jzitnik/client/events/SendSocketMessageEvent.java
@@ -0,0 +1,7 @@
+package cz.jzitnik.client.events;
+
+import cz.jzitnik.client.utils.events.Event;
+import cz.jzitnik.common.socket.SocketMessage;
+
+public record SendSocketMessageEvent(SocketMessage message) implements Event {
+}
--- a/game/src/main/java/cz/jzitnik/client/events/TerminalResizeEvent.java
+++ b/game/src/main/java/cz/jzitnik/client/events/TerminalResizeEvent.java
@@ -1,7 +1,7 @@
-package cz.jzitnik.events;
+package cz.jzitnik.client.events;

 import com.googlecode.lanterna.TerminalSize;
-import cz.jzitnik.utils.events.Event;
+import cz.jzitnik.client.utils.events.Event;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

--- a/game/src/main/java/cz/jzitnik/client/events/TerminalTooSmallEvent.java
+++ b/game/src/main/java/cz/jzitnik/client/events/TerminalTooSmallEvent.java
@@ -0,0 +1,6 @@
+package cz.jzitnik.client.events;
+
+import cz.jzitnik.client.utils.events.Event;
+
+public class TerminalTooSmallEvent implements Event {
+}
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/CliHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/CliHandler.java
@@ -1,18 +1,19 @@
-package cz.jzitnik.events.handlers;
+package cz.jzitnik.client.events.handlers;

 import com.googlecode.lanterna.TextColor;
 import com.googlecode.lanterna.graphics.TextGraphics;
-import cz.jzitnik.annotations.EventHandler;
-import cz.jzitnik.annotations.injectors.InjectState;
-import cz.jzitnik.events.RerenderScreen;
-import cz.jzitnik.game.Constants;
-import cz.jzitnik.states.RenderState;
-import cz.jzitnik.states.ScreenBuffer;
-import cz.jzitnik.states.TerminalState;
-import cz.jzitnik.ui.pixels.Empty;
-import cz.jzitnik.ui.pixels.Pixel;
-import cz.jzitnik.utils.DependencyManager;
-import cz.jzitnik.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectState;
+import cz.jzitnik.client.events.RerenderScreen;
+import cz.jzitnik.client.game.Constants;
+import cz.jzitnik.client.states.RenderState;
+import cz.jzitnik.client.states.ScreenBuffer;
+import cz.jzitnik.client.states.TerminalState;
+import cz.jzitnik.client.ui.pixels.AlphaPixel;
+import cz.jzitnik.client.ui.pixels.ColoredPixel;
+import cz.jzitnik.client.ui.pixels.Empty;
+import cz.jzitnik.client.ui.pixels.Pixel;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
 import lombok.extern.slf4j.Slf4j;

 import java.io.IOException;
@@ -29,10 +30,6 @@ public class CliHandler extends AbstractEventHandler<RerenderScreen> {
    @InjectState
    private RenderState renderState;

-    public CliHandler(DependencyManager dm) {
-        super(dm);
-    }
-
    @Override
    public void handle(RerenderScreen event) {
        if (renderState.isTerminalTooSmall()) {
@@ -41,6 +38,7 @@ public class CliHandler extends AbstractEventHandler<RerenderScreen> {

        var parts = event.parts();
        var buffer = screenBuffer.getRenderedBuffer();
+        var globalOverrideBuffer = screenBuffer.getGlobalOverrideBuffer();
        var terminalScreen = terminalState.getTerminalScreen();
        var tg = terminalState.getTextGraphics();

@@ -53,9 +51,9 @@ public class CliHandler extends AbstractEventHandler<RerenderScreen> {
            for (int y = startYNormalized; y <= endYNormalized; y += 2) {
                for (int x = start.getColumn(); x <= end.getColumn(); x++) {
                    try {
-                        Pixel topPixel = buffer[y][x];
+                        Pixel topPixel = getPixel(buffer[y][x], globalOverrideBuffer[y][x]);
                        Pixel bottomPixel = (y + 1 <= end.getRow())
-                                ? buffer[y + 1][x]
+                                ? getPixel(buffer[y + 1][x], globalOverrideBuffer[y + 1][x])
                                : new Empty();

                        TextColor topColor = topPixel instanceof Empty
@@ -81,6 +79,36 @@ public class CliHandler extends AbstractEventHandler<RerenderScreen> {
        }
    }

+    private Pixel getPixel(Pixel buffer, AlphaPixel globalOverride) {
+        if (globalOverride instanceof Empty) {
+            return buffer;
+        }
+
+        if (buffer instanceof Empty) {
+            return getPixel(new ColoredPixel(Constants.BACKGROUND_COLOR), globalOverride);
+        }
+
+        TextColor blended = blendColors(
+                buffer.getColor(),
+                globalOverride.getColor(),
+                globalOverride.getAlpha()
+        );
+
+        return new ColoredPixel(blended);
+    }
+
+    private TextColor blendColors(TextColor base, TextColor overlay, float alpha) {
+        int r = blend(base.getRed(),   overlay.getRed(),   alpha);
+        int g = blend(base.getGreen(), overlay.getGreen(), alpha);
+        int b = blend(base.getBlue(),  overlay.getBlue(),  alpha);
+
+        return new TextColor.RGB(r, g, b);
+    }
+
+    private int blend(int base, int overlay, float alpha) {
+        return Math.round(base * (1 - alpha) + overlay * alpha);
+    }
+
    private void drawHalfPixel(TextGraphics tg, int x, int y,
                               TextColor topColor,
                               TextColor bottomColor) {
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/DialogEventHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/DialogEventHandler.java
@@ -0,0 +1,200 @@
+package cz.jzitnik.client.events.handlers;
+
+import com.googlecode.lanterna.TerminalPosition;
+import com.googlecode.lanterna.TerminalSize;
+import com.googlecode.lanterna.TextColor;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.annotations.injectors.InjectState;
+import cz.jzitnik.client.events.RerenderScreen;
+import cz.jzitnik.client.game.dialog.Dialog;
+import cz.jzitnik.client.game.dialog.OnEnd;
+import cz.jzitnik.client.states.DialogState;
+import cz.jzitnik.client.states.ScreenBuffer;
+import cz.jzitnik.client.states.TerminalState;
+import cz.jzitnik.client.ui.pixels.AlphaPixel;
+import cz.jzitnik.client.ui.pixels.ColoredPixel;
+import cz.jzitnik.client.ui.pixels.Empty;
+import cz.jzitnik.client.utils.DependencyManager;
+import cz.jzitnik.client.utils.TextRenderer;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.utils.events.EventManager;
+import lombok.extern.slf4j.Slf4j;
+
+import java.awt.*;
+import java.util.List;
+import java.util.ArrayList;
+
+@Slf4j
+@EventHandler(Dialog.class)
+public class DialogEventHandler extends AbstractEventHandler<Dialog> {
+
+    @InjectState
+    private DialogState dialogState;
+
+    @InjectState
+    private TerminalState terminalState;
+
+    @InjectState
+    private ScreenBuffer screenBuffer;
+
+    @InjectDependency
+    private EventManager eventManager;
+
+    @InjectDependency
+    private TextRenderer textRenderer;
+
+    @InjectDependency
+    private DependencyManager dependencyManager;
+
+    private static final int WIDTH = 350;
+    private static final int MARGIN_BOTTOM = 15;
+    public static final int PADDING = 7;
+    private static final int BUTTON_TEXT_PADDING = 4;
+    private static final int QUESTION_ACTIONS_GAP = 10;
+    public static final int BUTTON_HEIGHT = 15;
+    public static final int BUTTON_PADDING = 5;
+    private static final float FONT_SIZE = 15f;
+
+    public static int calculateButtonHeight(Dialog dialog) {
+        if (dialog.getOnEnd() instanceof OnEnd.AskQuestion(OnEnd.AskQuestion.Answer[] answers)) {
+            return answers.length * BUTTON_HEIGHT + (answers.length - 1) * BUTTON_PADDING;
+        } else {
+            return 0;
+        }
+    }
+
+    public static int getYStartButtons(TextRenderer textRenderer, Dialog dialog) {
+        var textSize = textRenderer.measureText(dialog.getText(), WIDTH - PADDING * 2, FONT_SIZE);
+
+        return PADDING + textSize.height + BUTTON_PADDING;
+    }
+
+    public static TerminalSize getSize(TextRenderer textRenderer, Dialog dialog) {
+        var textSize = textRenderer.measureText(dialog.getText(), WIDTH - PADDING * 2, FONT_SIZE);
+
+        return new TerminalSize(300, PADDING + textSize.height + (
+                dialog.getOnEnd() instanceof OnEnd.AskQuestion ? BUTTON_PADDING + calculateButtonHeight(dialog) : 0
+        ) + PADDING);
+    }
+
+    public static TerminalPosition getStart(TerminalSize terminalSize, TerminalSize size) {
+        int startY = terminalSize.getRows() * 2 - MARGIN_BOTTOM - size.getRows();
+        int startX = (terminalSize.getColumns() / 2) - (size.getColumns() / 2);
+
+        return new TerminalPosition(startX, startY);
+    }
+
+    @Override
+    public void handle(Dialog event) {
+        boolean onlyLast = dialogState.getCurrentDialog() == event;
+        dialogState.setCurrentDialog(event);
+        TerminalSize terminalSize = terminalState.getTerminalScreen().getTerminalSize();
+        var overrideBuffer = screenBuffer.getGlobalOverrideBuffer();
+        var size = getSize(textRenderer, event);
+
+        var start = getStart(terminalSize, size);
+
+        var animation = textRenderer.renderTypingAnimation(event.getText(), size.getColumns() - PADDING * 2, size.getRows() - PADDING * 2, Color.WHITE, FONT_SIZE);
+        var textSize = textRenderer.measureText(event.getText(), size.getColumns() - PADDING * 2, FONT_SIZE);
+        OnEnd onEnd = event.getOnEnd();
+
+        List<AlphaPixel[][]> answersBuf = new ArrayList<>();
+
+        if (onEnd instanceof OnEnd.AskQuestion(
+                OnEnd.AskQuestion.Answer[] answers
+        )) {
+            for (OnEnd.AskQuestion.Answer answer : answers) {
+                answersBuf.add(textRenderer.renderText(answer.answer(), size.getColumns() - PADDING * 2, BUTTON_HEIGHT, Color.BLACK, FONT_SIZE, false));
+            }
+        }
+
+        dialogState.setRenderInProgress(true);
+        try {
+            for (int i = onlyLast ? animation.length : 0; i <= animation.length; i++) {
+                var buf = animation[Math.min(i, animation.length - 1)];
+                for (int y = 0; y < size.getRows(); y++) {
+                    for (int x = 0; x < size.getColumns(); x++) {
+                        var textPixel = buf[Math.min(Math.max(0, y - PADDING), buf.length - 1)][Math.min(Math.max(0, x - PADDING), buf[0].length - 1)];
+                        if (textPixel instanceof Empty || y < PADDING || x < PADDING || x >= size.getColumns() - PADDING || y >= size.getRows() - PADDING) {
+                            if (i == animation.length && y - 2 > textSize.height + QUESTION_ACTIONS_GAP && onEnd instanceof OnEnd.AskQuestion(
+                                    OnEnd.AskQuestion.Answer[] answers
+                            )) {
+                                int buttonsY = y - textSize.height - QUESTION_ACTIONS_GAP - 2;
+                                int buttonIndex = buttonsY / (BUTTON_HEIGHT + BUTTON_PADDING);
+                                int rest = buttonsY % (BUTTON_HEIGHT + BUTTON_PADDING);
+
+                                if (buttonIndex < answers.length && rest < BUTTON_HEIGHT && x >= PADDING && x < size.getColumns() - PADDING) {
+                                    int localY = rest - BUTTON_TEXT_PADDING;
+                                    int localX = x - PADDING - BUTTON_TEXT_PADDING;
+                                    var buttonBuf = answersBuf.get(buttonIndex);
+                                    var buttonTextPixel = buttonBuf[Math.min(Math.max(0, localY), buttonBuf.length - 1)][Math.min(Math.max(0, localX), buttonBuf[0].length - 1)];
+
+                                    if (buttonTextPixel instanceof Empty || localY < 0 || localX < 0 || localY >= buttonBuf.length || localX >= buttonBuf[0].length) {
+                                        overrideBuffer[start.getRow() + y][start.getColumn() + x] = new ColoredPixel(new TextColor.RGB(255, 255, 255), dialogState.getHoveredButtonIndex() == buttonIndex ? 0.8f : 0.6f);
+                                    } else {
+                                        overrideBuffer[start.getRow() + y][start.getColumn() + x] = buttonTextPixel;
+                                    }
+
+                                    continue;
+                                }
+                            }
+
+                            overrideBuffer[start.getRow() + y][start.getColumn() + x] = new ColoredPixel(new TextColor.RGB(0, 0, 0), 0.6f);
+                            continue;
+                        }
+
+                        overrideBuffer[start.getRow() + y][start.getColumn() + x] = textPixel;
+                    }
+                }
+
+                eventManager.emitEvent(
+                        new RerenderScreen(
+                                new RerenderScreen.ScreenPart(
+                                        start,
+                                        new TerminalPosition(start.getColumn() + size.getColumns(), start.getRow() + size.getRows())
+                                )
+                        )
+                );
+
+                Thread.sleep(1000 / event.getTypingSpeed());
+            }
+
+            dialogState.setRenderInProgress(false);
+
+            next(onEnd, start, size);
+
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void next(OnEnd onEnd, TerminalPosition start, TerminalSize size) throws InterruptedException {
+        if (onEnd instanceof OnEnd.Continue(Dialog nextDialog)) {
+            Thread.sleep(1000);
+            for (int y = start.getRow(); y < start.getRow() + size.getRows(); y++) {
+                for (int x = start.getColumn(); x < start.getColumn() + size.getColumns(); x++) {
+                    screenBuffer.getGlobalOverrideBuffer()[y][x] = new Empty();
+                }
+            }
+
+            if (nextDialog == null) {
+                dialogState.setCurrentDialog(null);
+                eventManager.emitEvent(
+                        new RerenderScreen(
+                                new RerenderScreen.ScreenPart(
+                                        start,
+                                        new TerminalPosition(start.getColumn() + size.getColumns(), start.getRow() + size.getRows())
+                                )
+                        )
+                );
+            } else {
+                eventManager.emitEvent(nextDialog);
+            }
+        } else if (onEnd instanceof OnEnd.RunCode(Runnable runnable, OnEnd end)) {
+            dependencyManager.inject(runnable);
+            runnable.run();
+            next(end, start, size);
+        }
+    }
+}
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/DroppedItemRerenderHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/DroppedItemRerenderHandler.java
@@ -1,22 +1,17 @@
-package cz.jzitnik.events.handlers;
+package cz.jzitnik.client.events.handlers;

-import cz.jzitnik.annotations.EventHandler;
-import cz.jzitnik.annotations.injectors.InjectDependency;
-import cz.jzitnik.events.DroppedItemRerender;
-import cz.jzitnik.events.RerenderPart;
-import cz.jzitnik.game.utils.RoomCords;
-import cz.jzitnik.utils.DependencyManager;
-import cz.jzitnik.utils.events.AbstractEventHandler;
-import cz.jzitnik.utils.events.EventManager;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.events.DroppedItemRerender;
+import cz.jzitnik.client.events.RerenderPart;
+import cz.jzitnik.common.models.coordinates.RoomCords;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.utils.events.EventManager;

 import java.awt.image.BufferedImage;

@EventHandler(DroppedItemRerender.class)
 public class DroppedItemRerenderHandler extends AbstractEventHandler<DroppedItemRerender> {
-    public DroppedItemRerenderHandler(DependencyManager dm) {
-        super(dm);
-    }
-
    @InjectDependency
    private EventManager eventManager;

--- a/game/src/main/java/cz/jzitnik/client/events/handlers/ExitEventHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/ExitEventHandler.java
@@ -0,0 +1,35 @@
+package cz.jzitnik.client.events.handlers;
+
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.annotations.injectors.InjectState;
+import cz.jzitnik.client.events.ExitEvent;
+import cz.jzitnik.client.states.RunningState;
+import cz.jzitnik.client.utils.ScheduledTaskManager;
+import cz.jzitnik.client.utils.ThreadManager;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.utils.roomtasks.RoomTaskScheduler;
+
+@EventHandler(ExitEvent.class)
+public class ExitEventHandler extends AbstractEventHandler<ExitEvent> {
+    @InjectDependency
+    private ThreadManager threadManager;
+
+    @InjectState
+    private RunningState runningState;
+
+    @InjectDependency
+    private RoomTaskScheduler roomTaskScheduler;
+
+    @InjectDependency
+    private ScheduledTaskManager scheduledTaskManager;
+
+    @Override
+    public void handle(ExitEvent event) {
+        threadManager.shutdownAll();
+        scheduledTaskManager.shutdown();
+        roomTaskScheduler.finalShutdown();
+        runningState.setRunning(false);
+        //System.exit(0); // Pls don't blame me
+    }
+}
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/FullRedrawEventHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/FullRedrawEventHandler.java
@@ -1,15 +1,14 @@
-package cz.jzitnik.events.handlers;
+package cz.jzitnik.client.events.handlers;

 import com.googlecode.lanterna.screen.Screen;
-import cz.jzitnik.annotations.EventHandler;
-import cz.jzitnik.annotations.injectors.InjectDependency;
-import cz.jzitnik.annotations.injectors.InjectState;
-import cz.jzitnik.events.FullRedrawEvent;
-import cz.jzitnik.events.FullRoomDraw;
-import cz.jzitnik.states.TerminalState;
-import cz.jzitnik.utils.DependencyManager;
-import cz.jzitnik.utils.events.AbstractEventHandler;
-import cz.jzitnik.utils.events.EventManager;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.annotations.injectors.InjectState;
+import cz.jzitnik.client.events.FullRedrawEvent;
+import cz.jzitnik.client.events.FullRoomDraw;
+import cz.jzitnik.client.states.TerminalState;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.utils.events.EventManager;

 import java.io.IOException;

@@ -21,10 +20,6 @@ public class FullRedrawEventHandler extends AbstractEventHandler<FullRedrawEvent
    @InjectState
    private TerminalState terminalState;

-    public FullRedrawEventHandler(DependencyManager dm) {
-        super(dm);
-    }
-
    @Override
    public void handle(FullRedrawEvent event) {
        terminalState.getTerminalScreen().clear();
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/FullRoomDrawHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/FullRoomDrawHandler.java
@@ -1,32 +1,28 @@
-package cz.jzitnik.events.handlers;
+package cz.jzitnik.client.events.handlers;

 import com.googlecode.lanterna.TerminalPosition;
 import com.googlecode.lanterna.TerminalSize;
 import com.googlecode.lanterna.screen.TerminalScreen;
-import cz.jzitnik.annotations.EventHandler;
-import cz.jzitnik.annotations.injectors.InjectConfig;
-import cz.jzitnik.annotations.injectors.InjectDependency;
-import cz.jzitnik.annotations.injectors.InjectState;
-import cz.jzitnik.config.Debugging;
-import cz.jzitnik.events.FullRoomDraw;
-import cz.jzitnik.events.RerenderScreen;
-import cz.jzitnik.events.TerminalTooSmallEvent;
-import cz.jzitnik.game.GameRoom;
-import cz.jzitnik.game.GameState;
-import cz.jzitnik.game.Player;
-import cz.jzitnik.game.ResourceManager;
-import cz.jzitnik.states.RenderState;
-import cz.jzitnik.states.ScreenBuffer;
-import cz.jzitnik.states.TerminalState;
-import cz.jzitnik.ui.Inventory;
-import cz.jzitnik.ui.Stats;
-import cz.jzitnik.utils.DependencyManager;
-import cz.jzitnik.utils.GlobalIOHandlerRepository;
-import cz.jzitnik.utils.RerenderUtils;
-import cz.jzitnik.utils.UIRoomClickHandlerRepository;
-import cz.jzitnik.utils.events.AbstractEventHandler;
-import cz.jzitnik.utils.events.EventManager;
-import cz.jzitnik.utils.roomtasks.RoomTaskScheduler;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectConfig;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.annotations.injectors.InjectState;
+import cz.jzitnik.client.config.Debugging;
+import cz.jzitnik.client.events.FullRoomDraw;
+import cz.jzitnik.client.events.RerenderScreen;
+import cz.jzitnik.client.events.TerminalTooSmallEvent;
+import cz.jzitnik.client.game.GameRoom;
+import cz.jzitnik.client.game.GameState;
+import cz.jzitnik.client.game.Player;
+import cz.jzitnik.client.game.ResourceManager;
+import cz.jzitnik.client.states.RenderState;
+import cz.jzitnik.client.states.ScreenBuffer;
+import cz.jzitnik.client.states.TerminalState;
+import cz.jzitnik.client.utils.GlobalIOHandlerRepository;
+import cz.jzitnik.client.utils.RerenderUtils;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.utils.events.EventManager;
+import cz.jzitnik.client.utils.roomtasks.RoomTaskScheduler;
 import lombok.extern.slf4j.Slf4j;

 import java.awt.image.BufferedImage;
@@ -59,10 +55,6 @@ public class FullRoomDrawHandler extends AbstractEventHandler<FullRoomDraw> {
    @InjectDependency
    private GlobalIOHandlerRepository globalIOHandlerRepository;

-    public FullRoomDrawHandler(DependencyManager dm) {
-        super(dm);
-    }
-
    @Override
    public void handle(FullRoomDraw event) {
        try {
@@ -83,7 +75,7 @@ public class FullRoomDrawHandler extends AbstractEventHandler<FullRoomDraw> {
            int startX = start.getX();
            int startY = start.getY();

-            RerenderUtils.rerenderPart(0, width - 1, 0, height - 1, startX, startY, currentRoom, room, player, playerTexture, screenBuffer, resourceManager, debugging);
+            RerenderUtils.rerenderPart(0, width - 1, 0, height - 1, startX, startY, currentRoom, room, player, screenBuffer, resourceManager, debugging, gameState.getOtherPlayers());
            if (event.isFullRerender()) {
                globalIOHandlerRepository.renderAll();
            }
@@ -96,9 +88,7 @@ public class FullRoomDrawHandler extends AbstractEventHandler<FullRoomDraw> {
            if (renderState.isFirstRender() || event.isFullRerender()) {
                eventManager.emitEvent(RerenderScreen.full(terminalSize));
                renderState.setFirstRender(false);
-                scheduler.schedule(() -> {
-                    roomTaskScheduler.setupNewSchedulers(currentRoom);
-                }, 200, TimeUnit.MILLISECONDS);
+                scheduler.schedule(() -> roomTaskScheduler.setupNewSchedulers(currentRoom), 200, TimeUnit.MILLISECONDS);
            } else {
                eventManager.emitEvent(new RerenderScreen(partsToRerender.toArray(RerenderScreen.ScreenPart[]::new)));
            }
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/InventoryRerenderHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/InventoryRerenderHandler.java
@@ -1,14 +1,13 @@
-package cz.jzitnik.events.handlers;
+package cz.jzitnik.client.events.handlers;

 import com.googlecode.lanterna.TerminalPosition;
-import cz.jzitnik.annotations.EventHandler;
-import cz.jzitnik.annotations.injectors.InjectDependency;
-import cz.jzitnik.events.InventoryRerender;
-import cz.jzitnik.events.RerenderScreen;
-import cz.jzitnik.ui.Inventory;
-import cz.jzitnik.utils.DependencyManager;
-import cz.jzitnik.utils.events.AbstractEventHandler;
-import cz.jzitnik.utils.events.EventManager;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.events.InventoryRerender;
+import cz.jzitnik.client.events.RerenderScreen;
+import cz.jzitnik.client.ui.Inventory;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.utils.events.EventManager;

@EventHandler(InventoryRerender.class)
 public class InventoryRerenderHandler extends AbstractEventHandler<InventoryRerender> {
@@ -18,10 +17,6 @@ public class InventoryRerenderHandler extends AbstractEventHandler<InventoryRere
    @InjectDependency
    private Inventory inventory;

-    public InventoryRerenderHandler(DependencyManager dm) {
-        super(dm);
-    }
-
    @Override
    public void handle(InventoryRerender event) {
        inventory.renderInventoryRerender();
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/KeyboardPressEventHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/KeyboardPressEventHandler.java
@@ -1,20 +1,15 @@
-package cz.jzitnik.events.handlers;
+package cz.jzitnik.client.events.handlers;

-import cz.jzitnik.annotations.EventHandler;
-import cz.jzitnik.annotations.injectors.InjectDependency;
-import cz.jzitnik.annotations.injectors.InjectState;
-import cz.jzitnik.events.*;
-import cz.jzitnik.game.GameState;
-import cz.jzitnik.utils.DependencyManager;
-import cz.jzitnik.utils.GlobalIOHandlerRepository;
-import cz.jzitnik.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.annotations.injectors.InjectState;
+import cz.jzitnik.client.events.KeyboardPressEvent;
+import cz.jzitnik.client.game.GameState;
+import cz.jzitnik.client.utils.GlobalIOHandlerRepository;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;

@EventHandler(KeyboardPressEvent.class)
 public class KeyboardPressEventHandler extends AbstractEventHandler<KeyboardPressEvent> {
-    public KeyboardPressEventHandler(DependencyManager dm) {
-        super(dm);
-    }
-
    @InjectState
    private GameState gameState;

--- a/game/src/main/java/cz/jzitnik/client/events/handlers/MouseActionEventHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/MouseActionEventHandler.java
@@ -1,29 +1,25 @@
-package cz.jzitnik.events.handlers;
+package cz.jzitnik.client.events.handlers;

-import cz.jzitnik.annotations.EventHandler;
-import cz.jzitnik.annotations.injectors.InjectConfig;
-import cz.jzitnik.annotations.injectors.InjectDependency;
-import cz.jzitnik.annotations.injectors.InjectState;
-import cz.jzitnik.config.PlayerConfig;
-import cz.jzitnik.events.MouseAction;
-import cz.jzitnik.events.MouseMoveEvent;
-import cz.jzitnik.game.GameState;
-import cz.jzitnik.game.utils.Selectable;
-import cz.jzitnik.states.RenderState;
-import cz.jzitnik.utils.DependencyManager;
-import cz.jzitnik.utils.UIRoomClickHandlerRepository;
-import cz.jzitnik.utils.events.AbstractEventHandler;
-import cz.jzitnik.utils.events.EventManager;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectConfig;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.annotations.injectors.InjectState;
+import cz.jzitnik.client.config.PlayerConfig;
+import cz.jzitnik.client.events.MouseAction;
+import cz.jzitnik.client.events.MouseMoveEvent;
+import cz.jzitnik.client.game.GameState;
+import cz.jzitnik.client.game.utils.Selectable;
+import cz.jzitnik.client.states.RenderState;
+import cz.jzitnik.client.utils.DependencyManager;
+import cz.jzitnik.client.utils.UIRoomClickHandlerRepository;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.utils.events.EventManager;

 import java.util.Optional;
 import java.util.stream.Stream;

@EventHandler(MouseAction.class)
 public class MouseActionEventHandler extends AbstractEventHandler<MouseAction> {
-    public MouseActionEventHandler(DependencyManager dm) {
-        super(dm);
-    }
-
    @InjectDependency
    private EventManager eventManager;

@@ -39,6 +35,9 @@ public class MouseActionEventHandler extends AbstractEventHandler<MouseAction> {
    @InjectConfig
    private PlayerConfig playerConfig;

+    @InjectDependency
+    private DependencyManager dependencyManager;
+
    @Override
    public void handle(MouseAction event) {
        if (gameState.getScreen() != null) {
@@ -74,9 +73,12 @@ public class MouseActionEventHandler extends AbstractEventHandler<MouseAction> {

                Optional<? extends Selectable> object = combined.filter(Selectable::isSelected).findFirst();

-                gameState.getPlayer().swing(playerConfig.getSwingTimeMs());
+                gameState.getPlayer().swing(playerConfig.swingTimeMs());

-                object.ifPresent(selectable -> selectable.interact(dm));
+                object.ifPresent(selectable -> {
+                    dependencyManager.inject(selectable);
+                    selectable.interact();
+                });
            }
            default -> uiRoomClickHandlerRepository.handleElse(event);
        }
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/MouseMoveEventHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/MouseMoveEventHandler.java
@@ -1,28 +1,27 @@
-package cz.jzitnik.events.handlers;
+package cz.jzitnik.client.events.handlers;

 import com.googlecode.lanterna.TerminalPosition;
 import com.googlecode.lanterna.input.MouseActionType;
-import cz.jzitnik.annotations.EventHandler;
-import cz.jzitnik.annotations.injectors.InjectConfig;
-import cz.jzitnik.annotations.injectors.InjectDependency;
-import cz.jzitnik.annotations.injectors.InjectState;
-import cz.jzitnik.config.Debugging;
-import cz.jzitnik.config.PlayerConfig;
-import cz.jzitnik.events.MouseAction;
-import cz.jzitnik.events.MouseMoveEvent;
-import cz.jzitnik.events.RerenderScreen;
-import cz.jzitnik.game.GameRoom;
-import cz.jzitnik.game.GameState;
-import cz.jzitnik.game.Player;
-import cz.jzitnik.game.ResourceManager;
-import cz.jzitnik.game.utils.RoomCords;
-import cz.jzitnik.game.utils.Selectable;
-import cz.jzitnik.states.ScreenBuffer;
-import cz.jzitnik.states.TerminalState;
-import cz.jzitnik.utils.DependencyManager;
-import cz.jzitnik.utils.RerenderUtils;
-import cz.jzitnik.utils.events.AbstractEventHandler;
-import cz.jzitnik.utils.events.EventManager;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectConfig;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.annotations.injectors.InjectState;
+import cz.jzitnik.client.config.Debugging;
+import cz.jzitnik.client.config.PlayerConfig;
+import cz.jzitnik.client.events.MouseAction;
+import cz.jzitnik.client.events.MouseMoveEvent;
+import cz.jzitnik.client.events.RerenderScreen;
+import cz.jzitnik.client.game.GameRoom;
+import cz.jzitnik.client.game.GameState;
+import cz.jzitnik.client.game.Player;
+import cz.jzitnik.client.game.ResourceManager;
+import cz.jzitnik.common.models.coordinates.RoomCords;
+import cz.jzitnik.client.game.utils.Selectable;
+import cz.jzitnik.client.states.ScreenBuffer;
+import cz.jzitnik.client.states.TerminalState;
+import cz.jzitnik.client.utils.RerenderUtils;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.utils.events.EventManager;
 import lombok.extern.slf4j.Slf4j;

 import java.awt.image.BufferedImage;
@@ -36,10 +35,6 @@ import java.util.stream.Stream;
@Slf4j
@EventHandler(MouseMoveEvent.class)
 public class MouseMoveEventHandler extends AbstractEventHandler<MouseMoveEvent> {
-    public MouseMoveEventHandler(DependencyManager dm) {
-        super(dm);
-    }
-
    private MouseMoveEvent lastEvent = new MouseMoveEvent(new MouseAction(MouseActionType.MOVE, 1, new TerminalPosition(0, 0)));

    @InjectState
@@ -138,7 +133,7 @@ public class MouseMoveEventHandler extends AbstractEventHandler<MouseMoveEvent>
                    objXEnd, objYEnd
            );

-            if (distance > playerConfig.getPlayerReach()) {
+            if (distance > playerConfig.playerReach()) {
                return false;
            }

@@ -182,10 +177,10 @@ public class MouseMoveEventHandler extends AbstractEventHandler<MouseMoveEvent>
                    currentRoom,
                    room,
                    player,
-                    playerTexture,
                    screenBuffer,
                    resourceManager,
-                    debugging
+                    debugging,
+                    gameState.getOtherPlayers()
            );

            parts.add(new RerenderScreen.ScreenPart(
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/PlayerMoveEventHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/PlayerMoveEventHandler.java
@@ -1,33 +1,27 @@
-package cz.jzitnik.events.handlers;
+package cz.jzitnik.client.events.handlers;

 import com.googlecode.lanterna.TerminalPosition;
 import com.googlecode.lanterna.input.KeyStroke;
-import cz.jzitnik.annotations.EventHandler;
-import cz.jzitnik.annotations.injectors.InjectConfig;
-import cz.jzitnik.annotations.injectors.InjectDependency;
-import cz.jzitnik.annotations.injectors.InjectState;
-import cz.jzitnik.config.Debugging;
-import cz.jzitnik.config.Logging;
-import cz.jzitnik.config.PlayerConfig;
-import cz.jzitnik.events.MouseMoveEvent;
-import cz.jzitnik.events.PlayerMoveEvent;
-import cz.jzitnik.events.RerenderScreen;
-import cz.jzitnik.events.RoomChangeEvent;
-import cz.jzitnik.game.GameRoom;
-import cz.jzitnik.game.GameState;
-import cz.jzitnik.game.Player;
-import cz.jzitnik.game.ResourceManager;
-import cz.jzitnik.game.utils.RoomCords;
-import cz.jzitnik.states.RenderState;
-import cz.jzitnik.states.ScreenBuffer;
-import cz.jzitnik.states.PlayerMovementState;
-import cz.jzitnik.states.TerminalState;
-import cz.jzitnik.ui.Stats;
-import cz.jzitnik.utils.DependencyManager;
-import cz.jzitnik.utils.RerenderUtils;
-import cz.jzitnik.utils.events.AbstractEventHandler;
-import cz.jzitnik.utils.events.Event;
-import cz.jzitnik.utils.events.EventManager;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectConfig;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.annotations.injectors.InjectState;
+import cz.jzitnik.client.config.Debugging;
+import cz.jzitnik.client.config.PlayerConfig;
+import cz.jzitnik.client.events.*;
+import cz.jzitnik.client.game.*;
+import cz.jzitnik.common.models.coordinates.RoomCords;
+import cz.jzitnik.client.states.RenderState;
+import cz.jzitnik.client.states.ScreenBuffer;
+import cz.jzitnik.client.states.PlayerMovementState;
+import cz.jzitnik.client.states.TerminalState;
+import cz.jzitnik.client.ui.Stats;
+import cz.jzitnik.client.utils.RerenderUtils;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.utils.events.Event;
+import cz.jzitnik.client.utils.events.EventManager;
+import cz.jzitnik.common.socket.messages.player.PlayerMove;
+import cz.jzitnik.common.socket.messages.player.PlayerRotation;
 import lombok.extern.slf4j.Slf4j;

 import java.awt.image.BufferedImage;
@@ -51,17 +45,11 @@ public class PlayerMoveEventHandler extends AbstractEventHandler<PlayerMoveEvent
    private PlayerConfig playerConfig;
    @InjectState
    private RenderState renderState;
-    @InjectConfig
-    private Logging logging;
    @InjectState
    private PlayerMovementState playerMovementState;
    @InjectDependency
    private Stats stats;

-    public PlayerMoveEventHandler(DependencyManager dm) {
-        super(dm);
-    }
-
    @Override
    public void handle(PlayerMoveEvent event) {
        if (renderState.isTerminalTooSmall()) {
@@ -73,13 +61,13 @@ public class PlayerMoveEventHandler extends AbstractEventHandler<PlayerMoveEvent
        RoomCords playerCords = player.getPlayerCords();
        GameRoom currentRoom = gameState.getCurrentRoom();

-        boolean isSprinting = player.getStamina() > 0 && switch (playerConfig.getSprintKey()) {
+        boolean isSprinting = player.getStamina() > 0 && switch (playerConfig.sprintKey()) {
            case CTRL -> event.getKeyStroke().isCtrlDown();
            case SHIFT -> event.getKeyStroke().isShiftDown();
            case ALT -> event.getKeyStroke().isAltDown();
        };

-        int moveStep = isSprinting ? playerConfig.getPlayerMoveDistanceSprinting() : playerConfig.getPlayerMoveDistance();
+        int moveStep = isSprinting ? playerConfig.playerMoveDistanceSprinting() : playerConfig.playerMoveDistance();

        int originalPlayerX = playerCords.getX();
        int originalPlayerY = playerCords.getY();
@@ -87,46 +75,46 @@ public class PlayerMoveEventHandler extends AbstractEventHandler<PlayerMoveEvent
            case 'w' -> {
                if (originalPlayerY <= 10) {
                    if (originalPlayerX >= 80 && originalPlayerX <= 105) {
-                        player.setPlayerRotation(Player.PlayerRotation.BACK);
+                        player.setPlayerRotation(PlayerRotation.BACK);
                        eventManager.emitEvent(new RoomChangeEvent(FullRoomDrawHandler.DoorPosition.TOP));
                    }
                    return;
                }
-                playerCords.updateCordsWithColliders(currentRoom.getColliders(), player.getPlayerCords().getX(), playerCords.getY() - moveStep);
-                player.setPlayerRotation(Player.PlayerRotation.BACK);
+                playerCords.updateCordsWithColliders(currentRoom.getColliders(), player.getPlayerCords().getX(), playerCords.getY() - moveStep, player.getCollider());
+                player.setPlayerRotation(PlayerRotation.BACK);
            }
            case 'a' -> {
                if (originalPlayerX <= 30) {
                    if (originalPlayerY >= 35 && originalPlayerY <= 65) {
-                        player.setPlayerRotation(Player.PlayerRotation.LEFT);
+                        player.setPlayerRotation(PlayerRotation.LEFT);
                        eventManager.emitEvent(new RoomChangeEvent(FullRoomDrawHandler.DoorPosition.LEFT));
                    }
                    return;
                }
-                playerCords.updateCordsWithColliders(currentRoom.getColliders(), player.getPlayerCords().getX() - moveStep, playerCords.getY());
-                player.setPlayerRotation(Player.PlayerRotation.LEFT);
+                playerCords.updateCordsWithColliders(currentRoom.getColliders(), player.getPlayerCords().getX() - moveStep, playerCords.getY(), player.getCollider());
+                player.setPlayerRotation(PlayerRotation.LEFT);
            }
            case 's' -> {
                if (originalPlayerY >= 110) {
                    if (originalPlayerX >= 75 && originalPlayerX <= 105) {
-                        player.setPlayerRotation(Player.PlayerRotation.FRONT);
+                        player.setPlayerRotation(PlayerRotation.FRONT);
                        eventManager.emitEvent(new RoomChangeEvent(FullRoomDrawHandler.DoorPosition.BOTTOM));
                    }
                    return;
                }
-                playerCords.updateCordsWithColliders(currentRoom.getColliders(), player.getPlayerCords().getX(), playerCords.getY() + moveStep);
-                player.setPlayerRotation(Player.PlayerRotation.FRONT);
+                playerCords.updateCordsWithColliders(currentRoom.getColliders(), player.getPlayerCords().getX(), playerCords.getY() + moveStep, player.getCollider());
+                player.setPlayerRotation(PlayerRotation.FRONT);
            }
            case 'd' -> {
                if (originalPlayerX >= 155) {
                    if (originalPlayerY >= 40 && originalPlayerY <= 60) {
-                        player.setPlayerRotation(Player.PlayerRotation.RIGHT);
+                        player.setPlayerRotation(PlayerRotation.RIGHT);
                        eventManager.emitEvent(new RoomChangeEvent(FullRoomDrawHandler.DoorPosition.RIGHT));
                    }
                    return;
                }
-                playerCords.updateCordsWithColliders(currentRoom.getColliders(), player.getPlayerCords().getX() + moveStep, playerCords.getY());
-                player.setPlayerRotation(Player.PlayerRotation.RIGHT);
+                playerCords.updateCordsWithColliders(currentRoom.getColliders(), player.getPlayerCords().getX() + moveStep, playerCords.getY(), player.getCollider());
+                player.setPlayerRotation(PlayerRotation.RIGHT);
            }
        }
        playerMovementState.setLastMovement(System.currentTimeMillis());
@@ -137,7 +125,7 @@ public class PlayerMoveEventHandler extends AbstractEventHandler<PlayerMoveEvent

        int newPlayerX = playerCords.getX();
        int newPlayerY = playerCords.getY();
-        if (logging.isShowPlayerCordsLogs()) {
+        if (debugging.showPlayerCordsLogs()) {
            log.debug("x: {}, y: {}", newPlayerX, newPlayerY);
        }
        BufferedImage playerTexture = player.getTexture(resourceManager);
@@ -151,9 +139,10 @@ public class PlayerMoveEventHandler extends AbstractEventHandler<PlayerMoveEvent
        int startX = start.getX();
        int startY = start.getY();

-        RerenderUtils.rerenderPart(forStartX, forEndX, forStartY, forEndY, startX, startY, currentRoom, room, player, playerTexture, screenBuffer, resourceManager, debugging);
+        RerenderUtils.rerenderPart(forStartX, forEndX, forStartY, forEndY, startX, startY, currentRoom, room, player, screenBuffer, resourceManager, debugging, gameState.getOtherPlayers());

        eventManager.emitEvent(new Event[]{
+                new SendSocketMessageEvent(new PlayerMove(playerCords, player.getPlayerRotation())),
                new MouseMoveEvent(null),
                new RerenderScreen(
                        new RerenderScreen.ScreenPart[]{
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/RenderStatsHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/RenderStatsHandler.java
@@ -1,14 +1,13 @@
-package cz.jzitnik.events.handlers;
+package cz.jzitnik.client.events.handlers;

 import com.googlecode.lanterna.TerminalPosition;
-import cz.jzitnik.annotations.EventHandler;
-import cz.jzitnik.annotations.injectors.InjectDependency;
-import cz.jzitnik.events.RenderStats;
-import cz.jzitnik.events.RerenderScreen;
-import cz.jzitnik.ui.Stats;
-import cz.jzitnik.utils.DependencyManager;
-import cz.jzitnik.utils.events.AbstractEventHandler;
-import cz.jzitnik.utils.events.EventManager;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.events.RenderStats;
+import cz.jzitnik.client.events.RerenderScreen;
+import cz.jzitnik.client.ui.Stats;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.utils.events.EventManager;

@EventHandler(RenderStats.class)
 public class RenderStatsHandler extends AbstractEventHandler<RenderStats> {
@@ -18,10 +17,6 @@ public class RenderStatsHandler extends AbstractEventHandler<RenderStats> {
    @InjectDependency
    private Stats stats;

-    public RenderStatsHandler(DependencyManager dm) {
-        super(dm);
-    }
-
    @Override
    public void handle(RenderStats event) {
        stats.rerender();
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/RerenderPartHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/RerenderPartHandler.java
@@ -1,32 +1,27 @@
-package cz.jzitnik.events.handlers;
+package cz.jzitnik.client.events.handlers;

 import com.googlecode.lanterna.TerminalPosition;
-import cz.jzitnik.annotations.EventHandler;
-import cz.jzitnik.annotations.injectors.InjectConfig;
-import cz.jzitnik.annotations.injectors.InjectDependency;
-import cz.jzitnik.annotations.injectors.InjectState;
-import cz.jzitnik.config.Debugging;
-import cz.jzitnik.events.RerenderPart;
-import cz.jzitnik.events.RerenderScreen;
-import cz.jzitnik.game.GameRoom;
-import cz.jzitnik.game.GameState;
-import cz.jzitnik.game.ResourceManager;
-import cz.jzitnik.game.utils.RoomCords;
-import cz.jzitnik.states.ScreenBuffer;
-import cz.jzitnik.states.TerminalState;
-import cz.jzitnik.utils.DependencyManager;
-import cz.jzitnik.utils.RerenderUtils;
-import cz.jzitnik.utils.events.AbstractEventHandler;
-import cz.jzitnik.utils.events.EventManager;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectConfig;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.annotations.injectors.InjectState;
+import cz.jzitnik.client.config.Debugging;
+import cz.jzitnik.client.events.RerenderPart;
+import cz.jzitnik.client.events.RerenderScreen;
+import cz.jzitnik.client.game.GameRoom;
+import cz.jzitnik.client.game.GameState;
+import cz.jzitnik.client.game.ResourceManager;
+import cz.jzitnik.common.models.coordinates.RoomCords;
+import cz.jzitnik.client.states.ScreenBuffer;
+import cz.jzitnik.client.states.TerminalState;
+import cz.jzitnik.client.utils.RerenderUtils;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.utils.events.EventManager;

 import java.awt.image.BufferedImage;

@EventHandler(RerenderPart.class)
 public class RerenderPartHandler extends AbstractEventHandler<RerenderPart> {
-    public RerenderPartHandler(DependencyManager dm) {
-        super(dm);
-    }
-
    @InjectState
    private TerminalState terminalState;

@@ -67,10 +62,10 @@ public class RerenderPartHandler extends AbstractEventHandler<RerenderPart> {
                currentRoom,
                room,
                gameState.getPlayer(),
-                gameState.getPlayer().getTexture(resourceManager),
                screenBuffer,
                resourceManager,
-                debugging
+                debugging,
+                gameState.getOtherPlayers()
        );

        eventManager.emitEvent(
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/RoomChangeEventHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/RoomChangeEventHandler.java
@@ -1,17 +1,17 @@
-package cz.jzitnik.events.handlers;
+package cz.jzitnik.client.events.handlers;

-import cz.jzitnik.annotations.EventHandler;
-import cz.jzitnik.annotations.injectors.InjectDependency;
-import cz.jzitnik.annotations.injectors.InjectState;
-import cz.jzitnik.events.FullRoomDraw;
-import cz.jzitnik.events.RoomChangeEvent;
-import cz.jzitnik.game.GameRoom;
-import cz.jzitnik.game.GameState;
-import cz.jzitnik.game.utils.RoomCords;
-import cz.jzitnik.utils.DependencyManager;
-import cz.jzitnik.utils.events.AbstractEventHandler;
-import cz.jzitnik.utils.events.EventManager;
-import cz.jzitnik.utils.roomtasks.RoomTaskScheduler;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.annotations.injectors.InjectState;
+import cz.jzitnik.client.events.RoomChangeEvent;
+import cz.jzitnik.client.events.SendSocketMessageEvent;
+import cz.jzitnik.client.game.GameRoom;
+import cz.jzitnik.client.game.GameState;
+import cz.jzitnik.common.models.coordinates.RoomCords;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.utils.events.EventManager;
+import cz.jzitnik.client.utils.roomtasks.RoomTaskScheduler;
+import cz.jzitnik.common.socket.messages.room.MovePlayerRoom;
 import lombok.extern.slf4j.Slf4j;

 import java.util.concurrent.Executors;
@@ -29,13 +29,10 @@ public class RoomChangeEventHandler extends AbstractEventHandler<RoomChangeEvent
    @InjectDependency
    private RoomTaskScheduler roomTaskScheduler;

-    public RoomChangeEventHandler(DependencyManager dm) {
-        super(dm);
-    }
-
    @Override
    public void handle(RoomChangeEvent event) {
        RoomCords playerCords = gameState.getPlayer().getPlayerCords();
+        RoomCords oldCords = playerCords.clone();
        GameRoom currentRoom = gameState.getCurrentRoom();
        GameRoom newRoom = switch (event.door()) {
            case LEFT -> currentRoom.getLeft();
@@ -55,10 +52,9 @@ public class RoomChangeEventHandler extends AbstractEventHandler<RoomChangeEvent
            case BOTTOM -> playerCords.updateCords(playerCords.getX(), 10);
        }

+        eventManager.emitEvent(new SendSocketMessageEvent(new MovePlayerRoom(newRoom.getId(), oldCords, playerCords)));
+
        gameState.setCurrentRoom(newRoom);
-        scheduler.schedule(() -> {
-            roomTaskScheduler.setupNewSchedulers(newRoom);
-        }, 200, TimeUnit.MILLISECONDS);
-        eventManager.emitEvent(new FullRoomDraw());
+        scheduler.schedule(() -> roomTaskScheduler.setupNewSchedulers(newRoom), 200, TimeUnit.MILLISECONDS);
    }
 }
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/SendSocketMessageEventHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/SendSocketMessageEventHandler.java
@@ -0,0 +1,24 @@
+package cz.jzitnik.client.events.handlers;
+
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.events.SendSocketMessageEvent;
+import cz.jzitnik.client.socket.Client;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
+
+import java.io.IOException;
+
+@EventHandler(SendSocketMessageEvent.class)
+public class SendSocketMessageEventHandler extends AbstractEventHandler<SendSocketMessageEvent> {
+    @InjectDependency
+    private Client client;
+
+    @Override
+    public void handle(SendSocketMessageEvent event) {
+        try {
+            client.send(event.message());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/TerminalResizeEventHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/TerminalResizeEventHandler.java
@@ -1,27 +1,23 @@
-package cz.jzitnik.events.handlers;
+package cz.jzitnik.client.events.handlers;

 import com.googlecode.lanterna.TerminalSize;
-import cz.jzitnik.annotations.EventHandler;
-import cz.jzitnik.annotations.injectors.InjectDependency;
-import cz.jzitnik.annotations.injectors.InjectState;
-import cz.jzitnik.events.FullRoomDraw;
-import cz.jzitnik.events.TerminalResizeEvent;
-import cz.jzitnik.game.GameState;
-import cz.jzitnik.states.ScreenBuffer;
-import cz.jzitnik.ui.pixels.Empty;
-import cz.jzitnik.ui.pixels.Pixel;
-import cz.jzitnik.utils.DependencyManager;
-import cz.jzitnik.utils.events.AbstractEventHandler;
-import cz.jzitnik.utils.events.EventManager;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectDependency;
+import cz.jzitnik.client.annotations.injectors.InjectState;
+import cz.jzitnik.client.events.FullRoomDraw;
+import cz.jzitnik.client.events.TerminalResizeEvent;
+import cz.jzitnik.client.game.GameState;
+import cz.jzitnik.client.states.ScreenBuffer;
+import cz.jzitnik.client.ui.pixels.AlphaPixel;
+import cz.jzitnik.client.ui.pixels.Empty;
+import cz.jzitnik.client.ui.pixels.Pixel;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.utils.events.EventManager;
 import lombok.extern.slf4j.Slf4j;

@Slf4j
@EventHandler(TerminalResizeEvent.class)
 public class TerminalResizeEventHandler extends AbstractEventHandler<TerminalResizeEvent> {
-    public TerminalResizeEventHandler(DependencyManager dm) {
-        super(dm);
-    }
-
    @InjectDependency
    private EventManager eventManager;

@@ -40,12 +36,15 @@ public class TerminalResizeEventHandler extends AbstractEventHandler<TerminalRes
        int height = size.getRows() * 2;

        Pixel[][] buffer = new Pixel[height][width];
+        AlphaPixel[][] globalOverride = new AlphaPixel[height][width];
        for (int x = 0; x < width; x++) {
            for (int y = 0; y < height; y++) {
                buffer[y][x] = new Empty();
+                globalOverride[y][x] = new Empty();
            }
        }
        screenBuffer.setRenderedBuffer(buffer);
+        screenBuffer.setGlobalOverrideBuffer(globalOverride);

        if (gameState.getScreen() != null) {
            if (screenRerendering) {
--- a/game/src/main/java/cz/jzitnik/client/events/handlers/TerminalTooSmallEventHandler.java
+++ b/game/src/main/java/cz/jzitnik/client/events/handlers/TerminalTooSmallEventHandler.java
@@ -1,28 +1,21 @@
-package cz.jzitnik.events.handlers;
+package cz.jzitnik.client.events.handlers;

 import com.googlecode.lanterna.SGR;
 import com.googlecode.lanterna.TerminalSize;
-import com.googlecode.lanterna.TextCharacter;
 import com.googlecode.lanterna.TextColor;
 import com.googlecode.lanterna.screen.Screen;
 import com.googlecode.lanterna.screen.TerminalScreen;
-import cz.jzitnik.annotations.EventHandler;
-import cz.jzitnik.annotations.injectors.InjectState;
-import cz.jzitnik.events.TerminalTooSmallEvent;
-import cz.jzitnik.states.TerminalState;
-import cz.jzitnik.utils.DependencyManager;
-import cz.jzitnik.utils.events.AbstractEventHandler;
+import cz.jzitnik.client.annotations.EventHandler;
+import cz.jzitnik.client.annotations.injectors.InjectState;
+import cz.jzitnik.client.events.TerminalTooSmallEvent;
+import cz.jzitnik.client.states.TerminalState;
+import cz.jzitnik.client.utils.events.AbstractEventHandler;

 import java.io.IOException;
 import java.util.EnumSet;
-import java.util.HashSet;

@EventHandler(TerminalTooSmallEvent.class)
 public class TerminalTooSmallEventHandler extends AbstractEventHandler<TerminalTooSmallEvent> {
-    public TerminalTooSmallEventHandler(DependencyManager dm) {
-        super(dm);
-    }
-
    @InjectState
    private TerminalState terminalState;

--- a/game/src/main/java/cz/jzitnik/client/game/Constants.java
+++ b/game/src/main/java/cz/jzitnik/client/game/Constants.java
@@ -1,4 +1,4 @@
-package cz.jzitnik.game;
+package cz.jzitnik.client.game;

 import com.googlecode.lanterna.TextColor;

--- a/game/src/main/java/cz/jzitnik/client/game/GamePlayer.java
+++ b/game/src/main/java/cz/jzitnik/client/game/GamePlayer.java
@@ -0,0 +1,10 @@
+package cz.jzitnik.client.game;
+
+import cz.jzitnik.common.models.coordinates.RoomCords;
+
+import java.awt.image.BufferedImage;
+
+public interface GamePlayer {
+    RoomCords getPlayerCords();
+    BufferedImage getTexture(ResourceManager resourceManager);
+}
--- a/game/src/main/java/cz/jzitnik/client/game/GameRoom.java
+++ b/game/src/main/java/cz/jzitnik/client/game/GameRoom.java
@@ -0,0 +1,88 @@
+package cz.jzitnik.client.game;
+
+import com.fasterxml.jackson.annotation.*;
+import cz.jzitnik.client.game.mobs.Mob;
+import cz.jzitnik.client.game.objects.DroppedItem;
+import cz.jzitnik.client.game.objects.GameObject;
+import cz.jzitnik.client.ui.pixels.Empty;
+import cz.jzitnik.client.ui.pixels.Pixel;
+import cz.jzitnik.common.models.coordinates.RoomPart;
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@JsonIdentityInfo(
+        generator = ObjectIdGenerators.PropertyGenerator.class,
+        property = "id"
+)
+@Getter
+public class GameRoom {
+    private final String id;
+    @JsonIgnore
+    private final Pixel[][] overrideBuffer;
+    @JsonIgnore
+    private final ResourceManager.Resource texture;
+    @JsonIgnore
+    private final List<GameObject> objects = new ArrayList<>();
+    @JsonIgnore
+    private final List<Mob> mobs = new ArrayList<>();
+    @JsonIgnore
+    private final Set<DroppedItem> droppedItems = new HashSet<>();
+    @JsonIgnore
+    private final List<RoomPart> colliders = new ArrayList<>();
+
+    private GameRoom left;
+    private GameRoom right;
+    private GameRoom up;
+    private GameRoom down;
+
+    @JsonCreator
+    public GameRoom(
+            @JsonProperty("id") String id,
+            @JsonProperty("objects") List<GameObject> objects,
+            @JsonProperty("colliders") List<RoomPart> colliders,
+            @JsonProperty("mobs") List<Mob> mobs,
+            @JsonProperty("texture") ResourceManager.Resource texture
+    ) {
+        this.id = id;
+        this.texture = texture;
+
+        if (objects != null) this.objects.addAll(objects);
+        if (colliders != null) this.colliders.addAll(colliders);
+        if (mobs != null) this.mobs.addAll(mobs);
+
+        int height = 225;
+        int width = 225 * 2;
+
+        Pixel[][] overrideBuffer = new Pixel[height][width];
+        for (int x = 0; x < width; x++) {
+            for (int y = 0; y < height; y++) {
+                overrideBuffer[y][x] = new Empty();
+            }
+        }
+        this.overrideBuffer = overrideBuffer;
+    }
+
+    @JsonSetter("west")
+    public void setWest(GameRoom west) {
+        if (west != null) this.left = west;
+    }
+
+    @JsonSetter("east")
+    public void setEast(GameRoom east) {
+        if (east != null) this.right = east;
+    }
+
+    @JsonSetter("north")
+    public void setNorth(GameRoom north) {
+        if (north != null) this.up = north;
+    }
+
+    @JsonSetter("south")
+    public void setSouth(GameRoom south) {
+        if (south != null) this.down = south;
+    }
+}
--- a/game/src/main/java/cz/jzitnik/client/game/GameState.java
+++ b/game/src/main/java/cz/jzitnik/client/game/GameState.java
@@ -0,0 +1,54 @@
+package cz.jzitnik.client.game;
+
+import cz.jzitnik.client.annotations.State;
+import cz.jzitnik.client.game.objects.Interactable;
+import cz.jzitnik.client.screens.Screen;
+import cz.jzitnik.client.utils.DependencyManager;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RequiredArgsConstructor
+@State
+public class GameState {
+    private final DependencyManager dependencyManager; // Maybe transient in the future
+
+    @Getter
+    @Setter
+    private GameRoom currentRoom;
+
+    @Getter
+    @Setter
+    private List<GameRoom> allRooms;
+
+    @Getter
+    @Setter
+    private Player player;
+
+    private final List<OtherPlayer> otherPlayers = new ArrayList<>();
+
+    public List<OtherPlayer> getOtherPlayers() {
+        return otherPlayers.stream().filter(OtherPlayer::isVisible).toList();
+    }
+
+    public List<OtherPlayer> getAllOtherPlayers() {
+        return otherPlayers;
+    }
+
+    @Getter
+    @Setter
+    private Interactable interacting;
+
+    @Getter
+    private Screen screen;
+
+    public void setScreen(Screen screen) {
+        if (screen != null) {
+            dependencyManager.inject(screen);
+        }
+        this.screen = screen;
+    }
+}
--- a/game/src/main/java/cz/jzitnik/client/game/OtherPlayer.java
+++ b/game/src/main/java/cz/jzitnik/client/game/OtherPlayer.java
@@ -0,0 +1,41 @@
+package cz.jzitnik.client.game;
+
+import cz.jzitnik.client.game.mobs.HittableMob;
+import cz.jzitnik.common.models.coordinates.RoomCords;
+import cz.jzitnik.common.models.player.PlayerCreation;
+import cz.jzitnik.common.socket.messages.player.PlayerRotation;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.awt.image.BufferedImage;
+
+@Getter
+public class OtherPlayer implements GamePlayer {
+    private final int id;
+    private boolean hitAnimationOn = false;
+    private final RoomCords playerCords;
+    @Setter
+    private PlayerRotation playerRotation = PlayerRotation.FRONT;
+    @Setter
+    private boolean visible;
+
+    public OtherPlayer(PlayerCreation playerCreation) {
+        this.id = playerCreation.getId();
+        this.playerCords = playerCreation.getPlayerCords();
+    }
+
+    public BufferedImage getTexture(ResourceManager resourceManager) {
+        BufferedImage resource = resourceManager.getResource(switch (playerRotation) {
+            case FRONT -> ResourceManager.Resource.PLAYER_FRONT;
+            case BACK -> ResourceManager.Resource.PLAYER_BACK;
+            case LEFT -> ResourceManager.Resource.PLAYER_LEFT;
+            case RIGHT -> ResourceManager.Resource.PLAYER_RIGHT;
+        });
+
+        if (hitAnimationOn) {
+            return HittableMob.applyRedFactor(resource);
+        }
+
+        return resource;
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jzitnik-dev	cdd002ea20	feat: Synchronize game items kinda	2026-02-03 21:40:13 +01:00
jzitnik-dev	faadc92dbc	feat: Player disconnect handler	2026-02-03 20:52:36 +01:00
jzitnik-dev	f6de75afd9	feat: Store player rotation	2026-02-03 09:54:23 +01:00
jzitnik-dev	1f54e933ad	chore: Remove todo	2026-02-02 22:04:54 +01:00
jzitnik-dev	9ca3a8d34c	feat: Multiplayer player moving between rooms	2026-02-02 21:59:55 +01:00
jzitnik-dev	e3f5c12b43	feat: Player movement multiplayer	2026-02-02 21:06:46 +01:00
jzitnik-dev	24f54b8b7a	feat: Connecting to a game	2026-02-02 19:18:25 +01:00
jzitnik-dev	92eb93815d	feat: Some more multiplayer stuff Hello miss Meitnerova... If you are not Meitnerova but some random person stalking my projects go get a life. Anyways have a great time reading this awful code :)	2026-02-02 18:51:51 +01:00
jzitnik-dev	f987b2bed6	chore: Add logs to gitignore	2026-02-01 15:23:37 +01:00
jzitnik-dev	b79c2f3373	chore: Remove logs	2026-02-01 15:23:20 +01:00
jzitnik-dev	ac5a96eb19	feat: Server selector	2026-02-01 15:16:44 +01:00
jzitnik-dev	fc14e4081d	feat: Finallized communication	2026-01-31 19:46:33 +01:00
jzitnik-dev	ef14edffde	feat: Started basic implementation of socket comm	2026-01-31 17:02:24 +01:00
jzitnik-dev	bfcce054d5	chore: Starting setting up multiplayer	2026-01-30 13:14:56 +01:00
jzitnik-dev	b72ac87098	chore: Game	2026-01-25 16:15:12 +01:00
jzitnik-dev	5193b4aba8	chore: Updated dependencies	2026-01-24 22:06:20 +01:00
jzitnik-dev	6e665dbbdd	refactor: Config in files	2026-01-24 21:40:44 +01:00
jzitnik-dev	743ad8e760	refactor: Load a game setup from a yaml file	2026-01-24 21:08:43 +01:00
jzitnik-dev	aac651cf93	refactor: Reworked collision system	2026-01-22 16:11:16 +01:00
jzitnik-dev	f8d28acc33	feat: Dialog running code and changeable tasks	2026-01-22 14:13:41 +01:00
jzitnik-dev	46981937ce	refactor(events): Small event manager refactoring	2026-01-21 08:05:32 +01:00
jzitnik-dev	cb488f9853	feat: Show icons in stats	2026-01-20 12:36:18 +01:00
jzitnik-dev	da45765413	feat: Dialog answering	2026-01-19 20:17:13 +01:00
jzitnik-dev	eef269c853	feat: Implemented text rendering	2026-01-19 17:20:49 +01:00
jzitnik-dev	6335ab7e5c	chore: Started implementing dialog	2026-01-19 09:30:50 +01:00