fixed merge related issues

game/core/src/com/eng1/game/assets/images/ImageAssets.java

@@ -20,40 +20,35 @@
  * The enum also provides methods to dispose of loaded textures to free up memory resources.
  */
 public enum ImageAssets implements Assets<Texture> {
-    MAIN_MENU_TITLE(() -> new Texture(Gdx.files.internal(MAIN_MENU_TITLE_PATH))),
-    NEW_WORLD_MAP_OVERVIEW(() -> new Texture(Gdx.files.internal(NEW_WORLD_MAP_OVERVIEW_PATH))),
-    PLAYER_CHARACTER_1(() -> new Texture(Gdx.files.internal(PLAYER_CHARACTER_1_PATH))),
-    PLAYER_CHARACTER_2(() -> new Texture(Gdx.files.internal(PLAYER_CHARACTER_2_PATH))),
-    PLAYER_CHARACTER_3(() -> new Texture(Gdx.files.internal(PLAYER_CHARACTER_3_PATH)));
     /**
-     * MAIN_MENU_TITLE: Represents the main menu title image.
+     * Represents the main menu title image.
      * The {@link Supplier} associated with this enum constant loads the image from the internal file "images/main_menu_title.png".
      */
-    MAIN_MENU_TITLE(() -> new Texture(Gdx.files.internal("images/main_menu_title.png"))),
+    MAIN_MENU_TITLE(() -> new Texture(Gdx.files.internal(MAIN_MENU_TITLE_PATH))),
 
     /**
-     * NEW_WORLD_MAP_OVERVIEW: Represents the new world map overview image.
+     * Represents the new world map overview image.
      * The {@link Supplier} associated with this enum constant loads the image from the internal file "maps/newWorldMap/newWorldMap.png".
      */
-    NEW_WORLD_MAP_OVERVIEW(() -> new Texture(Gdx.files.internal("maps/newWorldMap/newWorldMap.png"))),
+    NEW_WORLD_MAP_OVERVIEW(() -> new Texture(Gdx.files.internal(NEW_WORLD_MAP_OVERVIEW_PATH))),
 
     /**
-     * PLAYER_CHARACTER_1: Represents the first player character image.
+     * Represents the first player character image.
      * The {@link Supplier} associated with this enum constant loads the image from the internal file "playerCharacters/playerCharacter1.png".
      */
-    PLAYER_CHARACTER_1(() -> new Texture(Gdx.files.internal("playerCharacters/playerCharacter1.png"))),
+    PLAYER_CHARACTER_1(() -> new Texture(Gdx.files.internal(PLAYER_CHARACTER_1_PATH))),
 
     /**
-     * PLAYER_CHARACTER_2: Represents the second player character image.
+     * Represents the second player character image.
      * The {@link Supplier} associated with this enum constant loads the image from the internal file "playerCharacters/playerCharacter2.png".
      */
-    PLAYER_CHARACTER_2(() -> new Texture(Gdx.files.internal("playerCharacters/playerCharacter2.png"))),
+    PLAYER_CHARACTER_2(() -> new Texture(Gdx.files.internal(PLAYER_CHARACTER_2_PATH))),
 
     /**
-     * PLAYER_CHARACTER_3: Represents the third player character image.
+     * Represents the third player character image.
      * The {@link Supplier} associated with this enum constant loads the image from the internal file "playerCharacters/playerCharacter3.png".
      */
-    PLAYER_CHARACTER_3(() -> new Texture(Gdx.files.internal("playerCharacters/playerCharacter3.png")));
+    PLAYER_CHARACTER_3(() -> new Texture(Gdx.files.internal(PLAYER_CHARACTER_3_PATH)));
 
     /**
      * A {@link List} of {@link Texture} objects that have been loaded by this {@link ImageAssets} enum constant.

game/core/src/com/eng1/game/assets/skins/SkinAssets.java

@@ -16,12 +16,11 @@
  * Each enum constant is associated with a {@link Supplier} that can be used to create new instances of the {@link Skin}.
  */
 public enum SkinAssets implements Assets<Skin> {
-    UI(() -> new Skin(Gdx.files.internal(UISKIN_JSON_PATH)));
     /**
      * Associated with a {@link Supplier} that creates a new instance of the {@link Skin} class.
      * The Supplier loads the {@link Skin} from the "skin/uiskin.json" file located in the internal storage.
      */
-    UI(() -> new Skin(Gdx.files.internal("skin/uiskin.json")));
+    UI(() -> new Skin(Gdx.files.internal(UISKIN_JSON_PATH)));
 
     /**
      * A {@link List} of {@link Skin} objects that have been loaded.