feat: screen navigation (from @ngocmai3438), server account handler (#51)

* feat(screen): implement screen navigation

* feat(server): login + register logic

* feat(server): session logic, user info route, friendship manager (not completed)

* chore: bump version to 1.0.1, remove unnecessary dependencies

---------

Co-authored-by: 24020216@vnu.edu.vn <24020216@vnu.edu.vn>

Author: im-yuuki

.github/workflows/build-jar.yml

@@ -35,7 +35,7 @@ jobs:
         with:
           name: desktop-jar
           path: |
-            "./desktop/target/*.jar"
+            ./desktop/target/*.jar
             !./desktop/target/original-*.jar
 
       - name: Upload Desktop JAR to GitHub Releases
@@ -66,7 +66,7 @@ jobs:
         with:
           name: server-jar
           path: |
-            "./server/target/*.jar"
+            ./server/target/*.jar
 
       - name: Upload Server JAR to GitHub Releases
         if: github.event_name == 'release'

client/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.exterminator3618</groupId>
         <artifactId>common</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

client/src/main/java/io/exterminator3618/client/Exterminator3618.java

@@ -80,7 +80,7 @@ public void launchScreen(@NotNull Screen screen) {
         screenStack.push(screen);
         super.setScreen(screen);
     }
-
+/**
     public void backToPreviousScreen() {
         super.getScreen().dispose();
         if (screenStack.isEmpty()) {
@@ -91,10 +91,30 @@ public void backToPreviousScreen() {
             super.setScreen(screenStack.pop());
         }
     }
+*/
+    public void backToPreviousScreen () {
+        super.getScreen().dispose();
+        if (screenStack.isEmpty()) {
+            log.warn("Screen stack is empty, cannot go back.");
+            Gdx.app.exit();
+            return;
+        }
+        screenStack.pop();
+        if (screenStack.isEmpty()) {
+            log.warn("Popped the last screen, quiting game.");
+            Gdx.app.exit();
+        } else {
+            log.info("Returning to screen: {}", screenStack.peek().getClass().getSimpleName());
+            super.setScreen(screenStack.peek());
+        }
+    }
 
     public void replaceCurrentScreen(@NotNull Screen screen) {
         super.getScreen().dispose();
-        launchScreen(screen);
+        screenStack.pop();
+        screenStack.push(screen);
+        super.setScreen(screen);
+        //launchScreen(screen);
     }
 
     @Override

client/src/main/java/io/exterminator3618/client/screens/GameOverScreen.java

@@ -4,34 +4,69 @@
 import com.badlogic.gdx.Input;
 import com.badlogic.gdx.Screen;
 import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.OrthographicCamera;
+import com.badlogic.gdx.utils.viewport.FitViewport;
+import com.badlogic.gdx.utils.viewport.Viewport;
+import com.badlogic.gdx.math.Vector3;
+import io.exterminator3618.client.Constants;
 import io.exterminator3618.client.Exterminator3618;
+import io.exterminator3618.client.components.TextButton;
 import io.exterminator3618.client.utils.Renderer;
 
 public final class GameOverScreen implements Screen {
 
     private final Exterminator3618 game;
     private final Renderer renderer;
 
+    private OrthographicCamera camera;
+    private Viewport viewport;
+    private Vector3 touchPos = new Vector3();
+
+    private TextButton playAgainButton;
+    private TextButton backButton;
+
     public GameOverScreen(Exterminator3618 game) {
         this.game = game;
         this.renderer = game.getRenderer();
+        camera = new OrthographicCamera();
+        viewport = new FitViewport(Constants.WINDOW_WIDTH, Constants.WINDOW_HEIGHT, camera);
+        backButton = new TextButton("Main Menu", 100, 300, 200, 50);
+        playAgainButton = new TextButton("Play Again", 100, 240, 200, 50);
     }
 
     @Override
     public void show() {
-
+        camera.position.set(Constants.WINDOW_WIDTH / 2, Constants.WINDOW_HEIGHT / 2, 0);
     }
 
     @Override
     public void render(float delta) {
         // Render game over screen
         Gdx.gl.glClearColor(0.2f, 0, 0, 1);
         Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
-        renderer.begin();
+        renderer.begin(camera);
         // Draw game over text here
         renderer.drawTextMiddle("Day la Game Over Screen", Gdx.graphics.getWidth() / 2, Gdx.graphics.getHeight() / 2);
+        camera.update();
+        viewport.apply();
+        //renderer.begin(camera);
+        playAgainButton.draw(renderer);
+        backButton.draw(renderer);
+
         renderer.end();
 
+        if (Gdx.input.justTouched()) {
+            touchPos.set(Gdx.input.getX(), Gdx.input.getY(), 0);
+            viewport.unproject(touchPos);
+
+            if (backButton.isClicked(touchPos.x, touchPos.y)) {
+                game.backToPreviousScreen();
+            }
+
+            if (playAgainButton.isClicked(touchPos.x, touchPos.y)) {
+                game.replaceCurrentScreen(new GameScreen(game));
+            }
+        }
         if (Gdx.input.isKeyJustPressed(Input.Keys.ENTER) || Gdx.input.isKeyJustPressed(Input.Keys.ESCAPE)) {
             game.getSoundManager().stop(); // Stop any playing music
             game.launchScreen(new MainMenuScreen(game));
@@ -40,7 +75,7 @@ public void render(float delta) {
 
     @Override
     public void resize(int width, int height) {
-
+        viewport.update(width, height);
     }
 
     @Override

client/src/main/java/io/exterminator3618/client/screens/GameScreen.java

@@ -5,6 +5,11 @@
 import java.util.List;
 import java.util.Random;
 
+import com.badlogic.gdx.graphics.OrthographicCamera;
+import com.badlogic.gdx.utils.viewport.FitViewport;
+import com.badlogic.gdx.utils.viewport.Viewport;
+import com.badlogic.gdx.math.Vector3;
+import io.exterminator3618.client.components.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,6 +29,7 @@
 import io.exterminator3618.client.components.PowerUpBrick;
 import io.exterminator3618.client.components.StrongBrick;
 import io.exterminator3618.client.managers.SoundManager;
+
 import io.exterminator3618.client.utils.Assets;
 import io.exterminator3618.client.utils.LevelLoader;
 import io.exterminator3618.client.utils.Renderer;
@@ -53,6 +59,13 @@ public final class GameScreen implements Screen {
     private List<PowerUp> powerUps;
     private List<PowerUp> activePowerUps;
 
+    private OrthographicCamera camera;
+    private Viewport viewport;
+    private Vector3 touchPos = new Vector3();
+
+    private TextButton pauseButton;
+
+
     public GameScreen(Exterminator3618 game) {
         this.game = game;
         this.renderer = game.getRenderer();
@@ -63,7 +76,6 @@ public GameScreen(Exterminator3618 game) {
         soundManager.play("sound/gameplay_bgm.mp3", true);
     }
 
-
     public void loadLevel(int levelNumber, Ball oldball) {
         log.info("Loading level {}", levelNumber);
         // Initialize ball
@@ -99,13 +111,6 @@ public void loadLevel(int levelNumber, Ball oldball) {
                 PADDLE_REGION_NAME
         );
 
-        /*
-
-        bricks = new ArrayList<>();
-        int rows = 5;
-        int cols = 17;
-        int startX = 50;
-        int startY = WINDOW_HEIGHT - 100;*/
         bricks = LevelLoader.load(getClass().getResourceAsStream(
                 String.format("/levels/level%d.dat", levelNumber)
         ));
@@ -114,6 +119,11 @@ public void loadLevel(int levelNumber, Ball oldball) {
 
     @Override
     public void show() {
+        camera = new OrthographicCamera();
+        viewport = new FitViewport(Constants.WINDOW_WIDTH, Constants.WINDOW_HEIGHT, camera);
+        camera.position.set(Constants.WINDOW_WIDTH / 2, Constants.WINDOW_HEIGHT / 2, 0);
+        touchPos = new Vector3();
+        pauseButton = new TextButton("Pause", 100, 300, 200, 50);
     }
 
     /**
@@ -179,7 +189,7 @@ public void render(float deltaTime) {
         }
 
         // Render game objects
-        renderer.begin();
+        renderer.begin(camera);
         renderer.draw(ball);
         renderer.draw(paddle);
         for (PowerUp powerUp : powerUps) {
@@ -203,7 +213,9 @@ public void render(float deltaTime) {
         for (int i = 0; i < lives; i++) {
             renderer.drawLives(20 + i * 30, WINDOW_HEIGHT - 70);
         }
-
+        camera.update();
+        viewport.apply();
+        pauseButton.draw(renderer);
         // (Optional) Could display active power-up timers here if desired
 
         renderer.end();
@@ -226,11 +238,21 @@ public void render(float deltaTime) {
         if (Gdx.input.isKeyJustPressed(Input.Keys.P) || Gdx.input.isKeyJustPressed(Input.Keys.ESCAPE)) {
             game.launchScreen(new PauseScreen(game, this));
         }
+
+        if (Gdx.input.justTouched()) {
+            touchPos.set(Gdx.input.getX(), Gdx.input.getY(), 0);
+            viewport.unproject(touchPos);
+
+            if (pauseButton.isClicked(touchPos.x, touchPos.y)) {
+                game.launchScreen(new PauseScreen(game, this));
+            }
+        }
+
     }
 
     @Override
     public void resize(int width, int height) {
-
+        viewport.update(width, height);
     }
 
     @Override
@@ -255,7 +277,7 @@ public void hide() {
     public void dispose() {
         bricks.clear();
         extraBalls.clear();
-        Assets.dispose();
+        //Assets.dispose();
         log.info("Game disposed");
     }
 
@@ -264,8 +286,9 @@ private void gotoVictoryScreen() {
     }
 
     private void gotoGameOverScreen() {
-        soundManager.dispose();  
-        game.launchScreen(new GameOverScreen(game));
+        //game.launchScreen(new GameOverScreen(game));
+        soundManager.dispose();
+        game.replaceCurrentScreen(new GameOverScreen(game));
     }
 
     /**

client/src/main/java/io/exterminator3618/client/screens/MainMenuScreen.java

@@ -6,8 +6,10 @@
 import com.badlogic.gdx.graphics.GL20;
 
 import com.badlogic.gdx.graphics.OrthographicCamera;
-import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.utils.viewport.FitViewport;
+import com.badlogic.gdx.utils.viewport.Viewport;
 import com.badlogic.gdx.math.Vector3;
+import io.exterminator3618.client.Constants;
 import io.exterminator3618.client.Exterminator3618;
 import io.exterminator3618.client.managers.SoundManager;
 import io.exterminator3618.client.components.TextButton;
@@ -20,25 +22,37 @@ public final class MainMenuScreen implements Screen {
     private final SoundManager soundManager;
     private final OrthographicCamera camera;
     private final Vector3 touchPos;
+    private Viewport viewport;
 
-    private final TextButton startButton;
-    private final TextButton settingsButton;
+    private TextButton startButton;
+    private TextButton settingsButton;
+    private TextButton exitButton;
+
+    final int BUTTON_WIDTH = 220;
+    final int BUTTON_HEIGHT = 50;
+    final int PADDING = 20;
 
     public MainMenuScreen(Exterminator3618 game) {
         this.game = game;
         renderer = game.getRenderer();
         soundManager = game.getSoundManager();
 
         camera = new OrthographicCamera();
-        camera.setToOrtho(false, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
-
+        viewport = new FitViewport(Constants.WINDOW_WIDTH, Constants.WINDOW_HEIGHT, camera);
         touchPos = new Vector3();
-        startButton = new TextButton("Start Game", 100, 300, 200, 50);
-        settingsButton = new TextButton("Options", 100, 240, 200, 50);
+
+        final int CENTER_X = (Constants.WINDOW_WIDTH / 2) - (BUTTON_WIDTH / 2);
+        final int START_Y = (Constants.WINDOW_HEIGHT / 2) + BUTTON_HEIGHT + PADDING;
+        final int SETTINGS_Y = START_Y - BUTTON_HEIGHT - PADDING;
+        final int EXIT_Y = SETTINGS_Y - BUTTON_HEIGHT - PADDING;
+        startButton = new TextButton("Start Game", CENTER_X, START_Y, BUTTON_WIDTH, BUTTON_HEIGHT);
+        settingsButton = new TextButton("Options", CENTER_X, SETTINGS_Y, BUTTON_WIDTH, BUTTON_HEIGHT);
+        // exitButton = new TextButton("Exit", CENTER_X, EXIT_Y, BUTTON_WIDTH, BUTTON_HEIGHT);
     }
 
     @Override
     public void show() {
+        camera.position.set(Constants.WINDOW_WIDTH / 2, Constants.WINDOW_HEIGHT / 2, 0);
         soundManager.setVolume(0.1f);
         soundManager.play("sound/main_menu.mp3", true);
 
@@ -50,10 +64,10 @@ public void render(float delta) {
         Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
 
         camera.update();
+        viewport.apply();
         renderer.begin(camera);
         // Draw text here
         renderer.drawLogo(Gdx.graphics.getWidth() / 2, Gdx.graphics.getHeight() / 2 + 50);
-        renderer.drawTextMiddle("Day la Main Screen", Gdx.graphics.getWidth() / 2, Gdx.graphics.getHeight() / 2);
         startButton.draw(renderer);
         settingsButton.draw(renderer);
 
@@ -70,13 +84,16 @@ public void render(float delta) {
         if (Gdx.input.justTouched()) { // Chỉ kiểm tra khi người dùng vừa nhấp
             // Lấy tọa độ nhấp chuột trên màn hình
             touchPos.set(Gdx.input.getX(), Gdx.input.getY(), 0);
+            viewport.unproject(touchPos);
 
-            // Chuyển đổi tọa độ màn hình -> tọa độ thế giới game (quan trọng!)
-            camera.unproject(touchPos);
+            if (Gdx.input.isKeyJustPressed(Input.Keys.SPACE)) {
+                soundManager.stop(); // Stop main menu music
+                game.launchScreen(new GameScreen(game));
+            } else if (Gdx.input.isKeyJustPressed(Input.Keys.ESCAPE)) {
+                Gdx.app.exit();
+            }
 
-            // Transition to game screen on input
             if (startButton.isClicked(touchPos.x, touchPos.y)) {
-                soundManager.stop(); // Stop main menu music
                 game.launchScreen(new GameScreen(game));
             }
 
@@ -89,7 +106,7 @@ public void render(float delta) {
 
     @Override
     public void resize(int width, int height) {
-
+        viewport.update(width, height);
     }
 
     @Override