From 1b9cc4606005f9703c02447d8aa10c4614b11c53 Mon Sep 17 00:00:00 2001
From: Turid Dahl <turidcd@stud.ntnu.no>
Date: Sun, 19 Apr 2020 12:47:54 +0200
Subject: [PATCH] #98 Removes game_states folder, because crashed with
localStorage and couldn't find games
---
frontend/core/src/com/gameware/game/GameWare.java | 2 +-
.../game/states/{game_states => }/BubbleWrapState.java | 3 +--
.../gameware/game/states/{game_states => }/ColorRushState.java | 3 +--
.../game/states/{game_states => }/FruitSlicerState.java | 3 +--
frontend/core/src/com/gameware/game/states/PauseState.java | 1 -
.../game/states/{game_states => }/PlayStateTemplate.java | 2 +-
.../com/gameware/game/states/SinglePlayerSelectGameState.java | 1 -
.../core/src/com/gameware/game/states/ViewTournamentState.java | 1 -
8 files changed, 5 insertions(+), 11 deletions(-)
rename frontend/core/src/com/gameware/game/states/{game_states => }/BubbleWrapState.java (97%)
rename frontend/core/src/com/gameware/game/states/{game_states => }/ColorRushState.java (99%)
rename frontend/core/src/com/gameware/game/states/{game_states => }/FruitSlicerState.java (98%)
rename frontend/core/src/com/gameware/game/states/{game_states => }/PlayStateTemplate.java (99%)
diff --git a/frontend/core/src/com/gameware/game/GameWare.java b/frontend/core/src/com/gameware/game/GameWare.java
index a6648d8..10918e9 100644
--- a/frontend/core/src/com/gameware/game/GameWare.java
+++ b/frontend/core/src/com/gameware/game/GameWare.java
@@ -16,7 +16,7 @@ import com.gameware.game.models.Player;
import com.gameware.game.states.GameStateManager;
import com.gameware.game.states.LoginState;
import com.gameware.game.states.MenuState;
-import com.gameware.game.states.game_states.PlayStateTemplate;
+import com.gameware.game.states.PlayStateTemplate;
import java.io.IOException;
import java.lang.reflect.Constructor;
diff --git a/frontend/core/src/com/gameware/game/states/game_states/BubbleWrapState.java b/frontend/core/src/com/gameware/game/states/BubbleWrapState.java
similarity index 97%
rename from frontend/core/src/com/gameware/game/states/game_states/BubbleWrapState.java
rename to frontend/core/src/com/gameware/game/states/BubbleWrapState.java
index 0a1fffa..5d449bf 100644
--- a/frontend/core/src/com/gameware/game/states/game_states/BubbleWrapState.java
+++ b/frontend/core/src/com/gameware/game/states/BubbleWrapState.java
@@ -1,10 +1,9 @@
-package com.gameware.game.states.game_states;
+package com.gameware.game.states;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.gameware.game.sprites.Bubble;
-import com.gameware.game.states.GameStateManager;
import java.util.ArrayList;
diff --git a/frontend/core/src/com/gameware/game/states/game_states/ColorRushState.java b/frontend/core/src/com/gameware/game/states/ColorRushState.java
similarity index 99%
rename from frontend/core/src/com/gameware/game/states/game_states/ColorRushState.java
rename to frontend/core/src/com/gameware/game/states/ColorRushState.java
index 12d8bfe..ee8adc4 100644
--- a/frontend/core/src/com/gameware/game/states/game_states/ColorRushState.java
+++ b/frontend/core/src/com/gameware/game/states/ColorRushState.java
@@ -1,10 +1,9 @@
-package com.gameware.game.states.game_states;
+package com.gameware.game.states;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.gameware.game.sprites.ColorRushButton;
import com.gameware.game.sprites.ColorRushTarget;
-import com.gameware.game.states.GameStateManager;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/frontend/core/src/com/gameware/game/states/game_states/FruitSlicerState.java b/frontend/core/src/com/gameware/game/states/FruitSlicerState.java
similarity index 98%
rename from frontend/core/src/com/gameware/game/states/game_states/FruitSlicerState.java
rename to frontend/core/src/com/gameware/game/states/FruitSlicerState.java
index 6c805a9..25e3e86 100644
--- a/frontend/core/src/com/gameware/game/states/game_states/FruitSlicerState.java
+++ b/frontend/core/src/com/gameware/game/states/FruitSlicerState.java
@@ -1,4 +1,4 @@
-package com.gameware.game.states.game_states;
+package com.gameware.game.states;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.audio.Sound;
@@ -8,7 +8,6 @@ import com.badlogic.gdx.math.Vector3;
import com.gameware.game.GameWare;
import com.gameware.game.sprites.Fruit;
import com.gameware.game.sprites.SlicingCircle;
-import com.gameware.game.states.GameStateManager;
import java.util.ArrayList;
import java.util.List;
diff --git a/frontend/core/src/com/gameware/game/states/PauseState.java b/frontend/core/src/com/gameware/game/states/PauseState.java
index 767d260..2dbd72f 100644
--- a/frontend/core/src/com/gameware/game/states/PauseState.java
+++ b/frontend/core/src/com/gameware/game/states/PauseState.java
@@ -9,7 +9,6 @@ import com.gameware.game.sprites.ConfirmationBox;
import com.gameware.game.sprites.LoadingText;
import com.gameware.game.sprites.PauseCircle;
import com.gameware.game.sprites.PauseMenuButton;
-import com.gameware.game.states.game_states.PlayStateTemplate;
import java.util.ArrayList;
import java.util.List;
diff --git a/frontend/core/src/com/gameware/game/states/game_states/PlayStateTemplate.java b/frontend/core/src/com/gameware/game/states/PlayStateTemplate.java
similarity index 99%
rename from frontend/core/src/com/gameware/game/states/game_states/PlayStateTemplate.java
rename to frontend/core/src/com/gameware/game/states/PlayStateTemplate.java
index 6408670..7f7ed58 100644
--- a/frontend/core/src/com/gameware/game/states/game_states/PlayStateTemplate.java
+++ b/frontend/core/src/com/gameware/game/states/PlayStateTemplate.java
@@ -1,4 +1,4 @@
-package com.gameware.game.states.game_states;
+package com.gameware.game.states;
import com.badlogic.gdx.Gdx;
diff --git a/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java b/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java
index cddb5af..0611f81 100644
--- a/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java
+++ b/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java
@@ -11,7 +11,6 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.gameware.game.GameWare;
import com.gameware.game.models.Game;
-import com.gameware.game.states.game_states.PlayStateTemplate;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/frontend/core/src/com/gameware/game/states/ViewTournamentState.java b/frontend/core/src/com/gameware/game/states/ViewTournamentState.java
index e77a8f2..5a41fd0 100644
--- a/frontend/core/src/com/gameware/game/states/ViewTournamentState.java
+++ b/frontend/core/src/com/gameware/game/states/ViewTournamentState.java
@@ -20,7 +20,6 @@ import com.gameware.game.models.Game;
import com.gameware.game.models.Round;
import com.gameware.game.models.Tournament;
import com.gameware.game.sprites.LoadingText;
-import com.gameware.game.states.game_states.PlayStateTemplate;
import java.io.IOException;
import java.util.List;
--
GitLab