UnresolvedDependencyException is in package excpeptions.

MovingBlocks · May 5, 2024 · f72b3c6 · f72b3c6
1 parent a83ab2d
commit f72b3c6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorld.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorld.java
@@ -54,6 +54,7 @@
 import org.terasology.engine.world.sun.CelestialSystem;
 import org.terasology.engine.world.sun.DefaultCelestialSystem;
 import org.terasology.gestalt.module.ModuleEnvironment;
+import org.terasology.gestalt.module.exceptions.UnresolvedDependencyException;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -104,7 +105,7 @@ public boolean step() {
             // setting the world seed will create the world builder
             worldGenerator.setWorldSeed(worldInfo.getSeed());
             context.put(WorldGenerator.class, worldGenerator);
-        } catch (UnresolvedWorldGeneratorException e) {
+        } catch (UnresolvedWorldGeneratorException | UnresolvedDependencyException e) {
             logger.error("Unable to load world generator {}. Available world generators: {}",
                     worldInfo.getWorldGenerator(), worldGeneratorManager.getWorldGenerators());
             context.get(GameEngine.class).changeState(new StateMainMenu("Failed to resolve world generator."));

diff --git a/...rc/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/UniverseSetupScreen.java b/...rc/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/UniverseSetupScreen.java
@@ -51,7 +51,7 @@
 import org.terasology.gestalt.entitysystem.component.Component;
 import org.terasology.gestalt.module.Module;
 import org.terasology.gestalt.module.ModuleEnvironment;
-import org.terasology.gestalt.module.UnresolvedDependencyException;
+import org.terasology.gestalt.module.exceptions.UnresolvedDependencyException;
 import org.terasology.gestalt.module.dependencyresolution.DependencyInfo;
 import org.terasology.gestalt.module.dependencyresolution.DependencyResolver;
 import org.terasology.gestalt.module.dependencyresolution.ResolutionResult;

diff --git a/...e/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorManager.java b/...e/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorManager.java
@@ -15,7 +15,7 @@
 import org.terasology.engine.world.generator.WorldGenerator;
 import org.terasology.gestalt.module.Module;
 import org.terasology.gestalt.module.ModuleEnvironment;
-import org.terasology.gestalt.module.UnresolvedDependencyException;
+import org.terasology.gestalt.module.exceptions.UnresolvedDependencyException;
 import org.terasology.gestalt.module.dependencyresolution.DependencyResolver;
 import org.terasology.gestalt.module.dependencyresolution.ResolutionResult;
 import org.terasology.gestalt.naming.Name;
@@ -99,7 +99,8 @@ public WorldGeneratorInfo getWorldGeneratorInfo(SimpleUri uri) {
      * @param context objects from this context will be injected into the
      * @return The instantiated world generator.
      */
-    public static WorldGenerator createGenerator(SimpleUri uri, Context context) throws UnresolvedWorldGeneratorException {
+    public static WorldGenerator createGenerator(SimpleUri uri, Context context)
+            throws UnresolvedWorldGeneratorException, UnresolvedDependencyException {
         ModuleManager moduleManager = context.get(ModuleManager.class);
         Module module = moduleManager.getEnvironment().get(uri.getModuleName());
         if (module == null) {