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

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

Conflicts:
	common/biomesoplenty/biomes/BiomeGenMysticGrove.java
	common/biomesoplenty/biomes/BiomeGenOminousWoods.java
This commit is contained in:
Adubbz 2013-11-06 18:56:20 +11:00
parent 7beb926241 bc0d953aac
commit 72ff3b3d84
35 changed files with 921 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/biomesoplenty/BiomesOPlenty.java
View File

@ -33,6 +33,7 @@ import biomesoplenty.helpers.CreativeTabsBOP;
import biomesoplenty.helpers.Version;
import biomesoplenty.integration.BOPCrossIntegration;
import biomesoplenty.world.WorldProviderPromised;
import biomesoplenty.world.WorldTypeBOP;
import biomesoplenty.world.WorldTypeSize;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
@ -129,6 +130,9 @@ public class BiomesOPlenty
{
BOPCrossIntegration.postInit();
//Initialize new world type
BOPBiomes.WTBiomesOP = new WorldTypeBOP();
TickRegistry.registerTickHandler(new TickHandlerClient(), Side.CLIENT);
TickRegistry.registerTickHandler(new TickHandlerServer(), Side.SERVER);
}

1
common/biomesoplenty/api/Biomes.java
View File

@ -63,6 +63,7 @@ public class Biomes
public static Optional<? extends BiomeGenBase> moor = Optional.absent();
public static Optional<? extends BiomeGenBase> mountain = Optional.absent();
public static Optional<? extends BiomeGenBase> mysticGrove = Optional.absent();
public static Optional<? extends BiomeGenBase> mysticGroveThin = Optional.absent();
public static Optional<? extends BiomeGenBase> netherBase = Optional.absent();
public static Optional<? extends BiomeGenBase> netherGarden = Optional.absent();

1
common/biomesoplenty/biomes/BiomeGenAlps.java
View File

@ -23,7 +23,6 @@ public class BiomeGenAlps extends BiomeGenBase
customBiomeDecorator.grassPerChunk = -999;
customBiomeDecorator.sandPerChunk = -999;
customBiomeDecorator.sandPerChunk2 = -999;
customBiomeDecorator.hotSpringsPerChunk = 4;
}
@Override

16
common/biomesoplenty/biomes/BiomeGenArctic.java
View File

@ -5,9 +5,10 @@ import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import worldcore.interfaces.IWCFog;
import biomesoplenty.api.Blocks;
public class BiomeGenArctic extends BiomeGenBase
public class BiomeGenArctic extends BiomeGenBase implements IWCFog
{
private BiomeDecoratorBOP customBiomeDecorator;
@ -62,4 +63,17 @@ public class BiomeGenArctic extends BiomeGenBase
{
return 11903827;
}
@Override
public int getFogColour()
{
return 12638463;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 0.4F;
}
}

16
common/biomesoplenty/biomes/BiomeGenBambooForest.java
View File

@ -8,10 +8,11 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import worldcore.interfaces.IWCFog;
import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.tree.WorldGenBambooTree;
public class BiomeGenBambooForest extends BiomeGenBase
public class BiomeGenBambooForest extends BiomeGenBase implements IWCFog
{
private BiomeDecoratorBOP customBiomeDecorator;
@ -87,4 +88,17 @@ public class BiomeGenBambooForest extends BiomeGenBase
{
return 10739795;
}
@Override
public int getFogColour()
{
return 13428852;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 0.8F;
}
}

16
common/biomesoplenty/biomes/BiomeGenBayou.java
View File

@ -9,6 +9,7 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenerator;
import worldcore.interfaces.IWCFog;
import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenMoss;
@ -16,7 +17,7 @@ import biomesoplenty.worldgen.tree.WorldGenBayou1;
import biomesoplenty.worldgen.tree.WorldGenBayou2;
import biomesoplenty.worldgen.tree.WorldGenBayou3;
public class BiomeGenBayou extends BiomeGenBase
public class BiomeGenBayou extends BiomeGenBase implements IWCFog
{
private BiomeDecoratorBOP customBiomeDecorator;
@ -107,6 +108,19 @@ public class BiomeGenBayou extends BiomeGenBase
return 11591816;
}
@Override
public int getFogColour()
{
return 9482133;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 0.6F;
}
/**
* takes temperature, returns color
*/

16
common/biomesoplenty/biomes/BiomeGenDeadSwamp.java
View File

@ -8,11 +8,12 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import worldcore.interfaces.IWCFog;
import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.tree.WorldGenDeadTree;
public class BiomeGenDeadSwamp extends BiomeGenBase
public class BiomeGenDeadSwamp extends BiomeGenBase implements IWCFog
{
private BiomeDecoratorBOP customBiomeDecorator;
@ -93,6 +94,19 @@ public class BiomeGenDeadSwamp extends BiomeGenBase
return 6713420;
}
@Override
public int getFogColour()
{
return 9219993;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 0.6F;
}
/**
* takes temperature, returns color
*/

16
common/biomesoplenty/biomes/BiomeGenFen.java
View File

@ -9,13 +9,14 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import worldcore.interfaces.IWCFog;
import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenMoss;
import biomesoplenty.worldgen.tree.WorldGenDeadTree;
import biomesoplenty.worldgen.tree.WorldGenFen1;
import biomesoplenty.worldgen.tree.WorldGenFen2;
public class BiomeGenFen extends BiomeGenBase
public class BiomeGenFen extends BiomeGenBase implements IWCFog
{
private BiomeDecoratorBOP customBiomeDecorator;
@ -112,4 +113,17 @@ public class BiomeGenFen extends BiomeGenBase
{
return 13547897;
}
@Override
public int getFogColour()
{
return 12638463;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 0.8F;
}
}

16
common/biomesoplenty/biomes/BiomeGenFrostForest.java
View File

@ -7,10 +7,11 @@ import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator;
import worldcore.interfaces.IWCFog;
import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
public class BiomeGenFrostForest extends BiomeGenBase
public class BiomeGenFrostForest extends BiomeGenBase implements IWCFog
{
private BiomeDecoratorBOP customBiomeDecorator;
@ -77,6 +78,19 @@ public class BiomeGenFrostForest extends BiomeGenBase
return 11261628;
}
@Override
public int getFogColour()
{
return 12239814;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 0.6F;
}
/**
* takes temperature, returns color
*/

24
common/biomesoplenty/biomes/BiomeGenFungiForest.java
View File

