diff --git a/common/biomesoplenty/biomes/BiomeGenConiferousForest.java b/common/biomesoplenty/biomes/BiomeGenConiferousForest.java index 676cabe90..9db1e4ce5 100644 --- a/common/biomesoplenty/biomes/BiomeGenConiferousForest.java +++ b/common/biomesoplenty/biomes/BiomeGenConiferousForest.java @@ -29,7 +29,7 @@ public class BiomeGenConiferousForest extends BiomeGenBase spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 8, 4, 4)); theBiomeDecorator = new BiomeDecoratorBOP(this); customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; - customBiomeDecorator.treesPerChunk = 6; + customBiomeDecorator.treesPerChunk = 8; customBiomeDecorator.grassPerChunk = 10; customBiomeDecorator.mushroomsPerChunk = 8; customBiomeDecorator.toadstoolsPerChunk = 3; @@ -56,7 +56,7 @@ public class BiomeGenConiferousForest extends BiomeGenBase return par1Random.nextInt(5) == 0 ? new WorldGenFir1() : (par1Random.nextInt(3) == 0 ? new WorldGenFir2() : new WorldGenFir3()); } - return par1Random.nextInt(5) == 0 ? new WorldGenTaiga3(false) : (par1Random.nextInt(3) == 0 ? new WorldGenTaiga4(false) : new WorldGenTaiga9(false)); + return par1Random.nextInt(3) == 0 ? new WorldGenTaiga3(false) : (par1Random.nextInt(5) == 0 ? new WorldGenTaiga4(false) : new WorldGenTaiga9(false)); } /** diff --git a/common/biomesoplenty/biomes/BiomeGenCrag.java b/common/biomesoplenty/biomes/BiomeGenCrag.java index 52715fcbf..e862a6780 100644 --- a/common/biomesoplenty/biomes/BiomeGenCrag.java +++ b/common/biomesoplenty/biomes/BiomeGenCrag.java @@ -8,8 +8,9 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.interfaces.IFogColour; -public class BiomeGenCrag extends BiomeGenBase +public class BiomeGenCrag extends BiomeGenBase implements IFogColour { private BiomeDecoratorBOP customBiomeDecorator; @@ -46,6 +47,15 @@ public class BiomeGenCrag extends BiomeGenBase } } } + + /** + * Fog Color + */ + @Override + public int getFogColour() + { + return 10514245; + } /** * takes temperature, returns color diff --git a/common/biomesoplenty/biomes/BiomeGenDeadlands.java b/common/biomesoplenty/biomes/BiomeGenDeadlands.java index 9ab450dab..cf7b4d190 100644 --- a/common/biomesoplenty/biomes/BiomeGenDeadlands.java +++ b/common/biomesoplenty/biomes/BiomeGenDeadlands.java @@ -13,9 +13,10 @@ import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.interfaces.IFogColour; import biomesoplenty.worldgen.WorldGenDeadlands; -public class BiomeGenDeadlands extends BiomeGenBase +public class BiomeGenDeadlands extends BiomeGenBase implements IFogColour { private WorldGenerator theWorldGenerator; private BiomeDecoratorBOP customBiomeDecorator; @@ -71,6 +72,15 @@ public class BiomeGenDeadlands extends BiomeGenBase theWorldGenerator.generate(par1World, par2Random, var6, var7, var8); } } + + /** + * Fog Color + */ + @Override + public int getFogColour() + { + return 9849675; + } /** * takes temperature, returns color diff --git a/common/biomesoplenty/biomes/BiomeGenFungiForest.java b/common/biomesoplenty/biomes/BiomeGenFungiForest.java index af924d98d..c97bf4475 100644 --- a/common/biomesoplenty/biomes/BiomeGenFungiForest.java +++ b/common/biomesoplenty/biomes/BiomeGenFungiForest.java @@ -12,12 +12,11 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; -import biomesoplenty.worldgen.WorldGenFungi; +import biomesoplenty.interfaces.IFogColour; import biomesoplenty.worldgen.WorldGenMoss; -import biomesoplenty.worldgen.tree.WorldGenThickTree2; -import biomesoplenty.worldgen.tree.WorldGenThickTree3; +import biomesoplenty.worldgen.tree.WorldGenSequoia; -public class BiomeGenFungiForest extends BiomeGenBase +public class BiomeGenFungiForest extends BiomeGenBase implements IFogColour { private BiomeDecoratorBOP customBiomeDecorator; @@ -76,7 +75,7 @@ public class BiomeGenFungiForest extends BiomeGenBase @Override public WorldGenerator getRandomWorldGenForTrees(Random par1Random) { - return par1Random.nextInt(2) == 0 ? new WorldGenThickTree2(false) : (par1Random.nextInt(7) == 0 ? new WorldGenThickTree3(false) : (par1Random.nextInt(3) == 0 ? new WorldGenFungi() : new WorldGenFungi())); + return new WorldGenSequoia(false); } /** @@ -105,6 +104,15 @@ public class BiomeGenFungiForest extends BiomeGenBase { return 5359235; } + + /** + * Fog Color + */ + @Override + public int getFogColour() + { + return 7985325; + } /** * takes temperature, returns color diff --git a/common/biomesoplenty/biomes/BiomeGenMysticGrove.java b/common/biomesoplenty/biomes/BiomeGenMysticGrove.java index 1698786fe..09d6dd645 100644 --- a/common/biomesoplenty/biomes/BiomeGenMysticGrove.java +++ b/common/biomesoplenty/biomes/BiomeGenMysticGrove.java @@ -11,12 +11,13 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.configuration.configfile.BOPConfigurationMain; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.interfaces.IFogColour; import biomesoplenty.worldgen.realtree.WorldGenRealMagic; import biomesoplenty.worldgen.tree.WorldGenMystic1; import biomesoplenty.worldgen.tree.WorldGenMystic2; import biomesoplenty.worldgen.tree.WorldGenSwampTall; -public class BiomeGenMysticGrove extends BiomeGenBase +public class BiomeGenMysticGrove extends BiomeGenBase implements IFogColour { private BiomeDecoratorBOP customBiomeDecorator; @@ -97,6 +98,15 @@ public class BiomeGenMysticGrove extends BiomeGenBase { return 7332553; } + + /** + * Fog Color + */ + @Override + public int getFogColour() + { + return 16755401; + } /** * takes temperature, returns color @@ -105,7 +115,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase public int getSkyColorByTemp(float par1) { if (BOPConfigurationMisc.skyColors) - return 16751558; + return 8972496; else { par1 /= 3.0F; diff --git a/common/biomesoplenty/biomes/BiomeGenOminousWoods.java b/common/biomesoplenty/biomes/BiomeGenOminousWoods.java index baf51bc23..186521f23 100644 --- a/common/biomesoplenty/biomes/BiomeGenOminousWoods.java +++ b/common/biomesoplenty/biomes/BiomeGenOminousWoods.java @@ -12,10 +12,11 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.interfaces.IFogColour; import biomesoplenty.worldgen.tree.WorldGenOminous1; import biomesoplenty.worldgen.tree.WorldGenOminous2; -public class BiomeGenOminousWoods extends BiomeGenBase +public class BiomeGenOminousWoods extends BiomeGenBase implements IFogColour { private BiomeDecoratorBOP customBiomeDecorator; @@ -82,6 +83,15 @@ public class BiomeGenOminousWoods extends BiomeGenBase { return 4145489; } + + /** + * Fog Color + */ + @Override + public int getFogColour() + { + return 3420989; + } /** * takes temperature, returns color diff --git a/common/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java b/common/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java index 668441ba8..2387a2598 100644 --- a/common/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java +++ b/common/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java @@ -13,11 +13,12 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.interfaces.IFogColour; import biomesoplenty.worldgen.tree.WorldGenOminous1; import biomesoplenty.worldgen.tree.WorldGenOminous3; import biomesoplenty.worldgen.tree.WorldGenOminous4; -public class BiomeGenOminousWoodsThick extends BiomeGenBase +public class BiomeGenOminousWoodsThick extends BiomeGenBase implements IFogColour { private BiomeDecoratorBOP customBiomeDecorator; @@ -86,6 +87,15 @@ public class BiomeGenOminousWoodsThick extends BiomeGenBase { return 4145489; } + + /** + * Fog Color + */ + @Override + public int getFogColour() + { + return 3420989; + } /** * takes temperature, returns color diff --git a/common/biomesoplenty/biomes/BiomeGenSacredSprings.java b/common/biomesoplenty/biomes/BiomeGenSacredSprings.java index 4f2957e8a..07d61800c 100644 --- a/common/biomesoplenty/biomes/BiomeGenSacredSprings.java +++ b/common/biomesoplenty/biomes/BiomeGenSacredSprings.java @@ -12,9 +12,10 @@ import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.entities.EntityJungleSpider; +import biomesoplenty.interfaces.IFogColour; import biomesoplenty.worldgen.tree.WorldGenMassiveTree; -public class BiomeGenSacredSprings extends BiomeGenBase +public class BiomeGenSacredSprings extends BiomeGenBase implements IFogColour { private BiomeDecoratorBOP customBiomeDecorator; @@ -95,6 +96,15 @@ public class BiomeGenSacredSprings extends BiomeGenBase { return 39259; } + + /** + * Fog Color + */ + @Override + public int getFogColour() + { + return 8707327; + } /** * takes temperature, returns color diff --git a/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java b/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java index c202b38a6..fef6bcb80 100644 --- a/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java +++ b/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java @@ -10,6 +10,7 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; +import biomesoplenty.interfaces.IFogColour; import biomesoplenty.worldgen.tree.WorldGenAutumn; import biomesoplenty.worldgen.tree.WorldGenAutumn2; import biomesoplenty.worldgen.tree.WorldGenAutumn2Big; @@ -17,7 +18,7 @@ import biomesoplenty.worldgen.tree.WorldGenDeadTree2; import biomesoplenty.worldgen.tree.WorldGenMaple; import biomesoplenty.worldgen.tree.WorldGenMapleBig; -public class BiomeGenSeasonalForest extends BiomeGenBase +public class BiomeGenSeasonalForest extends BiomeGenBase implements IFogColour { private BiomeDecoratorBOP customBiomeDecorator; @@ -94,4 +95,13 @@ public class BiomeGenSeasonalForest extends BiomeGenBase return 12502092; //return 12502595; } + + /** + * Fog Color + */ + @Override + public int getFogColour() + { + return 16764548; + } } diff --git a/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java b/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java index 28e8d4410..01ae1a441 100644 --- a/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java +++ b/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java @@ -10,6 +10,7 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; +import biomesoplenty.interfaces.IFogColour; import biomesoplenty.worldgen.tree.WorldGenAutumn; import biomesoplenty.worldgen.tree.WorldGenAutumn2; import biomesoplenty.worldgen.tree.WorldGenDeadTree2; @@ -17,7 +18,7 @@ import biomesoplenty.worldgen.tree.WorldGenMaple; import biomesoplenty.worldgen.tree.WorldGenTaiga10; import biomesoplenty.worldgen.tree.WorldGenTaiga5; -public class BiomeGenSeasonalSpruceForest extends BiomeGenBase +public class BiomeGenSeasonalSpruceForest extends BiomeGenBase implements IFogColour { private BiomeDecoratorBOP customBiomeDecorator; @@ -94,4 +95,13 @@ public class BiomeGenSeasonalSpruceForest extends BiomeGenBase return 12502092; //return 12502595; } + + /** + * Fog Color + */ + @Override + public int getFogColour() + { + return 16764548; + } } diff --git a/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java b/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java index 11a2df6eb..735954a3e 100644 --- a/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java +++ b/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java @@ -13,9 +13,10 @@ import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.entities.EntityJungleSpider; +import biomesoplenty.interfaces.IFogColour; import biomesoplenty.worldgen.tree.WorldGenRainforest1; -public class BiomeGenTropicalRainforest extends BiomeGenBase +public class BiomeGenTropicalRainforest extends BiomeGenBase implements IFogColour { private BiomeDecoratorBOP customBiomeDecorator; @@ -91,6 +92,15 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase { return 8970560; } + + /** + * Fog Color + */ + @Override + public int getFogColour() + { + return 16228194; + } /** * takes temperature, returns color @@ -99,7 +109,7 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase public int getSkyColorByTemp(float par1) { if (BOPConfigurationMisc.skyColors) - return 12971089; + return 11128415; else { par1 /= 3.0F; diff --git a/common/biomesoplenty/biomes/BiomeGenTropics.java b/common/biomesoplenty/biomes/BiomeGenTropics.java index e3a0c8c65..da1c76441 100644 --- a/common/biomesoplenty/biomes/BiomeGenTropics.java +++ b/common/biomesoplenty/biomes/BiomeGenTropics.java @@ -12,10 +12,11 @@ import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.entities.EntityJungleSpider; +import biomesoplenty.interfaces.IFogColour; import biomesoplenty.worldgen.WorldGenTropicsShrub; import biomesoplenty.worldgen.tree.WorldGenPalmTree1; -public class BiomeGenTropics extends BiomeGenBase +public class BiomeGenTropics extends BiomeGenBase implements IFogColour { private BiomeDecoratorBOP customBiomeDecorator; @@ -70,6 +71,15 @@ public class BiomeGenTropics extends BiomeGenBase { return par1Random.nextInt(2) == 0 ? new WorldGenPalmTree1() : (par1Random.nextInt(2) == 0 ? new WorldGenTropicsShrub() : new WorldGenShrub(0,0)); } + + /** + * Fog Color + */ + @Override + public int getFogColour() + { + return 7724287; + } /** * takes temperature, returns color diff --git a/common/biomesoplenty/biomes/BiomeGenWasteland.java b/common/biomesoplenty/biomes/BiomeGenWasteland.java index f909faad3..013bb2c23 100644 --- a/common/biomesoplenty/biomes/BiomeGenWasteland.java +++ b/common/biomesoplenty/biomes/BiomeGenWasteland.java @@ -7,11 +7,12 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.interfaces.IFogColour; import biomesoplenty.worldgen.WorldGenWasteland; import biomesoplenty.worldgen.WorldGenWasteland2; import biomesoplenty.worldgen.tree.WorldGenDeadTree3; -public class BiomeGenWasteland extends BiomeGenBase +public class BiomeGenWasteland extends BiomeGenBase implements IFogColour { private BiomeDecoratorBOP customBiomeDecorator; @@ -56,6 +57,15 @@ public class BiomeGenWasteland extends BiomeGenBase { return 10067541; } + + /** + * Fog Color + */ + @Override + public int getFogColour() + { + return 5662280; + } /** * takes temperature, returns color diff --git a/common/biomesoplenty/worldgen/tree/WorldGenSequoia.java b/common/biomesoplenty/worldgen/tree/WorldGenSequoia.java new file mode 100644 index 000000000..45a7d5b34 --- /dev/null +++ b/common/biomesoplenty/worldgen/tree/WorldGenSequoia.java @@ -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 WorldGenSequoia extends WorldGenerator +{ + public WorldGenSequoia(boolean var1) + { + super(var1); + } + + @Override + public boolean generate(World var1, Random var2, int var3, int var4, int var5) + { + int var6 = var2.nextInt(10) + 35; + int var7 = var2.nextInt(5) + 10; + 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 != Block.leaves.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, Block.leaves.blockID, 0); + this.setBlockAndMetadata(var1, var20 + 1, var19, var22, Block.leaves.blockID, 0); + this.setBlockAndMetadata(var1, var20 - 1, var19, var22, Block.leaves.blockID, 0); + this.setBlockAndMetadata(var1, var20, var19, var22 + 1, Block.leaves.blockID, 0); + this.setBlockAndMetadata(var1, var20, var19, var22 - 1, Block.leaves.blockID, 0); + + //this.setBlockAndMetadata(var1, var20 + 1, var19, var22 + 1, Block.leaves.blockID, 0); + //this.setBlockAndMetadata(var1, var20 - 1, var19, var22 - 1, Block.leaves.blockID, 0); + //this.setBlockAndMetadata(var1, var20 - 1, var19, var22 + 1, Block.leaves.blockID, 0); + //this.setBlockAndMetadata(var1, var20 + 1, var19, var22 - 1, Block.leaves.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 == Block.leaves.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; + } +} diff --git a/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java index e27446de7..6b82e479f 100644 --- a/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java @@ -20,7 +20,7 @@ public class WorldGenTaiga3 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) @@ -30,7 +30,8 @@ public class WorldGenTaiga3 extends WorldGenerator int var14; int var15; int var24; - + int var25; + for (var11 = var4; var11 <= var4 + 1 + var6 && var10; ++var11) { boolean var12 = true; @@ -70,9 +71,10 @@ public class WorldGenTaiga3 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 WorldGenTaiga3 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; - - for (var20 = var3 - var15; var20 <= var3 + var15; ++var20) + 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) { - int var21 = var20 - var3; - - for (int var22 = var5 - var15; var22 <= var5 + var15; ++var22) + var19 = var4 + var6 - var18; + + for (var20 = var3 - var15; var20 <= var3 + var15; ++var20) { - int var23 = var22 - var5; - - if ((Math.abs(var21) != var15 || Math.abs(var23) != var15 || var15 <= 0) && !Block.opaqueCubeLookup[var1.getBlockId(var20, var19, var22)]) + int var21 = var20 - var3; + + for (int var22 = var5 - var15; var22 <= var5 + var15; ++var22) { - this.setBlockAndMetadata(var1, var20, var19, var22, Blocks.leaves1.get().blockID, 5); - this.setBlockAndMetadata(var1, var20 - 1, var19, var22, Blocks.leaves1.get().blockID, 5); - this.setBlockAndMetadata(var1, var20, var19, var22 - 1, Blocks.leaves1.get().blockID, 5); - this.setBlockAndMetadata(var1, var20 - 1, var19, var22 - 1, Blocks.leaves1.get().blockID, 5); + 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, 5); + this.setBlockAndMetadata(var1, var20 + 1, var19, var22, Blocks.leaves1.get().blockID, 5); + this.setBlockAndMetadata(var1, var20 - 1, var19, var22, Blocks.leaves1.get().blockID, 5); + this.setBlockAndMetadata(var1, var20, var19, var22 + 1, Blocks.leaves1.get().blockID, 5); + this.setBlockAndMetadata(var1, var20, var19, var22 - 1, Blocks.leaves1.get().blockID, 5); + + //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, 3); + this.setBlockAndMetadata(var1, var3 + 1, var4 + var19, var5, Blocks.logs1.get().blockID, 3); + this.setBlockAndMetadata(var1, var3 - 1, var4 + var19, var5, Blocks.logs1.get().blockID, 3); + this.setBlockAndMetadata(var1, var3, var4 + var19, var5 + 1, Blocks.logs1.get().blockID, 3); + this.setBlockAndMetadata(var1, var3, var4 + var19, var5 - 1, Blocks.logs1.get().blockID, 3); + } } - } - - 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, 3); - this.setBlockAndMetadata(var1, var3 - 1, var4 + var19, var5, Blocks.logs1.get().blockID, 3); - this.setBlockAndMetadata(var1, var3, var4 + var19, var5 - 1, Blocks.logs1.get().blockID, 3); - this.setBlockAndMetadata(var1, var3 - 1, var4 + var19, var5 - 1, Blocks.logs1.get().blockID, 3); - } - } - - return true; + + return true; + } else + return false; } else return false; } else diff --git a/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java index 0d148768b..c3ee6eeb4 100644 --- a/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java @@ -18,7 +18,7 @@ public class WorldGenTaiga4 extends WorldGenerator public boolean generate(World var1, Random var2, int var3, int var4, int var5) { int var6 = var2.nextInt(15) + 20; - int var7 = var2.nextInt(3) + 5; + int var7 = var2.nextInt(4) + 8; int var8 = var6 - var7; int var9 = 2 + var2.nextInt(2); boolean var10 = true;