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

src/minecraft/biomesoplenty/api/BlockReferences.java

@@ -43,6 +43,7 @@ public class BlockReferences {
 		palmLeaves (Blocks.leavesColorized, 2),
 		redwoodLeaves (Blocks.leavesColorized, 3),
 		willowLeaves (Blocks.leavesColorized, 4),
+		pineLeaves (Blocks.leavesColorized, 5),
 		
 		yellowAutumnLeaves (Blocks.leaves1, 0),
 		bambooLeaves (Blocks.leaves1, 1),
@@ -80,6 +81,7 @@ public class BlockReferences {
 		palmSapling (Blocks.colorizedSaplings, 2),
 		redwoodSapling (Blocks.colorizedSaplings, 3),
 		willowSapling (Blocks.colorizedSaplings, 4),
+		pineSapling (Blocks.colorizedSaplings, 5),
 		mapleSapling (Blocks.saplings, 11),
 		orangeAutumnSapling (Blocks.saplings, 8),
 		pinkCherrySapling (Blocks.saplings, 10),

src/minecraft/biomesoplenty/api/Potions.java

@@ -7,4 +7,5 @@ import com.google.common.base.Optional;
 public class Potions 
 {
     public static Optional<? extends Potion> nourishment   = Optional.absent();
+    public static Optional<? extends Potion> paralysis     = Optional.absent();
 }

src/minecraft/biomesoplenty/biomes/BiomeGenMountain.java

@@ -2,7 +2,7 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
-import biomesoplenty.worldgen.WorldGenTaiga7;
+import biomesoplenty.worldgen.WorldGenPineTree;
 
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenTaiga2;
@@ -27,6 +27,6 @@ public class BiomeGenMountain extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
     {
-		return (WorldGenerator)(par1Random.nextInt(8) == 0 ? new WorldGenTaiga2(false) : (par1Random.nextInt(4) == 0 ? new WorldGenTaiga7(false) : this.worldGeneratorTrees));
+		return (WorldGenerator)(par1Random.nextInt(4) == 0 ? this.worldGeneratorTrees : new WorldGenPineTree());
     }
 }

src/minecraft/biomesoplenty/blocks/BlockBOPColorizedLeaves.java

@@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearable
 {
-    private static final String[] leaves = new String[] {"acacia", "mangrove", "palm", "redwood", "willow"};
+    private static final String[] leaves = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine"};
     private Icon[][] textures;
     int[] adjacentTreeBlocks;
     

src/minecraft/biomesoplenty/blocks/BlockBOPColorizedSapling.java

@@ -18,6 +18,7 @@ import biomesoplenty.worldgen.WorldGenAcacia;
 import biomesoplenty.worldgen.WorldGenMangrove;
 import biomesoplenty.worldgen.WorldGenPalmTree1;
 import biomesoplenty.worldgen.WorldGenPalmTree3;
+import biomesoplenty.worldgen.WorldGenPineTree;
 import biomesoplenty.worldgen.WorldGenRedwoodTree2;
 import biomesoplenty.worldgen.WorldGenWillow;
 import cpw.mods.fml.relauncher.Side;
@@ -25,7 +26,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockBOPColorizedSapling extends BlockSapling
 {
-    private static final String[] saplings = new String[] {"acacia", "mangrove", "palm", "redwood", "willow"};
+    private static final String[] saplings = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine"};
     private Icon[] textures;
     private static final int TYPES = 15;
     
@@ -138,6 +139,10 @@ public class BlockBOPColorizedSapling extends BlockSapling
                     
                 case 4: // Willow Tree
                     obj = new WorldGenWillow();
+                    break;
+					
+				case 5: // Pine Tree
+                    obj = new WorldGenPineTree();
                     break;
             }
         }

src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java

@@ -10,7 +10,11 @@ import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.Icon;
@@ -124,9 +128,32 @@ public class BlockBOPFlower extends BlockFlower
     public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity)
     {
         int meta = world.getBlockMetadata(x, y, z);
+		if (!world.isRemote && meta == 2 && entity instanceof EntityLiving) 
+        	((EntityLiving)entity).addPotionEffect(new PotionEffect(Potion.wither.id, 200));
+		
         if (meta == 11)
             entity.attackEntityFrom(DamageSource.cactus, 1);
     }
