EpicKnarvik97/Fiasko
EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2024-10-16 18:23:38 +02:00
Code Issues Projects Releases Wiki Activity

Byttet pakkenavn.

Browse Source
This commit is contained in:
Steinar Aalstad Lillesund 2020-04-14 15:54:09 +02:00
parent 9f716cc9a3
commit 382960d623
49 changed files with 94 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/inf112/fiasko/roborally/Main.java
View File

@ -2,7 +2,7 @@ package inf112.fiasko.roborally;
import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper; import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
public class Main { public class Main {

2
src/main/java/inf112/fiasko/roborally/element_properties/Action.java → src/main/java/inf112/fiasko/roborally/elementproperties/Action.java
View File

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

2
src/main/java/inf112/fiasko/roborally/element_properties/Direction.java → src/main/java/inf112/fiasko/roborally/elementproperties/Direction.java
View File

@ -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 * This enum represents all possible directions for an element on the board

4
src/main/java/inf112/fiasko/roborally/element_properties/GameState.java → src/main/java/inf112/fiasko/roborally/elementproperties/GameState.java
View File

@ -1,8 +1,10 @@
package inf112.fiasko.roborally.element_properties; package inf112.fiasko.roborally.elementproperties;
public enum GameState { public enum GameState {
//Indicates that the server is waiting for something //Indicates that the server is waiting for something
WAITING, 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 //Indicates that the users' input is being run. The board should be shown
RUNNING_PROGRAMS, RUNNING_PROGRAMS,
//Indicates that //Indicates that

2
src/main/java/inf112/fiasko/roborally/element_properties/ParticleType.java → src/main/java/inf112/fiasko/roborally/elementproperties/ParticleType.java
View File

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

2
src/main/java/inf112/fiasko/roborally/element_properties/Position.java → src/main/java/inf112/fiasko/roborally/elementproperties/Position.java
View File

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

2
src/main/java/inf112/fiasko/roborally/element_properties/RobotID.java → src/main/java/inf112/fiasko/roborally/elementproperties/RobotID.java
View File

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

2
src/main/java/inf112/fiasko/roborally/element_properties/TileType.java → src/main/java/inf112/fiasko/roborally/elementproperties/TileType.java
View File

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

2
src/main/java/inf112/fiasko/roborally/element_properties/WallType.java → src/main/java/inf112/fiasko/roborally/elementproperties/WallType.java
View File

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

2
src/main/java/inf112/fiasko/roborally/game_wrapper/RoboRallyWrapper.java → src/main/java/inf112/fiasko/roborally/gamewrapper/RoboRallyWrapper.java
View File

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

17
src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java → src/main/java/inf112/fiasko/roborally/gamewrapper/ScreenManager.java
View File

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

2
src/main/java/inf112/fiasko/roborally/game_wrapper/SimpleButton.java → src/main/java/inf112/fiasko/roborally/gamewrapper/SimpleButton.java
View File

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

2
src/main/java/inf112/fiasko/roborally/game_wrapper/screens/AbstractScreen.java → src/main/java/inf112/fiasko/roborally/gamewrapper/screens/AbstractScreen.java
View File

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

4
src/main/java/inf112/fiasko/roborally/game_wrapper/screens/BoardActiveScreen.java → src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java
View File

@ -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.Gdx;
import com.badlogic.gdx.Input; 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.Disposable;
import com.badlogic.gdx.utils.viewport.ExtendViewport; import com.badlogic.gdx.utils.viewport.ExtendViewport;
import com.badlogic.gdx.utils.viewport.Viewport; 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.IDrawableGame;
import inf112.fiasko.roborally.objects.IDrawableObject; import inf112.fiasko.roborally.objects.IDrawableObject;
import inf112.fiasko.roborally.utility.IOUtil; import inf112.fiasko.roborally.utility.IOUtil;

4
src/main/java/inf112/fiasko/roborally/game_wrapper/screens/IPAddressScreen.java → src/main/java/inf112/fiasko/roborally/gamewrapper/screens/IPAddressScreen.java
View File

@ -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.Gdx;
import com.badlogic.gdx.graphics.GL20; 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.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.utils.viewport.FitViewport; import com.badlogic.gdx.utils.viewport.FitViewport;
import com.badlogic.gdx.utils.viewport.Viewport; 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; import inf112.fiasko.roborally.networking.RoboRallyClient;

8
src/main/java/inf112/fiasko/roborally/game_wrapper/screens/LobbyScreen.java → src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LobbyScreen.java
View File

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

6
src/main/java/inf112/fiasko/roborally/game_wrapper/screens/PowerDownScreen.java → src/main/java/inf112/fiasko/roborally/gamewrapper/screens/PowerDownScreen.java
View File

@ -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.Gdx;
import com.badlogic.gdx.graphics.GL20; 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.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.utils.viewport.FitViewport; import com.badlogic.gdx.utils.viewport.FitViewport;
import com.badlogic.gdx.utils.viewport.Viewport; import com.badlogic.gdx.utils.viewport.Viewport;
import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper; import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
import inf112.fiasko.roborally.game_wrapper.SimpleButton; import inf112.fiasko.roborally.gamewrapper.SimpleButton;
/** /**
* This screen is used for asking players whether they want to power down * This screen is used for asking players whether they want to power down

6
src/main/java/inf112/fiasko/roborally/game_wrapper/screens/StartMenuScreen.java → src/main/java/inf112/fiasko/roborally/gamewrapper/screens/StartMenuScreen.java
View File

@ -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.Gdx;
import com.badlogic.gdx.graphics.GL20; 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.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.utils.viewport.FitViewport; import com.badlogic.gdx.utils.viewport.FitViewport;
import com.badlogic.gdx.utils.viewport.Viewport; import com.badlogic.gdx.utils.viewport.Viewport;
import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper; import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
import inf112.fiasko.roborally.game_wrapper.SimpleButton; import inf112.fiasko.roborally.gamewrapper.SimpleButton;
import inf112.fiasko.roborally.networking.RoboRallyClient; import inf112.fiasko.roborally.networking.RoboRallyClient;
import inf112.fiasko.roborally.networking.RoboRallyServer; import inf112.fiasko.roborally.networking.RoboRallyServer;

4
src/main/java/inf112/fiasko/roborally/game_wrapper/screens/UsernameScreen.java → src/main/java/inf112/fiasko/roborally/gamewrapper/screens/UsernameScreen.java
View File

@ -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.Gdx;
import com.badlogic.gdx.graphics.GL20; 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.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.utils.viewport.FitViewport; import com.badlogic.gdx.utils.viewport.FitViewport;
import com.badlogic.gdx.utils.viewport.Viewport; 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 * This screen allows a user to choose their player name

2
src/main/java/inf112/fiasko/roborally/objects/BoardElementContainer.java
View File

@ -1,6 +1,6 @@
package inf112.fiasko.roborally.objects; 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 * This class represents a board element and its position

2
src/main/java/inf112/fiasko/roborally/objects/IDrawableGame.java
View File

@ -1,6 +1,6 @@
package inf112.fiasko.roborally.objects; 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.RoboRallyClient;
import inf112.fiasko.roborally.networking.RoboRallyServer; import inf112.fiasko.roborally.networking.RoboRallyServer;

4
src/main/java/inf112/fiasko/roborally/objects/Particle.java
View File

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

2
src/main/java/inf112/fiasko/roborally/objects/Player.java
View File

@ -1,6 +1,6 @@
package inf112.fiasko.roborally.objects; 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.ArrayList;
import java.util.List; import java.util.List;

2
src/main/java/inf112/fiasko/roborally/objects/ProgrammingCard.java
View File

@ -1,6 +1,6 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.Action; import inf112.fiasko.roborally.elementproperties.Action;
/** /**
* This class represents a programming card * This class represents a programming card

6
src/main/java/inf112/fiasko/roborally/objects/Robot.java
View File

@ -1,8 +1,8 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.Direction; import inf112.fiasko.roborally.elementproperties.Direction;
import inf112.fiasko.roborally.element_properties.Position; import inf112.fiasko.roborally.elementproperties.Position;
import inf112.fiasko.roborally.element_properties.RobotID; import inf112.fiasko.roborally.elementproperties.RobotID;
/** /**
* This class represents a robot * This class represents a robot

4
src/main/java/inf112/fiasko/roborally/objects/Tile.java
View File

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

4
src/main/java/inf112/fiasko/roborally/objects/Wall.java
View File

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

6
src/main/java/inf112/fiasko/roborally/utility/BoardLoaderUtil.java
View File

@ -1,8 +1,8 @@
package inf112.fiasko.roborally.utility; package inf112.fiasko.roborally.utility;
import inf112.fiasko.roborally.element_properties.Direction; import inf112.fiasko.roborally.elementproperties.Direction;
import inf112.fiasko.roborally.element_properties.TileType; import inf112.fiasko.roborally.elementproperties.TileType;
import inf112.fiasko.roborally.element_properties.WallType; import inf112.fiasko.roborally.elementproperties.WallType;
import inf112.fiasko.roborally.objects.Board; import inf112.fiasko.roborally.objects.Board;
import inf112.fiasko.roborally.objects.IGrid; import inf112.fiasko.roborally.objects.IGrid;
import inf112.fiasko.roborally.objects.Robot; import inf112.fiasko.roborally.objects.Robot;

2
src/main/java/inf112/fiasko/roborally/utility/DeckLoaderUtil.java
View File

@ -1,6 +1,6 @@
package inf112.fiasko.roborally.utility; 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.ProgrammingCard;
import inf112.fiasko.roborally.objects.ProgrammingCardDeck; import inf112.fiasko.roborally.objects.ProgrammingCardDeck;

6
src/main/java/inf112/fiasko/roborally/utility/IOUtil.java
View File

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

2
src/main/java/inf112/fiasko/roborally/utility/NetworkUtil.java
View File

@ -1,7 +1,7 @@
package inf112.fiasko.roborally.utility; package inf112.fiasko.roborally.utility;
import com.esotericsoftware.kryo.Kryo; 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.ErrorResponse;
import inf112.fiasko.roborally.networking.containers.GameStartInfo; import inf112.fiasko.roborally.networking.containers.GameStartInfo;
import inf112.fiasko.roborally.objects.IDeck; import inf112.fiasko.roborally.objects.IDeck;

10
src/main/java/inf112/fiasko/roborally/utility/TextureConverterUtil.java
View File

@ -4,11 +4,11 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.Disposable; import com.badlogic.gdx.utils.Disposable;
import inf112.fiasko.roborally.element_properties.Direction; import inf112.fiasko.roborally.elementproperties.Direction;
import inf112.fiasko.roborally.element_properties.ParticleType; import inf112.fiasko.roborally.elementproperties.ParticleType;
import inf112.fiasko.roborally.element_properties.RobotID; import inf112.fiasko.roborally.elementproperties.RobotID;
import inf112.fiasko.roborally.element_properties.TileType; import inf112.fiasko.roborally.elementproperties.TileType;
import inf112.fiasko.roborally.element_properties.WallType; import inf112.fiasko.roborally.elementproperties.WallType;
import inf112.fiasko.roborally.objects.Particle; import inf112.fiasko.roborally.objects.Particle;
import inf112.fiasko.roborally.objects.Robot; import inf112.fiasko.roborally.objects.Robot;
import inf112.fiasko.roborally.objects.Tile; import inf112.fiasko.roborally.objects.Tile;

2
src/test/java/inf112/fiasko/roborally/element_properties/DirectionTest.java → src/test/java/inf112/fiasko/roborally/elementproperties/DirectionTest.java
View File

@ -1,4 +1,4 @@
package inf112.fiasko.roborally.element_properties; package inf112.fiasko.roborally.elementproperties;
import org.junit.Test; import org.junit.Test;

2
src/test/java/inf112/fiasko/roborally/element_properties/ParticleTypeTest.java → src/test/java/inf112/fiasko/roborally/elementproperties/ParticleTypeTest.java
View File

@ -1,4 +1,4 @@
package inf112.fiasko.roborally.element_properties; package inf112.fiasko.roborally.elementproperties;
import org.junit.Test; import org.junit.Test;

2
src/test/java/inf112/fiasko/roborally/element_properties/PositionTest.java → src/test/java/inf112/fiasko/roborally/elementproperties/PositionTest.java
View File

@ -1,4 +1,4 @@
package inf112.fiasko.roborally.element_properties; package inf112.fiasko.roborally.elementproperties;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

2
src/test/java/inf112/fiasko/roborally/element_properties/TileTypeTest.java → src/test/java/inf112/fiasko/roborally/elementproperties/TileTypeTest.java
View File

@ -1,4 +1,4 @@
package inf112.fiasko.roborally.element_properties; package inf112.fiasko.roborally.elementproperties;
import org.junit.Test; import org.junit.Test;

2
src/test/java/inf112/fiasko/roborally/element_properties/WallTypeTest.java → src/test/java/inf112/fiasko/roborally/elementproperties/WallTypeTest.java
View File

@ -1,4 +1,4 @@
package inf112.fiasko.roborally.element_properties; package inf112.fiasko.roborally.elementproperties;
import inf112.fiasko.roborally.objects.Wall; import inf112.fiasko.roborally.objects.Wall;
import org.junit.Test; import org.junit.Test;

6
src/test/java/inf112/fiasko/roborally/objects/BoardElementContainerTest.java
View File

@ -1,8 +1,8 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.Direction; import inf112.fiasko.roborally.elementproperties.Direction;
import inf112.fiasko.roborally.element_properties.Position; import inf112.fiasko.roborally.elementproperties.Position;
import inf112.fiasko.roborally.element_properties.TileType; import inf112.fiasko.roborally.elementproperties.TileType;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

10
src/test/java/inf112/fiasko/roborally/objects/BoardTest.java
View File

@ -1,10 +1,10 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.Direction; import inf112.fiasko.roborally.elementproperties.Direction;
import inf112.fiasko.roborally.element_properties.Position; import inf112.fiasko.roborally.elementproperties.Position;
import inf112.fiasko.roborally.element_properties.RobotID; import inf112.fiasko.roborally.elementproperties.RobotID;
import inf112.fiasko.roborally.element_properties.TileType; import inf112.fiasko.roborally.elementproperties.TileType;
import inf112.fiasko.roborally.element_properties.WallType; import inf112.fiasko.roborally.elementproperties.WallType;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;

4
src/test/java/inf112/fiasko/roborally/objects/GridTest.java
View File

@ -1,7 +1,7 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.Direction; import inf112.fiasko.roborally.elementproperties.Direction;
import inf112.fiasko.roborally.element_properties.TileType; import inf112.fiasko.roborally.elementproperties.TileType;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

4
src/test/java/inf112/fiasko/roborally/objects/ParticleTest.java
View File

@ -1,7 +1,7 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.Direction; import inf112.fiasko.roborally.elementproperties.Direction;
import inf112.fiasko.roborally.element_properties.ParticleType; import inf112.fiasko.roborally.elementproperties.ParticleType;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

4
src/test/java/inf112/fiasko/roborally/objects/PlayerTest.java
View File

@ -1,7 +1,7 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.Action; import inf112.fiasko.roborally.elementproperties.Action;
import inf112.fiasko.roborally.element_properties.RobotID; import inf112.fiasko.roborally.elementproperties.RobotID;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

2
src/test/java/inf112/fiasko/roborally/objects/ProgrammingCardDeckTest.java
View File

@ -1,6 +1,6 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.Action; import inf112.fiasko.roborally.elementproperties.Action;
import inf112.fiasko.roborally.utility.DeckLoaderUtil; import inf112.fiasko.roborally.utility.DeckLoaderUtil;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

2
src/test/java/inf112/fiasko/roborally/objects/ProgrammingCardTest.java
View File

@ -1,6 +1,6 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.Action; import inf112.fiasko.roborally.elementproperties.Action;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

2
src/test/java/inf112/fiasko/roborally/objects/RoboRallyGameTest.java
View File

@ -12,7 +12,7 @@ public class RoboRallyGameTest {
@Before @Before
public void setUp() { public void setUp() {
game = new RoboRallyGame(new ArrayList<>(),"Checkmate.txt",false); game = new RoboRallyGame(new ArrayList<>(),"Checkmate.txt",false, "Player1");
} }
@Test @Test

4
src/test/java/inf112/fiasko/roborally/objects/RobotTest.java
View File

@ -1,9 +1,9 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.Position; import inf112.fiasko.roborally.elementproperties.Position;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import inf112.fiasko.roborally.element_properties.RobotID; import inf112.fiasko.roborally.elementproperties.RobotID;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

4
src/test/java/inf112/fiasko/roborally/objects/TileTest.java
View File

@ -1,7 +1,7 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.Direction; import inf112.fiasko.roborally.elementproperties.Direction;
import inf112.fiasko.roborally.element_properties.TileType; import inf112.fiasko.roborally.elementproperties.TileType;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

4
src/test/java/inf112/fiasko/roborally/objects/WallTest.java
View File

@ -1,7 +1,7 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.Direction; import inf112.fiasko.roborally.elementproperties.Direction;
import inf112.fiasko.roborally.element_properties.WallType; import inf112.fiasko.roborally.elementproperties.WallType;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import org.junit.Test; import org.junit.Test;

4
src/test/java/inf112/fiasko/roborally/utility/TextureConverterUtilTest.java
View File

@ -2,8 +2,8 @@ package inf112.fiasko.roborally.utility;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import inf112.fiasko.roborally.GdxTestRunner; import inf112.fiasko.roborally.GdxTestRunner;
import inf112.fiasko.roborally.element_properties.Direction; import inf112.fiasko.roborally.elementproperties.Direction;
import inf112.fiasko.roborally.element_properties.TileType; import inf112.fiasko.roborally.elementproperties.TileType;
import inf112.fiasko.roborally.objects.Tile; import inf112.fiasko.roborally.objects.Tile;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;