Redesigned the Mystic Grove

common/biomesoplenty/api/Biomes.java

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

common/biomesoplenty/biomes/BiomeGenAlps.java

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

common/biomesoplenty/biomes/BiomeGenMysticGrove.java

@@ -9,6 +9,7 @@ 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 biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.configfile.BOPConfigurationMain;
 import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
 import biomesoplenty.interfaces.IBOPFog;
@@ -33,23 +34,21 @@ public class BiomeGenMysticGrove extends BiomeGenBase implements IBOPFog
 		}
 		else
 		{
-			customBiomeDecorator.treesPerChunk = 8;
+			customBiomeDecorator.treesPerChunk = 9;
 		}
 		
-		customBiomeDecorator.grassPerChunk = 7;
+		customBiomeDecorator.grassPerChunk = 15;
 		customBiomeDecorator.wheatGrassPerChunk = 3;
 		customBiomeDecorator.flowersPerChunk = 8;
-		customBiomeDecorator.pinkFlowersPerChunk = 6;
+		customBiomeDecorator.pinkFlowersPerChunk = 9;
-		customBiomeDecorator.glowFlowersPerChunk = 15;
+		customBiomeDecorator.glowFlowersPerChunk = 10;
 		customBiomeDecorator.rosesPerChunk = 8;
 		customBiomeDecorator.sandPerChunk = -999;
 		customBiomeDecorator.sandPerChunk2 = -999;
-		customBiomeDecorator.sproutsPerChunk = 3;
+		customBiomeDecorator.sproutsPerChunk = 1;
-		customBiomeDecorator.hydrangeasPerChunk = 3;
+		customBiomeDecorator.hydrangeasPerChunk = 6;
-		customBiomeDecorator.blueMilksPerChunk = 4;
+		customBiomeDecorator.blueMilksPerChunk = 1;
-		customBiomeDecorator.glowshroomsPerChunk = 2;
 		customBiomeDecorator.lilyflowersPerChunk = 3;
-		customBiomeDecorator.hotSpringsPerChunk = 2;
 		customBiomeDecorator.poisonWaterPerChunk = 1;
 		waterColorMultiplier = 15349914;
 		spawnableMonsterList.clear();
@@ -69,7 +68,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase implements IBOPFog
 			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 ? this.worldGeneratorBigTree : ((par1Random.nextInt(8) == 0 ? new WorldGenSwampTall() : this.worldGeneratorTrees)));
 	}
 
 	/**
@@ -78,7 +77,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase implements IBOPFog
 	@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)));
 	}
 
 	/**

common/biomesoplenty/biomes/BiomeGenMysticGroveThin.java

@@ -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 biomesoplenty.api.Blocks;
+import biomesoplenty.configuration.configfile.BOPConfigurationMain;
+import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
+import biomesoplenty.interfaces.IBOPFog;
+import biomesoplenty.worldgen.realtree.WorldGenRealMagic;
+import biomesoplenty.worldgen.tree.WorldGenMystic1;
+import biomesoplenty.worldgen.tree.WorldGenMystic2;
+import biomesoplenty.worldgen.tree.WorldGenSwampTall;
+
+public class BiomeGenMysticGroveThin extends BiomeGenBase implements IBOPFog
+{
+	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(3) == 0 ? new WorldGenMystic2(false) : (par1Random.nextInt(6) == 0 ? this.worldGeneratorBigTree : ((par1Random.nextInt(6) == 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;
+    }
+}

common/biomesoplenty/biomes/BiomeGenOasis.java

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

common/biomesoplenty/biomes/BiomeGenSacredSprings.java

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

common/biomesoplenty/configuration/BOPAchievements.java

@@ -394,6 +394,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)
 					{
@@ -504,6 +509,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)
 					{
@@ -589,6 +599,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)
 					{
@@ -669,6 +684,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)
 					{

common/biomesoplenty/configuration/BOPBiomes.java

@@ -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;
@@ -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.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));
+		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));
@@ -376,6 +378,7 @@ public class BOPBiomes {
 		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);

common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java

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

common/biomesoplenty/world/layer/BiomeLayerSub.java

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

common/biomesoplenty/worldgen/tree/WorldGenMystic2.java

@@ -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 var6 = par2Random.nextInt(3) + 5;
-		int var7 = var2.nextInt(3) + 5;
+		boolean var7 = true;
-		int var8 = var6 - var7;
-		int var9 = 1 + var2.nextInt(3);
-		boolean var10 = true;
 
-		if (var4 >= 1 && var4 + var6 + 1 <= 256)
+		if (par4 >= 1 && par4 + var6 + 1 <= 256)
 		{
+			int var8;
+			int var10;
 			int var11;
-			int var13;
+			int var12;
-			int var15;
-			int var21;
 
-			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;
+					var9 = 0;
-				}
-				else
-				{
-					var21 = var9;
 				}
 
-				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);
+					this.setBlock(par1World, par3, par4 - 1, par5, Block.dirt.blockID);
-					var21 = var2.nextInt(2);
-					var13 = 1;
-					boolean var22 = false;
-					int var17;
 					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; ++var16)
-
-					for (var16 = 0; var16 < var6 - var15; ++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);
 						}
 					}