@ -8,6 +8,7 @@ import net.minecraft.entity.passive.EntityMooshroom;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import worldcore.interfaces.IWCFog;
@ -15,6 +16,8 @@ import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenMoss;
import biomesoplenty.worldgen.tree.WorldGenSequoia;
import biomesoplenty.worldgen.tree.WorldGenSequoiaOrange;
import biomesoplenty.worldgen.tree.WorldGenSequoiaYellow;
public class BiomeGenFungiForest extends BiomeGenBase implements IWCFog
{
@ -35,17 +38,12 @@ public class BiomeGenFungiForest extends BiomeGenBase implements IWCFog
customBiomeDecorator.bigMushroomsPerChunk = 8;
customBiomeDecorator.toadstoolsPerChunk = 5;
customBiomeDecorator.portobellosPerChunk = 7;
customBiomeDecorator.blueMilksPerChunk = 4;
customBiomeDecorator.glowshroomsPerChunk = 2;
customBiomeDecorator.blueMilksPerChunk = 2;
customBiomeDecorator.glowshroomsPerChunk = 1;
customBiomeDecorator.blueFlowersPerChunk = 3;
customBiomeDecorator.cattailsPerChunk = 1;
customBiomeDecorator.highCattailsPerChunk = 2;
customBiomeDecorator.reedsBOPPerChunk = 1;
customBiomeDecorator.lilyflowersPerChunk = 2;
customBiomeDecorator.carrotsPerChunk = 1;
customBiomeDecorator.wheatGrassPerChunk = 3;
customBiomeDecorator.shrubsPerChunk = 2;
customBiomeDecorator.koruPerChunk = 1;
customBiomeDecorator.shrubsPerChunk = 1;
customBiomeDecorator.generateMycelium = true;
customBiomeDecorator.generatePumpkins = true;
waterColorMultiplier = 65326;
@ -75,7 +73,7 @@ public class BiomeGenFungiForest extends BiomeGenBase implements IWCFog
@Override
public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{
return new WorldGenSequoia(false);
return par1Random.nextInt(3) == 0 ? new WorldGenSequoiaOrange(false) : ((par1Random.nextInt(5) == 0 ? new WorldGenSequoiaYellow(false) : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(0, 0) : new WorldGenSequoia(false))));
}
/**
@ -93,7 +91,7 @@ public class BiomeGenFungiForest extends BiomeGenBase implements IWCFog
@Override
public int getBiomeGrassColor()
{
return 5359235;
return 15792496;
}
/**
@ -102,7 +100,7 @@ public class BiomeGenFungiForest extends BiomeGenBase implements IWCFog
@Override
public int getBiomeFoliageColor()
{
return 5359235;
return 11139946;
}
/**
@ -111,7 +109,7 @@ public class BiomeGenFungiForest extends BiomeGenBase implements IWCFog
@Override
public int getFogColour()
{
return 7985325;
return 16050295;
}
/**
@ -121,7 +119,7 @@ public class BiomeGenFungiForest extends BiomeGenBase implements IWCFog
public int getSkyColorByTemp(float par1)
{
if (BOPConfigurationMisc.skyColors)
return 5888980;
return 11513806;
else
{
par1 /= 3.0F;

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

@ -7,9 +7,10 @@ import net.minecraft.entity.monster.EntitySlime;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry;
import worldcore.interfaces.IWCFog;
import biomesoplenty.api.Blocks;
public class BiomeGenMarsh extends BiomeGenBase
public class BiomeGenMarsh extends BiomeGenBase implements IWCFog
{
private BiomeDecoratorBOP customBiomeDecorator;
@ -57,4 +58,17 @@ public class BiomeGenMarsh extends BiomeGenBase
}
}
}
@Override
public int getFogColour()
{
return 12638463;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 0.6F;
}
}

16
common/biomesoplenty/biomes/BiomeGenMesa.java
View File

@ -8,10 +8,11 @@ import net.minecraft.entity.monster.EntitySpider;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry;
import worldcore.interfaces.IWCFog;
import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
public class BiomeGenMesa extends BiomeGenBase
public class BiomeGenMesa extends BiomeGenBase implements IWCFog
{
private BiomeDecoratorBOP customBiomeDecorator;
@ -53,6 +54,19 @@ public class BiomeGenMesa extends BiomeGenBase
}
}
@Override
public int getFogColour()
{
return 14070383;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 1.0F;
}
/**
* takes temperature, returns color
*/

25
common/biomesoplenty/biomes/BiomeGenMysticGrove.java
View File

@ -10,10 +10,11 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import worldcore.interfaces.IWCFog;
import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.configfile.BOPConfigurationMain;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.realtree.WorldGenRealMagic;
import biomesoplenty.worldgen.tree.WorldGenMystic1;
import biomesoplenty.worldgen.tree.WorldGenJacaranda;
import biomesoplenty.worldgen.tree.WorldGenMystic2;
import biomesoplenty.worldgen.tree.WorldGenSwampTall;
@ -33,23 +34,21 @@ public class BiomeGenMysticGrove extends BiomeGenBase implements IWCFog
}
else
{
customBiomeDecorator.treesPerChunk = 8;
customBiomeDecorator.treesPerChunk = 9;
}
customBiomeDecorator.grassPerChunk = 7;
customBiomeDecorator.grassPerChunk = 15;
customBiomeDecorator.wheatGrassPerChunk = 3;
customBiomeDecorator.flowersPerChunk = 8;
customBiomeDecorator.pinkFlowersPerChunk = 6;
customBiomeDecorator.glowFlowersPerChunk = 15;
customBiomeDecorator.pinkFlowersPerChunk = 9;
customBiomeDecorator.glowFlowersPerChunk = 10;
customBiomeDecorator.rosesPerChunk = 8;
customBiomeDecorator.sandPerChunk = -999;
customBiomeDecorator.sandPerChunk2 = -999;
customBiomeDecorator.sproutsPerChunk = 3;
customBiomeDecorator.hydrangeasPerChunk = 3;
customBiomeDecorator.blueMilksPerChunk = 4;
customBiomeDecorator.glowshroomsPerChunk = 2;
customBiomeDecorator.sproutsPerChunk = 1;
customBiomeDecorator.hydrangeasPerChunk = 6;
customBiomeDecorator.blueMilksPerChunk = 1;
customBiomeDecorator.lilyflowersPerChunk = 3;
customBiomeDecorator.hotSpringsPerChunk = 2;
customBiomeDecorator.poisonWaterPerChunk = 1;
waterColorMultiplier = 15349914;
spawnableMonsterList.clear();
@ -69,7 +68,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase implements IWCFog
return new WorldGenRealMagic();
}
return par1Random.nextInt(5) == 0 ? new WorldGenMystic2(false) : (par1Random.nextInt(7) == 0 ? new WorldGenSwampTall() : new WorldGenMystic1(false));
return par1Random.nextInt(4) == 0 ? new WorldGenMystic2(false) : (par1Random.nextInt(3) == 0 ? new WorldGenJacaranda(false) : ((par1Random.nextInt(3) == 0 ? this.worldGeneratorBigTree : ((par1Random.nextInt(8) == 0 ? new WorldGenSwampTall() : this.worldGeneratorTrees)))));
}
/**
@ -78,7 +77,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase implements IWCFog
@Override
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
return (par1Random.nextInt(5) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1)));
}
/**
@ -96,7 +95,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase implements IWCFog
@Override
public int getBiomeFoliageColor()
{
return 7332553;
return 7397529;
}
/**

142
common/biomesoplenty/biomes/BiomeGenMysticGroveThin.java Normal file
View File

@ -0,0 +1,142 @@
package biomesoplenty.biomes;
import java.awt.Color;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.entity.monster.EntityWitch;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import worldcore.interfaces.IWCFog;
import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.configfile.BOPConfigurationMain;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.realtree.WorldGenRealMagic;
import biomesoplenty.worldgen.tree.WorldGenJacaranda;
import biomesoplenty.worldgen.tree.WorldGenMystic2;
import biomesoplenty.worldgen.tree.WorldGenSwampTall;
public class BiomeGenMysticGroveThin extends BiomeGenBase implements IWCFog
{
private BiomeDecoratorBOP customBiomeDecorator;
@SuppressWarnings("unchecked")
public BiomeGenMysticGroveThin(int par1)
{
super(par1);
theBiomeDecorator = new BiomeDecoratorBOP(this);
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
if (BOPConfigurationMain.realisticTrees)
{
customBiomeDecorator.treesPerChunk = 1;
}
else
{
customBiomeDecorator.treesPerChunk = 3;
}
customBiomeDecorator.grassPerChunk = 7;
customBiomeDecorator.wheatGrassPerChunk = 3;
customBiomeDecorator.flowersPerChunk = 8;
customBiomeDecorator.pinkFlowersPerChunk = 6;
customBiomeDecorator.glowFlowersPerChunk = 15;
customBiomeDecorator.rosesPerChunk = 8;
customBiomeDecorator.sandPerChunk = -999;
customBiomeDecorator.sandPerChunk2 = -999;
customBiomeDecorator.sproutsPerChunk = 1;
customBiomeDecorator.hydrangeasPerChunk = 3;
customBiomeDecorator.blueMilksPerChunk = 1;
customBiomeDecorator.lilyflowersPerChunk = 3;
customBiomeDecorator.poisonWaterPerChunk = 1;
waterColorMultiplier = 15349914;
spawnableMonsterList.clear();
spawnableCreatureList.clear();
spawnableWaterCreatureList.clear();
spawnableMonsterList.add(new SpawnListEntry(EntityWitch.class, 10, 4, 4));
}
/**
* Gets a WorldGen appropriate for this biome.
*/
@Override
public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{
if (BOPConfigurationMain.realisticTrees)
{
return new WorldGenRealMagic();
}
return par1Random.nextInt(4) == 0 ? new WorldGenMystic2(false) : (par1Random.nextInt(2) == 0 ? new WorldGenJacaranda(false) : ((par1Random.nextInt(6) == 0 ? this.worldGeneratorBigTree : ((par1Random.nextInt(5) == 0 ? new WorldGenSwampTall() : this.worldGeneratorTrees)))));
}
/**
* Gets a WorldGen appropriate for this biome.
*/
@Override
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return (par1Random.nextInt(5) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1)));
}
/**
* Provides the basic grass color based on the biome temperature and rainfall
*/
@Override
public int getBiomeGrassColor()
{
return 6934491;
}
/**
* Provides the basic foliage color based on the biome temperature and rainfall
*/
@Override
public int getBiomeFoliageColor()
{
return 7397529;
}
/**
* Fog Color
*/
@Override
public int getFogColour()
{
return 16755401;
}
/**
* takes temperature, returns color
*/
@Override
public int getSkyColorByTemp(float par1)
{
if (BOPConfigurationMisc.skyColors)
return 8972496;
else
{
par1 /= 3.0F;
if (par1 < -1.0F)
{
par1 = -1.0F;
}
if (par1 > 1.0F)
{
par1 = 1.0F;
}
return Color.getHSBColor(0.62222224F - par1 * 0.05F, 0.5F + par1 * 0.1F, 1.0F).getRGB();
}
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 1.0F;
}
}

