Revert "Started on new experimental biome generation technique"

This reverts commit 650802747c.
This commit is contained in:
Adubbz 2013-08-28 18:32:30 +10:00
parent 8077c516d7
commit 006f9b4e1d
5 changed files with 732 additions and 894 deletions

View file

@ -958,399 +958,386 @@ public class BOPBiomes {
private static void addBiomes()
{
if (BOPConfiguration.TerrainGen.fancyGen == false)
if (BOPConfiguration.BiomeGen.alpsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.alps);
}
if (BOPConfiguration.BiomeGen.arcticGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.arctic);
}
if (BOPConfiguration.BiomeGen.badlandsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.badlands);
}
if (BOPConfiguration.BiomeGen.bambooForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.bambooForest);
}
if (BOPConfiguration.BiomeGen.bayouGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.bayou);
}
if (BOPConfiguration.BiomeGen.birchForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.birchForest);
}
if (BOPConfiguration.BiomeGen.bogGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.bog);
}
if (BOPConfiguration.BiomeGen.borealForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.borealForest);
}
if (BOPConfiguration.BiomeGen.brushlandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.brushland);
}
if (BOPConfiguration.BiomeGen.canyonGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.canyon);
}
if (BOPConfiguration.BiomeGen.chaparralGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.chaparral);
}
if (BOPConfiguration.BiomeGen.cherryBlossomGroveGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.cherryBlossomGrove);
}
if (BOPConfiguration.BiomeGen.coniferousForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.coniferousForest);
}
if (BOPConfiguration.BiomeGen.coniferousForestSnowGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.coniferousForestSnow);
}
if (BOPConfiguration.BiomeGen.cragGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.crag);
}
if (BOPConfiguration.BiomeGen.deadForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.deadForest);
}
if (BOPConfiguration.BiomeGen.deadForestSnowGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.deadForestSnow);
}
if (BOPConfiguration.BiomeGen.deadSwampGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.deadSwamp);
}
if (BOPConfiguration.BiomeGen.deadlandsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.deadlands);
}
if (BOPConfiguration.BiomeGen.deciduousForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.deciduousForest);
}
if (BOPConfiguration.BiomeGen.dunesGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.dunes);
}
if (BOPConfiguration.BiomeGen.fenGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.fen);
}
if (BOPConfiguration.BiomeGen.fieldGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.field);
}
if (BOPConfiguration.BiomeGen.frostForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.frostForest);
}
if (BOPConfiguration.BiomeGen.fungiForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.fungiForest);
}
if (BOPConfiguration.BiomeGen.gardenGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.garden);
}
if (BOPConfiguration.BiomeGen.glacierGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.glacier);
}
if (BOPConfiguration.BiomeGen.grasslandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.grassland);
}
if (BOPConfiguration.BiomeGen.groveGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.grove);
}
if (BOPConfiguration.BiomeGen.heathlandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.heathland);
}
if (BOPConfiguration.BiomeGen.highlandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.highland);
}
if (BOPConfiguration.BiomeGen.hotSpringsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.hotSprings);
}
if (BOPConfiguration.BiomeGen.icyHillsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.icyHills);
}
if (BOPConfiguration.BiomeGen.jadeCliffsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.jadeCliffs);
}
if (BOPConfiguration.BiomeGen.lushDesertGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.lushDesert);
}
if (BOPConfiguration.BiomeGen.lushSwampGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.lushSwamp);
}
if (BOPConfiguration.BiomeGen.mangroveGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.mangrove);
}
if (BOPConfiguration.BiomeGen.mapleWoodsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.mapleWoods);
}
if (BOPConfiguration.BiomeGen.marshGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.marsh);
}
if (BOPConfiguration.BiomeGen.meadowGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.meadow);
}
if (BOPConfiguration.BiomeGen.mesaGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.mesa);
}
if (BOPConfiguration.BiomeGen.moorGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.moor);
}
if (BOPConfiguration.BiomeGen.mountainGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.mountain);
}
if (BOPConfiguration.BiomeGen.mysticGroveGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.mysticGrove);
}
if (BOPConfiguration.BiomeGen.oasisGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.oasis);
}
if (BOPConfiguration.BiomeGen.ominousWoodsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.ominousWoods);
}
if (BOPConfiguration.BiomeGen.orchardGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.orchard);
}
if (BOPConfiguration.BiomeGen.originValleyGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.originValley);
}
if (BOPConfiguration.BiomeGen.outbackGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.outback);
}
if (BOPConfiguration.BiomeGen.overgrownGreensGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.overgrownGreens);
}
if (BOPConfiguration.BiomeGen.pastureGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.pasture);
}
if (BOPConfiguration.BiomeGen.polarGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.polar);
}
if (BOPConfiguration.BiomeGen.prairieGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.prairie);
}
if (BOPConfiguration.BiomeGen.quagmireGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.quagmire);
}
if (BOPConfiguration.BiomeGen.rainforestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.rainforest);
}
if (BOPConfiguration.BiomeGen.redwoodForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.redwoodForest);
}
if (BOPConfiguration.BiomeGen.sacredSpringsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.sacredSprings);
}
if (BOPConfiguration.BiomeGen.savannaGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.savanna);
}
if (BOPConfiguration.BiomeGen.scrublandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.scrubland);
}
if (BOPConfiguration.BiomeGen.seasonalForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.seasonalForest);
}
if (BOPConfiguration.BiomeGen.shieldGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.shield);
}
if (BOPConfiguration.BiomeGen.shrublandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.shrubland);
}
if (BOPConfiguration.BiomeGen.silkgladesGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.silkglades);
}
if (BOPConfiguration.BiomeGen.sludgepitGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.sludgepit);
}
if (BOPConfiguration.BiomeGen.spruceWoodsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.spruceWoods);
}
if (BOPConfiguration.BiomeGen.steppeGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.steppe);
}
if (BOPConfiguration.BiomeGen.temperateRainforestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.temperateRainforest);
}
if (BOPConfiguration.BiomeGen.thicketGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.thicket);
}
if (BOPConfiguration.BiomeGen.timberGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.timber);
}
if (BOPConfiguration.BiomeGen.tropicalRainforestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.tropicalRainforest);
}
if (BOPConfiguration.BiomeGen.tropicsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.tropics);
}
if (BOPConfiguration.BiomeGen.tundraGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.tundra);
}
if (BOPConfiguration.BiomeGen.volcanoGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.volcano);
}
if (BOPConfiguration.BiomeGen.wastelandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.wasteland);
}
if (BOPConfiguration.BiomeGen.wetlandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.wetland);
}
if (BOPConfiguration.BiomeGen.woodlandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.woodland);
}
// Vanilla biomes generation
if (BOPConfiguration.BiomeGen.plainsGen)
{
if (BOPConfiguration.BiomeGen.alpsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.alps);
}
if (BOPConfiguration.BiomeGen.arcticGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.arctic);
}
if (BOPConfiguration.BiomeGen.badlandsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.badlands);
}
if (BOPConfiguration.BiomeGen.bambooForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.bambooForest);
}
if (BOPConfiguration.BiomeGen.bayouGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.bayou);
}
if (BOPConfiguration.BiomeGen.birchForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.birchForest);
}
if (BOPConfiguration.BiomeGen.bogGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.bog);
}
if (BOPConfiguration.BiomeGen.borealForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.borealForest);
}
if (BOPConfiguration.BiomeGen.brushlandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.brushland);
}
if (BOPConfiguration.BiomeGen.canyonGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.canyon);
}
if (BOPConfiguration.BiomeGen.chaparralGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.chaparral);
}
if (BOPConfiguration.BiomeGen.cherryBlossomGroveGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.cherryBlossomGrove);
}
if (BOPConfiguration.BiomeGen.coniferousForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.coniferousForest);
}
if (BOPConfiguration.BiomeGen.coniferousForestSnowGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.coniferousForestSnow);
}
if (BOPConfiguration.BiomeGen.cragGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.crag);
}
if (BOPConfiguration.BiomeGen.deadForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.deadForest);
}
if (BOPConfiguration.BiomeGen.deadForestSnowGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.deadForestSnow);
}
if (BOPConfiguration.BiomeGen.deadSwampGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.deadSwamp);
}
if (BOPConfiguration.BiomeGen.deadlandsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.deadlands);
}
if (BOPConfiguration.BiomeGen.deciduousForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.deciduousForest);
}
if (BOPConfiguration.BiomeGen.dunesGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.dunes);
}
if (BOPConfiguration.BiomeGen.fenGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.fen);
}
if (BOPConfiguration.BiomeGen.fieldGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.field);
}
if (BOPConfiguration.BiomeGen.frostForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.frostForest);
}
if (BOPConfiguration.BiomeGen.fungiForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.fungiForest);
}
if (BOPConfiguration.BiomeGen.gardenGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.garden);
}
if (BOPConfiguration.BiomeGen.glacierGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.glacier);
}
if (BOPConfiguration.BiomeGen.grasslandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.grassland);
}
if (BOPConfiguration.BiomeGen.groveGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.grove);
}
if (BOPConfiguration.BiomeGen.heathlandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.heathland);
}
if (BOPConfiguration.BiomeGen.highlandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.highland);
}
if (BOPConfiguration.BiomeGen.hotSpringsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.hotSprings);
}
if (BOPConfiguration.BiomeGen.icyHillsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.icyHills);
}
if (BOPConfiguration.BiomeGen.jadeCliffsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.jadeCliffs);
}
if (BOPConfiguration.BiomeGen.lushDesertGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.lushDesert);
}
if (BOPConfiguration.BiomeGen.lushSwampGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.lushSwamp);
}
if (BOPConfiguration.BiomeGen.mangroveGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.mangrove);
}
if (BOPConfiguration.BiomeGen.mapleWoodsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.mapleWoods);
}
if (BOPConfiguration.BiomeGen.marshGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.marsh);
}
if (BOPConfiguration.BiomeGen.meadowGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.meadow);
}
if (BOPConfiguration.BiomeGen.mesaGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.mesa);
}
if (BOPConfiguration.BiomeGen.moorGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.moor);
}
if (BOPConfiguration.BiomeGen.mountainGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.mountain);
}
if (BOPConfiguration.BiomeGen.mysticGroveGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.mysticGrove);
}
if (BOPConfiguration.BiomeGen.oasisGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.oasis);
}
if (BOPConfiguration.BiomeGen.ominousWoodsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.ominousWoods);
}
if (BOPConfiguration.BiomeGen.orchardGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.orchard);
}
if (BOPConfiguration.BiomeGen.originValleyGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.originValley);
}
if (BOPConfiguration.BiomeGen.outbackGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.outback);
}
if (BOPConfiguration.BiomeGen.overgrownGreensGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.overgrownGreens);
}
if (BOPConfiguration.BiomeGen.pastureGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.pasture);
}
if (BOPConfiguration.BiomeGen.polarGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.polar);
}
if (BOPConfiguration.BiomeGen.prairieGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.prairie);
}
if (BOPConfiguration.BiomeGen.quagmireGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.quagmire);
}
if (BOPConfiguration.BiomeGen.rainforestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.rainforest);
}
if (BOPConfiguration.BiomeGen.redwoodForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.redwoodForest);
}
if (BOPConfiguration.BiomeGen.sacredSpringsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.sacredSprings);
}
if (BOPConfiguration.BiomeGen.savannaGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.savanna);
}
if (BOPConfiguration.BiomeGen.scrublandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.scrubland);
}
if (BOPConfiguration.BiomeGen.seasonalForestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.seasonalForest);
}
if (BOPConfiguration.BiomeGen.shieldGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.shield);
}
if (BOPConfiguration.BiomeGen.shrublandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.shrubland);
}
if (BOPConfiguration.BiomeGen.silkgladesGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.silkglades);
}
if (BOPConfiguration.BiomeGen.sludgepitGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.sludgepit);
}
if (BOPConfiguration.BiomeGen.spruceWoodsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.spruceWoods);
}
if (BOPConfiguration.BiomeGen.steppeGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.steppe);
}
if (BOPConfiguration.BiomeGen.temperateRainforestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.temperateRainforest);
}
if (BOPConfiguration.BiomeGen.thicketGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.thicket);
}
if (BOPConfiguration.BiomeGen.timberGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.timber);
}
if (BOPConfiguration.BiomeGen.tropicalRainforestGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.tropicalRainforest);
}
if (BOPConfiguration.BiomeGen.tropicsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.tropics);
}
if (BOPConfiguration.BiomeGen.tundraGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.tundra);
}
if (BOPConfiguration.BiomeGen.volcanoGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.volcano);
}
if (BOPConfiguration.BiomeGen.wastelandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.wasteland);
}
if (BOPConfiguration.BiomeGen.wetlandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.wetland);
}
if (BOPConfiguration.BiomeGen.woodlandGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.woodland);
}
// Vanilla biomes generation
if (BOPConfiguration.BiomeGen.plainsGen)
if (BOPConfiguration.TerrainGen.vanillaEnhanced)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced)
{
addBiomeToWorldTypes(getWorldTypes(), Biomes.plainsNew);
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.plains);
}
} else {
addBiomeToWorldTypes(getWorldTypes(), Biomes.plainsNew);
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.plains);
}
if (BOPConfiguration.BiomeGen.desertGen)
} else {
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.plains);
}
if (BOPConfiguration.BiomeGen.desertGen)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced)
{
addBiomeToWorldTypes(getWorldTypes(), Biomes.desertNew);
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.desert);
}
} else {
addBiomeToWorldTypes(getWorldTypes(), Biomes.desertNew);
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.desert);
}
if (BOPConfiguration.BiomeGen.extremeHillsGen)
} else {
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.desert);
}
if (BOPConfiguration.BiomeGen.extremeHillsGen)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced)
{
addBiomeToWorldTypes(getWorldTypes(), Biomes.extremeHillsNew);
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.extremeHills);
}
} else {
addBiomeToWorldTypes(getWorldTypes(), Biomes.extremeHillsNew);
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.extremeHills);
}
if (BOPConfiguration.BiomeGen.forestGen)
} else {
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.extremeHills);
}
if (BOPConfiguration.BiomeGen.forestGen)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced)
{
addBiomeToWorldTypes(getWorldTypes(), Biomes.forestNew);
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.forest);
}
} else {
addBiomeToWorldTypes(getWorldTypes(), Biomes.forestNew);
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.forest);
}
if (BOPConfiguration.BiomeGen.taigaGen)
} else {
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.forest);
}
if (BOPConfiguration.BiomeGen.taigaGen)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced)
{
addBiomeToWorldTypes(getWorldTypes(), Biomes.taigaNew);
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.taiga);
}
} else {
addBiomeToWorldTypes(getWorldTypes(), Biomes.taigaNew);
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.taiga);
}
if (BOPConfiguration.BiomeGen.swamplandGen)
} else {
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.taiga);
}
if (BOPConfiguration.BiomeGen.swamplandGen)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced)
{
addBiomeToWorldTypes(getWorldTypes(), Biomes.swamplandNew);
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.swampland);
}
} else {
addBiomeToWorldTypes(getWorldTypes(), Biomes.swamplandNew);
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.swampland);
}
if (BOPConfiguration.BiomeGen.jungleGen)
} else {
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.swampland);
}
if (BOPConfiguration.BiomeGen.jungleGen)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced)
{
addBiomeToWorldTypes(getWorldTypes(), Biomes.jungleNew);
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.jungle);
}
} else {
addBiomeToWorldTypes(getWorldTypes(), Biomes.jungleNew);
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.jungle);
}
}
else
{
addBiomeToWorldTypes(getWorldTypes(), Biomes.jungleNew);
addBiomeToWorldTypes(getWorldTypes(), Biomes.forestNew);
addBiomeToWorldTypes(getWorldTypes(), Biomes.desertNew);
addBiomeToWorldTypes(getWorldTypes(), Biomes.shrubland);
addBiomeToWorldTypes(getWorldTypes(), Biomes.wetland);
addBiomeToWorldTypes(getWorldTypes(), Biomes.tundra);
addBiomeToWorldTypes(getWorldTypes(), Biomes.badlands);
} else {
removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.jungle);
}
}

