From c20cc354d7ef930061bddd73e5804ea16afaf886 Mon Sep 17 00:00:00 2001 From: Steinar Aalstad Lillesund Date: Tue, 14 Apr 2020 16:18:39 +0200 Subject: [PATCH] Fikset flere Imports --- .../fiasko/roborally/gamewrapper/ScreenManager.java | 10 ++-------- .../gamewrapper/screens/BoardActiveScreen.java | 3 ++- .../roborally/gamewrapper/screens/WinnerScreen.java | 7 ++++--- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/ScreenManager.java b/src/main/java/inf112/fiasko/roborally/gamewrapper/ScreenManager.java index c190b31..c697f18 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/ScreenManager.java +++ b/src/main/java/inf112/fiasko/roborally/gamewrapper/ScreenManager.java @@ -1,13 +1,7 @@ -package inf112.fiasko.roborally.game_wrapper; +package inf112.fiasko.roborally.gamewrapper; -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; +import inf112.fiasko.roborally.gamewrapper.screens.*; /** * Keeps track of screen instances diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java index 8d0258f..75bc53a 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java +++ b/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,6 +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.elementproperties.GameState; import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper; import inf112.fiasko.roborally.objects.IDrawableGame; import inf112.fiasko.roborally.objects.IDrawableObject; diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/WinnerScreen.java b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/WinnerScreen.java index 7026e08..196e8d9 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/WinnerScreen.java +++ b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/WinnerScreen.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,9 @@ 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.gamewrapper.screens.AbstractScreen; public class WinnerScreen extends AbstractScreen { private final RoboRallyWrapper roboRallyWrapper;