diff --git a/.idea/artifacts/Game_jar.xml b/.idea/artifacts/Azaraka_jar.xml similarity index 66% rename from .idea/artifacts/Game_jar.xml rename to .idea/artifacts/Azaraka_jar.xml index dc4120c..edc805b 100644 --- a/.idea/artifacts/Game_jar.xml +++ b/.idea/artifacts/Azaraka_jar.xml @@ -1,7 +1,7 @@ - - $PROJECT_DIR$/out/artifacts/Game_jar - + + $PROJECT_DIR$/out/artifacts/Azaraka_jar + diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF index c9213bb..3d55900 100644 --- a/src/META-INF/MANIFEST.MF +++ b/src/META-INF/MANIFEST.MF @@ -1,3 +1,11 @@ Manifest-Version: 1.0 -Main-Class: cl.cromer.game.Main - +Main-Class: cl.cromer.azaraka.Main +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/game/Celda.java b/src/cl/cromer/azaraka/Celda.java similarity index 97% rename from src/cl/cromer/game/Celda.java rename to src/cl/cromer/azaraka/Celda.java index 6d0a6e0..6d45797 100644 --- a/src/cl/cromer/game/Celda.java +++ b/src/cl/cromer/azaraka/Celda.java @@ -13,10 +13,10 @@ * */ -package cl.cromer.game; +package cl.cromer.azaraka; -import cl.cromer.game.sprite.Animation; -import cl.cromer.game.sprite.AnimationException; +import cl.cromer.azaraka.sprite.Animation; +import cl.cromer.azaraka.sprite.AnimationException; import javax.swing.*; import java.awt.*; diff --git a/src/cl/cromer/game/Constantes.java b/src/cl/cromer/azaraka/Constantes.java similarity index 98% rename from src/cl/cromer/game/Constantes.java rename to src/cl/cromer/azaraka/Constantes.java index 92c63e8..9a72e48 100644 --- a/src/cl/cromer/game/Constantes.java +++ b/src/cl/cromer/azaraka/Constantes.java @@ -13,9 +13,9 @@ * */ -package cl.cromer.game; +package cl.cromer.azaraka; -import cl.cromer.game.logging.HtmlFormatter; +import cl.cromer.azaraka.logging.HtmlFormatter; import java.awt.*; import java.io.File; diff --git a/src/cl/cromer/game/Escenario.java b/src/cl/cromer/azaraka/Escenario.java similarity index 98% rename from src/cl/cromer/game/Escenario.java rename to src/cl/cromer/azaraka/Escenario.java index 7594247..900c88e 100644 --- a/src/cl/cromer/game/Escenario.java +++ b/src/cl/cromer/azaraka/Escenario.java @@ -13,16 +13,16 @@ * */ -package cl.cromer.game; +package cl.cromer.azaraka; -import cl.cromer.game.json.Cell; -import cl.cromer.game.json.Json; -import cl.cromer.game.sound.Sound; -import cl.cromer.game.sound.SoundException; -import cl.cromer.game.sprite.Animation; -import cl.cromer.game.sprite.AnimationMap; -import cl.cromer.game.sprite.Sheet; -import cl.cromer.game.sprite.SheetException; +import cl.cromer.azaraka.json.Cell; +import cl.cromer.azaraka.json.Json; +import cl.cromer.azaraka.sound.Sound; +import cl.cromer.azaraka.sound.SoundException; +import cl.cromer.azaraka.sprite.Animation; +import cl.cromer.azaraka.sprite.AnimationMap; +import cl.cromer.azaraka.sprite.Sheet; +import cl.cromer.azaraka.sprite.SheetException; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -626,6 +626,7 @@ public class Escenario extends JComponent implements Constantes { /** * Override the paintComponent method of JComponent to paint the scene + * * @param g The graphics object to paint */ @Override @@ -635,6 +636,7 @@ public class Escenario extends JComponent implements Constantes { /** * Override the update method of JComponent to do double buffering + * * @param g The graphics object */ @Override @@ -648,6 +650,7 @@ public class Escenario extends JComponent implements Constantes { /** * Get the player cell + * * @return Returns a cell that contains the player */ public Celda getPlayer() { diff --git a/src/cl/cromer/game/Lienzo.java b/src/cl/cromer/azaraka/Lienzo.java similarity index 97% rename from src/cl/cromer/game/Lienzo.java rename to src/cl/cromer/azaraka/Lienzo.java index db7f64a..e6e57f0 100644 --- a/src/cl/cromer/game/Lienzo.java +++ b/src/cl/cromer/azaraka/Lienzo.java @@ -13,14 +13,14 @@ * */ -package cl.cromer.game; +package cl.cromer.azaraka; -import cl.cromer.game.object.Object; -import cl.cromer.game.object.*; -import cl.cromer.game.sound.Sound; -import cl.cromer.game.sound.SoundException; -import cl.cromer.game.sprite.Animation; -import cl.cromer.game.sprite.AnimationException; +import cl.cromer.azaraka.object.Object; +import cl.cromer.azaraka.object.*; +import cl.cromer.azaraka.sound.Sound; +import cl.cromer.azaraka.sound.SoundException; +import cl.cromer.azaraka.sprite.Animation; +import cl.cromer.azaraka.sprite.AnimationException; import javax.sound.sampled.Clip; import java.awt.*; diff --git a/src/cl/cromer/game/Main.java b/src/cl/cromer/azaraka/Main.java similarity index 98% rename from src/cl/cromer/game/Main.java rename to src/cl/cromer/azaraka/Main.java index d0e2df6..4a7f917 100644 --- a/src/cl/cromer/game/Main.java +++ b/src/cl/cromer/azaraka/Main.java @@ -13,7 +13,7 @@ * */ -package cl.cromer.game; +package cl.cromer.azaraka; import javax.swing.*; import java.util.logging.Logger; diff --git a/src/cl/cromer/game/RandomPositionList.java b/src/cl/cromer/azaraka/RandomPositionList.java similarity index 99% rename from src/cl/cromer/game/RandomPositionList.java rename to src/cl/cromer/azaraka/RandomPositionList.java index 823fa87..e89cde3 100644 --- a/src/cl/cromer/game/RandomPositionList.java +++ b/src/cl/cromer/azaraka/RandomPositionList.java @@ -13,7 +13,7 @@ * */ -package cl.cromer.game; +package cl.cromer.azaraka; /** * This class is used to save locations of random cells for enemies, obstacles, chests, etc diff --git a/src/cl/cromer/game/VentanaPrincipal.java b/src/cl/cromer/azaraka/VentanaPrincipal.java similarity index 96% rename from src/cl/cromer/game/VentanaPrincipal.java rename to src/cl/cromer/azaraka/VentanaPrincipal.java index b4affa3..67bf53e 100644 --- a/src/cl/cromer/game/VentanaPrincipal.java +++ b/src/cl/cromer/azaraka/VentanaPrincipal.java @@ -13,10 +13,10 @@ * */ -package cl.cromer.game; +package cl.cromer.azaraka; -import cl.cromer.game.panel.Config; -import cl.cromer.game.panel.Game; +import cl.cromer.azaraka.panel.Config; +import cl.cromer.azaraka.panel.Game; import javax.imageio.ImageIO; import javax.swing.*; diff --git a/src/cl/cromer/game/json/Cell.java b/src/cl/cromer/azaraka/json/Cell.java similarity index 96% rename from src/cl/cromer/game/json/Cell.java rename to src/cl/cromer/azaraka/json/Cell.java index fae4f1f..fb1d3e2 100644 --- a/src/cl/cromer/game/json/Cell.java +++ b/src/cl/cromer/azaraka/json/Cell.java @@ -13,9 +13,9 @@ * */ -package cl.cromer.game.json; +package cl.cromer.azaraka.json; -import cl.cromer.game.Celda; +import cl.cromer.azaraka.Celda; import java.util.ArrayList; diff --git a/src/cl/cromer/game/json/Json.java b/src/cl/cromer/azaraka/json/Json.java similarity index 96% rename from src/cl/cromer/game/json/Json.java rename to src/cl/cromer/azaraka/json/Json.java index 1aa40fa..678ec2f 100644 --- a/src/cl/cromer/game/json/Json.java +++ b/src/cl/cromer/azaraka/json/Json.java @@ -13,10 +13,10 @@ * */ -package cl.cromer.game.json; +package cl.cromer.azaraka.json; -import cl.cromer.game.Celda; -import cl.cromer.game.Constantes; +import cl.cromer.azaraka.Celda; +import cl.cromer.azaraka.Constantes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/cl/cromer/game/logging/HtmlFormatter.java b/src/cl/cromer/azaraka/logging/HtmlFormatter.java similarity index 99% rename from src/cl/cromer/game/logging/HtmlFormatter.java rename to src/cl/cromer/azaraka/logging/HtmlFormatter.java index 86db5f7..8d71a7b 100644 --- a/src/cl/cromer/game/logging/HtmlFormatter.java +++ b/src/cl/cromer/azaraka/logging/HtmlFormatter.java @@ -13,7 +13,7 @@ * */ -package cl.cromer.game.logging; +package cl.cromer.azaraka.logging; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/cl/cromer/game/logging/StringUtils.java b/src/cl/cromer/azaraka/logging/StringUtils.java similarity index 99% rename from src/cl/cromer/game/logging/StringUtils.java rename to src/cl/cromer/azaraka/logging/StringUtils.java index 4412137..e77b675 100644 --- a/src/cl/cromer/game/logging/StringUtils.java +++ b/src/cl/cromer/azaraka/logging/StringUtils.java @@ -13,7 +13,7 @@ * */ -package cl.cromer.game.logging; +package cl.cromer.azaraka.logging; import java.util.HashMap; diff --git a/src/cl/cromer/game/object/Chest.java b/src/cl/cromer/azaraka/object/Chest.java similarity index 95% rename from src/cl/cromer/game/object/Chest.java rename to src/cl/cromer/azaraka/object/Chest.java index 8635c59..549fac1 100644 --- a/src/cl/cromer/game/object/Chest.java +++ b/src/cl/cromer/azaraka/object/Chest.java @@ -13,12 +13,12 @@ * */ -package cl.cromer.game.object; +package cl.cromer.azaraka.object; -import cl.cromer.game.Celda; -import cl.cromer.game.Constantes; -import cl.cromer.game.Escenario; -import cl.cromer.game.sprite.AnimationException; +import cl.cromer.azaraka.Celda; +import cl.cromer.azaraka.Constantes; +import cl.cromer.azaraka.Escenario; +import cl.cromer.azaraka.sprite.AnimationException; import java.util.logging.Logger; diff --git a/src/cl/cromer/game/object/Enemy.java b/src/cl/cromer/azaraka/object/Enemy.java similarity index 96% rename from src/cl/cromer/game/object/Enemy.java rename to src/cl/cromer/azaraka/object/Enemy.java index 24a3d1c..ed28492 100644 --- a/src/cl/cromer/game/object/Enemy.java +++ b/src/cl/cromer/azaraka/object/Enemy.java @@ -13,15 +13,15 @@ * */ -package cl.cromer.game.object; +package cl.cromer.azaraka.object; -import cl.cromer.game.Celda; -import cl.cromer.game.Constantes; -import cl.cromer.game.Escenario; -import cl.cromer.game.sound.Sound; -import cl.cromer.game.sprite.Animation; -import cl.cromer.game.sprite.AnimationException; -import cl.cromer.game.sprite.SheetException; +import cl.cromer.azaraka.Celda; +import cl.cromer.azaraka.Constantes; +import cl.cromer.azaraka.Escenario; +import cl.cromer.azaraka.sound.Sound; +import cl.cromer.azaraka.sprite.Animation; +import cl.cromer.azaraka.sprite.AnimationException; +import cl.cromer.azaraka.sprite.SheetException; import java.util.concurrent.locks.Lock; import java.util.logging.Logger; diff --git a/src/cl/cromer/game/object/Gem.java b/src/cl/cromer/azaraka/object/Gem.java similarity index 95% rename from src/cl/cromer/game/object/Gem.java rename to src/cl/cromer/azaraka/object/Gem.java index 73e8671..f6d2a8e 100644 --- a/src/cl/cromer/game/object/Gem.java +++ b/src/cl/cromer/azaraka/object/Gem.java @@ -13,10 +13,10 @@ * */ -package cl.cromer.game.object; +package cl.cromer.azaraka.object; -import cl.cromer.game.Celda; -import cl.cromer.game.Escenario; +import cl.cromer.azaraka.Celda; +import cl.cromer.azaraka.Escenario; /** * This class contains the gem diff --git a/src/cl/cromer/game/object/Key.java b/src/cl/cromer/azaraka/object/Key.java similarity index 93% rename from src/cl/cromer/game/object/Key.java rename to src/cl/cromer/azaraka/object/Key.java index eac91b2..5d8c947 100644 --- a/src/cl/cromer/game/object/Key.java +++ b/src/cl/cromer/azaraka/object/Key.java @@ -13,12 +13,12 @@ * */ -package cl.cromer.game.object; +package cl.cromer.azaraka.object; -import cl.cromer.game.Celda; -import cl.cromer.game.Constantes; -import cl.cromer.game.Escenario; -import cl.cromer.game.sprite.AnimationException; +import cl.cromer.azaraka.Celda; +import cl.cromer.azaraka.Constantes; +import cl.cromer.azaraka.Escenario; +import cl.cromer.azaraka.sprite.AnimationException; import java.util.logging.Logger; diff --git a/src/cl/cromer/game/object/Object.java b/src/cl/cromer/azaraka/object/Object.java similarity index 97% rename from src/cl/cromer/game/object/Object.java rename to src/cl/cromer/azaraka/object/Object.java index dd59dab..9c87752 100644 --- a/src/cl/cromer/game/object/Object.java +++ b/src/cl/cromer/azaraka/object/Object.java @@ -13,10 +13,10 @@ * */ -package cl.cromer.game.object; +package cl.cromer.azaraka.object; -import cl.cromer.game.Celda; -import cl.cromer.game.Escenario; +import cl.cromer.azaraka.Celda; +import cl.cromer.azaraka.Escenario; /** * All game objects extend this class diff --git a/src/cl/cromer/game/object/Player.java b/src/cl/cromer/azaraka/object/Player.java similarity index 97% rename from src/cl/cromer/game/object/Player.java rename to src/cl/cromer/azaraka/object/Player.java index 449f460..abfd761 100644 --- a/src/cl/cromer/game/object/Player.java +++ b/src/cl/cromer/azaraka/object/Player.java @@ -13,14 +13,14 @@ * */ -package cl.cromer.game.object; +package cl.cromer.azaraka.object; -import cl.cromer.game.Celda; -import cl.cromer.game.Constantes; -import cl.cromer.game.Escenario; -import cl.cromer.game.sound.Sound; -import cl.cromer.game.sprite.Animation; -import cl.cromer.game.sprite.AnimationException; +import cl.cromer.azaraka.Celda; +import cl.cromer.azaraka.Constantes; +import cl.cromer.azaraka.Escenario; +import cl.cromer.azaraka.sound.Sound; +import cl.cromer.azaraka.sprite.Animation; +import cl.cromer.azaraka.sprite.AnimationException; import java.awt.event.KeyEvent; import java.util.ArrayList; diff --git a/src/cl/cromer/game/object/Portal.java b/src/cl/cromer/azaraka/object/Portal.java similarity index 93% rename from src/cl/cromer/game/object/Portal.java rename to src/cl/cromer/azaraka/object/Portal.java index 2473278..44d30f3 100644 --- a/src/cl/cromer/game/object/Portal.java +++ b/src/cl/cromer/azaraka/object/Portal.java @@ -13,12 +13,12 @@ * */ -package cl.cromer.game.object; +package cl.cromer.azaraka.object; -import cl.cromer.game.Celda; -import cl.cromer.game.Constantes; -import cl.cromer.game.Escenario; -import cl.cromer.game.sprite.AnimationException; +import cl.cromer.azaraka.Celda; +import cl.cromer.azaraka.Constantes; +import cl.cromer.azaraka.Escenario; +import cl.cromer.azaraka.sprite.AnimationException; import java.util.logging.Logger; diff --git a/src/cl/cromer/game/panel/Config.java b/src/cl/cromer/azaraka/panel/Config.java similarity index 98% rename from src/cl/cromer/game/panel/Config.java rename to src/cl/cromer/azaraka/panel/Config.java index 9965aa1..79d7827 100644 --- a/src/cl/cromer/game/panel/Config.java +++ b/src/cl/cromer/azaraka/panel/Config.java @@ -13,9 +13,9 @@ * */ -package cl.cromer.game.panel; +package cl.cromer.azaraka.panel; -import cl.cromer.game.Constantes; +import cl.cromer.azaraka.Constantes; import javax.swing.*; import javax.swing.event.ChangeEvent; diff --git a/src/cl/cromer/game/panel/Game.java b/src/cl/cromer/azaraka/panel/Game.java similarity index 95% rename from src/cl/cromer/game/panel/Game.java rename to src/cl/cromer/azaraka/panel/Game.java index 0c9d47a..2c15a8c 100644 --- a/src/cl/cromer/game/panel/Game.java +++ b/src/cl/cromer/azaraka/panel/Game.java @@ -13,10 +13,10 @@ * */ -package cl.cromer.game.panel; +package cl.cromer.azaraka.panel; -import cl.cromer.game.Constantes; -import cl.cromer.game.Lienzo; +import cl.cromer.azaraka.Constantes; +import cl.cromer.azaraka.Lienzo; import javax.swing.*; import java.awt.*; diff --git a/src/cl/cromer/game/sound/Sound.java b/src/cl/cromer/azaraka/sound/Sound.java similarity index 98% rename from src/cl/cromer/game/sound/Sound.java rename to src/cl/cromer/azaraka/sound/Sound.java index cff021d..f212c36 100644 --- a/src/cl/cromer/game/sound/Sound.java +++ b/src/cl/cromer/azaraka/sound/Sound.java @@ -13,9 +13,9 @@ * */ -package cl.cromer.game.sound; +package cl.cromer.azaraka.sound; -import cl.cromer.game.Constantes; +import cl.cromer.azaraka.Constantes; import javax.sound.sampled.*; import java.io.BufferedInputStream; diff --git a/src/cl/cromer/game/sound/SoundException.java b/src/cl/cromer/azaraka/sound/SoundException.java similarity index 98% rename from src/cl/cromer/game/sound/SoundException.java rename to src/cl/cromer/azaraka/sound/SoundException.java index a8d7a04..afb8cdf 100644 --- a/src/cl/cromer/game/sound/SoundException.java +++ b/src/cl/cromer/azaraka/sound/SoundException.java @@ -13,7 +13,7 @@ * */ -package cl.cromer.game.sound; +package cl.cromer.azaraka.sound; /** * This exception is thrown when there are problems with a sound diff --git a/src/cl/cromer/game/sprite/Animation.java b/src/cl/cromer/azaraka/sprite/Animation.java similarity index 99% rename from src/cl/cromer/game/sprite/Animation.java rename to src/cl/cromer/azaraka/sprite/Animation.java index 25183ed..24ec283 100644 --- a/src/cl/cromer/game/sprite/Animation.java +++ b/src/cl/cromer/azaraka/sprite/Animation.java @@ -13,9 +13,9 @@ * */ -package cl.cromer.game.sprite; +package cl.cromer.azaraka.sprite; -import cl.cromer.game.Constantes; +import cl.cromer.azaraka.Constantes; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/cl/cromer/game/sprite/AnimationException.java b/src/cl/cromer/azaraka/sprite/AnimationException.java similarity index 98% rename from src/cl/cromer/game/sprite/AnimationException.java rename to src/cl/cromer/azaraka/sprite/AnimationException.java index 1c0d262..b3dc751 100644 --- a/src/cl/cromer/game/sprite/AnimationException.java +++ b/src/cl/cromer/azaraka/sprite/AnimationException.java @@ -13,7 +13,7 @@ * */ -package cl.cromer.game.sprite; +package cl.cromer.azaraka.sprite; /** * This exception is thrown when there are problems with a sprite diff --git a/src/cl/cromer/game/sprite/AnimationMap.java b/src/cl/cromer/azaraka/sprite/AnimationMap.java similarity index 96% rename from src/cl/cromer/game/sprite/AnimationMap.java rename to src/cl/cromer/azaraka/sprite/AnimationMap.java index 18656e9..3c27de4 100644 --- a/src/cl/cromer/game/sprite/AnimationMap.java +++ b/src/cl/cromer/azaraka/sprite/AnimationMap.java @@ -13,9 +13,9 @@ * */ -package cl.cromer.game.sprite; +package cl.cromer.azaraka.sprite; -import cl.cromer.game.Constantes; +import cl.cromer.azaraka.Constantes; import java.util.HashMap; import java.util.logging.Logger; diff --git a/src/cl/cromer/game/sprite/Sheet.java b/src/cl/cromer/azaraka/sprite/Sheet.java similarity index 97% rename from src/cl/cromer/game/sprite/Sheet.java rename to src/cl/cromer/azaraka/sprite/Sheet.java index 135b938..46e0030 100644 --- a/src/cl/cromer/game/sprite/Sheet.java +++ b/src/cl/cromer/azaraka/sprite/Sheet.java @@ -13,9 +13,9 @@ * */ -package cl.cromer.game.sprite; +package cl.cromer.azaraka.sprite; -import cl.cromer.game.Constantes; +import cl.cromer.azaraka.Constantes; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; diff --git a/src/cl/cromer/game/sprite/SheetException.java b/src/cl/cromer/azaraka/sprite/SheetException.java similarity index 98% rename from src/cl/cromer/game/sprite/SheetException.java rename to src/cl/cromer/azaraka/sprite/SheetException.java index 47b3776..5e9011f 100644 --- a/src/cl/cromer/game/sprite/SheetException.java +++ b/src/cl/cromer/azaraka/sprite/SheetException.java @@ -13,7 +13,7 @@ * */ -package cl.cromer.game.sprite; +package cl.cromer.azaraka.sprite; /** * This exception is thrown when there are problems with a sprite diff --git a/test/cl/cromer/game/test/RandomPositionListTest.java b/test/cl/cromer/azaraka/test/RandomPositionListTest.java similarity index 95% rename from test/cl/cromer/game/test/RandomPositionListTest.java rename to test/cl/cromer/azaraka/test/RandomPositionListTest.java index c166b4f..0e03020 100644 --- a/test/cl/cromer/game/test/RandomPositionListTest.java +++ b/test/cl/cromer/azaraka/test/RandomPositionListTest.java @@ -13,10 +13,10 @@ * */ -package cl.cromer.game.test; +package cl.cromer.azaraka.test; -import cl.cromer.game.Celda; -import cl.cromer.game.RandomPositionList; +import cl.cromer.azaraka.Celda; +import cl.cromer.azaraka.RandomPositionList; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/test/cl/cromer/game/test/object/PlayerTest.java b/test/cl/cromer/azaraka/test/object/PlayerTest.java similarity index 95% rename from test/cl/cromer/game/test/object/PlayerTest.java rename to test/cl/cromer/azaraka/test/object/PlayerTest.java index f011eb4..e186eac 100644 --- a/test/cl/cromer/game/test/object/PlayerTest.java +++ b/test/cl/cromer/azaraka/test/object/PlayerTest.java @@ -13,12 +13,12 @@ * */ -package cl.cromer.game.test.object; +package cl.cromer.azaraka.test.object; -import cl.cromer.game.Celda; -import cl.cromer.game.Escenario; -import cl.cromer.game.Lienzo; -import cl.cromer.game.object.Player; +import cl.cromer.azaraka.Celda; +import cl.cromer.azaraka.Escenario; +import cl.cromer.azaraka.Lienzo; +import cl.cromer.azaraka.object.Player; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;