Refac

Author: armin-reichert

pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadeCommon_GameModel.java

@@ -209,7 +209,7 @@ public void buildNormalLevel(int levelNumber) {
         gameLevel.pac().usingAutopilotProperty().bind(gameContext.gameController().propertyUsingAutopilot());
         hudData().theLevelCounter().setEnabled(true);
         huntingTimer().reset();
-        scoreManager().setScoreLevelNumber(levelNumber);
+        scoreManager().setGameLevelNumber(levelNumber);
         gateKeeper.setLevelNumber(levelNumber);
         gameLevel.house().ifPresent(house -> gateKeeper.setHouse(house)); //TODO what if no house exists?
         eventManager().publishEvent(GameEventType.LEVEL_CREATED);
@@ -226,7 +226,7 @@ public void buildDemoLevel() {
         demoLevelSteering.init();
         hudData().theLevelCounter().setEnabled(true);
         huntingTimer().reset();
-        scoreManager().setScoreLevelNumber(levelNumber);
+        scoreManager().setGameLevelNumber(levelNumber);
         gateKeeper.setLevelNumber(levelNumber);
         gameLevel.house().ifPresent(house -> gateKeeper.setHouse(house)); //TODO what if no house exists?
         eventManager().publishEvent(GameEventType.LEVEL_CREATED);

pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_MsPacMan_GameModel.java

@@ -37,7 +37,7 @@ public void buildDemoLevel() {
         demoLevelSteering.init();
         hudData().theLevelCounter().setEnabled(false);
         huntingTimer().reset();
-        scoreManager().setScoreLevelNumber(levelNumber);
+        scoreManager().setGameLevelNumber(levelNumber);
         gateKeeper.setLevelNumber(levelNumber);
         gameLevel.house().ifPresent(house -> gateKeeper.setHouse(house)); //TODO what if no house exists?
         eventManager().publishEvent(GameEventType.LEVEL_CREATED);

pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_PacMan_GameModel.java

@@ -45,7 +45,7 @@ public void buildDemoLevel() {
         demoLevelSteering.init();
         hudData().theLevelCounter().setEnabled(false);
         huntingTimer().reset();
-        scoreManager().setScoreLevelNumber(levelNumber);
+        scoreManager().setGameLevelNumber(levelNumber);
         gateKeeper.setLevelNumber(levelNumber);
         gameLevel.house().ifPresent(house -> gateKeeper.setHouse(house)); //TODO what if no house exists?
         eventManager().publishEvent(GameEventType.LEVEL_CREATED);

pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/model/TengenMsPacMan_GameModel.java

@@ -556,7 +556,7 @@ public void buildNormalLevel(int levelNumber) {
         gameLevel.pac().immuneProperty().bind(gameContext.gameController().propertyImmunity());
         gameLevel.pac().usingAutopilotProperty().bind(gameContext.gameController().propertyUsingAutopilot());
         huntingTimer().reset();
-        scoreManager.setScoreLevelNumber(levelNumber);
+        scoreManager.setGameLevelNumber(levelNumber);
         optGateKeeper().ifPresent(gateKeeper -> {
             gateKeeper.setLevelNumber(levelNumber);
             gameLevel.house().ifPresent(gateKeeper::setHouse); //TODO what if no house exists?
@@ -574,7 +574,7 @@ public void buildDemoLevel() {
         gameLevel.pac().setAutopilotSteering(demoLevelSteering);
         demoLevelSteering.init();
         huntingTimer.reset();
-        scoreManager.setScoreLevelNumber(1);
+        scoreManager.setGameLevelNumber(1);
         optGateKeeper().ifPresent(gateKeeper -> {
             gateKeeper.setLevelNumber(1);
             gameLevel.house().ifPresent(gateKeeper::setHouse); //TODO what if no house exists?

pacman-core/src/main/java/de/amr/pacmanfx/model/DefaultScoreManager.java

@@ -1,3 +1,7 @@
+/*
+Copyright (c) 2021-2025 Armin Reichert (MIT License)
+See file LICENSE in repository root directory for details.
+*/
 package de.amr.pacmanfx.model;
 
 import de.amr.pacmanfx.event.GameEvent;
@@ -9,7 +13,6 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.HashSet;
 import java.util.Set;
 
 import static java.util.Objects.requireNonNull;
@@ -42,7 +45,7 @@ private void onScoreChanged(Game game, int oldScore, int newScore) {
 
     @Override
     public void setExtraLifeScores(Set<Integer> scores) {
-        extraLifeScores = new HashSet<>(scores);
+        extraLifeScores = Set.copyOf(scores);
     }
 
     @Override
@@ -119,8 +122,7 @@ public Score highScore() {
     }
 
     @Override
-    public void setScoreLevelNumber(int levelNumber) {
+    public void setGameLevelNumber(int levelNumber) {
         score.setLevelNumber(levelNumber);
     }
-
-}
+}

pacman-core/src/main/java/de/amr/pacmanfx/model/ScoreManager.java

@@ -14,6 +14,6 @@ public interface ScoreManager {
     void loadHighScore();
     void saveHighScore();
     void updateHighScore();
-    void setScoreLevelNumber(int levelNumber);
+    void setGameLevelNumber(int levelNumber);
     void setExtraLifeScores(Set<Integer> scores);
 }