diff --git a/src/main/java/biomesoplenty/api/BOPBiomeHelper.java b/src/main/java/biomesoplenty/api/BOPBiomeHelper.java index c7f5c26f9..ad87ac4fe 100644 --- a/src/main/java/biomesoplenty/api/BOPBiomeHelper.java +++ b/src/main/java/biomesoplenty/api/BOPBiomeHelper.java @@ -54,6 +54,9 @@ public class BOPBiomeHelper case WARM: return GenLayerBiomeBOP.warmBiomes; + case MILD: + return GenLayerBiomeBOP.mildBiomes; + case COOL: return GenLayerBiomeBOP.coldBiomes; @@ -67,7 +70,7 @@ public class BOPBiomeHelper public enum TemperatureType { - HOT, WARM, COOL, ICY; + HOT, WARM, MILD, COOL, ICY; } public static class BOPBiomeEntry extends WeightedRandom.Item diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBambooForest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBambooForest.java index 898966be9..85d128fb0 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBambooForest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBambooForest.java @@ -34,6 +34,7 @@ public class BiomeGenBambooForest extends BOPBiome this.bopWorldFeatures.setFeature("shrubsPerChunk", 6); this.bopWorldFeatures.setFeature("bushesPerChunk", 5); this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15); + this.bopWorldFeatures.setFeature("algaePerChunk", 2); this.bopWorldFeatures.setFeature("generatePumpkins", false); } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForest.java index 70b252740..0d91a73ba 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForest.java @@ -47,6 +47,7 @@ public class BiomeGenConiferousForest extends BOPBiome this.bopWorldFeatures.setFeature("leafPilesPerChunk", 4); this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 8); this.bopWorldFeatures.setFeature("seaweedPerChunk", 5); + this.bopWorldFeatures.setFeature("algaePerChunk", 2); this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenHighland.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenHighland.java index 7afe352f9..ca99ecad5 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenHighland.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenHighland.java @@ -26,7 +26,7 @@ public class BiomeGenHighland extends BOPBiome this.theBiomeDecorator.grassPerChunk = 99; this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1); - this.bopWorldFeatures.setFeature("rockpilesPerChunk", 3); + this.bopWorldFeatures.setFeature("rockpilesPerChunk", 1); this.bopWorldFeatures.setFeature("bopGrassPerChunk", 99); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenLushSwamp.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenLushSwamp.java index 4ea63b9b5..b3a2a0beb 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenLushSwamp.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenLushSwamp.java @@ -36,7 +36,7 @@ public class BiomeGenLushSwamp extends BOPBiome this.bopWorldFeatures.setFeature("cattailsPerChunk", 10); this.bopWorldFeatures.setFeature("highCattailsPerChunk", 5); this.bopWorldFeatures.setFeature("riverCanePerChunk", 5); - this.bopWorldFeatures.setFeature("algaePerChunk", 1); + this.bopWorldFeatures.setFeature("algaePerChunk", 3); //TODO: FEATURE this.bopWorldFeatures.poisonWaterPerChunk = 2; this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1); this.bopWorldFeatures.setFeature("shrubsPerChunk", 5); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMarsh.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMarsh.java index dac55635b..17a5f336b 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMarsh.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMarsh.java @@ -41,7 +41,7 @@ public class BiomeGenMarsh extends BOPBiome this.bopWorldFeatures.setFeature("waterLakesPerChunk", 100); this.bopWorldFeatures.setFeature("waterReedsPerChunk", 10); this.bopWorldFeatures.setFeature("seaweedPerChunk", 15); - this.bopWorldFeatures.setFeature("algaePerChunk", 1); + this.bopWorldFeatures.setFeature("algaePerChunk", 3); this.bopWorldFeatures.setFeature("generatePumpkins", false); this.bopWorldFeatures.setFeature("bopGrassPerChunk", 50); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMeadow.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMeadow.java index b534730ea..299d2dee5 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMeadow.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMeadow.java @@ -40,6 +40,7 @@ public class BiomeGenMeadow extends BOPBiome this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 15); this.bopWorldFeatures.setFeature("seaweedPerChunk", 5); this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.bopWorldFeatures.setFeature("algaePerChunk", 2); this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMountain.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMountain.java index bbb324494..fd4a6b4ec 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMountain.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMountain.java @@ -32,6 +32,7 @@ public class BiomeGenMountain extends BOPBiome this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10); + this.bopWorldFeatures.setFeature("algaePerChunk", 2); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMysticGrove.java index 778637974..eb31d707e 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMysticGrove.java @@ -49,6 +49,7 @@ public class BiomeGenMysticGrove extends BOPBiome this.bopWorldFeatures.setFeature("shrubsPerChunk", 4); this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); this.bopWorldFeatures.setFeature("seaweedPerChunk", 5); + this.bopWorldFeatures.setFeature("algaePerChunk", 2); this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShrubland.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShrubland.java index 98a0bf5f4..b6eb1601d 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShrubland.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShrubland.java @@ -3,6 +3,7 @@ package biomesoplenty.common.biomes.overworld; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.biomes.BOPBiome; import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; @@ -39,8 +40,16 @@ public class BiomeGenShrubland extends BOPBiome this.bopWorldFeatures.setFeature("shrubsPerChunk", 5); this.bopWorldFeatures.setFeature("waterReedsPerChunk", 3); this.bopWorldFeatures.setFeature("generatePumpkins", false); + + this.bopWorldFeatures.setFeature("bopGrassPerChunk", 1); this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4); + + this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D); + this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D); + this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D); + this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); } @Override @@ -50,12 +59,6 @@ public class BiomeGenShrubland extends BOPBiome return new WorldGenShrub(0, 0); } - @Override - public WorldGenerator getRandomWorldGenForGrass(Random random) - { - return random.nextInt(4) == 0 ? (random.nextInt(2) == 0 ? new WorldGenTallGrass(BOPBlockHelper.get("foliage"), 10) : new WorldGenTallGrass(BOPBlockHelper.get("foliage"), 11)) : new WorldGenTallGrass(Blocks.tallgrass, 1); - } - @Override public void decorate(World world, Random random, int chunkX, int chunkZ) { diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenVolcano.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenVolcano.java index b75bd64b7..794767761 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenVolcano.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenVolcano.java @@ -27,8 +27,8 @@ public class BiomeGenVolcano extends BOPBiome this.theBiomeDecorator.flowersPerChunk = -999; this.theBiomeDecorator.grassPerChunk = -999; - this.bopWorldFeatures.setFeature("lavaLakesPerChunk", 50); - this.bopWorldFeatures.setFeature("lavaSpoutsPerChunk", 10); + this.bopWorldFeatures.setFeature("lavaLakesPerChunk", 20); + this.bopWorldFeatures.setFeature("lavaSpoutsPerChunk", 1); this.bopWorldFeatures.setFeature("generateAsh", true); } diff --git a/src/main/java/biomesoplenty/common/configuration/BOPConfigurationBiomeGen.java b/src/main/java/biomesoplenty/common/configuration/BOPConfigurationBiomeGen.java index 2f738c1df..3b115024a 100644 --- a/src/main/java/biomesoplenty/common/configuration/BOPConfigurationBiomeGen.java +++ b/src/main/java/biomesoplenty/common/configuration/BOPConfigurationBiomeGen.java @@ -27,6 +27,7 @@ public class BOPConfigurationBiomeGen public static boolean mesaPlateauFGen = false; public static boolean mesaPlateauGen = false; public static boolean jungleGen = false; + public static boolean shrublandGen = false; public static boolean megaTaigaGen = false; public static void addDefaultDisabledBiomes() @@ -88,6 +89,7 @@ public class BOPConfigurationBiomeGen mesaPlateauFGen = config.get("Special Biomes To Generate", "Mesa Plateau F", true).getBoolean(true); mesaPlateauGen = config.get("Special Biomes To Generate", "Mesa Plateau", true).getBoolean(true); jungleGen = config.get("Special Biomes To Generate", "Jungle", true).getBoolean(true); + shrublandGen = config.get("Special Biomes To Generate", "Shrubland", true).getBoolean(true); megaTaigaGen = config.get("Special Biomes To Generate", "Mega Taiga", true).getBoolean(true); } } diff --git a/src/main/java/biomesoplenty/common/core/BOPBiomes.java b/src/main/java/biomesoplenty/common/core/BOPBiomes.java index d7922a3dc..2228d44ad 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBiomes.java +++ b/src/main/java/biomesoplenty/common/core/BOPBiomes.java @@ -47,6 +47,10 @@ public class BOPBiomes registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.plains, TemperatureType.WARM, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.birchForest, TemperatureType.WARM, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.swampland, TemperatureType.WARM, 50)); + + registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.birchForest, TemperatureType.MILD, 50)); + registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.swampland, TemperatureType.MILD, 50)); + registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.plains, TemperatureType.MILD, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.forest, TemperatureType.COOL, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.extremeHills, TemperatureType.COOL, 50)); @@ -61,49 +65,49 @@ public class BOPBiomes registerBiome(new BOPBiomeEntry(new BiomeGenAlps(BOPConfigurationIDs.alpsID).setBiomeName("Alps"), TemperatureType.ICY, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenArctic(BOPConfigurationIDs.arcticID).setBiomeName("Arctic"), TemperatureType.ICY, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenBambooForest(BOPConfigurationIDs.bambooForestID).setBiomeName("Bamboo Forest"), TemperatureType.HOT, 25)); - registerBiome(new BOPBiomeEntry(new BiomeGenBayou(BOPConfigurationIDs.bayouID).setBiomeName("Bayou"), TemperatureType.WARM, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenBog(BOPConfigurationIDs.bogID).setBiomeName("Bog"), TemperatureType.WARM, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenBorealForest(BOPConfigurationIDs.borealForestID).setBiomeName("Boreal Forest"), TemperatureType.WARM, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenBayou(BOPConfigurationIDs.bayouID).setBiomeName("Bayou"), TemperatureType.MILD, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenBog(BOPConfigurationIDs.bogID).setBiomeName("Bog"), TemperatureType.MILD, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenBorealForest(BOPConfigurationIDs.borealForestID).setBiomeName("Boreal Forest"), TemperatureType.MILD, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenBrushland(BOPConfigurationIDs.brushlandID).setBiomeName("Brushland"), TemperatureType.HOT, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenCanyon(BOPConfigurationIDs.canyonID).setBiomeName("Canyon"), TemperatureType.HOT, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenChaparral(BOPConfigurationIDs.chaparralID).setBiomeName("Chaparral"), TemperatureType.WARM, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenCherryBlossomGrove(BOPConfigurationIDs.cherryBlossomGroveID).setBiomeName("Cherry Blossom Grove"), TemperatureType.COOL, 25)); + registerBiome(new BOPBiomeEntry(new BiomeGenCherryBlossomGrove(BOPConfigurationIDs.cherryBlossomGroveID).setBiomeName("Cherry Blossom Grove"), TemperatureType.MILD, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenConiferousForest(BOPConfigurationIDs.coniferousForestID).setBiomeName("Coniferous Forest"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenConiferousForestSnow(BOPConfigurationIDs.coniferousForestSnowID).setBiomeName("Snowy Coniferous Forest"), TemperatureType.ICY, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenCrag(BOPConfigurationIDs.cragID).setBiomeName("Crag"), TemperatureType.COOL, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenDeadForest(BOPConfigurationIDs.deadForestID).setBiomeName("Dead Forest"), TemperatureType.COOL, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenDeadSwamp(BOPConfigurationIDs.deadSwampID).setBiomeName("Dead Swamp"), TemperatureType.WARM, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenDeciduousForest(BOPConfigurationIDs.deciduousForestID).setBiomeName("Deciduous Forest"), TemperatureType.WARM, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenDeadSwamp(BOPConfigurationIDs.deadSwampID).setBiomeName("Dead Swamp"), TemperatureType.MILD, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenDeciduousForest(BOPConfigurationIDs.deciduousForestID).setBiomeName("Deciduous Forest"), TemperatureType.MILD, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenDunes(BOPConfigurationIDs.dunesID).setBiomeName("Dunes"), TemperatureType.HOT, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenFen(BOPConfigurationIDs.fenID).setBiomeName("Fen"), TemperatureType.WARM, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenFen(BOPConfigurationIDs.fenID).setBiomeName("Fen"), TemperatureType.MILD, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenFlowerField(BOPConfigurationIDs.flowerFieldID).setBiomeName("Flower Field"), TemperatureType.WARM, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenFrostForest(BOPConfigurationIDs.frostForestID).setBiomeName("Frost Forest"), TemperatureType.ICY, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenGrassland(BOPConfigurationIDs.grasslandID).setBiomeName("Grassland"), TemperatureType.COOL, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenGrassland(BOPConfigurationIDs.grasslandID).setBiomeName("Grassland"), TemperatureType.MILD, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenGrove(BOPConfigurationIDs.groveID).setBiomeName("Grove"), TemperatureType.COOL, 25)); - registerBiome(new BOPBiomeEntry(new BiomeGenHeathland(BOPConfigurationIDs.heathlandID).setBiomeName("Heathland"), TemperatureType.WARM, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenHighland(BOPConfigurationIDs.highlandID).setBiomeName("Highland"), TemperatureType.WARM, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenJadeCliffs(BOPConfigurationIDs.jadeCliffsID).setBiomeName("Jade Cliffs"), TemperatureType.WARM, 25)); - registerBiome(new BOPBiomeEntry(new BiomeGenLavenderFields(BOPConfigurationIDs.lavenderFieldsID).setBiomeName("Lavender Fields"), TemperatureType.WARM, 25)); + registerBiome(new BOPBiomeEntry(new BiomeGenHeathland(BOPConfigurationIDs.heathlandID).setBiomeName("Heathland"), TemperatureType.MILD, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenHighland(BOPConfigurationIDs.highlandID).setBiomeName("Highland"), TemperatureType.MILD, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenJadeCliffs(BOPConfigurationIDs.jadeCliffsID).setBiomeName("Jade Cliffs"), TemperatureType.MILD, 25)); + registerBiome(new BOPBiomeEntry(new BiomeGenLavenderFields(BOPConfigurationIDs.lavenderFieldsID).setBiomeName("Lavender Fields"), TemperatureType.MILD, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenLushDesert(BOPConfigurationIDs.lushDesertID).setBiomeName("Lush Desert"), TemperatureType.HOT, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenLushSwamp(BOPConfigurationIDs.lushSwampID).setBiomeName("Lush Swamp"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenMapleWoods(BOPConfigurationIDs.mapleWoodsID).setBiomeName("Maple Woods"), TemperatureType.COOL, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenMarsh(BOPConfigurationIDs.marshID).setBiomeName("Marsh"), TemperatureType.WARM, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenMeadow(BOPConfigurationIDs.meadowID).setBiomeName("Meadow"), TemperatureType.COOL, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenMoor(BOPConfigurationIDs.moorID).setBiomeName("Moor"), TemperatureType.COOL, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenMountain(BOPConfigurationIDs.mountainID).setBiomeName("Mountain"), TemperatureType.WARM, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenMysticGrove(BOPConfigurationIDs.mysticGroveID).setBiomeName("Mystic Grove"), TemperatureType.WARM, 15)); + registerBiome(new BOPBiomeEntry(new BiomeGenMeadow(BOPConfigurationIDs.meadowID).setBiomeName("Meadow"), TemperatureType.MILD, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenMoor(BOPConfigurationIDs.moorID).setBiomeName("Moor"), TemperatureType.MILD, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenMountain(BOPConfigurationIDs.mountainID).setBiomeName("Mountain"), TemperatureType.MILD, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenMysticGrove(BOPConfigurationIDs.mysticGroveID).setBiomeName("Mystic Grove"), TemperatureType.MILD, 15)); registerBiome(new BOPBiomeEntry(new BiomeGenOminousWoods(BOPConfigurationIDs.ominousWoodsID).setBiomeName("Ominous Woods"), TemperatureType.COOL, 15)); registerBiome(new BOPBiomeEntry(new BiomeGenOriginValley(BOPConfigurationIDs.originValleyID).setBiomeName("Origin Valley"), TemperatureType.WARM, 5)); registerBiome(new BOPBiomeEntry(new BiomeGenOutback(BOPConfigurationIDs.outbackID).setBiomeName("Outback"), TemperatureType.HOT, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenPasture(BOPConfigurationIDs.pastureID).setBiomeName("Pasture"), TemperatureType.WARM, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenPrairie(BOPConfigurationIDs.prairieID).setBiomeName("Prairie"), TemperatureType.WARM, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenQuagmire(BOPConfigurationIDs.quagmireID).setBiomeName("Quagmire"), TemperatureType.WARM, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenQuagmire(BOPConfigurationIDs.quagmireID).setBiomeName("Quagmire"), TemperatureType.MILD, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenRainforest(BOPConfigurationIDs.rainforestID).setBiomeName("Rainforest"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenRedwoodForest(BOPConfigurationIDs.redwoodForestID).setBiomeName("Redwood Forest"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenSacredSprings(BOPConfigurationIDs.sacredSpringsID).setBiomeName("Sacred Springs"), TemperatureType.WARM, 25)); - registerBiome(new BOPBiomeEntry(new BiomeGenSeasonalForest(BOPConfigurationIDs.seasonalForestID).setBiomeName("Seasonal Forest"), TemperatureType.COOL, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenSeasonalForest(BOPConfigurationIDs.seasonalForestID).setBiomeName("Seasonal Forest"), TemperatureType.MILD, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenShield(BOPConfigurationIDs.shieldID).setBiomeName("Shield"), TemperatureType.COOL, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenShrubland(BOPConfigurationIDs.shrublandID).setBiomeName("Shrubland"), TemperatureType.COOL, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenShrubland(BOPConfigurationIDs.shrublandID).setBiomeName("Shrubland"), TemperatureType.MILD, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenSilkglades(BOPConfigurationIDs.silkgladesID).setBiomeName("Silkglades"), TemperatureType.COOL, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenSludgepit(BOPConfigurationIDs.sludgepitID).setBiomeName("Sludgepit"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenSpruceWoods(BOPConfigurationIDs.spruceWoodsID).setBiomeName("Spruce Woods"), TemperatureType.WARM, 50)); @@ -116,7 +120,7 @@ public class BOPBiomes registerBiome(new BOPBiomeEntry(new BiomeGenVolcano(BOPConfigurationIDs.volcanoID).setBiomeName("Volcano"), TemperatureType.HOT, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenWasteland(BOPConfigurationIDs.wastelandID).setBiomeName("Wasteland"), TemperatureType.HOT, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenWetland(BOPConfigurationIDs.wetlandID).setBiomeName("Wetland"), TemperatureType.WARM, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenWoodland(BOPConfigurationIDs.woodlandID).setBiomeName("Woodland"), TemperatureType.WARM, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenWoodland(BOPConfigurationIDs.woodlandID).setBiomeName("Woodland"), TemperatureType.MILD, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenBloodyHeap(BOPConfigurationIDs.netherBloodyHeapID).setBiomeName("Bloody Heap"), 50), -1); } diff --git a/src/main/java/biomesoplenty/common/world/decoration/BOPWorldFeatures.java b/src/main/java/biomesoplenty/common/world/decoration/BOPWorldFeatures.java index 4caffe855..21e5772ea 100644 --- a/src/main/java/biomesoplenty/common/world/decoration/BOPWorldFeatures.java +++ b/src/main/java/biomesoplenty/common/world/decoration/BOPWorldFeatures.java @@ -32,8 +32,8 @@ public class BOPWorldFeatures addFeature("generateAsh", false); addFeature("generateMelons", false); - addFeature("waterPoolsPerChunk", 0); - addFeature("lavaPoolsPerChunk", 0); + addFeature("waterPoolsPerChunk", 50); + addFeature("lavaPoolsPerChunk", 20); addFeature("waterLakesPerChunk", 0); addFeature("lavaLakesPerChunk", 0); diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java index db21e4b84..710f5ee4b 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java @@ -1,5 +1,6 @@ package biomesoplenty.common.world.layer; +import biomesoplenty.api.BOPBiomeHelper; import biomesoplenty.api.BOPBiomeHelper.BOPBiomeEntry; import biomesoplenty.common.configuration.BOPConfigurationBiomeGen; import net.minecraft.util.WeightedRandom; @@ -18,6 +19,7 @@ public class GenLayerBiomeBOP extends GenLayerBiome { public static List desertBiomes = new ArrayList(); public static List warmBiomes = new ArrayList(); + public static List mildBiomes = new ArrayList(); public static List coldBiomes = new ArrayList(); public static List icyBiomes = new ArrayList(); @@ -81,6 +83,17 @@ public class GenLayerBiomeBOP extends GenLayerBiome } } else if (biomeID == 3) + { + if (l1 > 0 && BOPConfigurationBiomeGen.shrublandGen) + { + aint1[j1 + i1 * par3] = BOPBiomeHelper.get("shrubland").biomeID; + } + else + { + aint1[j1 + i1 * par3] = getRandomBiome(mildBiomes).biome.biomeID; + } + } + else if (biomeID == 4) { if (l1 > 0 && BOPConfigurationBiomeGen.megaTaigaGen) { @@ -91,7 +104,7 @@ public class GenLayerBiomeBOP extends GenLayerBiome aint1[j1 + i1 * par3] = getRandomBiome(coldBiomes).biome.biomeID; } } - else if (biomeID == 4) + else if (biomeID == 5) { aint1[j1 + i1 * par3] = getRandomBiome(icyBiomes).biome.biomeID; }