Refac

armin-reichert · armin-reichert · commit a8d6803d4c16 · 2025-08-13T11:28:12.000+02:00
diff --git a/pacman-app-allgames/src/main/java/de/amr/pacmanfx/allgames/app/PacManGames3dApp.java b/pacman-app-allgames/src/main/java/de/amr/pacmanfx/allgames/app/PacManGames3dApp.java
@@ -16,7 +16,7 @@
 import de.amr.pacmanfx.tengen.ms_pacman.model.TengenMsPacMan_GameModel;
 import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui.GameUI_Builder;
-import de.amr.pacmanfx.ui.api.DefaultGameVariants;
+import de.amr.pacmanfx.model.DefaultGameVariants;
 import de.amr.pacmanfx.ui.dashboard.DashboardID;
 import javafx.application.Application;
 import javafx.stage.Screen;
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_App.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_App.java
@@ -6,7 +6,7 @@
 
 import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui.GameUI_Builder;
-import de.amr.pacmanfx.ui.api.DefaultGameVariants;
+import de.amr.pacmanfx.model.DefaultGameVariants;
 import de.amr.pacmanfx.ui.dashboard.DashboardID;
 import javafx.application.Application;
 import javafx.stage.Screen;
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_StartPage.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_StartPage.java
@@ -5,7 +5,7 @@
 package de.amr.pacmanfx.arcade.ms_pacman;
 
 import de.amr.pacmanfx.ui.api.GameUI;
-import de.amr.pacmanfx.ui.api.DefaultGameVariants;
+import de.amr.pacmanfx.model.DefaultGameVariants;
 import de.amr.pacmanfx.ui.layout.StartPage;
 import de.amr.pacmanfx.ui.layout.StartPagesView;
 import de.amr.pacmanfx.uilib.assets.ResourceManager;
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadePacMan_StartPage.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadePacMan_StartPage.java
@@ -5,7 +5,7 @@
 package de.amr.pacmanfx.arcade.pacman;
 
 import de.amr.pacmanfx.ui.api.GameUI;
-import de.amr.pacmanfx.ui.api.DefaultGameVariants;
+import de.amr.pacmanfx.model.DefaultGameVariants;
 import de.amr.pacmanfx.ui.layout.StartPage;
 import de.amr.pacmanfx.ui.layout.StartPagesView;
 import de.amr.pacmanfx.uilib.assets.ResourceManager;
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/app/ArcadePacMan_App.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/app/ArcadePacMan_App.java
@@ -9,7 +9,7 @@
 import de.amr.pacmanfx.arcade.pacman.ArcadePacMan_UIConfig;
 import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui.GameUI_Builder;
-import de.amr.pacmanfx.ui.api.DefaultGameVariants;
+import de.amr.pacmanfx.model.DefaultGameVariants;
 import de.amr.pacmanfx.ui.dashboard.DashboardID;
 import javafx.application.Application;
 import javafx.stage.Screen;
diff --git a/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_Common_App.java b/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_Common_App.java
@@ -12,8 +12,8 @@
 import javafx.stage.Stage;
 
 import static de.amr.pacmanfx.Globals.theGameContext;
