From f35336ebcfa457f5b2af28fd063ffb3a08f5c1c0 Mon Sep 17 00:00:00 2001 From: therealemissions Date: Thu, 23 May 2024 08:55:06 +0100 Subject: [PATCH] fixed some qodana problems --- .../eng1/game/assets/images/ImageAssetPaths.java | 10 +++++----- .../com/eng1/game/assets/maps/MapAssetPaths.java | 13 ++++++++----- .../src/com/eng1/game/assets/maps/MapAssets.java | 1 - .../src/com/eng1/game/game/player/Statistics.java | 3 --- .../src/com/eng1/game/screens/CharacterScreen.java | 3 --- .../src/com/eng1/game/screens/LoadingScreen.java | 1 - game/core/src/com/eng1/game/screens/MainScreen.java | 1 - game/desktop/src/com/eng1/game/DesktopLauncher.java | 2 -- 8 files changed, 13 insertions(+), 21 deletions(-) diff --git a/game/core/src/com/eng1/game/assets/images/ImageAssetPaths.java b/game/core/src/com/eng1/game/assets/images/ImageAssetPaths.java index 366ff99..9174614 100644 --- a/game/core/src/com/eng1/game/assets/images/ImageAssetPaths.java +++ b/game/core/src/com/eng1/game/assets/images/ImageAssetPaths.java @@ -1,9 +1,9 @@ package com.eng1.game.assets.images; public final class ImageAssetPaths { - protected static final String MAIN_MENU_TITLE_PATH = "images/main_menu_title.png"; - protected static final String NEW_WORLD_MAP_OVERVIEW_PATH = "maps/newWorldMap/newWorldMap.png"; - protected static final String PLAYER_CHARACTER_1_PATH = "playerCharacters/playerCharacter1.png"; - protected static final String PLAYER_CHARACTER_2_PATH = "playerCharacters/playerCharacter2.png"; - protected static final String PLAYER_CHARACTER_3_PATH = "playerCharacters/playerCharacter3.png"; + static final String MAIN_MENU_TITLE_PATH = "images/main_menu_title.png"; + static final String NEW_WORLD_MAP_OVERVIEW_PATH = "maps/newWorldMap/newWorldMap.png"; + static final String PLAYER_CHARACTER_1_PATH = "playerCharacters/playerCharacter1.png"; + static final String PLAYER_CHARACTER_2_PATH = "playerCharacters/playerCharacter2.png"; + static final String PLAYER_CHARACTER_3_PATH = "playerCharacters/playerCharacter3.png"; } \ No newline at end of file diff --git a/game/core/src/com/eng1/game/assets/maps/MapAssetPaths.java b/game/core/src/com/eng1/game/assets/maps/MapAssetPaths.java index 85cfd61..489d6f6 100644 --- a/game/core/src/com/eng1/game/assets/maps/MapAssetPaths.java +++ b/game/core/src/com/eng1/game/assets/maps/MapAssetPaths.java @@ -1,9 +1,12 @@ package com.eng1.game.assets.maps; +import lombok.experimental.UtilityClass; + +@UtilityClass public final class MapAssetPaths { - protected static final String HOME_MAP_PATH = "maps/map8 (home)/home.tmx"; - protected static final String GYM_MAP_PATH = "maps/map9 (gym)/gym.tmx"; - protected static final String CS_BUILDING_MAP_PATH = "maps/map10 (cs-building)/computer-science-building.tmx"; - protected static final String PIAZZA_MAP_PATH = "maps/map11 (piazza)/piazza.tmx"; - protected static final String NEW_WORLD_MAP_PATH = "maps/newWorldMap/newWorldMap.tmx"; + static final String HOME_MAP_PATH = "maps/map8 (home)/home.tmx"; + static final String GYM_MAP_PATH = "maps/map9 (gym)/gym.tmx"; + static final String CS_BUILDING_MAP_PATH = "maps/map10 (cs-building)/computer-science-building.tmx"; + static final String PIAZZA_MAP_PATH = "maps/map11 (piazza)/piazza.tmx"; + static final String NEW_WORLD_MAP_PATH = "maps/newWorldMap/newWorldMap.tmx"; } diff --git a/game/core/src/com/eng1/game/assets/maps/MapAssets.java b/game/core/src/com/eng1/game/assets/maps/MapAssets.java index 41a821f..983d1e2 100644 --- a/game/core/src/com/eng1/game/assets/maps/MapAssets.java +++ b/game/core/src/com/eng1/game/assets/maps/MapAssets.java @@ -1,7 +1,6 @@ package com.eng1.game.assets.maps; import com.badlogic.gdx.maps.tiled.TiledMap; -import com.badlogic.gdx.maps.tiled.TmxMapLoader; import com.eng1.game.assets.Assets; import lombok.Getter; import org.jetbrains.annotations.NotNull; diff --git a/game/core/src/com/eng1/game/game/player/Statistics.java b/game/core/src/com/eng1/game/game/player/Statistics.java index 69ddaaa..1faf783 100644 --- a/game/core/src/com/eng1/game/game/player/Statistics.java +++ b/game/core/src/com/eng1/game/game/player/Statistics.java @@ -1,7 +1,6 @@ package com.eng1.game.game.player; import com.badlogic.gdx.scenes.scene2d.ui.ProgressBar; -import com.eng1.game.game.activity.Activities; import lombok.Getter; import lombok.experimental.UtilityClass; import org.jetbrains.annotations.NotNull; @@ -278,7 +277,6 @@ public enum Effect { * The score starts at 0 and increases over time as the player progresses in the game. * It represents the total points that the player has gained throughout the game. * - * @return The current score of the player. * @deprecated in favour of {@link com.eng1.game.game.Score} */ @Getter @@ -306,7 +304,6 @@ public enum Effect { * However, time is displayed 1 hour ahead to the player due to rolling over behaviour of {@link LocalTime} * The time increases as the player performs activities in the game. * - * @return The current time in the game. */ @Getter private static LocalTime time = LocalTime.of(7, 0); diff --git a/game/core/src/com/eng1/game/screens/CharacterScreen.java b/game/core/src/com/eng1/game/screens/CharacterScreen.java index 8b9d8f1..fbc29cf 100644 --- a/game/core/src/com/eng1/game/screens/CharacterScreen.java +++ b/game/core/src/com/eng1/game/screens/CharacterScreen.java @@ -88,9 +88,6 @@ private class TableContents { */ public static final Image CHARACTER3_IMAGE = new Image(ImageAssets.PLAYER_CHARACTER_3.get()); - /** - * Static initializer block that sets up the font scales for the labels and the sizes for the images. - */ static { TITLE_LABEL.setFontScale(2f); CHARACTER1_BUTTON.getLabel().setFontScale(1.6f); diff --git a/game/core/src/com/eng1/game/screens/LoadingScreen.java b/game/core/src/com/eng1/game/screens/LoadingScreen.java index a26cd1c..3a5df97 100644 --- a/game/core/src/com/eng1/game/screens/LoadingScreen.java +++ b/game/core/src/com/eng1/game/screens/LoadingScreen.java @@ -3,7 +3,6 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Screen; import com.badlogic.gdx.utils.viewport.ScreenViewport; -import com.eng1.game.HeslingtonHustle; import com.badlogic.gdx.scenes.scene2d.Stage; /** diff --git a/game/core/src/com/eng1/game/screens/MainScreen.java b/game/core/src/com/eng1/game/screens/MainScreen.java index 8470333..34dc461 100644 --- a/game/core/src/com/eng1/game/screens/MainScreen.java +++ b/game/core/src/com/eng1/game/screens/MainScreen.java @@ -1,6 +1,5 @@ package com.eng1.game.screens; -import com.eng1.game.HeslingtonHustle; import com.badlogic.gdx.Screen; import com.badlogic.gdx.*; import com.badlogic.gdx.Input.Keys; diff --git a/game/desktop/src/com/eng1/game/DesktopLauncher.java b/game/desktop/src/com/eng1/game/DesktopLauncher.java index a0cfdcc..7cdad1b 100644 --- a/game/desktop/src/com/eng1/game/DesktopLauncher.java +++ b/game/desktop/src/com/eng1/game/DesktopLauncher.java @@ -1,7 +1,5 @@ package com.eng1.game; -import com.badlogic.gdx.Graphics; import com.badlogic.gdx.graphics.glutils.HdpiMode; -import com.eng1.game.HeslingtonHustle; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;