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

Tweaked the Lush Desert

This commit is contained in:
Matt Caughey 2014-01-20 01:36:10 -05:00
parent 3c99b92488
commit ec1a525a6f
6 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java
View File

@ -6,8 +6,8 @@ import java.util.Random;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.world.features.WorldGenBOPFlora;
import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
import biomesoplenty.common.world.features.trees.WorldGenCypress;
import biomesoplenty.common.world.features.trees.WorldGenDeadTree1;
import net.minecraft.block.Block;
import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.init.Blocks;
@ -30,14 +30,14 @@ public class BiomeGenLushDesert extends BOPBiome
this.func_150570_a(biomeHeight);
//TODO: setColor()
this.setColor(9087277);
this.setTemperatureRainfall(0.8F, 0.2F);
this.setTemperatureRainfall(1.0F, 0.3F);
this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));
this.topBlock = BOPBlockHelper.get("redRock");
this.fillerBlock = BOPBlockHelper.get("redRock");
this.topBlock = Blocks.hardened_clay;
this.fillerBlock = Blocks.hardened_clay;
this.theBiomeDecorator.treesPerChunk = 12;
this.theBiomeDecorator.treesPerChunk = 6;
this.theBiomeDecorator.grassPerChunk = 8;
this.theBiomeDecorator.cactiPerChunk = 20;
this.theBiomeDecorator.deadBushPerChunk = 2;
@ -49,7 +49,6 @@ public class BiomeGenLushDesert extends BOPBiome
this.bopWorldFeatures.waterLakesPerChunk = 5;
this.bopWorldFeatures.waterReedsPerChunk = 4;
this.bopWorldFeatures.bromeliadsPerChunk = 3;
this.bopWorldFeatures.generateGrass = true;
this.bopWorldFeatures.generateSand = true;
this.bopWorldFeatures.generatePumpkins = false;
}
@ -58,8 +57,8 @@ public class BiomeGenLushDesert extends BOPBiome
//TODO: getRandomWorldGenForTrees()
public WorldGenAbstractTree func_150567_a(Random random)
{
return random.nextInt(4) == 0 ? new WorldGenSavannaTree(false) :
(random.nextInt(24) == 0 ? new WorldGenDeadTree1(false, Blocks.dirt, Blocks.grass, BOPBlockHelper.get("grass"), BOPBlockHelper.get("driedDirt"), BOPBlockHelper.get("redRock")) :
return random.nextInt(4) == 0 ? new WorldGenCypress(Blocks.log2, Blocks.leaves2, 0, 0, false, 7, 10, 2) :
(random.nextInt(18) == 0 ? new WorldGenDeadTree1(false, Blocks.dirt, Blocks.grass, BOPBlockHelper.get("grass"), BOPBlockHelper.get("driedDirt"), Blocks.hardened_clay) :
(random.nextInt(2) == 0 ? worldGeneratorTrees : new WorldGenShrub(0,0)));
}
@ -123,4 +122,23 @@ public class BiomeGenLushDesert extends BOPBiome
}
}
}
public void func_150573_a(World p_150573_1_, Random p_150573_2_, Block[] p_150573_3_, byte[] p_150573_4_, int p_150573_5_, int p_150573_6_, double p_150573_7_)
{
if (p_150573_7_ > 1.75D)
{
this.topBlock = Blocks.grass;
this.fillerBlock = Blocks.dirt;
this.field_150604_aj = 0;
}
else if (p_150573_7_ > -0.5D)
{
this.topBlock = Blocks.hardened_clay;
this.fillerBlock = Blocks.hardened_clay;
this.field_150604_aj = 0;
}
this.func_150560_b(p_150573_1_, p_150573_2_, p_150573_3_, p_150573_4_, p_150573_5_, p_150573_6_, p_150573_7_);
}
}

2
src/main/java/biomesoplenty/common/blocks/BlockBOPFlower.java
View File

@ -226,7 +226,7 @@ public class BlockBOPFlower extends BOPBlockWorldDecor
return block == BOPBlockHelper.get("grass") || block == BOPBlockHelper.get("holyDirt") || block == Blocks.grass || block == Blocks.dirt;
case 12: // Bromeliad
return block == BOPBlockHelper.get("hardDirt") || block == BOPBlockHelper.get("redRock") || block == Blocks.sand;
return block == BOPBlockHelper.get("hardDirt") || block == Blocks.hardened_clay || block == Blocks.sand;
case 14: // Sunflower Top
return block == this;

4
src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java
View File