1
common/biomesoplenty/biomes/BiomeGenOasis.java
View File

@ -35,7 +35,6 @@ public class BiomeGenOasis extends BiomeGenBase
customBiomeDecorator.generateQuicksand = true;
customBiomeDecorator.waterLakesPerChunk = 10;
customBiomeDecorator.aloePerChunk = 4;
customBiomeDecorator.hotSpringsPerChunk = 1;
}
@Override

5
common/biomesoplenty/biomes/BiomeGenOminousWoods.java
View File

@ -13,6 +13,7 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import worldcore.interfaces.IWCFog;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.tree.WorldGenDeadTree3;
import biomesoplenty.worldgen.tree.WorldGenOminous1;
import biomesoplenty.worldgen.tree.WorldGenOminous2;
@ -26,7 +27,7 @@ public class BiomeGenOminousWoods extends BiomeGenBase implements IWCFog
super(par1);
theBiomeDecorator = new BiomeDecoratorBOP(this);
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 10;
customBiomeDecorator.treesPerChunk = 8;
customBiomeDecorator.grassPerChunk = 1;
customBiomeDecorator.wheatGrassPerChunk = 1;
customBiomeDecorator.flowersPerChunk = -999;
@ -54,7 +55,7 @@ public class BiomeGenOminousWoods extends BiomeGenBase implements IWCFog
public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{
//return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenWillow2() : (par1Random.nextInt(7) == 0 ? new WorldGenDarkTree1() : (par1Random.nextInt(5) == 0 ? new WorldGenWillow1() : new WorldGenDarkTree2())));
return par1Random.nextInt(2) == 0 ? new WorldGenOminous1(false) : new WorldGenOminous2();
return par1Random.nextInt(2) == 0 ? new WorldGenOminous1(false) : (par1Random.nextInt(6) == 0 ? new WorldGenDeadTree3(false) : new WorldGenOminous2());
}
/**

16
common/biomesoplenty/biomes/BiomeGenQuagmire.java
View File

@ -7,11 +7,12 @@ import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator;
import worldcore.interfaces.IWCFog;
import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.tree.WorldGenDeadTree;
public class BiomeGenQuagmire extends BiomeGenBase
public class BiomeGenQuagmire extends BiomeGenBase implements IWCFog
{
private BiomeDecoratorBOP customBiomeDecorator;
@ -85,6 +86,19 @@ public class BiomeGenQuagmire extends BiomeGenBase
return 10390377;
}
@Override
public int getFogColour()
{
return 13291213;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 0.6F;
}
/**
* takes temperature, returns color
*/

1
common/biomesoplenty/biomes/BiomeGenSacredSprings.java
View File

@ -30,7 +30,6 @@ public class BiomeGenSacredSprings extends BiomeGenBase implements IWCFog
customBiomeDecorator.wheatGrassPerChunk = 1;
customBiomeDecorator.waterlilyPerChunk = 5;
customBiomeDecorator.violetsPerChunk = 1;
customBiomeDecorator.hotSpringsPerChunk = 1;
customBiomeDecorator.generatePumpkins = false;
spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class,
12, 6, 6));

16
common/biomesoplenty/biomes/BiomeGenSludgepit.java
View File

@ -10,12 +10,13 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import worldcore.interfaces.IWCFog;
import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenBog1;
import biomesoplenty.worldgen.WorldGenBog2;
public class BiomeGenSludgepit extends BiomeGenBase
public class BiomeGenSludgepit extends BiomeGenBase implements IWCFog
{
private BiomeDecoratorBOP customBiomeDecorator;
@ -102,6 +103,19 @@ public class BiomeGenSludgepit extends BiomeGenBase
return 9539892;
}
@Override
public int getFogColour()
{
return 10463856;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 0.6F;
}
/**
* takes temperature, returns color
*/

48
common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java
View File

@ -1,5 +1,6 @@
package biomesoplenty.biomes;
import java.awt.Color;
import java.util.Random;
import net.minecraft.block.Block;
@ -8,13 +9,15 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import worldcore.interfaces.IWCFog;
import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenMoss;
import biomesoplenty.worldgen.tree.WorldGenSequoia;
import biomesoplenty.worldgen.tree.WorldGenTemperate;
import biomesoplenty.worldgen.tree.WorldGenThickTree;
import biomesoplenty.worldgen.tree.WorldGenWillow;
public class BiomeGenTemperateRainforest extends BiomeGenBase
public class BiomeGenTemperateRainforest extends BiomeGenBase implements IWCFog
{
private BiomeDecoratorBOP customBiomeDecorator;
@ -46,7 +49,7 @@ public class BiomeGenTemperateRainforest extends BiomeGenBase
public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{
//return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenGrandFir1() : (par1Random.nextInt(4) == 0 ? new WorldGenAlaskanCedar2() : (par1Random.nextInt(8) == 0 ? new WorldGenAlaskanCedar1() : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(0,0) : new WorldGenGrandFir2()))));
return par1Random.nextInt(10) == 0 ? new WorldGenWillow() : (par1Random.nextInt(6) == 0 ? new WorldGenThickTree(false) : (par1Random.nextInt(2) == 0 ? new WorldGenTemperate(false) : new WorldGenShrub(0, 0)));
return par1Random.nextInt(10) == 0 ? new WorldGenWillow() : (par1Random.nextInt(6) == 0 ? new WorldGenSequoia(false) : (par1Random.nextInt(2) == 0 ? new WorldGenTemperate(false) : new WorldGenShrub(0, 0)));
}
/**
@ -105,4 +108,43 @@ public class BiomeGenTemperateRainforest extends BiomeGenBase
{
return 12311907;
}
@Override
public int getFogColour()
{
return 13753294;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 0.8F;
}
/**
* takes temperature, returns color
*/
@Override
public int getSkyColorByTemp(float par1)
{
if (BOPConfigurationMisc.skyColors)
return 11061213;
else
{
par1 /= 3.0F;
if (par1 < -1.0F)
{
par1 = -1.0F;
}
if (par1 > 1.0F)
{
par1 = 1.0F;
}
return Color.getHSBColor(0.62222224F - par1 * 0.05F, 0.5F + par1 * 0.1F, 1.0F).getRGB();
}
}
}

16
common/biomesoplenty/biomes/BiomeGenWetland.java
View File

@ -9,12 +9,13 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import worldcore.interfaces.IWCFog;
import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.WorldGenMoss;
import biomesoplenty.worldgen.tree.WorldGenTaiga5;
import biomesoplenty.worldgen.tree.WorldGenWillow;
public class BiomeGenWetland extends BiomeGenBase
public class BiomeGenWetland extends BiomeGenBase implements IWCFog
{
private BiomeDecoratorBOP customBiomeDecorator;
@ -119,4 +120,17 @@ public class BiomeGenWetland extends BiomeGenBase
{
return 5215831;
}
@Override
public int getFogColour()
{
return 6189472;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 0.8F;
}
}

16
common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java
View File

