Refac

Author: armin-reichert

pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_GameModel.java

@@ -222,7 +222,7 @@ public ArcadeMsPacMan_GameModel(GameContext gameContext, MapSelector mapSelector
         super(gameContext);
         this.mapSelector = requireNonNull(mapSelector);
 
-        scoreManager = new DefaultScoreManager(gameContext, highScoreFile);
+        scoreManager = new DefaultScoreManager(this, highScoreFile);
         scoreManager.setExtraLifeScores(Set.of(EXTRA_LIFE_SCORE));
 
         /*
@@ -443,7 +443,7 @@ private Portal randomPortal(GameLevel level) {
     }
 
     @Override
-    protected GameEventManager eventManager() {
+    public GameEventManager eventManager() {
         return gameContext.eventManager();
     }
 }

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

@@ -192,7 +192,7 @@ public ArcadePacMan_GameModel(GameContext gameContext, MapSelector mapSelector,
 
         this.mapSelector = requireNonNull(mapSelector);
 
-        scoreManager = new DefaultScoreManager(gameContext, highScoreFile);
+        scoreManager = new DefaultScoreManager(this, highScoreFile);
         scoreManager.setExtraLifeScores(Set.of(EXTRA_LIFE_SCORE));
 
         huntingTimer = new HuntingTimer("ArcadePacMan-HuntingTimer", 8) {
@@ -335,7 +335,7 @@ public void activateNextBonus() {
     }
 
     @Override
-    protected GameEventManager eventManager() {
+    public GameEventManager eventManager() {
         return gameContext.eventManager();
     }
 }

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

@@ -236,7 +236,7 @@ public Vector2i chasingTargetTile(GameContext gameContext) {
 
     public TengenMsPacMan_GameModel(GameContext gameContext, File highScoreFile) {
         this.gameContext = requireNonNull(gameContext);
-        scoreManager = new DefaultScoreManager(gameContext, highScoreFile);
+        scoreManager = new DefaultScoreManager(this, highScoreFile);
         actorSpeedControl = new TengenActorSpeedControl();
         mapSelector = new TengenMsPacMan_MapSelector();
         gateKeeper = new GateKeeper(this); //TODO implement Tengen logic instead
@@ -746,7 +746,7 @@ public void onGhostKilled(Ghost ghost) {
     }
 
     @Override
-    protected GameEventManager eventManager() {
+    public GameEventManager eventManager() {
         return gameContext.eventManager();
     }
 }

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

@@ -5,7 +5,6 @@
 package de.amr.pacmanfx.model;
 
 import de.amr.pacmanfx.GameContext;
-import de.amr.pacmanfx.event.GameEventManager;
 import de.amr.pacmanfx.event.GameEventType;
 import de.amr.pacmanfx.lib.timer.Pulse;
 import de.amr.pacmanfx.lib.timer.TickTimer;
@@ -37,8 +36,6 @@ public SimulationStep simulationStep() {
         return simulationStep;
     }
 
-    protected abstract GameEventManager eventManager();
-
     protected void setLifeCount(int n) {
         if (n >= 0) {
             lifeCount.set(n);

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

@@ -1,6 +1,5 @@
 package de.amr.pacmanfx.model;
 
-import de.amr.pacmanfx.GameContext;
 import de.amr.pacmanfx.event.GameEvent;
 import de.amr.pacmanfx.event.GameEventType;
 import org.tinylog.Logger;
@@ -17,27 +16,25 @@
 
 public class DefaultScoreManager implements ScoreManager {
 
-    protected final GameContext gameContext;
     protected final Score score = new Score();
     protected final Score highScore = new Score();
     protected final File highScoreFile;
     protected Set<Integer> extraLifeScores = Set.of();
 
-    public DefaultScoreManager(GameContext gameContext, File highScoreFile) {
-        this.gameContext = gameContext;
+    public DefaultScoreManager(Game game, File highScoreFile) {
         this.highScoreFile = requireNonNull(highScoreFile);
-        score.pointsProperty().addListener((py, ov, nv) -> onScoreChanged(ov.intValue(), nv.intValue()));
+        score.pointsProperty().addListener((py, ov, nv) -> onScoreChanged(game, ov.intValue(), nv.intValue()));
     }
 
-    private void onScoreChanged(int oldScore, int newScore) {
+    private void onScoreChanged(Game game, int oldScore, int newScore) {
         for (int extraLifeScore : extraLifeScores) {
             // has extra life score been crossed?
             if (oldScore < extraLifeScore && newScore >= extraLifeScore) {
-                gameContext.game().simulationStep().extraLifeWon = true;
-                gameContext.game().simulationStep().extraLifeScore = extraLifeScore;
-                gameContext.game().addLives(1);
-                GameEvent event = new GameEvent(gameContext.game(), GameEventType.SPECIAL_SCORE_REACHED);
-                gameContext.eventManager().publishEvent(event);
+                game.simulationStep().extraLifeWon = true;
+                game.simulationStep().extraLifeScore = extraLifeScore;
+                game.addLives(1);
+                GameEvent event = new GameEvent(game, GameEventType.SPECIAL_SCORE_REACHED);
+                game.eventManager().publishEvent(event);
                 break;
             }
         }

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

@@ -4,12 +4,14 @@
 */
 package de.amr.pacmanfx.model;
 
+import de.amr.pacmanfx.event.GameEventManager;
 import de.amr.pacmanfx.model.actors.ActorSpeedControl;
 
 import java.util.Optional;
 import java.util.OptionalInt;
 
 public interface Game extends GameLifecycle, GameEvents {
+    GameEventManager eventManager();
     ScoreManager scoreManager();
     HUDData hudData();
     SimulationStep simulationStep();