From 47b487b0f1aca1006b0bef199b54e566d7c099ba Mon Sep 17 00:00:00 2001 From: jzitnik-dev Date: Wed, 31 Dec 2025 22:26:47 +0100 Subject: [PATCH] chore: public -> protected --- src/main/java/cz/jzitnik/game/GameRoom.java | 10 +++++----- .../java/cz/jzitnik/game/setup/GameMenuScene.java | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/cz/jzitnik/game/GameRoom.java b/src/main/java/cz/jzitnik/game/GameRoom.java index d7b19ee..ff4f873 100644 --- a/src/main/java/cz/jzitnik/game/GameRoom.java +++ b/src/main/java/cz/jzitnik/game/GameRoom.java @@ -38,7 +38,7 @@ public class GameRoom { } public void addObject(GameObject gameObject) { - objects.addFirst(gameObject); + objects.add(gameObject); } public void addCollider(GameRoomPart collider) { @@ -48,7 +48,7 @@ public class GameRoom { public void setLeft(GameRoom left) { setLeft(left, true); } - public void setLeft(GameRoom left, boolean addReference) { + protected void setLeft(GameRoom left, boolean addReference) { this.left = left; if (addReference) { left.setRight(this, false); @@ -57,7 +57,7 @@ public class GameRoom { public void setRight(GameRoom right) { setRight(right, true); } - public void setRight(GameRoom right, boolean addReference) { + protected void setRight(GameRoom right, boolean addReference) { this.right = right; if (addReference) { right.setLeft(this, false); @@ -66,7 +66,7 @@ public class GameRoom { public void setUp(GameRoom up) { setUp(up, true); } - public void setUp(GameRoom up, boolean addReference) { + protected void setUp(GameRoom up, boolean addReference) { this.up = up; if (addReference) { up.setDown(this, false); @@ -75,7 +75,7 @@ public class GameRoom { public void setDown(GameRoom down) { setDown(down, true); } - public void setDown(GameRoom down, boolean addReference) { + protected void setDown(GameRoom down, boolean addReference) { this.down = down; if (addReference) { down.setUp(this, false); diff --git a/src/main/java/cz/jzitnik/game/setup/GameMenuScene.java b/src/main/java/cz/jzitnik/game/setup/GameMenuScene.java index fbe1a38..fe920d5 100644 --- a/src/main/java/cz/jzitnik/game/setup/GameMenuScene.java +++ b/src/main/java/cz/jzitnik/game/setup/GameMenuScene.java @@ -15,7 +15,7 @@ import cz.jzitnik.utils.DependencyManager; import cz.jzitnik.utils.events.EventManager; public class GameMenuScene extends Scene { - private static class GameMenuScreen extends Screen { + private static class GameMenuAudioScreen extends Screen { protected final SoundPlayer soundPlayer = new SoundPlayer(); protected boolean play = true; @@ -47,18 +47,18 @@ public class GameMenuScene extends Scene { @InjectDependency private EventManager eventManager; - private final GameMenuScreen gameMenuScreen; + private final GameMenuAudioScreen gameMenuAudioScreen; - public ImageScene(String filePath, GameMenuScreen gameMenuScreen) { + public ImageScene(String filePath, GameMenuAudioScreen gameMenuAudioScreen) { super(filePath); - this.gameMenuScreen = gameMenuScreen; + this.gameMenuAudioScreen = gameMenuAudioScreen; } @Override public void handleKeyboardAction(KeyboardPressEvent event) { if (event.getKeyStroke().getKeyType() == KeyType.Enter) { - gameMenuScreen.play = false; - gameMenuScreen.soundPlayer.stopCurrentSound(); + gameMenuAudioScreen.play = false; + gameMenuAudioScreen.soundPlayer.stopCurrentSound(); gameState.setScreen(null); eventManager.emitEvent(new FullRoomDraw(true)); } @@ -66,7 +66,7 @@ public class GameMenuScene extends Scene { } public GameMenuScene(DependencyManager dependencyManager) { - GameMenuScreen gameMenuScreen = new GameMenuScreen(); + GameMenuAudioScreen gameMenuScreen = new GameMenuAudioScreen(); ImageScene basicImageScene = new ImageScene("menu.png", gameMenuScreen); super(new Screen[]{gameMenuScreen, basicImageScene}, new OnEndAction.Repeat());