From 68f4208d88625b0d02a6249868d841b42fdc95a7 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Tue, 19 Jan 2016 23:14:30 -0500 Subject: [PATCH] Added pixies to the Mystic Grove, and ocelots to more tropical biomes --- .../common/biome/overworld/BiomeGenBambooForest.java | 4 ++++ .../common/biome/overworld/BiomeGenCherryBlossomGrove.java | 2 +- .../common/biome/overworld/BiomeGenEucalyptusForest.java | 4 ++++ .../common/biome/overworld/BiomeGenMysticGrove.java | 3 +++ .../common/biome/overworld/BiomeGenQuagmire.java | 2 +- .../common/biome/overworld/BiomeGenSacredSprings.java | 4 ++++ 6 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java index 540fa3819..4a78a7b01 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java @@ -14,9 +14,11 @@ import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockTallGrass; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.chunk.ChunkPrimer; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -60,6 +62,8 @@ public class BiomeGenBambooForest extends BOPBiome this.addWeight(BOPClimates.TROPICAL, 5); + this.spawnableCreatureList.add(new SpawnListEntry(EntityOcelot.class, 2, 1, 1)); + this.topBlock = Blocks.dirt.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.PODZOL); this.usualTopBlock = this.topBlock; this.alternateTopBlock = Blocks.grass.getDefaultState(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java index 4f2badd3f..247ae5063 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java @@ -42,7 +42,7 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome this.canGenerateVillages = false; - this.addWeight(BOPClimates.COOL_TEMPERATE, 3); + this.addWeight(BOPClimates.COOL_TEMPERATE, 2); // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(6.0F); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java index 14bd81af1..179437ac6 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java @@ -10,7 +10,9 @@ package biomesoplenty.common.biome.overworld; import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.util.BlockPos; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -40,6 +42,8 @@ public class BiomeGenEucalyptusForest extends BOPBiome this.addWeight(BOPClimates.WET_TEMPERATE, 3); this.addWeight(BOPClimates.TROPICAL, 5); + + this.spawnableCreatureList.add(new SpawnListEntry(EntityOcelot.class, 2, 1, 1)); // trees GeneratorWeighted treeGenerator = new GeneratorWeighted(5); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java index 909432899..e2f385991 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java @@ -22,6 +22,7 @@ import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.block.BlockBOPMushroom; +import biomesoplenty.common.entities.EntityPixie; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; @@ -59,6 +60,8 @@ public class BiomeGenMysticGrove extends BOPBiome this.spawnableWaterCreatureList.clear(); this.spawnableMonsterList.add(new SpawnListEntry(EntityWitch.class, 10, 4, 4)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityPixie.class, 4, 1, 1)); + // lakes this.addGenerator("poison_lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(0.1F).waterLakeForBiome(this).liquid(BOPBlocks.poison).frozenLiquid((IBlockState)null).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java index 832fcbf25..f34fd2eb0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java @@ -50,7 +50,7 @@ public class BiomeGenQuagmire extends BOPBiome this.canGenerateRivers = false; this.canGenerateVillages = false; - this.addWeight(BOPClimates.COLD_SWAMP, 5); + this.addWeight(BOPClimates.COLD_SWAMP, 3); this.spawnableWaterCreatureList.clear(); this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java index e21c70e8e..d9052b9e3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java @@ -20,7 +20,9 @@ import biomesoplenty.common.world.feature.tree.GeneratorBush; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockTallGrass; import net.minecraft.block.BlockFlower.EnumFlowerType; +import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.util.BlockPos; +import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; public class BiomeGenSacredSprings extends BOPBiome { @@ -37,6 +39,8 @@ public class BiomeGenSacredSprings extends BOPBiome this.addWeight(BOPClimates.TROPICAL, 2); + this.spawnableCreatureList.add(new SpawnListEntry(EntityOcelot.class, 2, 1, 1)); + // trees this.addGenerator("sacred_oak_trees", GeneratorStage.POST, (new GeneratorBigTree.Builder()).amountPerChunk(0.2F).log(BOPWoods.SACRED_OAK).leaves(BOPTrees.SACRED_OAK).minHeight(35).maxHeight(40).trunkWidth(2).foliageDensity(2.0D).create()); this.addGenerator("leaves_clusters", GeneratorStage.TREE, (new GeneratorBush.Builder()).amountPerChunk(12.5F).maxHeight(2).create());