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

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

This commit is contained in:
Adubbz 2013-09-22 15:06:13 +10:00
parent 071c94750f 6abe5e72ef
commit 038b2d4ed3
9 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -84,6 +84,7 @@
- Added Flat Mushroom
- Added cocoa trees to the Tropical Rainforest
- Added jungle wood to trees in the Brushland and Scrubland
- Tweaked marsh generation
Version 0.6.2 '20-08-13'
- Fixed bigtrees compatibility

6
build.xml
View File

@ -8,7 +8,7 @@
</condition>
<property name="mc.version" value="1.6.4" />
<property name="forge.version" value="9.11.0.883" />
<property name="fmp.version" value="1.0.0.173" />
<property name="fmp.version" value="1.0.0.182" />
<property name="src.dir" value="" />
<property name="build.dir" value="build" />
@ -21,7 +21,7 @@
<property name="mod.name" value="Biomes-O-Plenty-${mod.version}.${mod.build}-${mc.version}.jar" />
<property name="forge.name" value="minecraftforge-src-${mc.version}-${forge.version}.zip" />
<property name="fmp.name" value="ForgeMultipart-dev-1.6.2-${fmp.version}.jar" />
<property name="fmp.name" value="ForgeMultipart-dev-${mc.version}-${fmp.version}.jar" />
<!-- Check downloaded dependencies -->
@ -213,4 +213,4 @@
<antcall target="reobfuscate" />
<antcall target="package" />
</target>
</project>
</project>

2
common/biomesoplenty/biomes/BiomeGenGrassland.java
View File

@ -31,8 +31,6 @@ public class BiomeGenGrassland extends BiomeGenBase
customBiomeDecorator.wheatGrassPerChunk = 1;
customBiomeDecorator.reedsPerChunk = 35;
customBiomeDecorator.mushroomsPerChunk = 20;
customBiomeDecorator.sandPerChunk = -999;
customBiomeDecorator.sandPerChunk2 = -999;
customBiomeDecorator.waterLakesPerChunk = 15;
customBiomeDecorator.portobellosPerChunk = 3;
customBiomeDecorator.reedsBOPPerChunk = 5;

18
common/biomesoplenty/biomes/BiomeGenMarsh.java
View File

