diff --git a/src/main/java/biomesoplenty/common/biome/nether/BOPHellBiome.java b/src/main/java/biomesoplenty/common/biome/nether/BOPHellBiome.java index 161f71d7f..4fb0c7a9a 100644 --- a/src/main/java/biomesoplenty/common/biome/nether/BOPHellBiome.java +++ b/src/main/java/biomesoplenty/common/biome/nether/BOPHellBiome.java @@ -47,10 +47,10 @@ public class BOPHellBiome extends BOPBiome this.spawnableMonsterList.clear(); this.spawnableWaterCreatureList.clear(); - this.spawnableMonsterList.add(new Biome.SpawnListEntry(EntityGhast.class, 50, 4, 4)); - this.spawnableMonsterList.add(new Biome.SpawnListEntry(EntityPigZombie.class, 100, 4, 4)); - this.spawnableMonsterList.add(new Biome.SpawnListEntry(EntityMagmaCube.class, 2, 4, 4)); - this.spawnableMonsterList.add(new Biome.SpawnListEntry(EntityEnderman.class, 1, 4, 4)); + this.spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4)); + this.spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4)); + this.spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 2, 4, 4)); + this.spawnableMonsterList.add(new SpawnListEntry(EntityEnderman.class, 1, 4, 4)); this.addGenerator("hive", GeneratorStage.PRE, (new GeneratorHive.Builder()).amountPerChunk(0.2F).create()); } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java index 465422779..35c891f8f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java @@ -21,9 +21,11 @@ import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.biome.Biome; public class BiomeGenBorealForest extends BOPOverworldBiome { @@ -44,6 +46,7 @@ public class BiomeGenBorealForest extends BOPOverworldBiome } this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); // sand and gravel this.addGenerator("sand", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(3).maxRadius(7).with(Blocks.SAND.getDefaultState()).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java index 6fd3edac2..fc78fc6f7 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java @@ -22,8 +22,10 @@ import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.biome.Biome; public class BiomeGenBrushland extends BOPOverworldBiome { @@ -41,6 +43,8 @@ public class BiomeGenBrushland extends BOPOverworldBiome this.canGenerateVillages = true; + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); + //sand this.addGenerator("sand", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(4).maxRadius(7).with(Blocks.SAND.getDefaultState()).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java index 07de3c30c..a3311b52f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java @@ -35,10 +35,13 @@ import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.passive.EntityDonkey; import net.minecraft.entity.passive.EntityHorse; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.ChunkPrimer; public class BiomeGenChaparral extends BOPOverworldBiome @@ -63,6 +66,8 @@ public class BiomeGenChaparral extends BOPOverworldBiome this.alternateFillerBlock = Blocks.STONE.getDefaultState(); this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 1, 2, 6)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityDonkey.class, 1, 1, 1)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); this.canGenerateVillages = true; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java index dc8114e83..138e84bb0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java @@ -61,7 +61,7 @@ public class BiomeGenColdDesert extends BOPOverworldBiome this.addWeight(BOPClimates.ICE_CAP, 10); this.spawnableCreatureList.clear(); - this.spawnableCreatureList.add(new Biome.SpawnListEntry(EntityPolarBear.class, 1, 1, 2)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityPolarBear.class, 1, 1, 2)); // gravel, stone and boulders IBlockPosQuery surface = new BlockQueryBlock(Blocks.STONE, Blocks.GRAVEL); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java index bb5a11efb..24c020fe9 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java @@ -23,8 +23,10 @@ import biomesoplenty.common.world.generator.GeneratorWeighted; import biomesoplenty.common.world.generator.tree.GeneratorTaigaTree; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; +import net.minecraft.world.biome.Biome; public class BiomeGenConiferousForest extends BOPOverworldBiome { @@ -49,6 +51,7 @@ public class BiomeGenConiferousForest extends BOPOverworldBiome this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY); this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 8, 4, 4)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); // gravel this.addGenerator("gravel", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(4).maxRadius(7).with(Blocks.GRAVEL.getDefaultState()).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java index 8dfc771fa..b94141ef1 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java @@ -37,7 +37,7 @@ public class BiomeGenGlacier extends BOPOverworldBiome this.hasBiomeEssence = false; this.spawnableCreatureList.clear(); - this.spawnableCreatureList.add(new Biome.SpawnListEntry(EntityPolarBear.class, 1, 1, 2)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityPolarBear.class, 1, 1, 2)); clearWeights(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java index 05ba5d9fe..a856f778d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java @@ -26,9 +26,11 @@ import biomesoplenty.common.world.generator.GeneratorOreSingle; import biomesoplenty.common.world.generator.GeneratorWaterside; import biomesoplenty.common.world.generator.GeneratorWeighted; import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityDonkey; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.biome.Biome; public class BiomeGenGrassland extends BOPOverworldBiome { @@ -50,6 +52,7 @@ public class BiomeGenGrassland extends BOPOverworldBiome { this.canGenerateVillages = true; this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityDonkey.class, 1, 1, 1)); // lakes this.addGenerator("lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).waterLakeForBiome(this).amountPerChunk(0.2F).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java index ec3fe0171..c234b4db4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java @@ -34,7 +34,9 @@ import biomesoplenty.common.world.generator.tree.GeneratorTwigletTree; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.init.Blocks; +import net.minecraft.world.biome.Biome; public class BiomeGenLushDesert extends BOPOverworldBiome { @@ -53,6 +55,8 @@ public class BiomeGenLushDesert extends BOPOverworldBiome this.addWeight(BOPClimates.SAVANNA, 2); + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); + // trees IBlockPosQuery suitableTreePosition = BlockQuery.buildAnd().withAltitudeBetween(62, 68).states(this.topBlock).withAirAbove().create(); GeneratorWeighted treeGenerator = new GeneratorWeighted(4); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java index e986b4ec5..40c9fa24c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java @@ -18,8 +18,10 @@ import biomesoplenty.common.world.generator.tree.GeneratorTaigaTree; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; +import net.minecraft.world.biome.Biome; public class BiomeGenMapleWoods extends BOPOverworldBiome { @@ -40,6 +42,7 @@ public class BiomeGenMapleWoods extends BOPOverworldBiome } this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); // sand and gravel this.addGenerator("sand", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(3).maxRadius(7).with(Blocks.SAND.getDefaultState()).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java index a8c52645d..dd1957bf5 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java @@ -22,8 +22,10 @@ import biomesoplenty.common.world.generator.tree.GeneratorTaigaTree; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.biome.Biome; public class BiomeGenMeadow extends BOPOverworldBiome { @@ -44,6 +46,8 @@ public class BiomeGenMeadow extends BOPOverworldBiome this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation(); } + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); + // sand this.addGenerator("sand", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(3).maxRadius(7).with(Blocks.SAND.getDefaultState()).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java index 733101cc7..3282fc042 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java @@ -84,8 +84,8 @@ public class BiomeGenMountain extends BOPOverworldBiome // only sheep and wolves on the peaks this.spawnableCreatureList.clear(); - this.spawnableCreatureList.add(new Biome.SpawnListEntry(EntitySheep.class, 12, 4, 6)); - this.spawnableCreatureList.add(new Biome.SpawnListEntry(EntityWolf.class, 4, 4, 4)); + this.spawnableCreatureList.add(new SpawnListEntry(EntitySheep.class, 12, 4, 6)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 4, 4, 4)); this.spawnableCreatureList.add(new SpawnListEntry(EntityLlama.class, 5, 4, 6)); } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java index 8567e13a9..ea7118b31 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java @@ -39,8 +39,10 @@ import net.minecraft.block.BlockOldLeaf; import net.minecraft.block.BlockTallGrass; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.monster.EntityWitch; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.biome.Biome; public class BiomeGenMysticGrove extends BOPOverworldBiome { @@ -66,8 +68,9 @@ public class BiomeGenMysticGrove extends BOPOverworldBiome this.addWeight(BOPClimates.WET_TEMPERATE, 1); - this.spawnableCreatureList.clear(); // none of your regular farmyard critters here + this.spawnableCreatureList.clear(); this.spawnableWaterCreatureList.clear(); + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); this.spawnableMonsterList.add(new SpawnListEntry(EntityWitch.class, 10, 4, 4)); // hot springs diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java index 7ce7b47a3..356cafc23 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java @@ -35,8 +35,10 @@ import net.minecraft.block.BlockOldLeaf; import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.ChunkPrimer; public class BiomeGenOasis extends BOPOverworldBiome @@ -61,6 +63,8 @@ public class BiomeGenOasis extends BOPOverworldBiome this.usualTopBlock = this.topBlock; this.alternateTopBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SANDY); + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); + clearWeights(); // oases diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java index c7a3135de..3bb731c7c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java @@ -17,8 +17,10 @@ import biomesoplenty.common.world.generator.tree.GeneratorBasicTree; import biomesoplenty.common.world.generator.tree.GeneratorBigTree; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityDonkey; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.biome.Biome; public class BiomeGenOrchard extends BOPOverworldBiome { @@ -34,6 +36,7 @@ public class BiomeGenOrchard extends BOPOverworldBiome this.canGenerateVillages = true; this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 1, 2, 6)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityDonkey.class, 1, 1, 1)); // trees GeneratorWeighted treeGenerator = new GeneratorWeighted(5); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginBeach.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginBeach.java index 5a38a59bf..09d7844e8 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginBeach.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginBeach.java @@ -38,10 +38,10 @@ public class BiomeGenOriginBeach extends BOPOverworldBiome this.spawnableCaveCreatureList.clear(); this.spawnableMonsterList.clear(); this.spawnableCreatureList.clear(); - this.spawnableMonsterList.add(new Biome.SpawnListEntry(EntitySpider.class, 100, 4, 4)); - this.spawnableMonsterList.add(new Biome.SpawnListEntry(EntityZombie.class, 100, 4, 4)); - this.spawnableMonsterList.add(new Biome.SpawnListEntry(EntitySkeleton.class, 100, 4, 4)); - this.spawnableMonsterList.add(new Biome.SpawnListEntry(EntityCreeper.class, 100, 4, 4)); + this.spawnableMonsterList.add(new SpawnListEntry(EntitySpider.class, 100, 4, 4)); + this.spawnableMonsterList.add(new SpawnListEntry(EntityZombie.class, 100, 4, 4)); + this.spawnableMonsterList.add(new SpawnListEntry(EntitySkeleton.class, 100, 4, 4)); + this.spawnableMonsterList.add(new SpawnListEntry(EntityCreeper.class, 100, 4, 4)); this.decorator.treesPerChunk = -999; this.decorator.deadBushPerChunk = 0; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java index 117fa15fc..7b9d0e917 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java @@ -58,14 +58,14 @@ public class BiomeGenOriginIsland extends BOPOverworldBiome this.spawnableCaveCreatureList.clear(); this.spawnableMonsterList.clear(); this.spawnableCreatureList.clear(); - this.spawnableCreatureList.add(new Biome.SpawnListEntry(EntitySheep.class, 12, 4, 4)); - this.spawnableCreatureList.add(new Biome.SpawnListEntry(EntityPig.class, 10, 4, 4)); - this.spawnableCreatureList.add(new Biome.SpawnListEntry(EntityChicken.class, 10, 4, 4)); - this.spawnableCreatureList.add(new Biome.SpawnListEntry(EntityCow.class, 8, 4, 4)); - this.spawnableMonsterList.add(new Biome.SpawnListEntry(EntitySpider.class, 100, 4, 4)); - this.spawnableMonsterList.add(new Biome.SpawnListEntry(EntityZombie.class, 100, 4, 4)); - this.spawnableMonsterList.add(new Biome.SpawnListEntry(EntitySkeleton.class, 100, 4, 4)); - this.spawnableMonsterList.add(new Biome.SpawnListEntry(EntityCreeper.class, 100, 4, 4)); + this.spawnableCreatureList.add(new SpawnListEntry(EntitySheep.class, 12, 4, 4)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityPig.class, 10, 4, 4)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityChicken.class, 10, 4, 4)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityCow.class, 8, 4, 4)); + this.spawnableMonsterList.add(new SpawnListEntry(EntitySpider.class, 100, 4, 4)); + this.spawnableMonsterList.add(new SpawnListEntry(EntityZombie.class, 100, 4, 4)); + this.spawnableMonsterList.add(new SpawnListEntry(EntitySkeleton.class, 100, 4, 4)); + this.spawnableMonsterList.add(new SpawnListEntry(EntityCreeper.class, 100, 4, 4)); this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BOPGrassType.ORIGIN); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java index 1732c2a46..c2720e1c3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java @@ -27,7 +27,9 @@ import biomesoplenty.common.world.generator.tree.GeneratorTwigletTree; import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockSand; import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.init.Blocks; +import net.minecraft.world.biome.Biome; public class BiomeGenOutback extends BOPOverworldBiome { @@ -47,6 +49,7 @@ public class BiomeGenOutback extends BOPOverworldBiome this.spawnableCreatureList.clear(); this.spawnableWaterCreatureList.clear(); + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); // splatter top blocks IBlockPosQuery emptyRedSand = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java index d131bd7f9..f28d12ad3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java @@ -19,9 +19,11 @@ import biomesoplenty.common.world.generator.tree.GeneratorBigTree; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityDonkey; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.biome.Biome; public class BiomeGenPrairie extends BOPOverworldBiome { @@ -40,6 +42,7 @@ public class BiomeGenPrairie extends BOPOverworldBiome this.canGenerateVillages = true; this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 1, 2, 6)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityDonkey.class, 1, 1, 1)); // sand this.addGenerator("sand", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(3).maxRadius(7).with(Blocks.SAND.getDefaultState()).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java index 13777e0ff..25ed2ba04 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java @@ -23,9 +23,12 @@ import biomesoplenty.common.world.generator.GeneratorWeighted; import biomesoplenty.common.world.generator.tree.GeneratorBush; import net.minecraft.block.BlockFlower.EnumFlowerType; import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityDonkey; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityLlama; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.init.Blocks; +import net.minecraft.world.biome.Biome; public class BiomeGenShrubland extends BOPOverworldBiome { @@ -48,7 +51,9 @@ public class BiomeGenShrubland extends BOPOverworldBiome } this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityDonkey.class, 1, 1, 1)); this.spawnableCreatureList.add(new SpawnListEntry(EntityLlama.class, 5, 4, 6)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); // sand and gravel this.addGenerator("sand", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(3).maxRadius(7).with(Blocks.SAND.getDefaultState()).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java index ebeea5991..5fe94795b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java @@ -19,8 +19,10 @@ import biomesoplenty.common.world.generator.GeneratorWeighted; import biomesoplenty.common.world.generator.tree.GeneratorTaigaTree; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; +import net.minecraft.world.biome.Biome; public class BiomeGenSnowyConiferousForest extends BOPOverworldBiome { @@ -40,6 +42,7 @@ public class BiomeGenSnowyConiferousForest extends BOPOverworldBiome this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY); this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 8, 4, 4)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); // gravel this.addGenerator("gravel", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(4).maxRadius(7).with(Blocks.GRAVEL.getDefaultState()).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java index adc433a36..8a395ce73 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java @@ -25,7 +25,9 @@ import biomesoplenty.common.world.generator.GeneratorWeighted; import biomesoplenty.common.world.generator.tree.GeneratorBasicTree; import biomesoplenty.common.world.generator.tree.GeneratorBigTree; import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.biome.Biome; public class BiomeGenSnowyForest extends BOPOverworldBiome @@ -40,6 +42,8 @@ public class BiomeGenSnowyForest extends BOPOverworldBiome this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SILTY); this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SILTY); + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); + this.canGenerateVillages = false; this.addWeight(BOPClimates.TUNDRA, 7); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java index f265608b4..096fec473 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java @@ -26,11 +26,14 @@ import biomesoplenty.common.world.generator.GeneratorWaterside; import biomesoplenty.common.world.generator.GeneratorWeighted; import net.minecraft.block.BlockTallGrass; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.passive.EntityDonkey; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityLlama; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.ChunkPrimer; public class BiomeGenSteppe extends BOPOverworldBiome @@ -61,7 +64,9 @@ public class BiomeGenSteppe extends BOPOverworldBiome } this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityDonkey.class, 1, 1, 1)); this.spawnableCreatureList.add(new SpawnListEntry(EntityLlama.class, 5, 4, 6)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); // should the Steppe not have some splattered gravel and coarse dirt? diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java index 664c3d1f8..64bc72570 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java @@ -27,8 +27,10 @@ import biomesoplenty.common.world.generator.GeneratorWaterside; import biomesoplenty.common.world.generator.GeneratorWeighted; import biomesoplenty.common.world.generator.tree.GeneratorBush; import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.biome.Biome; public class BiomeGenTundra extends BOPOverworldBiome { @@ -54,6 +56,7 @@ public class BiomeGenTundra extends BOPOverworldBiome } this.spawnableCreatureList.clear(); + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); // boulders this.addGenerator("boulders", GeneratorStage.SAND, (new GeneratorBlobs.Builder()).amountPerChunk(0.5F).placeOn(Blocks.GRASS).with(Blocks.COBBLESTONE.getDefaultState()).minRadius(1.0F).maxRadius(3.0F).numBalls(3).scatterYMethod(ScatterYMethod.AT_SURFACE).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java index f01407ced..851fe237e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java @@ -27,9 +27,11 @@ import biomesoplenty.common.world.generator.tree.GeneratorTwigletTree; import net.minecraft.block.BlockPlanks; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.ChunkPrimer; public class BiomeGenXericShrubland extends BOPOverworldBiome @@ -55,6 +57,7 @@ public class BiomeGenXericShrubland extends BOPOverworldBiome this.addWeight(BOPClimates.HOT_DESERT, 3); this.spawnableCreatureList.clear(); + this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3)); // trees & logs GeneratorWeighted treeGenerator = new GeneratorWeighted(2.0F);