View file

@ -313,7 +313,6 @@ public class BOPConfiguration
public static boolean poisonWaterGen;
public static boolean quicksandGen;
public static boolean exposedStone;
public static boolean fancyGen;
public static int villageDistance;
@ -414,7 +413,6 @@ public class BOPConfiguration
biomeSize = config.get("Biomes O\' Plenty World Type Settings", "Biome Size", 4, "Default World Type has 4. Large Biomes World Type has 6.").getInt();
addToDefault = config.get("Biome Settings", "Add Biomes To Default World", false).getBoolean(true);
vanillaEnhanced = config.get("Biome Settings", "Enhanced Vanilla Biomes", true).getBoolean(false);
fancyGen = config.get("Biome Settings", "Enable Experimental Biome Generation", false).getBoolean(true);
netherOverride = config.get("Dimension Settings", "Enable Nether Override", true).getBoolean(true);
pumpkinGen = config.get("Decoration Settings", "Generate Pumpkins Without Faces", true).getBoolean(true);
poisonIvyGen = config.get("Decoration Settings", "Generate Poison Ivy", true).getBoolean(true);

View file

@ -17,401 +17,388 @@ public class WorldTypeBOP extends WorldType
this.biomesForWorldType = super.getBiomesForWorldType();
this.removeAllBiomes();
if (BOPConfiguration.TerrainGen.fancyGen == false)
if (BOPConfiguration.BiomeGen.alpsGen == true)
{
if (BOPConfiguration.BiomeGen.alpsGen == true)
{
addNewBiome(Biomes.alps);
}
if (BOPConfiguration.BiomeGen.arcticGen == true)
{
addNewBiome(Biomes.arctic);
}
if (BOPConfiguration.BiomeGen.badlandsGen == true)
{
addNewBiome(Biomes.badlands);
}
if (BOPConfiguration.BiomeGen.bambooForestGen == true)
{
addNewBiome(Biomes.bambooForest);
}
if (BOPConfiguration.BiomeGen.bayouGen == true)
{
addNewBiome(Biomes.bayou);
}
if (BOPConfiguration.BiomeGen.birchForestGen == true)
{
addNewBiome(Biomes.birchForest);
}
if (BOPConfiguration.BiomeGen.bogGen == true)
{
addNewBiome(Biomes.bog);
}
if (BOPConfiguration.BiomeGen.borealForestGen == true)
{
addNewBiome(Biomes.borealForest);
}
if (BOPConfiguration.BiomeGen.brushlandGen == true)
{
addNewBiome(Biomes.brushland);
}
if (BOPConfiguration.BiomeGen.canyonGen == true)
{
addNewBiome(Biomes.canyon);
}
if (BOPConfiguration.BiomeGen.chaparralGen == true)
{
addNewBiome(Biomes.chaparral);
}
if (BOPConfiguration.BiomeGen.cherryBlossomGroveGen == true)
{
addNewBiome(Biomes.cherryBlossomGrove);
}
if (BOPConfiguration.BiomeGen.coniferousForestGen == true)
{
addNewBiome(Biomes.coniferousForest);
}
if (BOPConfiguration.BiomeGen.coniferousForestSnowGen == true)
{
addNewBiome(Biomes.coniferousForestSnow);
}
if (BOPConfiguration.BiomeGen.cragGen == true)
{
addNewBiome(Biomes.crag);
}
if (BOPConfiguration.BiomeGen.deadForestGen == true)
{
addNewBiome(Biomes.deadForest);
}
if (BOPConfiguration.BiomeGen.deadForestSnowGen == true)
{
addNewBiome(Biomes.deadForestSnow);
}
if (BOPConfiguration.BiomeGen.deadSwampGen == true)
{
addNewBiome(Biomes.deadSwamp);
}
if (BOPConfiguration.BiomeGen.deadlandsGen == true)
{
addNewBiome(Biomes.deadlands);
}
if (BOPConfiguration.BiomeGen.deciduousForestGen == true)
{
addNewBiome(Biomes.deciduousForest);
}
if (BOPConfiguration.BiomeGen.dunesGen == true)
{
addNewBiome(Biomes.dunes);
}
if (BOPConfiguration.BiomeGen.fenGen == true)
{
addNewBiome(Biomes.fen);
}
if (BOPConfiguration.BiomeGen.fieldGen == true)
{
addNewBiome(Biomes.field);
}
if (BOPConfiguration.BiomeGen.frostForestGen == true)
{
addNewBiome(Biomes.frostForest);
}
if (BOPConfiguration.BiomeGen.fungiForestGen == true)
{
addNewBiome(Biomes.fungiForest);
}
if (BOPConfiguration.BiomeGen.gardenGen == true)
{
addNewBiome(Biomes.garden);
}
if (BOPConfiguration.BiomeGen.glacierGen == true)
{
addNewBiome(Biomes.glacier);
}
if (BOPConfiguration.BiomeGen.grasslandGen == true)
{
addNewBiome(Biomes.grassland);
}
if (BOPConfiguration.BiomeGen.groveGen == true)
{
addNewBiome(Biomes.grove);
}
if (BOPConfiguration.BiomeGen.heathlandGen == true)
{
addNewBiome(Biomes.heathland);
}
if (BOPConfiguration.BiomeGen.highlandGen == true)
{
addNewBiome(Biomes.highland);
}
if (BOPConfiguration.BiomeGen.hotSpringsGen == true)
{
addNewBiome(Biomes.hotSprings);
}
if (BOPConfiguration.BiomeGen.icyHillsGen == true)
{
addNewBiome(Biomes.icyHills);
}
if (BOPConfiguration.BiomeGen.jadeCliffsGen == true)
{
addNewBiome(Biomes.jadeCliffs);
}
if (BOPConfiguration.BiomeGen.lushDesertGen == true)
{
addNewBiome(Biomes.lushDesert);
}
if (BOPConfiguration.BiomeGen.lushSwampGen == true)
{
addNewBiome(Biomes.lushSwamp);
}
if (BOPConfiguration.BiomeGen.mangroveGen == true)
{
addNewBiome(Biomes.mangrove);
}
if (BOPConfiguration.BiomeGen.mapleWoodsGen == true)
{
addNewBiome(Biomes.mapleWoods);
}
if (BOPConfiguration.BiomeGen.marshGen == true)
{
addNewBiome(Biomes.marsh);
}
if (BOPConfiguration.BiomeGen.meadowGen == true)
{
addNewBiome(Biomes.meadow);
}
if (BOPConfiguration.BiomeGen.mesaGen == true)
{
addNewBiome(Biomes.mesa);
}
if (BOPConfiguration.BiomeGen.moorGen == true)
{
addNewBiome(Biomes.moor);
}
if (BOPConfiguration.BiomeGen.mountainGen == true)
{
addNewBiome(Biomes.mountain);
}
if (BOPConfiguration.BiomeGen.mysticGroveGen == true)
{
addNewBiome(Biomes.mysticGrove);
}
if (BOPConfiguration.BiomeGen.oasisGen == true)
{
addNewBiome(Biomes.oasis);
}
if (BOPConfiguration.BiomeGen.ominousWoodsGen == true)
{
addNewBiome(Biomes.ominousWoods);
}
if (BOPConfiguration.BiomeGen.orchardGen == true)
{
addNewBiome(Biomes.orchard);
}
if (BOPConfiguration.BiomeGen.originValleyGen == true)
{
addNewBiome(Biomes.originValley);
}
if (BOPConfiguration.BiomeGen.outbackGen == true)
{
addNewBiome(Biomes.outback);
}
if (BOPConfiguration.BiomeGen.overgrownGreensGen == true)
{
addNewBiome(Biomes.overgrownGreens);
}
if (BOPConfiguration.BiomeGen.pastureGen == true)
{
addNewBiome(Biomes.pasture);
}
if (BOPConfiguration.BiomeGen.polarGen == true)
{
addNewBiome(Biomes.polar);
}
if (BOPConfiguration.BiomeGen.prairieGen == true)
{
addNewBiome(Biomes.prairie);
}
if (BOPConfiguration.BiomeGen.quagmireGen == true)
{
addNewBiome(Biomes.quagmire);
}
if (BOPConfiguration.BiomeGen.rainforestGen == true)
{
addNewBiome(Biomes.rainforest);
}
if (BOPConfiguration.BiomeGen.redwoodForestGen == true)
{
addNewBiome(Biomes.redwoodForest);
}
if (BOPConfiguration.BiomeGen.sacredSpringsGen == true)
{
addNewBiome(Biomes.sacredSprings);
}
if (BOPConfiguration.BiomeGen.savannaGen == true)
{
addNewBiome(Biomes.savanna);
}
if (BOPConfiguration.BiomeGen.scrublandGen == true)
{
addNewBiome(Biomes.scrubland);
}
if (BOPConfiguration.BiomeGen.seasonalForestGen == true)
{
addNewBiome(Biomes.seasonalForest);
}
if (BOPConfiguration.BiomeGen.shieldGen == true)
{
addNewBiome(Biomes.shield);
}
if (BOPConfiguration.BiomeGen.shrublandGen == true)
{
addNewBiome(Biomes.shrubland);
}
if (BOPConfiguration.BiomeGen.silkgladesGen == true)
{
addNewBiome(Biomes.silkglades);
}
if (BOPConfiguration.BiomeGen.sludgepitGen == true)
{
addNewBiome(Biomes.sludgepit);
}
if (BOPConfiguration.BiomeGen.spruceWoodsGen == true)
{
addNewBiome(Biomes.spruceWoods);
}
if (BOPConfiguration.BiomeGen.steppeGen == true)
{
addNewBiome(Biomes.steppe);
}
if (BOPConfiguration.BiomeGen.temperateRainforestGen == true)
{
addNewBiome(Biomes.temperateRainforest);
}
if (BOPConfiguration.BiomeGen.thicketGen == true)
{
addNewBiome(Biomes.thicket);
}
if (BOPConfiguration.BiomeGen.timberGen == true)
{
addNewBiome(Biomes.timber);
}
if (BOPConfiguration.BiomeGen.tropicalRainforestGen == true)
{
addNewBiome(Biomes.tropicalRainforest);
}
if (BOPConfiguration.BiomeGen.tropicsGen == true)
{
addNewBiome(Biomes.tropics);
}
if (BOPConfiguration.BiomeGen.tundraGen == true)
{
addNewBiome(Biomes.tundra);
}
if (BOPConfiguration.BiomeGen.volcanoGen == true)
{
addNewBiome(Biomes.volcano);
}
if (BOPConfiguration.BiomeGen.wastelandGen == true)
{
addNewBiome(Biomes.wasteland);
}
if (BOPConfiguration.BiomeGen.wetlandGen == true)
{
addNewBiome(Biomes.wetland);
}
if (BOPConfiguration.BiomeGen.woodlandGen == true)
{
addNewBiome(Biomes.woodland);
}
addNewBiome(Biomes.alps);
}
if (BOPConfiguration.BiomeGen.arcticGen == true)
{
addNewBiome(Biomes.arctic);
}
if (BOPConfiguration.BiomeGen.badlandsGen == true)
{
addNewBiome(Biomes.badlands);
}
if (BOPConfiguration.BiomeGen.bambooForestGen == true)
{
addNewBiome(Biomes.bambooForest);
}
if (BOPConfiguration.BiomeGen.bayouGen == true)
{
addNewBiome(Biomes.bayou);
}
if (BOPConfiguration.BiomeGen.birchForestGen == true)
{
addNewBiome(Biomes.birchForest);
}
if (BOPConfiguration.BiomeGen.bogGen == true)
{
addNewBiome(Biomes.bog);
}
if (BOPConfiguration.BiomeGen.borealForestGen == true)
{
addNewBiome(Biomes.borealForest);
}
if (BOPConfiguration.BiomeGen.brushlandGen == true)
{
addNewBiome(Biomes.brushland);
}
if (BOPConfiguration.BiomeGen.canyonGen == true)
{
addNewBiome(Biomes.canyon);
}
if (BOPConfiguration.BiomeGen.chaparralGen == true)
{
addNewBiome(Biomes.chaparral);
}
if (BOPConfiguration.BiomeGen.cherryBlossomGroveGen == true)
{
addNewBiome(Biomes.cherryBlossomGrove);
}
if (BOPConfiguration.BiomeGen.coniferousForestGen == true)
{
addNewBiome(Biomes.coniferousForest);
}
if (BOPConfiguration.BiomeGen.coniferousForestSnowGen == true)
{
addNewBiome(Biomes.coniferousForestSnow);
}
if (BOPConfiguration.BiomeGen.cragGen == true)
{
addNewBiome(Biomes.crag);
}
if (BOPConfiguration.BiomeGen.deadForestGen == true)
{
addNewBiome(Biomes.deadForest);
}
if (BOPConfiguration.BiomeGen.deadForestSnowGen == true)
{
addNewBiome(Biomes.deadForestSnow);
}
if (BOPConfiguration.BiomeGen.deadSwampGen == true)
{
addNewBiome(Biomes.deadSwamp);
}
if (BOPConfiguration.BiomeGen.deadlandsGen == true)
{
addNewBiome(Biomes.deadlands);
}
if (BOPConfiguration.BiomeGen.deciduousForestGen == true)
{
addNewBiome(Biomes.deciduousForest);
}
if (BOPConfiguration.BiomeGen.dunesGen == true)
{
addNewBiome(Biomes.dunes);
}
if (BOPConfiguration.BiomeGen.fenGen == true)
{
addNewBiome(Biomes.fen);
}
if (BOPConfiguration.BiomeGen.fieldGen == true)
{
addNewBiome(Biomes.field);
}
if (BOPConfiguration.BiomeGen.frostForestGen == true)
{
addNewBiome(Biomes.frostForest);
}
if (BOPConfiguration.BiomeGen.fungiForestGen == true)
{
addNewBiome(Biomes.fungiForest);
}
if (BOPConfiguration.BiomeGen.gardenGen == true)
{
addNewBiome(Biomes.garden);
}
if (BOPConfiguration.BiomeGen.glacierGen == true)
{
addNewBiome(Biomes.glacier);
}
if (BOPConfiguration.BiomeGen.grasslandGen == true)
{
addNewBiome(Biomes.grassland);
}
if (BOPConfiguration.BiomeGen.groveGen == true)
{
addNewBiome(Biomes.grove);
}
if (BOPConfiguration.BiomeGen.heathlandGen == true)
{
addNewBiome(Biomes.heathland);
}
if (BOPConfiguration.BiomeGen.highlandGen == true)
{
addNewBiome(Biomes.highland);
}
if (BOPConfiguration.BiomeGen.hotSpringsGen == true)
{
addNewBiome(Biomes.hotSprings);
}
if (BOPConfiguration.BiomeGen.icyHillsGen == true)
{
addNewBiome(Biomes.icyHills);
}
if (BOPConfiguration.BiomeGen.jadeCliffsGen == true)
{
addNewBiome(Biomes.jadeCliffs);
}
if (BOPConfiguration.BiomeGen.lushDesertGen == true)
{
addNewBiome(Biomes.lushDesert);
}
if (BOPConfiguration.BiomeGen.lushSwampGen == true)
{
addNewBiome(Biomes.lushSwamp);
}
if (BOPConfiguration.BiomeGen.mangroveGen == true)
{
addNewBiome(Biomes.mangrove);
}
if (BOPConfiguration.BiomeGen.mapleWoodsGen == true)
{
addNewBiome(Biomes.mapleWoods);
}
if (BOPConfiguration.BiomeGen.marshGen == true)
{
addNewBiome(Biomes.marsh);
}
if (BOPConfiguration.BiomeGen.meadowGen == true)
{
addNewBiome(Biomes.meadow);
}
if (BOPConfiguration.BiomeGen.mesaGen == true)
{
addNewBiome(Biomes.mesa);
}
if (BOPConfiguration.BiomeGen.moorGen == true)
{
addNewBiome(Biomes.moor);
}
if (BOPConfiguration.BiomeGen.mountainGen == true)
{
addNewBiome(Biomes.mountain);
}
if (BOPConfiguration.BiomeGen.mysticGroveGen == true)
{
addNewBiome(Biomes.mysticGrove);
}
if (BOPConfiguration.BiomeGen.oasisGen == true)
{
addNewBiome(Biomes.oasis);
}
if (BOPConfiguration.BiomeGen.ominousWoodsGen == true)
{
addNewBiome(Biomes.ominousWoods);
}
if (BOPConfiguration.BiomeGen.orchardGen == true)
{
addNewBiome(Biomes.orchard);
}
if (BOPConfiguration.BiomeGen.originValleyGen == true)
{
addNewBiome(Biomes.originValley);
}
if (BOPConfiguration.BiomeGen.outbackGen == true)
{
addNewBiome(Biomes.outback);
}
if (BOPConfiguration.BiomeGen.overgrownGreensGen == true)
{
addNewBiome(Biomes.overgrownGreens);
}
if (BOPConfiguration.BiomeGen.pastureGen == true)
{
addNewBiome(Biomes.pasture);
}
if (BOPConfiguration.BiomeGen.polarGen == true)
{
addNewBiome(Biomes.polar);
}
if (BOPConfiguration.BiomeGen.prairieGen == true)
{
addNewBiome(Biomes.prairie);
}
if (BOPConfiguration.BiomeGen.quagmireGen == true)
{
addNewBiome(Biomes.quagmire);
}
if (BOPConfiguration.BiomeGen.rainforestGen == true)
{
addNewBiome(Biomes.rainforest);
}
if (BOPConfiguration.BiomeGen.redwoodForestGen == true)
{
addNewBiome(Biomes.redwoodForest);
}
if (BOPConfiguration.BiomeGen.sacredSpringsGen == true)
{
addNewBiome(Biomes.sacredSprings);
}
if (BOPConfiguration.BiomeGen.savannaGen == true)
{
addNewBiome(Biomes.savanna);
}
if (BOPConfiguration.BiomeGen.scrublandGen == true)
{
addNewBiome(Biomes.scrubland);
}
if (BOPConfiguration.BiomeGen.seasonalForestGen == true)
{
addNewBiome(Biomes.seasonalForest);
}
if (BOPConfiguration.BiomeGen.shieldGen == true)
{
addNewBiome(Biomes.shield);
}
if (BOPConfiguration.BiomeGen.shrublandGen == true)
{
addNewBiome(Biomes.shrubland);
}
if (BOPConfiguration.BiomeGen.silkgladesGen == true)
{
addNewBiome(Biomes.silkglades);
}
if (BOPConfiguration.BiomeGen.sludgepitGen == true)
{
addNewBiome(Biomes.sludgepit);
}
if (BOPConfiguration.BiomeGen.spruceWoodsGen == true)
{
addNewBiome(Biomes.spruceWoods);
}
if (BOPConfiguration.BiomeGen.steppeGen == true)
{
addNewBiome(Biomes.steppe);
}
if (BOPConfiguration.BiomeGen.temperateRainforestGen == true)
{
addNewBiome(Biomes.temperateRainforest);
}
if (BOPConfiguration.BiomeGen.thicketGen == true)
{
addNewBiome(Biomes.thicket);
}
if (BOPConfiguration.BiomeGen.timberGen == true)
{
addNewBiome(Biomes.timber);
}
if (BOPConfiguration.BiomeGen.tropicalRainforestGen == true)
{
addNewBiome(Biomes.tropicalRainforest);
}
if (BOPConfiguration.BiomeGen.tropicsGen == true)
{
addNewBiome(Biomes.tropics);
}
if (BOPConfiguration.BiomeGen.tundraGen == true)
{
addNewBiome(Biomes.tundra);
}
if (BOPConfiguration.BiomeGen.volcanoGen == true)
{
addNewBiome(Biomes.volcano);
}
if (BOPConfiguration.BiomeGen.wastelandGen == true)
{
addNewBiome(Biomes.wasteland);
}
if (BOPConfiguration.BiomeGen.wetlandGen == true)
{
addNewBiome(Biomes.wetland);
}
if (BOPConfiguration.BiomeGen.woodlandGen == true)
{
addNewBiome(Biomes.woodland);
}
if (BOPConfiguration.BiomeGen.plainsGen == true)
if (BOPConfiguration.BiomeGen.plainsGen == true)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{
addNewBiome(Biomes.plainsNew);
}
else
{
this.addNewBiome(BiomeGenBase.plains);
}
addNewBiome(Biomes.plainsNew);
}
if (BOPConfiguration.BiomeGen.desertGen == true)
else
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{
addNewBiome(Biomes.desertNew);
}
else
{
this.addNewBiome(BiomeGenBase.desert);
}
}
if (BOPConfiguration.BiomeGen.extremeHillsGen == true)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{
addNewBiome(Biomes.extremeHillsNew);
}
else
{
this.addNewBiome(BiomeGenBase.extremeHills);
}
}
if (BOPConfiguration.BiomeGen.forestGen == true)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{
addNewBiome(Biomes.forestNew);
}
else
{
this.addNewBiome(BiomeGenBase.forest);
}
}
if (BOPConfiguration.BiomeGen.taigaGen == true)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{
addNewBiome(Biomes.taigaNew);
}
else
{
this.addNewBiome(BiomeGenBase.taiga);
}
}
if (BOPConfiguration.BiomeGen.swamplandGen == true)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{
addNewBiome(Biomes.swamplandNew);
}
else
{
this.addNewBiome(BiomeGenBase.swampland);
}
}
if (BOPConfiguration.BiomeGen.jungleGen == true)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{
addNewBiome(Biomes.jungleNew);
}
else
{
this.addNewBiome(BiomeGenBase.jungle);
}
this.addNewBiome(BiomeGenBase.plains);
}
}
else
if (BOPConfiguration.BiomeGen.desertGen == true)
{
this.addNewBiome(Biomes.jungleNew);
this.addNewBiome(Biomes.forestNew);
this.addNewBiome(Biomes.wetland);
this.addNewBiome(Biomes.badlands);
this.addNewBiome(Biomes.tundra);
this.addNewBiome(Biomes.shrubland);
this.addNewBiome(Biomes.desertNew);
if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{
addNewBiome(Biomes.desertNew);
}
else
{
this.addNewBiome(BiomeGenBase.desert);
}
}
if (BOPConfiguration.BiomeGen.extremeHillsGen == true)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{
addNewBiome(Biomes.extremeHillsNew);
}
else
{
this.addNewBiome(BiomeGenBase.extremeHills);
}
}
if (BOPConfiguration.BiomeGen.forestGen == true)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{
addNewBiome(Biomes.forestNew);
}
else
{
this.addNewBiome(BiomeGenBase.forest);
}
}
if (BOPConfiguration.BiomeGen.taigaGen == true)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{
addNewBiome(Biomes.taigaNew);
}
else
{
this.addNewBiome(BiomeGenBase.taiga);
}
}
if (BOPConfiguration.BiomeGen.swamplandGen == true)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{
addNewBiome(Biomes.swamplandNew);
}
else
{
this.addNewBiome(BiomeGenBase.swampland);
}
}
if (BOPConfiguration.BiomeGen.jungleGen == true)
{
if (BOPConfiguration.TerrainGen.vanillaEnhanced == true)
{
addNewBiome(Biomes.jungleNew);
}
else
{
this.addNewBiome(BiomeGenBase.jungle);
}
}
}