@ -3,6 +3,7 @@ package biomesoplenty.biomes.vanilla;
import java.awt.Color;
import java.util.Random;
import worldcore.interfaces.IWCFog;
import net.minecraft.block.Block;
import net.minecraft.entity.monster.EntitySlime;
import net.minecraft.world.ColorizerFoliage;
@ -18,7 +19,7 @@ import biomesoplenty.worldgen.WorldGenLog;
import biomesoplenty.worldgen.WorldGenMoss;
import biomesoplenty.worldgen.tree.WorldGenWillow;
public class BiomeGenSwampNew extends BiomeGenBase
public class BiomeGenSwampNew extends BiomeGenBase implements IWCFog
{
private BiomeDecoratorBOP customBiomeDecorator;
@ -106,6 +107,19 @@ public class BiomeGenSwampNew extends BiomeGenBase
return ((ColorizerFoliage.getFoliageColor(var1, var3) & 16711422) + 5115470) / 2;
}
@Override
public int getFogColour()
{
return 7246218;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 0.4F;
}
/**
* takes temperature, returns color
*/

20
common/biomesoplenty/configuration/BOPAchievements.java
View File

@ -395,6 +395,11 @@ public class BOPAchievements
player.addStat(BOPAchievements.achField, 1);
}
if (biomeID == Biomes.fieldForest.get().biomeID)
{
player.addStat(BOPAchievements.achField, 1);
}
if (biomeID == Biomes.frostForest.get().biomeID)
{
player.addStat(BOPAchievements.achFrostForest, 1);
@ -505,6 +510,11 @@ public class BOPAchievements
player.addStat(BOPAchievements.achMysticGrove, 1);
}
if (biomeID == Biomes.mysticGroveThin.get().biomeID)
{
player.addStat(BOPAchievements.achMysticGrove, 1);
}
if (biomeID == Biomes.oasis.get().biomeID)
{
player.addStat(BOPAchievements.achOasis, 1);
@ -590,6 +600,11 @@ public class BOPAchievements
player.addStat(BOPAchievements.achSavanna, 1);
}
if (biomeID == Biomes.savannaPlateau.get().biomeID)
{
player.addStat(BOPAchievements.achSavanna, 1);
}
if (biomeID == Biomes.scrubland.get().biomeID)
{
player.addStat(BOPAchievements.achScrubland, 1);
@ -670,6 +685,11 @@ public class BOPAchievements
player.addStat(BOPAchievements.achTropics, 1);
}
if (biomeID == Biomes.tropicsMountain.get().biomeID)
{
player.addStat(BOPAchievements.achTropics, 1);
}
if (biomeID == Biomes.tundra.get().biomeID)
{
player.addStat(BOPAchievements.achTundra, 1);

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

@ -61,6 +61,7 @@ import biomesoplenty.biomes.BiomeGenMesa;
import biomesoplenty.biomes.BiomeGenMoor;
import biomesoplenty.biomes.BiomeGenMountain;
import biomesoplenty.biomes.BiomeGenMysticGrove;
import biomesoplenty.biomes.BiomeGenMysticGroveThin;
import biomesoplenty.biomes.BiomeGenOasis;
import biomesoplenty.biomes.BiomeGenOminousWoods;
import biomesoplenty.biomes.BiomeGenOminousWoodsThick;
@ -157,7 +158,7 @@ public class BOPBiomes {
initializeBiomes();
//Initialize new world type
WTBiomesOP = new WorldTypeBOP();
//WTBiomesOP = new WorldTypeBOP();
// Adding biomes to World Types
addBiomes();
@ -233,7 +234,8 @@ public class BOPBiomes {
Biomes.mesa = Optional.of((new BiomeGenMesa(BOPConfigurationIDs.mesaID)).setColor(16421912).setBiomeName("Mesa").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.4F, 2.0F));
Biomes.moor = Optional.of((new BiomeGenMoor(BOPConfigurationIDs.moorID)).setColor(16421912).setBiomeName("Moor").setTemperatureRainfall(0.5F, 1.0F).setMinMaxHeight(0.7F, 0.8F));
Biomes.mountain = Optional.of((new BiomeGenMountain(BOPConfigurationIDs.mountainID)).setColor(14090235).setBiomeName("Mountain").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(1.0F, 1.5F));
Biomes.mysticGrove = Optional.of((new BiomeGenMysticGrove(BOPConfigurationIDs.mysticGroveID)).setColor(353825).setBiomeName("Mystic Grove").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F));
Biomes.mysticGrove = Optional.of((new BiomeGenMysticGrove(BOPConfigurationIDs.mysticGroveID)).setColor(353825).setBiomeName("Mystic Grove").func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F).setMinMaxHeight(0.3F, 0.8F));
Biomes.mysticGroveThin = Optional.of((new BiomeGenMysticGroveThin(BOPConfigurationIDs.mysticGroveThinID)).setColor(353825).setBiomeName("Thinned Mystic Grove").func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F).setMinMaxHeight(0.1F, 0.3F));
Biomes.netherBase = Optional.of((new BiomeGenNetherBase(BOPConfigurationIDs.netherBaseID)).setColor(16711680).setBiomeName("Nether").setDisableRain().setTemperatureRainfall(2.0F, 0.0F));
Biomes.netherGarden = Optional.of((new BiomeGenNetherGarden(BOPConfigurationIDs.netherGardenID)).setColor(16711680).setBiomeName("Undergarden").setDisableRain().setTemperatureRainfall(2.0F, 0.0F));
@ -248,8 +250,8 @@ public class BOPBiomes {
Biomes.oceanCoral = Optional.of((new BiomeGenOceanCoral(BOPConfigurationIDs.oceanCoralID)).setColor(10486015).setBiomeName("Coral Reef").setMinMaxHeight(-0.1F, 0.0F).setTemperatureRainfall(0.5F, 0.9F));
Biomes.oceanKelp = Optional.of((new BiomeGenOceanKelp(BOPConfigurationIDs.oceanKelpID)).setColor(10486015).setBiomeName("Kelp Forest").setMinMaxHeight(-0.4F, -0.1F).setTemperatureRainfall(0.5F, 0.9F));
Biomes.ominousWoods = Optional.of((new BiomeGenOminousWoods(BOPConfigurationIDs.ominousWoodsID)).setColor(353825).setBiomeName("Ominous Woods").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F));
Biomes.ominousWoodsThick = Optional.of((new BiomeGenOminousWoodsThick(BOPConfigurationIDs.ominousWoodsThickID)).setColor(353825).setBiomeName("Thick Ominous Woods").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F));
Biomes.ominousWoods = Optional.of((new BiomeGenOminousWoods(BOPConfigurationIDs.ominousWoodsID)).setColor(353825).setBiomeName("Ominous Woods").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F).setMinMaxHeight(0.1F, 0.3F));
Biomes.ominousWoodsThick = Optional.of((new BiomeGenOminousWoodsThick(BOPConfigurationIDs.ominousWoodsThickID)).setColor(353825).setBiomeName("Thick Ominous Woods").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F).setMinMaxHeight(0.4F, 0.8F));
Biomes.orchard = Optional.of((new BiomeGenOrchard(BOPConfigurationIDs.orchardID)).setColor(9286496).setBiomeName("Orchard").setTemperatureRainfall(0.8F, 0.4F));
Biomes.originValley = Optional.of((new BiomeGenOriginValley(BOPConfigurationIDs.originValleyID)).setColor(353825).setBiomeName("Origin Valley").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.2F, 0.6F));
Biomes.outback = Optional.of((new BiomeGenOutback(BOPConfigurationIDs.outbackID)).setColor(9286496).setBiomeName("Outback").setTemperatureRainfall(0.8F, 0.05F).setMinMaxHeight(0.3F, 0.4F));
@ -375,7 +377,9 @@ public class BOPBiomes {
BiomeDictionary.registerBiomeType(Biomes.mesa.get(), Type.DESERT, Type.WASTELAND, Type.MOUNTAIN);
BiomeDictionary.registerBiomeType(Biomes.moor.get(), Type.HILLS, Type.SWAMP);
BiomeDictionary.registerBiomeType(Biomes.mountain.get(), Type.MOUNTAIN);
BiomeDictionary.registerBiomeType(Biomes.mysticGrove.get(), Type.MAGICAL, Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.mysticGroveThin.get(), Type.MAGICAL, Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.netherBase.get(), Type.NETHER);
BiomeDictionary.registerBiomeType(Biomes.netherGarden.get(), Type.NETHER, Type.JUNGLE);
@ -1511,7 +1515,7 @@ public class BOPBiomes {
worldTypes.add(WorldType.DEFAULT);
worldTypes.add(WorldType.LARGE_BIOMES);
}
worldTypes.add(WTBiomesOP);
//worldTypes.add(WTBiomesOP);
}
return ImmutableSet.copyOf(worldTypes);
}