@ -141,7 +141,7 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable
return block == BOPBlockHelper.get("driedDirt") || block == Blocks.sand;
case 1: // Desert Grass
return block == BOPBlockHelper.get("redRock");
return block == Blocks.hardened_clay;
case 2: // Desert Sprouts
case 3: // Dune Grass
@ -171,7 +171,7 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable
return block != Blocks.grass ? false : (world.func_147439_a(x - 1, y - 1, z).func_149688_o() == Material.field_151586_h ? true : (world.func_147439_a(x + 1, y - 1, z).func_149688_o() == Material.field_151586_h ? true : (world.func_147439_a(x, y - 1, z - 1).func_149688_o() == Material.field_151586_h ? true : world.func_147439_a(x, y - 1, z + 1).func_149688_o() == Material.field_151586_h)));
case 12: // Tiny Cactus
return block == Blocks.sand || block == BOPBlockHelper.get("redRock") || block == Blocks.soul_sand;
return block == Blocks.sand || block == Blocks.hardened_clay || block == Blocks.soul_sand;
case 13: // Wither Wart
return block == Blocks.soul_sand;

4
src/main/java/biomesoplenty/common/core/BOPBiomes.java
View File

@ -130,13 +130,13 @@ public class BOPBiomes
registerBiome(new BOPBiomeEntry(new BiomeGenFen(BOPConfigurationIDs.fenID).setBiomeName("Fen"), TemperatureType.WARM, 50));
registerBiome(new BOPBiomeEntry(new BiomeGenFlowerField(BOPConfigurationIDs.flowerFieldID).setBiomeName("Flower Field"), TemperatureType.WARM, 25));
registerBiome(new BOPBiomeEntry(new BiomeGenFrostForest(BOPConfigurationIDs.frostForestID).setBiomeName("Frost Forest"), TemperatureType.ICY, 50));
registerBiome(new BOPBiomeEntry(new BiomeGenGrassland(BOPConfigurationIDs.grasslandID).setBiomeName("Grassland"), TemperatureType.WARM, 50));
registerBiome(new BOPBiomeEntry(new BiomeGenGrassland(BOPConfigurationIDs.grasslandID).setBiomeName("Grassland"), TemperatureType.COOL, 50));
registerBiome(new BOPBiomeEntry(new BiomeGenGrove(BOPConfigurationIDs.groveID).setBiomeName("Grove"), TemperatureType.WARM, 50));
registerBiome(new BOPBiomeEntry(new BiomeGenHeathland(BOPConfigurationIDs.heathlandID).setBiomeName("Heathland"), TemperatureType.WARM, 50));
registerBiome(new BOPBiomeEntry(new BiomeGenHighland(BOPConfigurationIDs.highlandID).setBiomeName("Highland"), TemperatureType.WARM, 50));
registerBiome(new BOPBiomeEntry(new BiomeGenJadeCliffs(BOPConfigurationIDs.jadeCliffsID).setBiomeName("Jade Cliffs"), TemperatureType.WARM, 25));
registerBiome(new BOPBiomeEntry(new BiomeGenLavenderFields(BOPConfigurationIDs.lavenderFieldsID).setBiomeName("Lavender Fields"), TemperatureType.WARM, 25));
registerBiome(new BOPBiomeEntry(new BiomeGenLushDesert(BOPConfigurationIDs.lushDesertID).setBiomeName("Lush Desert"), TemperatureType.HOT, 50));
registerBiome(new BOPBiomeEntry(new BiomeGenLushDesert(BOPConfigurationIDs.lushDesertID).setBiomeName("Lush Desert"), TemperatureType.HOT, 25));
registerBiome(new BOPBiomeEntry(new BiomeGenLushSwamp(BOPConfigurationIDs.lushSwampID).setBiomeName("Lush Swamp"), TemperatureType.WARM, 50));
registerBiome(new BOPBiomeEntry(new BiomeGenMapleWoods(BOPConfigurationIDs.mapleWoodsID).setBiomeName("Maple Woods"), TemperatureType.COOL, 50));
registerBiome(new BOPBiomeEntry(new BiomeGenMarsh(BOPConfigurationIDs.marshID).setBiomeName("Marsh"), TemperatureType.WARM, 50));

2
src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java
View File

@ -77,7 +77,7 @@ public class WorldGenFieldAssociation
associateField("algaePerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("foliage"), 0));
associateField("sproutsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("foliage"), 5));
associateField("tinyCactiPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 12));
associateField("oasesPerChunk", new WorldGenWaterside(Blocks.grass, 7, Blocks.sand, BOPBlockHelper.get("redRock")));
associateField("oasesPerChunk", new WorldGenWaterside(Blocks.grass, 7, Blocks.sand, Blocks.hardened_clay));
associateField("minersDelightPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("flowers2"), 6));
associateField("rootsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 15));
associateField("grassSplatterPerChunk", new WorldGenGrassSplatter());

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/desertgrass.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 614 B

After

Width:  |  Height:  |  Size: 395 B