+	
+    /**
+     * A randomly called display update to be able to add particles or other items for display
+     */
+    public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random)
+    {
+        super.randomDisplayTick(par1World, par2, par3, par4, par5Random);
+		int meta = par1World.getBlockMetadata(par2, par3, par4);
+		if (meta == 2)
+		{
+			if (par5Random.nextInt(4) != 0)
+			{
+				par1World.spawnParticle("townaura", (double)((float)par2 + par5Random.nextFloat()), (double)((float)par3 + par5Random.nextFloat()), (double)((float)par4 + par5Random.nextFloat()), 0.0D, 0.0D, 0.0D);
+			}
+			if (par5Random.nextInt(4) == 0)
+			{
+				par1World.spawnParticle("smoke", (double)((float)par2 + par5Random.nextFloat()), (double)((float)par3), (double)((float)par4 + par5Random.nextFloat()), 0.0D, 0.0D, 0.0D);
+			}
+		}
+    }
     
     @Override
     @SideOnly(Side.CLIENT)

src/minecraft/biomesoplenty/configuration/BOPBlocks.java

@@ -458,6 +458,7 @@ public class BOPBlocks {
         
         LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,3), "Redwood Leaves");
         LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,4), "Willow Leaves");
+		LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,5), "Pine Leaves");
         LanguageRegistry.addName(new ItemStack(Blocks.leaves1.get(),1,5), "Fir Leaves");
         LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,0), "Acacia Leaves");
         LanguageRegistry.addName(new ItemStack(Blocks.leaves1.get(),1,3), "Dark Leaves");

src/minecraft/biomesoplenty/configuration/BOPPotions.java

@@ -8,6 +8,7 @@ import net.minecraftforge.common.MinecraftForge;
 import biomesoplenty.api.Potions;
 import biomesoplenty.potions.PotionEventHandler;
 import biomesoplenty.potions.PotionNourishment;
+import biomesoplenty.potions.PotionParalysis;
 
 import com.google.common.base.Optional;
 
@@ -30,11 +31,13 @@ public class BOPPotions
 	private static void intializePotions()
 	{
 		Potions.nourishment = Optional.of((new PotionNourishment(potionOffset + 0, false, 0)).setPotionName("potion.nourishment"));
+		Potions.paralysis = Optional.of((new PotionParalysis(potionOffset + 1, true, 16767262)).setPotionName("potion.paralysis"));
 	}
 	
 	private static void registerPotionNames()
 	{
 		LanguageRegistry.instance().addStringLocalization("potion.nourishment", "en_US", "Nourishment");
+		LanguageRegistry.instance().addStringLocalization("potion.paralysis", "en_US", "Paralysis");
 	}
 	
 	private static void extendPotionsArray()

src/minecraft/biomesoplenty/helpers/EntitiesHelper.java

@@ -1,23 +1,18 @@
 package biomesoplenty.helpers;
 
-import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.entity.passive.EntityChicken;
 import net.minecraft.entity.passive.EntityCow;
 import net.minecraft.entity.passive.EntityPig;
 import net.minecraft.entity.passive.EntitySheep;
+import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.Event.Result;
-import net.minecraftforge.event.ForgeEventFactory;
 import net.minecraftforge.event.ForgeSubscribe;
-import net.minecraftforge.event.Event.HasResult;
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;
-import net.minecraftforge.event.entity.living.LivingPackSizeEvent;
-import net.minecraftforge.event.entity.living.LivingSpawnEvent;
 import net.minecraftforge.event.entity.living.LivingSpawnEvent.CheckSpawn;
 import biomesoplenty.api.Blocks;
 import biomesoplenty.api.Items;
@@ -47,14 +42,21 @@ public class EntitiesHelper
     }
     
     @ForgeSubscribe
