diff --git a/src/main/java/biomesoplenty/api/content/BOPCBiomes.java b/src/main/java/biomesoplenty/api/content/BOPCBiomes.java index 996187bdb..eff7ed02e 100644 --- a/src/main/java/biomesoplenty/api/content/BOPCBiomes.java +++ b/src/main/java/biomesoplenty/api/content/BOPCBiomes.java @@ -44,7 +44,6 @@ public class BOPCBiomes public static BiomeGenBase originValley; public static BiomeGenBase outback; public static BiomeGenBase prairie; - public static BiomeGenBase quagmire; public static BiomeGenBase rainforest; public static BiomeGenBase redwoodForest; public static BiomeGenBase sacredSprings; @@ -59,9 +58,7 @@ public class BOPCBiomes public static BiomeGenBase thicket; public static BiomeGenBase timber; public static BiomeGenBase tropicalRainforest; - public static BiomeGenBase tropics; public static BiomeGenBase tundra; - public static BiomeGenBase volcano; public static BiomeGenBase wasteland; public static BiomeGenBase wetland; public static BiomeGenBase woodland; @@ -70,6 +67,9 @@ public class BOPCBiomes public static BiomeGenBase glacier; public static BiomeGenBase scrubland; public static BiomeGenBase oasis; + public static BiomeGenBase quagmire; + public static BiomeGenBase tropics; + public static BiomeGenBase volcano; //Ocean Biomes public static BiomeGenBase kelpForest; diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenQuagmire.java b/src/main/java/biomesoplenty/common/biomes/overworld/subbiomes/BiomeGenQuagmire.java similarity index 92% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenQuagmire.java rename to src/main/java/biomesoplenty/common/biomes/overworld/subbiomes/BiomeGenQuagmire.java index 2a0de5ff4..f0b6a9207 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenQuagmire.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/subbiomes/BiomeGenQuagmire.java @@ -1,18 +1,19 @@ -package biomesoplenty.common.biomes.overworld; - -import biomesoplenty.api.BOPBlockHelper; -import biomesoplenty.common.biomes.BOPBiome; -import biomesoplenty.common.configuration.BOPConfigurationMisc; -import biomesoplenty.common.world.features.WorldGenBOPTallGrass; -import biomesoplenty.common.world.features.trees.WorldGenDeadTree1; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenAbstractTree; +package biomesoplenty.common.biomes.overworld.subbiomes; import java.util.Random; -public class BiomeGenQuagmire extends BOPBiome +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.gen.feature.WorldGenAbstractTree; +import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.configuration.BOPConfigurationMisc; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; +import biomesoplenty.common.world.features.trees.WorldGenDeadTree1; + +public class BiomeGenQuagmire extends BOPSubBiome { private static final Height biomeHeight = new Height(0.0F, 0.1F); @@ -20,6 +21,9 @@ public class BiomeGenQuagmire extends BOPBiome { super(id); + this.zoom = 0.5D; + this.threshold = 0D; + //TODO: setHeight() this.setHeight(biomeHeight); //TODO: setColor() diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTropics.java b/src/main/java/biomesoplenty/common/biomes/overworld/subbiomes/BiomeGenTropics.java similarity index 93% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTropics.java rename to src/main/java/biomesoplenty/common/biomes/overworld/subbiomes/BiomeGenTropics.java index 242741ae1..12128cf5b 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTropics.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/subbiomes/BiomeGenTropics.java @@ -1,7 +1,16 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biomes.overworld.subbiomes; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.Height; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; +import net.minecraft.world.gen.feature.WorldGenAbstractTree; +import net.minecraft.world.gen.feature.WorldGenShrub; import biomesoplenty.api.BOPBlockHelper; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biomes.BOPSubBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.entities.EntityJungleSpider; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; @@ -9,15 +18,8 @@ import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenPalmTree1; import biomesoplenty.common.world.features.trees.WorldGenTropicsShrub; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenAbstractTree; -import net.minecraft.world.gen.feature.WorldGenShrub; -import java.util.Random; - -public class BiomeGenTropics extends BOPBiome +public class BiomeGenTropics extends BOPSubBiome { private static final Height biomeHeight = new Height(0.0F, 0.4F); @@ -25,6 +27,9 @@ public class BiomeGenTropics extends BOPBiome { super(id); + this.zoom = 0.25D; + this.threshold = 0.25D; + //TODO: setHeight() this.setHeight(biomeHeight); //TODO: setColor() diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenVolcano.java b/src/main/java/biomesoplenty/common/biomes/overworld/subbiomes/BiomeGenVolcano.java similarity index 81% rename from src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenVolcano.java rename to src/main/java/biomesoplenty/common/biomes/overworld/subbiomes/BiomeGenVolcano.java index ff0947804..40d41fb2c 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenVolcano.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/subbiomes/BiomeGenVolcano.java @@ -1,10 +1,11 @@ -package biomesoplenty.common.biomes.overworld; +package biomesoplenty.common.biomes.overworld.subbiomes; +import net.minecraft.world.biome.BiomeGenBase.Height; import biomesoplenty.api.BOPBlockHelper; -import biomesoplenty.common.biomes.BOPBiome; +import biomesoplenty.common.biomes.BOPSubBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; -public class BiomeGenVolcano extends BOPBiome +public class BiomeGenVolcano extends BOPSubBiome { private static final Height biomeHeight = new Height(5.0F, 0.025F); @@ -12,6 +13,9 @@ public class BiomeGenVolcano extends BOPBiome { super(id); + this.zoom = 0.25D; + this.threshold = 0.25D; + //TODO: setHeight() this.setHeight(biomeHeight); this.setDisableRain(); diff --git a/src/main/java/biomesoplenty/common/core/BOPBiomes.java b/src/main/java/biomesoplenty/common/core/BOPBiomes.java index 219dc4ef1..f8f9da5b7 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBiomes.java +++ b/src/main/java/biomesoplenty/common/core/BOPBiomes.java @@ -128,7 +128,6 @@ import biomesoplenty.common.biomes.overworld.BiomeGenOminousWoods; import biomesoplenty.common.biomes.overworld.BiomeGenOriginValley; import biomesoplenty.common.biomes.overworld.BiomeGenOutback; import biomesoplenty.common.biomes.overworld.BiomeGenPrairie; -import biomesoplenty.common.biomes.overworld.BiomeGenQuagmire; import biomesoplenty.common.biomes.overworld.BiomeGenRainforest; import biomesoplenty.common.biomes.overworld.BiomeGenRedwoodForest; import biomesoplenty.common.biomes.overworld.BiomeGenSacredSprings; @@ -143,15 +142,16 @@ import biomesoplenty.common.biomes.overworld.BiomeGenTemperateRainforest; import biomesoplenty.common.biomes.overworld.BiomeGenThicket; import biomesoplenty.common.biomes.overworld.BiomeGenTimber; import biomesoplenty.common.biomes.overworld.BiomeGenTropicalRainforest; -import biomesoplenty.common.biomes.overworld.BiomeGenTropics; import biomesoplenty.common.biomes.overworld.BiomeGenTundra; -import biomesoplenty.common.biomes.overworld.BiomeGenVolcano; import biomesoplenty.common.biomes.overworld.BiomeGenWasteland; import biomesoplenty.common.biomes.overworld.BiomeGenWetland; import biomesoplenty.common.biomes.overworld.BiomeGenWoodland; import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenGlacier; import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenOasis; +import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenQuagmire; import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenScrubland; +import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenTropics; +import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenVolcano; import biomesoplenty.common.configuration.BOPConfigurationBiomeGen; import biomesoplenty.common.configuration.BOPConfigurationIDs; import biomesoplenty.common.configuration.BOPConfigurationMisc; @@ -231,7 +231,6 @@ public class BOPBiomes originValley = registerOverworldBiome(BiomeGenOriginValley.class, "Origin Valley", TemperatureType.WARM, 1); outback = registerOverworldBiome(BiomeGenOutback.class, "Outback", TemperatureType.HOT, 10); prairie = registerOverworldBiome(BiomeGenPrairie.class, "Prairie", TemperatureType.WARM, 10); - quagmire = registerOverworldBiome(BiomeGenQuagmire.class, "Quagmire", TemperatureType.WARM, 10); rainforest = registerOverworldBiome(BiomeGenRainforest.class, "Rainforest", TemperatureType.WARM, 5); redwoodForest = registerOverworldBiome(BiomeGenRedwoodForest.class, "Redwood Forest", TemperatureType.WARM, 10); sacredSprings = registerOverworldBiome(BiomeGenSacredSprings.class, "Sacred Springs", TemperatureType.WARM, 3); @@ -246,9 +245,7 @@ public class BOPBiomes thicket = registerOverworldBiome(BiomeGenThicket.class, "Thicket", TemperatureType.COOL, 5); timber = registerOverworldBiome(BiomeGenTimber.class, "Timber", TemperatureType.COOL, 5); tropicalRainforest = registerOverworldBiome(BiomeGenTropicalRainforest.class, "Tropical Rainforest", TemperatureType.HOT, 5); - tropics = registerOverworldBiome(BiomeGenTropics.class, "Tropics", TemperatureType.HOT, 3); tundra = registerOverworldBiome(BiomeGenTundra.class, "Tundra", TemperatureType.ICY, 10); - volcano = registerOverworldBiome(BiomeGenVolcano.class, "Volcano", TemperatureType.HOT, 5); wasteland = registerOverworldBiome(BiomeGenWasteland.class, "Wasteland", TemperatureType.HOT, 3); wetland = registerOverworldBiome(BiomeGenWetland.class, "Wetland", TemperatureType.WARM, 10); woodland = registerOverworldBiome(BiomeGenWoodland.class, "Woodland", TemperatureType.WARM, 10); @@ -257,6 +254,11 @@ public class BOPBiomes glacier = registerOverworldSubBiome(BiomeGenGlacier.class, "Glacier", 10, arctic.biomeID); scrubland = registerOverworldSubBiome(BiomeGenScrubland.class, "Scrubland", 10, BiomeGenBase.savanna.biomeID); oasis = registerOverworldSubBiome(BiomeGenOasis.class, "Oasis", 10, BiomeGenBase.desert.biomeID); + quagmire = registerOverworldSubBiome(BiomeGenQuagmire.class, "Quagmire", 10, sludgepit.biomeID); + + //Ocean Biomes + volcano = registerOverworldSubBiome(BiomeGenVolcano.class, "Volcano", 10, BiomeGenBase.ocean.biomeID, BiomeGenBase.deepOcean.biomeID); + tropics = registerOverworldSubBiome(BiomeGenTropics.class, "Tropics", 10, BiomeGenBase.ocean.biomeID, BiomeGenBase.deepOcean.biomeID); //Nether Biomes corruptedSands = registerNetherBiome(BiomeGenCorruptedSands.class, "Corrupted Sands", 10); @@ -375,7 +377,6 @@ public class BOPBiomes //BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("polar, Type.FROZEN, Type.WATER); BiomeDictionary.registerBiomeType(BOPCBiomes.prairie, Type.PLAINS); - BiomeDictionary.registerBiomeType(BOPCBiomes.quagmire, Type.WASTELAND, Type.SWAMP); BiomeDictionary.registerBiomeType(BOPCBiomes.rainforest, Type.JUNGLE, Type.HILLS, Type.FOREST); BiomeDictionary.registerBiomeType(BOPCBiomes.redwoodForest, Type.FOREST); BiomeDictionary.registerBiomeType(BOPCBiomes.sacredSprings, Type.MOUNTAIN, Type.FOREST, Type.MAGICAL); @@ -403,11 +404,9 @@ public class BOPBiomes BiomeDictionary.registerBiomeType(BOPCBiomes.tropicalRainforest, Type.JUNGLE); - BiomeDictionary.registerBiomeType(BOPCBiomes.tropics, Type.JUNGLE, Type.WATER); //BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("tropicsMountain, Type.JUNGLE, Type.WATER); BiomeDictionary.registerBiomeType(BOPCBiomes.tundra, Type.FROZEN, Type.WASTELAND); - BiomeDictionary.registerBiomeType(BOPCBiomes.volcano, Type.WASTELAND, Type.MOUNTAIN); BiomeDictionary.registerBiomeType(BOPCBiomes.wasteland, Type.WASTELAND); BiomeDictionary.registerBiomeType(BOPCBiomes.wetland, Type.SWAMP, Type.FOREST); BiomeDictionary.registerBiomeType(BOPCBiomes.woodland, Type.FOREST);