From f10c36de2bfd93a73a2e2119b6ec8e05723b4251 Mon Sep 17 00:00:00 2001 From: jzitnik-dev Date: Sun, 21 Dec 2025 15:24:16 +0100 Subject: [PATCH] style: Extract main room into its own class --- src/main/java/cz/jzitnik/Main.java | 8 +++--- .../java/cz/jzitnik/game/setup/GameSetup.java | 17 ++---------- .../cz/jzitnik/game/setup/rooms/MainRoom.java | 27 +++++++++++++++++++ 3 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 src/main/java/cz/jzitnik/game/setup/rooms/MainRoom.java diff --git a/src/main/java/cz/jzitnik/Main.java b/src/main/java/cz/jzitnik/Main.java index 884a74a..5f7d51f 100644 --- a/src/main/java/cz/jzitnik/Main.java +++ b/src/main/java/cz/jzitnik/Main.java @@ -1,7 +1,5 @@ -package cz.jzitnik; +import cz.jzitnik.Game; -public class Main { - public static void main(String[] args) { - new Game().start(); - } +void main() { + new Game().start(); } \ No newline at end of file diff --git a/src/main/java/cz/jzitnik/game/setup/GameSetup.java b/src/main/java/cz/jzitnik/game/setup/GameSetup.java index 4013788..7a9c427 100644 --- a/src/main/java/cz/jzitnik/game/setup/GameSetup.java +++ b/src/main/java/cz/jzitnik/game/setup/GameSetup.java @@ -4,9 +4,7 @@ import cz.jzitnik.annotations.Dependency; import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.game.*; -import cz.jzitnik.game.items.GameItem; -import cz.jzitnik.game.items.WoodenSword; -import cz.jzitnik.game.objects.Chest; +import cz.jzitnik.game.setup.rooms.MainRoom; import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.utils.DependencyManager; @@ -24,7 +22,7 @@ public class GameSetup { public void setup() { //gameState.setScreen(new IntroScene(dependencyManager)); - GameRoom mainRoom = new GameRoom(ResourceManager.Resource.ROOM1); + GameRoom mainRoom = new MainRoom(dependencyManager, resourceManager); GameRoom rightRoom = new GameRoom(ResourceManager.Resource.ROOM2); GameRoom topRightRoom = new GameRoom(ResourceManager.Resource.ROOM3); GameRoom topRightTop = new GameRoom(ResourceManager.Resource.ROOM4); @@ -35,17 +33,6 @@ public class GameSetup { topRightRoom.setUp(topRightTop); topRightTop.setLeft(topRightTopLeft); - Chest chest = new Chest(dependencyManager, resourceManager, new RoomCords(100, 45), new GameItem[]{ - new WoodenSword(resourceManager), - new WoodenSword(resourceManager), - new WoodenSword(resourceManager), - }); - mainRoom.addObject(chest); - mainRoom.addCollider(new GameRoomPart( - new RoomCords(60, 10), - new RoomCords(135, 15) - )); - gameState.setCurrentRoom(mainRoom); gameState.setPlayer(new Player(new RoomCords(90, 100))); diff --git a/src/main/java/cz/jzitnik/game/setup/rooms/MainRoom.java b/src/main/java/cz/jzitnik/game/setup/rooms/MainRoom.java new file mode 100644 index 0000000..33e6f83 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/setup/rooms/MainRoom.java @@ -0,0 +1,27 @@ +package cz.jzitnik.game.setup.rooms; + +import cz.jzitnik.game.GameRoom; +import cz.jzitnik.game.GameRoomPart; +import cz.jzitnik.game.ResourceManager; +import cz.jzitnik.game.items.GameItem; +import cz.jzitnik.game.items.WoodenSword; +import cz.jzitnik.game.objects.Chest; +import cz.jzitnik.game.utils.RoomCords; +import cz.jzitnik.utils.DependencyManager; + +public class MainRoom extends GameRoom { + public MainRoom(DependencyManager dependencyManager, ResourceManager resourceManager) { + super(ResourceManager.Resource.ROOM1); + + Chest chest = new Chest(dependencyManager, resourceManager, new RoomCords(100, 45), new GameItem[]{ + new WoodenSword(resourceManager), + new WoodenSword(resourceManager), + new WoodenSword(resourceManager), + }); + addCollider(new GameRoomPart( + new RoomCords(60, 10), + new RoomCords(135, 15) + )); + addObject(chest); + } +}