Module select UI

engine/src/main/java/org/destinationsol/SolApplication.java

@@ -333,6 +333,9 @@ private void draw() {
 
     public void play(boolean tut, String shipName, boolean isNewGame, WorldConfig worldConfig) {
         ModuleManager moduleManager = appContext.getBean(ModuleManager.class);
+        moduleManager.loadEnvironment(worldConfig.getModules());
+        appContext.getBean(AssetHelper.class).switchEnvironment(moduleManager.getEnvironment());
+
         gameContext = appContext.getNestedContainer(
                 new GameConfigurationServiceRegistry(worldConfig),
                 new EventReceiverServiceRegistry(moduleManager.getEnvironment()),
@@ -350,7 +353,7 @@ public void play(boolean tut, String shipName, boolean isNewGame, WorldConfig wo
         entitySystemManager.initialise();
 
         solGame.createUpdateSystems();
-        solGame.startGame(shipName, isNewGame, worldConfig, entitySystemManager);
+        solGame.startGame(shipName, isNewGame, entitySystemManager);
 
         if (!isNewGame) {
             try {

engine/src/main/java/org/destinationsol/assets/AssetHelper.java

@@ -131,6 +131,10 @@ public Set<ResourceUrn> listAssets(Class<? extends Asset<?>> type, String asset,
         return list;
     }
 
+    public void switchEnvironment(ModuleEnvironment environment) {
+        assetTypeManager.switchEnvironment(environment);
+    }
+
     public void dispose() {
         try {
             assetTypeManager.unloadEnvironment();

engine/src/main/java/org/destinationsol/assets/music/OggMusicManager.java

@@ -238,7 +238,7 @@ public void unregisterModuleMusic() {
     }
 
     public void resetMusic() {
-        musicMap.put(GAME_MUSIC_SET, new ArrayList<>());
+        musicMap.clear();
     }
 
     public String getCurrentMusicSet() {

engine/src/main/java/org/destinationsol/game/GalaxyFiller.java

@@ -43,6 +43,7 @@
 
 import javax.inject.Inject;
 import java.util.ArrayList;
+import java.util.List;
 
 public class GalaxyFiller {
     private static final float STATION_CONSUME_SECTOR = 45f;
@@ -140,7 +141,7 @@ public void fill(SolGame game, HullConfigManager hullConfigManager, ItemManager
             return;
         }
         createStarPorts(game);
-        ArrayList<SolarSystem> systems = game.getGalaxyBuilder().getBuiltSolarSystems();
+        List<SolarSystem> systems = game.getGalaxyBuilder().getBuiltSolarSystems();
 
         JSONObject rootNode = Validator.getValidatedJSON(moduleName + ":startingStation", "engine:schemaStartingStation");
 

engine/src/main/java/org/destinationsol/game/SaveManager.java

@@ -20,6 +20,8 @@
 import com.badlogic.gdx.math.Vector2;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.stream.JsonReader;
@@ -34,10 +36,13 @@
 import org.destinationsol.game.item.SolItem;
 import org.destinationsol.game.ship.SolShip;
 import org.destinationsol.game.ship.hulls.HullConfig;
+import org.destinationsol.modules.ModuleManager;
 import org.destinationsol.ui.Waypoint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.terasology.context.annotation.API;
+import org.terasology.gestalt.module.Module;
+import org.terasology.gestalt.naming.Name;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -46,8 +51,10 @@
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 @API
 public class SaveManager {
@@ -232,16 +239,38 @@ public static ShipConfig readShip(HullConfigManager hullConfigs, ItemManager ite
     }
 
     /**
-     * Saves the world to a file. Currently stores the seed used to generate the world and the number of systems
-     * @param numberOfSystems
+     * Saves the world to a file. Currently stores the seed used to generate the world,
+     * the number of systems and the generators used.
+     * @param worldConfig the current world configuration.
      */
-    public static void saveWorld(int numberOfSystems) {
+    public static void saveWorld(WorldConfig worldConfig) {
         Long seed = SolRandom.getSeed();
         String fileName = SaveManager.getResourcePath(Const.WORLD_SAVE_FILE_NAME);
 
         JsonObject world = new JsonObject();
         world.addProperty("seed", seed);
-        world.addProperty("systems", numberOfSystems);
+        world.addProperty("systems", worldConfig.getNumberOfSystems());
+
+        JsonArray solarSystemGenerators = new JsonArray();
+        for (String solarSystemGenerator : worldConfig.getSolarSystemGenerators()) {
+            solarSystemGenerators.add(solarSystemGenerator);
+        }
+        world.add("solarSystemGenerators", solarSystemGenerators);
+
+        JsonArray featureGenerators = new JsonArray();
+        for (String featureGenerator : worldConfig.getFeatureGenerators()) {
+            featureGenerators.add(featureGenerator);
+        }
+        world.add("featureGenerators", featureGenerators);
+
+        JsonArray modulesArray = new JsonArray();
+        for (Name module : ModuleManager.getEnvironmentStatic().getModuleIdsOrderedByDependencies()) {
+            // Exclude built-in modules
+            if (module.compareTo("engine") != 0 && module.compareTo("nui") != 0) {
+                modulesArray.add(module.toString());
+            }
+        }
+        world.add("modules", modulesArray);
 
         Gson gson = new GsonBuilder().setPrettyPrinting().create();
         String stringToWrite = gson.toJson(world);
@@ -272,6 +301,44 @@ public static Optional<WorldConfig> loadWorld() {
                     config.setNumberOfSystems(world.get("systems").getAsInt());
                 }
 
+                if (world.has("solarSystemGenerators")) {
+                    List<String> solarSystemGenerators = new ArrayList<>();
+                    for (JsonElement value : world.getAsJsonArray("solarSystemGenerators")) {
+                        if (value.isJsonPrimitive() && value.getAsJsonPrimitive().isString()) {
+                            solarSystemGenerators.add(value.getAsString());
+                        }
+                    }
+                    config.setSolarSystemGenerators(solarSystemGenerators);
+                }
+
+                if (world.has("featureGenerators")) {
+                    List<String> featureGenerators = new ArrayList<>();
+                    for (JsonElement value : world.getAsJsonArray("featureGenerators")) {
+                        if (value.isJsonPrimitive() && value.getAsJsonPrimitive().isString()) {
+                            featureGenerators.add(value.getAsString());
+                        }
+                    }
+                    config.setFeatureGenerators(featureGenerators);
+                }
+
+                if (world.has("modules")) {
+                    Set<Module> modules = new HashSet<>();
+                    for (JsonElement value : world.getAsJsonArray("modules")) {
+                        if (value.isJsonPrimitive() && value.getAsJsonPrimitive().isString()) {
+                            Module module = ModuleManager.getEnvironmentStatic().get(new Name(value.getAsString()));
+                            if (module != null) {
+                                modules.add(module);
+                            } else {
+                                logger.warn("The module \"" + value.getAsString() + "\" is missing!");
+                            }
+                        }
+                    }
+                    config.setModules(modules);
+                } else {
+                    // This is for compatibility with older saves, which always used all modules unconditionally.
+                    config.setModules(new HashSet<>(ModuleManager.getEnvironmentStatic().getModulesOrderedByDependencies()));
+                }
+
                 logger.debug("Successfully loaded the world file");
                 return Optional.of(config);
             } catch (FileNotFoundException e) {

engine/src/main/java/org/destinationsol/game/SolGame.java

@@ -149,6 +149,8 @@ public class SolGame {
     protected SolCam solCam;
     @Inject
     protected ModuleManager moduleManager;
+    @Inject
+    protected WorldConfig worldConfig;
 
     protected SolApplication solApplication;
     private Hero hero;
@@ -236,7 +238,7 @@ public void createUpdateSystems() {
         }
     }
 
-    public void startGame(String shipName, boolean isNewGame, WorldConfig worldConfig, EntitySystemManager entitySystemManager) {
+    public void startGame(String shipName, boolean isNewGame, EntitySystemManager entitySystemManager) {
         this.entitySystemManager = entitySystemManager;
 
         respawnState = new RespawnState();
@@ -331,7 +333,7 @@ public void onGameEnd(Context context) {
             if (!hero.isTranscendent()) {
                 saveShip();
             }
-            SaveManager.saveWorld(getPlanetManager().getSystems().size());
+            SaveManager.saveWorld(worldConfig);
 
             try {
                 context.get(SerialisationManager.class).serialise();
@@ -603,6 +605,10 @@ public DrawableManager getDrawableManager() {
         return drawableManager;
     }
 
+    public WorldConfig getWorldConfig() {
+        return worldConfig;
+    }
+
     public void setRespawnState() {
         respawnState.setRespawnMoney(.75f * hero.getMoney());
         if (hero.isNonTranscendent()) {

engine/src/main/java/org/destinationsol/game/StarPort.java

@@ -125,7 +125,7 @@ public void update(SolGame game) {
             ship.setMoney(ship.getMoney() - FARE);
             Transcendent transcendent = new Transcendent(ship, fromPlanet, toPlanet, game);
             if (transcendent.getShip().getPilot().isPlayer()) {
-                SaveManager.saveWorld(game.getPlanetManager().getSystems().size());
+                SaveManager.saveWorld(game.getWorldConfig());
                 game.getHero().setTranscendent(transcendent);
             }
             ObjectManager objectManager = game.getObjectManager();
@@ -404,7 +404,7 @@ public void update(SolGame game) {
                 SolShip ship = this.ship.toObject(game);
                 if (ship.getPilot().isPlayer()) {
                     game.getHero().setSolShip(ship, game);
-                    SaveManager.saveWorld(game.getPlanetManager().getSystems().size());
+                    SaveManager.saveWorld(game.getWorldConfig());
                 }
                 objectManager.addObjDelayed(ship);
                 blip(game, ship);

engine/src/main/java/org/destinationsol/game/WorldConfig.java

@@ -16,19 +16,37 @@
 package org.destinationsol.game;
 
 import org.destinationsol.game.planet.SystemsBuilder;
+import org.terasology.gestalt.module.Module;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 public class WorldConfig {
     protected long seed;
     protected int numberOfSystems;
+    private List<String> solarSystemGenerators;
+    private List<String> featureGenerators;
+    private Set<Module> modules;
 
     public WorldConfig() {
         seed = System.currentTimeMillis();
         numberOfSystems = SystemsBuilder.DEFAULT_SYSTEM_COUNT;
+        solarSystemGenerators = new ArrayList<>();
+        featureGenerators = new ArrayList<>();
+        modules = new HashSet<>();
     }
 
-    public WorldConfig(long seed, int numberOfSystems) {
+    public WorldConfig(long seed, int numberOfSystems,
+                       List<String> solarSystemGenerators,
+                       List<String> featureGenerators,
+                       Set<Module> modules) {
         this.seed = seed;
         this.numberOfSystems = numberOfSystems;
+        this.solarSystemGenerators = solarSystemGenerators;
+        this.featureGenerators = featureGenerators;
+        this.modules = modules;
     }
 
     public long getSeed() {
@@ -46,4 +64,28 @@ public int getNumberOfSystems() {
     public void setNumberOfSystems(int numberOfSystems) {
         this.numberOfSystems = numberOfSystems;
     }
+
+    public List<String> getSolarSystemGenerators() {
+        return solarSystemGenerators;
+    }
+
+    public void setFeatureGenerators(List<String> featureGenerators) {
+        this.featureGenerators = featureGenerators;
+    }
+
+    public List<String> getFeatureGenerators() {
+        return featureGenerators;
+    }
+
+    public void setSolarSystemGenerators(List<String> solarSystemGenerators) {
+        this.solarSystemGenerators = solarSystemGenerators;
+    }
+
+    public Set<Module> getModules() {
+        return modules;
+    }
+
+    public void setModules(Set<Module> modules) {
+        this.modules = modules;
+    }
 }

engine/src/main/java/org/destinationsol/menu/MenuScreens.java

@@ -22,6 +22,7 @@
 import org.destinationsol.ui.nui.screens.mainMenu.InputMapScreen;
 import org.destinationsol.ui.nui.screens.mainMenu.LoadingScreen;
 import org.destinationsol.ui.nui.screens.mainMenu.MainMenuScreen;
+import org.destinationsol.ui.nui.screens.mainMenu.ModulesScreen;
 import org.destinationsol.ui.nui.screens.mainMenu.NewGameScreen;
 import org.destinationsol.ui.nui.screens.mainMenu.NewShipScreen;
 import org.destinationsol.ui.nui.screens.mainMenu.OptionsScreen;
@@ -36,6 +37,7 @@ public class MenuScreens {
     public final LoadingScreen loading;
     public final NewGameScreen newGame;
     public final NewShipScreen newShip;
+    public final ModulesScreen modules;
 
     public MenuScreens(SolLayouts layouts, boolean mobile, GameOptions gameOptions, NUIManager nuiManager) {
         MenuLayout menuLayout = layouts.menuLayout;
@@ -47,5 +49,6 @@ public MenuScreens(SolLayouts layouts, boolean mobile, GameOptions gameOptions,
         loading = (LoadingScreen) nuiManager.createScreen("engine:loadingScreen");
         newGame = (NewGameScreen) nuiManager.createScreen("engine:newGameScreen");
         newShip = (NewShipScreen) nuiManager.createScreen("engine:newShipScreen");
+        modules = (ModulesScreen) nuiManager.createScreen("engine:modulesScreen");
     }
 }

engine/src/main/java/org/destinationsol/modules/ModuleManager.java

@@ -220,6 +220,7 @@ public class ModuleManager implements AutoCloseable {
     private final FacadeModuleConfig moduleConfig;
     protected ModuleRegistry registry;
     protected Module engineModule;
+    private Set<Module> builtInModules;
 
     @Inject
     public ModuleManager(BeanContext beanContext, ModuleFactory moduleFactory, ModuleRegistry moduleRegistry,
@@ -240,9 +241,12 @@ public void init() throws Exception {
             File modulesRoot = moduleConfig.getModulesPath();
             scanner.scan(registry, modulesRoot);
 
+            builtInModules = Sets.newHashSet();
+            builtInModules.add(engineModule);
+            builtInModules.add(nuiModule);
+            registry.addAll(builtInModules);
+
             Set<Module> requiredModules = Sets.newHashSet();
-            registry.add(engineModule);
-            registry.add(nuiModule);
             requiredModules.addAll(registry);
 
             loadEnvironment(requiredModules);
@@ -253,6 +257,8 @@ public void init() throws Exception {
     }
 
     public void loadEnvironment(Set<Module> modules) {
+        modules.addAll(builtInModules);
+
         StandardPermissionProviderFactory permissionFactory = new StandardPermissionProviderFactory();
         for (String api : API_WHITELIST) {
             permissionFactory.getBasePermissionSet().addAPIPackage(api);
@@ -288,6 +294,10 @@ public ModuleEnvironment getEnvironment() {
         return environment;
     }
 
+    public Set<Module> getBuiltInModules() {
+        return builtInModules;
+    }
+
     //TODO: REMOVE THIS
     public static ModuleEnvironment getEnvironmentStatic() {
         return environment;
@@ -299,6 +309,10 @@ public void printAvailableModules() {
         }
     }
 
+    public ModuleRegistry getRegistry() {
+        return registry;
+    }
+
     public void dispose() {
         environment.close();
     }