diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 9f29985..dda12da 100644 --- 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/common/src/main/java/generations/gg/generations/structures/generationsstructures/byg/BYG.java b/common/src/main/java/generations/gg/generations/structures/generationsstructures/byg/BYG.java deleted file mode 100644 index 6f20023..0000000 --- a/common/src/main/java/generations/gg/generations/structures/generationsstructures/byg/BYG.java +++ /dev/null @@ -1,56 +0,0 @@ -package generations.gg.generations.structures.generationsstructures.byg; - -import generations.gg.generations.core.generationscore.world.level.block.GenerationsBlocks; -import generations.gg.generations.structures.generationsstructures.integration.Integration; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import potionstudios.byg.common.block.BYGBlocks; -import potionstudios.byg.common.block.BYGWoodTypes; - -/** - * Integration for the Oh the Biomes you'll go. - * @see BYG - * @see Integration - * @author J.T. McQuigg (JT122406) - */ -public class BYG implements Integration { - @Override - public String getModId() { - return potionstudios.byg.BYG.MOD_ID; - } - - @Override - public Block getBirchTrapdoorReplacement() { - return BYGWoodTypes.WITCH_HAZEL.trapdoor().get(); - } - - @Override - public Block getGhostTrapdoorReplacement() { - return BYGWoodTypes.EBONY.trapdoor().get(); - } - - @Override - public Block getOakLeavesReplacement() { - return Blocks.OAK_LEAVES; - } - - @Override - public Block getMirroredFloorReplacement() { - return GenerationsBlocks.MIRRORED_FLOOR_3_SET.getBaseBlock(); - } - - @Override - public Block getRedTulipReplacement() { - return Blocks.POTTED_RED_TULIP; - } - - @Override - public Block getPinkTulipReplacement() { - return Blocks.POTTED_PINK_TULIP; - } - - @Override - public Block getWhiteCastleBrick2SetSlabReplacement() { - return BYGBlocks.TRAVERTINE_SLAB.get(); - } -} diff --git a/common/src/main/java/generations/gg/generations/structures/generationsstructures/config/Config.java b/common/src/main/java/generations/gg/generations/structures/generationsstructures/config/Config.java index 8d4402c..2e3f1c9 100644 --- a/common/src/main/java/generations/gg/generations/structures/generationsstructures/config/Config.java +++ b/common/src/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 index 1d045fe..38d81cc 100644 --- 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 index b4e8aa6..7ece60d 100644 --- 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/forge/src/main/java/generations/gg/generations/structures/generationsstructures/forge/GenerationsStructuresForge.java b/forge/src/main/java/generations/gg/generations/structures/generationsstructures/forge/GenerationsStructuresForge.java index 5a6b23d..2f413af 100644 --- a/forge/src/main/java/generations/gg/generations/structures/generationsstructures/forge/GenerationsStructuresForge.java +++ b/forge/src/main/java/generations/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/forge/src/main/java/generations/gg/generations/structures/generationsstructures/forge/integration/BYGBOP.java b/forge/src/main/java/generations/gg/generations/structures/generationsstructures/forge/integration/BYGBOP.java deleted file mode 100644 index 4d9cdc7..0000000 --- a/forge/src/main/java/generations/gg/generations/structures/generationsstructures/forge/integration/BYGBOP.java +++ /dev/null @@ -1,59 +0,0 @@ -package generations.gg.generations.structures.generationsstructures.forge.integration; - -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.core.BiomesOPlenty; -import generations.gg.generations.core.generationscore.world.level.block.GenerationsBlocks; -import generations.gg.generations.structures.generationsstructures.integration.Integration; -import net.minecraft.world.level.block.Block; -import potionstudios.byg.BYG; -import potionstudios.byg.common.block.BYGBlocks; -import potionstudios.byg.common.block.BYGWoodTypes; - -/** - * Integration for Biomes O' Plenty and Oh the Biomes you'll go. When both are on server - * @see Biomes O' Plenty - * @see BYG - * @see Integration - * @author J.T. McQuigg (JT122406) - */ -public class BYGBOP implements Integration { - @Override - public String getModId() { - return BYG.MOD_ID + BiomesOPlenty.MOD_ID; - } - - @Override - public Block getBirchTrapdoorReplacement() { - return BYGWoodTypes.WITCH_HAZEL.trapdoor().get(); - } - - @Override - public Block getGhostTrapdoorReplacement() { - return BYGWoodTypes.EBONY.trapdoor().get(); - } - - @Override - public Block getOakLeavesReplacement() { - return BOPBlocks.FLOWERING_OAK_LEAVES.get(); - } - - @Override - public Block getMirroredFloorReplacement() { - return null; - } - - @Override - public Block getRedTulipReplacement() { - return null; - } - - @Override - public Block getPinkTulipReplacement() { - return null; - } - - @Override - public Block getWhiteCastleBrick2SetSlabReplacement() { - return BYGBlocks.TRAVERTINE_SLAB.get(); - } -} diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index c3c885b..ad0aa1c 100644 --- 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