From 25683194937495a9e9cc45447a88d1a940f79e37 Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 3 Jan 2022 17:45:30 +0100 Subject: [PATCH] Moved `fixBiomeSource` back to `MainConfig` --- src/main/java/ru/bclib/config/GeneratorConfig.java | 3 ++- src/main/java/ru/bclib/config/MainConfig.java | 8 ++++++++ .../java/ru/bclib/world/generator/GeneratorOptions.java | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/bclib/config/GeneratorConfig.java b/src/main/java/ru/bclib/config/GeneratorConfig.java index 513017f2..cf46cfe0 100644 --- a/src/main/java/ru/bclib/config/GeneratorConfig.java +++ b/src/main/java/ru/bclib/config/GeneratorConfig.java @@ -4,7 +4,8 @@ import ru.bclib.BCLib; public class GeneratorConfig extends NamedPathConfig { public static final ConfigToken USE_OLD_GENERATOR = ConfigToken.Boolean(false, "useOldBiomeGenerator", "options"); - + + public GeneratorConfig() { super(BCLib.MOD_ID, "generator", false); } diff --git a/src/main/java/ru/bclib/config/MainConfig.java b/src/main/java/ru/bclib/config/MainConfig.java index e47c92e0..2ebdc1b4 100644 --- a/src/main/java/ru/bclib/config/MainConfig.java +++ b/src/main/java/ru/bclib/config/MainConfig.java @@ -1,9 +1,17 @@ package ru.bclib.config; import ru.bclib.BCLib; +import ru.bclib.world.generator.GeneratorOptions; public class MainConfig extends NamedPathConfig { public static final ConfigToken APPLY_PATCHES = ConfigToken.Boolean(true, "applyPatches", Configs.MAIN_PATCH_CATEGORY); + + @ConfigUI(leftPadding = 8) + public static final ConfigToken REPAIR_BIOMES = DependendConfigToken.Boolean(true, "fixBiomeSource", Configs.MAIN_PATCH_CATEGORY, (config) -> config.get(MainConfig.APPLY_PATCHES)); + + public boolean applyPatches() { + return get(APPLY_PATCHES); + } public MainConfig() { super(BCLib.MOD_ID, "main", true, true); diff --git a/src/main/java/ru/bclib/world/generator/GeneratorOptions.java b/src/main/java/ru/bclib/world/generator/GeneratorOptions.java index 7e37a647..bf822b10 100644 --- a/src/main/java/ru/bclib/world/generator/GeneratorOptions.java +++ b/src/main/java/ru/bclib/world/generator/GeneratorOptions.java @@ -2,6 +2,7 @@ package ru.bclib.world.generator; import net.minecraft.util.Mth; import ru.bclib.config.Configs; +import ru.bclib.config.MainConfig; import java.awt.Point; import java.util.function.Function; @@ -32,7 +33,8 @@ public class GeneratorOptions { addEndBiomesByCategory = Configs.GENERATOR_CONFIG.getBoolean("options", "addEndBiomesByCategory", false); useOldBiomeGenerator = Configs.GENERATOR_CONFIG.useOldGenerator(); verticalBiomes = Configs.GENERATOR_CONFIG.getBoolean("options", "verticalBiomesInTallNether", true); - fixBiomeSource = Configs.GENERATOR_CONFIG.getBoolean("options", "fixBiomeSource", true); + + fixBiomeSource = Configs.MAIN_CONFIG.get(MainConfig.REPAIR_BIOMES); } public static int getBiomeSizeNether() {