From 1c23a1528e5630b09c341c6a1e26040a45bfe9b1 Mon Sep 17 00:00:00 2001
From: Maurice <maurice@miaurizius.de>
Date: Fri, 28 Nov 2025 16:42:56 +0100
Subject: [PATCH] moved some classes for simplification

---
 src/de/miaurizius/jgame2d/core/GamePanel.java              | 7 ++++++-
 src/de/miaurizius/jgame2d/core/UI.java                     | 6 ++++--
 src/de/miaurizius/jgame2d/core/{ => enums}/Direction.java  | 2 +-
 src/de/miaurizius/jgame2d/core/{ => enums}/GameState.java  | 2 +-
 .../jgame2d/core/{ => handlers}/AssetSetter.java           | 4 +++-
 .../jgame2d/core/{ => handlers}/CollisionHandler.java      | 3 ++-
 .../miaurizius/jgame2d/core/{ => handlers}/KeyHandler.java | 5 ++++-
 src/de/miaurizius/jgame2d/core/{ => handlers}/Sound.java   | 4 +++-
 src/de/miaurizius/jgame2d/entity/Entity.java               | 2 +-
 src/de/miaurizius/jgame2d/entity/OldManNPC.java            | 5 +++--
 src/de/miaurizius/jgame2d/entity/Player.java               | 5 +++--
 11 files changed, 31 insertions(+), 14 deletions(-)
 rename src/de/miaurizius/jgame2d/core/{ => enums}/Direction.java (85%)
 rename src/de/miaurizius/jgame2d/core/{ => enums}/GameState.java (54%)
 rename src/de/miaurizius/jgame2d/core/{ => handlers}/AssetSetter.java (64%)
 rename src/de/miaurizius/jgame2d/core/{ => handlers}/CollisionHandler.java (98%)
 rename src/de/miaurizius/jgame2d/core/{ => handlers}/KeyHandler.java (91%)
 rename src/de/miaurizius/jgame2d/core/{ => handlers}/Sound.java (94%)

diff --git a/src/de/miaurizius/jgame2d/core/GamePanel.java b/src/de/miaurizius/jgame2d/core/GamePanel.java
index 9ca9128..b33f6fd 100644
--- a/src/de/miaurizius/jgame2d/core/GamePanel.java
+++ b/src/de/miaurizius/jgame2d/core/GamePanel.java
@@ -1,5 +1,10 @@
 package de.miaurizius.jgame2d.core;
 
+import de.miaurizius.jgame2d.core.enums.GameState;
+import de.miaurizius.jgame2d.core.handlers.AssetSetter;
+import de.miaurizius.jgame2d.core.handlers.CollisionHandler;
+import de.miaurizius.jgame2d.core.handlers.KeyHandler;
+import de.miaurizius.jgame2d.core.handlers.Sound;
 import de.miaurizius.jgame2d.entity.Player;
 import de.miaurizius.jgame2d.object.SuperObject;
 import de.miaurizius.jgame2d.tile.TileManager;
