diff --git a/AntimatterAPI b/AntimatterAPI index 8229a5452..f3fc7c291 160000 --- a/AntimatterAPI +++ b/AntimatterAPI @@ -1 +1 @@ -Subproject commit 8229a5452845e0147a768f1f208cc4e9d579db86 +Subproject commit f3fc7c29139dcf8f84f600c4dd8381a7407cb85c diff --git a/common/build.gradle b/common/build.gradle index b647ad004..19df48504 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -22,6 +22,7 @@ dependencies{ exclude(group: "com.github.LlamaLad7") } modImplementation("earth.terrarium:botarium-common-1.18.2:${project.botarium_version}") + modImplementation "maven.modrinth:carbon-config:2ngFmmhP" compileOnly("com.electronwill.night-config:toml:${rootProject.nightconfig_version}") compileOnly("com.electronwill.night-config:core:${rootProject.nightconfig_version}") modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${rootProject.rei_version}" diff --git a/common/src/main/java/muramasa/gregtech/loader/WorldGenLoader.java b/common/src/main/java/muramasa/gregtech/loader/WorldGenLoader.java index ea715622a..c543e4546 100644 --- a/common/src/main/java/muramasa/gregtech/loader/WorldGenLoader.java +++ b/common/src/main/java/muramasa/gregtech/loader/WorldGenLoader.java @@ -43,13 +43,13 @@ public class WorldGenLoader { public static void init(WorldGenEvent ev) { - if (AntimatterConfig.WORLD.STONE_LAYERS) { + if (AntimatterConfig.STONE_LAYERS.get()) { initStoneVeins(ev); } - if (AntimatterConfig.WORLD.ORE_VEINS) { + if (AntimatterConfig.ORE_VEINS.get()) { initOreVeins(ev); } - if (AntimatterConfig.WORLD.SMALL_ORES && !AntimatterAPI.isModLoaded("tfc")){ + if (AntimatterConfig.SMALL_ORES.get() && !AntimatterAPI.isModLoaded("tfc")){ initSmallOres(ev); } OilSpoutSavedData.clearFluidMap(); @@ -239,7 +239,7 @@ private static void initOreVeins(WorldGenEvent ev) { OVERWORLD).buildVein()); ev.vein(new WorldGenVeinLayerBuilder("galena").asOreVein(6, 51, 40, 5, 16, Galena, Galena, Silver, Lead, OVERWORLD, BE_MARS, AA_MARS, BE_MOON, AA_MOON).buildVein()); - Material sporadic = !AntimatterConfig.WORLD.STONE_LAYERS ? Calcite : Alumina; + Material sporadic = !AntimatterConfig.STONE_LAYERS.get() ? Calcite : Alumina; ev.vein(new WorldGenVeinLayerBuilder("lapis").asOreVein(-44, 1, 40, 5, 16, Lazurite, Sodalite, Lapis, sporadic, OVERWORLD, TWILIGHT_FOREST, BE_MARS, AA_MARS, BE_MOON, AA_MOON).buildVein()); ev.vein(new WorldGenVeinLayerBuilder("lapis_end").asOreVein(20, 50, 40, 5, 16, Lazurite, Sodalite, Lapis, sporadic, @@ -249,7 +249,7 @@ private static void initOreVeins(WorldGenEvent ev) { ev.vein(new WorldGenVeinLayerBuilder("beryllium_end").asOreVein(5, 30, 30, 3, 16, Beryllium, Beryllium, Emerald, Thorium, END).buildVein()); - if (!AntimatterConfig.WORLD.STONE_LAYERS){ + if (!AntimatterConfig.STONE_LAYERS.get()){ ev.vein(new WorldGenVeinLayerBuilder("bauxite").asOreVein(-14, 46, 80, 4, 24, Bauxite, Bauxite, Alumina, Ilmenite, OVERWORLD, TWILIGHT_FOREST, BE_MARS, AA_MARS, BE_MOON, AA_MOON).buildVein()); ev.vein(new WorldGenVeinLayerBuilder("oilshale").asOreVein(-14, 31, 80, 6, 32, OilShale, OilShale, OilShale, OilShale, diff --git a/fabric/build.gradle b/fabric/build.gradle index 2e1066de9..800a1b68a 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -65,6 +65,7 @@ dependencies{ modImplementation("com.github.FeltMC:forgeconfigapiport-fabric:c1486f80f7"){ transitive = false } + modImplementation "maven.modrinth:carbon-config:2ngFmmhP" modImplementation("earth.terrarium:botarium-fabric-1.18.2:${project.botarium_version}"){ transitive = false } diff --git a/forge/build.gradle b/forge/build.gradle index ecdf4e1d8..15c5082de 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -59,6 +59,7 @@ dependencies { //modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-forge:${rootProject.rei_version}" modRuntimeOnly("mezz.jei:jei-1.18.2:9.7.2.1001") modImplementation("com.github.Reforged-Mods:ARRP-forge:0.6.7-1.18.2") + modImplementation "maven.modrinth:carbon-config:IMC0pt5I" modImplementation("io.github.llamalad7:mixinextras-forge:0.2.0-beta.11") implementation("io.github.gregtechintergalactical:gtcore-forge:${rootProject.gt_core_version}-${rootProject.minecraft_version}:dev-shadow"){ transitive = false