View file

@ -12,12 +12,7 @@ public class WorldTypeSize
public void BiomeSize(WorldTypeEvent.BiomeSize event)
{
if (event.worldType.getWorldTypeName() == "BIOMESOP") {
if (BOPConfiguration.TerrainGen.fancyGen) {
event.newSize = (byte)5;
}
else {
event.newSize = (byte)BOPConfiguration.TerrainGen.biomeSize;
}
if (BOPConfiguration.TerrainGen.netherOverride)
{

View file

@ -1,10 +1,8 @@
package biomesoplenty.world.layer;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.layer.GenLayer;
import net.minecraft.world.gen.layer.IntCache;
import biomesoplenty.api.Biomes;
import biomesoplenty.configuration.BOPConfiguration;
public class BiomeLayerSub extends BiomeLayer
{
@ -28,134 +26,7 @@ public class BiomeLayerSub extends BiomeLayer
int k1 = aint[j1 + 1 + (i1 + 1) * (par3 + 2)];
int l1 = k1;
//New biome gen test
if (BOPConfiguration.TerrainGen.fancyGen)
{
if (k1 == Biomes.forestNew.get().biomeID && nextInt(2) == 0) { l1 = Biomes.birchForest.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(2) == 0) { l1 = Biomes.woodland.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(2) == 0) { l1 = Biomes.spruceWoods.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(4) == 0) { l1 = Biomes.coniferousForest.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(4) == 0) { l1 = Biomes.temperateRainforest.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(4) == 0) { l1 = Biomes.redwoodForest.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(4) == 0) { l1 = Biomes.mountain.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(6) == 0) { l1 = Biomes.mapleWoods.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(6) == 0) { l1 = Biomes.seasonalForest.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(6) == 0) { l1 = Biomes.borealForest.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(6) == 0) { l1 = Biomes.deciduousForest.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(8) == 0) { l1 = Biomes.deadForest.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(8) == 0) { l1 = Biomes.grove.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(8) == 0) { l1 = Biomes.timber.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(8) == 0) { l1 = Biomes.thicket.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(8) == 0) { l1 = Biomes.shield.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(10) == 0) { l1 = Biomes.fungiForest.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(10) == 0) { l1 = Biomes.cherryBlossomGrove.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(10) == 0) { l1 = Biomes.mysticGrove.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(10) == 0) { l1 = Biomes.hotSprings.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(10) == 0) { l1 = Biomes.originValley.get().biomeID; }
//
if (k1 == Biomes.wetland.get().biomeID && nextInt(2) == 0) { l1 = Biomes.marsh.get().biomeID; }
if (k1 == Biomes.wetland.get().biomeID && nextInt(2) == 0) { l1 = Biomes.lushSwamp.get().biomeID; }
if (k1 == Biomes.wetland.get().biomeID && nextInt(2) == 0) { l1 = Biomes.bayou.get().biomeID; }
if (k1 == Biomes.wetland.get().biomeID && nextInt(4) == 0) { l1 = Biomes.fen.get().biomeID; }
if (k1 == Biomes.wetland.get().biomeID && nextInt(4) == 0) { l1 = Biomes.bog.get().biomeID; }
if (k1 == Biomes.wetland.get().biomeID && nextInt(4) == 0) { l1 = Biomes.swamplandNew.get().biomeID; }
if (k1 == Biomes.wetland.get().biomeID && nextInt(6) == 0) { l1 = Biomes.moor.get().biomeID; }
if (k1 == Biomes.wetland.get().biomeID && nextInt(6) == 0) { l1 = Biomes.deadSwamp.get().biomeID; }
if (k1 == Biomes.wetland.get().biomeID && nextInt(8) == 0) { l1 = Biomes.quagmire.get().biomeID; }
if (k1 == Biomes.wetland.get().biomeID && nextInt(8) == 0) { l1 = Biomes.sludgepit.get().biomeID; }
if (k1 == Biomes.wetland.get().biomeID && nextInt(10) == 0) { l1 = Biomes.ominousWoods.get().biomeID; }
if (k1 == Biomes.wetland.get().biomeID && nextInt(10) == 0) { l1 = Biomes.silkglades.get().biomeID; }
//
if (k1 == Biomes.desertNew.get().biomeID && nextInt(2) == 0) { l1 = Biomes.dunes.get().biomeID; }
if (k1 == Biomes.desertNew.get().biomeID && nextInt(2) == 0) { l1 = Biomes.canyon.get().biomeID; }
if (k1 == Biomes.desertNew.get().biomeID && nextInt(2) == 0) { l1 = Biomes.mesa.get().biomeID; }
if (k1 == Biomes.desertNew.get().biomeID && nextInt(4) == 0) { l1 = Biomes.outback.get().biomeID; }
if (k1 == Biomes.desertNew.get().biomeID && nextInt(4) == 0) { l1 = Biomes.steppe.get().biomeID; }
if (k1 == Biomes.desertNew.get().biomeID && nextInt(4) == 0) { l1 = Biomes.scrubland.get().biomeID; }
if (k1 == Biomes.desertNew.get().biomeID && nextInt(6) == 0) { l1 = Biomes.lushDesert.get().biomeID; }
if (k1 == Biomes.desertNew.get().biomeID && nextInt(6) == 0) { l1 = Biomes.savanna.get().biomeID; }
if (k1 == Biomes.desertNew.get().biomeID && nextInt(8) == 0) { l1 = Biomes.brushland.get().biomeID; }
if (k1 == Biomes.desertNew.get().biomeID && nextInt(8) == 0) { l1 = Biomes.heathland.get().biomeID; }
if (k1 == Biomes.desertNew.get().biomeID && nextInt(10) == 0) { l1 = Biomes.oasis.get().biomeID; }
//
if (k1 == Biomes.jungleNew.get().biomeID && nextInt(2) == 0) { l1 = Biomes.tropicalRainforest.get().biomeID; }
if (k1 == Biomes.jungleNew.get().biomeID && nextInt(2) == 0) { l1 = Biomes.rainforest.get().biomeID; }
if (k1 == Biomes.jungleNew.get().biomeID && nextInt(4) == 0) { l1 = Biomes.tropics.get().biomeID; }
if (k1 == Biomes.jungleNew.get().biomeID && nextInt(6) == 0) { l1 = Biomes.bambooForest.get().biomeID; }
if (k1 == Biomes.jungleNew.get().biomeID && nextInt(6) == 0) { l1 = Biomes.jadeCliffs.get().biomeID; }
if (k1 == Biomes.jungleNew.get().biomeID && nextInt(8) == 0) { l1 = Biomes.mangrove.get().biomeID; }
if (k1 == Biomes.jungleNew.get().biomeID && nextInt(10) == 0) { l1 = Biomes.sacredSprings.get().biomeID; }
//
if (k1 == Biomes.shrubland.get().biomeID && nextInt(2) == 0) { l1 = Biomes.plainsNew.get().biomeID; }
if (k1 == Biomes.shrubland.get().biomeID && nextInt(2) == 0) { l1 = Biomes.chaparral.get().biomeID; }
if (k1 == Biomes.shrubland.get().biomeID && nextInt(2) == 0) { l1 = Biomes.prairie.get().biomeID; }
if (k1 == Biomes.shrubland.get().biomeID && nextInt(4) == 0) { l1 = Biomes.field.get().biomeID; }
if (k1 == Biomes.shrubland.get().biomeID && nextInt(4) == 0) { l1 = Biomes.grassland.get().biomeID; }
if (k1 == Biomes.shrubland.get().biomeID && nextInt(4) == 0) { l1 = Biomes.highland.get().biomeID; }
if (k1 == Biomes.shrubland.get().biomeID && nextInt(6) == 0) { l1 = Biomes.pasture.get().biomeID; }
if (k1 == Biomes.shrubland.get().biomeID && nextInt(6) == 0) { l1 = Biomes.meadow.get().biomeID; }
if (k1 == Biomes.shrubland.get().biomeID && nextInt(8) == 0) { l1 = Biomes.orchard.get().biomeID; }
if (k1 == Biomes.shrubland.get().biomeID && nextInt(8) == 0) { l1 = Biomes.overgrownGreens.get().biomeID; }
if (k1 == Biomes.shrubland.get().biomeID && nextInt(10) == 0) { l1 = Biomes.garden.get().biomeID; }
//
if (k1 == Biomes.tundra.get().biomeID && nextInt(2) == 0) { l1 = Biomes.taigaNew.get().biomeID; }
if (k1 == Biomes.tundra.get().biomeID && nextInt(2) == 0) { l1 = Biomes.frostForest.get().biomeID; }
if (k1 == Biomes.tundra.get().biomeID && nextInt(4) == 0) { l1 = Biomes.deadForestSnow.get().biomeID; }
if (k1 == Biomes.tundra.get().biomeID && nextInt(4) == 0) { l1 = Biomes.coniferousForestSnow.get().biomeID; }
if (k1 == Biomes.tundra.get().biomeID && nextInt(6) == 0) { l1 = Biomes.alps.get().biomeID; }
if (k1 == Biomes.tundra.get().biomeID && nextInt(6) == 0) { l1 = BiomeGenBase.icePlains.biomeID; }
if (k1 == Biomes.tundra.get().biomeID && nextInt(8) == 0) { l1 = Biomes.polar.get().biomeID; }
if (k1 == Biomes.tundra.get().biomeID && nextInt(8) == 0) { l1 = Biomes.glacier.get().biomeID; }
if (k1 == Biomes.tundra.get().biomeID && nextInt(8) == 0) { l1 = Biomes.arctic.get().biomeID; }
if (k1 == Biomes.tundra.get().biomeID && nextInt(10) == 0) { l1 = Biomes.icyHills.get().biomeID; }
//
if (k1 == Biomes.badlands.get().biomeID && nextInt(2) == 0) { l1 = Biomes.crag.get().biomeID; }
if (k1 == Biomes.badlands.get().biomeID && nextInt(2) == 0) { l1 = Biomes.volcano.get().biomeID; }
if (k1 == Biomes.badlands.get().biomeID && nextInt(6) == 0) { l1 = Biomes.wasteland.get().biomeID; }
if (k1 == Biomes.badlands.get().biomeID && nextInt(10) == 0) { l1 = Biomes.deadlands.get().biomeID; }
}
//
//LIST
if (k1 == Biomes.meadow.get().biomeID && nextInt(2) == 0) { l1 = Biomes.meadowForest.get().biomeID; }
if (k1 == Biomes.canyon.get().biomeID && nextInt(2) == 0) { l1 = Biomes.canyonRavine.get().biomeID; }