Refac

Author: armin-reichert

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

@@ -184,17 +184,17 @@ public WorldMapColorScheme colorScheme(WorldMap worldMap) {
 
     @Override
     public ArcadeMsPacMan_GameRenderer createGameRenderer(Canvas canvas) {
-        return new ArcadeMsPacMan_GameRenderer(ui.assets(), this, spriteSheetBrightMazes, canvas);
+        return new ArcadeMsPacMan_GameRenderer(ui.assets(), canvas, spriteSheet, spriteSheetBrightMazes);
     }
 
     @Override
     public ArcadeMsPacMan_GhostAnimationMap createGhostAnimations(Ghost ghost) {
-        return new ArcadeMsPacMan_GhostAnimationMap(spriteSheet(), ghost.personality());
+        return new ArcadeMsPacMan_GhostAnimationMap(spriteSheet, ghost.personality());
     }
 
     @Override
     public ArcadeMsPacMan_PacAnimationMap createPacAnimations(Pac pac) {
-        return new ArcadeMsPacMan_PacAnimationMap(spriteSheet());
+        return new ArcadeMsPacMan_PacAnimationMap(spriteSheet);
     }
 
     @Override

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

@@ -38,26 +38,18 @@ public class ArcadeMsPacMan_GameRenderer extends GameRenderer {
 
     public ArcadeMsPacMan_GameRenderer(
         GameAssets assets,
-        GameUI_Config config,
-        BrightMazesSpriteSheet brightMazesSpriteSheet,
-        Canvas canvas)
+        Canvas canvas,
+        ArcadeMsPacMan_SpriteSheet spriteSheet,
+        BrightMazesSpriteSheet brightMazesSpriteSheet)
     {
         super(assets);
-        requireNonNull(config);
-        this.ctx = requireNonNull(canvas).getGraphicsContext2D();
-        this.spriteSheet = (ArcadeMsPacMan_SpriteSheet) config.spriteSheet();
-        this.brightMazesSpriteSheet = requireNonNull(brightMazesSpriteSheet);
+        ctx = canvas.getGraphicsContext2D();
+        this.spriteSheet = spriteSheet;
+        this.brightMazesSpriteSheet = brightMazesSpriteSheet;
     }
 
-    protected ArcadeMsPacMan_GameRenderer(
-        GameAssets assets,
-        GameUI_Config config,
-        Canvas canvas)
-    {
-        super(assets);
-        requireNonNull(config);
-        this.ctx = requireNonNull(canvas).getGraphicsContext2D();
-        this.spriteSheet = (ArcadeMsPacMan_SpriteSheet) config.spriteSheet();
+    protected ArcadeMsPacMan_GameRenderer(GameAssets assets, Canvas canvas, ArcadeMsPacMan_SpriteSheet spriteSheet) {
+        this(assets, canvas, spriteSheet, null);
     }
 
     @Override
@@ -71,8 +63,6 @@ public void dispose() {
 
     @Override
     public void drawHUD(GameContext gameContext, HUDData data, Vector2f sceneSize, long tick) {
-        requireNonNull(data);
-
         if (!data.isVisible()) return;
 
         if (data.isScoreVisible()) {

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

@@ -6,8 +6,8 @@
 
 import de.amr.pacmanfx.GameContext;
 import de.amr.pacmanfx.arcade.ms_pacman.rendering.ArcadeMsPacMan_GameRenderer;
+import de.amr.pacmanfx.arcade.ms_pacman.rendering.ArcadeMsPacMan_SpriteSheet;
 import de.amr.pacmanfx.model.GameLevel;
-import de.amr.pacmanfx.ui.api.GameUI_Config;
 import de.amr.pacmanfx.ui.GameAssets;
 import de.amr.pacmanfx.ui._2d.GenericMapRenderer;
 import javafx.scene.canvas.Canvas;
@@ -17,8 +17,8 @@ public class PacManXXL_MsPacMan_GameRenderer extends ArcadeMsPacMan_GameRenderer
 
     private final GenericMapRenderer mapRenderer;
 
-    public PacManXXL_MsPacMan_GameRenderer(GameAssets assets, GameUI_Config config, Canvas canvas) {
-        super(assets, config, canvas);
+    public PacManXXL_MsPacMan_GameRenderer(GameAssets assets, Canvas canvas, ArcadeMsPacMan_SpriteSheet spriteSheet) {
+        super(assets, canvas, spriteSheet);
         mapRenderer = new GenericMapRenderer(canvas);
         mapRenderer.scalingProperty().bind(scalingProperty());
     }

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

@@ -184,17 +184,17 @@ public WorldMapColorScheme colorScheme(WorldMap worldMap) {
 
     @Override
     public PacManXXL_MsPacMan_GameRenderer createGameRenderer(Canvas canvas) {
-        return new PacManXXL_MsPacMan_GameRenderer(ui.assets(), this, canvas);
+        return new PacManXXL_MsPacMan_GameRenderer(ui.assets(), canvas, spriteSheet);
     }
 
     @Override
     public SpriteAnimationMap<SpriteID> createGhostAnimations(Ghost ghost) {
-        return new ArcadeMsPacMan_GhostAnimationMap(spriteSheet(), ghost.personality());
+        return new ArcadeMsPacMan_GhostAnimationMap(spriteSheet, ghost.personality());
     }
 
     @Override
     public SpriteAnimationMap<SpriteID> createPacAnimations(Pac pac) {
-        return new ArcadeMsPacMan_PacAnimationMap(spriteSheet());
+        return new ArcadeMsPacMan_PacAnimationMap(spriteSheet);
     }
 
     @Override