From e694be127628bf1443e289e1290dd41b32f5f324 Mon Sep 17 00:00:00 2001 From: Forstride Date: Fri, 5 Feb 2016 16:59:03 -0500 Subject: [PATCH] Tweaked the Wisteria Meadow biome --- .../biome/overworld/BiomeGenTundra.java | 1 + .../overworld/BiomeGenWisteriaMeadow.java | 25 +++++++++++------- .../feature/tree/GeneratorBasicTree.java | 6 ++--- .../textures/blocks/wisteria.png | Bin 367 -> 332 bytes .../textures/blocks/wisteria_bottom.png | Bin 318 -> 290 bytes 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java index 72e963934..d26b46ddb 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java @@ -42,6 +42,7 @@ public class BiomeGenTundra extends BOPBiome this.canGenerateRivers = false; this.canSpawnInBiome = false; + this.canGenerateVillages = true; this.spawnableCreatureList.clear(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWisteriaMeadow.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWisteriaMeadow.java index 8232a9262..47c9eaaaa 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWisteriaMeadow.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWisteriaMeadow.java @@ -20,6 +20,8 @@ import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; +import biomesoplenty.common.enums.BOPTrees; +import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorDoubleFlora; @@ -39,17 +41,19 @@ public class BiomeGenWisteriaMeadow extends BOPBiome this.terrainSettings.avgHeight(64).heightVariation(5, 5).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D); this.setColor(11569864); - this.setTemperatureRainfall(0.8F, 0.4F); + this.setTemperatureRainfall(0.5F, 0.7F); this.addWeight(BOPClimates.COOL_TEMPERATE, 2); + this.canGenerateVillages = false; + this.spawnableCreatureList.add(new SpawnListEntry(EntityButterfly.class, 6, 2, 4)); //trees - this.addGenerator("trees", GeneratorStage.TREE, (new GeneratorBasicTree.Builder()).amountPerChunk(1.0F).minHeight(6).maxHeight(10).hanging(BlockBOPPlant.paging.getVariantState(BOPPlants.WISTERIA)).maxLeavesRadius(2).hangingChance(0.75F).create()); + this.addGenerator("trees", GeneratorStage.TREE, (new GeneratorBasicTree.Builder()).amountPerChunk(12.0F).minHeight(9).maxHeight(14).hanging(BlockBOPPlant.paging.getVariantState(BOPPlants.WISTERIA)).log(BOPWoods.JACARANDA).leaves(BOPTrees.JACARANDA).maxLeavesRadius(2).hangingChance(0.75F).create()); // grasses - GeneratorWeighted grassGenerator = new GeneratorWeighted(5.0F); + GeneratorWeighted grassGenerator = new GeneratorWeighted(8.0F); this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator); grassGenerator.add("shortgrass", 1, (new GeneratorGrass.Builder()).with(BOPPlants.SHORTGRASS).create()); grassGenerator.add("mediumgrass", 1, (new GeneratorGrass.Builder()).with(BOPPlants.MEDIUMGRASS).create()); @@ -58,13 +62,16 @@ public class BiomeGenWisteriaMeadow extends BOPBiome grassGenerator.add("tallgrass", 2, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create()); // flowers - GeneratorWeighted flowerGenerator = new GeneratorWeighted(25.0F); + GeneratorWeighted flowerGenerator = new GeneratorWeighted(30.0F); this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); - flowerGenerator.add("clover", 1, (new GeneratorFlora.Builder().with(BOPFlowers.CLOVER).create())); - flowerGenerator.add("white_anemones", 1, (new GeneratorFlora.Builder().with(BOPFlowers.WHITE_ANEMONE).create())); - flowerGenerator.add("houstonia", 2, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.HOUSTONIA).create())); - flowerGenerator.add("oxeye_daisy", 2, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.OXEYE_DAISY).create())); - + flowerGenerator.add("clover", 5, (new GeneratorFlora.Builder().with(BOPFlowers.CLOVER).create())); + flowerGenerator.add("white_anemones", 5, (new GeneratorFlora.Builder().with(BOPFlowers.WHITE_ANEMONE).create())); + flowerGenerator.add("houstonia", 6, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.HOUSTONIA).create())); + flowerGenerator.add("oxeye_daisy", 6, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.OXEYE_DAISY).create())); + flowerGenerator.add("syringa", 1, (new GeneratorDoubleFlora.Builder().with(BlockDoublePlant.EnumPlantType.SYRINGA).create())); + flowerGenerator.add("allium", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.ALLIUM).create())); + flowerGenerator.add("paeonias", 1, (new GeneratorDoubleFlora.Builder()).with(BlockDoublePlant.EnumPlantType.PAEONIA).create()); + // gem this.addGenerator("peridot", GeneratorStage.SAND, (new GeneratorOreSingle.Builder()).amountPerChunk(12).with(BOPGems.PERIDOT).create()); diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBasicTree.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBasicTree.java index 1ddb4f263..e13e9e42b 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBasicTree.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBasicTree.java @@ -286,13 +286,13 @@ public class GeneratorBasicTree extends GeneratorTreeBase //Generate below the bottom layer of leaves int y = start.getY() + (height - this.leafLayers); - for (int x = start.getX() - maxLeavesRadius; x <= start.getX() + maxLeavesRadius; x++) + for (int x = start.getX() - (maxLeavesRadius + 1); x <= start.getX() + (maxLeavesRadius + 1); x++) { - for (int z = start.getZ() - maxLeavesRadius; z <= start.getZ() + maxLeavesRadius; z++) + for (int z = start.getZ() - (maxLeavesRadius + 1); z <= start.getZ() + (maxLeavesRadius + 1); z++) { BlockPos hangingPos = new BlockPos(x, y, z); - if (!world.isAirBlock(hangingPos.up()) && world.rand.nextFloat() <= this.hangingChance) + if (!world.isAirBlock(hangingPos.up()) && (world.isAirBlock(hangingPos)) && world.rand.nextFloat() <= this.hangingChance) { this.setHanging(world, hangingPos); } diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/wisteria.png b/src/main/resources/assets/biomesoplenty/textures/blocks/wisteria.png index d12c0a44cc4c12edba71e0f82b799869f07aa16b..8aedbaa6c954ac544c52edc1da0179800a6ebf2e 100644 GIT binary patch delta 245 zcmV+!DX&JdA!q%L4j$B zCb?DV*29KC=a}gSWz1*xuv!n}n*}NK+r8gRPz8!i0~u7uuV)rWYEFY8i`7!EKL8kD zEpZ2y^c&wSFyNlX-1W&bs{n#mc!PYZoVW8<;0|cV0NlGqrUGg3#vtVL`FNHEnlu76 vILj~o|A`&>0!tz&)&;(XnMHDz9s47|Ka*>(O00000NkvXXu0mjfT_9-hD?(}YH$uAqXm~4L1qOGh1Z;1U4f5( zCz$0BQWH5)4N)HmnojkEk*5Z`AzYDwoUGZk?PZOITpMUoV9n`pU^tCv%>4=w2&fgq zkB=rtrtTX+NNVt|n)kTX0J2R&Oix2{;LQLcO@wcw#vZs2$UxxZfjP+@c=rv)K!_;+ f2d@9m^YR4}VxuEL^LB{<0000pX#y!l z@W?Z7nsFG3k(`r{L&{@hSbNuo77;@}>mKlWyyLlShZK#fcGOlHp)&JqRUeui%EP&T zUNXLb0gQ&J=c}dxhVY(4>9fF{IZsr6{xWp%mq>3+|Yq6lER|?F)G!_X~DqnkoPQ002ovPDHLk FV1gVhSfl^| delta 231 zcmVqB0BpD%?zKPd z=4SG&K|4&O=yu*-;2@9>20#%b&-IElF}4PvNe*Vs_bev4RihkA27yNKeEz}V&Sa5N zByPnB6Y_Nr3-Q#PI%EI<002ovPDHLkV1gU*Vs`)l