Merge pull request #507 from Wmaxlees/master

Bamboo Worldgen Config
Roadhog360 · Aug 20, 2024 · 4a0aebd · 4a0aebd
2 parents c74de3a + fd0d377
commit 4a0aebd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/ganymedes01/etfuturum/configuration/configs/ConfigWorld.java b/src/main/java/ganymedes01/etfuturum/configuration/configs/ConfigWorld.java
@@ -55,6 +55,7 @@ public class ConfigWorld extends ConfigBase {
 	public static int[] amethystDimensionBlacklist;
 	public static boolean amethystDimensionBlacklistAsWhitelist;
 	public static int cherryTreeRarity;
+	public static boolean bambooWorldgen;
 
 	public static int crimsonForestID;
 	public static int warpedForestID;
@@ -169,6 +170,7 @@ protected void syncConfigOptions() {
 		amethystRarity = getInt("amethystRarity", catGeneration, 53, 1, Byte.MAX_VALUE, "How rare should amethyst geodes be? 1/x chance per chunk, 1 means a geode attempts to appear every chunk");
 		amethystMaxY = getInt("amethystMaxY", catGeneration, 46, 6, 245, "Max Y level amethyst geodes should attempt to generate at");
 		cherryTreeRarity = getInt("cherryTreeRarity", catGeneration, 72, 0, Byte.MAX_VALUE, "How rare should cherry trees be? 1/x chance per chunk, 1 means a tree attempts to appear every chunk. 0 = no cherry trees. They will spawn in mountain-type biomes.");
+		bambooWorldgen = getBoolean("bambooWorldgen", catGeneration, true, "Whether bamboo should naturally spawn in the overworld. Turning this off allows you to use bamboo based blocks without bamboo world gen for mod compatability.");
 
 		crimsonForestID = getInt("crimsonForestID", catBiomes, 200, -1, 65536, "Set to -1 to disable the generation of Crimson Forests. To use an ID above 255, EndlessIDs is required.");
 		warpedForestID = getInt("warpedForestID", catBiomes, 201, -1, 65536, "Set to -1 to disable the generation of Warped Forests. To use an ID above 255, EndlessIDs is required.");

diff --git a/src/main/java/ganymedes01/etfuturum/world/EtFuturumWorldGenerator.java b/src/main/java/ganymedes01/etfuturum/world/EtFuturumWorldGenerator.java
@@ -125,7 +125,7 @@ public void postInit() {
 			}
 		}
 
-		if (ModBlocks.BAMBOO.isEnabled()) {
+		if (ModBlocks.BAMBOO.isEnabled() && ConfigWorld.bambooWorldgen) {
 			if (ModsList.BIOMES_O_PLENTY.isLoaded()) { //BoP replaces vanilla jungles with a BoP version but forgets to tag them
 				BiomeDictionary.registerBiomeType(BiomeGenBase.getBiome(21), Type.JUNGLE); //Gets biomes by ID so we get the BOP version
 				BiomeDictionary.registerBiomeType(BiomeGenBase.getBiome(22), Type.JUNGLE);