jzitnik/game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Multiplayer #2

Merged
jzitnik merged 14 commits from multiplayer into main 2026-02-04 10:33:25 +00:00
Conversation 4 Commits 14 Files Changed 254 +1263 -969
193 changed files with 1263 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bfcce054d5 - Show all commits

23
.idea/compiler.xml generated Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<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" />
<module name="common" />
<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>

6
.idea/encodings.xml generated
View File

@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="Encoding"> <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/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component> </component>

25
.idea/jarRepositories.xml generated Normal file
View File

@@ -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>

16
.idea/misc.xml generated
View File

@@ -1,17 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <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="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager"> <component name="MavenProjectsManager">
<option name="originalFiles"> <option name="originalFiles">
@@ -20,7 +8,5 @@
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_25" default="true" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK"> <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> </project>

39
common/.gitignore vendored Normal file
View File

@@ -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

3
common/.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,3 @@
# Default ignored files
/shelf/
/workspace.xml

7
common/.idea/encodings.xml generated Normal file
View File

@@ -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>

14
common/.idea/misc.xml generated Normal file
View File

@@ -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>

6
common/.idea/vcs.xml generated Normal file
View File

@@ -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>

28
common/pom.xml Normal file
View File

@@ -0,0 +1,28 @@
<?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>
<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>
</dependencies>
</project>

0
.gitignore → game/.gitignore vendored
View File

3
game/.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,3 @@
# Default ignored files
/shelf/
/workspace.xml

7
game/.idea/encodings.xml generated Normal file
View File

@@ -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>

26
game/.idea/misc.xml generated Normal file
View File

@@ -0,0 +1,26 @@
<?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">
<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>

6
game/.idea/vcs.xml generated Normal file
View File

@@ -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>

183
game/pom.xml Normal file
View File

@@ -0,0 +1,183 @@
<?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>
</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>
</dependencies>
</project>

20
src/main/java/cz/jzitnik/Cli.java → game/src/main/java/cz/jzitnik/client/Cli.java
View File

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

14
src/main/java/cz/jzitnik/Game.java → game/src/main/java/cz/jzitnik/client/Game.java
View File

@@ -1,11 +1,11 @@
package cz.jzitnik; package cz.jzitnik.client;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.game.setup.GameSetup; import cz.jzitnik.client.game.setup.GameSetup;
import cz.jzitnik.utils.DependencyManager; import cz.jzitnik.client.utils.DependencyManager;
import cz.jzitnik.utils.GlobalIOHandlerRepository; import cz.jzitnik.client.utils.GlobalIOHandlerRepository;
import cz.jzitnik.utils.ScheduledTaskManager; import cz.jzitnik.client.utils.ScheduledTaskManager;
import cz.jzitnik.utils.ThreadManager; import cz.jzitnik.client.utils.ThreadManager;
import org.reflections.Reflections; import org.reflections.Reflections;
import java.io.IOException; import java.io.IOException;

2
src/main/java/cz/jzitnik/Main.java → game/src/main/java/cz/jzitnik/client/Main.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik; package cz.jzitnik.client;
// events/handlers/MouseMoveEventHandler.java // events/handlers/MouseMoveEventHandler.java

2
src/main/java/cz/jzitnik/annotations/Config.java → game/src/main/java/cz/jzitnik/client/annotations/Config.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations; package cz.jzitnik.client.annotations;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;

2
src/main/java/cz/jzitnik/annotations/Dependency.java → game/src/main/java/cz/jzitnik/client/annotations/Dependency.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations; package cz.jzitnik.client.annotations;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;

4
src/main/java/cz/jzitnik/annotations/EventHandler.java → game/src/main/java/cz/jzitnik/client/annotations/EventHandler.java
View File

@@ -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.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;

2
src/main/java/cz/jzitnik/annotations/PostInit.java → game/src/main/java/cz/jzitnik/client/annotations/PostInit.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations; package cz.jzitnik.client.annotations;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;

2
src/main/java/cz/jzitnik/annotations/ScheduledTask.java → game/src/main/java/cz/jzitnik/client/annotations/ScheduledTask.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations; package cz.jzitnik.client.annotations;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;

2
src/main/java/cz/jzitnik/annotations/State.java → game/src/main/java/cz/jzitnik/client/annotations/State.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations; package cz.jzitnik.client.annotations;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;

2
src/main/java/cz/jzitnik/annotations/ThreadRegistry.java → game/src/main/java/cz/jzitnik/client/annotations/ThreadRegistry.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations; package cz.jzitnik.client.annotations;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;

2
src/main/java/cz/jzitnik/annotations/injectors/InjectConfig.java → game/src/main/java/cz/jzitnik/client/annotations/injectors/InjectConfig.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations.injectors; package cz.jzitnik.client.annotations.injectors;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

2
src/main/java/cz/jzitnik/annotations/injectors/InjectDependency.java → game/src/main/java/cz/jzitnik/client/annotations/injectors/InjectDependency.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations.injectors; package cz.jzitnik.client.annotations.injectors;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

2
src/main/java/cz/jzitnik/annotations/injectors/InjectState.java → game/src/main/java/cz/jzitnik/client/annotations/injectors/InjectState.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations.injectors; package cz.jzitnik.client.annotations.injectors;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

2
src/main/java/cz/jzitnik/annotations/ui/KeyboardPressHandler.java → game/src/main/java/cz/jzitnik/client/annotations/ui/KeyboardPressHandler.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations.ui; package cz.jzitnik.client.annotations.ui;
import com.googlecode.lanterna.input.KeyType; import com.googlecode.lanterna.input.KeyType;

2
src/main/java/cz/jzitnik/annotations/ui/KeyboardPressHandlers.java → game/src/main/java/cz/jzitnik/client/annotations/ui/KeyboardPressHandlers.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations.ui; package cz.jzitnik.client.annotations.ui;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

2
src/main/java/cz/jzitnik/annotations/ui/MouseHandler.java → game/src/main/java/cz/jzitnik/client/annotations/ui/MouseHandler.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations.ui; package cz.jzitnik.client.annotations.ui;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;

