From 3d4037b5445578177d0702774a683914fecda04f Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sat, 4 May 2013 21:21:08 -0400 Subject: [PATCH] Made some changes to the Lush Desert --- src/minecraft/biomesoplenty/biomes/BiomeGenCanyon.java | 1 - src/minecraft/biomesoplenty/biomes/BiomeGenLushDesert.java | 7 ++++--- src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java | 6 +++--- src/minecraft/biomesoplenty/configuration/BOPBiomes.java | 2 +- src/minecraft/biomesoplenty/worldgen/WorldGenAcacia.java | 4 ++-- .../biomesoplenty/worldgen/WorldGenDeadTree3.java | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenCanyon.java b/src/minecraft/biomesoplenty/biomes/BiomeGenCanyon.java index 87e7ac83d..e217f2163 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenCanyon.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenCanyon.java @@ -24,7 +24,6 @@ public class BiomeGenCanyon extends BiomeGenBase this.fillerBlock = (byte)Blocks.hardDirt.get().blockID; this.customBiomeDecorator.treesPerChunk = 10; this.customBiomeDecorator.flowersPerChunk = -999; - this.customBiomeDecorator.tinyCactiPerChunk = 2; this.customBiomeDecorator.canyonGrassPerChunk = 5; this.customBiomeDecorator.yuccaPerChunk = 2; this.customBiomeDecorator.generatePumpkins = false; diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenLushDesert.java b/src/minecraft/biomesoplenty/biomes/BiomeGenLushDesert.java index 4acab95bd..ab3b1488b 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenLushDesert.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenLushDesert.java @@ -5,6 +5,7 @@ import java.util.Random; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.BOPBlocks; import biomesoplenty.worldgen.WorldGenAcacia; +import biomesoplenty.worldgen.WorldGenDeadTree3; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; @@ -21,7 +22,7 @@ public class BiomeGenLushDesert extends BiomeGenBase this.fillerBlock = (byte)Blocks.redRock.get().blockID; this.theBiomeDecorator = new BiomeDecoratorBOP(this); this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; - this.customBiomeDecorator.treesPerChunk = 8; + this.customBiomeDecorator.treesPerChunk = 12; this.customBiomeDecorator.grassPerChunk = 8; this.customBiomeDecorator.oasesPerChunk = 999; this.customBiomeDecorator.oasesPerChunk2 = 999; @@ -31,7 +32,7 @@ public class BiomeGenLushDesert extends BiomeGenBase this.customBiomeDecorator.desertCactiPerChunk = 10; this.customBiomeDecorator.cactiPerChunk = 20; this.customBiomeDecorator.tinyCactiPerChunk = 5; - this.customBiomeDecorator.yuccaPerChunk = 5; + this.customBiomeDecorator.yuccaPerChunk = 3; this.customBiomeDecorator.generateGrass = true; this.customBiomeDecorator.generateSand = true; this.customBiomeDecorator.generatePumpkins = false; @@ -42,6 +43,6 @@ public class BiomeGenLushDesert extends BiomeGenBase */ public WorldGenerator getRandomWorldGenForTrees(Random par1Random) { - return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenAcacia(false) : new WorldGenShrub(0, 0)); + return (WorldGenerator)(par1Random.nextInt(4) == 0 ? new WorldGenAcacia(false) : (par1Random.nextInt(12) == 0 ? new WorldGenDeadTree3(false) : (par1Random.nextInt(2) == 0 ? this.worldGeneratorTrees : new WorldGenShrub(0,0)))); } } diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java b/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java index d04bcce79..7bf91989f 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java @@ -105,7 +105,7 @@ public class BlockBOPFlower extends BlockFlower protected boolean canThisPlantGrowOnThisBlockID(int id) { - return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Block.sand.blockID || id == Blocks.hardDirt.get().blockID; + return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Block.sand.blockID || id == Blocks.hardDirt.get().blockID || id == Blocks.redRock.get().blockID; } protected boolean canThisPlantGrowOnThisBlockID(int id, int meta) @@ -116,7 +116,7 @@ public class BlockBOPFlower extends BlockFlower return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.mycelium.blockID; case 11: // Cactus - return id == Block.sand.blockID; + return id == Blocks.redRock.get().blockID || id == Block.sand.blockID; case 12: // Yucca return id == Blocks.hardDirt.get().blockID || id == Blocks.redRock.get().blockID || id == Block.sand.blockID; @@ -139,7 +139,7 @@ public class BlockBOPFlower extends BlockFlower return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.mycelium.blockID; case 11: // Cactus - return id == Block.sand.blockID; + return id == Blocks.redRock.get().blockID || id == Block.sand.blockID; case 12: // Yucca return id == Blocks.hardDirt.get().blockID || id == Blocks.redRock.get().blockID || id == Block.sand.blockID; diff --git a/src/minecraft/biomesoplenty/configuration/BOPBiomes.java b/src/minecraft/biomesoplenty/configuration/BOPBiomes.java index c3b05c6a3..a821b3708 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBiomes.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBiomes.java @@ -95,7 +95,7 @@ public class BOPBiomes { Biomes.iceSheet = Optional.of((new BiomeGenIceSheet(BOPConfiguration.iceSheetID)).setColor(6316128).setBiomeName("Ice Sheet").setEnableSnow().setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.0F, 0.0F)); Biomes.icyHills = Optional.of((new BiomeGenIcyHills(BOPConfiguration.icyHillsID)).setColor(14090235).setBiomeName("Icy Hills").setEnableSnow().setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(-0.2F, 0.5F)); Biomes.jadeCliffs = Optional.of((new BiomeGenJadeCliffs(BOPConfiguration.jadeCliffsID)).setColor(14090235).setBiomeName("Jade Cliffs").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(0.1F, 2.0F)); - Biomes.lushDesert = Optional.of((new BiomeGenLushDesert(BOPConfiguration.lushDesertID)).setColor(16421912).setBiomeName("Lush Desert").setTemperatureRainfall(0.8F, 0.3F).setMinMaxHeight(0.2F, 0.8F)); + Biomes.lushDesert = Optional.of((new BiomeGenLushDesert(BOPConfiguration.lushDesertID)).setColor(16421912).setBiomeName("Lush Desert").setTemperatureRainfall(0.8F, 0.2F).setMinMaxHeight(0.0F, 0.9F)); Biomes.lushSwamp = Optional.of((new BiomeGenLushSwamp(BOPConfiguration.lushSwampID)).setColor(522674).setBiomeName("Lush Swamp").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.7F, 1.0F)); Biomes.mangrove = Optional.of((new BiomeGenMangrove(BOPConfiguration.mangroveID)).setColor(16440917).setBiomeName("Mangrove").setMinMaxHeight(-0.4F, -0.1F).setTemperatureRainfall(0.8F, 0.9F)); Biomes.mapleWoods = Optional.of((new BiomeGenMapleWoods(BOPConfiguration.mapleWoodsID)).setColor(747097).setBiomeName("Maple Woods").func_76733_a(5159473).setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.1F, 0.6F)); diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenAcacia.java b/src/minecraft/biomesoplenty/worldgen/WorldGenAcacia.java index 8e43b964b..b6f040f24 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenAcacia.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenAcacia.java @@ -76,7 +76,7 @@ public class WorldGenAcacia extends WorldGenerator { var12 = par1World.getBlockId(var10, var8, var11); - if (var12 != 0 && var12 != Blocks.leavesColorized.get().blockID && var12 != Block.grass.blockID && var12 != Block.dirt.blockID && var12 != Blocks.logs1.get().blockID) + if (var12 != 0 && var12 != Blocks.leavesColorized.get().blockID && var12 != Block.grass.blockID && var12 != Blocks.redRock.get().blockID && var12 != Block.dirt.blockID && var12 != Blocks.logs1.get().blockID) { var7 = false; } @@ -97,7 +97,7 @@ public class WorldGenAcacia extends WorldGenerator { var8 = par1World.getBlockId(par3, par4 - 1, par5); - if ((var8 == Block.grass.blockID || var8 == Block.dirt.blockID) && par4 < 256 - var6 - 1) + if ((var8 == Block.grass.blockID || var8 == Block.dirt.blockID || var8 == Blocks.redRock.get().blockID) && par4 < 256 - var6 - 1) { this.setBlock(par1World, par3, par4 - 1, par5, Block.dirt.blockID); var9 = 2; diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree3.java b/src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree3.java index 93c88b677..2e84f32b5 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree3.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree3.java @@ -448,7 +448,7 @@ public class WorldGenDeadTree3 extends WorldGenerator int[] var2 = new int[] {this.basePos[0], this.basePos[1] + this.heightLimit - 1, this.basePos[2]}; int var3 = this.worldObj.getBlockId(this.basePos[0], this.basePos[1] - 1, this.basePos[2]); - if (var3 != 2 && var3 != 3 && var3 != Blocks.holyGrass.get().blockID && var3 != Blocks.ash.get().blockID) + if (var3 != 2 && var3 != 3 && var3 != Blocks.holyGrass.get().blockID && var3 != Blocks.ash.get().blockID && var3 != Blocks.redRock.get().blockID) { return false; }