Remove BYG Integration (Temporary until they release a 1.20.1 version)

(cherry picked from commit 307872a)
GenerationsMod · Mar 9, 2024 · 08cd271 · 08cd271
1 parent 8e0bf0c
commit 08cd271
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 136 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -21,8 +21,6 @@ dependencies {
     modCompileOnly("com.cobblemon:mod:${project.properties["cobblemon_version"]}")
 
     //BiomeMod Integration
-    modCompileOnly("maven.modrinth:biomesyougo:${project.properties["BYGForge_version"]}")
-    //modCompileOnly("curse.maven:oh-the-biomes-youll-go-247560:${project.properties["BYGForge_version"]}")
     modCompileOnly("com.github.glitchfiend:TerraBlender-common:$minecraftVersion-${project.properties["terrablender_version"]}")
 }
 

diff --git a/...on/src/main/java/generations/gg/generations/structures/generationsstructures/byg/BYG.java b/...on/src/main/java/generations/gg/generations/structures/generationsstructures/byg/BYG.java
diff --git a/.../main/java/generations/gg/generations/structures/generationsstructures/config/Config.java b/.../main/java/generations/gg/generations/structures/generationsstructures/config/Config.java
@@ -9,7 +9,6 @@ public class Config {
 
     public static class Integration {
         public boolean AllowIntegrations = true;
-        public boolean AllowBYGIntegration = true;
         public boolean AllowBiomesOPlentyIntegration = true;
     }
 

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -45,9 +45,6 @@ dependencies {
 
     //BiomeMod Integration
     modApi("com.github.glitchfiend:TerraBlender-fabric:$minecraftVersion-${project.properties["terrablender_version"]}")
-    //modCompileOnly("curse.maven:oh-the-biomes-youll-go-fabric-391378:${project.properties["BYGFabric_version"]}")
-    //modCompileOnly("curse.maven:CorgiLib-693313:4681375")
-    //modCompileOnly("software.bernie.geckolib:geckolib-fabric-$minecraftVersion:${project.properties["geckolib_version"]}")
 }
 
 tasks {

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -63,9 +63,6 @@ dependencies {
     //BiomeMod Integration
     modApi("com.github.glitchfiend:TerraBlender-forge:$minecraftVersion-${project.properties["terrablender_version"]}")
     modApi("com.github.glitchfiend:BiomesOPlenty:$minecraftVersion-${project.properties["BOP_version"]}")
-    modCompileOnly("maven.modrinth:biomesyougo:${project.properties["BYGForge_version"]}")
-    //modRuntimeOnly("curse.maven:CorgiLib-693313:4681375")
-    //modRuntimeOnly("software.bernie.geckolib:geckolib-forge-$minecraftVersion:${project.properties["geckolib_version"]}")
     modRuntimeOnly(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
 }
 

diff --git a/...ons/gg/generations/structures/generationsstructures/forge/GenerationsStructuresForge.java b/...ons/gg/generations/structures/generationsstructures/forge/GenerationsStructuresForge.java
@@ -1,10 +1,8 @@
 package generations.gg.generations.structures.generationsstructures.forge;
 
 import generations.gg.generations.structures.generationsstructures.GenerationsStructures;
-import generations.gg.generations.structures.generationsstructures.byg.BYG;
 import generations.gg.generations.structures.generationsstructures.forge.events.LifeCycleEvents;
 import generations.gg.generations.structures.generationsstructures.forge.integration.BOP;
-import generations.gg.generations.structures.generationsstructures.forge.integration.BYGBOP;
 import generations.gg.generations.structures.generationsstructures.integration.Default;
 import generations.gg.generations.structures.generationsstructures.integration.Integration;
 import generations.gg.generations.structures.generationsstructures.processors.StructureProcessors;
@@ -25,9 +23,7 @@
 public class GenerationsStructuresForge {
     public GenerationsStructuresForge() {
         Integration integration;
-        if (ModList.get().isLoaded(biomesoplenty.core.BiomesOPlenty.MOD_ID) && ModList.get().isLoaded(potionstudios.byg.BYG.MOD_ID)) integration = new BYGBOP();
-        else if (ModList.get().isLoaded(biomesoplenty.core.BiomesOPlenty.MOD_ID)) integration = new BOP();
-        else if (ModList.get().isLoaded(potionstudios.byg.BYG.MOD_ID)) integration = new BYG();
+        if (ModList.get().isLoaded(biomesoplenty.core.BiomesOPlenty.MOD_ID)) integration = new BOP();
         else integration = new Default();
         GenerationsStructures.init(integration);
         IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();

diff --git a/...generations/gg/generations/structures/generationsstructures/forge/integration/BYGBOP.java b/...generations/gg/generations/structures/generationsstructures/forge/integration/BYGBOP.java
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -42,13 +42,6 @@ Adds structures for the Generations Mod Family
     ordering = "AFTER"
     side = "BOTH"
 
-[[dependencies.generations_structures]]
-    modId = "byg"
-    mandatory = false
-    versionRange = "[4.0.0.0,)"
-    ordering = "AFTER"
-    side = "BOTH"
-
 [[dependencies.generations_structures]]
     modId="cobblemon"
     mandatory = true