2
src/main/java/cz/jzitnik/annotations/ui/MouseHandlerType.java → game/src/main/java/cz/jzitnik/client/annotations/ui/MouseHandlerType.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations.ui; package cz.jzitnik.client.annotations.ui;
public enum MouseHandlerType { public enum MouseHandlerType {
CLICK, CLICK,

2
src/main/java/cz/jzitnik/annotations/ui/Render.java → game/src/main/java/cz/jzitnik/client/annotations/ui/Render.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations.ui; package cz.jzitnik.client.annotations.ui;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;

2
src/main/java/cz/jzitnik/annotations/ui/UI.java → game/src/main/java/cz/jzitnik/client/annotations/ui/UI.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.annotations.ui; package cz.jzitnik.client.annotations.ui;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;

5
src/main/java/cz/jzitnik/config/CoreLogic.java → game/src/main/java/cz/jzitnik/client/config/CoreLogic.java
View File

@@ -1,9 +1,8 @@
package cz.jzitnik.config; package cz.jzitnik.client.config;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import cz.jzitnik.annotations.Config; import cz.jzitnik.client.annotations.Config;
import lombok.Getter;
@Config("core_logic.yaml") @Config("core_logic.yaml")
public record CoreLogic(int itemDropDisappearMinutes) { public record CoreLogic(int itemDropDisappearMinutes) {

4
src/main/java/cz/jzitnik/config/Debugging.java → game/src/main/java/cz/jzitnik/client/config/Debugging.java
View File

@@ -1,8 +1,8 @@
package cz.jzitnik.config; package cz.jzitnik.client.config;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import cz.jzitnik.annotations.Config; import cz.jzitnik.client.annotations.Config;
@Config("debugging.yaml") @Config("debugging.yaml")
public record Debugging(boolean renderColliders, boolean renderPlayerCollider, boolean showPlayerCordsLogs) { public record Debugging(boolean renderColliders, boolean renderPlayerCollider, boolean showPlayerCordsLogs) {

4
src/main/java/cz/jzitnik/config/MicrophoneConfig.java → game/src/main/java/cz/jzitnik/client/config/MicrophoneConfig.java
View File

@@ -1,8 +1,8 @@
package cz.jzitnik.config; package cz.jzitnik.client.config;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import cz.jzitnik.annotations.Config; import cz.jzitnik.client.annotations.Config;
@Config("microphone.yaml") @Config("microphone.yaml")
public record MicrophoneConfig(float volumeThreshold) { public record MicrophoneConfig(float volumeThreshold) {

6
src/main/java/cz/jzitnik/config/PlayerConfig.java → game/src/main/java/cz/jzitnik/client/config/PlayerConfig.java
View File

@@ -1,9 +1,9 @@
package cz.jzitnik.config; package cz.jzitnik.client.config;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import cz.jzitnik.annotations.Config; import cz.jzitnik.client.annotations.Config;
import cz.jzitnik.events.handlers.PlayerMoveEventHandler; import cz.jzitnik.client.events.handlers.PlayerMoveEventHandler;
@Config("player.yaml") @Config("player.yaml")
public record PlayerConfig( public record PlayerConfig(

5
src/main/java/cz/jzitnik/config/ThreadPoolConfig.java → game/src/main/java/cz/jzitnik/client/config/ThreadPoolConfig.java
View File

@@ -1,9 +1,8 @@
package cz.jzitnik.config; package cz.jzitnik.client.config;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import cz.jzitnik.annotations.Config; import cz.jzitnik.client.annotations.Config;
import lombok.Getter;
@Config("threads.yaml") @Config("threads.yaml")
public record ThreadPoolConfig(int eventThreadCount, int taskThreadCount) { public record ThreadPoolConfig(int eventThreadCount, int taskThreadCount) {

7
game/src/main/java/cz/jzitnik/client/events/DroppedItemRerender.java Normal file
View File

@@ -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 {
}

4
src/main/java/cz/jzitnik/events/ExitEvent.java → game/src/main/java/cz/jzitnik/client/events/ExitEvent.java
View File

@@ -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 **/ /** Custom event without any handler **/
public class ExitEvent implements Event { public class ExitEvent implements Event {

6
game/src/main/java/cz/jzitnik/client/events/FullRedrawEvent.java Normal file
View File

@@ -0,0 +1,6 @@
package cz.jzitnik.client.events;
import cz.jzitnik.client.utils.events.Event;
public class FullRedrawEvent implements Event {
}

5
src/main/java/cz/jzitnik/events/FullRoomDraw.java → game/src/main/java/cz/jzitnik/client/events/FullRoomDraw.java
View File

@@ -1,7 +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; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

6
game/src/main/java/cz/jzitnik/client/events/InventoryRerender.java Normal file
View File

@@ -0,0 +1,6 @@
package cz.jzitnik.client.events;
import cz.jzitnik.client.utils.events.Event;
public class InventoryRerender implements Event {
}

4
src/main/java/cz/jzitnik/events/KeyboardPressEvent.java → game/src/main/java/cz/jzitnik/client/events/KeyboardPressEvent.java
View File

@@ -1,7 +1,7 @@
package cz.jzitnik.events; package cz.jzitnik.client.events;
import com.googlecode.lanterna.input.KeyStroke; import com.googlecode.lanterna.input.KeyStroke;
import cz.jzitnik.utils.events.Event; import cz.jzitnik.client.utils.events.Event;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

4
src/main/java/cz/jzitnik/events/MouseAction.java → game/src/main/java/cz/jzitnik/client/events/MouseAction.java
View File

@@ -1,8 +1,8 @@
package cz.jzitnik.events; package cz.jzitnik.client.events;
import com.googlecode.lanterna.TerminalPosition; import com.googlecode.lanterna.TerminalPosition;
import com.googlecode.lanterna.input.MouseActionType; 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 class MouseAction extends com.googlecode.lanterna.input.MouseAction implements Event {
public MouseAction(MouseActionType actionType, int button, TerminalPosition position) { public MouseAction(MouseActionType actionType, int button, TerminalPosition position) {

4
src/main/java/cz/jzitnik/events/MouseMoveEvent.java → game/src/main/java/cz/jzitnik/client/events/MouseMoveEvent.java
View File

@@ -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.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

4
src/main/java/cz/jzitnik/events/PlayerMoveEvent.java → game/src/main/java/cz/jzitnik/client/events/PlayerMoveEvent.java
View File

@@ -1,7 +1,7 @@
package cz.jzitnik.events; package cz.jzitnik.client.events;
import com.googlecode.lanterna.input.KeyStroke; import com.googlecode.lanterna.input.KeyStroke;
import cz.jzitnik.utils.events.Event; import cz.jzitnik.client.utils.events.Event;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

6
game/src/main/java/cz/jzitnik/client/events/RenderStats.java Normal file
View File

@@ -0,0 +1,6 @@
package cz.jzitnik.client.events;
import cz.jzitnik.client.utils.events.Event;
public class RenderStats implements Event {
}

4
src/main/java/cz/jzitnik/events/RerenderPart.java → game/src/main/java/cz/jzitnik/client/events/RerenderPart.java
View File

@@ -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.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

6
src/main/java/cz/jzitnik/events/RerenderScreen.java → game/src/main/java/cz/jzitnik/client/events/RerenderScreen.java
View File

@@ -1,13 +1,11 @@
package cz.jzitnik.events; package cz.jzitnik.client.events;
import com.googlecode.lanterna.TerminalPosition; import com.googlecode.lanterna.TerminalPosition;
import com.googlecode.lanterna.TerminalSize; import com.googlecode.lanterna.TerminalSize;
import cz.jzitnik.utils.events.Event; import cz.jzitnik.client.utils.events.Event;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import java.awt.*;
public record RerenderScreen(ScreenPart[] parts) implements Event { public record RerenderScreen(ScreenPart[] parts) implements Event {
public RerenderScreen(ScreenPart part) { public RerenderScreen(ScreenPart part) {
this(new ScreenPart[]{part}); this(new ScreenPart[]{part});

7
game/src/main/java/cz/jzitnik/client/events/RoomChangeEvent.java Normal file
View File

@@ -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 {
}

4
src/main/java/cz/jzitnik/events/TerminalResizeEvent.java → game/src/main/java/cz/jzitnik/client/events/TerminalResizeEvent.java
View File

@@ -1,7 +1,7 @@
package cz.jzitnik.events; package cz.jzitnik.client.events;
import com.googlecode.lanterna.TerminalSize; import com.googlecode.lanterna.TerminalSize;
import cz.jzitnik.utils.events.Event; import cz.jzitnik.client.utils.events.Event;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

6
game/src/main/java/cz/jzitnik/client/events/TerminalTooSmallEvent.java Normal file
View File

@@ -0,0 +1,6 @@
package cz.jzitnik.client.events;
import cz.jzitnik.client.utils.events.Event;
public class TerminalTooSmallEvent implements Event {
}

26
src/main/java/cz/jzitnik/events/handlers/CliHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/CliHandler.java
View File

@@ -1,19 +1,19 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import com.googlecode.lanterna.TextColor; import com.googlecode.lanterna.TextColor;
import com.googlecode.lanterna.graphics.TextGraphics; import com.googlecode.lanterna.graphics.TextGraphics;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.events.RerenderScreen; import cz.jzitnik.client.events.RerenderScreen;
import cz.jzitnik.game.Constants; import cz.jzitnik.client.game.Constants;
import cz.jzitnik.states.RenderState; import cz.jzitnik.client.states.RenderState;
import cz.jzitnik.states.ScreenBuffer; import cz.jzitnik.client.states.ScreenBuffer;
import cz.jzitnik.states.TerminalState; import cz.jzitnik.client.states.TerminalState;
import cz.jzitnik.ui.pixels.AlphaPixel; import cz.jzitnik.client.ui.pixels.AlphaPixel;
import cz.jzitnik.ui.pixels.ColoredPixel; import cz.jzitnik.client.ui.pixels.ColoredPixel;
import cz.jzitnik.ui.pixels.Empty; import cz.jzitnik.client.ui.pixels.Empty;
import cz.jzitnik.ui.pixels.Pixel; import cz.jzitnik.client.ui.pixels.Pixel;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.io.IOException; import java.io.IOException;

34
src/main/java/cz/jzitnik/events/handlers/DialogEventHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/DialogEventHandler.java
View File

@@ -1,24 +1,24 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import com.googlecode.lanterna.TerminalPosition; import com.googlecode.lanterna.TerminalPosition;
import com.googlecode.lanterna.TerminalSize; import com.googlecode.lanterna.TerminalSize;
import com.googlecode.lanterna.TextColor; import com.googlecode.lanterna.TextColor;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.events.RerenderScreen; import cz.jzitnik.client.events.RerenderScreen;
import cz.jzitnik.game.dialog.Dialog; import cz.jzitnik.client.game.dialog.Dialog;
import cz.jzitnik.game.dialog.OnEnd; import cz.jzitnik.client.game.dialog.OnEnd;
import cz.jzitnik.states.DialogState; import cz.jzitnik.client.states.DialogState;
import cz.jzitnik.states.ScreenBuffer; import cz.jzitnik.client.states.ScreenBuffer;
import cz.jzitnik.states.TerminalState; import cz.jzitnik.client.states.TerminalState;
import cz.jzitnik.ui.pixels.AlphaPixel; import cz.jzitnik.client.ui.pixels.AlphaPixel;
import cz.jzitnik.ui.pixels.ColoredPixel; import cz.jzitnik.client.ui.pixels.ColoredPixel;
import cz.jzitnik.ui.pixels.Empty; import cz.jzitnik.client.ui.pixels.Empty;
import cz.jzitnik.utils.DependencyManager; import cz.jzitnik.client.utils.DependencyManager;
import cz.jzitnik.utils.TextRenderer; import cz.jzitnik.client.utils.TextRenderer;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.awt.*; import java.awt.*;

16
src/main/java/cz/jzitnik/events/handlers/DroppedItemRerenderHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/DroppedItemRerenderHandler.java
View File

@@ -1,12 +1,12 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.events.DroppedItemRerender; import cz.jzitnik.client.events.DroppedItemRerender;
import cz.jzitnik.events.RerenderPart; import cz.jzitnik.client.events.RerenderPart;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;

20
src/main/java/cz/jzitnik/events/handlers/ExitEventHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/ExitEventHandler.java
View File

@@ -1,14 +1,14 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.events.ExitEvent; import cz.jzitnik.client.events.ExitEvent;
import cz.jzitnik.states.RunningState; import cz.jzitnik.client.states.RunningState;
import cz.jzitnik.utils.ScheduledTaskManager; import cz.jzitnik.client.utils.ScheduledTaskManager;
import cz.jzitnik.utils.ThreadManager; import cz.jzitnik.client.utils.ThreadManager;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
import cz.jzitnik.utils.roomtasks.RoomTaskScheduler; import cz.jzitnik.client.utils.roomtasks.RoomTaskScheduler;
@EventHandler(ExitEvent.class) @EventHandler(ExitEvent.class)
public class ExitEventHandler extends AbstractEventHandler<ExitEvent> { public class ExitEventHandler extends AbstractEventHandler<ExitEvent> {

18
src/main/java/cz/jzitnik/events/handlers/FullRedrawEventHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/FullRedrawEventHandler.java
View File

@@ -1,14 +1,14 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import com.googlecode.lanterna.screen.Screen; import com.googlecode.lanterna.screen.Screen;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.events.FullRedrawEvent; import cz.jzitnik.client.events.FullRedrawEvent;
import cz.jzitnik.events.FullRoomDraw; import cz.jzitnik.client.events.FullRoomDraw;
import cz.jzitnik.states.TerminalState; import cz.jzitnik.client.states.TerminalState;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import java.io.IOException; import java.io.IOException;

42
src/main/java/cz/jzitnik/events/handlers/FullRoomDrawHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/FullRoomDrawHandler.java
View File

@@ -1,28 +1,28 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import com.googlecode.lanterna.TerminalPosition; import com.googlecode.lanterna.TerminalPosition;
import com.googlecode.lanterna.TerminalSize; import com.googlecode.lanterna.TerminalSize;
import com.googlecode.lanterna.screen.TerminalScreen; import com.googlecode.lanterna.screen.TerminalScreen;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectConfig; import cz.jzitnik.client.annotations.injectors.InjectConfig;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.config.Debugging; import cz.jzitnik.client.config.Debugging;
import cz.jzitnik.events.FullRoomDraw; import cz.jzitnik.client.events.FullRoomDraw;
import cz.jzitnik.events.RerenderScreen; import cz.jzitnik.client.events.RerenderScreen;
import cz.jzitnik.events.TerminalTooSmallEvent; import cz.jzitnik.client.events.TerminalTooSmallEvent;
import cz.jzitnik.game.GameRoom; import cz.jzitnik.client.game.GameRoom;
import cz.jzitnik.game.GameState; import cz.jzitnik.client.game.GameState;
import cz.jzitnik.game.Player; import cz.jzitnik.client.game.Player;
import cz.jzitnik.game.ResourceManager; import cz.jzitnik.client.game.ResourceManager;
import cz.jzitnik.states.RenderState; import cz.jzitnik.client.states.RenderState;
import cz.jzitnik.states.ScreenBuffer; import cz.jzitnik.client.states.ScreenBuffer;
import cz.jzitnik.states.TerminalState; import cz.jzitnik.client.states.TerminalState;
import cz.jzitnik.utils.GlobalIOHandlerRepository; import cz.jzitnik.client.utils.GlobalIOHandlerRepository;
import cz.jzitnik.utils.RerenderUtils; import cz.jzitnik.client.utils.RerenderUtils;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import cz.jzitnik.utils.roomtasks.RoomTaskScheduler; import cz.jzitnik.client.utils.roomtasks.RoomTaskScheduler;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;

16
src/main/java/cz/jzitnik/events/handlers/InventoryRerenderHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/InventoryRerenderHandler.java
View File

@@ -1,13 +1,13 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import com.googlecode.lanterna.TerminalPosition; import com.googlecode.lanterna.TerminalPosition;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.events.InventoryRerender; import cz.jzitnik.client.events.InventoryRerender;
import cz.jzitnik.events.RerenderScreen; import cz.jzitnik.client.events.RerenderScreen;
import cz.jzitnik.ui.Inventory; import cz.jzitnik.client.ui.Inventory;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
@EventHandler(InventoryRerender.class) @EventHandler(InventoryRerender.class)
public class InventoryRerenderHandler extends AbstractEventHandler<InventoryRerender> { public class InventoryRerenderHandler extends AbstractEventHandler<InventoryRerender> {

16
src/main/java/cz/jzitnik/events/handlers/KeyboardPressEventHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/KeyboardPressEventHandler.java
View File

@@ -1,12 +1,12 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.events.*; import cz.jzitnik.client.events.KeyboardPressEvent;
import cz.jzitnik.game.GameState; import cz.jzitnik.client.game.GameState;
import cz.jzitnik.utils.GlobalIOHandlerRepository; import cz.jzitnik.client.utils.GlobalIOHandlerRepository;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
@EventHandler(KeyboardPressEvent.class) @EventHandler(KeyboardPressEvent.class)
public class KeyboardPressEventHandler extends AbstractEventHandler<KeyboardPressEvent> { public class KeyboardPressEventHandler extends AbstractEventHandler<KeyboardPressEvent> {

30
src/main/java/cz/jzitnik/events/handlers/MouseActionEventHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/MouseActionEventHandler.java
View File

@@ -1,19 +1,19 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectConfig; import cz.jzitnik.client.annotations.injectors.InjectConfig;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.config.PlayerConfig; import cz.jzitnik.client.config.PlayerConfig;
import cz.jzitnik.events.MouseAction; import cz.jzitnik.client.events.MouseAction;
import cz.jzitnik.events.MouseMoveEvent; import cz.jzitnik.client.events.MouseMoveEvent;
import cz.jzitnik.game.GameState; import cz.jzitnik.client.game.GameState;
import cz.jzitnik.game.utils.Selectable; import cz.jzitnik.client.game.utils.Selectable;
import cz.jzitnik.states.RenderState; import cz.jzitnik.client.states.RenderState;
import cz.jzitnik.utils.DependencyManager; import cz.jzitnik.client.utils.DependencyManager;
import cz.jzitnik.utils.UIRoomClickHandlerRepository; import cz.jzitnik.client.utils.UIRoomClickHandlerRepository;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;

42
src/main/java/cz/jzitnik/events/handlers/MouseMoveEventHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/MouseMoveEventHandler.java
View File

@@ -1,27 +1,27 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import com.googlecode.lanterna.TerminalPosition; import com.googlecode.lanterna.TerminalPosition;
import com.googlecode.lanterna.input.MouseActionType; import com.googlecode.lanterna.input.MouseActionType;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectConfig; import cz.jzitnik.client.annotations.injectors.InjectConfig;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.config.Debugging; import cz.jzitnik.client.config.Debugging;
import cz.jzitnik.config.PlayerConfig; import cz.jzitnik.client.config.PlayerConfig;
import cz.jzitnik.events.MouseAction; import cz.jzitnik.client.events.MouseAction;
import cz.jzitnik.events.MouseMoveEvent; import cz.jzitnik.client.events.MouseMoveEvent;
import cz.jzitnik.events.RerenderScreen; import cz.jzitnik.client.events.RerenderScreen;
import cz.jzitnik.game.GameRoom; import cz.jzitnik.client.game.GameRoom;
import cz.jzitnik.game.GameState; import cz.jzitnik.client.game.GameState;
import cz.jzitnik.game.Player; import cz.jzitnik.client.game.Player;
import cz.jzitnik.game.ResourceManager; import cz.jzitnik.client.game.ResourceManager;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.game.utils.Selectable; import cz.jzitnik.client.game.utils.Selectable;
import cz.jzitnik.states.ScreenBuffer; import cz.jzitnik.client.states.ScreenBuffer;
import cz.jzitnik.states.TerminalState; import cz.jzitnik.client.states.TerminalState;
import cz.jzitnik.utils.RerenderUtils; import cz.jzitnik.client.utils.RerenderUtils;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;

50
src/main/java/cz/jzitnik/events/handlers/PlayerMoveEventHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/PlayerMoveEventHandler.java
View File

@@ -1,31 +1,31 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import com.googlecode.lanterna.TerminalPosition; import com.googlecode.lanterna.TerminalPosition;
import com.googlecode.lanterna.input.KeyStroke; import com.googlecode.lanterna.input.KeyStroke;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectConfig; import cz.jzitnik.client.annotations.injectors.InjectConfig;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.config.Debugging; import cz.jzitnik.client.config.Debugging;
import cz.jzitnik.config.PlayerConfig; import cz.jzitnik.client.config.PlayerConfig;
import cz.jzitnik.events.MouseMoveEvent; import cz.jzitnik.client.events.MouseMoveEvent;
import cz.jzitnik.events.PlayerMoveEvent; import cz.jzitnik.client.events.PlayerMoveEvent;
import cz.jzitnik.events.RerenderScreen; import cz.jzitnik.client.events.RerenderScreen;
import cz.jzitnik.events.RoomChangeEvent; import cz.jzitnik.client.events.RoomChangeEvent;
import cz.jzitnik.game.GameRoom; import cz.jzitnik.client.game.GameRoom;
import cz.jzitnik.game.GameState; import cz.jzitnik.client.game.GameState;
import cz.jzitnik.game.Player; import cz.jzitnik.client.game.Player;
import cz.jzitnik.game.ResourceManager; import cz.jzitnik.client.game.ResourceManager;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.states.RenderState; import cz.jzitnik.client.states.RenderState;
import cz.jzitnik.states.ScreenBuffer; import cz.jzitnik.client.states.ScreenBuffer;
import cz.jzitnik.states.PlayerMovementState; import cz.jzitnik.client.states.PlayerMovementState;
import cz.jzitnik.states.TerminalState; import cz.jzitnik.client.states.TerminalState;
import cz.jzitnik.ui.Stats; import cz.jzitnik.client.ui.Stats;
import cz.jzitnik.utils.RerenderUtils; import cz.jzitnik.client.utils.RerenderUtils;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
import cz.jzitnik.utils.events.Event; import cz.jzitnik.client.utils.events.Event;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;

16
src/main/java/cz/jzitnik/events/handlers/RenderStatsHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/RenderStatsHandler.java
View File

@@ -1,13 +1,13 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import com.googlecode.lanterna.TerminalPosition; import com.googlecode.lanterna.TerminalPosition;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.events.RenderStats; import cz.jzitnik.client.events.RenderStats;
import cz.jzitnik.events.RerenderScreen; import cz.jzitnik.client.events.RerenderScreen;
import cz.jzitnik.ui.Stats; import cz.jzitnik.client.ui.Stats;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
@EventHandler(RenderStats.class) @EventHandler(RenderStats.class)
public class RenderStatsHandler extends AbstractEventHandler<RenderStats> { public class RenderStatsHandler extends AbstractEventHandler<RenderStats> {

34
src/main/java/cz/jzitnik/events/handlers/RerenderPartHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/RerenderPartHandler.java
View File

@@ -1,22 +1,22 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import com.googlecode.lanterna.TerminalPosition; import com.googlecode.lanterna.TerminalPosition;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectConfig; import cz.jzitnik.client.annotations.injectors.InjectConfig;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.config.Debugging; import cz.jzitnik.client.config.Debugging;
import cz.jzitnik.events.RerenderPart; import cz.jzitnik.client.events.RerenderPart;
import cz.jzitnik.events.RerenderScreen; import cz.jzitnik.client.events.RerenderScreen;
import cz.jzitnik.game.GameRoom; import cz.jzitnik.client.game.GameRoom;
import cz.jzitnik.game.GameState; import cz.jzitnik.client.game.GameState;
import cz.jzitnik.game.ResourceManager; import cz.jzitnik.client.game.ResourceManager;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.states.ScreenBuffer; import cz.jzitnik.client.states.ScreenBuffer;
import cz.jzitnik.states.TerminalState; import cz.jzitnik.client.states.TerminalState;
import cz.jzitnik.utils.RerenderUtils; import cz.jzitnik.client.utils.RerenderUtils;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;

24
src/main/java/cz/jzitnik/events/handlers/RoomChangeEventHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/RoomChangeEventHandler.java
View File

@@ -1,16 +1,16 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.events.FullRoomDraw; import cz.jzitnik.client.events.FullRoomDraw;
import cz.jzitnik.events.RoomChangeEvent; import cz.jzitnik.client.events.RoomChangeEvent;
import cz.jzitnik.game.GameRoom; import cz.jzitnik.client.game.GameRoom;
import cz.jzitnik.game.GameState; import cz.jzitnik.client.game.GameState;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import cz.jzitnik.utils.roomtasks.RoomTaskScheduler; import cz.jzitnik.client.utils.roomtasks.RoomTaskScheduler;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;

26
src/main/java/cz/jzitnik/events/handlers/TerminalResizeEventHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/TerminalResizeEventHandler.java
View File

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

12
src/main/java/cz/jzitnik/events/handlers/TerminalTooSmallEventHandler.java → game/src/main/java/cz/jzitnik/client/events/handlers/TerminalTooSmallEventHandler.java
View File

@@ -1,15 +1,15 @@
package cz.jzitnik.events.handlers; package cz.jzitnik.client.events.handlers;
import com.googlecode.lanterna.SGR; import com.googlecode.lanterna.SGR;
import com.googlecode.lanterna.TerminalSize; import com.googlecode.lanterna.TerminalSize;
import com.googlecode.lanterna.TextColor; import com.googlecode.lanterna.TextColor;
import com.googlecode.lanterna.screen.Screen; import com.googlecode.lanterna.screen.Screen;
import com.googlecode.lanterna.screen.TerminalScreen; import com.googlecode.lanterna.screen.TerminalScreen;
import cz.jzitnik.annotations.EventHandler; import cz.jzitnik.client.annotations.EventHandler;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.events.TerminalTooSmallEvent; import cz.jzitnik.client.events.TerminalTooSmallEvent;
import cz.jzitnik.states.TerminalState; import cz.jzitnik.client.states.TerminalState;
import cz.jzitnik.utils.events.AbstractEventHandler; import cz.jzitnik.client.utils.events.AbstractEventHandler;
import java.io.IOException; import java.io.IOException;
import java.util.EnumSet; import java.util.EnumSet;

2
src/main/java/cz/jzitnik/game/Constants.java → game/src/main/java/cz/jzitnik/client/game/Constants.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.game; package cz.jzitnik.client.game;
import com.googlecode.lanterna.TextColor; import com.googlecode.lanterna.TextColor;

12
src/main/java/cz/jzitnik/game/GameRoom.java → game/src/main/java/cz/jzitnik/client/game/GameRoom.java
View File

@@ -1,11 +1,11 @@
package cz.jzitnik.game; package cz.jzitnik.client.game;
import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.annotation.*;
import cz.jzitnik.game.mobs.Mob; import cz.jzitnik.client.game.mobs.Mob;
import cz.jzitnik.game.objects.DroppedItem; import cz.jzitnik.client.game.objects.DroppedItem;
import cz.jzitnik.game.objects.GameObject; import cz.jzitnik.client.game.objects.GameObject;
import cz.jzitnik.ui.pixels.Empty; import cz.jzitnik.client.ui.pixels.Empty;
import cz.jzitnik.ui.pixels.Pixel; import cz.jzitnik.client.ui.pixels.Pixel;
import lombok.Getter; import lombok.Getter;
import java.util.ArrayList; import java.util.ArrayList;

5
src/main/java/cz/jzitnik/game/GameRoomPart.java → game/src/main/java/cz/jzitnik/client/game/GameRoomPart.java
View File

@@ -1,9 +1,8 @@
package cz.jzitnik.game; package cz.jzitnik.client.game;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.ToString; import lombok.ToString;

10
src/main/java/cz/jzitnik/game/GameState.java → game/src/main/java/cz/jzitnik/client/game/GameState.java
View File

@@ -1,9 +1,9 @@
package cz.jzitnik.game; package cz.jzitnik.client.game;
import cz.jzitnik.annotations.State; import cz.jzitnik.client.annotations.State;
import cz.jzitnik.game.objects.Interactable; import cz.jzitnik.client.game.objects.Interactable;
import cz.jzitnik.screens.Screen; import cz.jzitnik.client.screens.Screen;
import cz.jzitnik.utils.DependencyManager; import cz.jzitnik.client.utils.DependencyManager;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Setter; import lombok.Setter;

20
src/main/java/cz/jzitnik/game/Player.java → game/src/main/java/cz/jzitnik/client/game/Player.java
View File

@@ -1,16 +1,16 @@
package cz.jzitnik.game; package cz.jzitnik.client.game;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import cz.jzitnik.events.RerenderPart; import cz.jzitnik.client.events.RerenderPart;
import cz.jzitnik.game.items.GameItem; import cz.jzitnik.client.game.items.GameItem;
import cz.jzitnik.game.items.types.interfaces.WeaponInterface; import cz.jzitnik.client.game.items.types.interfaces.WeaponInterface;
import cz.jzitnik.game.mobs.HittableMob; import cz.jzitnik.client.game.mobs.HittableMob;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.ui.Inventory; import cz.jzitnik.client.ui.Inventory;
import cz.jzitnik.utils.DependencyManager; import cz.jzitnik.client.utils.DependencyManager;
import cz.jzitnik.utils.events.Event; import cz.jzitnik.client.utils.events.Event;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

6
src/main/java/cz/jzitnik/game/ResourceManager.java → game/src/main/java/cz/jzitnik/client/game/ResourceManager.java
View File

@@ -1,7 +1,7 @@
package cz.jzitnik.game; package cz.jzitnik.client.game;
import cz.jzitnik.annotations.Dependency; import cz.jzitnik.client.annotations.Dependency;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

4
src/main/java/cz/jzitnik/game/dialog/Dialog.java → game/src/main/java/cz/jzitnik/client/game/dialog/Dialog.java
View File

@@ -1,6 +1,6 @@
package cz.jzitnik.game.dialog; package cz.jzitnik.client.game.dialog;
import cz.jzitnik.utils.events.Event; import cz.jzitnik.client.utils.events.Event;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

2
src/main/java/cz/jzitnik/game/dialog/OnEnd.java → game/src/main/java/cz/jzitnik/client/game/dialog/OnEnd.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.game.dialog; package cz.jzitnik.client.game.dialog;
public interface OnEnd { public interface OnEnd {
record RunCode(Runnable runnable, OnEnd onEnd) implements OnEnd {} record RunCode(Runnable runnable, OnEnd onEnd) implements OnEnd {}

2
src/main/java/cz/jzitnik/game/exceptions/InvalidCoordinatesException.java → game/src/main/java/cz/jzitnik/client/game/exceptions/InvalidCoordinatesException.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.game.exceptions; package cz.jzitnik.client.game.exceptions;
public class InvalidCoordinatesException extends RuntimeException { public class InvalidCoordinatesException extends RuntimeException {
public InvalidCoordinatesException(String message) { public InvalidCoordinatesException(String message) {

8
src/main/java/cz/jzitnik/game/items/GameItem.java → game/src/main/java/cz/jzitnik/client/game/items/GameItem.java
View File

@@ -1,9 +1,9 @@
package cz.jzitnik.game.items; package cz.jzitnik.client.game.items;
import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.annotation.*;
import cz.jzitnik.game.ResourceManager; import cz.jzitnik.client.game.ResourceManager;
import cz.jzitnik.game.items.types.ItemType; import cz.jzitnik.client.game.items.types.ItemType;
import cz.jzitnik.game.utils.Renderable; import cz.jzitnik.client.game.utils.Renderable;
import lombok.Getter; import lombok.Getter;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;

6
src/main/java/cz/jzitnik/game/items/types/InteractableItem.java → game/src/main/java/cz/jzitnik/client/game/items/types/InteractableItem.java
View File

@@ -1,7 +1,7 @@
package cz.jzitnik.game.items.types; package cz.jzitnik.client.game.items.types;
import cz.jzitnik.utils.DependencyManager; import cz.jzitnik.client.utils.DependencyManager;
import cz.jzitnik.utils.StateManager; import cz.jzitnik.client.utils.StateManager;
public interface InteractableItem { public interface InteractableItem {
InteractableItemResponse interact(DependencyManager dependencyManager, StateManager stateManager); InteractableItemResponse interact(DependencyManager dependencyManager, StateManager stateManager);

6
src/main/java/cz/jzitnik/game/items/types/ItemType.java → game/src/main/java/cz/jzitnik/client/game/items/types/ItemType.java
View File

@@ -1,9 +1,9 @@
package cz.jzitnik.game.items.types; package cz.jzitnik.client.game.items.types;
import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo;
import cz.jzitnik.game.items.types.food.Food; import cz.jzitnik.client.game.items.types.food.Food;
import cz.jzitnik.game.items.types.weapons.Sword; import cz.jzitnik.client.game.items.types.weapons.Sword;
@JsonTypeInfo( @JsonTypeInfo(
use = JsonTypeInfo.Id.NAME, use = JsonTypeInfo.Id.NAME,

16
src/main/java/cz/jzitnik/game/items/types/food/Food.java → game/src/main/java/cz/jzitnik/client/game/items/types/food/Food.java
View File

@@ -1,14 +1,14 @@
package cz.jzitnik.game.items.types.food; package cz.jzitnik.client.game.items.types.food;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import cz.jzitnik.events.RenderStats; import cz.jzitnik.client.events.RenderStats;
import cz.jzitnik.game.GameState; import cz.jzitnik.client.game.GameState;
import cz.jzitnik.game.items.types.InteractableItem; import cz.jzitnik.client.game.items.types.InteractableItem;
import cz.jzitnik.game.items.types.ItemType; import cz.jzitnik.client.game.items.types.ItemType;
import cz.jzitnik.utils.DependencyManager; import cz.jzitnik.client.utils.DependencyManager;
import cz.jzitnik.utils.StateManager; import cz.jzitnik.client.utils.StateManager;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
public class Food implements InteractableItem, ItemType<Food> { public class Food implements InteractableItem, ItemType<Food> {
private final int addHealth; private final int addHealth;

2
src/main/java/cz/jzitnik/game/items/types/interfaces/WeaponInterface.java → game/src/main/java/cz/jzitnik/client/game/items/types/interfaces/WeaponInterface.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.game.items.types.interfaces; package cz.jzitnik.client.game.items.types.interfaces;
public interface WeaponInterface { public interface WeaponInterface {
int getDamageDeal(); int getDamageDeal();

2
src/main/java/cz/jzitnik/game/items/types/weapons/Sword.java → game/src/main/java/cz/jzitnik/client/game/items/types/weapons/Sword.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.game.items.types.weapons; package cz.jzitnik.client.game.items.types.weapons;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;

6
src/main/java/cz/jzitnik/game/items/types/weapons/Weapon.java → game/src/main/java/cz/jzitnik/client/game/items/types/weapons/Weapon.java
View File

@@ -1,7 +1,7 @@
package cz.jzitnik.game.items.types.weapons; package cz.jzitnik.client.game.items.types.weapons;
import cz.jzitnik.game.items.types.ItemType; import cz.jzitnik.client.game.items.types.ItemType;
import cz.jzitnik.game.items.types.interfaces.WeaponInterface; import cz.jzitnik.client.game.items.types.interfaces.WeaponInterface;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@AllArgsConstructor @AllArgsConstructor

18
src/main/java/cz/jzitnik/game/mobs/DialogMob.java → game/src/main/java/cz/jzitnik/client/game/mobs/DialogMob.java
View File

@@ -1,13 +1,13 @@
package cz.jzitnik.game.mobs; package cz.jzitnik.client.game.mobs;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.game.GameRoomPart; import cz.jzitnik.client.game.GameRoomPart;
import cz.jzitnik.game.dialog.Dialog; import cz.jzitnik.client.game.dialog.Dialog;
import cz.jzitnik.game.mobs.tasks.MobRoomTask; import cz.jzitnik.client.game.mobs.tasks.MobRoomTask;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.states.DialogState; import cz.jzitnik.client.states.DialogState;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;

22
src/main/java/cz/jzitnik/game/mobs/HittableMob.java → game/src/main/java/cz/jzitnik/client/game/mobs/HittableMob.java
View File

@@ -1,15 +1,15 @@
package cz.jzitnik.game.mobs; package cz.jzitnik.client.game.mobs;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.events.RerenderPart; import cz.jzitnik.client.events.RerenderPart;
import cz.jzitnik.game.GameRoomPart; import cz.jzitnik.client.game.GameRoomPart;
import cz.jzitnik.game.GameState; import cz.jzitnik.client.game.GameState;
import cz.jzitnik.game.mobs.tasks.MobRoomTask; import cz.jzitnik.client.game.mobs.tasks.MobRoomTask;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import cz.jzitnik.utils.roomtasks.RoomTask; import cz.jzitnik.client.utils.roomtasks.RoomTask;
import cz.jzitnik.utils.roomtasks.RoomTaskScheduler; import cz.jzitnik.client.utils.roomtasks.RoomTaskScheduler;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

24
src/main/java/cz/jzitnik/game/mobs/HittableMobDrops.java → game/src/main/java/cz/jzitnik/client/game/mobs/HittableMobDrops.java
View File

@@ -1,19 +1,19 @@
package cz.jzitnik.game.mobs; package cz.jzitnik.client.game.mobs;
import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JacksonInject;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.events.DroppedItemRerender; import cz.jzitnik.client.events.DroppedItemRerender;
import cz.jzitnik.events.InventoryRerender; import cz.jzitnik.client.events.InventoryRerender;
import cz.jzitnik.game.*; import cz.jzitnik.client.game.*;
import cz.jzitnik.game.items.GameItem; import cz.jzitnik.client.game.items.GameItem;
import cz.jzitnik.game.mobs.tasks.MobRoomTask; import cz.jzitnik.client.game.mobs.tasks.MobRoomTask;
import cz.jzitnik.game.objects.DroppedItem; import cz.jzitnik.client.game.objects.DroppedItem;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.utils.events.Event; import cz.jzitnik.client.utils.events.Event;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.ArrayList; import java.util.ArrayList;

10
src/main/java/cz/jzitnik/game/mobs/HittableMobNoDrops.java → game/src/main/java/cz/jzitnik/client/game/mobs/HittableMobNoDrops.java
View File

@@ -1,12 +1,12 @@
package cz.jzitnik.game.mobs; package cz.jzitnik.client.game.mobs;
import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JacksonInject;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import cz.jzitnik.game.GameRoomPart; import cz.jzitnik.client.game.GameRoomPart;
import cz.jzitnik.game.ResourceManager; import cz.jzitnik.client.game.ResourceManager;
import cz.jzitnik.game.mobs.tasks.MobRoomTask; import cz.jzitnik.client.game.mobs.tasks.MobRoomTask;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
public class HittableMobNoDrops extends HittableMob { public class HittableMobNoDrops extends HittableMob {
@JsonCreator @JsonCreator

16
src/main/java/cz/jzitnik/game/mobs/Mob.java → game/src/main/java/cz/jzitnik/client/game/mobs/Mob.java
View File

@@ -1,15 +1,15 @@
package cz.jzitnik.game.mobs; package cz.jzitnik.client.game.mobs;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.game.GameRoomPart; import cz.jzitnik.client.game.GameRoomPart;
import cz.jzitnik.game.mobs.tasks.MobRoomTask; import cz.jzitnik.client.game.mobs.tasks.MobRoomTask;
import cz.jzitnik.game.utils.Renderable; import cz.jzitnik.client.game.utils.Renderable;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.game.utils.Selectable; import cz.jzitnik.client.game.utils.Selectable;
import cz.jzitnik.utils.roomtasks.RoomTaskScheduler; import cz.jzitnik.client.utils.roomtasks.RoomTaskScheduler;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

28
src/main/java/cz/jzitnik/game/mobs/tasks/BlindMobFollowingPlayerTask.java → game/src/main/java/cz/jzitnik/client/game/mobs/tasks/BlindMobFollowingPlayerTask.java
View File

@@ -1,20 +1,20 @@
package cz.jzitnik.game.mobs.tasks; package cz.jzitnik.client.game.mobs.tasks;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import cz.jzitnik.annotations.injectors.InjectConfig; import cz.jzitnik.client.annotations.injectors.InjectConfig;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.config.Debugging; import cz.jzitnik.client.config.Debugging;
import cz.jzitnik.config.MicrophoneConfig; import cz.jzitnik.client.config.MicrophoneConfig;
import cz.jzitnik.game.GameState; import cz.jzitnik.client.game.GameState;
import cz.jzitnik.game.ResourceManager; import cz.jzitnik.client.game.ResourceManager;
import cz.jzitnik.game.mobs.Mob; import cz.jzitnik.client.game.mobs.Mob;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.states.MicrophoneState; import cz.jzitnik.client.states.MicrophoneState;
import cz.jzitnik.states.ScreenBuffer; import cz.jzitnik.client.states.ScreenBuffer;
import cz.jzitnik.states.TerminalState; import cz.jzitnik.client.states.TerminalState;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Setter; import lombok.Setter;

18
src/main/java/cz/jzitnik/game/mobs/tasks/EnemyPlayerAttackingTask.java → game/src/main/java/cz/jzitnik/client/game/mobs/tasks/EnemyPlayerAttackingTask.java
View File

@@ -1,15 +1,15 @@
package cz.jzitnik.game.mobs.tasks; package cz.jzitnik.client.game.mobs.tasks;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.events.RenderStats; import cz.jzitnik.client.events.RenderStats;
import cz.jzitnik.game.GameState; import cz.jzitnik.client.game.GameState;
import cz.jzitnik.game.mobs.Mob; import cz.jzitnik.client.game.mobs.Mob;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.utils.DependencyManager; import cz.jzitnik.client.utils.DependencyManager;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Setter; import lombok.Setter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

38
src/main/java/cz/jzitnik/game/mobs/tasks/MobFollowingPlayerTask.java → game/src/main/java/cz/jzitnik/client/game/mobs/tasks/MobFollowingPlayerTask.java
View File

@@ -1,26 +1,26 @@
package cz.jzitnik.game.mobs.tasks; package cz.jzitnik.client.game.mobs.tasks;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.googlecode.lanterna.TerminalPosition; import com.googlecode.lanterna.TerminalPosition;
import cz.jzitnik.annotations.injectors.InjectConfig; import cz.jzitnik.client.annotations.injectors.InjectConfig;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.config.Debugging; import cz.jzitnik.client.config.Debugging;
import cz.jzitnik.events.MouseMoveEvent; import cz.jzitnik.client.events.MouseMoveEvent;
import cz.jzitnik.events.RerenderScreen; import cz.jzitnik.client.events.RerenderScreen;
import cz.jzitnik.game.GameRoomPart; import cz.jzitnik.client.game.GameRoomPart;
import cz.jzitnik.game.GameState; import cz.jzitnik.client.game.GameState;
import cz.jzitnik.game.Player; import cz.jzitnik.client.game.Player;
import cz.jzitnik.game.ResourceManager; import cz.jzitnik.client.game.ResourceManager;
import cz.jzitnik.game.mobs.Mob; import cz.jzitnik.client.game.mobs.Mob;
import cz.jzitnik.game.mobs.tasks.utils.AStarAlg; import cz.jzitnik.client.game.mobs.tasks.utils.AStarAlg;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.states.ScreenBuffer; import cz.jzitnik.client.states.ScreenBuffer;
import cz.jzitnik.states.TerminalState; import cz.jzitnik.client.states.TerminalState;
import cz.jzitnik.utils.RerenderUtils; import cz.jzitnik.client.utils.RerenderUtils;
import cz.jzitnik.utils.events.Event; import cz.jzitnik.client.utils.events.Event;
import cz.jzitnik.utils.events.EventManager; import cz.jzitnik.client.utils.events.EventManager;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Setter; import lombok.Setter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

6
src/main/java/cz/jzitnik/game/mobs/tasks/MobRoomTask.java → game/src/main/java/cz/jzitnik/client/game/mobs/tasks/MobRoomTask.java
View File

@@ -1,9 +1,9 @@
package cz.jzitnik.game.mobs.tasks; package cz.jzitnik.client.game.mobs.tasks;
import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo;
import cz.jzitnik.game.mobs.Mob; import cz.jzitnik.client.game.mobs.Mob;
import cz.jzitnik.utils.roomtasks.RoomTask; import cz.jzitnik.client.utils.roomtasks.RoomTask;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

6
src/main/java/cz/jzitnik/game/mobs/tasks/utils/AStarAlg.java → game/src/main/java/cz/jzitnik/client/game/mobs/tasks/utils/AStarAlg.java
View File

@@ -1,7 +1,7 @@
package cz.jzitnik.game.mobs.tasks.utils; package cz.jzitnik.client.game.mobs.tasks.utils;
import cz.jzitnik.game.GameRoomPart; import cz.jzitnik.client.game.GameRoomPart;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import java.util.*; import java.util.*;

52
src/main/java/cz/jzitnik/game/objects/Chest.java → game/src/main/java/cz/jzitnik/client/game/objects/Chest.java
View File

@@ -1,4 +1,4 @@
package cz.jzitnik.game.objects; package cz.jzitnik.client.game.objects;
import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JacksonInject;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@@ -6,32 +6,30 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.googlecode.lanterna.TerminalPosition; import com.googlecode.lanterna.TerminalPosition;
import com.googlecode.lanterna.TextColor; import com.googlecode.lanterna.TextColor;
import cz.jzitnik.annotations.injectors.InjectConfig; import cz.jzitnik.client.annotations.injectors.InjectConfig;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.config.Debugging; import cz.jzitnik.client.config.Debugging;
import cz.jzitnik.events.InventoryRerender; import cz.jzitnik.client.events.InventoryRerender;
import cz.jzitnik.events.MouseAction; import cz.jzitnik.client.events.MouseAction;
import cz.jzitnik.events.RerenderPart; import cz.jzitnik.client.events.RerenderPart;
import cz.jzitnik.events.RerenderScreen; import cz.jzitnik.client.events.RerenderScreen;
import cz.jzitnik.game.GameRoom; import cz.jzitnik.client.game.GameRoom;
import cz.jzitnik.game.GameState; import cz.jzitnik.client.game.GameState;
import cz.jzitnik.game.Player; import cz.jzitnik.client.game.Player;
import cz.jzitnik.game.ResourceManager; import cz.jzitnik.client.game.ResourceManager;
import cz.jzitnik.game.items.GameItem; import cz.jzitnik.client.game.items.GameItem;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.states.ScreenBuffer; import cz.jzitnik.client.states.ScreenBuffer;
import cz.jzitnik.states.TerminalState; import cz.jzitnik.client.states.TerminalState;
import cz.jzitnik.ui.Inventory; import cz.jzitnik.client.ui.Inventory;
import cz.jzitnik.ui.utils.Grid; import cz.jzitnik.client.ui.utils.Grid;
import cz.jzitnik.ui.pixels.ColoredPixel; import cz.jzitnik.client.ui.pixels.ColoredPixel;
import cz.jzitnik.ui.pixels.Empty; import cz.jzitnik.client.ui.pixels.Empty;
import cz.jzitnik.ui.pixels.Pixel; import cz.jzitnik.client.ui.pixels.Pixel;
import cz.jzitnik.utils.DependencyManager; import cz.jzitnik.client.utils.RerenderUtils;
import cz.jzitnik.utils.RerenderUtils; import cz.jzitnik.client.utils.UIRoomClickHandlerRepository;
import cz.jzitnik.utils.StateManager; import cz.jzitnik.client.utils.events.EventManager;
import cz.jzitnik.utils.UIRoomClickHandlerRepository;
import cz.jzitnik.utils.events.EventManager;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;

24
src/main/java/cz/jzitnik/game/objects/DroppedItem.java → game/src/main/java/cz/jzitnik/client/game/objects/DroppedItem.java
View File

@@ -1,17 +1,15 @@
package cz.jzitnik.game.objects; package cz.jzitnik.client.game.objects;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.client.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.client.annotations.injectors.InjectState;
import cz.jzitnik.events.DroppedItemRerender; import cz.jzitnik.client.events.DroppedItemRerender;
import cz.jzitnik.events.InventoryRerender; import cz.jzitnik.client.events.InventoryRerender;
import cz.jzitnik.game.GameRoom; import cz.jzitnik.client.game.GameRoom;
import cz.jzitnik.game.GameState; import cz.jzitnik.client.game.GameState;
import cz.jzitnik.game.items.GameItem; import cz.jzitnik.client.game.items.GameItem;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.game.utils.Selectable; import cz.jzitnik.client.game.utils.Selectable;
import cz.jzitnik.utils.DependencyManager; import cz.jzitnik.client.utils.events.EventManager;
import cz.jzitnik.utils.StateManager;
import cz.jzitnik.utils.events.EventManager;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Setter; import lombok.Setter;

8
src/main/java/cz/jzitnik/game/objects/GameObject.java → game/src/main/java/cz/jzitnik/client/game/objects/GameObject.java
View File

@@ -1,11 +1,11 @@
package cz.jzitnik.game.objects; package cz.jzitnik.client.game.objects;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo;
import cz.jzitnik.game.utils.Renderable; import cz.jzitnik.client.game.utils.Renderable;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.client.game.utils.RoomCords;
import cz.jzitnik.game.utils.Selectable; import cz.jzitnik.client.game.utils.Selectable;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Setter; import lombok.Setter;

Some files were not shown because too many files have changed in this diff Show More