BREAKING: Arch proposal

build.gradle

@@ -30,7 +30,7 @@ tasks.withType(JavaCompile) {
 
 application {
     mainModule = 'io.rpg'
-    mainClass = 'io.rpg.HelloApplication'
+    mainClass = 'io.rpg.Main'
 }
 
 javafx {

configurations/config-1/locations/location-1/location-1.json

@@ -3,5 +3,6 @@
   "objects": [
     { "tag": "object-1", "position": { "row": 0, "col": 5 }, "type": "collectible" },
     { "tag": "object-2", "position": { "row": 1, "col": 3 }, "type": "interactive" }
-  ]
-}
+  ],
+  "backgroundPath": "file:assets/map.png"
+}

configurations/config-1/locations/location-2/location-2.json

@@ -1,7 +1,8 @@
 {
   "tag": "location-2",
   "objects": [
-    { "tag": "object-1", "position": { "row": 0, "col": 0 } },
-    { "tag": "object-3", "position": { "row": 0, "col": 1 } }
-  ]
+    { "tag": "object-1", "position": { "row": 0, "col": 0 }, "type": "collectible" },
+    { "tag": "object-3", "position": { "row": 0, "col": 1 }, "type": "navigable" }
+  ],
+  "backgroundPath": "file:assets/map.png"
 }

configurations/config-1/locations/location-2/objects/object-1.json

@@ -0,0 +1,5 @@
+{
+  "tag": "object-1",
+  "assetPath": "/path/to/the/asset",
+  "type": ""
+}

configurations/config-1/locations/location-2/objects/object-3.json

@@ -0,0 +1,5 @@
+{
+  "tag": "object-3",
+  "assetPath": "/path/to/the/asset",
+  "type": ""
+}

configurations/config-1/root.json

@@ -1,7 +1,8 @@
 {
   "tag": "GameByConfig1",
-  "locations": [
+  "locationTags": [
     "location-1",
     "location-2"
-  ]
+  ],
+  "rootLocation": "location-1"
 }

configurations/unit-test-configuration/locations/location-1/location-1.json

@@ -1,7 +1,8 @@
 {
   "tag": "location-1",
   "objects": [
-    { "tag": "object-1", "position": { "row": 0, "col": 5 } },
-    { "tag": "object-2", "position": { "row": 1, "col": 3 } }
-  ]
-}
+    { "tag": "object-1", "position": { "row": 0, "col": 5 }, "type": "collectible" },
+    { "tag": "object-2", "position": { "row": 1, "col": 3 }, "type": "interactive" }
+  ],
+  "backgroundPath": "file:assets/map.png"
+}

configurations/unit-test-configuration/locations/location-1/objects/object-1.json

@@ -0,0 +1,5 @@
+{
+  "tag": "object-1",
+  "assetPath": "/path/to/the/asset",
+  "type": ""
+}

configurations/unit-test-configuration/locations/location-2/location-2.json

@@ -1,7 +1,8 @@
 {
   "tag": "location-2",
   "objects": [
-    { "tag": "object-1", "position": { "row": 0, "col": 0 } },
-    { "tag": "object-3", "position": { "row": 0, "col": 1 } }
-  ]
+    { "tag": "object-1", "position": { "row": 0, "col": 0 }, "type": "collectible" },
+    { "tag": "object-3", "position": { "row": 0, "col": 1 }, "type": "navigable" }
+  ],
+  "backgroundPath": "file:assets/map.png"
 }

configurations/unit-test-configuration/locations/location-2/objects/object-1.json

@@ -0,0 +1,5 @@
+{
+  "tag": "object-1",
+  "assetPath": "/path/to/the/asset",
+  "type": ""
+}

configurations/unit-test-configuration/locations/location-2/objects/object-3.json

@@ -0,0 +1,5 @@
+{
+  "tag": "object-3",
+  "assetPath": "/path/to/the/asset",
+  "type": ""
+}

configurations/unit-test-configuration/root.json

@@ -1,7 +1,8 @@
 {
   "tag": "test-tag",
-  "locations": [
+  "locationTags": [
     "location-1",
     "location-2"
-  ]
+  ],
+  "rootLocation": "location-1"
 }

src/main/java/io/rpg/Game.java

