From 0485713e862b31e85ce532f61096e98657ebabaa Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Tue, 12 Nov 2024 16:10:46 +0100 Subject: [PATCH] Update GameStates Fix FightserverPortal.fightStateMapper --- .../src/de/steamwar/lobby/portal/FightserverPortal.java | 2 ++ .../src/de/steamwar/towerrun/countdowns/EndCountdown.java | 2 +- .../de/steamwar/towerrun/countdowns/GameCountdown.java | 2 +- .../de/steamwar/towerrun/countdowns/LobbyCountdown.java | 2 +- TowerRun/src/de/steamwar/towerrun/game/TowerRunGame.java | 2 +- .../src/de/steamwar/towerrun/listener/IngameListener.java | 2 +- .../src/de/steamwar/towerrun/listener/LobbyListener.java | 2 +- .../de/steamwar/towerrun/listener/NotLobbyListener.java | 2 +- TowerRun/src/de/steamwar/towerrun/state/GameState.java | 4 ++-- TowerRun/src/de/steamwar/towerrun/state/GameStates.java | 8 ++++---- .../de/steamwar/towerrun/winconditions/WinCondition.java | 2 +- 11 files changed, 16 insertions(+), 14 deletions(-) diff --git a/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java b/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java index 08f03bb3..7d82cfdc 100644 --- a/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java +++ b/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java @@ -222,11 +222,13 @@ public class FightserverPortal implements PortalHandler, Comparable name.equals("backup"))).length > 0; public EndCountdown(LobbyCountdown lobbyCountdown) { - super(EnumSet.of(GameStates.ENDING)); + super(EnumSet.of(GameStates.END)); this.lobbyCountdown = lobbyCountdown; } diff --git a/TowerRun/src/de/steamwar/towerrun/countdowns/GameCountdown.java b/TowerRun/src/de/steamwar/towerrun/countdowns/GameCountdown.java index 29487859..b1d25110 100644 --- a/TowerRun/src/de/steamwar/towerrun/countdowns/GameCountdown.java +++ b/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 diff --git a/TowerRun/src/de/steamwar/towerrun/countdowns/LobbyCountdown.java b/TowerRun/src/de/steamwar/towerrun/countdowns/LobbyCountdown.java index 40808f1e..a655c4c3 100644 --- a/TowerRun/src/de/steamwar/towerrun/countdowns/LobbyCountdown.java +++ b/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 diff --git a/TowerRun/src/de/steamwar/towerrun/game/TowerRunGame.java b/TowerRun/src/de/steamwar/towerrun/game/TowerRunGame.java index 2d71ef1d..c83138d4 100644 --- a/TowerRun/src/de/steamwar/towerrun/game/TowerRunGame.java +++ b/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(); diff --git a/TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java b/TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java index ea07eb04..9e30cf07 100644 --- a/TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java +++ b/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 diff --git a/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java b/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java index eb2cb157..52d600ca 100644 --- a/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java +++ b/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 diff --git a/TowerRun/src/de/steamwar/towerrun/listener/NotLobbyListener.java b/TowerRun/src/de/steamwar/towerrun/listener/NotLobbyListener.java index 4d3525e5..6bfb1623 100644 --- a/TowerRun/src/de/steamwar/towerrun/listener/NotLobbyListener.java +++ b/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 diff --git a/TowerRun/src/de/steamwar/towerrun/state/GameState.java b/TowerRun/src/de/steamwar/towerrun/state/GameState.java index 3c3a55e0..46b7e93a 100644 --- a/TowerRun/src/de/steamwar/towerrun/state/GameState.java +++ b/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 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); } diff --git a/TowerRun/src/de/steamwar/towerrun/state/GameStates.java b/TowerRun/src/de/steamwar/towerrun/state/GameStates.java index 347e9814..4fe32829 100644 --- a/TowerRun/src/de/steamwar/towerrun/state/GameStates.java +++ b/TowerRun/src/de/steamwar/towerrun/state/GameStates.java @@ -25,10 +25,10 @@ import lombok.Getter; @AllArgsConstructor @Getter public enum GameStates { - ENDING(null), - INGAME(ENDING), - GENERATING_TOWER(INGAME), - LOBBY(GENERATING_TOWER); + END(null), + RUNNING(END), + GENERATING_TOWER(RUNNING), + WAITING(GENERATING_TOWER); private final GameStates nextState; } diff --git a/TowerRun/src/de/steamwar/towerrun/winconditions/WinCondition.java b/TowerRun/src/de/steamwar/towerrun/winconditions/WinCondition.java index 4a736dd5..21e0e860 100644 --- a/TowerRun/src/de/steamwar/towerrun/winconditions/WinCondition.java +++ b/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; }