-import static de.amr.pacmanfx.ui.api.DefaultGameVariants.MS_PACMAN_XXL;
-import static de.amr.pacmanfx.ui.api.DefaultGameVariants.PACMAN_XXL;
+import static de.amr.pacmanfx.model.DefaultGameVariants.MS_PACMAN_XXL;
+import static de.amr.pacmanfx.model.DefaultGameVariants.PACMAN_XXL;
 
 public class PacManXXL_Common_App extends Application {
 
diff --git a/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_Common_StartPageMenu.java b/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_Common_StartPageMenu.java
@@ -12,7 +12,7 @@
 import de.amr.pacmanfx.model.actors.Pac;
 import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui.api.GameUI_Config;
-import de.amr.pacmanfx.ui.api.DefaultGameVariants;
+import de.amr.pacmanfx.model.DefaultGameVariants;
 import de.amr.pacmanfx.ui._2d.ArcadePalette;
 import de.amr.pacmanfx.ui._2d.GameRenderer;
 import de.amr.pacmanfx.uilib.widgets.OptionMenu;
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/TengenMsPacMan_StartPage.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/TengenMsPacMan_StartPage.java
@@ -5,7 +5,7 @@
 package de.amr.pacmanfx.tengen.ms_pacman;
 
 import de.amr.pacmanfx.ui.api.GameUI;
-import de.amr.pacmanfx.ui.api.DefaultGameVariants;
+import de.amr.pacmanfx.model.DefaultGameVariants;
 import de.amr.pacmanfx.ui.layout.StartPage;
 import de.amr.pacmanfx.ui.layout.StartPagesView;
 import de.amr.pacmanfx.uilib.assets.ResourceManager;
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/app/TengenMsPacMan_App.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/app/TengenMsPacMan_App.java
@@ -15,7 +15,7 @@
 import javafx.stage.Stage;
 
 import static de.amr.pacmanfx.tengen.ms_pacman.TengenMsPacMan_UIConfig.NES_ASPECT;
-import static de.amr.pacmanfx.ui.api.DefaultGameVariants.MS_PACMAN_TENGEN;
+import static de.amr.pacmanfx.model.DefaultGameVariants.MS_PACMAN_TENGEN;
 
 public class TengenMsPacMan_App extends Application {
 
diff --git a/pacman-core/src/main/java/de/amr/pacmanfx/controller/GameState.java b/pacman-core/src/main/java/de/amr/pacmanfx/controller/GameState.java
@@ -11,6 +11,7 @@
 import de.amr.pacmanfx.lib.timer.Pulse;
 import de.amr.pacmanfx.lib.timer.TickTimer;
 import de.amr.pacmanfx.model.AbstractGameModel;
+import de.amr.pacmanfx.model.DefaultGameVariants;
 import de.amr.pacmanfx.model.GameLevel;
 import de.amr.pacmanfx.model.actors.Bonus;
 import de.amr.pacmanfx.model.actors.Ghost;
@@ -23,7 +24,8 @@
  */
 public enum GameState implements FsmState<GameContext> {
 
-    BOOT { // "Das muss das Boot abkönnen!"
+    // "Das muss das Boot abkönnen!"
+    BOOT {
         @Override
         public void onEnter(GameContext context) {
             timer.restartIndefinitely();
@@ -62,6 +64,9 @@ public void onUpdate(GameContext context) {
     },
 
 
+    /**
+     * In Tengen Ms. Pac-Man, the credited people are shown.
+     */
     SHOWING_CREDITS {
         @Override
         public void onEnter(GameContext context) {
@@ -88,45 +93,57 @@ public void onEnter(GameContext context) {
             context.eventManager().publishEvent(GameEventType.STOP_ALL_SOUNDS);
         }
 
+        private void startNewGame(GameContext context) {
+            if (timer.tickCount() == 1) {
+                context.game().startNewGame();
+            }
+            else if (timer.tickCount() == 2) {
+                context.game().startLevel();
+            }
+            else if (timer.tickCount() == TICK_NEW_GAME_SHOW_GUYS) {
+                context.gameLevel().showPacAndGhosts();
+            }
+            else if (timer.tickCount() == TICK_NEW_GAME_START_HUNTING) {
+                context.game().setPlaying(true);
+                context.gameController().changeGameState(GameState.HUNTING);
+            }
+        }
+
+        private void continueGame(GameContext context) {
+            if (timer.tickCount() == 1) {
+                context.game().continueGame();
+            } else if (timer.tickCount() == TICK_RESUME_HUNTING) {
+                context.gameController().changeGameState(GameState.HUNTING);
+            }
+        }
+
+        private void startDemoLevel(GameContext context) {
+            if (timer.tickCount() == 1) {
+                context.game().buildDemoLevel();
+                context.eventManager().publishEvent(GameEventType.LEVEL_CREATED);
+            }
+            else if (timer.tickCount() == 2) {
+                context.game().startLevel();
+            }
+            else if (timer.tickCount() == 3) {
+                // Now, actor animations are available
+                context.gameLevel().showPacAndGhosts();
+            }
+            else if (timer.tickCount() == TICK_DEMO_LEVEL_START_HUNTING) {
+                context.gameController().changeGameState(GameState.HUNTING);
+            }
+        }
+
         @Override
         public void onUpdate(GameContext context) {
             if (context.game().isPlaying()) {
-                if (timer.tickCount() == 1) {
-                    context.game().continueGame();
-                } else if (timer.tickCount() == TICK_RESUME_HUNTING) {
-                    context.gameController().changeGameState(GameState.HUNTING);
-                }
+                continueGame(context);
             }
             else if (context.game().canStartNewGame()) {
-                if (timer.tickCount() == 1) {
-                    context.game().startNewGame();
-                }
-                else if (timer.tickCount() == 2) {
-                    context.game().startLevel();
-                }
-                else if (timer.tickCount() == TICK_NEW_GAME_SHOW_GUYS) {
-                    context.gameLevel().showPacAndGhosts();
-                }
-                else if (timer.tickCount() == TICK_NEW_GAME_START_HUNTING) {
-                    context.game().setPlaying(true);
-                    context.gameController().changeGameState(GameState.HUNTING);
-                }
+                startNewGame(context);
             }
-            else { // start demo level
-                if (timer.tickCount() == 1) {
-                    context.game().buildDemoLevel();
-                    context.eventManager().publishEvent(GameEventType.LEVEL_CREATED);
-                }
-                else if (timer.tickCount() == 2) {
-                    context.game().startLevel();
-                }
-                else if (timer.tickCount() == 3) {
-                    // Now, actor animations are available
-                    context.gameLevel().showPacAndGhosts();
-                }
-                else if (timer.tickCount() == TICK_DEMO_LEVEL_START_HUNTING) {
-                    context.gameController().changeGameState(GameState.HUNTING);
-                }
+            else {
+                startDemoLevel(context);
             }
         }
     },
@@ -185,14 +202,15 @@ public void onUpdate(GameContext context) {
             }
 
             //TODO this is crap. Maybe Tengen Ms. Pac-Man needs its own state machine?
-            if (context.gameController().isSelected("MS_PACMAN_TENGEN") && context.gameLevel().isDemoLevel()) {
+            if (context.gameController().isSelected(DefaultGameVariants.MS_PACMAN_TENGEN.name())
+                && context.gameLevel().isDemoLevel()) {
                 context.gameController().changeGameState(SHOWING_CREDITS);
                 return;
             }
 
             if (timer.hasExpired()) {
                 if (context.gameLevel().isDemoLevel()) {
-                    // just in case: if demo level is complete, go back to intro scene
+                    // just in case: if demo level was completed, go back to intro scene
                     context.gameController().changeGameState(INTRO);
                 } else if (context.game().cutScenesEnabled()
                     && context.game().cutSceneNumber(context.gameLevel().number()).isPresent()) {
diff --git a/pacman-core/src/main/java/de/amr/pacmanfx/model/DefaultGameVariants.java b/pacman-core/src/main/java/de/amr/pacmanfx/model/DefaultGameVariants.java
@@ -2,7 +2,7 @@
 Copyright (c) 2021-2025 Armin Reichert (MIT License)
 See file LICENSE in repository root directory for details.
 */
-package de.amr.pacmanfx.ui.api;
+package de.amr.pacmanfx.model;
 
 /**
  * Predefined game variants. String value ({@link DefaultGameVariants#name()} is uses in map keys etc.