@@ -30,7 +35,7 @@ public class GamePanel extends JPanel implements Runnable {
     int FPS = 60;
 
     // SYSTEM
-    TileManager tileM = new TileManager(this);
+    public TileManager tileM = new TileManager(this);
     KeyHandler keyH = new KeyHandler(this);
     Sound se = new Sound();
     Sound music = new Sound();
diff --git a/src/de/miaurizius/jgame2d/core/UI.java b/src/de/miaurizius/jgame2d/core/UI.java
index 5c5f750..5079e41 100644
--- a/src/de/miaurizius/jgame2d/core/UI.java
+++ b/src/de/miaurizius/jgame2d/core/UI.java
@@ -1,5 +1,7 @@
 package de.miaurizius.jgame2d.core;
 
+import de.miaurizius.jgame2d.core.enums.GameState;
+
 import java.awt.*;
 
 public class UI {
@@ -20,10 +22,10 @@ public class UI {
         graphics2d.setColor(Color.white);
 
         switch (panel.gameState) {
-            case PLAY:
+            case GameState.PLAY:
 
                 break;
-            case PAUSE:
+            case GameState.PAUSE:
                 drawPauseScreen();
                 break;
         }
diff --git a/src/de/miaurizius/jgame2d/core/Direction.java b/src/de/miaurizius/jgame2d/core/enums/Direction.java
similarity index 85%
rename from src/de/miaurizius/jgame2d/core/Direction.java
rename to src/de/miaurizius/jgame2d/core/enums/Direction.java
index a88ef78..51534ff 100644
--- a/src/de/miaurizius/jgame2d/core/Direction.java
+++ b/src/de/miaurizius/jgame2d/core/enums/Direction.java
@@ -1,4 +1,4 @@
-package de.miaurizius.jgame2d.core;
+package de.miaurizius.jgame2d.core.enums;
 
 public enum Direction {
 
diff --git a/src/de/miaurizius/jgame2d/core/GameState.java b/src/de/miaurizius/jgame2d/core/enums/GameState.java
similarity index 54%
rename from src/de/miaurizius/jgame2d/core/GameState.java
rename to src/de/miaurizius/jgame2d/core/enums/GameState.java
index 6254fd7..d335669 100644
--- a/src/de/miaurizius/jgame2d/core/GameState.java
+++ b/src/de/miaurizius/jgame2d/core/enums/GameState.java
@@ -1,4 +1,4 @@
-package de.miaurizius.jgame2d.core;
+package de.miaurizius.jgame2d.core.enums;
 
 public enum GameState {
 
diff --git a/src/de/miaurizius/jgame2d/core/AssetSetter.java b/src/de/miaurizius/jgame2d/core/handlers/AssetSetter.java
similarity index 64%
rename from src/de/miaurizius/jgame2d/core/AssetSetter.java
rename to src/de/miaurizius/jgame2d/core/handlers/AssetSetter.java
index b502488..db56cdb 100644
--- a/src/de/miaurizius/jgame2d/core/AssetSetter.java
+++ b/src/de/miaurizius/jgame2d/core/handlers/AssetSetter.java
@@ -1,4 +1,6 @@
-package de.miaurizius.jgame2d.core;
+package de.miaurizius.jgame2d.core.handlers;
+
+import de.miaurizius.jgame2d.core.GamePanel;
 
 public class AssetSetter {
 
diff --git a/src/de/miaurizius/jgame2d/core/CollisionHandler.java b/src/de/miaurizius/jgame2d/core/handlers/CollisionHandler.java
similarity index 98%
rename from src/de/miaurizius/jgame2d/core/CollisionHandler.java
rename to src/de/miaurizius/jgame2d/core/handlers/CollisionHandler.java
index a09053e..150d96e 100644
--- a/src/de/miaurizius/jgame2d/core/CollisionHandler.java
+++ b/src/de/miaurizius/jgame2d/core/handlers/CollisionHandler.java
@@ -1,5 +1,6 @@
-package de.miaurizius.jgame2d.core;
+package de.miaurizius.jgame2d.core.handlers;
 
+import de.miaurizius.jgame2d.core.GamePanel;
 import de.miaurizius.jgame2d.entity.Entity;
 import de.miaurizius.jgame2d.object.SuperObject;
 
diff --git a/src/de/miaurizius/jgame2d/core/KeyHandler.java b/src/de/miaurizius/jgame2d/core/handlers/KeyHandler.java
similarity index 91%
rename from src/de/miaurizius/jgame2d/core/KeyHandler.java
rename to src/de/miaurizius/jgame2d/core/handlers/KeyHandler.java
index 80617e5..917ccde 100644
--- a/src/de/miaurizius/jgame2d/core/KeyHandler.java
+++ b/src/de/miaurizius/jgame2d/core/handlers/KeyHandler.java
@@ -1,4 +1,7 @@
-package de.miaurizius.jgame2d.core;
+package de.miaurizius.jgame2d.core.handlers;
+
+import de.miaurizius.jgame2d.core.GamePanel;
+import de.miaurizius.jgame2d.core.enums.GameState;
 
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
diff --git a/src/de/miaurizius/jgame2d/core/Sound.java b/src/de/miaurizius/jgame2d/core/handlers/Sound.java
similarity index 94%
rename from src/de/miaurizius/jgame2d/core/Sound.java
rename to src/de/miaurizius/jgame2d/core/handlers/Sound.java
index 79595fc..141fdf8 100644
--- a/src/de/miaurizius/jgame2d/core/Sound.java
+++ b/src/de/miaurizius/jgame2d/core/handlers/Sound.java
@@ -1,4 +1,6 @@
-package de.miaurizius.jgame2d.core;
+package de.miaurizius.jgame2d.core.handlers;
+
+import de.miaurizius.jgame2d.core.Boot;
 
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
diff --git a/src/de/miaurizius/jgame2d/entity/Entity.java b/src/de/miaurizius/jgame2d/entity/Entity.java
index d00863f..28fabec 100644
--- a/src/de/miaurizius/jgame2d/entity/Entity.java
+++ b/src/de/miaurizius/jgame2d/entity/Entity.java
@@ -1,7 +1,7 @@
 package de.miaurizius.jgame2d.entity;
 
 import de.miaurizius.jgame2d.core.Boot;
-import de.miaurizius.jgame2d.core.Direction;
+import de.miaurizius.jgame2d.core.enums.Direction;
 import de.miaurizius.jgame2d.core.GamePanel;
 import de.miaurizius.jgame2d.core.Utility;
 
diff --git a/src/de/miaurizius/jgame2d/entity/OldManNPC.java b/src/de/miaurizius/jgame2d/entity/OldManNPC.java
index 54bfae7..4a7467d 100644
--- a/src/de/miaurizius/jgame2d/entity/OldManNPC.java
+++ b/src/de/miaurizius/jgame2d/entity/OldManNPC.java
@@ -1,6 +1,6 @@
 package de.miaurizius.jgame2d.entity;
 
-import de.miaurizius.jgame2d.core.Direction;
+import de.miaurizius.jgame2d.core.enums.Direction;
 import de.miaurizius.jgame2d.core.GamePanel;
 
 public class OldManNPC extends Entity {
@@ -10,9 +10,10 @@ public class OldManNPC extends Entity {
 
         direction = Direction.DOWN;
         speed = 1;
+        getImage();
     }
 
-    public void getPlayerImage()  {
+    public void getImage()  {
         up1 = initEntitySprites("npc/oldman_up_1");
         up2 = initEntitySprites("npc/oldman_up_2");
         down1 = initEntitySprites("npc/oldman_down_1");
diff --git a/src/de/miaurizius/jgame2d/entity/Player.java b/src/de/miaurizius/jgame2d/entity/Player.java
index e940c86..2f95a7d 100644
--- a/src/de/miaurizius/jgame2d/entity/Player.java
+++ b/src/de/miaurizius/jgame2d/entity/Player.java
@@ -1,10 +1,11 @@
 package de.miaurizius.jgame2d.entity;
 
 import de.miaurizius.jgame2d.core.*;
+import de.miaurizius.jgame2d.core.enums.Direction;
+import de.miaurizius.jgame2d.core.handlers.KeyHandler;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.*;
 
 public class Player extends Entity {
 
@@ -51,7 +52,7 @@ public class Player extends Entity {
     }
 
     public void update() {
-        //Move player
+        // MOVEMENT
         if(keyH.upPressed ||  keyH.downPressed || keyH.leftPressed || keyH.rightPressed) {
             if(keyH.upPressed) direction = Direction.UP;
             else if(keyH.downPressed) direction = Direction.DOWN;