Refac

armin-reichert · armin-reichert · commit d6dbbf63681f · 2025-08-13T12:25:50.000+02:00
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_GameModel.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_GameModel.java
@@ -258,7 +258,7 @@ public ScoreManager scoreManager() {
     }
 
     @Override
-    public ArcadeMsPacMan_GameData hud() {
+    public ArcadeMsPacMan_GameData hudData() {
         return hud;
     }
 
@@ -295,7 +295,7 @@ public void createLevel(int levelNumber) {
 
         /* In Ms. Pac-Man, the level counter stays fixed from level 8 on and bonus symbols are created randomly
          * (also inside a level) whenever a bonus score is reached. At least that's what I was told. */
-        hud().theLevelCounter().setEnabled(levelNumber < 8);
+        hudData().theLevelCounter().setEnabled(levelNumber < 8);
     }
 
     @Override
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_CutScene1.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_CutScene1.java
@@ -11,9 +11,9 @@
 import de.amr.pacmanfx.lib.timer.TickTimer;
 import de.amr.pacmanfx.model.actors.Ghost;
 import de.amr.pacmanfx.model.actors.Pac;
+import de.amr.pacmanfx.ui._2d.GameScene2D;
 import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui.api.GameUI_Config;
-import de.amr.pacmanfx.ui._2d.GameScene2D;
 import de.amr.pacmanfx.uilib.animation.SingleSpriteActor;
 
 import java.util.List;
@@ -77,7 +77,7 @@ public void doInit() {
         clapperboard.setFont(scaledArcadeFont8());
         clapperboard.startAnimation();
 
-        gameContext().game().hud().score(true).levelCounter(true).livesCounter(false);
+        gameContext().game().hudData().score(true).levelCounter(true).livesCounter(false);
 
         setState(STATE_CLAPPERBOARD, 120);
     }
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_CutScene2.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_CutScene2.java
@@ -8,8 +8,8 @@
 import de.amr.pacmanfx.lib.Vector2f;
 import de.amr.pacmanfx.lib.timer.TickTimer;
 import de.amr.pacmanfx.model.actors.Pac;
-import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui._2d.GameScene2D;
+import de.amr.pacmanfx.ui.api.GameUI;
 
 import java.util.List;
 
@@ -56,7 +56,7 @@ public void doInit() {
         clapperboard.setFont(scaledArcadeFont8());
         clapperboard.startAnimation();
 
-        gameContext().game().hud().score(true).levelCounter(true).livesCounter(false);
+        gameContext().game().hudData().score(true).levelCounter(true).livesCounter(false);
 
         setSceneState(STATE_CLAPPERBOARD, 120);
     }
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_CutScene3.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_CutScene3.java
@@ -10,9 +10,9 @@
 import de.amr.pacmanfx.lib.Vector2f;
 import de.amr.pacmanfx.lib.timer.TickTimer;
 import de.amr.pacmanfx.model.actors.Pac;
+import de.amr.pacmanfx.ui._2d.GameScene2D;
 import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui.api.GameUI_Config;
-import de.amr.pacmanfx.ui._2d.GameScene2D;
 
 import java.util.List;
 
@@ -68,7 +68,7 @@ public void doInit() {
         clapperboard.setFont(scaledArcadeFont8());
         clapperboard.startAnimation();
 
-        gameContext().game().hud().score(true).levelCounter(true).livesCounter(false);
+        gameContext().game().hudData().score(true).levelCounter(true).livesCounter(false);
 
         setSceneState(STATE_CLAPPERBOARD, TickTimer.INDEFINITE);
     }
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_IntroScene.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_IntroScene.java
@@ -70,7 +70,7 @@ public ArcadeMsPacMan_IntroScene context() {
 
     @Override
     public void doInit() {
-        gameContext().game().hud().credit(true).score(true).levelCounter(true).livesCounter(false);
+        gameContext().game().hudData().credit(true).score(true).levelCounter(true).livesCounter(false);
 
         actionBindings.assign(ACTION_ARCADE_INSERT_COIN, ui.actionBindings());
         actionBindings.assign(ACTION_ARCADE_START_GAME, ui.actionBindings());
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_StartScene.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_StartScene.java
@@ -30,7 +30,7 @@ public ArcadeMsPacMan_StartScene(GameUI ui) {
     
     @Override
     public void doInit() {
-        gameContext().game().hud().credit(true).score(true).levelCounter(true).livesCounter(false);
+        gameContext().game().hudData().credit(true).score(true).levelCounter(true).livesCounter(false);
 
         midwayCopyright = new MidwayCopyright(ui.currentConfig().localAssetImage("logo.midway"));
         midwayCopyright.setPosition(TS * 6, TS * 28);
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadeCommon_GameModel.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadeCommon_GameModel.java
@@ -53,7 +53,7 @@ public void init() {
     @Override
     public void resetEverything() {
         prepareForNewGame();
-        hud().theLevelCounter().clear();
+        hudData().theLevelCounter().clear();
     }
 
     @Override
@@ -70,7 +70,7 @@ public void prepareForNewGame() {
     @Override
     public void startNewGame() {
         prepareForNewGame();
-        hud().theLevelCounter().clear();
+        hudData().theLevelCounter().clear();
         buildNormalLevel(1);
         eventManager().publishEvent(GameEventType.GAME_STARTED);
     }
@@ -219,7 +219,7 @@ public void buildNormalLevel(int levelNumber) {
         level.setDemoLevel(false);
         level.pac().immuneProperty().bind(gameContext.gameController().propertyImmunity());
         level.pac().usingAutopilotProperty().bind(gameContext.gameController().propertyUsingAutopilot());
-        hud().theLevelCounter().setEnabled(true);
+        hudData().theLevelCounter().setEnabled(true);
         huntingTimer.reset();
         scoreManager().setScoreLevelNumber(levelNumber);
         gateKeeper.setLevelNumber(levelNumber);
@@ -236,7 +236,7 @@ public void buildDemoLevel() {
         level.pac().setUsingAutopilot(true);
         level.pac().setAutopilotSteering(demoLevelSteering);
         demoLevelSteering.init();
-        hud().theLevelCounter().setEnabled(true);
+        hudData().theLevelCounter().setEnabled(true);
         huntingTimer.reset();
         scoreManager().setScoreLevelNumber(levelNumber);
         gateKeeper.setLevelNumber(levelNumber);
@@ -255,7 +255,7 @@ public void startLevel() {
             scoreManager().highScore().setEnabled(false);
             Logger.info("Demo level {} started", level.number());
         } else {
-            hud().theLevelCounter().update(level.number(), level.bonusSymbol(0));
+            hudData().theLevelCounter().update(level.number(), level.bonusSymbol(0));
             level.showMessage(GameLevel.MESSAGE_READY);
             scoreManager().score().setEnabled(true);
             scoreManager().highScore().setEnabled(true);
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadePacMan_GameModel.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadePacMan_GameModel.java
@@ -252,7 +252,7 @@ public ScoreManager scoreManager() {
     }
 
     @Override
-    public GameData hud() {
+    public GameData hudData() {
         return hud;
     }
 
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_BootScene2D.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_BootScene2D.java
@@ -7,8 +7,8 @@
 import de.amr.pacmanfx.lib.RectShort;
 import de.amr.pacmanfx.lib.Vector2f;
 import de.amr.pacmanfx.lib.timer.TickTimer;
-import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui._2d.GameScene2D;
+import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui.sound.SoundID;
 import de.amr.pacmanfx.uilib.assets.SpriteSheet;
 
@@ -35,7 +35,7 @@ public ArcadePacMan_BootScene2D(GameUI ui) {
 
     @Override
     public void doInit() {
-        gameContext().game().hud().score(false).levelCounter(false).livesCounter(false);
+        gameContext().game().hudData().score(false).levelCounter(false).livesCounter(false);
 
         SpriteSheet<?> spriteSheet = ui.currentConfig().spriteSheet();
         double width = spriteSheet.sourceImage().getWidth(), height = spriteSheet.sourceImage().getHeight();
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_CutScene1.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_CutScene1.java
@@ -8,8 +8,8 @@
 import de.amr.pacmanfx.lib.Vector2f;
 import de.amr.pacmanfx.model.actors.Ghost;
 import de.amr.pacmanfx.model.actors.Pac;
-import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui._2d.GameScene2D;
+import de.amr.pacmanfx.ui.api.GameUI;
 import org.tinylog.Logger;
 
 import static de.amr.pacmanfx.Globals.RED_GHOST_SHADOW;
@@ -51,7 +51,7 @@ public void doInit() {
         actorsInZOrder.add(pac);
         actorsInZOrder.add(blinky);
 
-        gameContext().game().hud().credit(false).score(true).levelCounter(true).livesCounter(false);
+        gameContext().game().hudData().credit(false).score(true).levelCounter(true).livesCounter(false);
     }
 
     @Override
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_CutScene2.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_CutScene2.java
@@ -65,7 +65,7 @@ public void doInit() {
         actorsInZOrder.add(pac);
         actorsInZOrder.add(blinky);
 
-        gameContext().game().hud().credit(false).score(true).levelCounter(true).livesCounter(false);
+        gameContext().game().hudData().credit(false).score(true).levelCounter(true).livesCounter(false);
     }
 
     @Override
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_CutScene3.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_CutScene3.java
@@ -8,8 +8,8 @@
 import de.amr.pacmanfx.lib.Vector2f;
 import de.amr.pacmanfx.model.actors.Ghost;
 import de.amr.pacmanfx.model.actors.Pac;
-import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui._2d.GameScene2D;
+import de.amr.pacmanfx.ui.api.GameUI;
 import org.tinylog.Logger;
 
 import static de.amr.pacmanfx.Globals.RED_GHOST_SHADOW;
@@ -50,7 +50,7 @@ public void doInit() {
         actorsInZOrder.add(pac);
         actorsInZOrder.add(blinky);
 
-        gameContext().game().hud().credit(false).score(true).levelCounter(true).livesCounter(false);
+        gameContext().game().hudData().credit(false).score(true).levelCounter(true).livesCounter(false);
     }
 
     @Override
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_IntroScene.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_IntroScene.java
@@ -72,7 +72,7 @@ public ArcadePacMan_IntroScene(GameUI ui) {
     
     @Override
     public void doInit() {
-        gameContext().game().hud().credit(true).score(true).livesCounter(false).levelCounter(true);
+        gameContext().game().hudData().credit(true).score(true).livesCounter(false).levelCounter(true);
 
         actionBindings.assign(ACTION_ARCADE_INSERT_COIN, ui.actionBindings());
         actionBindings.assign(ACTION_ARCADE_START_GAME, ui.actionBindings());
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_PlayScene2D.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_PlayScene2D.java
@@ -56,7 +56,7 @@ public ArcadePacMan_PlayScene2D(GameUI ui) {
 
     @Override
     protected void doInit() {
-        gameContext().game().hud().credit(false).score(true).levelCounter(true).livesCounter(true);
+        gameContext().game().hudData().credit(false).score(true).levelCounter(true).livesCounter(true);
         levelCompletedAnimation = new LevelCompletedAnimation(animationRegistry);
         gameRenderer = ui.currentConfig().createGameRenderer(canvas);
     }
@@ -76,11 +76,11 @@ the onLevelCreated() handler of this scene is not called!
      */
     private void initWithGameLevel(GameLevel gameLevel) {
         if (gameLevel.isDemoLevel()) {
-            gameContext().game().hud().credit(false).levelCounter(true).livesCounter(false);
+            gameContext().game().hudData().credit(false).levelCounter(true).livesCounter(false);
             actionBindings.assign(ACTION_ARCADE_INSERT_COIN, ui.actionBindings());
             actionBindings.installBindings(ui.keyboard());
         } else {
-            gameContext().game().hud().credit(false).levelCounter(true).livesCounter(true);
+            gameContext().game().hudData().credit(false).levelCounter(true).livesCounter(true);
             actionBindings.assign(ACTION_STEER_UP, ui.actionBindings());
             actionBindings.assign(ACTION_STEER_DOWN, ui.actionBindings());
             actionBindings.assign(ACTION_STEER_LEFT, ui.actionBindings());
@@ -162,14 +162,14 @@ public void update() {
     }
 
     private void updateHUD() {
-        LivesCounter livesCounter = gameContext().game().hud().theLivesCounter();
+        LivesCounter livesCounter = gameContext().game().hudData().theLivesCounter();
         int numLivesDisplayed = gameContext().game().lifeCount() - 1;
         // As long as Pac-Man is still initially hidden in the maze, he is shown as an entry in the lives counter
         if (gameContext().gameState() == GameState.STARTING_GAME && !gameContext().gameLevel().pac().isVisible()) {
             numLivesDisplayed += 1;
         }
         livesCounter.setVisibleLifeCount(Math.min(numLivesDisplayed, livesCounter.maxLivesDisplayed()));
-        gameContext().game().hud().showCredit(gameContext().coinMechanism().isEmpty());
+        gameContext().game().hudData().showCredit(gameContext().coinMechanism().isEmpty());
     }
 
     private void updateSound() {
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_StartScene.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_StartScene.java
@@ -26,7 +26,7 @@ public ArcadePacMan_StartScene(GameUI ui) {
 
     @Override
     public void doInit() {
-        gameContext().game().hud().credit(true).score(true).levelCounter(true).livesCounter(false);
+        gameContext().game().hudData().credit(true).score(true).levelCounter(true).livesCounter(false);
         actionBindings.assign(ACTION_ARCADE_INSERT_COIN, ui.actionBindings());
         actionBindings.assign(ACTION_ARCADE_START_GAME, ui.actionBindings());
     }
diff --git a/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_MsPacMan_GameModel.java b/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_MsPacMan_GameModel.java
@@ -35,7 +35,7 @@ public void buildDemoLevel() {
         level.pac().setUsingAutopilot(true);
         level.pac().setAutopilotSteering(demoLevelSteering);
         demoLevelSteering.init();
-        hud().theLevelCounter().setEnabled(false);
+        hudData().theLevelCounter().setEnabled(false);
         huntingTimer.reset();
         scoreManager().setScoreLevelNumber(levelNumber);
         gateKeeper.setLevelNumber(levelNumber);
diff --git a/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_PacMan_GameModel.java b/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_PacMan_GameModel.java
@@ -43,7 +43,7 @@ public void buildDemoLevel() {
         level.pac().setUsingAutopilot(true);
         level.pac().setAutopilotSteering(demoLevelSteering);
         demoLevelSteering.init();
-        hud().theLevelCounter().setEnabled(false);
+        hudData().theLevelCounter().setEnabled(false);
         huntingTimer.reset();
         scoreManager().setScoreLevelNumber(levelNumber);
         gateKeeper.setLevelNumber(levelNumber);
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/model/TengenMsPacMan_GameModel.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/model/TengenMsPacMan_GameModel.java
@@ -253,7 +253,7 @@ public ScoreManager scoreManager() {
     }
 
     @Override
-    public TengenMsPacMan_GameData hud() {
+    public TengenMsPacMan_GameData hudData() {
         return hud;
     }
 
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_BootScene.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_BootScene.java
@@ -10,9 +10,9 @@
 import de.amr.pacmanfx.model.actors.Actor;
 import de.amr.pacmanfx.model.actors.Ghost;
 import de.amr.pacmanfx.tengen.ms_pacman.rendering.TengenMsPacMan_GameRenderer;
-import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui._2d.GameRenderer;
 import de.amr.pacmanfx.ui._2d.GameScene2D;
+import de.amr.pacmanfx.ui.api.GameUI;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 
@@ -58,7 +58,7 @@ public void doInit() {
         ghost.setAnimations(ui.currentConfig().createGhostAnimations(ghost));
         ghost.selectAnimation(ANIM_GHOST_NORMAL);
 
-        gameContext().game().hud().all(false);
+        gameContext().game().hudData().all(false);
     }
 
     @Override
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CreditsScene.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CreditsScene.java
@@ -12,7 +12,8 @@
 
 import static de.amr.pacmanfx.Globals.TS;
 import static de.amr.pacmanfx.tengen.ms_pacman.TengenMsPacMan_Actions.ACTION_ENTER_START_SCREEN;
-import static de.amr.pacmanfx.tengen.ms_pacman.TengenMsPacMan_UIConfig.*;
+import static de.amr.pacmanfx.tengen.ms_pacman.TengenMsPacMan_UIConfig.NES_SIZE_PX;
+import static de.amr.pacmanfx.tengen.ms_pacman.TengenMsPacMan_UIConfig.nesPaletteColor;
 
 /**
  * Gives credit to the people that helped in making the game, original and remake authors.
@@ -27,7 +28,7 @@ public TengenMsPacMan_CreditsScene(GameUI ui) {
 
     @Override
     protected void doInit() {
-        gameContext().game().hud().credit(false).score(false).levelCounter(false).livesCounter(false);
+        gameContext().game().hudData().credit(false).score(false).levelCounter(false).livesCounter(false);
         var tengenBindings = ui.<TengenMsPacMan_UIConfig>currentConfig().tengenMsPacManBindings();
         actionBindings.assign(ACTION_ENTER_START_SCREEN, tengenBindings);
     }
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene1.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene1.java
@@ -14,9 +14,9 @@
 import de.amr.pacmanfx.tengen.ms_pacman.rendering.SpriteID;
 import de.amr.pacmanfx.tengen.ms_pacman.rendering.TengenMsPacMan_GameRenderer;
 import de.amr.pacmanfx.tengen.ms_pacman.rendering.TengenMsPacMan_SpriteSheet;
+import de.amr.pacmanfx.ui._2d.GameScene2D;
 import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui.api.GameUI_Config;
-import de.amr.pacmanfx.ui._2d.GameScene2D;
 import de.amr.pacmanfx.uilib.animation.SingleSpriteActor;
 
 import java.util.List;
@@ -68,7 +68,7 @@ public TengenMsPacMan_CutScene1(GameUI ui) {
     public void doInit() {
         t = -1;
 
-        gameContext().game().hud().credit(false).score(false).levelCounter(true).livesCounter(false);
+        gameContext().game().hudData().credit(false).score(false).levelCounter(true).livesCounter(false);
 
         actionBindings.bind(ACTION_LET_GAME_STATE_EXPIRE, ui.joypad().key(JoypadButton.START));
 
@@ -233,7 +233,7 @@ public void draw() {
         // draw HUD only for non-Arcade map mode
         var game = gameContext().<TengenMsPacMan_GameModel>game();
         if (game.mapCategory() != MapCategory.ARCADE) {
-            gameRenderer.drawHUD(gameContext(), game.hud(), sizeInPx().minus(0, 2 * TS), ui.clock().tickCount());
+            gameRenderer.drawHUD(gameContext(), game.hudData(), sizeInPx().minus(0, 2 * TS), ui.clock().tickCount());
         }
     }
 
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene2.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene2.java
@@ -12,9 +12,9 @@
 import de.amr.pacmanfx.tengen.ms_pacman.model.TengenMsPacMan_GameModel;
 import de.amr.pacmanfx.tengen.ms_pacman.rendering.TengenMsPacMan_GameRenderer;
 import de.amr.pacmanfx.tengen.ms_pacman.rendering.TengenMsPacMan_SpriteSheet;
+import de.amr.pacmanfx.ui._2d.GameScene2D;
 import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui.api.GameUI_Config;
-import de.amr.pacmanfx.ui._2d.GameScene2D;
 
 import java.util.List;
 
@@ -56,7 +56,7 @@ public TengenMsPacMan_CutScene2(GameUI ui) {
     public void doInit() {
         t = -1;
 
-        gameContext().game().hud().credit(false).score(false).levelCounter(true).livesCounter(false);
+        gameContext().game().hudData().credit(false).score(false).levelCounter(true).livesCounter(false);
 
         actionBindings.bind(ACTION_LET_GAME_STATE_EXPIRE, ui.joypad().key(JoypadButton.START));
 
@@ -169,7 +169,7 @@ public void draw() {
         // draw HUD only for non-Arcade map mode
         var game = gameContext().<TengenMsPacMan_GameModel>game();
         if (game.mapCategory() != MapCategory.ARCADE) {
-            gameRenderer.drawHUD(gameContext(), game.hud(), sizeInPx().minus(0, 2 * TS), ui.clock().tickCount());
+            gameRenderer.drawHUD(gameContext(), game.hudData(), sizeInPx().minus(0, 2 * TS), ui.clock().tickCount());
         }
     }
 
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene3.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene3.java
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene4.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene4.java
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_IntroScene.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_IntroScene.java
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_OptionsScene.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_OptionsScene.java
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_PlayScene2D.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_PlayScene2D.java
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
diff --git a/pacman-core/src/main/java/de/amr/pacmanfx/model/Game.java b/pacman-core/src/main/java/de/amr/pacmanfx/model/Game.java
diff --git a/pacman-ui/src/main/java/de/amr/pacmanfx/ui/_2d/GameScene2D.java b/pacman-ui/src/main/java/de/amr/pacmanfx/ui/_2d/GameScene2D.java
diff --git a/pacman-ui/src/main/java/de/amr/pacmanfx/ui/_3d/GameLevel3D.java b/pacman-ui/src/main/java/de/amr/pacmanfx/ui/_3d/GameLevel3D.java
diff --git a/pacman-ui/src/main/java/de/amr/pacmanfx/ui/_3d/PlayScene3D.java b/pacman-ui/src/main/java/de/amr/pacmanfx/ui/_3d/PlayScene3D.java

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ public ScoreManager scoreManager() {`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`@Override`
`261`		`- public ArcadeMsPacMan_GameData hud() {`
	`261`	`+ public ArcadeMsPacMan_GameData hudData() {`
`262`	`262`	`return hud;`
`263`	`263`	`}`
`264`	`264`
`@@ -295,7 +295,7 @@ public void createLevel(int levelNumber) {`
`295`	`295`
`296`	`296`	`/* In Ms. Pac-Man, the level counter stays fixed from level 8 on and bonus symbols are created randomly`
`297`	`297`	`* (also inside a level) whenever a bonus score is reached. At least that's what I was told. */`
`298`		`- hud().theLevelCounter().setEnabled(levelNumber < 8);`
	`298`	`+ hudData().theLevelCounter().setEnabled(levelNumber < 8);`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ public ScoreManager scoreManager() {`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`@Override`
`255`		`- public GameData hud() {`
	`255`	`+ public GameData hudData() {`
`256`	`256`	`return hud;`
`257`	`257`	`}`
`258`	`258`