diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java index 563a9f1..42e29a8 100644 --- a/src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java +++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java @@ -1,6 +1,14 @@ package inf112.fiasko.roborally.game_wrapper; -import inf112.fiasko.roborally.game_wrapper.screens.*; + +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; /** * Keeps track of screen instances @@ -67,7 +75,7 @@ public class ScreenManager { * @param roboRallyWrapper The Robo Rally launcher instance to use * @return A start menu screen instance */ - synchronized StartMenuScreen getStartMenuScreen(RoboRallyWrapper roboRallyWrapper) { + public synchronized StartMenuScreen getStartMenuScreen(RoboRallyWrapper roboRallyWrapper) { return new StartMenuScreen(roboRallyWrapper); } diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/AbstractScreen.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/AbstractScreen.java index b11db14..729fe0a 100644 --- a/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/AbstractScreen.java +++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/AbstractScreen.java @@ -6,8 +6,8 @@ import com.badlogic.gdx.Screen; * This class overrides methods of screens which are often unused */ public abstract class AbstractScreen implements Screen { - final int applicationWidth = 600; - final int applicationHeight = 800; + protected final int applicationWidth = 600; + protected final int applicationHeight = 800; @Override public void show() { diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/CardChoiceScreen.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/CardChoiceScreen.java index 70f7325..d8595a3 100644 --- a/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/CardChoiceScreen.java +++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/CardChoiceScreen.java @@ -9,7 +9,9 @@ import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.graphics.g2d.GlyphLayout; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.math.Vector3; -import com.badlogic.gdx.scenes.scene2d.*; +import com.badlogic.gdx.scenes.scene2d.Stage; +import com.badlogic.gdx.scenes.scene2d.InputListener; +import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.utils.viewport.FitViewport; import com.badlogic.gdx.utils.viewport.Viewport; @@ -239,9 +241,9 @@ public class CardChoiceScreen extends InputAdapter implements Screen { * A helper class for keeping track of card information and a rectangle */ class CardRectangle { - final Rectangle rectangle; - final ProgrammingCard card; - boolean selected = false; + protected final Rectangle rectangle; + protected final ProgrammingCard card; + protected boolean selected = false; /** * Instantiates a new card rectangle diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/UsernameScreen.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/UsernameScreen.java index 83f9b1d..faf952a 100644 --- a/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/UsernameScreen.java +++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/UsernameScreen.java @@ -75,7 +75,7 @@ public class UsernameScreen extends AbstractScreen { */ private boolean nameInvalid(String userName) { //TODO: Find a way to ask the server if the name is taken - return userName.equals(""); + return "".equals(userName); } @Override diff --git a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServer.java b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServer.java index ccb5a05..43323e4 100644 --- a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServer.java +++ b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServer.java @@ -76,7 +76,7 @@ class RoboRallyServerListener extends Listener { * Gets a map between connections and their player name * @return A mapping between connections and robot ids */ - Map getPlayerNames() { + public Map getPlayerNames() { return playerNames; } @@ -84,7 +84,7 @@ class RoboRallyServerListener extends Listener { * Gets a map between connections and their robot id * @return A mapping between connections and robot ids */ - Map getRobotID() { + public Map getRobotID() { return clients; } diff --git a/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java b/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java index 013f97f..59c04e2 100644 --- a/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java +++ b/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java @@ -4,7 +4,14 @@ 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.objects.*; +import inf112.fiasko.roborally.objects.Player; +import inf112.fiasko.roborally.objects.IDrawableObject; +import inf112.fiasko.roborally.objects.Tile; +import inf112.fiasko.roborally.objects.IDrawableGame; +import inf112.fiasko.roborally.objects.Wall; +import inf112.fiasko.roborally.objects.Particle; +import inf112.fiasko.roborally.objects.Robot; +import inf112.fiasko.roborally.objects.DrawableObject; import com.esotericsoftware.kryonet.Connection; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java b/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java index 0dffede..0bc560a 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java @@ -70,7 +70,6 @@ public class DrawableObjectTest { assertEquals(Y_POSITION_MAX_ARG, drawableObjectMaximumArguments.getYPosition()); } - @Test public void getWidthMinArg() { assertEquals(64, drawableObjectMinimumArguments.getWidth());