@ -25,8 +25,13 @@ public class BiomeGenMarsh extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = -999;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.grassPerChunk = 65;
customBiomeDecorator.highGrassPerChunk = 25;
customBiomeDecorator.grassPerChunk = 50;
customBiomeDecorator.wheatGrassPerChunk = 50;
customBiomeDecorator.highGrassPerChunk = 50;
customBiomeDecorator.reedsPerChunk = -999;
customBiomeDecorator.waterLakesPerChunk = 100;
customBiomeDecorator.sandPerChunk = -999;
customBiomeDecorator.sandPerChunk2 = -999;
customBiomeDecorator.generatePumpkins = false;
spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
}
@ -35,7 +40,6 @@ public class BiomeGenMarsh extends BiomeGenBase
public void decorate(World par1World, Random par2Random, int par3, int par4)
{
super.decorate(par1World, par2Random, par3, par4);
WorldGenMarsh var5 = new WorldGenMarsh();
int var55 = 12 + par2Random.nextInt(6);
@ -51,14 +55,6 @@ public class BiomeGenMarsh extends BiomeGenBase
par1World.setBlock(var77, var88, var99, Blocks.amethystOre.get().blockID, 12, 2);
}
}
for (int var6 = 0; var6 < 25; ++var6)
{
int var7 = par3 + par2Random.nextInt(16) + 8;
byte var8 = 62;
int var9 = par4 + par2Random.nextInt(16) + 8;
var5.generate(par1World, par2Random, var7, var8, var9);
}
}
/**

2
common/biomesoplenty/configuration/BOPBiomes.java
View File

@ -226,7 +226,7 @@ public class BOPBiomes {
Biomes.lushSwamp = Optional.of((new BiomeGenLushSwamp(BOPConfigurationIDs.lushSwampID)).setColor(522674).setBiomeName("Lush Swamp").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.3F).setTemperatureRainfall(0.7F, 1.0F));
Biomes.mangrove = Optional.of((new BiomeGenMangrove(BOPConfigurationIDs.mangroveID)).setColor(16440917).setBiomeName("Mangrove").setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F));
Biomes.mapleWoods = Optional.of((new BiomeGenMapleWoods(BOPConfigurationIDs.mapleWoodsID)).setColor(747097).setBiomeName("Maple Woods").func_76733_a(5159473).setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.3F, 0.6F));
Biomes.marsh = Optional.of((new BiomeGenMarsh(BOPConfigurationIDs.marshID)).setColor(10486015).setBiomeName("Marsh").setMinMaxHeight(-0.5F, 0.05F).setTemperatureRainfall(0.5F, 0.9F));
Biomes.marsh = Optional.of((new BiomeGenMarsh(BOPConfigurationIDs.marshID)).setColor(10486015).setBiomeName("Marsh").setMinMaxHeight(0.2F, 0.3F).setTemperatureRainfall(0.5F, 0.9F));
Biomes.meadow = Optional.of((new BiomeGenMeadow(BOPConfigurationIDs.meadowID)).setColor(9286496).setBiomeName("Meadow").setTemperatureRainfall(0.7F, 0.7F));
Biomes.meadowForest = Optional.of((new BiomeGenMeadowForest(BOPConfigurationIDs.meadowForestID)).setColor(9286496).setBiomeName("Meadow Forest").setTemperatureRainfall(0.7F, 0.7F));
Biomes.mesa = Optional.of((new BiomeGenMesa(BOPConfigurationIDs.mesaID)).setColor(16421912).setBiomeName("Mesa").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.4F, 2.0F));

2
common/biomesoplenty/worldgen/WorldGenMoss.java
View File

@ -23,7 +23,7 @@ public class WorldGenMoss extends WorldGenerator
{
if (Blocks.moss.get().canPlaceBlockOnSide(par1World, par3, par4, par5, var8))
{
int var999 = par2Random.nextInt(3);
int var999 = par2Random.nextInt(4);
if (var999 == 0)
{

20
common/biomesoplenty/worldgen/WorldGenOutback.java
View File

@ -34,11 +34,29 @@ public class WorldGenOutback extends WorldGenerator
int var8 = par3 + par2Random.nextInt(8) - par2Random.nextInt(8);
int var9 = par4 + par2Random.nextInt(4) - par2Random.nextInt(4);
int var10 = par5 + par2Random.nextInt(8) - par2Random.nextInt(8);
int var999 = par2Random.nextInt(5);
if (par1World.isAirBlock(var8, var9, var10) && (par1World.getBlockId(var8, var9 - 1, var10) == Blocks.hardSand.get().blockID || par1World.getBlockId(var8, var9 - 1, var10) == Block.sand.blockID || par1World.getBlockId(var8, var9 - 1, var10) == Block.stone.blockID))
{
par1World.setBlock(var8, var9 - 1, var10, Block.grass.blockID, 0, 2);
par1World.setBlock(var8, var9, var10, tallGrassID, tallGrassMetadata, 2);
if (var999 == 0)
{
par1World.setBlock(var8, var9, var10, tallGrassID, tallGrassMetadata, 2);
}
else if (var999 == 1)
{
par1World.setBlock(var8, var9, var10, Blocks.foliage.get().blockID, 10, 2);
}
else if (var999 == 2)
{
par1World.setBlock(var8, var9, var10, Blocks.foliage.get().blockID, 11, 2);
}
else
{
par1World.setBlock(var8, var9, var10, tallGrassID, tallGrassMetadata, 2);
}
}
}

7
common/biomesoplenty/worldgen/structure/BOPMapGenScatteredFeature.java
View File

@ -23,9 +23,12 @@ public class BOPMapGenScatteredFeature extends MapGenStructure
{
private static List biomelist = Arrays.asList(new BiomeGenBase[] {
BiomeGenBase.desert, BiomeGenBase.desertHills, BiomeGenBase.jungle, BiomeGenBase.jungleHills, BiomeGenBase.swampland,
Biomes.dunes.get(), Biomes.oasis.get(), Biomes.desertNew.get(),
Biomes.dunes.get(), Biomes.oasis.get(), Biomes.desertNew.get(), Biomes.outback.get(), Biomes.canyon.get(), Biomes.canyonRavine.get(),
Biomes.brushland.get(), Biomes.lushDesert.get(), Biomes.steppe.get(),
Biomes.bayou.get(), Biomes.bog.get(), Biomes.deadSwamp.get(), Biomes.fen.get(), Biomes.sludgepit.get(), Biomes.swamplandNew.get(),
Biomes.rainforest.get(), Biomes.temperateRainforest.get(), Biomes.tropicalRainforest.get(), Biomes.jungleNew.get()
Biomes.rainforest.get(), Biomes.tropics.get(), Biomes.tropicalRainforest.get(), Biomes.jungleNew.get(), Biomes.overgrownGreens.get(),
Biomes.quagmire.get(), Biomes.ominousWoods.get(), Biomes.marsh.get(), Biomes.moor.get(), Biomes.wetland.get(), Biomes.silkglades.get(),
Biomes.sacredSprings.get(), Biomes.bambooForest.get()
});
/** contains possible spawns for scattered features */

7
common/biomesoplenty/worldgen/structure/BOPStructureScatteredFeatureStart.java
View File

@ -19,11 +19,14 @@ public class BOPStructureScatteredFeatureStart extends StructureStart
BiomeGenBase biome = world.getBiomeGenForCoords(x * 16 + 8, z * 16 + 8);
if (biome != BiomeGenBase.jungle && biome != BiomeGenBase.jungleHills && biome != Biomes.rainforest.get() &&
biome != Biomes.temperateRainforest.get() && biome != Biomes.tropicalRainforest.get() && biome != Biomes.jungleNew.get())
biome != Biomes.tropics.get() && biome != Biomes.tropicalRainforest.get() && biome != Biomes.jungleNew.get() &&
biome != Biomes.bambooForest.get() && biome != Biomes.sacredSprings.get() && biome != Biomes.overgrownGreens.get())
{
if (biome == BiomeGenBase.swampland || biome == Biomes.bayou.get() || biome == Biomes.bog.get()
|| biome == Biomes.deadSwamp.get() || biome == Biomes.fen.get() || biome == Biomes.sludgepit.get()
|| biome == Biomes.swamplandNew.get())
|| biome == Biomes.swamplandNew.get() || biome == Biomes.marsh.get() || biome == Biomes.moor.get()
|| biome == Biomes.ominousWoods.get() || biome == Biomes.quagmire.get() || biome == Biomes.wetland.get()
|| biome == Biomes.silkglades.get())
{
ComponentScatteredFeatureSwampHut componentscatteredfeatureswamphut = new ComponentScatteredFeatureSwampHut(random, x * 16, z * 16);
components.add(componentscatteredfeatureswamphut);