@@ -0,0 +1,44 @@
+package io.rpg;
+
+import io.rpg.controller.Controller;
+import javafx.scene.Scene;
+import org.jetbrains.annotations.NotNull;
+
+public class Game {
+  private Controller controller;
+
+  private Game() {
+
+  }
+
+  public void setLocationControllerForLocationTag(String tag) {
+    // tutaj przyda sie hashmapa: nazwa lokacji -> kontroller
+  }
+
+  public Scene getWorldView() {
+    return controller.getView();
+  }
+
+  public void setController(Controller controller) {
+    this.controller = controller;
+  }
+
+  public static class Builder {
+    private final Game game;
+
+    public Builder() {
+      game = new Game();
+    }
+
+    public Game build() {
+      assert game.controller != null : "Attempt to build Game object without controller";
+      return game;
+    }
+
+    public Builder setController(Controller controller) {
+      assert controller != null : "Attempt to set null controller";
+      game.setController(controller);
+      return this;
+    }
+  }
+}

src/main/java/io/rpg/Initializer.java

@@ -0,0 +1,106 @@
+package io.rpg;
+
+import io.rpg.config.ConfigLoader;
+import io.rpg.controller.Controller;
+import io.rpg.config.model.GameWorldConfig;
+import io.rpg.config.model.LocationConfig;
+import io.rpg.model.location.LocationModel;
+import io.rpg.model.object.GameObject;
+import io.rpg.config.model.GameObjectConfig;
+import io.rpg.util.Result;
+import io.rpg.view.LocationView;
+import javafx.stage.Stage;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+
+public class Initializer {
+  private Path pathToConfigDir;
+  private ConfigLoader configLoader;
+  private Stage mainStage;
+
+  private final Logger logger;
+
+  public Initializer(@NotNull String pathToConfigDir, Stage mainStage) {
+    this.configLoader = new ConfigLoader(pathToConfigDir);
+    this.mainStage = mainStage;
+    this.logger = LogManager.getLogger(Initializer.class);
+  }
+
+  public Result<Game, Exception> initialize() {
+    Result<GameWorldConfig, Exception> gameWorldConfigLoadResult = configLoader.load();
+
+    if (gameWorldConfigLoadResult.isError()) {
+      gameWorldConfigLoadResult.getErrorValueOpt().ifPresentOrElse(
+          ex -> logger.error(ex.getMessage()),
+          () -> logger.error("Unknown error returned from config loader")
+      );
+      return Result.error(gameWorldConfigLoadResult.getErrorValue());
+    } else if (gameWorldConfigLoadResult.isOkValueNull()) {
+      logger.error("ConfigLoader fetched null GameWorldConfig");
+      return Result.error(new RuntimeException("ConfigLoader fetched null GameWorldConfig"));
+    }
+
+    GameWorldConfig worldConfig = gameWorldConfigLoadResult.getOkValue();
+
+    Controller.Builder controllerBuilder = new Controller.Builder();
+
+    assert worldConfig.getLocationConfigs() != null;
+    assert worldConfig.getLocationConfigs().size() > 0 : "There must be at least one location config specified";
+
+    for (LocationConfig locationConfig : worldConfig.getLocationConfigs()) {
+      LocationModel model = loadLocationModelFromConfig(locationConfig);
+      LocationView view = loadLocationViewFromConfig(locationConfig);
+
+      assert view != null;
+
+      if (locationConfig.getTag().equals(worldConfig.getRootLocation())) {
+        controllerBuilder
+            .setModel(model)
+            .setView(view);
+      }
+
+      model.addOnLocationModelStateChangeObserver(view);
+
+      controllerBuilder
+          .addViewForTag(locationConfig.getTag(), view)
+          .addModelForTag(locationConfig.getTag(), model);
+    }
+
+    Game.Builder gameBuilder = new Game.Builder();
+    gameBuilder.setController(controllerBuilder.build());
+
+    return Result.ok(gameBuilder.build());
+  }
+
+  @Nullable
+  public static LocationView loadLocationViewFromConfig(LocationConfig config) {
+    try {
+      return LocationView.fromConfig(config);
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    return null;
+  }
+
+  public static LocationModel loadLocationModelFromConfig(LocationConfig config) {
+    List<GameObjectConfig> gameObjectConfigs = config.getObjects();
+    List<GameObject> gameObjects = new LinkedList<>();
+
+    for (GameObjectConfig goconfig : gameObjectConfigs) {
+      gameObjects.add(GameObject.fromConfig(goconfig));
+    }
+
+    return new LocationModel(
+        config.getTag(),
+        gameObjects
+    );
+  }
+}