From ff6f76e018ed2cb9ba6de08ad8d6103002211d30 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 2 Dec 2020 01:17:38 -0500 Subject: [PATCH] Default world type is used from the settings now, not just overworld --- .../iris/scaffold/engine/EngineCompositeGenerator.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java index 6bf4e53f4..44d6eed8c 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java @@ -1,6 +1,7 @@ package com.volmit.iris.scaffold.engine; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.generator.IrisEngineCompound; import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.object.IrisBiome; @@ -156,8 +157,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce } if (hint == null) { - Iris.error("Cannot find iris dimension data for world: " + world.getName() + "! Assuming overworld!"); - hint = "overworld"; + Iris.error("Cannot find iris dimension data for world: " + world.getName() + "! Assuming " + IrisSettings.get().getDefaultWorldType() + "!"); + hint = IrisSettings.get().getDefaultWorldType(); } dim = IrisDataManager.loadAnyDimension(hint); @@ -231,8 +232,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce } if (hint == null) { - Iris.error("Cannot find iris dimension data for world: " + world + "! Assuming overworld!"); - hint = "overworld"; + Iris.error("Cannot find iris dimension data for world: " + world + "! Assuming " + IrisSettings.get().getDefaultWorldType() + "!"); + hint = IrisSettings.get().getDefaultWorldType(); } dim = IrisDataManager.loadAnyDimension(hint);