From 50497c6c982e3a28affb407470f3500d772542d3 Mon Sep 17 00:00:00 2001 From: Forstride Date: Mon, 8 Feb 2016 20:26:33 -0500 Subject: [PATCH] Changed beach types for certain biomes --- .../biomesoplenty/common/biome/overworld/BiomeGenAlps.java | 2 ++ .../biomesoplenty/common/biome/overworld/BiomeGenBayou.java | 2 ++ .../biomesoplenty/common/biome/overworld/BiomeGenBog.java | 6 ++++++ .../common/biome/overworld/BiomeGenBorealForest.java | 6 ++++++ .../common/biome/overworld/BiomeGenCanyon.java | 2 ++ .../common/biome/overworld/BiomeGenConiferousForest.java | 6 ++++++ .../common/biome/overworld/BiomeGenCoralReef.java | 3 +++ .../biomesoplenty/common/biome/overworld/BiomeGenCrag.java | 2 ++ .../common/biome/overworld/BiomeGenDeadForest.java | 6 ++++++ .../common/biome/overworld/BiomeGenDeadSwamp.java | 2 ++ .../biomesoplenty/common/biome/overworld/BiomeGenFen.java | 6 ++++++ .../common/biome/overworld/BiomeGenFungiForest.java | 2 ++ .../common/biome/overworld/BiomeGenGrassland.java | 1 + .../common/biome/overworld/BiomeGenHighland.java | 3 +++ .../common/biome/overworld/BiomeGenKelpForest.java | 3 +++ .../common/biome/overworld/BiomeGenLandOfLakes.java | 6 ++++++ .../common/biome/overworld/BiomeGenLushSwamp.java | 2 ++ .../common/biome/overworld/BiomeGenMapleWoods.java | 6 ++++++ .../biomesoplenty/common/biome/overworld/BiomeGenMarsh.java | 2 ++ .../common/biome/overworld/BiomeGenMeadow.java | 6 ++++++ .../biomesoplenty/common/biome/overworld/BiomeGenMoor.java | 3 +++ .../common/biome/overworld/BiomeGenMountain.java | 2 ++ .../common/biome/overworld/BiomeGenMysticGrove.java | 2 ++ .../common/biome/overworld/BiomeGenOminousWoods.java | 2 ++ .../common/biome/overworld/BiomeGenOvergrownCliffs.java | 2 ++ .../common/biome/overworld/BiomeGenQuagmire.java | 2 ++ .../common/biome/overworld/BiomeGenRainforest.java | 2 ++ .../common/biome/overworld/BiomeGenSacredSprings.java | 2 ++ .../common/biome/overworld/BiomeGenSeasonalForest.java | 6 ++++++ .../common/biome/overworld/BiomeGenShield.java | 6 ++++++ .../common/biome/overworld/BiomeGenShrubland.java | 6 ++++++ .../common/biome/overworld/BiomeGenSteppe.java | 6 ++++++ .../common/biome/overworld/BiomeGenTemperateRainforest.java | 6 ++++++ .../common/biome/overworld/BiomeGenTundra.java | 6 ++++++ .../common/biome/overworld/BiomeGenWasteland.java | 2 ++ .../common/biome/overworld/BiomeGenWetland.java | 2 ++ .../common/biome/overworld/BiomeGenWoodland.java | 6 ++++++ 37 files changed, 137 insertions(+) diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java index 76c08f347..4d627d944 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java @@ -36,6 +36,8 @@ public class BiomeGenAlps extends BOPBiome this.addWeight(BOPClimates.TUNDRA, 3); this.addWeight(BOPClimates.ICE_CAP, 5); + this.beachBiomeId = this.biomeID; + this.topBlock = Blocks.snow.getDefaultState(); this.fillerBlock = Blocks.snow.getDefaultState(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java index 68473a1ea..0fdfee74a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java @@ -59,6 +59,8 @@ public class BiomeGenBayou extends BOPBiome this.canSpawnInBiome = false; this.canGenerateRivers = false; this.canGenerateVillages = false; + + this.beachBiomeId = this.biomeID; this.addWeight(BOPClimates.HOT_SWAMP, 10); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java index 24ebaa072..805ca23df 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java @@ -18,6 +18,7 @@ import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; @@ -58,6 +59,11 @@ public class BiomeGenBog extends BOPBiome this.canGenerateRivers = false; this.canGenerateVillages = false; + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } + this.addWeight(BOPClimates.COLD_SWAMP, 7); this.spawnableWaterCreatureList.clear(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java index 18fd2d054..e9896ea53 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java @@ -8,6 +8,7 @@ import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.common.block.BlockBOPDoublePlant; @@ -39,6 +40,11 @@ public class BiomeGenBorealForest extends BOPBiome this.canGenerateVillages = false; + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } + this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4)); // sand and gravel diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCanyon.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCanyon.java index 12d82b4c1..e17677470 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCanyon.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCanyon.java @@ -49,6 +49,8 @@ public class BiomeGenCanyon extends BOPBiome this.canSpawnInBiome = false; this.canGenerateVillages = false; + + this.beachBiomeId = this.biomeID; this.spawnableCreatureList.clear(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java index 8aae40ffa..7e91b2b75 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java @@ -6,6 +6,7 @@ import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; @@ -43,6 +44,11 @@ public class BiomeGenConiferousForest extends BOPBiome this.setTemperatureRainfall(0.45F, 0.5F); this.canGenerateVillages = false; + + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } this.addWeight(BOPClimates.BOREAL, 10); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java index 8bec6ec12..b50b01313 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java @@ -20,6 +20,7 @@ import biomesoplenty.common.world.feature.GeneratorColumns; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorOreSingle; import net.minecraft.init.Blocks; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeGenCoralReef extends BOPBiome { @@ -34,6 +35,8 @@ public class BiomeGenCoralReef extends BOPBiome this.canGenerateVillages = false; this.canGenerateRivers = false; + this.beachBiomeId = BiomeGenBase.ocean.biomeID; + clearWeights(); // coral diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java index 07e337157..8fc174337 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java @@ -30,6 +30,8 @@ public class BiomeGenCrag extends BOPBiome this.canGenerateVillages = false; this.canGenerateRivers = false; + this.beachBiomeId = this.biomeID; + this.addWeight(BOPClimates.COLD_SWAMP, 1); this.spawnableCreatureList.clear(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java index dadb0fe0b..b2bf4e228 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java @@ -12,6 +12,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; @@ -44,6 +45,11 @@ public class BiomeGenDeadForest extends BOPBiome this.canSpawnInBiome = false; this.canGenerateVillages = false; + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } + this.setColor(0xBCA165); this.setTemperatureRainfall(0.3F, 0.3F); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java index c6fea4802..eb5e59169 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java @@ -59,6 +59,8 @@ public class BiomeGenDeadSwamp extends BOPBiome this.canGenerateRivers = false; this.canGenerateVillages = false; + this.beachBiomeId = this.biomeID; + this.addWeight(BOPClimates.COLD_SWAMP, 3); this.spawnableCreatureList.clear(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java index 14edeae75..cd6ca2b10 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java @@ -16,6 +16,7 @@ import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; @@ -63,6 +64,11 @@ public class BiomeGenFen extends BOPBiome this.canGenerateRivers = false; this.canGenerateVillages = false; + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } + this.addWeight(BOPClimates.COLD_SWAMP, 7); this.spawnableCreatureList.add(new SpawnListEntry(EntitySnail.class, 8, 1, 2)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFungiForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFungiForest.java index 2e59a039d..427c7c2e3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFungiForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFungiForest.java @@ -56,6 +56,8 @@ public class BiomeGenFungiForest extends BOPBiome this.canSpawnInBiome = false; this.canGenerateVillages = false; + + this.beachBiomeId = this.biomeID; this.addWeight(BOPClimates.TROPICAL, 1); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java index ac94ee08a..833886be4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java @@ -13,6 +13,7 @@ import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BlockQueries; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java index 0878b94df..32c753204 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java @@ -11,6 +11,7 @@ package biomesoplenty.common.biome.overworld; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; +import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -40,6 +41,8 @@ public class BiomeGenHighland extends BOPBiome this.addWeight(BOPClimates.COOL_TEMPERATE, 7); + this.beachBiomeId = BiomeGenBase.stoneBeach.biomeID; + // boulders this.addGenerator("boulders", GeneratorStage.SAND, (new GeneratorBlobs.Builder()).amountPerChunk(0.5F).placeOn(Blocks.grass).with(Blocks.cobblestone.getDefaultState()).minRadius(0.3F).maxRadius(1.2F).numBalls(1).scatterYMethod(ScatterYMethod.AT_SURFACE).create()); this.addGenerator("big_boulders", GeneratorStage.SAND, (new GeneratorBlobs.Builder()).amountPerChunk(0.1F).placeOn(Blocks.grass).with(Blocks.cobblestone.getDefaultState()).minRadius(0.3F).maxRadius(4.0F).numBalls(3).scatterYMethod(ScatterYMethod.AT_SURFACE).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenKelpForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenKelpForest.java index 0e61055f2..b9ea9a47d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenKelpForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenKelpForest.java @@ -20,6 +20,7 @@ import biomesoplenty.common.world.feature.GeneratorColumns; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorOreSingle; import net.minecraft.init.Blocks; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeGenKelpForest extends BOPBiome { @@ -34,6 +35,8 @@ public class BiomeGenKelpForest extends BOPBiome this.canGenerateVillages = false; this.canGenerateRivers = false; + this.beachBiomeId = BiomeGenBase.ocean.biomeID; + clearWeights(); // algae diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java index 3ba2bb036..8da6e210c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java @@ -16,6 +16,7 @@ import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; @@ -63,6 +64,11 @@ public class BiomeGenLandOfLakes extends BOPBiome this.addWeight(BOPClimates.COLD_SWAMP, 3); + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } + this.spawnableWaterCreatureList.clear(); this.spawnableCreatureList.add(new SpawnListEntry(EntitySnail.class, 8, 1, 2)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java index c691df9dc..248a15c84 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java @@ -64,6 +64,8 @@ public class BiomeGenLushSwamp extends BOPBiome this.canGenerateRivers = false; this.canGenerateVillages = false; + this.beachBiomeId = this.biomeID; + this.addWeight(BOPClimates.WET_TEMPERATE, 10); this.spawnableWaterCreatureList.clear(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java index ca3e0f0f7..f3cf8ff12 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java @@ -8,6 +8,7 @@ import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.common.block.BlockBOPDoublePlant; @@ -40,6 +41,11 @@ public class BiomeGenMapleWoods extends BOPBiome this.canGenerateVillages = false; + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } + this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4)); // sand and gravel diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java index 1d52fa2f8..439291525 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java @@ -56,6 +56,8 @@ public class BiomeGenMarsh extends BOPBiome this.canGenerateRivers = false; this.canGenerateVillages = false; + this.beachBiomeId = this.biomeID; + this.addWeight(BOPClimates.WET_TEMPERATE, 7); this.spawnableCreatureList.clear(); // none of your regular farmyard critters here diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java index 63db9ad7c..6dd111f06 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java @@ -7,6 +7,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; @@ -44,6 +45,11 @@ public class BiomeGenMeadow extends BOPBiome this.canGenerateVillages = true; + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } + this.spawnableCreatureList.add(new SpawnListEntry(EntitySnail.class, 6, 1, 2)); this.spawnableCreatureList.add(new SpawnListEntry(EntityButterfly.class, 6, 2, 4)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java index 5bdc03e62..c7a988419 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java @@ -11,6 +11,7 @@ package biomesoplenty.common.biome.overworld; import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; +import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -48,6 +49,8 @@ public class BiomeGenMoor extends BOPBiome this.canSpawnInBiome = false; this.canGenerateVillages = false; + this.beachBiomeId = BiomeGenBase.stoneBeach.biomeID; + this.addWeight(BOPClimates.COLD_SWAMP, 5); this.spawnableWaterCreatureList.clear(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java index 5943bff39..ac654715b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java @@ -80,6 +80,8 @@ public class BiomeGenMountain extends BOPBiome this.setColor(0x80A355); this.setTemperatureRainfall(0.3F, 0.1F); + this.beachBiomeId = BiomeGenBase.stoneBeach.biomeID; + if (type == MountainType.PEAKS) { this.canGenerateVillages = false; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java index 19c644d87..77366fb45 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java @@ -59,6 +59,8 @@ public class BiomeGenMysticGrove extends BOPBiome this.canGenerateVillages = false; this.canSpawnInBiome = false; + this.beachBiomeId = this.biomeID; + this.addWeight(BOPClimates.WET_TEMPERATE, 1); this.spawnableCreatureList.clear(); // none of your regular farmyard critters here diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java index 03010c709..333032eda 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java @@ -69,6 +69,8 @@ public class BiomeGenOminousWoods extends BOPBiome this.canGenerateVillages = false; this.canSpawnInBiome = false; + this.beachBiomeId = this.biomeID; + this.addWeight(BOPClimates.COLD_SWAMP, 1); this.spawnableCreatureList.clear(); // none of your regular farmyard critters here diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java index ffbb05fe4..333a6e2d9 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java @@ -46,6 +46,8 @@ public class BiomeGenOvergrownCliffs extends BOPBiome this.canGenerateVillages = false; this.addWeight(BOPClimates.TROPICAL, 2); + + this.beachBiomeId = this.biomeID; this.spawnableCreatureList.clear(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java index bf6f6f973..4f6fca55b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java @@ -53,6 +53,8 @@ public class BiomeGenQuagmire extends BOPBiome this.canGenerateRivers = false; this.canGenerateVillages = false; + this.beachBiomeId = this.biomeID; + this.addWeight(BOPClimates.COLD_SWAMP, 2); this.spawnableCreatureList.clear(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java index 260fda605..a3c1c4f3a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java @@ -47,6 +47,8 @@ public class BiomeGenRainforest extends BOPBiome this.canGenerateVillages = false; this.canGenerateRivers = false; + this.beachBiomeId = this.biomeID; + this.spawnableMonsterList.add(new SpawnListEntry(EntityOcelot.class, 2, 1, 1)); this.spawnableCreatureList.add(new SpawnListEntry(EntityButterfly.class, 6, 2, 4)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java index e5cc84ed0..dc5d78845 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java @@ -45,6 +45,8 @@ public class BiomeGenSacredSprings extends BOPBiome this.canGenerateRivers = false; this.canGenerateVillages = false; + this.beachBiomeId = this.biomeID; + this.addWeight(BOPClimates.TROPICAL, 1); this.spawnableMonsterList.add(new SpawnListEntry(EntityOcelot.class, 2, 1, 1)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java index 4a0a57f2d..c5bad3c83 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java @@ -8,6 +8,7 @@ import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.common.block.BlockBOPDoublePlant; @@ -40,6 +41,11 @@ public class BiomeGenSeasonalForest extends BOPBiome this.canGenerateVillages = false; + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } + this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4)); this.spawnableCreatureList.add(new SpawnListEntry(EntitySnail.class, 6, 1, 2)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java index e686a939e..9e1eed441 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java @@ -22,6 +22,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; @@ -67,6 +68,11 @@ public class BiomeGenShield extends BOPBiome this.canGenerateVillages = false; + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } + this.addWeight(BOPClimates.BOREAL, 5); // gravel diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java index 015fb264b..0a6dfbfca 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java @@ -14,6 +14,7 @@ import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; @@ -48,6 +49,11 @@ public class BiomeGenShrubland extends BOPBiome this.canGenerateVillages = true; + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } + this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6)); this.spawnableCreatureList.add(new SpawnListEntry(EntityButterfly.class, 6, 2, 4)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java index e301de081..ebe618c63 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java @@ -18,6 +18,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; @@ -59,6 +60,11 @@ public class BiomeGenSteppe extends BOPBiome this.addWeight(BOPClimates.DRY_TEMPERATE, 5); + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } + this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6)); // should the Steppe not have some splattered gravel and coarse dirt? diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java index bcf07acaa..f45128ffd 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java @@ -10,6 +10,7 @@ import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; @@ -54,6 +55,11 @@ public class BiomeGenTemperateRainforest extends BOPBiome this.addWeight(BOPClimates.WET_TEMPERATE, 7); + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } + this.spawnableCreatureList.add(new SpawnListEntry(EntitySnail.class, 6, 1, 2)); // sand and gravel diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java index d26b46ddb..33e7177e1 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java @@ -12,6 +12,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.common.enums.BOPClimates; @@ -44,6 +45,11 @@ public class BiomeGenTundra extends BOPBiome this.canSpawnInBiome = false; this.canGenerateVillages = true; + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } + this.spawnableCreatureList.clear(); // boulders diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java index 10ab7a6b0..7dcb9f7ec 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java @@ -62,6 +62,8 @@ public class BiomeGenWasteland extends BOPBiome this.canGenerateVillages = false; this.canSpawnInBiome = false; + this.beachBiomeId = this.biomeID; + this.addWeight(BOPClimates.WASTELAND, 50); this.spawnableCreatureList.clear(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java index 2de36c4d3..c12da96fa 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java @@ -61,6 +61,8 @@ public class BiomeGenWetland extends BOPBiome this.canGenerateRivers = false; this.canGenerateVillages = false; + this.beachBiomeId = this.biomeID; + this.addWeight(BOPClimates.WET_TEMPERATE, 7); this.addWeight(BOPClimates.COLD_SWAMP, 5); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java index 568d86fa4..71e1efe9d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java @@ -15,6 +15,7 @@ import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.common.block.BlockBOPDoublePlant; @@ -52,6 +53,11 @@ public class BiomeGenWoodland extends BOPBiome this.addWeight(BOPClimates.WARM_TEMPERATE, 10); + if (BOPBiomes.gravel_beach.isPresent()) + { + this.beachBiomeId = BOPBiomes.gravel_beach.get().biomeID; + } + this.spawnableCreatureList.add(new SpawnListEntry(EntitySnail.class, 6, 1, 2)); this.spawnableCreatureList.add(new SpawnListEntry(EntityButterfly.class, 6, 2, 4));