diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/MinecraftAddon.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/MinecraftAddon.java index 3a6d70b3c..70a0f24bb 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/MinecraftAddon.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/MinecraftAddon.java @@ -53,12 +53,9 @@ public abstract class MinecraftAddon implements BaseAddon { public void initialize() { modPlatform.getEventManager() .getHandler(FunctionalEventHandler.class) - .register(this, ConfigurationLoadEvent.class) - .then(event -> { - if(event.is(ConfigPack.class)) { - event.getLoadedObject(ConfigPack.class).getContext().put(event.load(new VanillaWorldProperties())); - } - }) + .register(this, ConfigPackPostLoadEvent.class) + .then(event -> event.getPack().getContext().put(event.loadTemplate(new VanillaWorldProperties()))) + .priority(100) .global(); modPlatform.getEventManager() .getHandler(FunctionalEventHandler.class) diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java index 80b9deb59..4d604da29 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java @@ -28,7 +28,7 @@ public class DimensionUtil { public static DimensionType createDimension(ConfigPack pack, ModPlatform platform) { VanillaWorldProperties vanillaWorldProperties; MonsterSettingsConfig monsterSettingsConfig; - if (pack.getContext().has(VanillaBiomeProperties.class)) { + if (pack.getContext().has(VanillaWorldProperties.class)) { vanillaWorldProperties = pack.getContext().get(VanillaWorldProperties.class); } else { vanillaWorldProperties = new VanillaWorldProperties(); @@ -46,7 +46,7 @@ public class DimensionUtil { assert defaultDimension != null; MonsterSettings monsterSettings = getMonsterSettings(defaultDimension, monsterSettingsConfig); - DimensionType dimension = new DimensionType( + return new DimensionType( vanillaWorldProperties.getFixedTime() == null ? defaultDimension.fixedTime() : OptionalLong.of( vanillaWorldProperties.getFixedTime()), vanillaWorldProperties.getHasSkyLight() == null ? defaultDimension.hasSkyLight() : vanillaWorldProperties.getHasSkyLight(), @@ -64,8 +64,6 @@ public class DimensionUtil { vanillaWorldProperties.getAmbientLight() == null ? defaultDimension.ambientLight() : vanillaWorldProperties.getAmbientLight(), monsterSettings ); - - return dimension; } @NotNull