3
common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java
View File

@ -214,6 +214,7 @@ public class BOPConfigurationIDs
public static int moorID;
public static int mountainID;
public static int mysticGroveID;
public static int mysticGroveThinID;
public static int netherBaseID;
public static int netherGardenID;
@ -485,8 +486,8 @@ public class BOPConfigurationIDs
//23-79 ExtraBiomesXL
mysticGroveThinID = config.get("Biome IDs", "Thinned Mystic Grove (Sub-Biome) ID", 29).getInt();
netherBloodID = config.get("Biome IDs", "Bloody Heap (Nether) ID", 30).getInt();
lavenderFieldsID = config.get("Biome IDs", "Lavender Fields ID", 31).getInt();
tropicsMountainID = config.get("Biome IDs", "Tropics Mountain (Sub-Biome) ID", 32).getInt();
autumnHillsID = config.get("Biome IDs", "Autumn Hills ID", 33).getInt();

6
common/biomesoplenty/configuration/configfile/BOPConfigurationMisc.java
View File

@ -59,9 +59,9 @@ public class BOPConfigurationMisc
promisedLandSkyColor = config.get("Hard-Coded Colors", "Promised Land Sky Color", 50175, null).getInt();
grassColourSmoothingArea = config.get("Biome Transition Colour Smoothing", "Grass Colour Smoothing Area", 5, "In Vanilla this is 1.").getInt();
leavesColourSmoothingArea = config.get("Biome Transition Colour Smoothing", "Leaves Colour Smoothing Area", 5, "In Vanilla this is 1.").getInt();
waterColourSmoothingArea = config.get("Biome Transition Colour Smoothing", "Water Colour Smoothing Area", 5, "In Vanilla this is 1.").getInt();
grassColourSmoothingArea = config.get("Biome Transition Colour Smoothing", "Grass Colour Smoothing Area", 1, "In Vanilla this is 1. Set to 5 for optimal smoothing").getInt();
leavesColourSmoothingArea = config.get("Biome Transition Colour Smoothing", "Leaves Colour Smoothing Area", 1, "In Vanilla this is 1. Set to 5 for optimal smoothing").getInt();
waterColourSmoothingArea = config.get("Biome Transition Colour Smoothing", "Water Colour Smoothing Area", 1, "In Vanilla this is 1. Set to 5 for optimal smoothing").getInt();
FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Misc Config!");
}

4
common/biomesoplenty/helpers/Version.java
View File

