updated antimatter

GregTech-Intergalactical · Nov 5, 2023 · e86ac41 · e86ac41
1 parent a67045b
commit e86ac41
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/AntimatterAPI b/AntimatterAPI
diff --git 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
@@ -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
@@ -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
@@ -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
+1 −1		TesseractAPI
+1 −3		common/build.gradle
+1 −1		common/gradle.properties
+1 −0		common/src/main/java/muramasa/antimatter/Antimatter.java
+7 −6		common/src/main/java/muramasa/antimatter/AntimatterAPI.java
+123 −333		common/src/main/java/muramasa/antimatter/AntimatterConfig.java
+2 −2		common/src/main/java/muramasa/antimatter/AntimatterRemapping.java
+1 −1		common/src/main/java/muramasa/antimatter/blockentity/BlockEntityMachine.java
+2 −2		common/src/main/java/muramasa/antimatter/blockentity/multi/BlockEntityBasicMultiMachine.java
+1 −1		common/src/main/java/muramasa/antimatter/capability/machine/MachineEnergyHandler.java
+1 −1		common/src/main/java/muramasa/antimatter/common/event/CommonEvents.java
+6 −2		common/src/main/java/muramasa/antimatter/datagen/AntimatterDynamics.java
+2 −2		common/src/main/java/muramasa/antimatter/datagen/DynamicDataPack.java
+1 −1		common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterLanguageProvider.java
+8 −9		common/src/main/java/muramasa/antimatter/integration/jei/AntimatterJEIPlugin.java
+10 −10		common/src/main/java/muramasa/antimatter/integration/jei/category/RecipeMapCategory.java
+13 −13		common/src/main/java/muramasa/antimatter/integration/jeirei/AntimatterJEIREIPlugin.java
+16 −26		common/src/main/java/muramasa/antimatter/integration/rei/AntimatterREIClientPlugin.java
+6 −3		common/src/main/java/muramasa/antimatter/integration/rei/category/RecipeMapCategory.java
+0 −4		common/src/main/java/muramasa/antimatter/item/ItemBasic.java
+1 −1		common/src/main/java/muramasa/antimatter/machine/BlockMachine.java
+21 −5		common/src/main/java/muramasa/antimatter/machine/types/Machine.java
+1 −1		common/src/main/java/muramasa/antimatter/material/MaterialType.java
+1 −1		common/src/main/java/muramasa/antimatter/ore/BlockOre.java
+4 −3		common/src/main/java/muramasa/antimatter/recipe/map/RecipeMap.java
+1 −1		common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourTreeFelling.java
+13 −0		common/src/main/java/muramasa/antimatter/util/AntimatterPlatformUtils.java
+1 −1		common/src/main/java/muramasa/antimatter/util/Utils.java
+2 −2		common/src/main/java/muramasa/antimatter/worldgen/AntimatterWorldGenerator.java
+1 −1		common/src/main/java/muramasa/antimatter/worldgen/feature/FeatureOre.java
+1 −1		common/src/main/java/muramasa/antimatter/worldgen/feature/FeatureSmallOres.java
+3 −3		common/src/main/java/muramasa/antimatter/worldgen/feature/FeatureStoneLayer.java
+1 −1		common/src/main/java/muramasa/antimatter/worldgen/feature/FeatureVein.java
+5 −5		common/src/main/java/muramasa/antimatter/worldgen/feature/FeatureVeinLayer.java
+10 −10		common/src/main/java/muramasa/antimatter/worldgen/vein/WorldGenVeinLayer.java
+1 −1		common/src/main/java/muramasa/antimatter/worldgen/vein/old/WorldGenVeinVariantBuilder.java
+1 −3		fabric/build.gradle
+1 −1		fabric/gradle.properties
+0 −10		fabric/src/main/java/muramasa/antimatter/fabric/AntimatterImpl.java
+12 −0		fabric/src/main/java/muramasa/antimatter/util/fabric/AntimatterPlatformUtilsImpl.java
+2 −2		fabric/src/main/java/muramasa/antimatter/worldgen/fabric/AntimatterFabricWorldgen.java
+1 −0		forge/build.gradle
+1 −1		forge/gradle.properties
+0 −4		forge/src/main/java/muramasa/antimatter/common/event/forge/ModCommonEvents.java
+0 −2		forge/src/main/java/muramasa/antimatter/forge/AntimatterImpl.java
+12 −0		forge/src/main/java/muramasa/antimatter/util/forge/AntimatterPlatformUtilsImpl.java