From 7d48b1ccb5ed5f9d9d24dcdce275ae63efce66cd Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Thu, 3 Oct 2019 20:16:37 -0300 Subject: [PATCH] Change over to gradle build system Signed-off-by: Chris Cromer --- .gitignore | 6 +- .idea/.name | 2 +- .idea/artifacts/Azaraka.xml | 16 -- .idea/artifacts/Azaraka_standalone.xml | 12 -- .idea/gradle.xml | 17 ++ .../com_google_code_gson_gson_2_8_5.xml | 10 - .idea/misc.xml | 5 +- .idea/modules.xml | 8 - .idea/uiDesigner.xml | 124 ------------- .idea/vcs.xml | 2 +- Azaraka.iml | 20 -- build.gradle | 55 ++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 55190 bytes gradle/wrapper/gradle-wrapper.properties | 21 +++ gradlew | 172 ++++++++++++++++++ gradlew.bat | 84 +++++++++ settings.gradle | 17 ++ src/META-INF/MANIFEST.MF | 15 -- .../java}/cl/cromer/azaraka/Celda.java | 7 +- .../java}/cl/cromer/azaraka/Constantes.java | 57 +++--- .../java}/cl/cromer/azaraka/Escenario.java | 9 +- .../java}/cl/cromer/azaraka/Lienzo.java | 33 ++-- .../java}/cl/cromer/azaraka/Main.java | 3 +- .../cl/cromer/azaraka/VentanaPrincipal.java | 0 .../java}/cl/cromer/azaraka/json/Cell.java | 0 .../java}/cl/cromer/azaraka/json/Json.java | 0 .../cl/cromer/azaraka/json/package-info.java | 0 .../cromer/azaraka/logging/HtmlFormatter.java | 0 .../cromer/azaraka/logging/StringUtils.java | 0 .../cromer/azaraka/logging/package-info.java | 0 .../java}/cl/cromer/azaraka/object/Chest.java | 29 +-- .../java}/cl/cromer/azaraka/object/Enemy.java | 12 +- .../java}/cl/cromer/azaraka/object/Gem.java | 20 +- .../java}/cl/cromer/azaraka/object/Key.java | 0 .../cl/cromer/azaraka/object/Object.java | 26 +-- .../cl/cromer/azaraka/object/Obstacle.java | 0 .../cl/cromer/azaraka/object/Player.java | 8 +- .../cl/cromer/azaraka/object/Portal.java | 2 +- .../cromer/azaraka/object/package-info.java | 0 .../java}/cl/cromer/azaraka/package-info.java | 0 .../java}/cl/cromer/azaraka/panel/Config.java | 0 .../java}/cl/cromer/azaraka/panel/Game.java | 0 .../cl/cromer/azaraka/panel/package-info.java | 0 .../java}/cl/cromer/azaraka/sound/Sound.java | 11 +- .../cromer/azaraka/sound/SoundException.java | 0 .../cl/cromer/azaraka/sound/package-info.java | 0 .../cl/cromer/azaraka/sprite/Animation.java | 24 +-- .../azaraka/sprite/AnimationException.java | 0 .../java}/cl/cromer/azaraka/sprite/Sheet.java | 6 +- .../cromer/azaraka/sprite/SheetException.java | 0 .../cromer/azaraka/sprite/package-info.java | 0 .../main/resources}/img/chest/chests.png | Bin .../main/resources}/img/enemy/chara4.png | Bin .../main/resources}/img/enemy/emote4.png | Bin .../main/resources}/img/gameover/gameover.png | Bin .../main/resources}/img/heart/heart0.png | Bin .../main/resources}/img/heart/heart1.png | Bin .../main/resources}/img/heart/heart2.png | Bin .../main/resources}/img/heart/heart3.png | Bin .../main/resources}/img/heart/heart4.png | Bin {res => src/main/resources}/img/icon.png | Bin {res => src/main/resources}/img/key/key.png | Bin .../main/resources}/img/player/chara2.png | Bin .../main/resources}/img/player/emote2.png | Bin .../main/resources}/img/portal/gray/000.png | Bin .../main/resources}/img/portal/gray/001.png | Bin .../main/resources}/img/portal/gray/002.png | Bin .../main/resources}/img/portal/gray/003.png | Bin .../main/resources}/img/portal/gray/004.png | Bin .../main/resources}/img/portal/gray/005.png | Bin .../main/resources}/img/portal/gray/006.png | Bin .../main/resources}/img/portal/gray/007.png | Bin .../main/resources}/img/portal/gray/008.png | Bin .../main/resources}/img/portal/gray/009.png | Bin .../main/resources}/img/portal/gray/010.png | Bin .../main/resources}/img/portal/gray/011.png | Bin .../main/resources}/img/portal/gray/012.png | Bin .../main/resources}/img/portal/gray/013.png | Bin .../main/resources}/img/portal/gray/014.png | Bin .../main/resources}/img/portal/gray/015.png | Bin .../main/resources}/img/portal/gray/016.png | Bin .../main/resources}/img/portal/gray/017.png | Bin .../main/resources}/img/portal/gray/018.png | Bin .../main/resources}/img/portal/gray/019.png | Bin .../main/resources}/img/portal/gray/020.png | Bin .../main/resources}/img/portal/gray/021.png | Bin .../main/resources}/img/portal/gray/022.png | Bin .../main/resources}/img/portal/gray/023.png | Bin .../main/resources}/img/portal/gray/024.png | Bin .../main/resources}/img/portal/gray/025.png | Bin .../main/resources}/img/portal/gray/026.png | Bin .../main/resources}/img/portal/gray/027.png | Bin .../main/resources}/img/portal/gray/028.png | Bin .../main/resources}/img/portal/gray/029.png | Bin .../main/resources}/img/portal/gray/030.png | Bin .../main/resources}/img/portal/gray/031.png | Bin .../main/resources}/img/portal/gray/032.png | Bin .../main/resources}/img/portal/gray/033.png | Bin .../main/resources}/img/portal/gray/034.png | Bin .../main/resources}/img/portal/gray/035.png | Bin .../main/resources}/img/portal/gray/036.png | Bin .../main/resources}/img/portal/gray/037.png | Bin .../main/resources}/img/portal/gray/038.png | Bin .../main/resources}/img/portal/gray/039.png | Bin .../main/resources}/img/portal/gray/040.png | Bin .../main/resources}/img/portal/gray/041.png | Bin .../main/resources}/img/portal/gray/042.png | Bin .../main/resources}/img/portal/gray/043.png | Bin .../main/resources}/img/portal/gray/044.png | Bin .../main/resources}/img/portal/gray/045.png | Bin .../main/resources}/img/portal/gray/046.png | Bin .../main/resources}/img/portal/gray/047.png | Bin .../main/resources}/img/portal/gray/048.png | Bin .../main/resources}/img/portal/gray/049.png | Bin .../main/resources}/img/portal/gray/050.png | Bin .../main/resources}/img/portal/gray/051.png | Bin .../main/resources}/img/portal/gray/052.png | Bin .../main/resources}/img/portal/gray/053.png | Bin .../main/resources}/img/portal/gray/054.png | Bin .../main/resources}/img/portal/gray/055.png | Bin .../main/resources}/img/portal/gray/056.png | Bin .../main/resources}/img/portal/gray/057.png | Bin .../main/resources}/img/portal/gray/058.png | Bin .../main/resources}/img/portal/gray/059.png | Bin .../main/resources}/img/portal/gray/060.png | Bin .../main/resources}/img/portal/gray/061.png | Bin .../main/resources}/img/portal/gray/062.png | Bin .../main/resources}/img/portal/gray/063.png | Bin .../main/resources}/img/portal/gray/064.png | Bin .../main/resources}/img/portal/gray/065.png | Bin .../main/resources}/img/portal/gray/066.png | Bin .../main/resources}/img/portal/gray/067.png | Bin .../main/resources}/img/portal/gray/068.png | Bin .../main/resources}/img/portal/gray/069.png | Bin .../main/resources}/img/portal/gray/070.png | Bin .../main/resources}/img/portal/gray/071.png | Bin .../main/resources}/img/portal/gray/072.png | Bin .../main/resources}/img/portal/gray/073.png | Bin .../main/resources}/img/portal/gray/074.png | Bin .../main/resources}/img/portal/gray/075.png | Bin .../main/resources}/img/portal/gray/076.png | Bin .../main/resources}/img/portal/gray/077.png | Bin .../main/resources}/img/portal/gray/078.png | Bin .../main/resources}/img/portal/gray/079.png | Bin .../main/resources}/img/portal/gray/080.png | Bin .../main/resources}/img/portal/gray/081.png | Bin .../main/resources}/img/portal/gray/082.png | Bin .../main/resources}/img/portal/gray/083.png | Bin .../main/resources}/img/portal/gray/084.png | Bin .../main/resources}/img/portal/gray/085.png | Bin .../main/resources}/img/portal/gray/086.png | Bin .../main/resources}/img/portal/gray/087.png | Bin .../main/resources}/img/portal/gray/088.png | Bin .../main/resources}/img/portal/gray/089.png | Bin .../main/resources}/img/portal/gray/090.png | Bin .../main/resources}/img/portal/gray/091.png | Bin .../main/resources}/img/portal/gray/092.png | Bin .../main/resources}/img/portal/gray/093.png | Bin .../main/resources}/img/portal/gray/094.png | Bin .../main/resources}/img/portal/gray/095.png | Bin .../main/resources}/img/portal/gray/096.png | Bin .../main/resources}/img/portal/gray/097.png | Bin .../main/resources}/img/portal/gray/098.png | Bin .../main/resources}/img/portal/gray/099.png | Bin .../main/resources}/img/portal/gray/100.png | Bin .../main/resources}/img/portal/gray/101.png | Bin .../main/resources}/img/portal/gray/102.png | Bin .../main/resources}/img/portal/gray/103.png | Bin .../main/resources}/img/portal/gray/104.png | Bin .../main/resources}/img/portal/gray/105.png | Bin .../main/resources}/img/portal/gray/106.png | Bin .../main/resources}/img/portal/gray/107.png | Bin .../main/resources}/img/portal/gray/108.png | Bin .../main/resources}/img/portal/gray/109.png | Bin .../main/resources}/img/portal/gray/110.png | Bin .../main/resources}/img/portal/gray/111.png | Bin .../main/resources}/img/portal/gray/112.png | Bin .../main/resources}/img/portal/gray/113.png | Bin .../main/resources}/img/portal/gray/114.png | Bin .../main/resources}/img/portal/gray/115.png | Bin .../main/resources}/img/portal/gray/116.png | Bin .../main/resources}/img/portal/gray/117.png | Bin .../main/resources}/img/portal/gray/118.png | Bin .../main/resources}/img/portal/gray/119.png | Bin .../main/resources}/img/portal/green/000.png | Bin .../main/resources}/img/portal/green/001.png | Bin .../main/resources}/img/portal/green/002.png | Bin .../main/resources}/img/portal/green/003.png | Bin .../main/resources}/img/portal/green/004.png | Bin .../main/resources}/img/portal/green/005.png | Bin .../main/resources}/img/portal/green/006.png | Bin .../main/resources}/img/portal/green/007.png | Bin .../main/resources}/img/portal/green/008.png | Bin .../main/resources}/img/portal/green/009.png | Bin .../main/resources}/img/portal/green/010.png | Bin .../main/resources}/img/portal/green/011.png | Bin .../main/resources}/img/portal/green/012.png | Bin .../main/resources}/img/portal/green/013.png | Bin .../main/resources}/img/portal/green/014.png | Bin .../main/resources}/img/portal/green/015.png | Bin .../main/resources}/img/portal/green/016.png | Bin .../main/resources}/img/portal/green/017.png | Bin .../main/resources}/img/portal/green/018.png | Bin .../main/resources}/img/portal/green/019.png | Bin .../main/resources}/img/portal/green/020.png | Bin .../main/resources}/img/portal/green/021.png | Bin .../main/resources}/img/portal/green/022.png | Bin .../main/resources}/img/portal/green/023.png | Bin .../main/resources}/img/portal/green/024.png | Bin .../main/resources}/img/portal/green/025.png | Bin .../main/resources}/img/portal/green/026.png | Bin .../main/resources}/img/portal/green/027.png | Bin .../main/resources}/img/portal/green/028.png | Bin .../main/resources}/img/portal/green/029.png | Bin .../main/resources}/img/portal/green/030.png | Bin .../main/resources}/img/portal/green/031.png | Bin .../main/resources}/img/portal/green/032.png | Bin .../main/resources}/img/portal/green/033.png | Bin .../main/resources}/img/portal/green/034.png | Bin .../main/resources}/img/portal/green/035.png | Bin .../main/resources}/img/portal/green/036.png | Bin .../main/resources}/img/portal/green/037.png | Bin .../main/resources}/img/portal/green/038.png | Bin .../main/resources}/img/portal/green/039.png | Bin .../main/resources}/img/portal/green/040.png | Bin .../main/resources}/img/portal/green/041.png | Bin .../main/resources}/img/portal/green/042.png | Bin .../main/resources}/img/portal/green/043.png | Bin .../main/resources}/img/portal/green/044.png | Bin .../main/resources}/img/portal/green/045.png | Bin .../main/resources}/img/portal/green/046.png | Bin .../main/resources}/img/portal/green/047.png | Bin .../main/resources}/img/portal/green/048.png | Bin .../main/resources}/img/portal/green/049.png | Bin .../main/resources}/img/portal/green/050.png | Bin .../main/resources}/img/portal/green/051.png | Bin .../main/resources}/img/portal/green/052.png | Bin .../main/resources}/img/portal/green/053.png | Bin .../main/resources}/img/portal/green/054.png | Bin .../main/resources}/img/portal/green/055.png | Bin .../main/resources}/img/portal/green/056.png | Bin .../main/resources}/img/portal/green/057.png | Bin .../main/resources}/img/portal/green/058.png | Bin .../main/resources}/img/portal/green/059.png | Bin .../main/resources}/img/portal/green/060.png | Bin .../main/resources}/img/portal/green/061.png | Bin .../main/resources}/img/portal/green/062.png | Bin .../main/resources}/img/portal/green/063.png | Bin .../main/resources}/img/portal/green/064.png | Bin .../main/resources}/img/portal/green/065.png | Bin .../main/resources}/img/portal/green/066.png | Bin .../main/resources}/img/portal/green/067.png | Bin .../main/resources}/img/portal/green/068.png | Bin .../main/resources}/img/portal/green/069.png | Bin .../main/resources}/img/portal/green/070.png | Bin .../main/resources}/img/portal/green/071.png | Bin .../main/resources}/img/portal/green/072.png | Bin .../main/resources}/img/portal/green/073.png | Bin .../main/resources}/img/portal/green/074.png | Bin .../main/resources}/img/portal/green/075.png | Bin .../main/resources}/img/portal/green/076.png | Bin .../main/resources}/img/portal/green/077.png | Bin .../main/resources}/img/portal/green/078.png | Bin .../main/resources}/img/portal/green/079.png | Bin .../main/resources}/img/portal/green/080.png | Bin .../main/resources}/img/portal/green/081.png | Bin .../main/resources}/img/portal/green/082.png | Bin .../main/resources}/img/portal/green/083.png | Bin .../main/resources}/img/portal/green/084.png | Bin .../main/resources}/img/portal/green/085.png | Bin .../main/resources}/img/portal/green/086.png | Bin .../main/resources}/img/portal/green/087.png | Bin .../main/resources}/img/portal/green/088.png | Bin .../main/resources}/img/portal/green/089.png | Bin .../main/resources}/img/portal/green/090.png | Bin .../main/resources}/img/portal/green/091.png | Bin .../main/resources}/img/portal/green/092.png | Bin .../main/resources}/img/portal/green/093.png | Bin .../main/resources}/img/portal/green/094.png | Bin .../main/resources}/img/portal/green/095.png | Bin .../main/resources}/img/portal/green/096.png | Bin .../main/resources}/img/portal/green/097.png | Bin .../main/resources}/img/portal/green/098.png | Bin .../main/resources}/img/portal/green/099.png | Bin .../main/resources}/img/portal/green/100.png | Bin .../main/resources}/img/portal/green/101.png | Bin .../main/resources}/img/portal/green/102.png | Bin .../main/resources}/img/portal/green/103.png | Bin .../main/resources}/img/portal/green/104.png | Bin .../main/resources}/img/portal/green/105.png | Bin .../main/resources}/img/portal/green/106.png | Bin .../main/resources}/img/portal/green/107.png | Bin .../main/resources}/img/portal/green/108.png | Bin .../main/resources}/img/portal/green/109.png | Bin .../main/resources}/img/portal/green/110.png | Bin .../main/resources}/img/portal/green/111.png | Bin .../main/resources}/img/portal/green/112.png | Bin .../main/resources}/img/portal/green/113.png | Bin .../main/resources}/img/portal/green/114.png | Bin .../main/resources}/img/portal/green/115.png | Bin .../main/resources}/img/portal/green/116.png | Bin .../main/resources}/img/portal/green/117.png | Bin .../main/resources}/img/portal/green/118.png | Bin .../main/resources}/img/portal/green/119.png | Bin .../main/resources}/img/textures/dungeon.png | Bin {res => src/main/resources}/scene.json | 0 .../main/resources}/snd/EnemyAttack.wav | Bin {res => src/main/resources}/snd/GameLoop.wav | Bin {res => src/main/resources}/snd/GameOver.wav | Bin {res => src/main/resources}/snd/GetKey.wav | Bin {res => src/main/resources}/snd/OpenChest.wav | Bin {res => src/main/resources}/snd/Success.wav | Bin 312 files changed, 502 insertions(+), 331 deletions(-) delete mode 100644 .idea/artifacts/Azaraka.xml delete mode 100644 .idea/artifacts/Azaraka_standalone.xml create mode 100644 .idea/gradle.xml delete mode 100644 .idea/libraries/com_google_code_gson_gson_2_8_5.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 Azaraka.iml create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle delete mode 100644 src/META-INF/MANIFEST.MF rename src/{ => main/java}/cl/cromer/azaraka/Celda.java (97%) rename src/{ => main/java}/cl/cromer/azaraka/Constantes.java (99%) rename src/{ => main/java}/cl/cromer/azaraka/Escenario.java (99%) rename src/{ => main/java}/cl/cromer/azaraka/Lienzo.java (99%) rename src/{ => main/java}/cl/cromer/azaraka/Main.java (97%) rename src/{ => main/java}/cl/cromer/azaraka/VentanaPrincipal.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/json/Cell.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/json/Json.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/json/package-info.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/logging/HtmlFormatter.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/logging/StringUtils.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/logging/package-info.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/object/Chest.java (98%) rename src/{ => main/java}/cl/cromer/azaraka/object/Enemy.java (98%) rename src/{ => main/java}/cl/cromer/azaraka/object/Gem.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/object/Key.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/object/Object.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/object/Obstacle.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/object/Player.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/object/Portal.java (99%) rename src/{ => main/java}/cl/cromer/azaraka/object/package-info.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/package-info.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/panel/Config.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/panel/Game.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/panel/package-info.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/sound/Sound.java (99%) rename src/{ => main/java}/cl/cromer/azaraka/sound/SoundException.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/sound/package-info.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/sprite/Animation.java (97%) rename src/{ => main/java}/cl/cromer/azaraka/sprite/AnimationException.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/sprite/Sheet.java (97%) rename src/{ => main/java}/cl/cromer/azaraka/sprite/SheetException.java (100%) rename src/{ => main/java}/cl/cromer/azaraka/sprite/package-info.java (100%) rename {res => src/main/resources}/img/chest/chests.png (100%) rename {res => src/main/resources}/img/enemy/chara4.png (100%) rename {res => src/main/resources}/img/enemy/emote4.png (100%) rename {res => src/main/resources}/img/gameover/gameover.png (100%) rename {res => src/main/resources}/img/heart/heart0.png (100%) rename {res => src/main/resources}/img/heart/heart1.png (100%) rename {res => src/main/resources}/img/heart/heart2.png (100%) rename {res => src/main/resources}/img/heart/heart3.png (100%) rename {res => src/main/resources}/img/heart/heart4.png (100%) rename {res => src/main/resources}/img/icon.png (100%) rename {res => src/main/resources}/img/key/key.png (100%) rename {res => src/main/resources}/img/player/chara2.png (100%) rename {res => src/main/resources}/img/player/emote2.png (100%) rename {res => src/main/resources}/img/portal/gray/000.png (100%) rename {res => src/main/resources}/img/portal/gray/001.png (100%) rename {res => src/main/resources}/img/portal/gray/002.png (100%) rename {res => src/main/resources}/img/portal/gray/003.png (100%) rename {res => src/main/resources}/img/portal/gray/004.png (100%) rename {res => src/main/resources}/img/portal/gray/005.png (100%) rename {res => src/main/resources}/img/portal/gray/006.png (100%) rename {res => src/main/resources}/img/portal/gray/007.png (100%) rename {res => src/main/resources}/img/portal/gray/008.png (100%) rename {res => src/main/resources}/img/portal/gray/009.png (100%) rename {res => src/main/resources}/img/portal/gray/010.png (100%) rename {res => src/main/resources}/img/portal/gray/011.png (100%) rename {res => src/main/resources}/img/portal/gray/012.png (100%) rename {res => src/main/resources}/img/portal/gray/013.png (100%) rename {res => src/main/resources}/img/portal/gray/014.png (100%) rename {res => src/main/resources}/img/portal/gray/015.png (100%) rename {res => src/main/resources}/img/portal/gray/016.png (100%) rename {res => src/main/resources}/img/portal/gray/017.png (100%) rename {res => src/main/resources}/img/portal/gray/018.png (100%) rename {res => src/main/resources}/img/portal/gray/019.png (100%) rename {res => src/main/resources}/img/portal/gray/020.png (100%) rename {res => src/main/resources}/img/portal/gray/021.png (100%) rename {res => src/main/resources}/img/portal/gray/022.png (100%) rename {res => src/main/resources}/img/portal/gray/023.png (100%) rename {res => src/main/resources}/img/portal/gray/024.png (100%) rename {res => src/main/resources}/img/portal/gray/025.png (100%) rename {res => src/main/resources}/img/portal/gray/026.png (100%) rename {res => src/main/resources}/img/portal/gray/027.png (100%) rename {res => src/main/resources}/img/portal/gray/028.png (100%) rename {res => src/main/resources}/img/portal/gray/029.png (100%) rename {res => src/main/resources}/img/portal/gray/030.png (100%) rename {res => src/main/resources}/img/portal/gray/031.png (100%) rename {res => src/main/resources}/img/portal/gray/032.png (100%) rename {res => src/main/resources}/img/portal/gray/033.png (100%) rename {res => src/main/resources}/img/portal/gray/034.png (100%) rename {res => src/main/resources}/img/portal/gray/035.png (100%) rename {res => src/main/resources}/img/portal/gray/036.png (100%) rename {res => src/main/resources}/img/portal/gray/037.png (100%) rename {res => src/main/resources}/img/portal/gray/038.png (100%) rename {res => src/main/resources}/img/portal/gray/039.png (100%) rename {res => src/main/resources}/img/portal/gray/040.png (100%) rename {res => src/main/resources}/img/portal/gray/041.png (100%) rename {res => src/main/resources}/img/portal/gray/042.png (100%) rename {res => src/main/resources}/img/portal/gray/043.png (100%) rename {res => src/main/resources}/img/portal/gray/044.png (100%) rename {res => src/main/resources}/img/portal/gray/045.png (100%) rename {res => src/main/resources}/img/portal/gray/046.png (100%) rename {res => src/main/resources}/img/portal/gray/047.png (100%) rename {res => src/main/resources}/img/portal/gray/048.png (100%) rename {res => src/main/resources}/img/portal/gray/049.png (100%) rename {res => src/main/resources}/img/portal/gray/050.png (100%) rename {res => src/main/resources}/img/portal/gray/051.png (100%) rename {res => src/main/resources}/img/portal/gray/052.png (100%) rename {res => src/main/resources}/img/portal/gray/053.png (100%) rename {res => src/main/resources}/img/portal/gray/054.png (100%) rename {res => src/main/resources}/img/portal/gray/055.png (100%) rename {res => src/main/resources}/img/portal/gray/056.png (100%) rename {res => src/main/resources}/img/portal/gray/057.png (100%) rename {res => src/main/resources}/img/portal/gray/058.png (100%) rename {res => src/main/resources}/img/portal/gray/059.png (100%) rename {res => src/main/resources}/img/portal/gray/060.png (100%) rename {res => src/main/resources}/img/portal/gray/061.png (100%) rename {res => src/main/resources}/img/portal/gray/062.png (100%) rename {res => src/main/resources}/img/portal/gray/063.png (100%) rename {res => src/main/resources}/img/portal/gray/064.png (100%) rename {res => src/main/resources}/img/portal/gray/065.png (100%) rename {res => src/main/resources}/img/portal/gray/066.png (100%) rename {res => src/main/resources}/img/portal/gray/067.png (100%) rename {res => src/main/resources}/img/portal/gray/068.png (100%) rename {res => src/main/resources}/img/portal/gray/069.png (100%) rename {res => src/main/resources}/img/portal/gray/070.png (100%) rename {res => src/main/resources}/img/portal/gray/071.png (100%) rename {res => src/main/resources}/img/portal/gray/072.png (100%) rename {res => src/main/resources}/img/portal/gray/073.png (100%) rename {res => src/main/resources}/img/portal/gray/074.png (100%) rename {res => src/main/resources}/img/portal/gray/075.png (100%) rename {res => src/main/resources}/img/portal/gray/076.png (100%) rename {res => src/main/resources}/img/portal/gray/077.png (100%) rename {res => src/main/resources}/img/portal/gray/078.png (100%) rename {res => src/main/resources}/img/portal/gray/079.png (100%) rename {res => src/main/resources}/img/portal/gray/080.png (100%) rename {res => src/main/resources}/img/portal/gray/081.png (100%) rename {res => src/main/resources}/img/portal/gray/082.png (100%) rename {res => src/main/resources}/img/portal/gray/083.png (100%) rename {res => src/main/resources}/img/portal/gray/084.png (100%) rename {res => src/main/resources}/img/portal/gray/085.png (100%) rename {res => src/main/resources}/img/portal/gray/086.png (100%) rename {res => src/main/resources}/img/portal/gray/087.png (100%) rename {res => src/main/resources}/img/portal/gray/088.png (100%) rename {res => src/main/resources}/img/portal/gray/089.png (100%) rename {res => src/main/resources}/img/portal/gray/090.png (100%) rename {res => src/main/resources}/img/portal/gray/091.png (100%) rename {res => src/main/resources}/img/portal/gray/092.png (100%) rename {res => src/main/resources}/img/portal/gray/093.png (100%) rename {res => src/main/resources}/img/portal/gray/094.png (100%) rename {res => src/main/resources}/img/portal/gray/095.png (100%) rename {res => src/main/resources}/img/portal/gray/096.png (100%) rename {res => src/main/resources}/img/portal/gray/097.png (100%) rename {res => src/main/resources}/img/portal/gray/098.png (100%) rename {res => src/main/resources}/img/portal/gray/099.png (100%) rename {res => src/main/resources}/img/portal/gray/100.png (100%) rename {res => src/main/resources}/img/portal/gray/101.png (100%) rename {res => src/main/resources}/img/portal/gray/102.png (100%) rename {res => src/main/resources}/img/portal/gray/103.png (100%) rename {res => src/main/resources}/img/portal/gray/104.png (100%) rename {res => src/main/resources}/img/portal/gray/105.png (100%) rename {res => src/main/resources}/img/portal/gray/106.png (100%) rename {res => src/main/resources}/img/portal/gray/107.png (100%) rename {res => src/main/resources}/img/portal/gray/108.png (100%) rename {res => src/main/resources}/img/portal/gray/109.png (100%) rename {res => src/main/resources}/img/portal/gray/110.png (100%) rename {res => src/main/resources}/img/portal/gray/111.png (100%) rename {res => src/main/resources}/img/portal/gray/112.png (100%) rename {res => src/main/resources}/img/portal/gray/113.png (100%) rename {res => src/main/resources}/img/portal/gray/114.png (100%) rename {res => src/main/resources}/img/portal/gray/115.png (100%) rename {res => src/main/resources}/img/portal/gray/116.png (100%) rename {res => src/main/resources}/img/portal/gray/117.png (100%) rename {res => src/main/resources}/img/portal/gray/118.png (100%) rename {res => src/main/resources}/img/portal/gray/119.png (100%) rename {res => src/main/resources}/img/portal/green/000.png (100%) rename {res => src/main/resources}/img/portal/green/001.png (100%) rename {res => src/main/resources}/img/portal/green/002.png (100%) rename {res => src/main/resources}/img/portal/green/003.png (100%) rename {res => src/main/resources}/img/portal/green/004.png (100%) rename {res => src/main/resources}/img/portal/green/005.png (100%) rename {res => src/main/resources}/img/portal/green/006.png (100%) rename {res => src/main/resources}/img/portal/green/007.png (100%) rename {res => src/main/resources}/img/portal/green/008.png (100%) rename {res => src/main/resources}/img/portal/green/009.png (100%) rename {res => src/main/resources}/img/portal/green/010.png (100%) rename {res => src/main/resources}/img/portal/green/011.png (100%) rename {res => src/main/resources}/img/portal/green/012.png (100%) rename {res => src/main/resources}/img/portal/green/013.png (100%) rename {res => src/main/resources}/img/portal/green/014.png (100%) rename {res => src/main/resources}/img/portal/green/015.png (100%) rename {res => src/main/resources}/img/portal/green/016.png (100%) rename {res => src/main/resources}/img/portal/green/017.png (100%) rename {res => src/main/resources}/img/portal/green/018.png (100%) rename {res => src/main/resources}/img/portal/green/019.png (100%) rename {res => src/main/resources}/img/portal/green/020.png (100%) rename {res => src/main/resources}/img/portal/green/021.png (100%) rename {res => src/main/resources}/img/portal/green/022.png (100%) rename {res => src/main/resources}/img/portal/green/023.png (100%) rename {res => src/main/resources}/img/portal/green/024.png (100%) rename {res => src/main/resources}/img/portal/green/025.png (100%) rename {res => src/main/resources}/img/portal/green/026.png (100%) rename {res => src/main/resources}/img/portal/green/027.png (100%) rename {res => src/main/resources}/img/portal/green/028.png (100%) rename {res => src/main/resources}/img/portal/green/029.png (100%) rename {res => src/main/resources}/img/portal/green/030.png (100%) rename {res => src/main/resources}/img/portal/green/031.png (100%) rename {res => src/main/resources}/img/portal/green/032.png (100%) rename {res => src/main/resources}/img/portal/green/033.png (100%) rename {res => src/main/resources}/img/portal/green/034.png (100%) rename {res => src/main/resources}/img/portal/green/035.png (100%) rename {res => src/main/resources}/img/portal/green/036.png (100%) rename {res => src/main/resources}/img/portal/green/037.png (100%) rename {res => src/main/resources}/img/portal/green/038.png (100%) rename {res => src/main/resources}/img/portal/green/039.png (100%) rename {res => src/main/resources}/img/portal/green/040.png (100%) rename {res => src/main/resources}/img/portal/green/041.png (100%) rename {res => src/main/resources}/img/portal/green/042.png (100%) rename {res => src/main/resources}/img/portal/green/043.png (100%) rename {res => src/main/resources}/img/portal/green/044.png (100%) rename {res => src/main/resources}/img/portal/green/045.png (100%) rename {res => src/main/resources}/img/portal/green/046.png (100%) rename {res => src/main/resources}/img/portal/green/047.png (100%) rename {res => src/main/resources}/img/portal/green/048.png (100%) rename {res => src/main/resources}/img/portal/green/049.png (100%) rename {res => src/main/resources}/img/portal/green/050.png (100%) rename {res => src/main/resources}/img/portal/green/051.png (100%) rename {res => src/main/resources}/img/portal/green/052.png (100%) rename {res => src/main/resources}/img/portal/green/053.png (100%) rename {res => src/main/resources}/img/portal/green/054.png (100%) rename {res => src/main/resources}/img/portal/green/055.png (100%) rename {res => src/main/resources}/img/portal/green/056.png (100%) rename {res => src/main/resources}/img/portal/green/057.png (100%) rename {res => src/main/resources}/img/portal/green/058.png (100%) rename {res => src/main/resources}/img/portal/green/059.png (100%) rename {res => src/main/resources}/img/portal/green/060.png (100%) rename {res => src/main/resources}/img/portal/green/061.png (100%) rename {res => src/main/resources}/img/portal/green/062.png (100%) rename {res => src/main/resources}/img/portal/green/063.png (100%) rename {res => src/main/resources}/img/portal/green/064.png (100%) rename {res => src/main/resources}/img/portal/green/065.png (100%) rename {res => src/main/resources}/img/portal/green/066.png (100%) rename {res => src/main/resources}/img/portal/green/067.png (100%) rename {res => src/main/resources}/img/portal/green/068.png (100%) rename {res => src/main/resources}/img/portal/green/069.png (100%) rename {res => src/main/resources}/img/portal/green/070.png (100%) rename {res => src/main/resources}/img/portal/green/071.png (100%) rename {res => src/main/resources}/img/portal/green/072.png (100%) rename {res => src/main/resources}/img/portal/green/073.png (100%) rename {res => src/main/resources}/img/portal/green/074.png (100%) rename {res => src/main/resources}/img/portal/green/075.png (100%) rename {res => src/main/resources}/img/portal/green/076.png (100%) rename {res => src/main/resources}/img/portal/green/077.png (100%) rename {res => src/main/resources}/img/portal/green/078.png (100%) rename {res => src/main/resources}/img/portal/green/079.png (100%) rename {res => src/main/resources}/img/portal/green/080.png (100%) rename {res => src/main/resources}/img/portal/green/081.png (100%) rename {res => src/main/resources}/img/portal/green/082.png (100%) rename {res => src/main/resources}/img/portal/green/083.png (100%) rename {res => src/main/resources}/img/portal/green/084.png (100%) rename {res => src/main/resources}/img/portal/green/085.png (100%) rename {res => src/main/resources}/img/portal/green/086.png (100%) rename {res => src/main/resources}/img/portal/green/087.png (100%) rename {res => src/main/resources}/img/portal/green/088.png (100%) rename {res => src/main/resources}/img/portal/green/089.png (100%) rename {res => src/main/resources}/img/portal/green/090.png (100%) rename {res => src/main/resources}/img/portal/green/091.png (100%) rename {res => src/main/resources}/img/portal/green/092.png (100%) rename {res => src/main/resources}/img/portal/green/093.png (100%) rename {res => src/main/resources}/img/portal/green/094.png (100%) rename {res => src/main/resources}/img/portal/green/095.png (100%) rename {res => src/main/resources}/img/portal/green/096.png (100%) rename {res => src/main/resources}/img/portal/green/097.png (100%) rename {res => src/main/resources}/img/portal/green/098.png (100%) rename {res => src/main/resources}/img/portal/green/099.png (100%) rename {res => src/main/resources}/img/portal/green/100.png (100%) rename {res => src/main/resources}/img/portal/green/101.png (100%) rename {res => src/main/resources}/img/portal/green/102.png (100%) rename {res => src/main/resources}/img/portal/green/103.png (100%) rename {res => src/main/resources}/img/portal/green/104.png (100%) rename {res => src/main/resources}/img/portal/green/105.png (100%) rename {res => src/main/resources}/img/portal/green/106.png (100%) rename {res => src/main/resources}/img/portal/green/107.png (100%) rename {res => src/main/resources}/img/portal/green/108.png (100%) rename {res => src/main/resources}/img/portal/green/109.png (100%) rename {res => src/main/resources}/img/portal/green/110.png (100%) rename {res => src/main/resources}/img/portal/green/111.png (100%) rename {res => src/main/resources}/img/portal/green/112.png (100%) rename {res => src/main/resources}/img/portal/green/113.png (100%) rename {res => src/main/resources}/img/portal/green/114.png (100%) rename {res => src/main/resources}/img/portal/green/115.png (100%) rename {res => src/main/resources}/img/portal/green/116.png (100%) rename {res => src/main/resources}/img/portal/green/117.png (100%) rename {res => src/main/resources}/img/portal/green/118.png (100%) rename {res => src/main/resources}/img/portal/green/119.png (100%) rename {res => src/main/resources}/img/textures/dungeon.png (100%) rename {res => src/main/resources}/scene.json (100%) rename {res => src/main/resources}/snd/EnemyAttack.wav (100%) rename {res => src/main/resources}/snd/GameLoop.wav (100%) rename {res => src/main/resources}/snd/GameOver.wav (100%) rename {res => src/main/resources}/snd/GetKey.wav (100%) rename {res => src/main/resources}/snd/OpenChest.wav (100%) rename {res => src/main/resources}/snd/Success.wav (100%) diff --git a/.gitignore b/.gitignore index 8570bc9..3afe6fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/out/ +/.gradle/ +/build/ /javadoc/ -/log/ -/lib/ +/log/ \ No newline at end of file diff --git a/.idea/.name b/.idea/.name index e5d0980..6de9339 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -Azaraka \ No newline at end of file +azaraka \ No newline at end of file diff --git a/.idea/artifacts/Azaraka.xml b/.idea/artifacts/Azaraka.xml deleted file mode 100644 index 39e2275..0000000 --- a/.idea/artifacts/Azaraka.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - $PROJECT_DIR$/out/artifacts/Azaraka - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/artifacts/Azaraka_standalone.xml b/.idea/artifacts/Azaraka_standalone.xml deleted file mode 100644 index 89ebdf8..0000000 --- a/.idea/artifacts/Azaraka_standalone.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - $PROJECT_DIR$/out/artifacts/Azaraka_standalone - - - - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..310e0f2 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/com_google_code_gson_gson_2_8_5.xml b/.idea/libraries/com_google_code_gson_gson_2_8_5.xml deleted file mode 100644 index f5763a9..0000000 --- a/.idea/libraries/com_google_code_gson_gson_2_8_5.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 59629bb..83f36b5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,11 +1,12 @@ + - - + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 78c88f1..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index decd15d..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Azaraka.iml b/Azaraka.iml deleted file mode 100644 index 146f756..0000000 --- a/Azaraka.iml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..7de1dc9 --- /dev/null +++ b/build.gradle @@ -0,0 +1,55 @@ +/* + * Copyright 2019 Chris Cromer + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +plugins { + id 'java' + id 'application' +} + +group 'cl.cromer.azaraka' +version '1.0.0' + +sourceCompatibility = 1.8 + +mainClassName = "cl.cromer.azaraka.Main" + +repositories { + mavenCentral() +} + +dependencies { + implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.2' +} + +jar { + manifest { + attributes "Main-Class": "$mainClassName", + 'Class-Path': configurations.default.files.collect { "$it.name" }.join(' ') + } + + // This adds the libs into the jar + /*from { + configurations.default.collect { it.isDirectory() ? it : zipTree(it) } + }*/ +} + +task copyDependencies(type: Copy) { + from configurations.default + into "$buildDir/libs" +} + +build.dependsOn(copyDependencies) +jar.dependsOn(copyDependencies) \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..87b738cbd051603d91cc39de6cb000dd98fe6b02 GIT binary patch literal 55190 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 z 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..6d57edc --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..60a8a6c --- /dev/null +++ b/settings.gradle @@ -0,0 +1,17 @@ +/* + * Copyright 2019 Chris Cromer + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +rootProject.name = 'azaraka' + diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF deleted file mode 100644 index 60e03f9..0000000 --- a/src/META-INF/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: cl.cromer.azaraka.Main -Class-Path: lib/gson-2.8.5.jar lib/junit-jupiter-5.5.2.jar lib/junit-jupiter-api-5.5 - .2.jar lib/apiguardian-api-1.1.0.jar lib/opentest4j-1.2.0.jar lib/junit-platform-co - mmons-1.5.2.jar lib/junit-jupiter-params-5.5.2.jar lib/junit-jupiter-engine-5.5 - .2.jar lib/junit-platform-engine-1.5.2.jar -Name: cl/cromer/game/ -Specification-Title: La Aventura de Azaraka -Specification-Version: 1.0 -Specification-Vendor: Chris Cromer -Implementation-Title: cl.cromer.azaraka -Implementation-Version: build1 -Implementation-Vendor: Chris Cromer -Name: cl/cromer/game/ -Sealed: true diff --git a/src/cl/cromer/azaraka/Celda.java b/src/main/java/cl/cromer/azaraka/Celda.java similarity index 97% rename from src/cl/cromer/azaraka/Celda.java rename to src/main/java/cl/cromer/azaraka/Celda.java index 7377c9f..ec4ed66 100644 --- a/src/cl/cromer/azaraka/Celda.java +++ b/src/main/java/cl/cromer/azaraka/Celda.java @@ -57,10 +57,11 @@ public class Celda extends JComponent implements Constantes { /** * Initialize the cell with its coordinates + * * @param xPixels The x graphical coordinate * @param yPixels The y graphical coordinate - * @param x The x coordinate of the cell - * @param y The y coordinate of the cell + * @param x The x coordinate of the cell + * @param y The y coordinate of the cell */ public Celda(int xPixels, int yPixels, int x, int y) { this.xPixels = xPixels; @@ -135,6 +136,7 @@ public class Celda extends JComponent implements Constantes { /** * Override the paintComponent method of JComponent to paint the cell based on type + * * @param g The graphics object to paint */ @Override @@ -144,6 +146,7 @@ public class Celda extends JComponent implements Constantes { /** * Override the update method of JComponent to do double buffering + * * @param g The graphics object to paint */ @Override diff --git a/src/cl/cromer/azaraka/Constantes.java b/src/main/java/cl/cromer/azaraka/Constantes.java similarity index 99% rename from src/cl/cromer/azaraka/Constantes.java rename to src/main/java/cl/cromer/azaraka/Constantes.java index 514e388..46e5eeb 100644 --- a/src/cl/cromer/azaraka/Constantes.java +++ b/src/main/java/cl/cromer/azaraka/Constantes.java @@ -34,35 +34,6 @@ public interface Constantes { * The name of the game */ String TITLE = "La Aventura de Azaraka"; - - /** - * Get a logger object to use for debugging - * - * @param logClass The class that is in need of a logger - * @param logLevel What log level to use - * @return Returns the logger - */ - default Logger getLogger(Class logClass, LogLevel logLevel) { - String className = logClass.getName(); - Logger logger; - if (GLOBAL_LOG) { - logger = Logger.getGlobal(); - } - else { - logger = Logger.getLogger(className); - } - if (logger.getHandlers().length == 0) { - initializeLogger(logClass); - } - if (GLOBAL_LOG) { - logger.setLevel(LogLevel.GLOBAL.getLevel()); - } - else { - logger.setLevel(logLevel.getLevel()); - } - return logger; - } - /** * Use a global log if true or individual logs if false */ @@ -144,6 +115,34 @@ public interface Constantes { */ Font FONT = new Font("monospaced", Font.PLAIN, FONT_SIZE); + /** + * Get a logger object to use for debugging + * + * @param logClass The class that is in need of a logger + * @param logLevel What log level to use + * @return Returns the logger + */ + default Logger getLogger(Class logClass, LogLevel logLevel) { + String className = logClass.getName(); + Logger logger; + if (GLOBAL_LOG) { + logger = Logger.getGlobal(); + } + else { + logger = Logger.getLogger(className); + } + if (logger.getHandlers().length == 0) { + initializeLogger(logClass); + } + if (GLOBAL_LOG) { + logger.setLevel(LogLevel.GLOBAL.getLevel()); + } + else { + logger.setLevel(logLevel.getLevel()); + } + return logger; + } + /** * Generate a random number between given min and max * diff --git a/src/cl/cromer/azaraka/Escenario.java b/src/main/java/cl/cromer/azaraka/Escenario.java similarity index 99% rename from src/cl/cromer/azaraka/Escenario.java rename to src/main/java/cl/cromer/azaraka/Escenario.java index 1088238..1d86847 100644 --- a/src/cl/cromer/azaraka/Escenario.java +++ b/src/main/java/cl/cromer/azaraka/Escenario.java @@ -55,6 +55,10 @@ public class Escenario extends JComponent implements Constantes { * The cells of the game */ private final Celda[][] celdas; + /** + * The logger + */ + private final Logger logger; /** * A collection of tiles that can be used in the scene */ @@ -63,10 +67,6 @@ public class Escenario extends JComponent implements Constantes { * Whether or not the door is closed yet */ private boolean doorClosed = false; - /** - * The logger - */ - private final Logger logger; /** * Initialize the scene @@ -463,6 +463,7 @@ public class Escenario extends JComponent implements Constantes { /** * Get the parent canvas of this scene + * * @return Returns the parent canvas */ public Lienzo getCanvas() { diff --git a/src/cl/cromer/azaraka/Lienzo.java b/src/main/java/cl/cromer/azaraka/Lienzo.java similarity index 99% rename from src/cl/cromer/azaraka/Lienzo.java rename to src/main/java/cl/cromer/azaraka/Lienzo.java index 0906a9b..768a284 100644 --- a/src/cl/cromer/azaraka/Lienzo.java +++ b/src/main/java/cl/cromer/azaraka/Lienzo.java @@ -40,22 +40,10 @@ public class Lienzo extends Canvas implements Constantes { * The game scene */ private final Escenario escenario; - /** - * The graphics buffer - */ - private Graphics graphicBuffer; - /** - * The image buffer - */ - private Image imageBuffer; /** * The threads for the objects */ private final HashMap threads = new HashMap<>(); - /** - * The player - */ - private Player player; /** * The enemies */ @@ -68,10 +56,6 @@ public class Lienzo extends Canvas implements Constantes { * The chests */ private final ArrayList chests = new ArrayList<>(); - /** - * The magic portal - */ - private Portal portal; /** * The logger */ @@ -80,6 +64,22 @@ public class Lienzo extends Canvas implements Constantes { * The game over animation */ private final Animation gameOverAnimation; + /** + * The graphics buffer + */ + private Graphics graphicBuffer; + /** + * The image buffer + */ + private Image imageBuffer; + /** + * The player + */ + private Player player; + /** + * The magic portal + */ + private Portal portal; /** * The hearts animation */ @@ -196,6 +196,7 @@ public class Lienzo extends Canvas implements Constantes { /** * Override the paint method of Canvas to paint all the scene components + * * @param g The graphics object to paint */ @Override diff --git a/src/cl/cromer/azaraka/Main.java b/src/main/java/cl/cromer/azaraka/Main.java similarity index 97% rename from src/cl/cromer/azaraka/Main.java rename to src/main/java/cl/cromer/azaraka/Main.java index 6c62e58..61a335d 100644 --- a/src/cl/cromer/azaraka/Main.java +++ b/src/main/java/cl/cromer/azaraka/Main.java @@ -37,9 +37,10 @@ public class Main implements Constantes { /** * Open the main window + * * @param args The arguments passed to the application */ - public static void main (String[]args) { + public static void main(String[] args) { new Main(); } diff --git a/src/cl/cromer/azaraka/VentanaPrincipal.java b/src/main/java/cl/cromer/azaraka/VentanaPrincipal.java similarity index 100% rename from src/cl/cromer/azaraka/VentanaPrincipal.java rename to src/main/java/cl/cromer/azaraka/VentanaPrincipal.java diff --git a/src/cl/cromer/azaraka/json/Cell.java b/src/main/java/cl/cromer/azaraka/json/Cell.java similarity index 100% rename from src/cl/cromer/azaraka/json/Cell.java rename to src/main/java/cl/cromer/azaraka/json/Cell.java diff --git a/src/cl/cromer/azaraka/json/Json.java b/src/main/java/cl/cromer/azaraka/json/Json.java similarity index 100% rename from src/cl/cromer/azaraka/json/Json.java rename to src/main/java/cl/cromer/azaraka/json/Json.java diff --git a/src/cl/cromer/azaraka/json/package-info.java b/src/main/java/cl/cromer/azaraka/json/package-info.java similarity index 100% rename from src/cl/cromer/azaraka/json/package-info.java rename to src/main/java/cl/cromer/azaraka/json/package-info.java diff --git a/src/cl/cromer/azaraka/logging/HtmlFormatter.java b/src/main/java/cl/cromer/azaraka/logging/HtmlFormatter.java similarity index 100% rename from src/cl/cromer/azaraka/logging/HtmlFormatter.java rename to src/main/java/cl/cromer/azaraka/logging/HtmlFormatter.java diff --git a/src/cl/cromer/azaraka/logging/StringUtils.java b/src/main/java/cl/cromer/azaraka/logging/StringUtils.java similarity index 100% rename from src/cl/cromer/azaraka/logging/StringUtils.java rename to src/main/java/cl/cromer/azaraka/logging/StringUtils.java diff --git a/src/cl/cromer/azaraka/logging/package-info.java b/src/main/java/cl/cromer/azaraka/logging/package-info.java similarity index 100% rename from src/cl/cromer/azaraka/logging/package-info.java rename to src/main/java/cl/cromer/azaraka/logging/package-info.java diff --git a/src/cl/cromer/azaraka/object/Chest.java b/src/main/java/cl/cromer/azaraka/object/Chest.java similarity index 98% rename from src/cl/cromer/azaraka/object/Chest.java rename to src/main/java/cl/cromer/azaraka/object/Chest.java index 5332d76..bee500b 100644 --- a/src/cl/cromer/azaraka/object/Chest.java +++ b/src/main/java/cl/cromer/azaraka/object/Chest.java @@ -40,8 +40,9 @@ public class Chest extends Object implements Constantes { /** * Initialize the chest + * * @param escenario The scene the chest is in - * @param celda The cell that contains the chest + * @param celda The cell that contains the chest */ public Chest(Escenario escenario, Celda celda) { super(escenario, celda); @@ -91,19 +92,6 @@ public class Chest extends Object implements Constantes { return state; } - /** - * Play the chest opening sound - */ - private void playChestOpenSound() { - try { - sound.setVolume(getEscenario().getCanvas().getVolume()); - sound.play(); - } - catch (SoundException e) { - getLogger().warning(e.getMessage()); - } - } - /** * Sets the state of the chest * @@ -130,6 +118,19 @@ public class Chest extends Object implements Constantes { } } + /** + * Play the chest opening sound + */ + private void playChestOpenSound() { + try { + sound.setVolume(getEscenario().getCanvas().getVolume()); + sound.play(); + } + catch (SoundException e) { + getLogger().warning(e.getMessage()); + } + } + /** * Animate the chest opening */ diff --git a/src/cl/cromer/azaraka/object/Enemy.java b/src/main/java/cl/cromer/azaraka/object/Enemy.java similarity index 98% rename from src/cl/cromer/azaraka/object/Enemy.java rename to src/main/java/cl/cromer/azaraka/object/Enemy.java index 658e784..c8ec09e 100644 --- a/src/cl/cromer/azaraka/object/Enemy.java +++ b/src/main/java/cl/cromer/azaraka/object/Enemy.java @@ -30,6 +30,10 @@ import java.util.concurrent.locks.Lock; * This class handles the enemy object */ public class Enemy extends Object implements Constantes { + /** + * The lock helps prevent race conditions when checking positioning + */ + private final Lock lock; /** * The current direction the enemy is facing */ @@ -38,10 +42,6 @@ public class Enemy extends Object implements Constantes { * The speed of the enemy */ private int speed = 500; - /** - * The lock helps prevent race conditions when checking positioning - */ - private final Lock lock; /** * The enemy attack sound */ @@ -51,8 +51,8 @@ public class Enemy extends Object implements Constantes { * Initialize the enemy * * @param escenario The scene the enemy is in - * @param celda The cell this enemy is in - * @param lock The lock used to prevent the threads from conflicting + * @param celda The cell this enemy is in + * @param lock The lock used to prevent the threads from conflicting */ public Enemy(Escenario escenario, Celda celda, Lock lock) { super(escenario, celda); diff --git a/src/cl/cromer/azaraka/object/Gem.java b/src/main/java/cl/cromer/azaraka/object/Gem.java similarity index 100% rename from src/cl/cromer/azaraka/object/Gem.java rename to src/main/java/cl/cromer/azaraka/object/Gem.java index 59f425d..8c8d876 100644 --- a/src/cl/cromer/azaraka/object/Gem.java +++ b/src/main/java/cl/cromer/azaraka/object/Gem.java @@ -27,6 +27,16 @@ public class Gem extends Object { */ private State state = State.TAINTED; + /** + * Initialize the gem object + * + * @param escenario The scene the gem is in + * @param celda The cell the gem is in + */ + public Gem(Escenario escenario, Celda celda) { + super(escenario, celda); + } + /** * The possible states of the gem */ @@ -40,14 +50,4 @@ public class Gem extends Object { */ PURIFIED } - - /** - * Initialize the gem object - * - * @param escenario The scene the gem is in - * @param celda The cell the gem is in - */ - public Gem(Escenario escenario, Celda celda) { - super(escenario, celda); - } } diff --git a/src/cl/cromer/azaraka/object/Key.java b/src/main/java/cl/cromer/azaraka/object/Key.java similarity index 100% rename from src/cl/cromer/azaraka/object/Key.java rename to src/main/java/cl/cromer/azaraka/object/Key.java diff --git a/src/cl/cromer/azaraka/object/Object.java b/src/main/java/cl/cromer/azaraka/object/Object.java similarity index 100% rename from src/cl/cromer/azaraka/object/Object.java rename to src/main/java/cl/cromer/azaraka/object/Object.java index ef12775..4a1c2c2 100644 --- a/src/cl/cromer/azaraka/object/Object.java +++ b/src/main/java/cl/cromer/azaraka/object/Object.java @@ -29,6 +29,10 @@ import java.util.logging.Logger; * All game objects extend this class */ public class Object implements Runnable { + /** + * The scene the object is in + */ + private final Escenario escenario; /** * The current x position of the object */ @@ -37,10 +41,6 @@ public class Object implements Runnable { * The current y position of the object */ private int y; - /** - * The scene the object is in - */ - private final Escenario escenario; /** * The cell the object is in */ @@ -129,6 +129,15 @@ public class Object implements Runnable { return celda; } + /** + * Get the cell the object is in + * + * @param celda The cell + */ + protected void setCelda(Celda celda) { + this.celda = celda; + } + /** * Get the current animation * @@ -212,15 +221,6 @@ public class Object implements Runnable { } } - /** - * Get the cell the object is in - * - * @param celda The cell - */ - protected void setCelda(Celda celda) { - this.celda = celda; - } - /** * Get the logger * diff --git a/src/cl/cromer/azaraka/object/Obstacle.java b/src/main/java/cl/cromer/azaraka/object/Obstacle.java similarity index 100% rename from src/cl/cromer/azaraka/object/Obstacle.java rename to src/main/java/cl/cromer/azaraka/object/Obstacle.java diff --git a/src/cl/cromer/azaraka/object/Player.java b/src/main/java/cl/cromer/azaraka/object/Player.java similarity index 100% rename from src/cl/cromer/azaraka/object/Player.java rename to src/main/java/cl/cromer/azaraka/object/Player.java index 41bd96a..2439d7b 100644 --- a/src/cl/cromer/azaraka/object/Player.java +++ b/src/main/java/cl/cromer/azaraka/object/Player.java @@ -32,14 +32,14 @@ public class Player extends Object implements Constantes { * The maximum health of the player */ public final static int MAX_HEALTH = 8; - /** - * The current health of the player - */ - private int health = MAX_HEALTH; /** * Objects that the player is carrying */ private final ArrayList carrying = new ArrayList<>(); + /** + * The current health of the player + */ + private int health = MAX_HEALTH; /** * Initialize the player diff --git a/src/cl/cromer/azaraka/object/Portal.java b/src/main/java/cl/cromer/azaraka/object/Portal.java similarity index 99% rename from src/cl/cromer/azaraka/object/Portal.java rename to src/main/java/cl/cromer/azaraka/object/Portal.java index 9c3a030..52dab4c 100644 --- a/src/cl/cromer/azaraka/object/Portal.java +++ b/src/main/java/cl/cromer/azaraka/object/Portal.java @@ -42,7 +42,7 @@ public class Portal extends Object implements Constantes { * Initialize the portal * * @param escenario The scene that contains the portal - * @param celda The cell the portal is in + * @param celda The cell the portal is in */ public Portal(Escenario escenario, Celda celda) { super(escenario, celda); diff --git a/src/cl/cromer/azaraka/object/package-info.java b/src/main/java/cl/cromer/azaraka/object/package-info.java similarity index 100% rename from src/cl/cromer/azaraka/object/package-info.java rename to src/main/java/cl/cromer/azaraka/object/package-info.java diff --git a/src/cl/cromer/azaraka/package-info.java b/src/main/java/cl/cromer/azaraka/package-info.java similarity index 100% rename from src/cl/cromer/azaraka/package-info.java rename to src/main/java/cl/cromer/azaraka/package-info.java diff --git a/src/cl/cromer/azaraka/panel/Config.java b/src/main/java/cl/cromer/azaraka/panel/Config.java similarity index 100% rename from src/cl/cromer/azaraka/panel/Config.java rename to src/main/java/cl/cromer/azaraka/panel/Config.java diff --git a/src/cl/cromer/azaraka/panel/Game.java b/src/main/java/cl/cromer/azaraka/panel/Game.java similarity index 100% rename from src/cl/cromer/azaraka/panel/Game.java rename to src/main/java/cl/cromer/azaraka/panel/Game.java diff --git a/src/cl/cromer/azaraka/panel/package-info.java b/src/main/java/cl/cromer/azaraka/panel/package-info.java similarity index 100% rename from src/cl/cromer/azaraka/panel/package-info.java rename to src/main/java/cl/cromer/azaraka/panel/package-info.java diff --git a/src/cl/cromer/azaraka/sound/Sound.java b/src/main/java/cl/cromer/azaraka/sound/Sound.java similarity index 99% rename from src/cl/cromer/azaraka/sound/Sound.java rename to src/main/java/cl/cromer/azaraka/sound/Sound.java index 09e3c4b..c9e1cc7 100644 --- a/src/cl/cromer/azaraka/sound/Sound.java +++ b/src/main/java/cl/cromer/azaraka/sound/Sound.java @@ -27,10 +27,6 @@ import java.util.logging.Logger; * This class handles sound */ public class Sound implements Constantes { - /** - * The sound clip to play - */ - private Clip sound; /** * The path to the sound */ @@ -39,6 +35,10 @@ public class Sound implements Constantes { * The logger */ private final Logger logger; + /** + * The sound clip to play + */ + private Clip sound; /** * Load the sound @@ -71,6 +71,7 @@ public class Sound implements Constantes { /** * Play the sound + * * @throws SoundException Thrown if the sound clip is null */ public void play() throws SoundException { @@ -104,6 +105,7 @@ public class Sound implements Constantes { /** * Stop the sound + * * @throws SoundException Thrown if the sound clip is null */ public void stop() throws SoundException { @@ -119,6 +121,7 @@ public class Sound implements Constantes { /** * Set the number of loops to play + * * @param loops The number of loops, should be n-1 * @throws SoundException Thrown if the sound is null */ diff --git a/src/cl/cromer/azaraka/sound/SoundException.java b/src/main/java/cl/cromer/azaraka/sound/SoundException.java similarity index 100% rename from src/cl/cromer/azaraka/sound/SoundException.java rename to src/main/java/cl/cromer/azaraka/sound/SoundException.java diff --git a/src/cl/cromer/azaraka/sound/package-info.java b/src/main/java/cl/cromer/azaraka/sound/package-info.java similarity index 100% rename from src/cl/cromer/azaraka/sound/package-info.java rename to src/main/java/cl/cromer/azaraka/sound/package-info.java diff --git a/src/cl/cromer/azaraka/sprite/Animation.java b/src/main/java/cl/cromer/azaraka/sprite/Animation.java similarity index 97% rename from src/cl/cromer/azaraka/sprite/Animation.java rename to src/main/java/cl/cromer/azaraka/sprite/Animation.java index 7cf80cf..bb8319f 100644 --- a/src/cl/cromer/azaraka/sprite/Animation.java +++ b/src/main/java/cl/cromer/azaraka/sprite/Animation.java @@ -29,6 +29,14 @@ import java.util.logging.Logger; * This class handles loading the images and animating the sprite */ public class Animation implements Cloneable, Constantes { + /** + * The collection of all the images that make up the object + */ + private final HashMap> imageHash; + /** + * The logger + */ + private final Logger logger; /** * The current frame the sprite should be showing */ @@ -45,14 +53,6 @@ public class Animation implements Cloneable, Constantes { * The direction of the image to show */ private Direction currentDirection = Direction.NONE; - /** - * The collection of all the images that make up the object - */ - private final HashMap> imageHash; - /** - * The logger - */ - private final Logger logger; /** * Initialize the sprite @@ -65,8 +65,8 @@ public class Animation implements Cloneable, Constantes { /** * Scale an image * - * @param image The image to scale - * @param width The new width + * @param image The image to scale + * @param width The new width * @param height The new height * @return Returns the scaled image */ @@ -141,7 +141,7 @@ public class Animation implements Cloneable, Constantes { * Add an image to the animation * * @param direction The direction to add the image to - * @param path The path to the sprite e.g. res/player/image.png + * @param path The path to the sprite e.g. res/player/image.png */ public void addImage(Direction direction, String path) { try { @@ -157,7 +157,7 @@ public class Animation implements Cloneable, Constantes { /** * Add an image to the animation * - * @param direction The direction to add the image to + * @param direction The direction to add the image to * @param bufferedImage The path to the sprite e.g. res/player/image.png */ public void addImage(Direction direction, BufferedImage bufferedImage) { diff --git a/src/cl/cromer/azaraka/sprite/AnimationException.java b/src/main/java/cl/cromer/azaraka/sprite/AnimationException.java similarity index 100% rename from src/cl/cromer/azaraka/sprite/AnimationException.java rename to src/main/java/cl/cromer/azaraka/sprite/AnimationException.java diff --git a/src/cl/cromer/azaraka/sprite/Sheet.java b/src/main/java/cl/cromer/azaraka/sprite/Sheet.java similarity index 97% rename from src/cl/cromer/azaraka/sprite/Sheet.java rename to src/main/java/cl/cromer/azaraka/sprite/Sheet.java index d856030..e697e2e 100644 --- a/src/cl/cromer/azaraka/sprite/Sheet.java +++ b/src/main/java/cl/cromer/azaraka/sprite/Sheet.java @@ -35,9 +35,9 @@ public class Sheet implements Constantes { /** * Initialize the texture collection * - * @param path The path to the image + * @param path The path to the image * @param height The height of the textures in the image - * @param width The width of the textures in the image + * @param width The width of the textures in the image */ public Sheet(String path, int height, int width) { images = new ArrayList<>(); @@ -63,8 +63,8 @@ public class Sheet implements Constantes { /** * Returns the selected texture * - * @return Returns the current texture * @param textureNumber The texture to get from the collection + * @return Returns the current texture * @throws SheetException Thrown when there are no images in the texture collection */ public BufferedImage getTexture(int textureNumber) throws SheetException { diff --git a/src/cl/cromer/azaraka/sprite/SheetException.java b/src/main/java/cl/cromer/azaraka/sprite/SheetException.java similarity index 100% rename from src/cl/cromer/azaraka/sprite/SheetException.java rename to src/main/java/cl/cromer/azaraka/sprite/SheetException.java diff --git a/src/cl/cromer/azaraka/sprite/package-info.java b/src/main/java/cl/cromer/azaraka/sprite/package-info.java similarity index 100% rename from src/cl/cromer/azaraka/sprite/package-info.java rename to src/main/java/cl/cromer/azaraka/sprite/package-info.java diff --git a/res/img/chest/chests.png b/src/main/resources/img/chest/chests.png similarity index 100% rename from res/img/chest/chests.png rename to src/main/resources/img/chest/chests.png diff --git a/res/img/enemy/chara4.png b/src/main/resources/img/enemy/chara4.png similarity index 100% rename from res/img/enemy/chara4.png rename to src/main/resources/img/enemy/chara4.png diff --git a/res/img/enemy/emote4.png b/src/main/resources/img/enemy/emote4.png similarity index 100% rename from res/img/enemy/emote4.png rename to src/main/resources/img/enemy/emote4.png diff --git a/res/img/gameover/gameover.png b/src/main/resources/img/gameover/gameover.png similarity index 100% rename from res/img/gameover/gameover.png rename to src/main/resources/img/gameover/gameover.png diff --git a/res/img/heart/heart0.png b/src/main/resources/img/heart/heart0.png similarity index 100% rename from res/img/heart/heart0.png rename to src/main/resources/img/heart/heart0.png diff --git a/res/img/heart/heart1.png b/src/main/resources/img/heart/heart1.png similarity index 100% rename from res/img/heart/heart1.png rename to src/main/resources/img/heart/heart1.png diff --git a/res/img/heart/heart2.png b/src/main/resources/img/heart/heart2.png similarity index 100% rename from res/img/heart/heart2.png rename to src/main/resources/img/heart/heart2.png diff --git a/res/img/heart/heart3.png b/src/main/resources/img/heart/heart3.png similarity index 100% rename from res/img/heart/heart3.png rename to src/main/resources/img/heart/heart3.png diff --git a/res/img/heart/heart4.png b/src/main/resources/img/heart/heart4.png similarity index 100% rename from res/img/heart/heart4.png rename to src/main/resources/img/heart/heart4.png diff --git a/res/img/icon.png b/src/main/resources/img/icon.png similarity index 100% rename from res/img/icon.png rename to src/main/resources/img/icon.png diff --git a/res/img/key/key.png b/src/main/resources/img/key/key.png similarity index 100% rename from res/img/key/key.png rename to src/main/resources/img/key/key.png diff --git a/res/img/player/chara2.png b/src/main/resources/img/player/chara2.png similarity index 100% rename from res/img/player/chara2.png rename to src/main/resources/img/player/chara2.png diff --git a/res/img/player/emote2.png b/src/main/resources/img/player/emote2.png similarity index 100% rename from res/img/player/emote2.png rename to src/main/resources/img/player/emote2.png diff --git a/res/img/portal/gray/000.png b/src/main/resources/img/portal/gray/000.png similarity index 100% rename from res/img/portal/gray/000.png rename to src/main/resources/img/portal/gray/000.png diff --git a/res/img/portal/gray/001.png b/src/main/resources/img/portal/gray/001.png similarity index 100% rename from res/img/portal/gray/001.png rename to src/main/resources/img/portal/gray/001.png diff --git a/res/img/portal/gray/002.png b/src/main/resources/img/portal/gray/002.png similarity index 100% rename from res/img/portal/gray/002.png rename to src/main/resources/img/portal/gray/002.png diff --git a/res/img/portal/gray/003.png b/src/main/resources/img/portal/gray/003.png similarity index 100% rename from res/img/portal/gray/003.png rename to src/main/resources/img/portal/gray/003.png diff --git a/res/img/portal/gray/004.png b/src/main/resources/img/portal/gray/004.png similarity index 100% rename from res/img/portal/gray/004.png rename to src/main/resources/img/portal/gray/004.png diff --git a/res/img/portal/gray/005.png b/src/main/resources/img/portal/gray/005.png similarity index 100% rename from res/img/portal/gray/005.png rename to src/main/resources/img/portal/gray/005.png diff --git a/res/img/portal/gray/006.png b/src/main/resources/img/portal/gray/006.png similarity index 100% rename from res/img/portal/gray/006.png rename to src/main/resources/img/portal/gray/006.png diff --git a/res/img/portal/gray/007.png b/src/main/resources/img/portal/gray/007.png similarity index 100% rename from res/img/portal/gray/007.png rename to src/main/resources/img/portal/gray/007.png diff --git a/res/img/portal/gray/008.png b/src/main/resources/img/portal/gray/008.png similarity index 100% rename from res/img/portal/gray/008.png rename to src/main/resources/img/portal/gray/008.png diff --git a/res/img/portal/gray/009.png b/src/main/resources/img/portal/gray/009.png similarity index 100% rename from res/img/portal/gray/009.png rename to src/main/resources/img/portal/gray/009.png diff --git a/res/img/portal/gray/010.png b/src/main/resources/img/portal/gray/010.png similarity index 100% rename from res/img/portal/gray/010.png rename to src/main/resources/img/portal/gray/010.png diff --git a/res/img/portal/gray/011.png b/src/main/resources/img/portal/gray/011.png similarity index 100% rename from res/img/portal/gray/011.png rename to src/main/resources/img/portal/gray/011.png diff --git a/res/img/portal/gray/012.png b/src/main/resources/img/portal/gray/012.png similarity index 100% rename from res/img/portal/gray/012.png rename to src/main/resources/img/portal/gray/012.png diff --git a/res/img/portal/gray/013.png b/src/main/resources/img/portal/gray/013.png similarity index 100% rename from res/img/portal/gray/013.png rename to src/main/resources/img/portal/gray/013.png diff --git a/res/img/portal/gray/014.png b/src/main/resources/img/portal/gray/014.png similarity index 100% rename from res/img/portal/gray/014.png rename to src/main/resources/img/portal/gray/014.png diff --git a/res/img/portal/gray/015.png b/src/main/resources/img/portal/gray/015.png similarity index 100% rename from res/img/portal/gray/015.png rename to src/main/resources/img/portal/gray/015.png diff --git a/res/img/portal/gray/016.png b/src/main/resources/img/portal/gray/016.png similarity index 100% rename from res/img/portal/gray/016.png rename to src/main/resources/img/portal/gray/016.png diff --git a/res/img/portal/gray/017.png b/src/main/resources/img/portal/gray/017.png similarity index 100% rename from res/img/portal/gray/017.png rename to src/main/resources/img/portal/gray/017.png diff --git a/res/img/portal/gray/018.png b/src/main/resources/img/portal/gray/018.png similarity index 100% rename from res/img/portal/gray/018.png rename to src/main/resources/img/portal/gray/018.png diff --git a/res/img/portal/gray/019.png b/src/main/resources/img/portal/gray/019.png similarity index 100% rename from res/img/portal/gray/019.png rename to src/main/resources/img/portal/gray/019.png diff --git a/res/img/portal/gray/020.png b/src/main/resources/img/portal/gray/020.png similarity index 100% rename from res/img/portal/gray/020.png rename to src/main/resources/img/portal/gray/020.png diff --git a/res/img/portal/gray/021.png b/src/main/resources/img/portal/gray/021.png similarity index 100% rename from res/img/portal/gray/021.png rename to src/main/resources/img/portal/gray/021.png diff --git a/res/img/portal/gray/022.png b/src/main/resources/img/portal/gray/022.png similarity index 100% rename from res/img/portal/gray/022.png rename to src/main/resources/img/portal/gray/022.png diff --git a/res/img/portal/gray/023.png b/src/main/resources/img/portal/gray/023.png similarity index 100% rename from res/img/portal/gray/023.png rename to src/main/resources/img/portal/gray/023.png diff --git a/res/img/portal/gray/024.png b/src/main/resources/img/portal/gray/024.png similarity index 100% rename from res/img/portal/gray/024.png rename to src/main/resources/img/portal/gray/024.png diff --git a/res/img/portal/gray/025.png b/src/main/resources/img/portal/gray/025.png similarity index 100% rename from res/img/portal/gray/025.png rename to src/main/resources/img/portal/gray/025.png diff --git a/res/img/portal/gray/026.png b/src/main/resources/img/portal/gray/026.png similarity index 100% rename from res/img/portal/gray/026.png rename to src/main/resources/img/portal/gray/026.png diff --git a/res/img/portal/gray/027.png b/src/main/resources/img/portal/gray/027.png similarity index 100% rename from res/img/portal/gray/027.png rename to src/main/resources/img/portal/gray/027.png diff --git a/res/img/portal/gray/028.png b/src/main/resources/img/portal/gray/028.png similarity index 100% rename from res/img/portal/gray/028.png rename to src/main/resources/img/portal/gray/028.png diff --git a/res/img/portal/gray/029.png b/src/main/resources/img/portal/gray/029.png similarity index 100% rename from res/img/portal/gray/029.png rename to src/main/resources/img/portal/gray/029.png diff --git a/res/img/portal/gray/030.png b/src/main/resources/img/portal/gray/030.png similarity index 100% rename from res/img/portal/gray/030.png rename to src/main/resources/img/portal/gray/030.png diff --git a/res/img/portal/gray/031.png b/src/main/resources/img/portal/gray/031.png similarity index 100% rename from res/img/portal/gray/031.png rename to src/main/resources/img/portal/gray/031.png diff --git a/res/img/portal/gray/032.png b/src/main/resources/img/portal/gray/032.png similarity index 100% rename from res/img/portal/gray/032.png rename to src/main/resources/img/portal/gray/032.png diff --git a/res/img/portal/gray/033.png b/src/main/resources/img/portal/gray/033.png similarity index 100% rename from res/img/portal/gray/033.png rename to src/main/resources/img/portal/gray/033.png diff --git a/res/img/portal/gray/034.png b/src/main/resources/img/portal/gray/034.png similarity index 100% rename from res/img/portal/gray/034.png rename to src/main/resources/img/portal/gray/034.png diff --git a/res/img/portal/gray/035.png b/src/main/resources/img/portal/gray/035.png similarity index 100% rename from res/img/portal/gray/035.png rename to src/main/resources/img/portal/gray/035.png diff --git a/res/img/portal/gray/036.png b/src/main/resources/img/portal/gray/036.png similarity index 100% rename from res/img/portal/gray/036.png rename to src/main/resources/img/portal/gray/036.png diff --git a/res/img/portal/gray/037.png b/src/main/resources/img/portal/gray/037.png similarity index 100% rename from res/img/portal/gray/037.png rename to src/main/resources/img/portal/gray/037.png diff --git a/res/img/portal/gray/038.png b/src/main/resources/img/portal/gray/038.png similarity index 100% rename from res/img/portal/gray/038.png rename to src/main/resources/img/portal/gray/038.png diff --git a/res/img/portal/gray/039.png b/src/main/resources/img/portal/gray/039.png similarity index 100% rename from res/img/portal/gray/039.png rename to src/main/resources/img/portal/gray/039.png diff --git a/res/img/portal/gray/040.png b/src/main/resources/img/portal/gray/040.png similarity index 100% rename from res/img/portal/gray/040.png rename to src/main/resources/img/portal/gray/040.png diff --git a/res/img/portal/gray/041.png b/src/main/resources/img/portal/gray/041.png similarity index 100% rename from res/img/portal/gray/041.png rename to src/main/resources/img/portal/gray/041.png diff --git a/res/img/portal/gray/042.png b/src/main/resources/img/portal/gray/042.png similarity index 100% rename from res/img/portal/gray/042.png rename to src/main/resources/img/portal/gray/042.png diff --git a/res/img/portal/gray/043.png b/src/main/resources/img/portal/gray/043.png similarity index 100% rename from res/img/portal/gray/043.png rename to src/main/resources/img/portal/gray/043.png diff --git a/res/img/portal/gray/044.png b/src/main/resources/img/portal/gray/044.png similarity index 100% rename from res/img/portal/gray/044.png rename to src/main/resources/img/portal/gray/044.png diff --git a/res/img/portal/gray/045.png b/src/main/resources/img/portal/gray/045.png similarity index 100% rename from res/img/portal/gray/045.png rename to src/main/resources/img/portal/gray/045.png diff --git a/res/img/portal/gray/046.png b/src/main/resources/img/portal/gray/046.png similarity index 100% rename from res/img/portal/gray/046.png rename to src/main/resources/img/portal/gray/046.png diff --git a/res/img/portal/gray/047.png b/src/main/resources/img/portal/gray/047.png similarity index 100% rename from res/img/portal/gray/047.png rename to src/main/resources/img/portal/gray/047.png diff --git a/res/img/portal/gray/048.png b/src/main/resources/img/portal/gray/048.png similarity index 100% rename from res/img/portal/gray/048.png rename to src/main/resources/img/portal/gray/048.png diff --git a/res/img/portal/gray/049.png b/src/main/resources/img/portal/gray/049.png similarity index 100% rename from res/img/portal/gray/049.png rename to src/main/resources/img/portal/gray/049.png diff --git a/res/img/portal/gray/050.png b/src/main/resources/img/portal/gray/050.png similarity index 100% rename from res/img/portal/gray/050.png rename to src/main/resources/img/portal/gray/050.png diff --git a/res/img/portal/gray/051.png b/src/main/resources/img/portal/gray/051.png similarity index 100% rename from res/img/portal/gray/051.png rename to src/main/resources/img/portal/gray/051.png diff --git a/res/img/portal/gray/052.png b/src/main/resources/img/portal/gray/052.png similarity index 100% rename from res/img/portal/gray/052.png rename to src/main/resources/img/portal/gray/052.png diff --git a/res/img/portal/gray/053.png b/src/main/resources/img/portal/gray/053.png similarity index 100% rename from res/img/portal/gray/053.png rename to src/main/resources/img/portal/gray/053.png diff --git a/res/img/portal/gray/054.png b/src/main/resources/img/portal/gray/054.png similarity index 100% rename from res/img/portal/gray/054.png rename to src/main/resources/img/portal/gray/054.png diff --git a/res/img/portal/gray/055.png b/src/main/resources/img/portal/gray/055.png similarity index 100% rename from res/img/portal/gray/055.png rename to src/main/resources/img/portal/gray/055.png diff --git a/res/img/portal/gray/056.png b/src/main/resources/img/portal/gray/056.png similarity index 100% rename from res/img/portal/gray/056.png rename to src/main/resources/img/portal/gray/056.png diff --git a/res/img/portal/gray/057.png b/src/main/resources/img/portal/gray/057.png similarity index 100% rename from res/img/portal/gray/057.png rename to src/main/resources/img/portal/gray/057.png diff --git a/res/img/portal/gray/058.png b/src/main/resources/img/portal/gray/058.png similarity index 100% rename from res/img/portal/gray/058.png rename to src/main/resources/img/portal/gray/058.png diff --git a/res/img/portal/gray/059.png b/src/main/resources/img/portal/gray/059.png similarity index 100% rename from res/img/portal/gray/059.png rename to src/main/resources/img/portal/gray/059.png diff --git a/res/img/portal/gray/060.png b/src/main/resources/img/portal/gray/060.png similarity index 100% rename from res/img/portal/gray/060.png rename to src/main/resources/img/portal/gray/060.png diff --git a/res/img/portal/gray/061.png b/src/main/resources/img/portal/gray/061.png similarity index 100% rename from res/img/portal/gray/061.png rename to src/main/resources/img/portal/gray/061.png diff --git a/res/img/portal/gray/062.png b/src/main/resources/img/portal/gray/062.png similarity index 100% rename from res/img/portal/gray/062.png rename to src/main/resources/img/portal/gray/062.png diff --git a/res/img/portal/gray/063.png b/src/main/resources/img/portal/gray/063.png similarity index 100% rename from res/img/portal/gray/063.png rename to src/main/resources/img/portal/gray/063.png diff --git a/res/img/portal/gray/064.png b/src/main/resources/img/portal/gray/064.png similarity index 100% rename from res/img/portal/gray/064.png rename to src/main/resources/img/portal/gray/064.png diff --git a/res/img/portal/gray/065.png b/src/main/resources/img/portal/gray/065.png similarity index 100% rename from res/img/portal/gray/065.png rename to src/main/resources/img/portal/gray/065.png diff --git a/res/img/portal/gray/066.png b/src/main/resources/img/portal/gray/066.png similarity index 100% rename from res/img/portal/gray/066.png rename to src/main/resources/img/portal/gray/066.png diff --git a/res/img/portal/gray/067.png b/src/main/resources/img/portal/gray/067.png similarity index 100% rename from res/img/portal/gray/067.png rename to src/main/resources/img/portal/gray/067.png diff --git a/res/img/portal/gray/068.png b/src/main/resources/img/portal/gray/068.png similarity index 100% rename from res/img/portal/gray/068.png rename to src/main/resources/img/portal/gray/068.png diff --git a/res/img/portal/gray/069.png b/src/main/resources/img/portal/gray/069.png similarity index 100% rename from res/img/portal/gray/069.png rename to src/main/resources/img/portal/gray/069.png diff --git a/res/img/portal/gray/070.png b/src/main/resources/img/portal/gray/070.png similarity index 100% rename from res/img/portal/gray/070.png rename to src/main/resources/img/portal/gray/070.png diff --git a/res/img/portal/gray/071.png b/src/main/resources/img/portal/gray/071.png similarity index 100% rename from res/img/portal/gray/071.png rename to src/main/resources/img/portal/gray/071.png diff --git a/res/img/portal/gray/072.png b/src/main/resources/img/portal/gray/072.png similarity index 100% rename from res/img/portal/gray/072.png rename to src/main/resources/img/portal/gray/072.png diff --git a/res/img/portal/gray/073.png b/src/main/resources/img/portal/gray/073.png similarity index 100% rename from res/img/portal/gray/073.png rename to src/main/resources/img/portal/gray/073.png diff --git a/res/img/portal/gray/074.png b/src/main/resources/img/portal/gray/074.png similarity index 100% rename from res/img/portal/gray/074.png rename to src/main/resources/img/portal/gray/074.png diff --git a/res/img/portal/gray/075.png b/src/main/resources/img/portal/gray/075.png similarity index 100% rename from res/img/portal/gray/075.png rename to src/main/resources/img/portal/gray/075.png diff --git a/res/img/portal/gray/076.png b/src/main/resources/img/portal/gray/076.png similarity index 100% rename from res/img/portal/gray/076.png rename to src/main/resources/img/portal/gray/076.png diff --git a/res/img/portal/gray/077.png b/src/main/resources/img/portal/gray/077.png similarity index 100% rename from res/img/portal/gray/077.png rename to src/main/resources/img/portal/gray/077.png diff --git a/res/img/portal/gray/078.png b/src/main/resources/img/portal/gray/078.png similarity index 100% rename from res/img/portal/gray/078.png rename to src/main/resources/img/portal/gray/078.png diff --git a/res/img/portal/gray/079.png b/src/main/resources/img/portal/gray/079.png similarity index 100% rename from res/img/portal/gray/079.png rename to src/main/resources/img/portal/gray/079.png diff --git a/res/img/portal/gray/080.png b/src/main/resources/img/portal/gray/080.png similarity index 100% rename from res/img/portal/gray/080.png rename to src/main/resources/img/portal/gray/080.png diff --git a/res/img/portal/gray/081.png b/src/main/resources/img/portal/gray/081.png similarity index 100% rename from res/img/portal/gray/081.png rename to src/main/resources/img/portal/gray/081.png diff --git a/res/img/portal/gray/082.png b/src/main/resources/img/portal/gray/082.png similarity index 100% rename from res/img/portal/gray/082.png rename to src/main/resources/img/portal/gray/082.png diff --git a/res/img/portal/gray/083.png b/src/main/resources/img/portal/gray/083.png similarity index 100% rename from res/img/portal/gray/083.png rename to src/main/resources/img/portal/gray/083.png diff --git a/res/img/portal/gray/084.png b/src/main/resources/img/portal/gray/084.png similarity index 100% rename from res/img/portal/gray/084.png rename to src/main/resources/img/portal/gray/084.png diff --git a/res/img/portal/gray/085.png b/src/main/resources/img/portal/gray/085.png similarity index 100% rename from res/img/portal/gray/085.png rename to src/main/resources/img/portal/gray/085.png diff --git a/res/img/portal/gray/086.png b/src/main/resources/img/portal/gray/086.png similarity index 100% rename from res/img/portal/gray/086.png rename to src/main/resources/img/portal/gray/086.png diff --git a/res/img/portal/gray/087.png b/src/main/resources/img/portal/gray/087.png similarity index 100% rename from res/img/portal/gray/087.png rename to src/main/resources/img/portal/gray/087.png diff --git a/res/img/portal/gray/088.png b/src/main/resources/img/portal/gray/088.png similarity index 100% rename from res/img/portal/gray/088.png rename to src/main/resources/img/portal/gray/088.png diff --git a/res/img/portal/gray/089.png b/src/main/resources/img/portal/gray/089.png similarity index 100% rename from res/img/portal/gray/089.png rename to src/main/resources/img/portal/gray/089.png diff --git a/res/img/portal/gray/090.png b/src/main/resources/img/portal/gray/090.png similarity index 100% rename from res/img/portal/gray/090.png rename to src/main/resources/img/portal/gray/090.png diff --git a/res/img/portal/gray/091.png b/src/main/resources/img/portal/gray/091.png similarity index 100% rename from res/img/portal/gray/091.png rename to src/main/resources/img/portal/gray/091.png diff --git a/res/img/portal/gray/092.png b/src/main/resources/img/portal/gray/092.png similarity index 100% rename from res/img/portal/gray/092.png rename to src/main/resources/img/portal/gray/092.png diff --git a/res/img/portal/gray/093.png b/src/main/resources/img/portal/gray/093.png similarity index 100% rename from res/img/portal/gray/093.png rename to src/main/resources/img/portal/gray/093.png diff --git a/res/img/portal/gray/094.png b/src/main/resources/img/portal/gray/094.png similarity index 100% rename from res/img/portal/gray/094.png rename to src/main/resources/img/portal/gray/094.png diff --git a/res/img/portal/gray/095.png b/src/main/resources/img/portal/gray/095.png similarity index 100% rename from res/img/portal/gray/095.png rename to src/main/resources/img/portal/gray/095.png diff --git a/res/img/portal/gray/096.png b/src/main/resources/img/portal/gray/096.png similarity index 100% rename from res/img/portal/gray/096.png rename to src/main/resources/img/portal/gray/096.png diff --git a/res/img/portal/gray/097.png b/src/main/resources/img/portal/gray/097.png similarity index 100% rename from res/img/portal/gray/097.png rename to src/main/resources/img/portal/gray/097.png diff --git a/res/img/portal/gray/098.png b/src/main/resources/img/portal/gray/098.png similarity index 100% rename from res/img/portal/gray/098.png rename to src/main/resources/img/portal/gray/098.png diff --git a/res/img/portal/gray/099.png b/src/main/resources/img/portal/gray/099.png similarity index 100% rename from res/img/portal/gray/099.png rename to src/main/resources/img/portal/gray/099.png diff --git a/res/img/portal/gray/100.png b/src/main/resources/img/portal/gray/100.png similarity index 100% rename from res/img/portal/gray/100.png rename to src/main/resources/img/portal/gray/100.png diff --git a/res/img/portal/gray/101.png b/src/main/resources/img/portal/gray/101.png similarity index 100% rename from res/img/portal/gray/101.png rename to src/main/resources/img/portal/gray/101.png diff --git a/res/img/portal/gray/102.png b/src/main/resources/img/portal/gray/102.png similarity index 100% rename from res/img/portal/gray/102.png rename to src/main/resources/img/portal/gray/102.png diff --git a/res/img/portal/gray/103.png b/src/main/resources/img/portal/gray/103.png similarity index 100% rename from res/img/portal/gray/103.png rename to src/main/resources/img/portal/gray/103.png diff --git a/res/img/portal/gray/104.png b/src/main/resources/img/portal/gray/104.png similarity index 100% rename from res/img/portal/gray/104.png rename to src/main/resources/img/portal/gray/104.png diff --git a/res/img/portal/gray/105.png b/src/main/resources/img/portal/gray/105.png similarity index 100% rename from res/img/portal/gray/105.png rename to src/main/resources/img/portal/gray/105.png diff --git a/res/img/portal/gray/106.png b/src/main/resources/img/portal/gray/106.png similarity index 100% rename from res/img/portal/gray/106.png rename to src/main/resources/img/portal/gray/106.png diff --git a/res/img/portal/gray/107.png b/src/main/resources/img/portal/gray/107.png similarity index 100% rename from res/img/portal/gray/107.png rename to src/main/resources/img/portal/gray/107.png diff --git a/res/img/portal/gray/108.png b/src/main/resources/img/portal/gray/108.png similarity index 100% rename from res/img/portal/gray/108.png rename to src/main/resources/img/portal/gray/108.png diff --git a/res/img/portal/gray/109.png b/src/main/resources/img/portal/gray/109.png similarity index 100% rename from res/img/portal/gray/109.png rename to src/main/resources/img/portal/gray/109.png diff --git a/res/img/portal/gray/110.png b/src/main/resources/img/portal/gray/110.png similarity index 100% rename from res/img/portal/gray/110.png rename to src/main/resources/img/portal/gray/110.png diff --git a/res/img/portal/gray/111.png b/src/main/resources/img/portal/gray/111.png similarity index 100% rename from res/img/portal/gray/111.png rename to src/main/resources/img/portal/gray/111.png diff --git a/res/img/portal/gray/112.png b/src/main/resources/img/portal/gray/112.png similarity index 100% rename from res/img/portal/gray/112.png rename to src/main/resources/img/portal/gray/112.png diff --git a/res/img/portal/gray/113.png b/src/main/resources/img/portal/gray/113.png similarity index 100% rename from res/img/portal/gray/113.png rename to src/main/resources/img/portal/gray/113.png diff --git a/res/img/portal/gray/114.png b/src/main/resources/img/portal/gray/114.png similarity index 100% rename from res/img/portal/gray/114.png rename to src/main/resources/img/portal/gray/114.png diff --git a/res/img/portal/gray/115.png b/src/main/resources/img/portal/gray/115.png similarity index 100% rename from res/img/portal/gray/115.png rename to src/main/resources/img/portal/gray/115.png diff --git a/res/img/portal/gray/116.png b/src/main/resources/img/portal/gray/116.png similarity index 100% rename from res/img/portal/gray/116.png rename to src/main/resources/img/portal/gray/116.png diff --git a/res/img/portal/gray/117.png b/src/main/resources/img/portal/gray/117.png similarity index 100% rename from res/img/portal/gray/117.png rename to src/main/resources/img/portal/gray/117.png diff --git a/res/img/portal/gray/118.png b/src/main/resources/img/portal/gray/118.png similarity index 100% rename from res/img/portal/gray/118.png rename to src/main/resources/img/portal/gray/118.png diff --git a/res/img/portal/gray/119.png b/src/main/resources/img/portal/gray/119.png similarity index 100% rename from res/img/portal/gray/119.png rename to src/main/resources/img/portal/gray/119.png diff --git a/res/img/portal/green/000.png b/src/main/resources/img/portal/green/000.png similarity index 100% rename from res/img/portal/green/000.png rename to src/main/resources/img/portal/green/000.png diff --git a/res/img/portal/green/001.png b/src/main/resources/img/portal/green/001.png similarity index 100% rename from res/img/portal/green/001.png rename to src/main/resources/img/portal/green/001.png diff --git a/res/img/portal/green/002.png b/src/main/resources/img/portal/green/002.png similarity index 100% rename from res/img/portal/green/002.png rename to src/main/resources/img/portal/green/002.png diff --git a/res/img/portal/green/003.png b/src/main/resources/img/portal/green/003.png similarity index 100% rename from res/img/portal/green/003.png rename to src/main/resources/img/portal/green/003.png diff --git a/res/img/portal/green/004.png b/src/main/resources/img/portal/green/004.png similarity index 100% rename from res/img/portal/green/004.png rename to src/main/resources/img/portal/green/004.png diff --git a/res/img/portal/green/005.png b/src/main/resources/img/portal/green/005.png similarity index 100% rename from res/img/portal/green/005.png rename to src/main/resources/img/portal/green/005.png diff --git a/res/img/portal/green/006.png b/src/main/resources/img/portal/green/006.png similarity index 100% rename from res/img/portal/green/006.png rename to src/main/resources/img/portal/green/006.png diff --git a/res/img/portal/green/007.png b/src/main/resources/img/portal/green/007.png similarity index 100% rename from res/img/portal/green/007.png rename to src/main/resources/img/portal/green/007.png diff --git a/res/img/portal/green/008.png b/src/main/resources/img/portal/green/008.png similarity index 100% rename from res/img/portal/green/008.png rename to src/main/resources/img/portal/green/008.png diff --git a/res/img/portal/green/009.png b/src/main/resources/img/portal/green/009.png similarity index 100% rename from res/img/portal/green/009.png rename to src/main/resources/img/portal/green/009.png diff --git a/res/img/portal/green/010.png b/src/main/resources/img/portal/green/010.png similarity index 100% rename from res/img/portal/green/010.png rename to src/main/resources/img/portal/green/010.png diff --git a/res/img/portal/green/011.png b/src/main/resources/img/portal/green/011.png similarity index 100% rename from res/img/portal/green/011.png rename to src/main/resources/img/portal/green/011.png diff --git a/res/img/portal/green/012.png b/src/main/resources/img/portal/green/012.png similarity index 100% rename from res/img/portal/green/012.png rename to src/main/resources/img/portal/green/012.png diff --git a/res/img/portal/green/013.png b/src/main/resources/img/portal/green/013.png similarity index 100% rename from res/img/portal/green/013.png rename to src/main/resources/img/portal/green/013.png diff --git a/res/img/portal/green/014.png b/src/main/resources/img/portal/green/014.png similarity index 100% rename from res/img/portal/green/014.png rename to src/main/resources/img/portal/green/014.png diff --git a/res/img/portal/green/015.png b/src/main/resources/img/portal/green/015.png similarity index 100% rename from res/img/portal/green/015.png rename to src/main/resources/img/portal/green/015.png diff --git a/res/img/portal/green/016.png b/src/main/resources/img/portal/green/016.png similarity index 100% rename from res/img/portal/green/016.png rename to src/main/resources/img/portal/green/016.png diff --git a/res/img/portal/green/017.png b/src/main/resources/img/portal/green/017.png similarity index 100% rename from res/img/portal/green/017.png rename to src/main/resources/img/portal/green/017.png diff --git a/res/img/portal/green/018.png b/src/main/resources/img/portal/green/018.png similarity index 100% rename from res/img/portal/green/018.png rename to src/main/resources/img/portal/green/018.png diff --git a/res/img/portal/green/019.png b/src/main/resources/img/portal/green/019.png similarity index 100% rename from res/img/portal/green/019.png rename to src/main/resources/img/portal/green/019.png diff --git a/res/img/portal/green/020.png b/src/main/resources/img/portal/green/020.png similarity index 100% rename from res/img/portal/green/020.png rename to src/main/resources/img/portal/green/020.png diff --git a/res/img/portal/green/021.png b/src/main/resources/img/portal/green/021.png similarity index 100% rename from res/img/portal/green/021.png rename to src/main/resources/img/portal/green/021.png diff --git a/res/img/portal/green/022.png b/src/main/resources/img/portal/green/022.png similarity index 100% rename from res/img/portal/green/022.png rename to src/main/resources/img/portal/green/022.png diff --git a/res/img/portal/green/023.png b/src/main/resources/img/portal/green/023.png similarity index 100% rename from res/img/portal/green/023.png rename to src/main/resources/img/portal/green/023.png diff --git a/res/img/portal/green/024.png b/src/main/resources/img/portal/green/024.png similarity index 100% rename from res/img/portal/green/024.png rename to src/main/resources/img/portal/green/024.png diff --git a/res/img/portal/green/025.png b/src/main/resources/img/portal/green/025.png similarity index 100% rename from res/img/portal/green/025.png rename to src/main/resources/img/portal/green/025.png diff --git a/res/img/portal/green/026.png b/src/main/resources/img/portal/green/026.png similarity index 100% rename from res/img/portal/green/026.png rename to src/main/resources/img/portal/green/026.png diff --git a/res/img/portal/green/027.png b/src/main/resources/img/portal/green/027.png similarity index 100% rename from res/img/portal/green/027.png rename to src/main/resources/img/portal/green/027.png diff --git a/res/img/portal/green/028.png b/src/main/resources/img/portal/green/028.png similarity index 100% rename from res/img/portal/green/028.png rename to src/main/resources/img/portal/green/028.png diff --git a/res/img/portal/green/029.png b/src/main/resources/img/portal/green/029.png similarity index 100% rename from res/img/portal/green/029.png rename to src/main/resources/img/portal/green/029.png diff --git a/res/img/portal/green/030.png b/src/main/resources/img/portal/green/030.png similarity index 100% rename from res/img/portal/green/030.png rename to src/main/resources/img/portal/green/030.png diff --git a/res/img/portal/green/031.png b/src/main/resources/img/portal/green/031.png similarity index 100% rename from res/img/portal/green/031.png rename to src/main/resources/img/portal/green/031.png diff --git a/res/img/portal/green/032.png b/src/main/resources/img/portal/green/032.png similarity index 100% rename from res/img/portal/green/032.png rename to src/main/resources/img/portal/green/032.png diff --git a/res/img/portal/green/033.png b/src/main/resources/img/portal/green/033.png similarity index 100% rename from res/img/portal/green/033.png rename to src/main/resources/img/portal/green/033.png diff --git a/res/img/portal/green/034.png b/src/main/resources/img/portal/green/034.png similarity index 100% rename from res/img/portal/green/034.png rename to src/main/resources/img/portal/green/034.png diff --git a/res/img/portal/green/035.png b/src/main/resources/img/portal/green/035.png similarity index 100% rename from res/img/portal/green/035.png rename to src/main/resources/img/portal/green/035.png diff --git a/res/img/portal/green/036.png b/src/main/resources/img/portal/green/036.png similarity index 100% rename from res/img/portal/green/036.png rename to src/main/resources/img/portal/green/036.png diff --git a/res/img/portal/green/037.png b/src/main/resources/img/portal/green/037.png similarity index 100% rename from res/img/portal/green/037.png rename to src/main/resources/img/portal/green/037.png diff --git a/res/img/portal/green/038.png b/src/main/resources/img/portal/green/038.png similarity index 100% rename from res/img/portal/green/038.png rename to src/main/resources/img/portal/green/038.png diff --git a/res/img/portal/green/039.png b/src/main/resources/img/portal/green/039.png similarity index 100% rename from res/img/portal/green/039.png rename to src/main/resources/img/portal/green/039.png diff --git a/res/img/portal/green/040.png b/src/main/resources/img/portal/green/040.png similarity index 100% rename from res/img/portal/green/040.png rename to src/main/resources/img/portal/green/040.png diff --git a/res/img/portal/green/041.png b/src/main/resources/img/portal/green/041.png similarity index 100% rename from res/img/portal/green/041.png rename to src/main/resources/img/portal/green/041.png diff --git a/res/img/portal/green/042.png b/src/main/resources/img/portal/green/042.png similarity index 100% rename from res/img/portal/green/042.png rename to src/main/resources/img/portal/green/042.png diff --git a/res/img/portal/green/043.png b/src/main/resources/img/portal/green/043.png similarity index 100% rename from res/img/portal/green/043.png rename to src/main/resources/img/portal/green/043.png diff --git a/res/img/portal/green/044.png b/src/main/resources/img/portal/green/044.png similarity index 100% rename from res/img/portal/green/044.png rename to src/main/resources/img/portal/green/044.png diff --git a/res/img/portal/green/045.png b/src/main/resources/img/portal/green/045.png similarity index 100% rename from res/img/portal/green/045.png rename to src/main/resources/img/portal/green/045.png diff --git a/res/img/portal/green/046.png b/src/main/resources/img/portal/green/046.png similarity index 100% rename from res/img/portal/green/046.png rename to src/main/resources/img/portal/green/046.png diff --git a/res/img/portal/green/047.png b/src/main/resources/img/portal/green/047.png similarity index 100% rename from res/img/portal/green/047.png rename to src/main/resources/img/portal/green/047.png diff --git a/res/img/portal/green/048.png b/src/main/resources/img/portal/green/048.png similarity index 100% rename from res/img/portal/green/048.png rename to src/main/resources/img/portal/green/048.png diff --git a/res/img/portal/green/049.png b/src/main/resources/img/portal/green/049.png similarity index 100% rename from res/img/portal/green/049.png rename to src/main/resources/img/portal/green/049.png diff --git a/res/img/portal/green/050.png b/src/main/resources/img/portal/green/050.png similarity index 100% rename from res/img/portal/green/050.png rename to src/main/resources/img/portal/green/050.png diff --git a/res/img/portal/green/051.png b/src/main/resources/img/portal/green/051.png similarity index 100% rename from res/img/portal/green/051.png rename to src/main/resources/img/portal/green/051.png diff --git a/res/img/portal/green/052.png b/src/main/resources/img/portal/green/052.png similarity index 100% rename from res/img/portal/green/052.png rename to src/main/resources/img/portal/green/052.png diff --git a/res/img/portal/green/053.png b/src/main/resources/img/portal/green/053.png similarity index 100% rename from res/img/portal/green/053.png rename to src/main/resources/img/portal/green/053.png diff --git a/res/img/portal/green/054.png b/src/main/resources/img/portal/green/054.png similarity index 100% rename from res/img/portal/green/054.png rename to src/main/resources/img/portal/green/054.png diff --git a/res/img/portal/green/055.png b/src/main/resources/img/portal/green/055.png similarity index 100% rename from res/img/portal/green/055.png rename to src/main/resources/img/portal/green/055.png diff --git a/res/img/portal/green/056.png b/src/main/resources/img/portal/green/056.png similarity index 100% rename from res/img/portal/green/056.png rename to src/main/resources/img/portal/green/056.png diff --git a/res/img/portal/green/057.png b/src/main/resources/img/portal/green/057.png similarity index 100% rename from res/img/portal/green/057.png rename to src/main/resources/img/portal/green/057.png diff --git a/res/img/portal/green/058.png b/src/main/resources/img/portal/green/058.png similarity index 100% rename from res/img/portal/green/058.png rename to src/main/resources/img/portal/green/058.png diff --git a/res/img/portal/green/059.png b/src/main/resources/img/portal/green/059.png similarity index 100% rename from res/img/portal/green/059.png rename to src/main/resources/img/portal/green/059.png diff --git a/res/img/portal/green/060.png b/src/main/resources/img/portal/green/060.png similarity index 100% rename from res/img/portal/green/060.png rename to src/main/resources/img/portal/green/060.png diff --git a/res/img/portal/green/061.png b/src/main/resources/img/portal/green/061.png similarity index 100% rename from res/img/portal/green/061.png rename to src/main/resources/img/portal/green/061.png diff --git a/res/img/portal/green/062.png b/src/main/resources/img/portal/green/062.png similarity index 100% rename from res/img/portal/green/062.png rename to src/main/resources/img/portal/green/062.png diff --git a/res/img/portal/green/063.png b/src/main/resources/img/portal/green/063.png similarity index 100% rename from res/img/portal/green/063.png rename to src/main/resources/img/portal/green/063.png diff --git a/res/img/portal/green/064.png b/src/main/resources/img/portal/green/064.png similarity index 100% rename from res/img/portal/green/064.png rename to src/main/resources/img/portal/green/064.png diff --git a/res/img/portal/green/065.png b/src/main/resources/img/portal/green/065.png similarity index 100% rename from res/img/portal/green/065.png rename to src/main/resources/img/portal/green/065.png diff --git a/res/img/portal/green/066.png b/src/main/resources/img/portal/green/066.png similarity index 100% rename from res/img/portal/green/066.png rename to src/main/resources/img/portal/green/066.png diff --git a/res/img/portal/green/067.png b/src/main/resources/img/portal/green/067.png similarity index 100% rename from res/img/portal/green/067.png rename to src/main/resources/img/portal/green/067.png diff --git a/res/img/portal/green/068.png b/src/main/resources/img/portal/green/068.png similarity index 100% rename from res/img/portal/green/068.png rename to src/main/resources/img/portal/green/068.png diff --git a/res/img/portal/green/069.png b/src/main/resources/img/portal/green/069.png similarity index 100% rename from res/img/portal/green/069.png rename to src/main/resources/img/portal/green/069.png diff --git a/res/img/portal/green/070.png b/src/main/resources/img/portal/green/070.png similarity index 100% rename from res/img/portal/green/070.png rename to src/main/resources/img/portal/green/070.png diff --git a/res/img/portal/green/071.png b/src/main/resources/img/portal/green/071.png similarity index 100% rename from res/img/portal/green/071.png rename to src/main/resources/img/portal/green/071.png diff --git a/res/img/portal/green/072.png b/src/main/resources/img/portal/green/072.png similarity index 100% rename from res/img/portal/green/072.png rename to src/main/resources/img/portal/green/072.png diff --git a/res/img/portal/green/073.png b/src/main/resources/img/portal/green/073.png similarity index 100% rename from res/img/portal/green/073.png rename to src/main/resources/img/portal/green/073.png diff --git a/res/img/portal/green/074.png b/src/main/resources/img/portal/green/074.png similarity index 100% rename from res/img/portal/green/074.png rename to src/main/resources/img/portal/green/074.png diff --git a/res/img/portal/green/075.png b/src/main/resources/img/portal/green/075.png similarity index 100% rename from res/img/portal/green/075.png rename to src/main/resources/img/portal/green/075.png diff --git a/res/img/portal/green/076.png b/src/main/resources/img/portal/green/076.png similarity index 100% rename from res/img/portal/green/076.png rename to src/main/resources/img/portal/green/076.png diff --git a/res/img/portal/green/077.png b/src/main/resources/img/portal/green/077.png similarity index 100% rename from res/img/portal/green/077.png rename to src/main/resources/img/portal/green/077.png diff --git a/res/img/portal/green/078.png b/src/main/resources/img/portal/green/078.png similarity index 100% rename from res/img/portal/green/078.png rename to src/main/resources/img/portal/green/078.png diff --git a/res/img/portal/green/079.png b/src/main/resources/img/portal/green/079.png similarity index 100% rename from res/img/portal/green/079.png rename to src/main/resources/img/portal/green/079.png diff --git a/res/img/portal/green/080.png b/src/main/resources/img/portal/green/080.png similarity index 100% rename from res/img/portal/green/080.png rename to src/main/resources/img/portal/green/080.png diff --git a/res/img/portal/green/081.png b/src/main/resources/img/portal/green/081.png similarity index 100% rename from res/img/portal/green/081.png rename to src/main/resources/img/portal/green/081.png diff --git a/res/img/portal/green/082.png b/src/main/resources/img/portal/green/082.png similarity index 100% rename from res/img/portal/green/082.png rename to src/main/resources/img/portal/green/082.png diff --git a/res/img/portal/green/083.png b/src/main/resources/img/portal/green/083.png similarity index 100% rename from res/img/portal/green/083.png rename to src/main/resources/img/portal/green/083.png diff --git a/res/img/portal/green/084.png b/src/main/resources/img/portal/green/084.png similarity index 100% rename from res/img/portal/green/084.png rename to src/main/resources/img/portal/green/084.png diff --git a/res/img/portal/green/085.png b/src/main/resources/img/portal/green/085.png similarity index 100% rename from res/img/portal/green/085.png rename to src/main/resources/img/portal/green/085.png diff --git a/res/img/portal/green/086.png b/src/main/resources/img/portal/green/086.png similarity index 100% rename from res/img/portal/green/086.png rename to src/main/resources/img/portal/green/086.png diff --git a/res/img/portal/green/087.png b/src/main/resources/img/portal/green/087.png similarity index 100% rename from res/img/portal/green/087.png rename to src/main/resources/img/portal/green/087.png diff --git a/res/img/portal/green/088.png b/src/main/resources/img/portal/green/088.png similarity index 100% rename from res/img/portal/green/088.png rename to src/main/resources/img/portal/green/088.png diff --git a/res/img/portal/green/089.png b/src/main/resources/img/portal/green/089.png similarity index 100% rename from res/img/portal/green/089.png rename to src/main/resources/img/portal/green/089.png diff --git a/res/img/portal/green/090.png b/src/main/resources/img/portal/green/090.png similarity index 100% rename from res/img/portal/green/090.png rename to src/main/resources/img/portal/green/090.png diff --git a/res/img/portal/green/091.png b/src/main/resources/img/portal/green/091.png similarity index 100% rename from res/img/portal/green/091.png rename to src/main/resources/img/portal/green/091.png diff --git a/res/img/portal/green/092.png b/src/main/resources/img/portal/green/092.png similarity index 100% rename from res/img/portal/green/092.png rename to src/main/resources/img/portal/green/092.png diff --git a/res/img/portal/green/093.png b/src/main/resources/img/portal/green/093.png similarity index 100% rename from res/img/portal/green/093.png rename to src/main/resources/img/portal/green/093.png diff --git a/res/img/portal/green/094.png b/src/main/resources/img/portal/green/094.png similarity index 100% rename from res/img/portal/green/094.png rename to src/main/resources/img/portal/green/094.png diff --git a/res/img/portal/green/095.png b/src/main/resources/img/portal/green/095.png similarity index 100% rename from res/img/portal/green/095.png rename to src/main/resources/img/portal/green/095.png diff --git a/res/img/portal/green/096.png b/src/main/resources/img/portal/green/096.png similarity index 100% rename from res/img/portal/green/096.png rename to src/main/resources/img/portal/green/096.png diff --git a/res/img/portal/green/097.png b/src/main/resources/img/portal/green/097.png similarity index 100% rename from res/img/portal/green/097.png rename to src/main/resources/img/portal/green/097.png diff --git a/res/img/portal/green/098.png b/src/main/resources/img/portal/green/098.png similarity index 100% rename from res/img/portal/green/098.png rename to src/main/resources/img/portal/green/098.png diff --git a/res/img/portal/green/099.png b/src/main/resources/img/portal/green/099.png similarity index 100% rename from res/img/portal/green/099.png rename to src/main/resources/img/portal/green/099.png diff --git a/res/img/portal/green/100.png b/src/main/resources/img/portal/green/100.png similarity index 100% rename from res/img/portal/green/100.png rename to src/main/resources/img/portal/green/100.png diff --git a/res/img/portal/green/101.png b/src/main/resources/img/portal/green/101.png similarity index 100% rename from res/img/portal/green/101.png rename to src/main/resources/img/portal/green/101.png diff --git a/res/img/portal/green/102.png b/src/main/resources/img/portal/green/102.png similarity index 100% rename from res/img/portal/green/102.png rename to src/main/resources/img/portal/green/102.png diff --git a/res/img/portal/green/103.png b/src/main/resources/img/portal/green/103.png similarity index 100% rename from res/img/portal/green/103.png rename to src/main/resources/img/portal/green/103.png diff --git a/res/img/portal/green/104.png b/src/main/resources/img/portal/green/104.png similarity index 100% rename from res/img/portal/green/104.png rename to src/main/resources/img/portal/green/104.png diff --git a/res/img/portal/green/105.png b/src/main/resources/img/portal/green/105.png similarity index 100% rename from res/img/portal/green/105.png rename to src/main/resources/img/portal/green/105.png diff --git a/res/img/portal/green/106.png b/src/main/resources/img/portal/green/106.png similarity index 100% rename from res/img/portal/green/106.png rename to src/main/resources/img/portal/green/106.png diff --git a/res/img/portal/green/107.png b/src/main/resources/img/portal/green/107.png similarity index 100% rename from res/img/portal/green/107.png rename to src/main/resources/img/portal/green/107.png diff --git a/res/img/portal/green/108.png b/src/main/resources/img/portal/green/108.png similarity index 100% rename from res/img/portal/green/108.png rename to src/main/resources/img/portal/green/108.png diff --git a/res/img/portal/green/109.png b/src/main/resources/img/portal/green/109.png similarity index 100% rename from res/img/portal/green/109.png rename to src/main/resources/img/portal/green/109.png diff --git a/res/img/portal/green/110.png b/src/main/resources/img/portal/green/110.png similarity index 100% rename from res/img/portal/green/110.png rename to src/main/resources/img/portal/green/110.png diff --git a/res/img/portal/green/111.png b/src/main/resources/img/portal/green/111.png similarity index 100% rename from res/img/portal/green/111.png rename to src/main/resources/img/portal/green/111.png diff --git a/res/img/portal/green/112.png b/src/main/resources/img/portal/green/112.png similarity index 100% rename from res/img/portal/green/112.png rename to src/main/resources/img/portal/green/112.png diff --git a/res/img/portal/green/113.png b/src/main/resources/img/portal/green/113.png similarity index 100% rename from res/img/portal/green/113.png rename to src/main/resources/img/portal/green/113.png diff --git a/res/img/portal/green/114.png b/src/main/resources/img/portal/green/114.png similarity index 100% rename from res/img/portal/green/114.png rename to src/main/resources/img/portal/green/114.png diff --git a/res/img/portal/green/115.png b/src/main/resources/img/portal/green/115.png similarity index 100% rename from res/img/portal/green/115.png rename to src/main/resources/img/portal/green/115.png diff --git a/res/img/portal/green/116.png b/src/main/resources/img/portal/green/116.png similarity index 100% rename from res/img/portal/green/116.png rename to src/main/resources/img/portal/green/116.png diff --git a/res/img/portal/green/117.png b/src/main/resources/img/portal/green/117.png similarity index 100% rename from res/img/portal/green/117.png rename to src/main/resources/img/portal/green/117.png diff --git a/res/img/portal/green/118.png b/src/main/resources/img/portal/green/118.png similarity index 100% rename from res/img/portal/green/118.png rename to src/main/resources/img/portal/green/118.png diff --git a/res/img/portal/green/119.png b/src/main/resources/img/portal/green/119.png similarity index 100% rename from res/img/portal/green/119.png rename to src/main/resources/img/portal/green/119.png diff --git a/res/img/textures/dungeon.png b/src/main/resources/img/textures/dungeon.png similarity index 100% rename from res/img/textures/dungeon.png rename to src/main/resources/img/textures/dungeon.png diff --git a/res/scene.json b/src/main/resources/scene.json similarity index 100% rename from res/scene.json rename to src/main/resources/scene.json diff --git a/res/snd/EnemyAttack.wav b/src/main/resources/snd/EnemyAttack.wav similarity index 100% rename from res/snd/EnemyAttack.wav rename to src/main/resources/snd/EnemyAttack.wav diff --git a/res/snd/GameLoop.wav b/src/main/resources/snd/GameLoop.wav similarity index 100% rename from res/snd/GameLoop.wav rename to src/main/resources/snd/GameLoop.wav diff --git a/res/snd/GameOver.wav b/src/main/resources/snd/GameOver.wav similarity index 100% rename from res/snd/GameOver.wav rename to src/main/resources/snd/GameOver.wav diff --git a/res/snd/GetKey.wav b/src/main/resources/snd/GetKey.wav similarity index 100% rename from res/snd/GetKey.wav rename to src/main/resources/snd/GetKey.wav diff --git a/res/snd/OpenChest.wav b/src/main/resources/snd/OpenChest.wav similarity index 100% rename from res/snd/OpenChest.wav rename to src/main/resources/snd/OpenChest.wav diff --git a/res/snd/Success.wav b/src/main/resources/snd/Success.wav similarity index 100% rename from res/snd/Success.wav rename to src/main/resources/snd/Success.wav