@ -9,6 +9,7 @@ import java.util.logging.Level;
import net.minecraft.world.World;
import net.minecraft.world.WorldType;
import net.minecraftforge.common.Property;
import biomesoplenty.configuration.BOPBiomes;
import biomesoplenty.configuration.configfile.BOPConfigurationMain;
import biomesoplenty.world.WorldTypeBOP;
import cpw.mods.fml.common.FMLCommonHandler;
@ -62,7 +63,6 @@ public class Version implements Runnable {
public static boolean needsBOPWorldtypeAndMarkAsSeen(World world)
{
WorldType terrainType = world.getWorldInfo().getTerrainType();
WorldTypeBOP bopType = new WorldTypeBOP();
Property property = BOPConfigurationMain.config.get("Vars", "Seen WorldType Msg", false);
String worldTypeProp = property.getString();
@ -70,7 +70,7 @@ public class Version implements Runnable {
if (terrainType == null || property.getBoolean(false) == true)
return false;
if (terrainType.getWorldTypeName().equals(bopType.getWorldTypeName()) || terrainType.getWorldTypeName().equals("ATG"))
if (terrainType.getWorldTypeName().equals(BOPBiomes.WTBiomesOP.getWorldTypeName()) || terrainType.getWorldTypeName().equals("ATG"))
{
property.set(true);

26
common/biomesoplenty/integration/ATGIntegration.java
View File

@ -316,24 +316,22 @@ public class ATGIntegration
// Steppe
// ########################
// tier 0
// tier 1
// tier 2
if (cragGen) ATGBiomes.addBiome(land, "Steppe", Biomes.crag.get(), tiers[2]);
// tier 3
if (cragGen) ATGBiomes.addBiome(land, "Steppe", Biomes.crag.get(), tiers[2]);
// tier 4
if (mountainGen) ATGBiomes.addBiome(land, "Steppe", Biomes.mountain.get(), tiers[4]);
// tier 5
if (deadForestGen) ATGBiomes.addBiome(land, "Steppe", Biomes.deadForest.get(), tiers[5]);
if (mountainGen) ATGBiomes.addBiome(land, "Steppe", Biomes.mountain.get(), tiers[4]);
// tier 6
if (deadlandsGen) ATGBiomes.addBiome(land, "Steppe", Biomes.deadlands.get(), tiers[6]);
if (wastelandGen) ATGBiomes.addBiome(land, "Steppe", Biomes.wasteland.get(), tiers[6]);
// tier 6
if (deadForestGen) ATGBiomes.addBiome(land, "Steppe", Biomes.deadForest.get(), tiers[5]);
if (deadlandsGen) ATGBiomes.addBiome(land, "Steppe", Biomes.deadlands.get(), tiers[5]);
if (wastelandGen) ATGBiomes.addBiome(land, "Steppe", Biomes.wasteland.get(), tiers[5]);
}
private static void addSavannahBiomesGroup()
@ -425,29 +423,29 @@ public class ATGIntegration
// Swampland
// ########################
// tier 0
// tier 1
if (wetlandGen) ATGBiomes.addBiome(coast, "Swampland", Biomes.wetland.get(), tiers[0]);
// tier 1
// tier 2
if (marshGen) ATGBiomes.addBiome(coast, "Swampland", Biomes.marsh.get(), tiers[1]);
if (lushSwampGen) ATGBiomes.addBiome(coast, "Swampland", Biomes.lushSwamp.get(), tiers[1]);
if (bayouGen) ATGBiomes.addBiome(coast, "Swampland", Biomes.bayou.get(), tiers[1]);
// tier 2
// tier 3
if (swamplandGen) ATGBiomes.replaceBiome(coast, "Swampland", BiomeGenBase.swampland, Biomes.swamplandNew.get(), tiers[2]);
if (fenGen) ATGBiomes.addBiome(coast, "Swampland", Biomes.fen.get(), tiers[2]);
if (bogGen) ATGBiomes.addBiome(coast, "Swampland", Biomes.bog.get(), tiers[2]);
if (mangroveGen) ATGBiomes.addBiome(coast, "Swampland", Biomes.mangrove.get(), tiers[2]);
// tier 3
// tier 4
if (moorGen) ATGBiomes.addBiome(coast, "Swampland", Biomes.moor.get(), tiers[3]);
if (deadSwampGen) ATGBiomes.addBiome(coast, "Swampland", Biomes.deadSwamp.get(), tiers[3]);
// tier 4
// tier 5
if (quagmireGen) ATGBiomes.addBiome(coast, "Swampland", Biomes.quagmire.get(), tiers[4]);
if (sludgepitGen) ATGBiomes.addBiome(coast, "Swampland", Biomes.sludgepit.get(), tiers[4]);
// tier 5
// tier 6
if (ominousWoodsGen) ATGBiomes.addBiome(coast, "Swampland", Biomes.ominousWoods.get(), tiers[5]);
if (silkgladesGen) ATGBiomes.addBiome(coast, "Swampland", Biomes.silkglades.get(), tiers[5]);

2
common/biomesoplenty/world/WorldTypeBOP.java
View File

@ -15,7 +15,7 @@ public class WorldTypeBOP extends WorldType
{
public WorldTypeBOP() {
super(4, "BIOMESOP");
this.biomesForWorldType = super.getBiomesForWorldType();
this.biomesForWorldType = WorldType.DEFAULT.getBiomesForWorldType();
this.removeAllBiomes();
if (BOPConfigurationBiomeGen.alpsGen == true)

1
common/biomesoplenty/world/layer/BiomeLayerSub.java
View File

@ -41,6 +41,7 @@ public class BiomeLayerSub extends BiomeLayer
if (k1 == Biomes.field.get().biomeID && nextInt(2) == 0) { l1 = Biomes.fieldForest.get().biomeID; }
if (k1 == Biomes.savanna.get().biomeID && nextInt(4) == 0) { l1 = Biomes.savannaPlateau.get().biomeID; }
if (k1 == Biomes.tropics.get().biomeID && nextInt(3) == 0) { l1 = Biomes.tropicsMountain.get().biomeID; }
if (k1 == Biomes.mysticGrove.get().biomeID && nextInt(3) == 0) { l1 = Biomes.mysticGroveThin.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(3) == 0) { l1 = Biomes.forestHillsNew.get().biomeID; }
if (k1 == Biomes.taigaNew.get().biomeID && nextInt(3) == 0) { l1 = Biomes.taigaHillsNew.get().biomeID; }

107
common/biomesoplenty/worldgen/tree/WorldGenMystic2.java
View File

@ -9,121 +9,98 @@ import biomesoplenty.api.Blocks;
public class WorldGenMystic2 extends WorldGenerator
{
public WorldGenMystic2(boolean var1)
public WorldGenMystic2(boolean par1)
{
super(var1);
super(par1);
}
@Override
public boolean generate(World var1, Random var2, int var3, int var4, int var5)
public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5)
{
int var6 = var2.nextInt(15) + 15;
int var7 = var2.nextInt(3) + 5;
int var8 = var6 - var7;
int var9 = 1 + var2.nextInt(3);
boolean var10 = true;
int var6 = par2Random.nextInt(3) + 5;
boolean var7 = true;
if (var4 >= 1 && var4 + var6 + 1 <= 256)
if (par4 >= 1 && par4 + var6 + 1 <= 256)
{
int var8;
int var10;
int var11;
int var13;
int var15;
int var21;
int var12;
for (var11 = var4; var11 <= var4 + 1 + var6 && var10; ++var11)
for (var8 = par4; var8 <= par4 + 1 + var6; ++var8)
{
boolean var12 = true;
byte var9 = 1;
if (var11 - var4 < var7)
if (var8 == par4)
{
var21 = 0;
}
else
{
var21 = var9;
var9 = 0;
}
for (var13 = var3 - var21; var13 <= var3 + var21 && var10; ++var13)
if (var8 >= par4 + 1 + var6 - 2)
{
for (int var14 = var5 - var21; var14 <= var5 + var21 && var10; ++var14)
var9 = 2;
}
for (var10 = par3 - var9; var10 <= par3 + var9 && var7; ++var10)
{
for (var11 = par5 - var9; var11 <= par5 + var9 && var7; ++var11)
{
if (var11 >= 0 && var11 < 256)
if (var8 >= 0 && var8 < 256)
{
var15 = var1.getBlockId(var13, var11, var14);
var12 = par1World.getBlockId(var10, var8, var11);
if (var15 != 0 && var15 != Blocks.leaves1.get().blockID)
if (var12 != 0 && var12 != Blocks.leaves1.get().blockID)
{
var10 = false;
var7 = false;
}
}
else
{
var10 = false;
var7 = false;
}
}
}
}
if (!var10)
if (!var7)
return false;
else
{
var11 = var1.getBlockId(var3, var4 - 1, var5);
var8 = par1World.getBlockId(par3, par4 - 1, par5);
if ((var11 == Blocks.holyGrass.get().blockID || var11 == Block.grass.blockID || var11 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
if ((var8 == Block.grass.blockID || var8 == Block.dirt.blockID) && par4 < 256 - var6 - 1)
{
var1.setBlock(var3, var4 - 1, var5, Block.dirt.blockID);
var21 = var2.nextInt(2);
var13 = 1;
boolean var22 = false;
int var17;
this.setBlock(par1World, par3, par4 - 1, par5, Block.dirt.blockID);
int var16;
for (var15 = 0; var15 <= var8; ++var15)
for (var16 = par4 - 3 + var6; var16 <= par4 + var6; ++var16)
{
var16 = var4 + var6 - var15;
var10 = var16 - (par4 + var6);
var11 = 1 - var10 / 2;
for (var17 = var3 - var21; var17 <= var3 + var21; ++var17)
for (var12 = par3 - var11; var12 <= par3 + var11; ++var12)
{
int var18 = var17 - var3;
int var13 = var12 - par3;
for (int var19 = var5 - var21; var19 <= var5 + var21; ++var19)
for (int var14 = par5 - var11; var14 <= par5 + var11; ++var14)
{
int var20 = var19 - var5;
int var15 = var14 - par5;
if ((Math.abs(var18) != var21 || Math.abs(var20) != var21 || var21 <= 0) && !Block.opaqueCubeLookup[var1.getBlockId(var17, var16, var19)])
if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var12, var16, var14)])
{
this.setBlockAndMetadata(var1, var17, var16, var19, Blocks.leaves1.get().blockID, 2);
this.setBlockAndMetadata(par1World, var12, var16, var14, Blocks.leaves1.get().blockID, 2);
}
}
}
if (var21 >= var13)
{
var21 = var22 ? 1 : 0;
var22 = true;
++var13;
if (var13 > var9)
{
var13 = var9;
}
}
else
{
++var21;
}
}
var15 = var2.nextInt(3);
for (var16 = 0; var16 < var6 - var15; ++var16)
for (var16 = 0; var16 < var6; ++var16)
{
var17 = var1.getBlockId(var3, var4 + var16, var5);
var10 = par1World.getBlockId(par3, par4 + var16, par5);
if (var17 == 0 || var17 == Blocks.leaves1.get().blockID)
if (var10 == 0 || var10 == Blocks.leaves1.get().blockID)
{
this.setBlockAndMetadata(var1, var3, var4 + var16, var5, Blocks.logs2.get().blockID,1);
this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Blocks.logs2.get().blockID, 1);
}
}

124
common/biomesoplenty/worldgen/tree/WorldGenOminous4.java
View File

@ -17,10 +17,10 @@ public class WorldGenOminous4 extends WorldGenerator
@Override
public boolean generate(World var1, Random var2, int var3, int var4, int var5)
{
int var6 = var2.nextInt(20) + 15;
int var7 = var2.nextInt(10) + 5;
int var6 = var2.nextInt(10) + 35;
int var7 = var2.nextInt(5) + 10;
int var8 = var6 - var7;
int var9 = 3 + var2.nextInt(1);
int var9 = 4;
boolean var10 = true;
if (var4 >= 1 && var4 + var6 + 1 <= 256)
@ -30,6 +30,7 @@ public class WorldGenOminous4 extends WorldGenerator
int var14;
int var15;
int var24;
int var25;
for (var11 = var4; var11 <= var4 + 1 + var6 && var10; ++var11)
{
@ -70,9 +71,10 @@ public class WorldGenOminous4 extends WorldGenerator
else
{
var11 = var1.getBlockId(var3, var4 - 1, var5);
var25 = var1.getBlockId(var3 + 1, var4 - 1, var5);
var24 = var1.getBlockId(var3 - 1, var4 - 1, var5);
var13 = var1.getBlockId(var3, var4 - 1, var5 - 1);
var14 = var1.getBlockId(var3 - 1, var4 - 1, var5 - 1);
var13 = var1.getBlockId(var3, var4 - 1, var5 + 1);
var14 = var1.getBlockId(var3, var4 - 1, var5 - 1);
if ((var11 == Block.grass.blockID || var11 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
{
@ -82,72 +84,84 @@ public class WorldGenOminous4 extends WorldGenerator
{
if ((var14 == Block.grass.blockID || var24 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
{
var1.setBlock(var3, var4 - 1, var5, Block.dirt.blockID);
var1.setBlock(var3 - 1, var4 - 1, var5, Block.dirt.blockID);
var1.setBlock(var3, var4 - 1, var5 - 1, Block.dirt.blockID);
var1.setBlock(var3 - 1, var4 - 1, var5 - 1, Block.dirt.blockID);
var15 = var2.nextInt(2);
int var16 = 1;
boolean var17 = false;
int var19;
int var18;
int var20;
for (var18 = 0; var18 <= var8; ++var18)
if ((var25 == Block.grass.blockID || var25 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
{
var19 = var4 + var6 - var18;
var1.setBlock(var3, var4 - 1, var5, Block.dirt.blockID);
var1.setBlock(var3 + 1, var4 - 1, var5, Block.dirt.blockID);
var1.setBlock(var3 - 1, var4 - 1, var5, Block.dirt.blockID);
var1.setBlock(var3, var4 - 1, var5 + 1, Block.dirt.blockID);
var1.setBlock(var3, var4 - 1, var5 - 1, Block.dirt.blockID);
var15 = var2.nextInt(2);
int var16 = 1;
boolean var17 = false;
int var19;
int var18;
int var20;
for (var20 = var3 - var15; var20 <= var3 + var15; ++var20)
for (var18 = 0; var18 <= var8; ++var18)
{
int var21 = var20 - var3;
var19 = var4 + var6 - var18;
for (int var22 = var5 - var15; var22 <= var5 + var15; ++var22)
for (var20 = var3 - var15; var20 <= var3 + var15; ++var20)
{
int var23 = var22 - var5;
int var21 = var20 - var3;
if ((Math.abs(var21) != var15 || Math.abs(var23) != var15 || var15 <= 0) && !Block.opaqueCubeLookup[var1.getBlockId(var20, var19, var22)])
for (int var22 = var5 - var15; var22 <= var5 + var15; ++var22)
{
this.setBlockAndMetadata(var1, var20, var19, var22, Blocks.leaves1.get().blockID, 3);
this.setBlockAndMetadata(var1, var20 - 1, var19, var22, Blocks.leaves1.get().blockID, 3);
this.setBlockAndMetadata(var1, var20, var19, var22 - 1, Blocks.leaves1.get().blockID, 3);
this.setBlockAndMetadata(var1, var20 - 1, var19, var22 - 1, Blocks.leaves1.get().blockID, 3);
int var23 = var22 - var5;
if ((Math.abs(var21) != var15 || Math.abs(var23) != var15 || var15 <= 0) && !Block.opaqueCubeLookup[var1.getBlockId(var20, var19, var22)])
{
this.setBlockAndMetadata(var1, var20, var19, var22, Blocks.leaves1.get().blockID, 3);
this.setBlockAndMetadata(var1, var20 + 1, var19, var22, Blocks.leaves1.get().blockID, 3);
this.setBlockAndMetadata(var1, var20 - 1, var19, var22, Blocks.leaves1.get().blockID, 3);
this.setBlockAndMetadata(var1, var20, var19, var22 + 1, Blocks.leaves1.get().blockID, 3);
this.setBlockAndMetadata(var1, var20, var19, var22 - 1, Blocks.leaves1.get().blockID, 3);
//this.setBlockAndMetadata(var1, var20 + 1, var19, var22 + 1, Blocks.leaves1.get().blockID, 0);
//this.setBlockAndMetadata(var1, var20 - 1, var19, var22 - 1, Blocks.leaves1.get().blockID, 0);
//this.setBlockAndMetadata(var1, var20 - 1, var19, var22 + 1, Blocks.leaves1.get().blockID, 0);
//this.setBlockAndMetadata(var1, var20 + 1, var19, var22 - 1, Blocks.leaves1.get().blockID, 0);
}
}
}
}
if (var15 >= var16)
{
var15 = var17 ? 1 : 0;
var17 = true;
++var16;
if (var16 > var9)
if (var15 >= var16)
{
var16 = var9;
var15 = var17 ? 1 : 0;
var17 = true;
++var16;
if (var16 > var9)
{
var16 = var9;
}
}
else
{
++var15;
}
}
else
var18 = var2.nextInt(3);
for (var19 = 0; var19 < var6 - var18; ++var19)
{
++var15;
var20 = var1.getBlockId(var3, var4 + var19, var5);
if (var20 == 0 || var20 == Blocks.leaves1.get().blockID)
{
this.setBlockAndMetadata(var1, var3, var4 + var19, var5, Blocks.logs1.get().blockID, 2);
this.setBlockAndMetadata(var1, var3 + 1, var4 + var19, var5, Blocks.logs1.get().blockID, 2);
this.setBlockAndMetadata(var1, var3 - 1, var4 + var19, var5, Blocks.logs1.get().blockID, 2);
this.setBlockAndMetadata(var1, var3, var4 + var19, var5 + 1, Blocks.logs1.get().blockID, 2);
this.setBlockAndMetadata(var1, var3, var4 + var19, var5 - 1, Blocks.logs1.get().blockID, 2);
}
}
}
var18 = var2.nextInt(3);
for (var19 = 0; var19 < var6 - var18; ++var19)
{
var20 = var1.getBlockId(var3, var4 + var19, var5);
if (var20 == 0 || var20 == Blocks.leaves1.get().blockID)
{
this.setBlockAndMetadata(var1, var3, var4 + var19, var5, Blocks.logs1.get().blockID, 2);
this.setBlockAndMetadata(var1, var3 - 1, var4 + var19, var5, Blocks.logs1.get().blockID, 2);
this.setBlockAndMetadata(var1, var3, var4 + var19, var5 - 1, Blocks.logs1.get().blockID, 2);
this.setBlockAndMetadata(var1, var3 - 1, var4 + var19, var5 - 1, Blocks.logs1.get().blockID, 2);
}
}
return true;
return true;
} else
return false;
} else
return false;
} else

2
common/biomesoplenty/worldgen/tree/WorldGenSequoia.java
View File

@ -20,7 +20,7 @@ public class WorldGenSequoia extends WorldGenerator
int var6 = var2.nextInt(10) + 35;
int var7 = var2.nextInt(5) + 10;
int var8 = var6 - var7;
int var9 = 3;
int var9 = 4;
boolean var10 = true;
if (var4 >= 1 && var4 + var6 + 1 <= 256)

177
common/biomesoplenty/worldgen/tree/WorldGenSequoiaOrange.java Normal file
View File

@ -0,0 +1,177 @@
package biomesoplenty.worldgen.tree;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks;
public class WorldGenSequoiaOrange extends WorldGenerator
{
public WorldGenSequoiaOrange(boolean var1)
{
super(var1);
}
@Override
public boolean generate(World var1, Random var2, int var3, int var4, int var5)
{
int var6 = var2.nextInt(10) + 25;
int var7 = var2.nextInt(4) + 8;
int var8 = var6 - var7;
int var9 = 4;
boolean var10 = true;
if (var4 >= 1 && var4 + var6 + 1 <= 256)
{
int var11;
int var13;
int var14;
int var15;
int var24;
int var25;
for (var11 = var4; var11 <= var4 + 1 + var6 && var10; ++var11)
{
boolean var12 = true;
if (var11 - var4 < var7)
{
var24 = 0;
}
else
{
var24 = var9;
}
for (var13 = var3 - var24; var13 <= var3 + var24 && var10; ++var13)
{
for (var14 = var5 - var24; var14 <= var5 + var24 && var10; ++var14)
{
if (var11 >= 0 && var11 < 256)
{
var15 = var1.getBlockId(var13, var11, var14);
if (var15 != 0 && var15 != Blocks.leaves1.get().blockID)
{
var10 = false;
}
}
else
{
var10 = false;
}
}
}
}
if (!var10)
return false;
else
{
var11 = var1.getBlockId(var3, var4 - 1, var5);
var25 = var1.getBlockId(var3 + 1, var4 - 1, var5);
var24 = var1.getBlockId(var3 - 1, var4 - 1, var5);
var13 = var1.getBlockId(var3, var4 - 1, var5 + 1);
var14 = var1.getBlockId(var3, var4 - 1, var5 - 1);
if ((var11 == Block.grass.blockID || var11 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
{
if ((var24 == Block.grass.blockID || var24 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
{
if ((var13 == Block.grass.blockID || var24 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
{
if ((var14 == Block.grass.blockID || var24 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
{
if ((var25 == Block.grass.blockID || var25 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
{
var1.setBlock(var3, var4 - 1, var5, Block.dirt.blockID);
var1.setBlock(var3 + 1, var4 - 1, var5, Block.dirt.blockID);
var1.setBlock(var3 - 1, var4 - 1, var5, Block.dirt.blockID);
var1.setBlock(var3, var4 - 1, var5 + 1, Block.dirt.blockID);
var1.setBlock(var3, var4 - 1, var5 - 1, Block.dirt.blockID);
var15 = var2.nextInt(2);
int var16 = 1;
boolean var17 = false;
int var19;
int var18;
int var20;
for (var18 = 0; var18 <= var8; ++var18)
{
var19 = var4 + var6 - var18;
for (var20 = var3 - var15; var20 <= var3 + var15; ++var20)
{
int var21 = var20 - var3;
for (int var22 = var5 - var15; var22 <= var5 + var15; ++var22)
{
int var23 = var22 - var5;
if ((Math.abs(var21) != var15 || Math.abs(var23) != var15 || var15 <= 0) && !Block.opaqueCubeLookup[var1.getBlockId(var20, var19, var22)])
{
this.setBlockAndMetadata(var1, var20, var19, var22, Blocks.leaves1.get().blockID, 7);
this.setBlockAndMetadata(var1, var20 + 1, var19, var22, Blocks.leaves1.get().blockID, 7);
this.setBlockAndMetadata(var1, var20 - 1, var19, var22, Blocks.leaves1.get().blockID, 7);
this.setBlockAndMetadata(var1, var20, var19, var22 + 1, Blocks.leaves1.get().blockID, 7);
this.setBlockAndMetadata(var1, var20, var19, var22 - 1, Blocks.leaves1.get().blockID, 7);
//this.setBlockAndMetadata(var1, var20 + 1, var19, var22 + 1, Blocks.leaves1.get().blockID, 0);
//this.setBlockAndMetadata(var1, var20 - 1, var19, var22 - 1, Blocks.leaves1.get().blockID, 0);
//this.setBlockAndMetadata(var1, var20 - 1, var19, var22 + 1, Blocks.leaves1.get().blockID, 0);
//this.setBlockAndMetadata(var1, var20 + 1, var19, var22 - 1, Blocks.leaves1.get().blockID, 0);
}
}
}
if (var15 >= var16)
{
var15 = var17 ? 1 : 0;
var17 = true;
++var16;
if (var16 > var9)
{
var16 = var9;
}
}
else
{
++var15;
}
}
var18 = var2.nextInt(3);
for (var19 = 0; var19 < var6 - var18; ++var19)
{
var20 = var1.getBlockId(var3, var4 + var19, var5);
if (var20 == 0 || var20 == Blocks.leaves1.get().blockID)
{
this.setBlockAndMetadata(var1, var3, var4 + var19, var5, Block.wood.blockID, 0);
this.setBlockAndMetadata(var1, var3 + 1, var4 + var19, var5, Block.wood.blockID, 0);
this.setBlockAndMetadata(var1, var3 - 1, var4 + var19, var5, Block.wood.blockID, 0);
this.setBlockAndMetadata(var1, var3, var4 + var19, var5 + 1, Block.wood.blockID, 0);
this.setBlockAndMetadata(var1, var3, var4 + var19, var5 - 1, Block.wood.blockID, 0);
}
}
return true;
} else
return false;
} else
return false;
} else
return false;
} else
return false;
} else
return false;
}
} else
return false;
}
}

177
common/biomesoplenty/worldgen/tree/WorldGenSequoiaYellow.java Normal file
View File

@ -0,0 +1,177 @@
package biomesoplenty.worldgen.tree;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks;
public class WorldGenSequoiaYellow extends WorldGenerator
{
public WorldGenSequoiaYellow(boolean var1)
{
super(var1);
}
@Override
public boolean generate(World var1, Random var2, int var3, int var4, int var5)
{
int var6 = var2.nextInt(15) + 15;
int var7 = var2.nextInt(5) + 5;
int var8 = var6 - var7;
int var9 = 3;
boolean var10 = true;
if (var4 >= 1 && var4 + var6 + 1 <= 256)
{
int var11;
int var13;
int var14;
int var15;
int var24;
int var25;
for (var11 = var4; var11 <= var4 + 1 + var6 && var10; ++var11)
{
boolean var12 = true;
if (var11 - var4 < var7)
{
var24 = 0;
}
else
{
var24 = var9;
}
for (var13 = var3 - var24; var13 <= var3 + var24 && var10; ++var13)
{
for (var14 = var5 - var24; var14 <= var5 + var24 && var10; ++var14)
{
if (var11 >= 0 && var11 < 256)
{
var15 = var1.getBlockId(var13, var11, var14);
if (var15 != 0 && var15 != Blocks.leaves1.get().blockID)
{
var10 = false;
}
}
else
{
var10 = false;
}
}
}
}
if (!var10)
return false;
else
{
var11 = var1.getBlockId(var3, var4 - 1, var5);
var25 = var1.getBlockId(var3 + 1, var4 - 1, var5);
var24 = var1.getBlockId(var3 - 1, var4 - 1, var5);
var13 = var1.getBlockId(var3, var4 - 1, var5 + 1);
var14 = var1.getBlockId(var3, var4 - 1, var5 - 1);
if ((var11 == Block.grass.blockID || var11 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
{
if ((var24 == Block.grass.blockID || var24 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
{
if ((var13 == Block.grass.blockID || var24 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
{
if ((var14 == Block.grass.blockID || var24 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
{
if ((var25 == Block.grass.blockID || var25 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
{
var1.setBlock(var3, var4 - 1, var5, Block.dirt.blockID);
var1.setBlock(var3 + 1, var4 - 1, var5, Block.dirt.blockID);
var1.setBlock(var3 - 1, var4 - 1, var5, Block.dirt.blockID);
var1.setBlock(var3, var4 - 1, var5 + 1, Block.dirt.blockID);
var1.setBlock(var3, var4 - 1, var5 - 1, Block.dirt.blockID);
var15 = var2.nextInt(2);
int var16 = 1;
boolean var17 = false;
int var19;
int var18;
int var20;
for (var18 = 0; var18 <= var8; ++var18)
{
var19 = var4 + var6 - var18;
for (var20 = var3 - var15; var20 <= var3 + var15; ++var20)
{
int var21 = var20 - var3;
for (int var22 = var5 - var15; var22 <= var5 + var15; ++var22)
{
int var23 = var22 - var5;
if ((Math.abs(var21) != var15 || Math.abs(var23) != var15 || var15 <= 0) && !Block.opaqueCubeLookup[var1.getBlockId(var20, var19, var22)])
{
this.setBlockAndMetadata(var1, var20, var19, var22, Blocks.leaves1.get().blockID, 0);
this.setBlockAndMetadata(var1, var20 + 1, var19, var22, Blocks.leaves1.get().blockID, 0);
this.setBlockAndMetadata(var1, var20 - 1, var19, var22, Blocks.leaves1.get().blockID, 0);
this.setBlockAndMetadata(var1, var20, var19, var22 + 1, Blocks.leaves1.get().blockID, 0);
this.setBlockAndMetadata(var1, var20, var19, var22 - 1, Blocks.leaves1.get().blockID, 0);
//this.setBlockAndMetadata(var1, var20 + 1, var19, var22 + 1, Blocks.leaves1.get().blockID, 0);
//this.setBlockAndMetadata(var1, var20 - 1, var19, var22 - 1, Blocks.leaves1.get().blockID, 0);
//this.setBlockAndMetadata(var1, var20 - 1, var19, var22 + 1, Blocks.leaves1.get().blockID, 0);
//this.setBlockAndMetadata(var1, var20 + 1, var19, var22 - 1, Blocks.leaves1.get().blockID, 0);
}
}
}
if (var15 >= var16)
{
var15 = var17 ? 1 : 0;
var17 = true;
++var16;
if (var16 > var9)
{
var16 = var9;
}
}
else
{
++var15;
}
}
var18 = var2.nextInt(3);
for (var19 = 0; var19 < var6 - var18; ++var19)
{
var20 = var1.getBlockId(var3, var4 + var19, var5);
if (var20 == 0 || var20 == Blocks.leaves1.get().blockID)
{
this.setBlockAndMetadata(var1, var3, var4 + var19, var5, Block.wood.blockID, 0);
this.setBlockAndMetadata(var1, var3 + 1, var4 + var19, var5, Block.wood.blockID, 0);
this.setBlockAndMetadata(var1, var3 - 1, var4 + var19, var5, Block.wood.blockID, 0);
this.setBlockAndMetadata(var1, var3, var4 + var19, var5 + 1, Block.wood.blockID, 0);
this.setBlockAndMetadata(var1, var3, var4 + var19, var5 - 1, Block.wood.blockID, 0);
}
}
return true;
} else
return false;
} else
return false;
} else
return false;
} else
return false;
} else
return false;
}
} else
return false;
}
}