-    public void canEntitySpawn(LivingSpawnEvent event)
+    public void canEntitySpawn(CheckSpawn event)
     {
-    	
-        int i = MathHelper.floor_double(event.entity.posX);
-        int j = MathHelper.floor_double(event.entity.boundingBox.minY);
-        int k = MathHelper.floor_double(event.entity.posZ);
-        
-        if (event.entity.worldObj.getBlockId(i, j - 1, k) == Blocks.holyGrass.get().blockID && event.entity.worldObj.getFullBlockLightValue(i, j, k) > 8)
-        	event.setResult(Result.ALLOW);
+    	if (event.entityLiving instanceof EntityAnimal)
+    	{
+            int i = MathHelper.floor_double(event.entityLiving.posX);
+            int j = MathHelper.floor_double(event.entityLiving.boundingBox.minY);
+            int k = MathHelper.floor_double(event.entityLiving.posZ);
+            
+            if (event.entityLiving.getMaxSpawnedInChunk() <= event.world.getEntitiesWithinAABB(event.entityLiving.getClass(), AxisAlignedBB.getAABBPool().getAABB((double)(i - 16), (double)(j - 4), (double)(k - 16), (double)(i + 17), (double)(j + 5), (double)(k + 17))).size())
+                return;
+            
+            if (event.entityLiving.worldObj.getBlockId(i, j - 1, k) == Blocks.holyGrass.get().blockID && event.entityLiving.worldObj.getFullBlockLightValue(i, j, k) > 8
+                    && event.entityLiving.worldObj.checkNoEntityCollision(event.entity.boundingBox) && !event.entityLiving.worldObj.isAnyLiquid(event.entityLiving.boundingBox)
+                    && event.entityLiving.worldObj.getCollidingBoundingBoxes(event.entityLiving, event.entityLiving.boundingBox).isEmpty())
+            	event.setResult(Result.ALLOW);
+    	}
     }
 }

src/minecraft/biomesoplenty/items/projectiles/EntityDart.java

@@ -19,6 +19,7 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import biomesoplenty.BiomesOPlenty;
 import biomesoplenty.ClientProxy;
+import biomesoplenty.api.Potions;
 
 public class EntityDart extends EntityArrow
 {
@@ -155,7 +156,8 @@ public class EntityDart extends EntityArrow
                 {
                     this.damage = 1;
                     if (movingobjectposition.entityHit instanceof EntityLiving)
-                        ((EntityLiving)movingobjectposition.entityHit).addPotionEffect(new PotionEffect(Potion.poison.id, 100));
+//                        ((EntityLiving)movingobjectposition.entityHit).addPotionEffect(new PotionEffect(Potion.poison.id, 100));
+                        ((EntityLiving)movingobjectposition.entityHit).addPotionEffect(new PotionEffect(Potions.paralysis.get().id, 100));
                 }
 
                 if (movingobjectposition.entityHit.attackEntityFrom(damagesource, this.damage))

src/minecraft/biomesoplenty/potions/PotionEventHandler.java

@@ -1,7 +1,9 @@
 package biomesoplenty.potions;
 
+import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.event.ForgeSubscribe;
+import net.minecraftforge.event.entity.living.EnderTeleportEvent;
 import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
 import biomesoplenty.api.Potions;
 
@@ -25,5 +27,29 @@ public class PotionEventHandler
 				return;
 			}
 		}
+		
+		if (event.entityLiving.isPotionActive(Potions.paralysis.get())) 
+        {
+            event.entityLiving.motionX = 0.0;
+            if (!event.entityLiving.isAirBorne)
+                event.entityLiving.motionY = 0.0;
+            event.entityLiving.motionZ = 0.0;
+            
+            if (event.entityLiving instanceof EntityCreeper)
+                ((EntityCreeper)event.entityLiving).setCreeperState(-1);
+            
+            if (event.entityLiving.getActivePotionEffect(Potions.paralysis.get()).getDuration() == 0) 
+            {
+                event.entityLiving.removePotionEffect(Potions.paralysis.get().id);
+                return;
+            }
+        }
+	}
+	
+	@ForgeSubscribe
+	public void onEndermanTP(EnderTeleportEvent event)
+	{
+	    if (event.entityLiving.isPotionActive(Potions.paralysis.get()))
+	        event.setCanceled(true);
 	}
 }

src/minecraft/biomesoplenty/potions/PotionParalysis.java

@@ -0,0 +1,28 @@
+package biomesoplenty.potions;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.potion.Potion;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class PotionParalysis extends Potion
+{
+    public PotionParalysis(int par1, boolean par2, int par3)
+    {
+        super(par1, par2, par3);
+        this.setIconIndex(1, 0);
+    }
+    
+    @SideOnly(Side.CLIENT)
+    public int getStatusIconIndex()
+    {
+        Minecraft.getMinecraft().renderEngine.bindTexture("/mods/BiomesOPlenty/textures/potions/BOPPotionFX.png");
+        return 1;
+    }
+    
+    @Override
+    public boolean isReady(int par1, int par2)
+    {
+        return par1 >= 1;
+    }
+}

