etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ted80/BiomesOPlenty

This commit is contained in:
Adubbz 2013-05-05 11:27:47 +10:00
parent 52cb252d6f 3d4037b544
commit 4348490256
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/minecraft/biomesoplenty/biomes/BiomeGenCanyon.java
View File

@ -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;

7
src/minecraft/biomesoplenty/biomes/BiomeGenLushDesert.java
View File

@ -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))));
}
}

2
src/minecraft/biomesoplenty/configuration/BOPBiomes.java
View File

@ -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));

4
src/minecraft/biomesoplenty/worldgen/WorldGenAcacia.java
View File

@ -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;

2
src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree3.java
View File

@ -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;
}