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

style: Extract main room into its own class

Browse Source
This commit is contained in:
Jakub Žitník
2025-12-21 15:24:16 +01:00
parent ef40f40809
commit f10c36de2b
3 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/cz/jzitnik/Main.java
View File

@@ -1,7 +1,5 @@
package cz.jzitnik; import cz.jzitnik.Game;
public class Main { void main() {
public static void main(String[] args) {
new Game().start(); new Game().start();
} }
}

17
src/main/java/cz/jzitnik/game/setup/GameSetup.java
View File

@@ -4,9 +4,7 @@ import cz.jzitnik.annotations.Dependency;
import cz.jzitnik.annotations.injectors.InjectDependency; import cz.jzitnik.annotations.injectors.InjectDependency;
import cz.jzitnik.annotations.injectors.InjectState; import cz.jzitnik.annotations.injectors.InjectState;
import cz.jzitnik.game.*; import cz.jzitnik.game.*;
import cz.jzitnik.game.items.GameItem; import cz.jzitnik.game.setup.rooms.MainRoom;
import cz.jzitnik.game.items.WoodenSword;
import cz.jzitnik.game.objects.Chest;
import cz.jzitnik.game.utils.RoomCords; import cz.jzitnik.game.utils.RoomCords;
import cz.jzitnik.utils.DependencyManager; import cz.jzitnik.utils.DependencyManager;
@@ -24,7 +22,7 @@ public class GameSetup {
public void setup() { public void setup() {
//gameState.setScreen(new IntroScene(dependencyManager)); //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 rightRoom = new GameRoom(ResourceManager.Resource.ROOM2);
GameRoom topRightRoom = new GameRoom(ResourceManager.Resource.ROOM3); GameRoom topRightRoom = new GameRoom(ResourceManager.Resource.ROOM3);
GameRoom topRightTop = new GameRoom(ResourceManager.Resource.ROOM4); GameRoom topRightTop = new GameRoom(ResourceManager.Resource.ROOM4);
@@ -35,17 +33,6 @@ public class GameSetup {
topRightRoom.setUp(topRightTop); topRightRoom.setUp(topRightTop);
topRightTop.setLeft(topRightTopLeft); 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.setCurrentRoom(mainRoom);
gameState.setPlayer(new Player(new RoomCords(90, 100))); gameState.setPlayer(new Player(new RoomCords(90, 100)));

27
src/main/java/cz/jzitnik/game/setup/rooms/MainRoom.java Normal file
View File

@@ -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);
}
}