Byttet pakkenavn.

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.game_wrapper.RoboRallyWrapper;
+import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
 
 
 public class Main {

src/main/java/inf112/fiasko/roborally/elementproperties/Action.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.element_properties;
+package inf112.fiasko.roborally.elementproperties;
 
 /**
  * This enum represents an action on a programming card

src/main/java/inf112/fiasko/roborally/elementproperties/Direction.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.element_properties;
+package inf112.fiasko.roborally.elementproperties;
 
 /**
  * This enum represents all possible directions for an element on the board

src/main/java/inf112/fiasko/roborally/elementproperties/GameState.java

@@ -1,8 +1,10 @@
-package inf112.fiasko.roborally.element_properties;
+package inf112.fiasko.roborally.elementproperties;
 
 public enum GameState {
     //Indicates that the server is waiting for something
     WAITING,
+    //Gives the game Access to the client and server
+    BEGINNING_OF_GAME,
     //Indicates that the users' input is being run. The board should be shown
     RUNNING_PROGRAMS,
     //Indicates that

src/main/java/inf112/fiasko/roborally/elementproperties/ParticleType.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.element_properties;
+package inf112.fiasko.roborally.elementproperties;
 
 public enum ParticleType {
     LASER_BEAM_SINGLE (1),

src/main/java/inf112/fiasko/roborally/elementproperties/Position.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.element_properties;
+package inf112.fiasko.roborally.elementproperties;
 
 /**
  * This class represent a position on the board

src/main/java/inf112/fiasko/roborally/elementproperties/RobotID.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.element_properties;
+package inf112.fiasko.roborally.elementproperties;
 
 /**
  * This class represents an id for marking specific robots

src/main/java/inf112/fiasko/roborally/elementproperties/TileType.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.element_properties;
+package inf112.fiasko.roborally.elementproperties;
 
 /**
  * This enum represents all possible tile types

src/main/java/inf112/fiasko/roborally/elementproperties/WallType.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.element_properties;
+package inf112.fiasko.roborally.elementproperties;
 
 /**
  * This enum represents all possible wall types

src/main/java/inf112/fiasko/roborally/gamewrapper/RoboRallyWrapper.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.game_wrapper;
+package inf112.fiasko.roborally.gamewrapper;
 
 import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;

src/main/java/inf112/fiasko/roborally/gamewrapper/ScreenManager.java

@@ -1,14 +1,13 @@
-package inf112.fiasko.roborally.game_wrapper;
+package inf112.fiasko.roborally.gamewrapper;
 
 
-import inf112.fiasko.roborally.game_wrapper.screens.BoardActiveScreen;
-import inf112.fiasko.roborally.game_wrapper.screens.CardChoiceScreen;
-import inf112.fiasko.roborally.game_wrapper.screens.LoadingScreen;
-import inf112.fiasko.roborally.game_wrapper.screens.PowerDownScreen;
-import inf112.fiasko.roborally.game_wrapper.screens.UsernameScreen;
-import inf112.fiasko.roborally.game_wrapper.screens.IPAddressScreen;
-import inf112.fiasko.roborally.game_wrapper.screens.LobbyScreen;
-import inf112.fiasko.roborally.game_wrapper.screens.StartMenuScreen;
+import inf112.fiasko.roborally.gamewrapper.screens.BoardActiveScreen;
+import inf112.fiasko.roborally.gamewrapper.screens.LoadingScreen;
+import inf112.fiasko.roborally.gamewrapper.screens.PowerDownScreen;
+import inf112.fiasko.roborally.gamewrapper.screens.UsernameScreen;
+import inf112.fiasko.roborally.gamewrapper.screens.IPAddressScreen;
+import inf112.fiasko.roborally.gamewrapper.screens.LobbyScreen;
+import inf112.fiasko.roborally.gamewrapper.screens.StartMenuScreen;
 
 /**
  * Keeps track of screen instances

src/main/java/inf112/fiasko/roborally/gamewrapper/SimpleButton.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.game_wrapper;
+package inf112.fiasko.roborally.gamewrapper;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;

src/main/java/inf112/fiasko/roborally/gamewrapper/screens/AbstractScreen.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.game_wrapper.screens;
+package inf112.fiasko.roborally.gamewrapper.screens;
 
 import com.badlogic.gdx.Screen;
 

src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.game_wrapper.screens;
+package inf112.fiasko.roborally.gamewrapper.screens;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
@@ -12,7 +12,7 @@ import com.badlogic.gdx.math.Vector3;
 import com.badlogic.gdx.utils.Disposable;
 import com.badlogic.gdx.utils.viewport.ExtendViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
-import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
+import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
 import inf112.fiasko.roborally.objects.IDrawableGame;
 import inf112.fiasko.roborally.objects.IDrawableObject;
 import inf112.fiasko.roborally.utility.IOUtil;

src/main/java/inf112/fiasko/roborally/gamewrapper/screens/IPAddressScreen.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.game_wrapper.screens;
+package inf112.fiasko.roborally.gamewrapper.screens;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.GL20;
@@ -11,7 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextField;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import com.badlogic.gdx.utils.viewport.FitViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
-import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
+import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
 import inf112.fiasko.roborally.networking.RoboRallyClient;
 
 

src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LobbyScreen.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.game_wrapper.screens;
+package inf112.fiasko.roborally.gamewrapper.screens;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.GL20;
@@ -9,8 +9,8 @@ import com.badlogic.gdx.scenes.scene2d.Stage;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.utils.viewport.FitViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
-import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
-import inf112.fiasko.roborally.game_wrapper.SimpleButton;
+import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
+import inf112.fiasko.roborally.gamewrapper.SimpleButton;
 import inf112.fiasko.roborally.networking.containers.GameStartInfo;
 import inf112.fiasko.roborally.objects.Player;
 import inf112.fiasko.roborally.utility.IOUtil;
@@ -54,7 +54,7 @@ public class LobbyScreen extends AbstractScreen {
                             ,playerlist,playernames.get(connection)));
                 }
                 roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getLoadingScreen(roboRallyWrapper));
-                return true;//her we do stuff
+                return true;
             }
         });
         stage.setViewport(viewport);

src/main/java/inf112/fiasko/roborally/gamewrapper/screens/PowerDownScreen.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.game_wrapper.screens;
+package inf112.fiasko.roborally.gamewrapper.screens;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.GL20;
@@ -9,8 +9,8 @@ import com.badlogic.gdx.scenes.scene2d.Stage;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.utils.viewport.FitViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
-import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
-import inf112.fiasko.roborally.game_wrapper.SimpleButton;
+import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
+import inf112.fiasko.roborally.gamewrapper.SimpleButton;
 
 /**
  * This screen is used for asking players whether they want to power down

src/main/java/inf112/fiasko/roborally/gamewrapper/screens/StartMenuScreen.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.game_wrapper.screens;
+package inf112.fiasko.roborally.gamewrapper.screens;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.GL20;
@@ -9,8 +9,8 @@ import com.badlogic.gdx.scenes.scene2d.Stage;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.utils.viewport.FitViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
-import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
-import inf112.fiasko.roborally.game_wrapper.SimpleButton;
+import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
+import inf112.fiasko.roborally.gamewrapper.SimpleButton;
 import inf112.fiasko.roborally.networking.RoboRallyClient;
 import inf112.fiasko.roborally.networking.RoboRallyServer;
 

src/main/java/inf112/fiasko/roborally/gamewrapper/screens/UsernameScreen.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.game_wrapper.screens;
+package inf112.fiasko.roborally.gamewrapper.screens;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.GL20;
@@ -11,7 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextField;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import com.badlogic.gdx.utils.viewport.FitViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
-import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
+import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
 
 /**
  * This screen allows a user to choose their player name

src/main/java/inf112/fiasko/roborally/objects/BoardElementContainer.java

@@ -1,6 +1,6 @@
 package inf112.fiasko.roborally.objects;
 
-import inf112.fiasko.roborally.element_properties.Position;
+import inf112.fiasko.roborally.elementproperties.Position;
 
 /**
  * This class represents a board element and its position

src/main/java/inf112/fiasko/roborally/objects/IDrawableGame.java

@@ -1,6 +1,6 @@
 package inf112.fiasko.roborally.objects;
 
-import inf112.fiasko.roborally.element_properties.GameState;
+import inf112.fiasko.roborally.elementproperties.GameState;
 import inf112.fiasko.roborally.networking.RoboRallyClient;
 import inf112.fiasko.roborally.networking.RoboRallyServer;
 

src/main/java/inf112/fiasko/roborally/objects/Particle.java

@@ -1,7 +1,7 @@
 package inf112.fiasko.roborally.objects;
 
-import inf112.fiasko.roborally.element_properties.Direction;
-import inf112.fiasko.roborally.element_properties.ParticleType;
+import inf112.fiasko.roborally.elementproperties.Direction;
+import inf112.fiasko.roborally.elementproperties.ParticleType;
 
 /**
  * This class represents a particle

src/main/java/inf112/fiasko/roborally/objects/Player.java

@@ -1,6 +1,6 @@
 package inf112.fiasko.roborally.objects;
 
-import inf112.fiasko.roborally.element_properties.RobotID;
+import inf112.fiasko.roborally.elementproperties.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.element_properties.Action;
+import inf112.fiasko.roborally.elementproperties.Action;
 
 /**
  * This class represents a programming card

src/main/java/inf112/fiasko/roborally/objects/Robot.java

@@ -1,8 +1,8 @@
 package inf112.fiasko.roborally.objects;
 
-import inf112.fiasko.roborally.element_properties.Direction;
-import inf112.fiasko.roborally.element_properties.Position;
-import inf112.fiasko.roborally.element_properties.RobotID;
+import inf112.fiasko.roborally.elementproperties.Direction;
+import inf112.fiasko.roborally.elementproperties.Position;
+import inf112.fiasko.roborally.elementproperties.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.element_properties.Direction;
-import inf112.fiasko.roborally.element_properties.TileType;
+import inf112.fiasko.roborally.elementproperties.Direction;
+import inf112.fiasko.roborally.elementproperties.TileType;
 
 /**
  * This class represents a simple tile

src/main/java/inf112/fiasko/roborally/objects/Wall.java

@@ -1,7 +1,7 @@
 package inf112.fiasko.roborally.objects;
 
-import inf112.fiasko.roborally.element_properties.Direction;
-import inf112.fiasko.roborally.element_properties.WallType;
+import inf112.fiasko.roborally.elementproperties.Direction;
+import inf112.fiasko.roborally.elementproperties.WallType;
 
 /**
  * This class represents a wall

src/main/java/inf112/fiasko/roborally/utility/BoardLoaderUtil.java

@@ -1,8 +1,8 @@
 package inf112.fiasko.roborally.utility;
 
-import inf112.fiasko.roborally.element_properties.Direction;
-import inf112.fiasko.roborally.element_properties.TileType;
-import inf112.fiasko.roborally.element_properties.WallType;
+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.IGrid;
 import inf112.fiasko.roborally.objects.Robot;

src/main/java/inf112/fiasko/roborally/utility/DeckLoaderUtil.java

@@ -1,6 +1,6 @@
 package inf112.fiasko.roborally.utility;
 
-import inf112.fiasko.roborally.element_properties.Action;
+import inf112.fiasko.roborally.elementproperties.Action;
 import inf112.fiasko.roborally.objects.ProgrammingCard;
 import inf112.fiasko.roborally.objects.ProgrammingCardDeck;
 

src/main/java/inf112/fiasko/roborally/utility/IOUtil.java

@@ -1,9 +1,9 @@
 package inf112.fiasko.roborally.utility;
 
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import inf112.fiasko.roborally.element_properties.Direction;
-import inf112.fiasko.roborally.element_properties.Position;
-import inf112.fiasko.roborally.element_properties.RobotID;
+import inf112.fiasko.roborally.elementproperties.Direction;
+import inf112.fiasko.roborally.elementproperties.Position;
+import inf112.fiasko.roborally.elementproperties.RobotID;
 import inf112.fiasko.roborally.objects.Player;
 import inf112.fiasko.roborally.objects.IDrawableObject;
 import inf112.fiasko.roborally.objects.Tile;

src/main/java/inf112/fiasko/roborally/utility/NetworkUtil.java

@@ -1,7 +1,7 @@
 package inf112.fiasko.roborally.utility;
 
 import com.esotericsoftware.kryo.Kryo;
-import inf112.fiasko.roborally.element_properties.RobotID;
+import inf112.fiasko.roborally.elementproperties.RobotID;
 import inf112.fiasko.roborally.networking.containers.ErrorResponse;
 import inf112.fiasko.roborally.networking.containers.GameStartInfo;
 import inf112.fiasko.roborally.objects.IDeck;

src/main/java/inf112/fiasko/roborally/utility/TextureConverterUtil.java

@@ -4,11 +4,11 @@ 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.element_properties.Direction;
-import inf112.fiasko.roborally.element_properties.ParticleType;
-import inf112.fiasko.roborally.element_properties.RobotID;
-import inf112.fiasko.roborally.element_properties.TileType;
-import inf112.fiasko.roborally.element_properties.WallType;
+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.Robot;
 import inf112.fiasko.roborally.objects.Tile;