From 448440a28debc7af8abf4c2ae681b8983938f1fc Mon Sep 17 00:00:00 2001 From: Tobydrama Date: Sun, 3 May 2020 15:15:32 +0200 Subject: [PATCH] renamet packeges --- .../java/inf112/fiasko/roborally/Main.java | 2 +- .../roborally/networking/RoboRallyClient.java | 2 +- .../networking/RoboRallyClientListener.java | 6 +++--- .../roborally/networking/RoboRallyServer.java | 2 +- .../networking/RoboRallyServerListener.java | 2 +- .../fiasko/roborally/objects/Board.java | 16 +++++++-------- .../roborally/objects/BoardElement.java | 2 +- .../objects/BoardElementContainer.java | 2 +- .../roborally/objects/InteractableGame.java | 2 +- .../fiasko/roborally/objects/Particle.java | 4 ++-- .../fiasko/roborally/objects/Phase.java | 14 ++++++------- .../fiasko/roborally/objects/Player.java | 2 +- .../roborally/objects/ProgrammingCard.java | 2 +- .../roborally/objects/RoboRallyGame.java | 17 ++++++++-------- .../fiasko/roborally/objects/Robot.java | 6 +++--- .../inf112/fiasko/roborally/objects/Tile.java | 4 ++-- .../inf112/fiasko/roborally/objects/Wall.java | 4 ++-- .../properties}/Action.java | 2 +- .../properties}/Direction.java | 2 +- .../properties}/GameState.java | 2 +- .../properties}/ParticleType.java | 2 +- .../properties}/Position.java | 2 +- .../properties}/RobotID.java | 2 +- .../properties}/TileType.java | 2 +- .../properties}/WallType.java | 2 +- .../{gamewrapper => ui}/RoboRallyUI.java | 2 +- .../{gamewrapper => ui}/RoboRallyWrapper.java | 4 ++-- .../{gamewrapper => ui}/ScreenManager.java | 20 +++++++++---------- .../{gamewrapper => ui}/SimpleButton.java | 2 +- .../screens/AbstractScreen.java | 2 +- .../screens/BoardActiveScreen.java | 12 +++++------ .../screens/CardChoiceScreen.java | 8 ++++---- .../screens/CardRectangle.java | 2 +- .../screens/IPAddressScreen.java | 4 ++-- .../screens/InteractiveScreen.java | 2 +- .../screens/LoadingScreen.java | 6 +++--- .../screens/LobbyScreen.java | 15 +++++++------- .../screens/PowerDownScreen.java | 8 ++++---- .../screens/StartMenuScreen.java | 6 +++--- .../screens/UsernameScreen.java | 4 ++-- .../screens/WinnerScreen.java | 6 +++--- .../roborally/utility/BoardLoaderUtil.java | 6 +++--- .../roborally/utility/DeckLoaderUtil.java | 8 +++++--- .../fiasko/roborally/utility/GridUtil.java | 2 +- .../fiasko/roborally/utility/IOUtil.java | 6 +++--- .../fiasko/roborally/utility/LaserHelper.java | 6 +++--- .../fiasko/roborally/utility/NetworkUtil.java | 4 ++-- .../utility/TextureConverterUtil.java | 10 +++++----- .../objects/BoardElementContainerTest.java | 6 +++--- .../fiasko/roborally/objects/BoardTest.java | 10 +++++----- .../fiasko/roborally/objects/FakeGame.java | 2 +- .../roborally/objects/ListGridTest.java | 4 ++-- .../roborally/objects/ParticleTest.java | 4 ++-- .../fiasko/roborally/objects/PhaseTest.java | 8 ++++---- .../fiasko/roborally/objects/PlayerTest.java | 4 ++-- .../objects/ProgrammingCardDeckTest.java | 2 +- .../objects/ProgrammingCardTest.java | 2 +- .../roborally/objects/RoboRallyGameTest.java | 6 +++--- .../fiasko/roborally/objects/RobotTest.java | 4 ++-- .../fiasko/roborally/objects/TileTest.java | 4 ++-- .../fiasko/roborally/objects/WallTest.java | 4 ++-- .../properties}/DirectionTest.java | 2 +- .../properties}/ParticleTypeTest.java | 2 +- .../properties}/PositionTest.java | 2 +- .../properties}/TileTypeTest.java | 2 +- .../properties}/WallTypeTest.java | 2 +- .../utility/TextureConverterUtilTest.java | 4 ++-- 67 files changed, 163 insertions(+), 161 deletions(-) rename src/main/java/inf112/fiasko/roborally/{elementproperties => objects/properties}/Action.java (92%) rename src/main/java/inf112/fiasko/roborally/{elementproperties => objects/properties}/Direction.java (98%) rename src/main/java/inf112/fiasko/roborally/{elementproperties => objects/properties}/GameState.java (96%) rename src/main/java/inf112/fiasko/roborally/{elementproperties => objects/properties}/ParticleType.java (97%) rename src/main/java/inf112/fiasko/roborally/{elementproperties => objects/properties}/Position.java (96%) rename src/main/java/inf112/fiasko/roborally/{elementproperties => objects/properties}/RobotID.java (96%) rename src/main/java/inf112/fiasko/roborally/{elementproperties => objects/properties}/TileType.java (98%) rename src/main/java/inf112/fiasko/roborally/{elementproperties => objects/properties}/WallType.java (96%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/RoboRallyUI.java (96%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/RoboRallyWrapper.java (96%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/ScreenManager.java (87%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/SimpleButton.java (96%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/screens/AbstractScreen.java (96%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/screens/BoardActiveScreen.java (97%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/screens/CardChoiceScreen.java (98%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/screens/CardRectangle.java (93%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/screens/IPAddressScreen.java (97%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/screens/InteractiveScreen.java (95%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/screens/LoadingScreen.java (95%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/screens/LobbyScreen.java (94%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/screens/PowerDownScreen.java (93%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/screens/StartMenuScreen.java (96%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/screens/UsernameScreen.java (97%) rename src/main/java/inf112/fiasko/roborally/{gamewrapper => ui}/screens/WinnerScreen.java (93%) rename src/test/java/inf112/fiasko/roborally/{elementproperties => objects/properties}/DirectionTest.java (99%) rename src/test/java/inf112/fiasko/roborally/{elementproperties => objects/properties}/ParticleTypeTest.java (96%) rename src/test/java/inf112/fiasko/roborally/{elementproperties => objects/properties}/PositionTest.java (96%) rename src/test/java/inf112/fiasko/roborally/{elementproperties => objects/properties}/TileTypeTest.java (96%) rename src/test/java/inf112/fiasko/roborally/{elementproperties => objects/properties}/WallTypeTest.java (97%) diff --git a/src/main/java/inf112/fiasko/roborally/Main.java b/src/main/java/inf112/fiasko/roborally/Main.java index 24442bc..bb47ba0 100644 --- a/src/main/java/inf112/fiasko/roborally/Main.java +++ b/src/main/java/inf112/fiasko/roborally/Main.java @@ -2,7 +2,7 @@ package inf112.fiasko.roborally; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; -import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper; +import inf112.fiasko.roborally.ui.RoboRallyWrapper; /** * The mail class which runs the game diff --git a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClient.java b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClient.java index c82898c..8114e2a 100644 --- a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClient.java +++ b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClient.java @@ -1,7 +1,7 @@ package inf112.fiasko.roborally.networking; import com.esotericsoftware.kryonet.Client; -import inf112.fiasko.roborally.gamewrapper.RoboRallyUI; +import inf112.fiasko.roborally.ui.RoboRallyUI; import inf112.fiasko.roborally.utility.NetworkUtil; import java.io.IOException; diff --git a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClientListener.java b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClientListener.java index be856f1..07e3bf0 100644 --- a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClientListener.java +++ b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClientListener.java @@ -2,8 +2,6 @@ package inf112.fiasko.roborally.networking; import com.esotericsoftware.kryonet.Connection; import com.esotericsoftware.kryonet.Listener; -import inf112.fiasko.roborally.elementproperties.GameState; -import inf112.fiasko.roborally.gamewrapper.RoboRallyUI; import inf112.fiasko.roborally.networking.containers.ErrorResponse; import inf112.fiasko.roborally.networking.containers.GameStartInfoResponse; import inf112.fiasko.roborally.networking.containers.HandResponse; @@ -12,6 +10,8 @@ import inf112.fiasko.roborally.networking.containers.OkayResponse; import inf112.fiasko.roborally.networking.containers.PowerDownContainerResponse; import inf112.fiasko.roborally.networking.containers.ProgramsContainerResponse; import inf112.fiasko.roborally.objects.RoboRallyGame; +import inf112.fiasko.roborally.objects.properties.GameState; +import inf112.fiasko.roborally.ui.RoboRallyUI; import java.util.ArrayList; import java.util.concurrent.TimeUnit; @@ -93,7 +93,7 @@ class RoboRallyClientListener extends Listener { */ private void receiveGameStartInfo(GameStartInfoResponse info) { wrapper.setGame(new RoboRallyGame(info.getPlayerList(), info.getBoardName(), info.getPlayerName(), - wrapper.getServer(),wrapper.isTesting())); + wrapper.getServer(), wrapper.isTesting())); new Thread(() -> wrapper.getGame().runTurn()).start(); } diff --git a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServer.java b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServer.java index f58ff6a..51caeab 100644 --- a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServer.java +++ b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServer.java @@ -2,7 +2,7 @@ package inf112.fiasko.roborally.networking; import com.esotericsoftware.kryonet.Connection; import com.esotericsoftware.kryonet.Server; -import inf112.fiasko.roborally.elementproperties.RobotID; +import inf112.fiasko.roborally.objects.properties.RobotID; import inf112.fiasko.roborally.utility.NetworkUtil; import java.io.IOException; diff --git a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServerListener.java b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServerListener.java index a127831..51e3227 100644 --- a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServerListener.java +++ b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServerListener.java @@ -3,7 +3,6 @@ package inf112.fiasko.roborally.networking; import com.esotericsoftware.kryonet.Connection; import com.esotericsoftware.kryonet.Listener; -import inf112.fiasko.roborally.elementproperties.RobotID; import inf112.fiasko.roborally.networking.containers.ErrorResponse; import inf112.fiasko.roborally.networking.containers.HurryResponse; import inf112.fiasko.roborally.networking.containers.OkayResponse; @@ -12,6 +11,7 @@ import inf112.fiasko.roborally.networking.containers.ProgramAndPowerdownRequest; import inf112.fiasko.roborally.networking.containers.ProgramsContainerResponse; import inf112.fiasko.roborally.networking.containers.UsernameRequest; import inf112.fiasko.roborally.objects.ProgrammingCard; +import inf112.fiasko.roborally.objects.properties.RobotID; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/inf112/fiasko/roborally/objects/Board.java b/src/main/java/inf112/fiasko/roborally/objects/Board.java index 7985e24..44bf07d 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Board.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Board.java @@ -1,11 +1,11 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.ParticleType; -import inf112.fiasko.roborally.elementproperties.Position; -import inf112.fiasko.roborally.elementproperties.RobotID; -import inf112.fiasko.roborally.elementproperties.TileType; -import inf112.fiasko.roborally.elementproperties.WallType; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.ParticleType; +import inf112.fiasko.roborally.objects.properties.Position; +import inf112.fiasko.roborally.objects.properties.RobotID; +import inf112.fiasko.roborally.objects.properties.TileType; +import inf112.fiasko.roborally.objects.properties.WallType; import inf112.fiasko.roborally.utility.GridUtil; import inf112.fiasko.roborally.utility.LaserHelper; @@ -865,8 +865,8 @@ public class Board { case WALL_LASER_TRIPLE: laserDamage = 3; break; - default: - throw new IllegalArgumentException("Invalid laser type encountered."); + default: + throw new IllegalArgumentException("Invalid laser type encountered."); } robot.setDamageTaken(robot.getDamageTaken() + laserDamage); } diff --git a/src/main/java/inf112/fiasko/roborally/objects/BoardElement.java b/src/main/java/inf112/fiasko/roborally/objects/BoardElement.java index 59fdfb7..d0bc9bf 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/BoardElement.java +++ b/src/main/java/inf112/fiasko/roborally/objects/BoardElement.java @@ -1,6 +1,6 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Direction; +import inf112.fiasko.roborally.objects.properties.Direction; /** * Represents an element on the board diff --git a/src/main/java/inf112/fiasko/roborally/objects/BoardElementContainer.java b/src/main/java/inf112/fiasko/roborally/objects/BoardElementContainer.java index 13b4b86..1427ed9 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/BoardElementContainer.java +++ b/src/main/java/inf112/fiasko/roborally/objects/BoardElementContainer.java @@ -1,6 +1,6 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Position; +import inf112.fiasko.roborally.objects.properties.Position; /** * This class represents a board element and its position diff --git a/src/main/java/inf112/fiasko/roborally/objects/InteractableGame.java b/src/main/java/inf112/fiasko/roborally/objects/InteractableGame.java index d85f179..a5ec132 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/InteractableGame.java +++ b/src/main/java/inf112/fiasko/roborally/objects/InteractableGame.java @@ -1,8 +1,8 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.GameState; import inf112.fiasko.roborally.networking.containers.PowerDownContainerResponse; import inf112.fiasko.roborally.networking.containers.ProgramsContainerResponse; +import inf112.fiasko.roborally.objects.properties.GameState; import java.util.List; diff --git a/src/main/java/inf112/fiasko/roborally/objects/Particle.java b/src/main/java/inf112/fiasko/roborally/objects/Particle.java index 06e9dc2..d2a7f6d 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Particle.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Particle.java @@ -1,7 +1,7 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.ParticleType; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.ParticleType; import inf112.fiasko.roborally.utility.StringUtil; /** diff --git a/src/main/java/inf112/fiasko/roborally/objects/Phase.java b/src/main/java/inf112/fiasko/roborally/objects/Phase.java index 2b492f2..e5b4d7c 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Phase.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Phase.java @@ -1,12 +1,12 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Action; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.GameState; -import inf112.fiasko.roborally.elementproperties.Position; -import inf112.fiasko.roborally.elementproperties.RobotID; -import inf112.fiasko.roborally.elementproperties.TileType; -import inf112.fiasko.roborally.elementproperties.WallType; +import inf112.fiasko.roborally.objects.properties.Action; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.GameState; +import inf112.fiasko.roborally.objects.properties.Position; +import inf112.fiasko.roborally.objects.properties.RobotID; +import inf112.fiasko.roborally.objects.properties.TileType; +import inf112.fiasko.roborally.objects.properties.WallType; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/inf112/fiasko/roborally/objects/Player.java b/src/main/java/inf112/fiasko/roborally/objects/Player.java index 9d8a682..eae25b2 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Player.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Player.java @@ -1,6 +1,6 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.RobotID; +import inf112.fiasko.roborally.objects.properties.RobotID; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCard.java b/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCard.java index 4ae6d26..c8fda9c 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCard.java +++ b/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCard.java @@ -1,6 +1,6 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Action; +import inf112.fiasko.roborally.objects.properties.Action; /** * This class represents a programming card diff --git a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java index 621e0ee..063978d 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java +++ b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java @@ -1,14 +1,14 @@ package inf112.fiasko.roborally.objects; import com.esotericsoftware.kryonet.Connection; -import inf112.fiasko.roborally.elementproperties.GameState; -import inf112.fiasko.roborally.elementproperties.Position; -import inf112.fiasko.roborally.elementproperties.RobotID; -import inf112.fiasko.roborally.elementproperties.TileType; import inf112.fiasko.roborally.networking.RoboRallyServer; import inf112.fiasko.roborally.networking.containers.HandResponse; import inf112.fiasko.roborally.networking.containers.PowerDownContainerResponse; import inf112.fiasko.roborally.networking.containers.ProgramsContainerResponse; +import inf112.fiasko.roborally.objects.properties.GameState; +import inf112.fiasko.roborally.objects.properties.Position; +import inf112.fiasko.roborally.objects.properties.RobotID; +import inf112.fiasko.roborally.objects.properties.TileType; import inf112.fiasko.roborally.utility.BoardLoaderUtil; import inf112.fiasko.roborally.utility.DeckLoaderUtil; @@ -45,8 +45,8 @@ public class RoboRallyGame implements DrawableGame, InteractableGame { * @param server The server if this player is host. Should be null otherwise */ public RoboRallyGame(List playerList, String boardName, String playerName, - RoboRallyServer server,Boolean testingMode) { - this.testingMode=testingMode; + RoboRallyServer server, Boolean testingMode) { + this.testingMode = testingMode; this.playerName = playerName; this.host = server != null; this.playerList = playerList; @@ -246,10 +246,9 @@ public class RoboRallyGame implements DrawableGame, InteractableGame { TileType.FLAG_4, TileType.WRENCH, TileType.WRENCH_AND_HAMMER); if (host) { - if(testingMode){ + if (testingMode) { mainDeck = DeckLoaderUtil.loadProgrammingCardsTestDeck(); - } - else{ + } else { mainDeck = DeckLoaderUtil.loadProgrammingCardsDeck(); } diff --git a/src/main/java/inf112/fiasko/roborally/objects/Robot.java b/src/main/java/inf112/fiasko/roborally/objects/Robot.java index 94e4c99..871deb0 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Robot.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Robot.java @@ -1,8 +1,8 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.Position; -import inf112.fiasko.roborally.elementproperties.RobotID; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.Position; +import inf112.fiasko.roborally.objects.properties.RobotID; /** * This class represents a robot diff --git a/src/main/java/inf112/fiasko/roborally/objects/Tile.java b/src/main/java/inf112/fiasko/roborally/objects/Tile.java index 192e257..7099ab5 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Tile.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Tile.java @@ -1,7 +1,7 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.TileType; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.TileType; import inf112.fiasko.roborally.utility.StringUtil; /** diff --git a/src/main/java/inf112/fiasko/roborally/objects/Wall.java b/src/main/java/inf112/fiasko/roborally/objects/Wall.java index b2ff61a..e4b7a6c 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Wall.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Wall.java @@ -1,7 +1,7 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.WallType; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.WallType; /** * This class represents a wall diff --git a/src/main/java/inf112/fiasko/roborally/elementproperties/Action.java b/src/main/java/inf112/fiasko/roborally/objects/properties/Action.java similarity index 92% rename from src/main/java/inf112/fiasko/roborally/elementproperties/Action.java rename to src/main/java/inf112/fiasko/roborally/objects/properties/Action.java index 2a5fd01..410b58e 100644 --- a/src/main/java/inf112/fiasko/roborally/elementproperties/Action.java +++ b/src/main/java/inf112/fiasko/roborally/objects/properties/Action.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.elementproperties; +package inf112.fiasko.roborally.objects.properties; /** * This enum represents an action on a programming card diff --git a/src/main/java/inf112/fiasko/roborally/elementproperties/Direction.java b/src/main/java/inf112/fiasko/roborally/objects/properties/Direction.java similarity index 98% rename from src/main/java/inf112/fiasko/roborally/elementproperties/Direction.java rename to src/main/java/inf112/fiasko/roborally/objects/properties/Direction.java index 32f0a96..2771471 100644 --- a/src/main/java/inf112/fiasko/roborally/elementproperties/Direction.java +++ b/src/main/java/inf112/fiasko/roborally/objects/properties/Direction.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.elementproperties; +package inf112.fiasko.roborally.objects.properties; /** * This enum represents all possible directions for an element on the board diff --git a/src/main/java/inf112/fiasko/roborally/elementproperties/GameState.java b/src/main/java/inf112/fiasko/roborally/objects/properties/GameState.java similarity index 96% rename from src/main/java/inf112/fiasko/roborally/elementproperties/GameState.java rename to src/main/java/inf112/fiasko/roborally/objects/properties/GameState.java index 310023b..c9a6c03 100644 --- a/src/main/java/inf112/fiasko/roborally/elementproperties/GameState.java +++ b/src/main/java/inf112/fiasko/roborally/objects/properties/GameState.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.elementproperties; +package inf112.fiasko.roborally.objects.properties; /** * This enum represents the different states the game can be in diff --git a/src/main/java/inf112/fiasko/roborally/elementproperties/ParticleType.java b/src/main/java/inf112/fiasko/roborally/objects/properties/ParticleType.java similarity index 97% rename from src/main/java/inf112/fiasko/roborally/elementproperties/ParticleType.java rename to src/main/java/inf112/fiasko/roborally/objects/properties/ParticleType.java index 339b63e..61957bb 100644 --- a/src/main/java/inf112/fiasko/roborally/elementproperties/ParticleType.java +++ b/src/main/java/inf112/fiasko/roborally/objects/properties/ParticleType.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.elementproperties; +package inf112.fiasko.roborally.objects.properties; /** * This enum represents all possible particle types diff --git a/src/main/java/inf112/fiasko/roborally/elementproperties/Position.java b/src/main/java/inf112/fiasko/roborally/objects/properties/Position.java similarity index 96% rename from src/main/java/inf112/fiasko/roborally/elementproperties/Position.java rename to src/main/java/inf112/fiasko/roborally/objects/properties/Position.java index 14ad8a7..abe04b6 100644 --- a/src/main/java/inf112/fiasko/roborally/elementproperties/Position.java +++ b/src/main/java/inf112/fiasko/roborally/objects/properties/Position.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.elementproperties; +package inf112.fiasko.roborally.objects.properties; /** * This class represent a position on the board diff --git a/src/main/java/inf112/fiasko/roborally/elementproperties/RobotID.java b/src/main/java/inf112/fiasko/roborally/objects/properties/RobotID.java similarity index 96% rename from src/main/java/inf112/fiasko/roborally/elementproperties/RobotID.java rename to src/main/java/inf112/fiasko/roborally/objects/properties/RobotID.java index 75ec501..14e731e 100644 --- a/src/main/java/inf112/fiasko/roborally/elementproperties/RobotID.java +++ b/src/main/java/inf112/fiasko/roborally/objects/properties/RobotID.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.elementproperties; +package inf112.fiasko.roborally.objects.properties; /** * This class represents an id for marking specific robots diff --git a/src/main/java/inf112/fiasko/roborally/elementproperties/TileType.java b/src/main/java/inf112/fiasko/roborally/objects/properties/TileType.java similarity index 98% rename from src/main/java/inf112/fiasko/roborally/elementproperties/TileType.java rename to src/main/java/inf112/fiasko/roborally/objects/properties/TileType.java index 68eba0b..5be2987 100644 --- a/src/main/java/inf112/fiasko/roborally/elementproperties/TileType.java +++ b/src/main/java/inf112/fiasko/roborally/objects/properties/TileType.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.elementproperties; +package inf112.fiasko.roborally.objects.properties; /** * This enum represents all possible tile types diff --git a/src/main/java/inf112/fiasko/roborally/elementproperties/WallType.java b/src/main/java/inf112/fiasko/roborally/objects/properties/WallType.java similarity index 96% rename from src/main/java/inf112/fiasko/roborally/elementproperties/WallType.java rename to src/main/java/inf112/fiasko/roborally/objects/properties/WallType.java index 3a27b80..883ffde 100644 --- a/src/main/java/inf112/fiasko/roborally/elementproperties/WallType.java +++ b/src/main/java/inf112/fiasko/roborally/objects/properties/WallType.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.elementproperties; +package inf112.fiasko.roborally.objects.properties; /** * This enum represents all possible wall types diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/RoboRallyUI.java b/src/main/java/inf112/fiasko/roborally/ui/RoboRallyUI.java similarity index 96% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/RoboRallyUI.java rename to src/main/java/inf112/fiasko/roborally/ui/RoboRallyUI.java index 06ef8a7..d61d27e 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/RoboRallyUI.java +++ b/src/main/java/inf112/fiasko/roborally/ui/RoboRallyUI.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.gamewrapper; +package inf112.fiasko.roborally.ui; import inf112.fiasko.roborally.networking.RoboRallyServer; import inf112.fiasko.roborally.objects.RoboRallyGame; diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/RoboRallyWrapper.java b/src/main/java/inf112/fiasko/roborally/ui/RoboRallyWrapper.java similarity index 96% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/RoboRallyWrapper.java rename to src/main/java/inf112/fiasko/roborally/ui/RoboRallyWrapper.java index b526c2c..92eeae3 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/RoboRallyWrapper.java +++ b/src/main/java/inf112/fiasko/roborally/ui/RoboRallyWrapper.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.gamewrapper; +package inf112.fiasko.roborally.ui; import com.badlogic.gdx.Game; import com.badlogic.gdx.Gdx; @@ -74,7 +74,7 @@ public class RoboRallyWrapper extends Game implements RoboRallyUI { } @Override - public boolean isTesting(){ + public boolean isTesting() { return this.isTesting; } } diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/ScreenManager.java b/src/main/java/inf112/fiasko/roborally/ui/ScreenManager.java similarity index 87% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/ScreenManager.java rename to src/main/java/inf112/fiasko/roborally/ui/ScreenManager.java index c001dad..4ddd86a 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/ScreenManager.java +++ b/src/main/java/inf112/fiasko/roborally/ui/ScreenManager.java @@ -1,14 +1,14 @@ -package inf112.fiasko.roborally.gamewrapper; +package inf112.fiasko.roborally.ui; -import inf112.fiasko.roborally.gamewrapper.screens.BoardActiveScreen; -import inf112.fiasko.roborally.gamewrapper.screens.CardChoiceScreen; -import inf112.fiasko.roborally.gamewrapper.screens.IPAddressScreen; -import inf112.fiasko.roborally.gamewrapper.screens.LoadingScreen; -import inf112.fiasko.roborally.gamewrapper.screens.LobbyScreen; -import inf112.fiasko.roborally.gamewrapper.screens.PowerDownScreen; -import inf112.fiasko.roborally.gamewrapper.screens.StartMenuScreen; -import inf112.fiasko.roborally.gamewrapper.screens.UsernameScreen; -import inf112.fiasko.roborally.gamewrapper.screens.WinnerScreen; +import inf112.fiasko.roborally.ui.screens.BoardActiveScreen; +import inf112.fiasko.roborally.ui.screens.CardChoiceScreen; +import inf112.fiasko.roborally.ui.screens.IPAddressScreen; +import inf112.fiasko.roborally.ui.screens.LoadingScreen; +import inf112.fiasko.roborally.ui.screens.LobbyScreen; +import inf112.fiasko.roborally.ui.screens.PowerDownScreen; +import inf112.fiasko.roborally.ui.screens.StartMenuScreen; +import inf112.fiasko.roborally.ui.screens.UsernameScreen; +import inf112.fiasko.roborally.ui.screens.WinnerScreen; /** * Keeps track of screen instances diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/SimpleButton.java b/src/main/java/inf112/fiasko/roborally/ui/SimpleButton.java similarity index 96% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/SimpleButton.java rename to src/main/java/inf112/fiasko/roborally/ui/SimpleButton.java index d03c0f1..a008e27 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/SimpleButton.java +++ b/src/main/java/inf112/fiasko/roborally/ui/SimpleButton.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.gamewrapper; +package inf112.fiasko.roborally.ui; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.g2d.BitmapFont; diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/AbstractScreen.java b/src/main/java/inf112/fiasko/roborally/ui/screens/AbstractScreen.java similarity index 96% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/screens/AbstractScreen.java rename to src/main/java/inf112/fiasko/roborally/ui/screens/AbstractScreen.java index d038f3d..63c97ce 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/AbstractScreen.java +++ b/src/main/java/inf112/fiasko/roborally/ui/screens/AbstractScreen.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.gamewrapper.screens; +package inf112.fiasko.roborally.ui.screens; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.InputMultiplexer; diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java b/src/main/java/inf112/fiasko/roborally/ui/screens/BoardActiveScreen.java similarity index 97% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java rename to src/main/java/inf112/fiasko/roborally/ui/screens/BoardActiveScreen.java index c52079c..852d9e7 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java +++ b/src/main/java/inf112/fiasko/roborally/ui/screens/BoardActiveScreen.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.gamewrapper.screens; +package inf112.fiasko.roborally.ui.screens; import com.badlogic.gdx.Input; import com.badlogic.gdx.graphics.g2d.SpriteBatch; @@ -7,17 +7,17 @@ import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.utils.Disposable; import com.badlogic.gdx.utils.viewport.ExtendViewport; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.GameState; -import inf112.fiasko.roborally.elementproperties.RobotID; -import inf112.fiasko.roborally.elementproperties.TileType; -import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper; import inf112.fiasko.roborally.objects.DrawableGame; import inf112.fiasko.roborally.objects.DrawableObject; import inf112.fiasko.roborally.objects.InteractableGame; import inf112.fiasko.roborally.objects.Player; import inf112.fiasko.roborally.objects.Robot; import inf112.fiasko.roborally.objects.Tile; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.GameState; +import inf112.fiasko.roborally.objects.properties.RobotID; +import inf112.fiasko.roborally.objects.properties.TileType; +import inf112.fiasko.roborally.ui.RoboRallyWrapper; import inf112.fiasko.roborally.utility.IOUtil; import inf112.fiasko.roborally.utility.TextureConverterUtil; diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java b/src/main/java/inf112/fiasko/roborally/ui/screens/CardChoiceScreen.java similarity index 98% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java rename to src/main/java/inf112/fiasko/roborally/ui/screens/CardChoiceScreen.java index e7c9103..bd46f68 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java +++ b/src/main/java/inf112/fiasko/roborally/ui/screens/CardChoiceScreen.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.gamewrapper.screens; +package inf112.fiasko.roborally.ui.screens; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; @@ -12,12 +12,12 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.utils.viewport.FitViewport; -import inf112.fiasko.roborally.elementproperties.GameState; -import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper; -import inf112.fiasko.roborally.gamewrapper.SimpleButton; import inf112.fiasko.roborally.networking.containers.ProgramAndPowerdownRequest; import inf112.fiasko.roborally.objects.ProgrammingCard; import inf112.fiasko.roborally.objects.ProgrammingCardDeck; +import inf112.fiasko.roborally.objects.properties.GameState; +import inf112.fiasko.roborally.ui.RoboRallyWrapper; +import inf112.fiasko.roborally.ui.SimpleButton; import inf112.fiasko.roborally.utility.TextureConverterUtil; import javax.swing.*; diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardRectangle.java b/src/main/java/inf112/fiasko/roborally/ui/screens/CardRectangle.java similarity index 93% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardRectangle.java rename to src/main/java/inf112/fiasko/roborally/ui/screens/CardRectangle.java index ab44e4d..ddc7130 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardRectangle.java +++ b/src/main/java/inf112/fiasko/roborally/ui/screens/CardRectangle.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.gamewrapper.screens; +package inf112.fiasko.roborally.ui.screens; import com.badlogic.gdx.math.Rectangle; import inf112.fiasko.roborally.objects.ProgrammingCard; diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/IPAddressScreen.java b/src/main/java/inf112/fiasko/roborally/ui/screens/IPAddressScreen.java similarity index 97% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/screens/IPAddressScreen.java rename to src/main/java/inf112/fiasko/roborally/ui/screens/IPAddressScreen.java index c08e635..e348bfe 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/IPAddressScreen.java +++ b/src/main/java/inf112/fiasko/roborally/ui/screens/IPAddressScreen.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.gamewrapper.screens; +package inf112.fiasko.roborally.ui.screens; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.scenes.scene2d.InputEvent; @@ -8,8 +8,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.ui.TextField; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.utils.viewport.FitViewport; -import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper; import inf112.fiasko.roborally.networking.RoboRallyClient; +import inf112.fiasko.roborally.ui.RoboRallyWrapper; import javax.swing.*; import java.io.IOException; diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/InteractiveScreen.java b/src/main/java/inf112/fiasko/roborally/ui/screens/InteractiveScreen.java similarity index 95% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/screens/InteractiveScreen.java rename to src/main/java/inf112/fiasko/roborally/ui/screens/InteractiveScreen.java index 518bbc6..f85732c 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/InteractiveScreen.java +++ b/src/main/java/inf112/fiasko/roborally/ui/screens/InteractiveScreen.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.gamewrapper.screens; +package inf112.fiasko.roborally.ui.screens; import com.badlogic.gdx.InputProcessor; diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LoadingScreen.java b/src/main/java/inf112/fiasko/roborally/ui/screens/LoadingScreen.java similarity index 95% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LoadingScreen.java rename to src/main/java/inf112/fiasko/roborally/ui/screens/LoadingScreen.java index 555380f..6fbf83c 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LoadingScreen.java +++ b/src/main/java/inf112/fiasko/roborally/ui/screens/LoadingScreen.java @@ -1,11 +1,11 @@ -package inf112.fiasko.roborally.gamewrapper.screens; +package inf112.fiasko.roborally.ui.screens; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.utils.viewport.ExtendViewport; -import inf112.fiasko.roborally.elementproperties.GameState; -import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper; import inf112.fiasko.roborally.networking.containers.ProgramAndPowerdownRequest; +import inf112.fiasko.roborally.objects.properties.GameState; +import inf112.fiasko.roborally.ui.RoboRallyWrapper; import java.util.ArrayList; diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LobbyScreen.java b/src/main/java/inf112/fiasko/roborally/ui/screens/LobbyScreen.java similarity index 94% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LobbyScreen.java rename to src/main/java/inf112/fiasko/roborally/ui/screens/LobbyScreen.java index 5644a68..2a870de 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LobbyScreen.java +++ b/src/main/java/inf112/fiasko/roborally/ui/screens/LobbyScreen.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.gamewrapper.screens; +package inf112.fiasko.roborally.ui.screens; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; @@ -10,10 +10,10 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.viewport.FitViewport; import com.esotericsoftware.kryonet.Connection; -import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper; -import inf112.fiasko.roborally.gamewrapper.SimpleButton; import inf112.fiasko.roborally.networking.containers.GameStartInfoResponse; import inf112.fiasko.roborally.objects.Player; +import inf112.fiasko.roborally.ui.RoboRallyWrapper; +import inf112.fiasko.roborally.ui.SimpleButton; import inf112.fiasko.roborally.utility.IOUtil; import java.util.List; @@ -65,7 +65,8 @@ public class LobbyScreen extends InteractiveScreen { Gdx.input.setInputProcessor(stage); stage.setViewport(viewport); } - private void startGame(){ + + private void startGame() { roboRallyWrapper.server.startGame(); Map playerNames = roboRallyWrapper.server.getPlayerNames(); List playerList = IOUtil.playerGenerator(playerNames, @@ -76,6 +77,7 @@ public class LobbyScreen extends InteractiveScreen { } roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getLoadingScreen(roboRallyWrapper)); } + @Override public void show() { super.show(); @@ -93,9 +95,8 @@ public class LobbyScreen extends InteractiveScreen { selectBox.setSelected(testBoard); } return true; - } - else if(keyCode == Input.Keys.T){ - roboRallyWrapper.isTesting=true; + } else if (keyCode == Input.Keys.T) { + roboRallyWrapper.isTesting = true; String testBoard = "Manuall_testing"; selectBox.getItems().add(testBoard); selectBox.setSelected(testBoard); diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/PowerDownScreen.java b/src/main/java/inf112/fiasko/roborally/ui/screens/PowerDownScreen.java similarity index 93% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/screens/PowerDownScreen.java rename to src/main/java/inf112/fiasko/roborally/ui/screens/PowerDownScreen.java index 7a497c8..961931f 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/PowerDownScreen.java +++ b/src/main/java/inf112/fiasko/roborally/ui/screens/PowerDownScreen.java @@ -1,12 +1,12 @@ -package inf112.fiasko.roborally.gamewrapper.screens; +package inf112.fiasko.roborally.ui.screens; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.utils.viewport.FitViewport; -import inf112.fiasko.roborally.elementproperties.GameState; -import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper; -import inf112.fiasko.roborally.gamewrapper.SimpleButton; +import inf112.fiasko.roborally.objects.properties.GameState; +import inf112.fiasko.roborally.ui.RoboRallyWrapper; +import inf112.fiasko.roborally.ui.SimpleButton; /** * This screen is used for asking players whether they want to power down diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/StartMenuScreen.java b/src/main/java/inf112/fiasko/roborally/ui/screens/StartMenuScreen.java similarity index 96% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/screens/StartMenuScreen.java rename to src/main/java/inf112/fiasko/roborally/ui/screens/StartMenuScreen.java index 217ce66..c53f4e0 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/StartMenuScreen.java +++ b/src/main/java/inf112/fiasko/roborally/ui/screens/StartMenuScreen.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.gamewrapper.screens; +package inf112.fiasko.roborally.ui.screens; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.scenes.scene2d.InputEvent; @@ -7,10 +7,10 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.ui.TextField; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.utils.viewport.FitViewport; -import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper; -import inf112.fiasko.roborally.gamewrapper.SimpleButton; import inf112.fiasko.roborally.networking.RoboRallyClient; import inf112.fiasko.roborally.networking.RoboRallyServer; +import inf112.fiasko.roborally.ui.RoboRallyWrapper; +import inf112.fiasko.roborally.ui.SimpleButton; import java.io.IOException; diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/UsernameScreen.java b/src/main/java/inf112/fiasko/roborally/ui/screens/UsernameScreen.java similarity index 97% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/screens/UsernameScreen.java rename to src/main/java/inf112/fiasko/roborally/ui/screens/UsernameScreen.java index 400ddb1..fa70b67 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/UsernameScreen.java +++ b/src/main/java/inf112/fiasko/roborally/ui/screens/UsernameScreen.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.gamewrapper.screens; +package inf112.fiasko.roborally.ui.screens; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.scenes.scene2d.InputEvent; @@ -7,9 +7,9 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.ui.TextField; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.utils.viewport.FitViewport; -import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper; import inf112.fiasko.roborally.networking.RequestState; import inf112.fiasko.roborally.networking.containers.UsernameRequest; +import inf112.fiasko.roborally.ui.RoboRallyWrapper; import javax.swing.*; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/WinnerScreen.java b/src/main/java/inf112/fiasko/roborally/ui/screens/WinnerScreen.java similarity index 93% rename from src/main/java/inf112/fiasko/roborally/gamewrapper/screens/WinnerScreen.java rename to src/main/java/inf112/fiasko/roborally/ui/screens/WinnerScreen.java index 37355bc..d9dee33 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/WinnerScreen.java +++ b/src/main/java/inf112/fiasko/roborally/ui/screens/WinnerScreen.java @@ -1,12 +1,12 @@ -package inf112.fiasko.roborally.gamewrapper.screens; +package inf112.fiasko.roborally.ui.screens; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.utils.viewport.FitViewport; -import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper; -import inf112.fiasko.roborally.gamewrapper.SimpleButton; +import inf112.fiasko.roborally.ui.RoboRallyWrapper; +import inf112.fiasko.roborally.ui.SimpleButton; /** * This screen shows which player won the game diff --git a/src/main/java/inf112/fiasko/roborally/utility/BoardLoaderUtil.java b/src/main/java/inf112/fiasko/roborally/utility/BoardLoaderUtil.java index 20eba46..4a46155 100644 --- a/src/main/java/inf112/fiasko/roborally/utility/BoardLoaderUtil.java +++ b/src/main/java/inf112/fiasko/roborally/utility/BoardLoaderUtil.java @@ -1,8 +1,5 @@ package inf112.fiasko.roborally.utility; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.TileType; -import inf112.fiasko.roborally.elementproperties.WallType; import inf112.fiasko.roborally.objects.Board; import inf112.fiasko.roborally.objects.BoardElement; import inf112.fiasko.roborally.objects.BoardElementContainer; @@ -12,6 +9,9 @@ import inf112.fiasko.roborally.objects.Robot; import inf112.fiasko.roborally.objects.Tile; import inf112.fiasko.roborally.objects.TwoTuple; import inf112.fiasko.roborally.objects.Wall; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.TileType; +import inf112.fiasko.roborally.objects.properties.WallType; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/inf112/fiasko/roborally/utility/DeckLoaderUtil.java b/src/main/java/inf112/fiasko/roborally/utility/DeckLoaderUtil.java index 2e7be48..f6b3f3d 100644 --- a/src/main/java/inf112/fiasko/roborally/utility/DeckLoaderUtil.java +++ b/src/main/java/inf112/fiasko/roborally/utility/DeckLoaderUtil.java @@ -1,8 +1,8 @@ package inf112.fiasko.roborally.utility; -import inf112.fiasko.roborally.elementproperties.Action; import inf112.fiasko.roborally.objects.ProgrammingCard; import inf112.fiasko.roborally.objects.ProgrammingCardDeck; +import inf112.fiasko.roborally.objects.properties.Action; import java.io.BufferedReader; import java.io.IOException; @@ -24,10 +24,12 @@ public final class DeckLoaderUtil { public static ProgrammingCardDeck loadProgrammingCardsDeck() throws IOException { return loadCards("programming_cards.txt"); } - public static ProgrammingCardDeck loadProgrammingCardsTestDeck()throws IOException{ + + public static ProgrammingCardDeck loadProgrammingCardsTestDeck() throws IOException { return loadCards("programming_cards_manuall_testing.txt"); } - private static ProgrammingCardDeck loadCards(String cardFile) throws IOException{ + + private static ProgrammingCardDeck loadCards(String cardFile) throws IOException { BufferedReader reader = new BufferedReader(new InputStreamReader( ResourceUtil.getResourceAsInputStream(cardFile))); int numberOfCards = Integer.parseInt(reader.readLine()); diff --git a/src/main/java/inf112/fiasko/roborally/utility/GridUtil.java b/src/main/java/inf112/fiasko/roborally/utility/GridUtil.java index 0e1f08a..5de6498 100644 --- a/src/main/java/inf112/fiasko/roborally/utility/GridUtil.java +++ b/src/main/java/inf112/fiasko/roborally/utility/GridUtil.java @@ -1,9 +1,9 @@ package inf112.fiasko.roborally.utility; -import inf112.fiasko.roborally.elementproperties.Position; import inf112.fiasko.roborally.objects.BoardElement; import inf112.fiasko.roborally.objects.BoardElementContainer; import inf112.fiasko.roborally.objects.Grid; +import inf112.fiasko.roborally.objects.properties.Position; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java b/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java index 441ccc4..3363687 100644 --- a/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java +++ b/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java @@ -2,9 +2,6 @@ package inf112.fiasko.roborally.utility; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.esotericsoftware.kryonet.Connection; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.Position; -import inf112.fiasko.roborally.elementproperties.RobotID; import inf112.fiasko.roborally.objects.DrawableGame; import inf112.fiasko.roborally.objects.DrawableObject; import inf112.fiasko.roborally.objects.Particle; @@ -12,6 +9,9 @@ import inf112.fiasko.roborally.objects.Player; import inf112.fiasko.roborally.objects.Robot; import inf112.fiasko.roborally.objects.Tile; import inf112.fiasko.roborally.objects.Wall; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.Position; +import inf112.fiasko.roborally.objects.properties.RobotID; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/inf112/fiasko/roborally/utility/LaserHelper.java b/src/main/java/inf112/fiasko/roborally/utility/LaserHelper.java index 5d99e93..8186cf5 100644 --- a/src/main/java/inf112/fiasko/roborally/utility/LaserHelper.java +++ b/src/main/java/inf112/fiasko/roborally/utility/LaserHelper.java @@ -1,9 +1,9 @@ package inf112.fiasko.roborally.utility; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.ParticleType; -import inf112.fiasko.roborally.elementproperties.WallType; import inf112.fiasko.roborally.objects.Particle; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.ParticleType; +import inf112.fiasko.roborally.objects.properties.WallType; /** * Helps with displaying laser beams diff --git a/src/main/java/inf112/fiasko/roborally/utility/NetworkUtil.java b/src/main/java/inf112/fiasko/roborally/utility/NetworkUtil.java index 3941507..fe49400 100644 --- a/src/main/java/inf112/fiasko/roborally/utility/NetworkUtil.java +++ b/src/main/java/inf112/fiasko/roborally/utility/NetworkUtil.java @@ -1,8 +1,6 @@ package inf112.fiasko.roborally.utility; import com.esotericsoftware.kryo.Kryo; -import inf112.fiasko.roborally.elementproperties.Action; -import inf112.fiasko.roborally.elementproperties.RobotID; import inf112.fiasko.roborally.networking.containers.ErrorResponse; import inf112.fiasko.roborally.networking.containers.GameStartInfoResponse; import inf112.fiasko.roborally.networking.containers.HandResponse; @@ -16,6 +14,8 @@ import inf112.fiasko.roborally.objects.Deck; import inf112.fiasko.roborally.objects.Player; import inf112.fiasko.roborally.objects.ProgrammingCard; import inf112.fiasko.roborally.objects.ProgrammingCardDeck; +import inf112.fiasko.roborally.objects.properties.Action; +import inf112.fiasko.roborally.objects.properties.RobotID; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/inf112/fiasko/roborally/utility/TextureConverterUtil.java b/src/main/java/inf112/fiasko/roborally/utility/TextureConverterUtil.java index fd0b269..5f5260c 100644 --- a/src/main/java/inf112/fiasko/roborally/utility/TextureConverterUtil.java +++ b/src/main/java/inf112/fiasko/roborally/utility/TextureConverterUtil.java @@ -4,16 +4,16 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.utils.Disposable; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.ParticleType; -import inf112.fiasko.roborally.elementproperties.RobotID; -import inf112.fiasko.roborally.elementproperties.TileType; -import inf112.fiasko.roborally.elementproperties.WallType; import inf112.fiasko.roborally.objects.Particle; import inf112.fiasko.roborally.objects.ProgrammingCard; import inf112.fiasko.roborally.objects.Robot; import inf112.fiasko.roborally.objects.Tile; import inf112.fiasko.roborally.objects.Wall; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.ParticleType; +import inf112.fiasko.roborally.objects.properties.RobotID; +import inf112.fiasko.roborally.objects.properties.TileType; +import inf112.fiasko.roborally.objects.properties.WallType; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/test/java/inf112/fiasko/roborally/objects/BoardElementContainerTest.java b/src/test/java/inf112/fiasko/roborally/objects/BoardElementContainerTest.java index 75d49bb..9245403 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/BoardElementContainerTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/BoardElementContainerTest.java @@ -1,8 +1,8 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.Position; -import inf112.fiasko.roborally.elementproperties.TileType; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.Position; +import inf112.fiasko.roborally.objects.properties.TileType; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java b/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java index 577f70c..eed5468 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java @@ -1,10 +1,10 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.Position; -import inf112.fiasko.roborally.elementproperties.RobotID; -import inf112.fiasko.roborally.elementproperties.TileType; -import inf112.fiasko.roborally.elementproperties.WallType; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.Position; +import inf112.fiasko.roborally.objects.properties.RobotID; +import inf112.fiasko.roborally.objects.properties.TileType; +import inf112.fiasko.roborally.objects.properties.WallType; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/src/test/java/inf112/fiasko/roborally/objects/FakeGame.java b/src/test/java/inf112/fiasko/roborally/objects/FakeGame.java index 86af7bc..413e26c 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/FakeGame.java +++ b/src/test/java/inf112/fiasko/roborally/objects/FakeGame.java @@ -1,8 +1,8 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.GameState; import inf112.fiasko.roborally.networking.containers.PowerDownContainerResponse; import inf112.fiasko.roborally.networking.containers.ProgramsContainerResponse; +import inf112.fiasko.roborally.objects.properties.GameState; import java.util.List; diff --git a/src/test/java/inf112/fiasko/roborally/objects/ListGridTest.java b/src/test/java/inf112/fiasko/roborally/objects/ListGridTest.java index 797b14f..57706bb 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/ListGridTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/ListGridTest.java @@ -1,7 +1,7 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.TileType; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.TileType; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/inf112/fiasko/roborally/objects/ParticleTest.java b/src/test/java/inf112/fiasko/roborally/objects/ParticleTest.java index 745f180..0bc74a6 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/ParticleTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/ParticleTest.java @@ -1,7 +1,7 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.ParticleType; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.ParticleType; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java b/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java index 60283e6..cccccd1 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java @@ -1,9 +1,9 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Action; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.Position; -import inf112.fiasko.roborally.elementproperties.RobotID; +import inf112.fiasko.roborally.objects.properties.Action; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.Position; +import inf112.fiasko.roborally.objects.properties.RobotID; import inf112.fiasko.roborally.utility.BoardLoaderUtil; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/inf112/fiasko/roborally/objects/PlayerTest.java b/src/test/java/inf112/fiasko/roborally/objects/PlayerTest.java index 22210d6..d500f37 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/PlayerTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/PlayerTest.java @@ -1,7 +1,7 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Action; -import inf112.fiasko.roborally.elementproperties.RobotID; +import inf112.fiasko.roborally.objects.properties.Action; +import inf112.fiasko.roborally.objects.properties.RobotID; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/inf112/fiasko/roborally/objects/ProgrammingCardDeckTest.java b/src/test/java/inf112/fiasko/roborally/objects/ProgrammingCardDeckTest.java index fcaddc6..29990e5 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/ProgrammingCardDeckTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/ProgrammingCardDeckTest.java @@ -1,6 +1,6 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Action; +import inf112.fiasko.roborally.objects.properties.Action; import inf112.fiasko.roborally.utility.DeckLoaderUtil; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/inf112/fiasko/roborally/objects/ProgrammingCardTest.java b/src/test/java/inf112/fiasko/roborally/objects/ProgrammingCardTest.java index 169d1a9..f2299ff 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/ProgrammingCardTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/ProgrammingCardTest.java @@ -1,6 +1,6 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Action; +import inf112.fiasko.roborally.objects.properties.Action; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/inf112/fiasko/roborally/objects/RoboRallyGameTest.java b/src/test/java/inf112/fiasko/roborally/objects/RoboRallyGameTest.java index 9ef5ecb..b2a86ec 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/RoboRallyGameTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/RoboRallyGameTest.java @@ -1,7 +1,7 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Action; -import inf112.fiasko.roborally.elementproperties.GameState; +import inf112.fiasko.roborally.objects.properties.Action; +import inf112.fiasko.roborally.objects.properties.GameState; import org.junit.Before; import org.junit.Test; @@ -19,7 +19,7 @@ public class RoboRallyGameTest { @Before public void setUp() { game = new RoboRallyGame(new ArrayList<>(), "Checkmate.txt", "Player1", - null,false); + null, false); } @Test diff --git a/src/test/java/inf112/fiasko/roborally/objects/RobotTest.java b/src/test/java/inf112/fiasko/roborally/objects/RobotTest.java index b278a89..6cdad89 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/RobotTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/RobotTest.java @@ -1,7 +1,7 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Position; -import inf112.fiasko.roborally.elementproperties.RobotID; +import inf112.fiasko.roborally.objects.properties.Position; +import inf112.fiasko.roborally.objects.properties.RobotID; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/inf112/fiasko/roborally/objects/TileTest.java b/src/test/java/inf112/fiasko/roborally/objects/TileTest.java index cbff92c..5e00f65 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/TileTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/TileTest.java @@ -1,7 +1,7 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.TileType; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.TileType; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/inf112/fiasko/roborally/objects/WallTest.java b/src/test/java/inf112/fiasko/roborally/objects/WallTest.java index 093332f..99f415a 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/WallTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/WallTest.java @@ -1,7 +1,7 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.WallType; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.WallType; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/inf112/fiasko/roborally/elementproperties/DirectionTest.java b/src/test/java/inf112/fiasko/roborally/objects/properties/DirectionTest.java similarity index 99% rename from src/test/java/inf112/fiasko/roborally/elementproperties/DirectionTest.java rename to src/test/java/inf112/fiasko/roborally/objects/properties/DirectionTest.java index 75a1e61..c2e420b 100644 --- a/src/test/java/inf112/fiasko/roborally/elementproperties/DirectionTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/properties/DirectionTest.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.elementproperties; +package inf112.fiasko.roborally.objects.properties; import org.junit.Test; diff --git a/src/test/java/inf112/fiasko/roborally/elementproperties/ParticleTypeTest.java b/src/test/java/inf112/fiasko/roborally/objects/properties/ParticleTypeTest.java similarity index 96% rename from src/test/java/inf112/fiasko/roborally/elementproperties/ParticleTypeTest.java rename to src/test/java/inf112/fiasko/roborally/objects/properties/ParticleTypeTest.java index cb948a2..f4dede0 100644 --- a/src/test/java/inf112/fiasko/roborally/elementproperties/ParticleTypeTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/properties/ParticleTypeTest.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.elementproperties; +package inf112.fiasko.roborally.objects.properties; import org.junit.Test; diff --git a/src/test/java/inf112/fiasko/roborally/elementproperties/PositionTest.java b/src/test/java/inf112/fiasko/roborally/objects/properties/PositionTest.java similarity index 96% rename from src/test/java/inf112/fiasko/roborally/elementproperties/PositionTest.java rename to src/test/java/inf112/fiasko/roborally/objects/properties/PositionTest.java index 58bc884..76431c4 100644 --- a/src/test/java/inf112/fiasko/roborally/elementproperties/PositionTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/properties/PositionTest.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.elementproperties; +package inf112.fiasko.roborally.objects.properties; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/inf112/fiasko/roborally/elementproperties/TileTypeTest.java b/src/test/java/inf112/fiasko/roborally/objects/properties/TileTypeTest.java similarity index 96% rename from src/test/java/inf112/fiasko/roborally/elementproperties/TileTypeTest.java rename to src/test/java/inf112/fiasko/roborally/objects/properties/TileTypeTest.java index 8e3a2f3..f9092f8 100644 --- a/src/test/java/inf112/fiasko/roborally/elementproperties/TileTypeTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/properties/TileTypeTest.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.elementproperties; +package inf112.fiasko.roborally.objects.properties; import org.junit.Test; diff --git a/src/test/java/inf112/fiasko/roborally/elementproperties/WallTypeTest.java b/src/test/java/inf112/fiasko/roborally/objects/properties/WallTypeTest.java similarity index 97% rename from src/test/java/inf112/fiasko/roborally/elementproperties/WallTypeTest.java rename to src/test/java/inf112/fiasko/roborally/objects/properties/WallTypeTest.java index 77771d0..6fceb5c 100644 --- a/src/test/java/inf112/fiasko/roborally/elementproperties/WallTypeTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/properties/WallTypeTest.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.elementproperties; +package inf112.fiasko.roborally.objects.properties; import inf112.fiasko.roborally.objects.Wall; import org.junit.Test; diff --git a/src/test/java/inf112/fiasko/roborally/utility/TextureConverterUtilTest.java b/src/test/java/inf112/fiasko/roborally/utility/TextureConverterUtilTest.java index 35de05c..3b35bc2 100644 --- a/src/test/java/inf112/fiasko/roborally/utility/TextureConverterUtilTest.java +++ b/src/test/java/inf112/fiasko/roborally/utility/TextureConverterUtilTest.java @@ -2,9 +2,9 @@ package inf112.fiasko.roborally.utility; import com.badlogic.gdx.graphics.g2d.TextureRegion; import inf112.fiasko.roborally.GdxTestRunner; -import inf112.fiasko.roborally.elementproperties.Direction; -import inf112.fiasko.roborally.elementproperties.TileType; import inf112.fiasko.roborally.objects.Tile; +import inf112.fiasko.roborally.objects.properties.Direction; +import inf112.fiasko.roborally.objects.properties.TileType; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith;