Update GameStates

Fix FightserverPortal.fightStateMapper

LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java

@@ -222,11 +222,13 @@ public class FightserverPortal implements PortalHandler, Comparable<FightserverP
             case "PRE_SCHEM_SETUP":
                 return "Schemauswahl";
             case "POST_SCHEM_SETUP":
+            case "generating_tower":
                 return "Vorbereitung";
             case "PRE_RUNNING":
                 return "Kampfbeginn in";
             case "fighting":
             case "RUNNING":
+            case "running":
                 return "Kampf läuft";
             case "end":
             case "SPECTATE":

TowerRun/src/de/steamwar/towerrun/countdowns/EndCountdown.java

@@ -35,7 +35,7 @@ public class EndCountdown extends Countdown {
     private static final boolean RESETS = Objects.requireNonNull(Bukkit.getWorlds().get(0).getWorldFolder().list((dir, name) -> name.equals("backup"))).length > 0;
 
     public EndCountdown(LobbyCountdown lobbyCountdown) {
-        super(EnumSet.of(GameStates.ENDING));
+        super(EnumSet.of(GameStates.END));
         this.lobbyCountdown = lobbyCountdown;
     }
 

TowerRun/src/de/steamwar/towerrun/countdowns/GameCountdown.java

@@ -31,7 +31,7 @@ public class GameCountdown extends Countdown {
     private long startTime = 0;
 
     public GameCountdown() {
-        super(EnumSet.of(GameStates.INGAME));
+        super(EnumSet.of(GameStates.RUNNING));
     }
 
     @Override

TowerRun/src/de/steamwar/towerrun/countdowns/LobbyCountdown.java

@@ -37,7 +37,7 @@ public class LobbyCountdown extends Countdown {
     private boolean override = false;
 
     public LobbyCountdown() {
-        super(EnumSet.of(GameStates.LOBBY));
+        super(EnumSet.of(GameStates.WAITING));
     }
 
     @Override

TowerRun/src/de/steamwar/towerrun/game/TowerRunGame.java

@@ -49,7 +49,7 @@ public class TowerRunGame {
     }
 
     public static void prepareTowerOrStart() {
-        if (GameState.getCurrentState() == GameStates.LOBBY) {
+        if (GameState.getCurrentState() == GameStates.WAITING) {
             GameState.nextState();
             if (TowerRun.getTowerGenerator() == null) {
                 start();

TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java

@@ -52,7 +52,7 @@ public class IngameListener extends GameStateBukkitListener {
     private BukkitRunnable antiCampRunnable;
 
     public IngameListener() {
-        super(EnumSet.of(GameStates.INGAME));
+        super(EnumSet.of(GameStates.RUNNING));
     }
 
     @Override

TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java

@@ -37,7 +37,7 @@ import java.util.EnumSet;
 
 public class LobbyListener extends GameStateBukkitListener {
     public LobbyListener() {
-        super(EnumSet.of(GameStates.LOBBY));
+        super(EnumSet.of(GameStates.WAITING));
     }
 
     @EventHandler

TowerRun/src/de/steamwar/towerrun/listener/NotLobbyListener.java

@@ -31,7 +31,7 @@ import java.util.EnumSet;
 
 public class NotLobbyListener extends GameStateBukkitListener {
     public NotLobbyListener() {
-        super(EnumSet.complementOf(EnumSet.of(GameStates.LOBBY)));
+        super(EnumSet.complementOf(EnumSet.of(GameStates.WAITING)));
     }
 
     @EventHandler

TowerRun/src/de/steamwar/towerrun/state/GameState.java

@@ -28,7 +28,7 @@ import java.util.List;
 @UtilityClass
 public class GameState {
     @Getter
-    private static GameStates currentState = GameStates.LOBBY;
+    private static GameStates currentState = GameStates.WAITING;
     private static final List<GameStateListener> gameStateListeners = new ArrayList<>();
 
     public static void addGameStateListener(GameStateListener gameStateListener) {
@@ -49,7 +49,7 @@ public class GameState {
 
     public static void reset() {
         final GameStates oldState = currentState;
-        currentState = GameStates.LOBBY;
+        currentState = GameStates.WAITING;
         gameStateChanges(oldState, currentState);
     }
 

TowerRun/src/de/steamwar/towerrun/state/GameStates.java

@@ -25,10 +25,10 @@ import lombok.Getter;
 @AllArgsConstructor
 @Getter
 public enum GameStates {
-    ENDING(null),
+    END(null),
-    INGAME(ENDING),
+    RUNNING(END),
-    GENERATING_TOWER(INGAME),
+    GENERATING_TOWER(RUNNING),
-    LOBBY(GENERATING_TOWER);
+    WAITING(GENERATING_TOWER);
 
     private final GameStates nextState;
 }

TowerRun/src/de/steamwar/towerrun/winconditions/WinCondition.java

@@ -34,7 +34,7 @@ public abstract class WinCondition extends GameStateBukkitListener {
     private boolean active = false;
 
     protected WinCondition(String name) {
-        super(EnumSet.of(GameStates.INGAME));
+        super(EnumSet.of(GameStates.RUNNING));
         this.name = name;
     }