src/minecraft/biomesoplenty/worldgen/WorldGenPineTree.java

@@ -0,0 +1,169 @@
+package biomesoplenty.worldgen;
+
+import java.util.Random;
+
+import biomesoplenty.api.Blocks;
+import biomesoplenty.configuration.BOPBlocks;
+
+import net.minecraft.block.Block;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+public class WorldGenPineTree extends WorldGenerator
+{
+    public boolean generate(World var1, Random var2, int var3, int var4, int var5)
+    {
+        while (var1.isAirBlock(var3, var4, var5) && var4 > 2)
+        {
+            --var4;
+        }
+
+        int var6 = var1.getBlockId(var3, var4, var5);
+
+        if (var6 != Block.grass.blockID)
+        {
+            return false;
+        }
+        else
+        {
+            for (int var7 = -2; var7 <= 2; ++var7)
+            {
+                for (int var8 = -2; var8 <= 2; ++var8)
+                {
+                    if (var1.isAirBlock(var3 + var7, var4 - 1, var5 + var8) && var1.isAirBlock(var3 + var7, var4 - 2, var5 + var8) && !var1.isAirBlock(var3 + var7, var4, var5 + var8))
+                    {
+                        return false;
+                    }
+                }
+            }
+			
+			int var99 = var2.nextInt(2);
+			
+			if (var99 == 0)
+			{
+				var1.setBlock(var3, var4, var5, Block.dirt.blockID);
+				var1.setBlock(var3, var4 + 1, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 2, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 3, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 4, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 5, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 6, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 7, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 8, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 9, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 10, var5, Block.wood.blockID, 0, 2);
+				
+				var1.setBlock(var3 + 1, var4 + 6, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 6, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 6, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 6, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 6, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 6, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 6, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 6, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 6, var5 - 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 2, var4 + 6, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 2, var4 + 6, var5 - 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 6, var5 + 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 2, var4 + 6, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 2, var4 + 6, var5 + 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				
+				var1.setBlock(var3 + 1, var4 + 8, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 8, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 8, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 8, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 8, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 8, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 8, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 8, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 8, var5 - 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 2, var4 + 8, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 2, var4 + 8, var5 - 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 8, var5 + 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 2, var4 + 8, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 2, var4 + 8, var5 + 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				
+				var1.setBlock(var3 + 1, var4 + 10, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 10, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 10, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 10, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 10, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 10, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 10, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 10, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				
+				var1.setBlock(var3 + 1, var4 + 11, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 11, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 11, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 11, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				
+				var1.setBlock(var3, var4 + 12, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+			}
+				
+			if (var99 == 1)
+			{
+				var1.setBlock(var3, var4, var5, Block.dirt.blockID);
+				var1.setBlock(var3, var4 + 1, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 2, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 3, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 4, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 5, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 6, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 7, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 8, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 9, var5, Block.wood.blockID, 0, 2);
+				var1.setBlock(var3, var4 + 10, var5, Block.wood.blockID, 0, 2);
+				
+				var1.setBlock(var3 + 1, var4 + 6, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 6, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 6, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 6, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 6, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 6, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 6, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 6, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				
+				var1.setBlock(var3 + 1, var4 + 6, var5 - 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 2, var4 + 6, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 2, var4 + 6, var5 - 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 6, var5 + 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 2, var4 + 6, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 2, var4 + 6, var5 + 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				
+				var1.setBlock(var3 + 1, var4 + 8, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 8, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 8, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 8, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 8, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 8, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 8, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 8, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				
+				var1.setBlock(var3 - 1, var4 + 8, var5 - 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 2, var4 + 8, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 2, var4 + 8, var5 - 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 8, var5 + 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 2, var4 + 8, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 2, var4 + 8, var5 + 2, Blocks.leavesColorized.get().blockID, 5, 2);
+				
+				var1.setBlock(var3 + 1, var4 + 10, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 10, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 10, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 10, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 10, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 + 1, var4 + 10, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 10, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 10, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				
+				var1.setBlock(var3 + 1, var4 + 11, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3 - 1, var4 + 11, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 11, var5 + 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				var1.setBlock(var3, var4 + 11, var5 - 1, Blocks.leavesColorized.get().blockID, 5, 2);
+				
+				var1.setBlock(var3, var4 + 12, var5, Blocks.leavesColorized.get().blockID, 5, 2);
+			}
+			
+			return true;
+        }
+    }
+}