renamet packeges

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

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;

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();
     }
 

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;

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;

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.objects.properties.Direction;
-import inf112.fiasko.roborally.elementproperties.ParticleType;
+import inf112.fiasko.roborally.objects.properties.ParticleType;
-import inf112.fiasko.roborally.elementproperties.Position;
+import inf112.fiasko.roborally.objects.properties.Position;
-import inf112.fiasko.roborally.elementproperties.RobotID;
+import inf112.fiasko.roborally.objects.properties.RobotID;
-import inf112.fiasko.roborally.elementproperties.TileType;
+import inf112.fiasko.roborally.objects.properties.TileType;
-import inf112.fiasko.roborally.elementproperties.WallType;
+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:
+            default:
-                 throw new IllegalArgumentException("Invalid laser type encountered.");
+                throw new IllegalArgumentException("Invalid laser type encountered.");
         }
         robot.setDamageTaken(robot.getDamageTaken() + laserDamage);
     }

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

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

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;
 

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.objects.properties.Direction;
-import inf112.fiasko.roborally.elementproperties.ParticleType;
+import inf112.fiasko.roborally.objects.properties.ParticleType;
 import inf112.fiasko.roborally.utility.StringUtil;
 
 /**

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.objects.properties.Action;
-import inf112.fiasko.roborally.elementproperties.Direction;
+import inf112.fiasko.roborally.objects.properties.Direction;
-import inf112.fiasko.roborally.elementproperties.GameState;
+import inf112.fiasko.roborally.objects.properties.GameState;
-import inf112.fiasko.roborally.elementproperties.Position;
+import inf112.fiasko.roborally.objects.properties.Position;
-import inf112.fiasko.roborally.elementproperties.RobotID;
+import inf112.fiasko.roborally.objects.properties.RobotID;
-import inf112.fiasko.roborally.elementproperties.TileType;
+import inf112.fiasko.roborally.objects.properties.TileType;
-import inf112.fiasko.roborally.elementproperties.WallType;
+import inf112.fiasko.roborally.objects.properties.WallType;
 
 import java.util.ArrayList;
 import java.util.Collections;

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;

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

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<Player> playerList, String boardName, String playerName,
-                         RoboRallyServer server,Boolean testingMode) {
+                         RoboRallyServer server, Boolean testingMode) {
-        this.testingMode=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();
                 }
 

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.objects.properties.Direction;
-import inf112.fiasko.roborally.elementproperties.Position;
+import inf112.fiasko.roborally.objects.properties.Position;
-import inf112.fiasko.roborally.elementproperties.RobotID;
+import inf112.fiasko.roborally.objects.properties.RobotID;
 
 /**
  * This class represents a robot

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.objects.properties.Direction;
-import inf112.fiasko.roborally.elementproperties.TileType;
+import inf112.fiasko.roborally.objects.properties.TileType;
 import inf112.fiasko.roborally.utility.StringUtil;
 
 /**

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.objects.properties.Direction;
-import inf112.fiasko.roborally.elementproperties.WallType;
+import inf112.fiasko.roborally.objects.properties.WallType;
 
 /**
  * This class represents a wall

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

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

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

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

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

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

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

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

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;

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;
     }
 }

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.ui.screens.BoardActiveScreen;
-import inf112.fiasko.roborally.gamewrapper.screens.CardChoiceScreen;
+import inf112.fiasko.roborally.ui.screens.CardChoiceScreen;
-import inf112.fiasko.roborally.gamewrapper.screens.IPAddressScreen;
+import inf112.fiasko.roborally.ui.screens.IPAddressScreen;
-import inf112.fiasko.roborally.gamewrapper.screens.LoadingScreen;
+import inf112.fiasko.roborally.ui.screens.LoadingScreen;
-import inf112.fiasko.roborally.gamewrapper.screens.LobbyScreen;
+import inf112.fiasko.roborally.ui.screens.LobbyScreen;
-import inf112.fiasko.roborally.gamewrapper.screens.PowerDownScreen;
+import inf112.fiasko.roborally.ui.screens.PowerDownScreen;
-import inf112.fiasko.roborally.gamewrapper.screens.StartMenuScreen;
+import inf112.fiasko.roborally.ui.screens.StartMenuScreen;
-import inf112.fiasko.roborally.gamewrapper.screens.UsernameScreen;
+import inf112.fiasko.roborally.ui.screens.UsernameScreen;
-import inf112.fiasko.roborally.gamewrapper.screens.WinnerScreen;
+import inf112.fiasko.roborally.ui.screens.WinnerScreen;
 
 /**
  * Keeps track of screen instances

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;

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;

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;
 

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.*;

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;

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;

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;
 

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;
 

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<Connection, String> playerNames = roboRallyWrapper.server.getPlayerNames();
         List<Player> 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) {
-        else if(keyCode == Input.Keys.T){
+            roboRallyWrapper.isTesting = true;
-            roboRallyWrapper.isTesting=true;
             String testBoard = "Manuall_testing";
             selectBox.getItems().add(testBoard);
             selectBox.setSelected(testBoard);

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.objects.properties.GameState;
-import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
+import inf112.fiasko.roborally.ui.RoboRallyWrapper;
-import inf112.fiasko.roborally.gamewrapper.SimpleButton;
+import inf112.fiasko.roborally.ui.SimpleButton;
 
 /**
  * This screen is used for asking players whether they want to power down

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;
 

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;

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.ui.RoboRallyWrapper;
-import inf112.fiasko.roborally.gamewrapper.SimpleButton;
+import inf112.fiasko.roborally.ui.SimpleButton;
 
 /**
  * This screen shows which player won the game

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;

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());

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;

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;

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

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;

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;

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.objects.properties.Direction;
-import inf112.fiasko.roborally.elementproperties.Position;
+import inf112.fiasko.roborally.objects.properties.Position;
-import inf112.fiasko.roborally.elementproperties.TileType;
+import inf112.fiasko.roborally.objects.properties.TileType;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

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.objects.properties.Direction;
-import inf112.fiasko.roborally.elementproperties.Position;
+import inf112.fiasko.roborally.objects.properties.Position;
-import inf112.fiasko.roborally.elementproperties.RobotID;
+import inf112.fiasko.roborally.objects.properties.RobotID;
-import inf112.fiasko.roborally.elementproperties.TileType;
+import inf112.fiasko.roborally.objects.properties.TileType;
-import inf112.fiasko.roborally.elementproperties.WallType;
+import inf112.fiasko.roborally.objects.properties.WallType;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;

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;
 

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.objects.properties.Direction;
-import inf112.fiasko.roborally.elementproperties.TileType;
+import inf112.fiasko.roborally.objects.properties.TileType;
 import org.junit.Before;
 import org.junit.Test;
 

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.objects.properties.Direction;
-import inf112.fiasko.roborally.elementproperties.ParticleType;
+import inf112.fiasko.roborally.objects.properties.ParticleType;
 import org.junit.Before;
 import org.junit.Test;
 

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.objects.properties.Action;
-import inf112.fiasko.roborally.elementproperties.Direction;
+import inf112.fiasko.roborally.objects.properties.Direction;
-import inf112.fiasko.roborally.elementproperties.Position;
+import inf112.fiasko.roborally.objects.properties.Position;
-import inf112.fiasko.roborally.elementproperties.RobotID;
+import inf112.fiasko.roborally.objects.properties.RobotID;
 import inf112.fiasko.roborally.utility.BoardLoaderUtil;
 import org.junit.Before;
 import org.junit.Test;

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.objects.properties.Action;
-import inf112.fiasko.roborally.elementproperties.RobotID;
+import inf112.fiasko.roborally.objects.properties.RobotID;
 import org.junit.Before;
 import org.junit.Test;
 

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;

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;
 

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.objects.properties.Action;
-import inf112.fiasko.roborally.elementproperties.GameState;
+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

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.objects.properties.Position;
-import inf112.fiasko.roborally.elementproperties.RobotID;
+import inf112.fiasko.roborally.objects.properties.RobotID;
 import org.junit.Before;
 import org.junit.Test;
 

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.objects.properties.Direction;
-import inf112.fiasko.roborally.elementproperties.TileType;
+import inf112.fiasko.roborally.objects.properties.TileType;
 import org.junit.Before;
 import org.junit.Test;
 

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.objects.properties.Direction;
-import inf112.fiasko.roborally.elementproperties.WallType;
+import inf112.fiasko.roborally.objects.properties.WallType;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

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;
 

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;
 

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;

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;
 

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;

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;