Finished reducing all the IDs - time to start bugfixing and finishing

it.

src/minecraft/biomesoplenty/api/Blocks.java

@@ -52,7 +52,8 @@ public class Blocks
     
     // Plants
     public static Optional<? extends Block> flowers                     = Optional.absent();
-    public static Optional<? extends Block> leaves                      = Optional.absent();
+    public static Optional<? extends Block> leaves1                     = Optional.absent();
+    public static Optional<? extends Block> leaves2                     = Optional.absent();
     public static Optional<? extends Block> leavesColorized             = Optional.absent();
     public static Optional<? extends Block> leavesFruit                 = Optional.absent();
     public static Optional<? extends Block> foliage                     = Optional.absent();
@@ -64,9 +65,14 @@ public class Blocks
     public static Optional<? extends Block> treeMoss                    = Optional.absent();
     public static Optional<? extends Block> moss                        = Optional.absent();
     public static Optional<? extends Block> petals                      = Optional.absent();
+    public static Optional<? extends Block> bamboo                      = Optional.absent();
     
     public static Optional<? extends Block> amethystBlock               = Optional.absent();
     public static Optional<? extends Block> amethystOre                 = Optional.absent();
     public static Optional<? extends Block> bambooThatching             = Optional.absent();
-    public static Optional<? extends Block> mudBrick             = Optional.absent();
+    public static Optional<? extends Block> mudBrick                    = Optional.absent();
+    public static Optional<? extends Block> smolderingGrass             = Optional.absent();
+    public static Optional<? extends Block> quicksand                   = Optional.absent();
+    
+    public static Optional<? extends Block> promisedPortal              = Optional.absent();
 }

src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java

@@ -22,9 +22,11 @@ import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.Ev
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenAlgae;
 import biomesoplenty.worldgen.WorldGenAsh;
+import biomesoplenty.worldgen.WorldGenBOPFlowers;
 import biomesoplenty.worldgen.WorldGenBoulder;
 import biomesoplenty.worldgen.WorldGenBush;
 import biomesoplenty.worldgen.WorldGenCanyon;
@@ -52,6 +54,7 @@ import biomesoplenty.worldgen.WorldGenSprout;
 import biomesoplenty.worldgen.WorldGenSteppe;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeDecorator;
 import net.minecraft.world.biome.BiomeGenBase;
@@ -313,12 +316,12 @@ public class BiomeDecoratorBOP extends BiomeDecorator
     	super(par1BiomeGenBase);
         this.sandGen = new WorldGenSand(7, Block.sand.blockID);
         this.oasesGen = new WorldGenOasis(7, Block.grass.blockID);
-        this.mudGen = new WorldGenMud(7, BOPBlocks.mud.blockID);
+        this.mudGen = new WorldGenMud(7, Blocks.mud.get().blockID);
 		this.gravelShoreGen = new WorldGenGravel(7, Block.gravel.blockID);
         this.gravelAsSandGen = new WorldGenSand(6, Block.gravel.blockID);
         this.dirtGen = new WorldGenMinable(Block.dirt.blockID, 32);
         this.gravelGen = new WorldGenMinable(Block.gravel.blockID, 32);
-        this.ashGen = new WorldGenAsh(BOPBlocks.ash.blockID, 32);
+        this.ashGen = new WorldGenAsh(Blocks.ash.get().blockID, 32);
         this.grassMesaGen = new WorldGenMesa(Block.grass.blockID, 48);
         this.sandMesaGen = new WorldGenMesa(Block.sand.blockID, 32);
         this.myceliumGen = new WorldGenMycelium(Block.mycelium.blockID, 32);
@@ -328,45 +331,45 @@ public class BiomeDecoratorBOP extends BiomeDecorator
         this.sandInStoneGen = new WorldGenMinable(Block.sand.blockID, 32);
         this.clayInStoneGen = new WorldGenMinable(Block.blockClay.blockID, 32);
         this.quagmireGen = new WorldGenQuagmire(Block.grass.blockID, 48);
-		this.canyonGen = new WorldGenCanyon(BOPBlocks.redRock.blockID, 48);
+		this.canyonGen = new WorldGenCanyon(Blocks.redRock.get().blockID, 48);
-		this.smolderingGrassGen = new WorldGenSmolderingGrass(BOPBlocks.smolderingGrass.blockID, 32);
+		this.smolderingGrassGen = new WorldGenSmolderingGrass(Blocks.smolderingGrass.get().blockID, 32);
-        this.driedDirtInSandGen = new WorldGenDriedDirt(BOPBlocks.driedDirt.blockID, 32);
+        this.driedDirtInSandGen = new WorldGenDriedDirt(Blocks.driedDirt.get().blockID, 32);
         this.coalGen = new WorldGenMinable(Block.oreCoal.blockID, 16);
         this.ironGen = new WorldGenMinable(Block.oreIron.blockID, 8);
         this.goldGen = new WorldGenMinable(Block.oreGold.blockID, 8);
         this.redstoneGen = new WorldGenMinable(Block.oreRedstone.blockID, 7);
         this.diamondGen = new WorldGenMinable(Block.oreDiamond.blockID, 7);
         this.lapisGen = new WorldGenMinable(Block.oreLapis.blockID, 6);
-        this.plantYellowGen = new WorldGenFlowers(Block.plantYellow.blockID);
+        this.plantYellowGen = new WorldGenBOPFlowers(Block.plantYellow.blockID, 0);
-        this.plantRedGen = new WorldGenFlowers(Block.plantRed.blockID);
+        this.plantRedGen = new WorldGenBOPFlowers(Block.plantRed.blockID, 0);
-        this.plantWhiteGen = new WorldGenFlowers(BOPBlocks.whiteFlower.blockID);
+        this.plantWhiteGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 9);
-        this.plantBlueGen = new WorldGenFlowers(BOPBlocks.blueFlower.blockID);
+        this.plantBlueGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 1);
-        this.plantPurpleGen = new WorldGenFlowers(BOPBlocks.purpleFlower.blockID);
+        this.plantPurpleGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 7);
-		this.plantPinkGen = new WorldGenFlowers(BOPBlocks.pinkFlower.blockID);
+		this.plantPinkGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 6);
-        this.plantOrangeGen = new WorldGenFlowers(BOPBlocks.orangeFlower.blockID);
+        this.plantOrangeGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 5);
-        this.plantTinyGen = new WorldGenFlowers(BOPBlocks.tinyFlower.blockID);
+        this.plantTinyGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 0);
-        this.plantGlowGen = new WorldGenFlowers(BOPBlocks.glowFlower.blockID);
+        this.plantGlowGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 3);
-        this.plantDeadGen = new WorldGenFlowers(BOPBlocks.deadGrass.blockID);
+        this.plantDeadGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 0);
-        this.plantDesertGen = new WorldGenFlowers(BOPBlocks.desertGrass.blockID);
+        this.plantDesertGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 1);
-        this.thornGen = new WorldGenFlowers(BOPBlocks.thorn.blockID);
+        this.thornGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 5);
-        this.bushGen = new WorldGenBush(BOPBlocks.bush.blockID);
+        this.bushGen = new WorldGenBush(Blocks.foliage.get().blockID, 4);
-		this.tinyCactusGen = new WorldGenFlowers(BOPBlocks.tinyCactus.blockID);
+		this.tinyCactusGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 11);
-		this.deathbloomGen = new WorldGenFlowers(BOPBlocks.deathbloom.blockID);
+		this.deathbloomGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 2);
-		this.hydrangeaGen = new WorldGenFlowers(BOPBlocks.hydrangea.blockID);
+		this.hydrangeaGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 4);
-		this.violetGen = new WorldGenFlowers(BOPBlocks.violet.blockID);
+		this.violetGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 8);
-		this.duneGrassGen = new WorldGenFlowers(BOPBlocks.duneGrass.blockID);
+		this.duneGrassGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 3);
-		this.holyTallGrassGen = new WorldGenFlowers(BOPBlocks.holyTallGrass.blockID);
+		this.holyTallGrassGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 4);
-		this.desertSproutsGen = new WorldGenFlowers(BOPBlocks.desertSprouts.blockID);
+		this.desertSproutsGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 2);
 		this.promisedWillowGen = new WorldGenPromisedWillow();
 		this.quicksandGen = new WorldGenQuicksand();
 		this.quicksand2Gen = new WorldGenQuicksand2();
         this.cattailGen = new WorldGenCattail();
-        this.mushroomBrownGen = new WorldGenFlowers(Block.mushroomBrown.blockID);
+        this.mushroomBrownGen = new WorldGenBOPFlowers(Block.mushroomBrown.blockID, 0);
-        this.mushroomRedGen = new WorldGenFlowers(Block.mushroomRed.blockID);
+        this.mushroomRedGen = new WorldGenBOPFlowers(Block.mushroomRed.blockID, 0);
-        this.toadstoolGen = new WorldGenFlowers(BOPBlocks.toadstool.blockID);
+        this.toadstoolGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 10);
-        this.sproutGen = new WorldGenSprout(BOPBlocks.sprout.blockID, 1);
+        this.sproutGen = new WorldGenSprout(Blocks.foliage.get().blockID, 5);
-        this.highGrassGen = new WorldGenHighGrass(BOPBlocks.highGrassBottom.blockID, 0);
+        this.highGrassGen = new WorldGenHighGrass(Blocks.foliage.get().blockID, 3);
-		this.outbackGen = new WorldGenOutback(BOPBlocks.mediumGrass.blockID, 1);
+		this.outbackGen = new WorldGenOutback(Blocks.foliage.get().blockID, 2);
 		this.steppeGen = new WorldGenSteppe(Block.sand.blockID, 0);
         this.carrotGen = new WorldGenCarrots(Block.tallGrass.blockID, 0);
         this.potatoGen = new WorldGenPotatoes(Block.tallGrass.blockID, 0);
@@ -376,7 +379,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
         this.desertCactusGen = new WorldGenDesertCactus();
         this.waterlilyGen = new WorldGenWaterlily();
 		this.algaeGen = new WorldGenAlgae();
-        this.pitGen = new WorldGenPit(BOPBlocks.ash.blockID);
+        this.pitGen = new WorldGenPit(Blocks.ash.get().blockID);
         this.waterlilyPerChunk = 0;
         this.treesPerChunk = 0;
         this.flowersPerChunk = 2;

src/minecraft/biomesoplenty/biomes/BiomeGenArctic.java

@@ -2,11 +2,13 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenTaiga3;
 import biomesoplenty.worldgen.WorldGenTaiga4;
 import biomesoplenty.worldgen.WorldGenTaiga9;
 
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
@@ -40,6 +42,6 @@ public class BiomeGenArctic extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
+        return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
     }
 }

src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.awt.Color;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPConfiguration;
 
@@ -17,7 +18,7 @@ public class BiomeGenBadlands extends BiomeGenBase
         super(par1);
         this.spawnableCreatureList.clear();
         this.topBlock = (byte)Block.sandStone.blockID;
-        this.fillerBlock = (byte)BOPBlocks.hardSand.blockID;
+        this.fillerBlock = (byte)Blocks.hardSand.get().blockID;
         this.theBiomeDecorator = new BiomeDecoratorBOP(this);
         this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
         this.customBiomeDecorator.treesPerChunk = -999;

src/minecraft/biomesoplenty/biomes/BiomeGenBambooForest.java

@@ -2,10 +2,12 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenBambooTree;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenShrub;
@@ -42,7 +44,7 @@ public class BiomeGenBambooForest extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
+        return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
     }
 	
     public void decorate(World par1World, Random par2Random, int par3, int par4)

src/minecraft/biomesoplenty/biomes/BiomeGenBirchForest.java

@@ -2,9 +2,11 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
@@ -38,7 +40,7 @@ public class BiomeGenBirchForest extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
+        return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
     }
 	
     public void decorate(World par1World, Random par2Random, int par3, int par4)

src/minecraft/biomesoplenty/biomes/BiomeGenBog.java

@@ -3,6 +3,7 @@ package biomesoplenty.biomes;
 import java.awt.Color;
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenBog1;
@@ -10,6 +11,7 @@ import biomesoplenty.worldgen.WorldGenBog2;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.monster.EntitySlime;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
@@ -53,7 +55,7 @@ public class BiomeGenBog extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 0) : new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1);
+        return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 0) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
     }
 
     /**

src/minecraft/biomesoplenty/biomes/BiomeGenCanyon.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenCanyonShrub;
 import biomesoplenty.worldgen.WorldGenCanyonTree;
@@ -19,8 +20,8 @@ public class BiomeGenCanyon extends BiomeGenBase
         this.spawnableCreatureList.clear();
         this.theBiomeDecorator = new BiomeDecoratorBOP(this);
         this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)BOPBlocks.hardDirt.blockID;
+		this.topBlock = (byte)Blocks.hardDirt.get().blockID;
-        this.fillerBlock = (byte)BOPBlocks.hardDirt.blockID;
+        this.fillerBlock = (byte)Blocks.hardDirt.get().blockID;
         this.customBiomeDecorator.treesPerChunk = 10;
 		this.customBiomeDecorator.flowersPerChunk = -999;
 		this.customBiomeDecorator.tinyCactiPerChunk = 2;

src/minecraft/biomesoplenty/biomes/BiomeGenChaparral.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenChaparral1;
 import biomesoplenty.worldgen.WorldGenChaparral2;
@@ -43,7 +44,7 @@ public class BiomeGenChaparral extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
+        return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
     }
 	
     public void decorate(World par1World, Random par2Random, int par3, int par4)

src/minecraft/biomesoplenty/biomes/BiomeGenConiferousForest.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenTaiga3;
 import biomesoplenty.worldgen.WorldGenTaiga4;
@@ -45,7 +46,7 @@ public class BiomeGenConiferousForest extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1);
+        return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
     }
 	
     public void decorate(World par1World, Random par2Random, int par3, int par4)

src/minecraft/biomesoplenty/biomes/BiomeGenCrag.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.awt.Color;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPConfiguration;
 
@@ -19,8 +20,8 @@ public class BiomeGenCrag extends BiomeGenBase
         this.customBiomeDecorator.treesPerChunk = -999;
 		this.spawnableCreatureList.clear();
         this.spawnableWaterCreatureList.clear();
-        this.topBlock = (byte)BOPBlocks.cragRock.blockID;
+        this.topBlock = (byte)Blocks.cragRock.get().blockID;
-        this.fillerBlock = (byte)BOPBlocks.cragRock.blockID;
+        this.fillerBlock = (byte)Blocks.cragRock.get().blockID;
 		this.waterColorMultiplier = 944693;
     }
 	

src/minecraft/biomesoplenty/biomes/BiomeGenDeadForest.java

@@ -3,6 +3,7 @@ package biomesoplenty.biomes;
 import java.awt.Color;
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenDeadTree;
@@ -10,6 +11,7 @@ import biomesoplenty.worldgen.WorldGenDeadTree2;
 import biomesoplenty.worldgen.WorldGenTaiga5;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
@@ -35,7 +37,7 @@ public class BiomeGenDeadForest extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 0) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
+        return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 0) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
     }
 	
     /**

src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java

@@ -3,6 +3,7 @@ package biomesoplenty.biomes;
 import java.awt.Color;
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenDeadTree;
@@ -40,7 +41,7 @@ public class BiomeGenDeadSwamp extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1);
+        return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
     }
 	
     /**

src/minecraft/biomesoplenty/biomes/BiomeGenDeadlands.java

@@ -3,11 +3,6 @@ package biomesoplenty.biomes;
 import java.awt.Color;
 import java.util.Random;
 
-import biomesoplenty.configuration.BOPBlocks;
-import biomesoplenty.configuration.BOPConfiguration;
-import biomesoplenty.worldgen.WorldGenDeadTree3;
-import biomesoplenty.worldgen.WorldGenDeadlands;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.passive.EntityBat;
@@ -16,6 +11,10 @@ import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenMinable;
 import net.minecraft.world.gen.feature.WorldGenerator;
+import biomesoplenty.api.Blocks;
+import biomesoplenty.configuration.BOPConfiguration;
+import biomesoplenty.worldgen.WorldGenDeadTree3;
+import biomesoplenty.worldgen.WorldGenDeadlands;
 
 public class BiomeGenDeadlands extends BiomeGenBase
 {
@@ -26,8 +25,8 @@ public class BiomeGenDeadlands extends BiomeGenBase
 	public BiomeGenDeadlands(int par1)
     {
         super(par1);
-        this.topBlock = (byte)BOPBlocks.ash.blockID;
+        this.topBlock = (byte)Blocks.ash.get().blockID;
-        this.fillerBlock = (byte)BOPBlocks.ash.blockID;
+        this.fillerBlock = (byte)Blocks.ash.get().blockID;
         this.theBiomeDecorator = new BiomeDecoratorBOP(this);
         this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
         this.customBiomeDecorator.treesPerChunk = 1;

src/minecraft/biomesoplenty/biomes/BiomeGenDeciduousForest.java

@@ -2,9 +2,11 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenDeciduous;
 
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
@@ -39,7 +41,7 @@ public class BiomeGenDeciduousForest extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(5) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
+        return par1Random.nextInt(5) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
     }
 	
     /**

src/minecraft/biomesoplenty/biomes/BiomeGenFen.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenDeadTree;
 import biomesoplenty.worldgen.WorldGenFen1;
@@ -9,6 +10,7 @@ import biomesoplenty.worldgen.WorldGenFen2;
 import biomesoplenty.worldgen.WorldGenMoss;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
@@ -65,7 +67,7 @@ public class BiomeGenFen extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-		return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1)));
+		return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1)));
     }
 	
     /**

src/minecraft/biomesoplenty/biomes/BiomeGenGarden.java

@@ -2,12 +2,14 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.mobs.EntityRosester;
 import biomesoplenty.worldgen.WorldGenGiantFlowerRed;
 import biomesoplenty.worldgen.WorldGenGiantFlowerYellow;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.SpawnListEntry;
@@ -44,7 +46,7 @@ public class BiomeGenGarden extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
+        return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 1) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
     }
 	
     /**

src/minecraft/biomesoplenty/biomes/BiomeGenGlacier.java

@@ -1,5 +1,6 @@
 package biomesoplenty.biomes;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.world.biome.BiomeGenBase;
@@ -12,8 +13,8 @@ public class BiomeGenGlacier extends BiomeGenBase
     {
         super(par1);
         this.spawnableCreatureList.clear();
-        this.topBlock = (byte)BOPBlocks.hardIce.blockID;
+        this.topBlock = (byte)Blocks.hardIce.get().blockID;
-        this.fillerBlock = (byte)BOPBlocks.hardIce.blockID;
+        this.fillerBlock = (byte)Blocks.hardIce.get().blockID;
         this.theBiomeDecorator = new BiomeDecoratorBOP(this);
         this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
         this.customBiomeDecorator.treesPerChunk = -999;

src/minecraft/biomesoplenty/biomes/BiomeGenGrassland.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -9,6 +10,7 @@ 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.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.SpawnListEntry;
@@ -45,7 +47,7 @@ public class BiomeGenGrassland extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
+        return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
     }
 	
     public void decorate(World par1World, Random par2Random, int par3, int par4)

src/minecraft/biomesoplenty/biomes/BiomeGenLushDesert.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenAcacia;
 
@@ -16,8 +17,8 @@ public class BiomeGenLushDesert extends BiomeGenBase
 	public BiomeGenLushDesert(int par1)
     {
         super(par1);
-        this.topBlock = (byte)BOPBlocks.redRock.blockID;
+        this.topBlock = (byte)Blocks.redRock.get().blockID;
-        this.fillerBlock = (byte)BOPBlocks.redRock.blockID;
+        this.fillerBlock = (byte)Blocks.redRock.get().blockID;
         this.theBiomeDecorator = new BiomeDecoratorBOP(this);
         this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
         this.customBiomeDecorator.treesPerChunk = 8;

src/minecraft/biomesoplenty/biomes/BiomeGenMarsh.java

@@ -2,10 +2,12 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenMarsh;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
@@ -48,6 +50,6 @@ public class BiomeGenMarsh extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
+        return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
     }
 }

src/minecraft/biomesoplenty/biomes/BiomeGenMesa.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.awt.Color;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPConfiguration;
 
@@ -18,8 +19,8 @@ public class BiomeGenMesa extends BiomeGenBase
     {
         super(par1);
         this.spawnableCreatureList.clear();
-        this.topBlock = (byte)BOPBlocks.redRock.blockID;
+        this.topBlock = (byte)Blocks.redRock.get().blockID;
-        this.fillerBlock = (byte)BOPBlocks.redRock.blockID;
+        this.fillerBlock = (byte)Blocks.redRock.get().blockID;
         this.theBiomeDecorator = new BiomeDecoratorBOP(this);
         this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
         this.customBiomeDecorator.treesPerChunk = -999;

src/minecraft/biomesoplenty/biomes/BiomeGenMoor.java

@@ -3,11 +3,13 @@ package biomesoplenty.biomes;
 import java.awt.Color;
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenMoor;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
@@ -54,7 +56,7 @@ public class BiomeGenMoor extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-		return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1)));
+		return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1)));
     }
 	
     /**

src/minecraft/biomesoplenty/biomes/BiomeGenOriginValley.java

@@ -3,6 +3,7 @@ package biomesoplenty.biomes;
 import java.awt.Color;
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenOriginTree;
@@ -19,7 +20,7 @@ public class BiomeGenOriginValley extends BiomeGenBase
         super(par1);
         this.theBiomeDecorator = new BiomeDecoratorBOP(this);
         this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)BOPBlocks.originGrass.blockID;
+		this.topBlock = (byte)Blocks.originGrass.get().blockID;
         this.customBiomeDecorator.treesPerChunk = 4;
         this.customBiomeDecorator.grassPerChunk = -999;
 		this.customBiomeDecorator.generatePumpkins = false;

src/minecraft/biomesoplenty/biomes/BiomeGenOutback.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenOutbackShrub;
 import biomesoplenty.worldgen.WorldGenOutbackTree;
@@ -19,8 +20,8 @@ public class BiomeGenOutback extends BiomeGenBase
         this.spawnableCreatureList.clear();
         this.theBiomeDecorator = new BiomeDecoratorBOP(this);
         this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)BOPBlocks.hardSand.blockID;
+		this.topBlock = (byte)Blocks.hardSand.get().blockID;
-        this.fillerBlock = (byte)BOPBlocks.hardSand.blockID;
+        this.fillerBlock = (byte)Blocks.hardSand.get().blockID;
         this.customBiomeDecorator.treesPerChunk = 3;
 		this.customBiomeDecorator.flowersPerChunk = -999;
         this.customBiomeDecorator.outbackPerChunk = 10;

src/minecraft/biomesoplenty/biomes/BiomeGenPasture.java

@@ -2,8 +2,10 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
@@ -27,7 +29,7 @@ public class BiomeGenPasture extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return new WorldGenTallGrass(BOPBlocks.barley.blockID, 0);
+        return new WorldGenTallGrass(Blocks.plants.get().blockID, 6);
     }
 
     /**

src/minecraft/biomesoplenty/biomes/BiomeGenPlainsNew.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -29,6 +30,6 @@ public class BiomeGenPlainsNew extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
+        return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
     }
 }

src/minecraft/biomesoplenty/biomes/BiomeGenPrairie.java

@@ -2,10 +2,12 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenPrairie;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
@@ -37,6 +39,6 @@ public class BiomeGenPrairie extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-		return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1)));
+		return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1)));
     }
 }

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLand.java

@@ -3,6 +3,7 @@ package biomesoplenty.biomes;
 import java.awt.Color;
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenPromisedShrub;
@@ -26,8 +27,8 @@ public class BiomeGenPromisedLand extends BiomeGenBase
         super(par1);
         this.theBiomeDecorator = new BiomeDecoratorBOP(this);
         this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
-		this.topBlock = (byte)BOPBlocks.holyGrass.blockID;
+		this.topBlock = (byte)Blocks.holyGrass.get().blockID;
-        this.fillerBlock = (byte)BOPBlocks.holyStone.blockID;
+        this.fillerBlock = (byte)Blocks.holyStone.get().blockID;
         this.customBiomeDecorator.treesPerChunk = 8;
         this.customBiomeDecorator.grassPerChunk = -999;
 		this.customBiomeDecorator.holyTallGrassPerChunk = 50;
@@ -75,7 +76,7 @@ public class BiomeGenPromisedLand extends BiomeGenBase
 
             if (var10 == Block.stone.blockID)
             {
-                par1World.setBlock(var7, var8, var9, BOPBlocks.amethystOre.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 0, 2);
             }
         }
 

src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java

@@ -3,12 +3,11 @@ package biomesoplenty.biomes;
 import java.awt.Color;
 import java.util.Random;
 
-import biomesoplenty.configuration.BOPBlocks;
-import biomesoplenty.configuration.BOPConfiguration;
-import biomesoplenty.worldgen.WorldGenDeadTree;
-
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenerator;
+import biomesoplenty.api.Blocks;
+import biomesoplenty.configuration.BOPConfiguration;
+import biomesoplenty.worldgen.WorldGenDeadTree;
 
 public class BiomeGenQuagmire extends BiomeGenBase
 {
@@ -19,8 +18,8 @@ public class BiomeGenQuagmire extends BiomeGenBase
         super(par1);
         this.spawnableCreatureList.clear();
         this.spawnableWaterCreatureList.clear();
-        this.topBlock = (byte)BOPBlocks.mud.blockID;
+        this.topBlock = (byte)Blocks.mud.get().blockID;
-        this.fillerBlock = (byte)BOPBlocks.mud.blockID;
+        this.fillerBlock = (byte)Blocks.mud.get().blockID;
         this.theBiomeDecorator = new BiomeDecoratorBOP(this);
         this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
         this.customBiomeDecorator.treesPerChunk = 0;

src/minecraft/biomesoplenty/biomes/BiomeGenSavanna.java

@@ -2,10 +2,12 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenAcacia;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
@@ -41,6 +43,6 @@ public class BiomeGenSavanna extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
+        return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
     }
 }

src/minecraft/biomesoplenty/biomes/BiomeGenSeasonalForest.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenAutumn;
 import biomesoplenty.worldgen.WorldGenAutumn2;
@@ -9,6 +10,7 @@ import biomesoplenty.worldgen.WorldGenDeadTree2;
 import biomesoplenty.worldgen.WorldGenMaple;
 
 import net.minecraft.entity.passive.EntityWolf;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
@@ -36,7 +38,7 @@ public class BiomeGenSeasonalForest extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
+        return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
     }
 	
     /**

src/minecraft/biomesoplenty/biomes/BiomeGenShrubland.java

@@ -2,8 +2,10 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
@@ -38,6 +40,6 @@ public class BiomeGenShrubland extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
+        return new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
     }
 }

src/minecraft/biomesoplenty/biomes/BiomeGenSnowyWoods.java

@@ -3,12 +3,14 @@ package biomesoplenty.biomes;
 import java.awt.Color;
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenDeadTree;
 import biomesoplenty.worldgen.WorldGenDeadTree2;
 import biomesoplenty.worldgen.WorldGenTaiga5;
 
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
@@ -32,7 +34,7 @@ public class BiomeGenSnowyWoods extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
+        return new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
     }
 	
     /**

src/minecraft/biomesoplenty/biomes/BiomeGenSteppe.java

@@ -2,9 +2,11 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
@@ -34,7 +36,7 @@ public class BiomeGenSteppe extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-		return (par1Random.nextInt(8) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1)));
+		return (par1Random.nextInt(8) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1)));
     }
 	
     /**

src/minecraft/biomesoplenty/biomes/BiomeGenSwampwoods.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenCypress;
 import biomesoplenty.worldgen.WorldGenMarsh;
@@ -64,7 +65,7 @@ public class BiomeGenSwampwoods extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1);
+        return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
     }
 	
     /**

src/minecraft/biomesoplenty/biomes/BiomeGenTaigaNew.java

@@ -2,9 +2,11 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.entity.passive.EntityWolf;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenTaiga1;
@@ -42,6 +44,6 @@ public class BiomeGenTaigaNew extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-        return new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
+        return new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
     }
 }

src/minecraft/biomesoplenty/biomes/BiomeGenTemperateRainforest.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.worldgen.WorldGenMoss;
 import biomesoplenty.worldgen.WorldGenTemperate;
@@ -9,6 +10,7 @@ import biomesoplenty.worldgen.WorldGenThickTree;
 import biomesoplenty.worldgen.WorldGenWillow;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenShrub;
@@ -43,7 +45,7 @@ public class BiomeGenTemperateRainforest extends BiomeGenBase
      */
     public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
     {
-		return (par1Random.nextInt(6) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1))));
+		return (par1Random.nextInt(6) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Blocks.foliage.get().blockID, 2) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1))));
     }
 	
     public void decorate(World par1World, Random par2Random, int par3, int par4)

src/minecraft/biomesoplenty/biomes/BiomeGenVolcano.java

@@ -3,6 +3,7 @@ package biomesoplenty.biomes;
 import java.awt.Color;
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenVolcano;
@@ -18,8 +19,8 @@ public class BiomeGenVolcano extends BiomeGenBase
     {
         super(par1);
         this.spawnableCreatureList.clear();
-        this.topBlock = (byte)BOPBlocks.ashStone.blockID;
+        this.topBlock = (byte)Blocks.ashStone.get().blockID;
-        this.fillerBlock = (byte)BOPBlocks.ashStone.blockID;
+        this.fillerBlock = (byte)Blocks.ashStone.get().blockID;
         this.theBiomeDecorator = new BiomeDecoratorBOP(this);
         this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
         this.customBiomeDecorator.treesPerChunk = 1;

src/minecraft/biomesoplenty/biomes/BiomeGenWasteland.java

@@ -2,6 +2,7 @@ package biomesoplenty.biomes;
 
 import java.awt.Color;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPConfiguration;
 
@@ -14,8 +15,8 @@ public class BiomeGenWasteland extends BiomeGenBase
     public BiomeGenWasteland(int par1)
     {
         super(par1);
-        this.topBlock = (byte)BOPBlocks.driedDirt.blockID;
+        this.topBlock = (byte)Blocks.driedDirt.get().blockID;
-        this.fillerBlock = (byte)BOPBlocks.driedDirt.blockID;
+        this.fillerBlock = (byte)Blocks.driedDirt.get().blockID;
         this.theBiomeDecorator = new BiomeDecoratorBOP(this);
         this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
 		this.customBiomeDecorator.treesPerChunk = -999;

src/minecraft/biomesoplenty/blocks/BlockBOPAppleLeaves.java

@@ -23,7 +23,6 @@ import net.minecraftforge.common.IShearable;
 
 public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
 {
-    private static final String[] leaves = new String[] {"apple"};
     @SideOnly(Side.CLIENT)
     private Icon[][] textures;
     
@@ -42,29 +41,26 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
     @SideOnly(Side.CLIENT)
     public void registerIcons(IconRegister iconRegister)
     {
-        textures = new Icon[2][2];
+        textures = new Icon[2][4];
         
-        textures[0][0] = iconRegister.registerIcon("BiomesOPlenty:" + leaves[0] + "leaves3");
+        for (int i = 0; i < 4; ++i)
-        textures[1][0] = iconRegister.registerIcon("BiomesOPlenty:" + leaves[0] + "leaves4");
+        {
-        textures[0][1] = iconRegister.registerIcon("BiomesOPlenty:" + leaves[0] + "leaves1");
+            textures[0][i] = iconRegister.registerIcon("BiomesOPlenty:appleleaves" + i + "_fancy");
-        textures[1][1] = iconRegister.registerIcon("BiomesOPlenty:" + leaves[0] + "leaves2");
+            textures[1][i] = iconRegister.registerIcon("BiomesOPlenty:appleleaves" + i + "_fast");
-
+        }
     }
     
     @Override
     @SideOnly(Side.CLIENT)
     public Icon getIcon(int side, int meta)
     {
-        if (meta < 0 || meta >= textures[0].length)
+        return textures[(!isOpaqueCube() ? 0 : 1)][meta & 7];
-            meta = 0;
-
-        return textures[(!isOpaqueCube() ? 0 : 1)][meta];
     }
     
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
-        list.add(new ItemStack(blockID, 1, 0));
+        list.add(new ItemStack(blockID, 1, 0));        
     }
     
     @Override
@@ -76,7 +72,7 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
 //        if (random1.nextInt(20) == 0 && world.getBlockLightValue(x, y, z) >= 8)
 //        {
             int meta = world.getBlockMetadata(x, y, z);
-            if (meta < 1)
+            if ((meta & 3) < 3)
                 world.setBlock(x, y, z, blockID, meta + 1, 3);
 //        }
     }
@@ -88,14 +84,16 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
             return false;
 
         int meta = world.getBlockMetadata(x, y, z);
-        if (meta == 1)
+        if ((meta & 3) == 3)
         {
-            world.setBlock(x, y, z, blockID, 0, 3);
+            world.setBlock(x, y, z, blockID, meta - 3, 3);
             EntityItem entityitem = new EntityItem(world, player.posX, player.posY - 1.0D, player.posZ, new ItemStack(Item.appleRed, 1, 0));
             world.spawnEntityInWorld(entityitem);
             entityitem.onCollideWithPlayer(player);
+            return true;
         }
-        return true;
+        else
+            return false;
     }
     
     @Override
@@ -116,6 +114,12 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
         return random.nextInt(20) == 0 ? 1 : 0;
     }
     
+//    @Override
+//    public int getDamageValue(World par1World, int par2, int par3, int par4)
+//    {
+//        return par1World.getBlockMetadata(par2, par3, par4) / 4;
+//    }
+    
     @Override
     public boolean isShearable(ItemStack item, World world, int x, int y, int z) 
     {

src/minecraft/biomesoplenty/blocks/BlockBOPColorizedLeaves.java

@@ -93,10 +93,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
     @SideOnly(Side.CLIENT)
     public Icon getIcon(int side, int meta)
     {
-        if (meta < 0 || meta >= textures[0].length)
+        return textures[(!isOpaqueCube() ? 0 : 1)][getTypeFromMeta(meta)];
-            meta = 0;
-
-        return textures[(!isOpaqueCube() ? 0 : 1)][meta];
     }
     
     @Override
@@ -115,7 +112,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
     @Override
     public int damageDropped(int meta)
     {
-        return meta & 15;
+        return getTypeFromMeta(meta);
     }
     
     @Override
@@ -134,7 +131,17 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
     public ArrayList<ItemStack> onSheared(ItemStack item, World world, int x, int y, int z, int fortune) 
     {
         ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
-        ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z) & 15));
+        ret.add(new ItemStack(this, 1, getTypeFromMeta(world.getBlockMetadata(x, y, z))));
         return ret;
     }
+    
+    public String getLeafType(int meta)
+    {
+      return leaves[getTypeFromMeta(meta)];
+    }
+    
+    private static int getTypeFromMeta(int meta)
+    {
+      return meta & 7;
+    }
 }

src/minecraft/biomesoplenty/blocks/BlockBOPLeaves.java

@@ -4,14 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import biomesoplenty.BiomesOPlenty;
-import biomesoplenty.api.Blocks;
-import biomesoplenty.configuration.BOPBlocks;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLeavesBase;
 import net.minecraft.block.material.Material;
@@ -21,16 +13,27 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.IShearable;
+import biomesoplenty.BiomesOPlenty;
+import biomesoplenty.api.Blocks;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
 {
+    public static enum LeafCategory
+    {
+      CAT1, CAT2;
+    }
+    
     private static final String[] leaves = new String[] {"autumn", "bamboo", "blue", "dark", "dead", "fir", "holy", "orange", "origin", "pink", "red", "white"};
     @SideOnly(Side.CLIENT)
     private Icon[][] textures;
+    private final LeafCategory category;
     
-    public BlockBOPLeaves(int blockID)
+    public BlockBOPLeaves(int blockID, LeafCategory cat)
     {
         super(blockID, Material.leaves, false);
+        category = cat;
         setBurnProperties(this.blockID, 30, 60);
         this.setTickRandomly(true);
         setHardness(0.2F);
@@ -56,17 +59,15 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
     @SideOnly(Side.CLIENT)
     public Icon getIcon(int side, int meta)
     {
-        if (meta < 0 || meta >= textures[0].length)
+        return textures[(!isOpaqueCube() ? 0 : 1)][getTypeFromMeta(meta) + (this.category.ordinal() * 8)];
-            meta = 0;
-
-        return textures[(!isOpaqueCube() ? 0 : 1)][meta];
     }
     
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
-        for (int i = 0; i < textures[0].length; ++i)
+        for (int i = 0; i < 8; ++i)
-            list.add(new ItemStack(blockID, 1, i));
+            if (category != LeafCategory.CAT2 || i < 4)
+                list.add(new ItemStack(blockID, 1, i));
     }
     
     @Override
@@ -78,7 +79,13 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
     @Override
     public int damageDropped(int meta)
     {
-        return (meta & 15) + 1;
+        return (getTypeFromMeta(meta) + this.category.ordinal() * 8) + 1;
+    }
+    
+    @Override
+    public int getDamageValue(World par1World, int par2, int par3, int par4)
+    {
+        return getTypeFromMeta(par1World.getBlockMetadata(par2, par3, par4));
     }
     
     @Override
@@ -97,7 +104,17 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
     public ArrayList<ItemStack> onSheared(ItemStack item, World world, int x, int y, int z, int fortune) 
     {
         ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
-        ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z) & 15));
+        ret.add(new ItemStack(this, 1, getTypeFromMeta(world.getBlockMetadata(x, y, z))));
         return ret;
     }
+    
+    public String getLeafType(int meta)
+    {
+      return leaves[getTypeFromMeta(meta) + category.ordinal() * 8];
+    }
+    
+    private static int getTypeFromMeta(int meta)
+    {
+      return meta & 7;
+    }
 }

src/minecraft/biomesoplenty/blocks/BlockBOPLog.java

@@ -21,7 +21,7 @@ public class BlockBOPLog extends Block
       CAT1, CAT2, CAT3;
     }
     
-    private static final String[] woodTypes = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "dead"};
+    private static final String[] types = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "dead", "bigflowerstem"};
     @SideOnly(Side.CLIENT)
     private Icon[] textures;
     private Icon[] logHearts;
@@ -43,14 +43,17 @@ public class BlockBOPLog extends Block
     @SideOnly(Side.CLIENT)
     public void registerIcons(IconRegister iconRegister)
     {
-        textures = new Icon[woodTypes.length];
+        textures = new Icon[types.length];
-        logHearts = new Icon[woodTypes.length];
+        logHearts = new Icon[types.length];
 
-        for (int i = 0; i < woodTypes.length; ++i)
+        for (int i = 0; i < types.length - 1; ++i)
         {
-            textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+woodTypes[i]+"log");
+            textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+types[i]+"log");
             logHearts[i] = iconRegister.registerIcon("BiomesOPlenty:logTopBottum");
         }
+        
+        textures[types.length - 1] = iconRegister.registerIcon("BiomesOPlenty:bigflowerstem");
+        logHearts[types.length - 1] = iconRegister.registerIcon("BiomesOPlenty:stemTopBottum");
     }
     
     @Override
@@ -67,10 +70,7 @@ public class BlockBOPLog extends Block
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
         for (int i = 0; i < 4; ++i)
-            if (category != LogCategory.CAT3 || i < 3)
+            list.add(new ItemStack(this, 1, i));
-//                return;
-//            else
-                list.add(new ItemStack(this, 1, i));
     }
     
     @Override
@@ -147,9 +147,9 @@ public class BlockBOPLog extends Block
       return true;
     }
     
-    public int getWoodType(int meta)
+    public String getWoodType(int meta)
     {
-      return getTypeFromMeta(meta) + category.ordinal() * 4;
+      return types[getTypeFromMeta(meta) + category.ordinal() * 4];
     }
     
     private static int getTypeFromMeta(int meta)

src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java

@@ -18,6 +18,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.IShearable;
 import biomesoplenty.BiomesOPlenty;
+import biomesoplenty.api.Blocks;
 import biomesoplenty.blocks.renderers.PlantsRenderer;
 import biomesoplenty.configuration.BOPBlocks;
 import cpw.mods.fml.relauncher.Side;
@@ -100,13 +101,13 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
     {
         // TODO 
         if (meta == 0)
-            return id == BOPBlocks.driedDirt.blockID || id == Block.sand.blockID;
+            return id == Blocks.driedDirt.get().blockID || id == Block.sand.blockID;
         else if (meta == 1)    
-            return id == BOPBlocks.redRock.blockID;
+            return id == Blocks.redRock.get().blockID;
         else if (meta == 2 || meta == 3)
             return id == Block.sand.blockID;
         else if (meta == 4)
-            return id == BOPBlocks.holyGrass.blockID;
+            return id == Blocks.holyGrass.get().blockID;
         else
             return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID;
     }

src/minecraft/biomesoplenty/blocks/BlockHolyGrass.java

@@ -5,6 +5,7 @@ import static net.minecraftforge.common.ForgeDirection.UP;
 import java.util.Random;
 
 import biomesoplenty.BiomesOPlenty;
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -125,14 +126,14 @@ public class BlockHolyGrass extends Block
     	if (par1World.provider.isHellWorld)
     	{
     		par1World.setBlock(par2, par3 + 1, par4, Block.fire.blockID);
-    		par1World.setBlock(par2, par3, par4, BOPBlocks.smolderingGrass.blockID);
+    		par1World.setBlock(par2, par3, par4, Blocks.smolderingGrass.get().blockID);
     	}
     	
         if (!par1World.isRemote)
         {
             if (par1World.getBlockLightValue(par2, par3 + 1, par4) < 4 && Block.lightOpacity[par1World.getBlockId(par2, par3 + 1, par4)] > 2)
             {
-                par1World.setBlock(par2, par3, par4, BOPBlocks.holyStone.blockID);
+                par1World.setBlock(par2, par3, par4, Blocks.holyStone.get().blockID);
             }
             else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9)
             {
@@ -143,9 +144,9 @@ public class BlockHolyGrass extends Block
                     int var9 = par4 + par5Random.nextInt(3) - 1;
                     int var10 = par1World.getBlockId(var7, var8 + 1, var9);
 
-                    if (par1World.getBlockId(var7, var8, var9) == BOPBlocks.holyStone.blockID && par1World.getBlockLightValue(var7, var8 + 1, var9) >= 4 && Block.lightOpacity[var10] <= 2)
+                    if (par1World.getBlockId(var7, var8, var9) == Blocks.holyStone.get().blockID && par1World.getBlockLightValue(var7, var8 + 1, var9) >= 4 && Block.lightOpacity[var10] <= 2)
                     {
-                        par1World.setBlock(var7, var8, var9, BOPBlocks.holyGrass.blockID);
+                        par1World.setBlock(var7, var8, var9, Blocks.holyGrass.get().blockID);
                     }
                 }
             }
@@ -157,6 +158,6 @@ public class BlockHolyGrass extends Block
      */
     public int idDropped(int par1, Random par2Random, int par3)
     {
-        return BOPBlocks.holyStone.idDropped(0, par2Random, par3);
+        return Blocks.holyStone.get().idDropped(0, par2Random, par3);
     }
 }

src/minecraft/biomesoplenty/blocks/BlockMoss.java

@@ -2,6 +2,7 @@ package biomesoplenty.blocks;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPItems;
 
@@ -174,7 +175,7 @@ public class BlockMoss extends Block
      */
     private boolean canBePlacedOn(int par1)
     {
-        if (par1 != Block.wood.blockID && par1 != BOPBlocks.willowWood.blockID && par1 != Block.stone.blockID)
+        if (par1 != Block.wood.blockID && par1 != Blocks.logs3.get().blockID && par1 != Block.stone.blockID)
         {
             return false;
         }

src/minecraft/biomesoplenty/blocks/BlockOriginGrass.java

@@ -3,6 +3,7 @@ package biomesoplenty.blocks;
 import java.util.Random;
 
 import biomesoplenty.BiomesOPlenty;
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -123,7 +124,7 @@ public class BlockOriginGrass extends Block
 
                     if (par1World.getBlockId(var7, var8, var9) == Block.dirt.blockID && par1World.getBlockLightValue(var7, var8 + 1, var9) >= 4 && Block.lightOpacity[var10] <= 2)
                     {
-                        par1World.setBlock(var7, var8, var9, BOPBlocks.originGrass.blockID);
+                        par1World.setBlock(var7, var8, var9, Blocks.originGrass.get().blockID);
                     }
                 }
             }

src/minecraft/biomesoplenty/configuration/BOPItems.java

@@ -1,6 +1,7 @@
 package biomesoplenty.configuration;
 
 import biomesoplenty.BiomesOPlenty;
+import biomesoplenty.api.Blocks;
 import biomesoplenty.armor.ArmorAmethyst;
 import biomesoplenty.armor.ArmorMuddy;
 import biomesoplenty.items.ItemAncientStaff;
@@ -40,12 +41,12 @@ public class BOPItems {
 	public static Item shroomPowder;
 	public static Item mudBall;
 	public static Item mudBrick;
-	public static Item cattailItem;
+//	public static Item cattailItem;
-	public static Item barleyItem;
+//	public static Item barleyItem;
-	public static Item shortGrassItem;
+//	public static Item shortGrassItem;
-	public static Item mediumGrassItem;
+//	public static Item mediumGrassItem;
-	public static Item bushItem;
+//	public static Item bushItem;
-	public static Item sproutItem;
+//	public static Item sproutItem;
 	public static Item mossItem;
 	public static Item ashes;
 	public static Item bambooItem;
@@ -96,13 +97,13 @@ public class BOPItems {
 		shroomPowder = (new ItemShroomPowder(BOPConfiguration.shroomPowderID, 1, 0.5F, false)).setPotionEffect(Potion.confusion.id, 30, 0, 0.6F).setAlwaysEdible().setUnlocalizedName("shroomPowder").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
 		mudBall = (new ItemBOP(BOPConfiguration.mudBallID, 0)).setUnlocalizedName("mudBall").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
 		mudBrick = (new ItemBOP(BOPConfiguration.mudBrickID, 1)).setUnlocalizedName("mudBrick").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
-		bambooItem = (new ItemBamboo(BOPConfiguration.bambooItemID, BOPBlocks.bamboo)).setUnlocalizedName("bambooItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
+		bambooItem = (new ItemBamboo(BOPConfiguration.bambooItemID, Blocks.bamboo.get())).setUnlocalizedName("bambooItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
-		cattailItem = (new ItemCattail(BOPConfiguration.cattailItemID, BOPBlocks.cattail)).setUnlocalizedName("cattailItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
+//		cattailItem = (new ItemCattail(BOPConfiguration.cattailItemID, BOPBlocks.cattail)).setUnlocalizedName("cattailItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
-		barleyItem = (new ItemBarley(BOPConfiguration.barleyItemID, BOPBlocks.barley)).setUnlocalizedName("barleyItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
+//		barleyItem = (new ItemBarley(BOPConfiguration.barleyItemID, BOPBlocks.barley)).setUnlocalizedName("barleyItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
-		shortGrassItem = (new ItemShortGrass(BOPConfiguration.shortGrassItemID, BOPBlocks.shortGrass)).setUnlocalizedName("shortGrassItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
+//		shortGrassItem = (new ItemShortGrass(BOPConfiguration.shortGrassItemID, BOPBlocks.shortGrass)).setUnlocalizedName("shortGrassItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
-		mediumGrassItem = (new ItemMediumGrass(BOPConfiguration.mediumGrassItemID, BOPBlocks.mediumGrass)).setUnlocalizedName("mediumGrassItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
+//		mediumGrassItem = (new ItemMediumGrass(BOPConfiguration.mediumGrassItemID, BOPBlocks.mediumGrass)).setUnlocalizedName("mediumGrassItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
-		bushItem = (new ItemBush(BOPConfiguration.bushItemID, BOPBlocks.bush)).setUnlocalizedName("bushItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
+//		bushItem = (new ItemBush(BOPConfiguration.bushItemID, BOPBlocks.bush)).setUnlocalizedName("bushItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
-		sproutItem = (new ItemSprout(BOPConfiguration.sproutItemID, BOPBlocks.sprout)).setUnlocalizedName("sproutItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
+//		sproutItem = (new ItemSprout(BOPConfiguration.sproutItemID, BOPBlocks.sprout)).setUnlocalizedName("sproutItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
 		mossItem = (new ItemBOP(BOPConfiguration.mossItemID, 2)).setUnlocalizedName("mossItem").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
 		ancientStaff = new ItemAncientStaff(BOPConfiguration.ancientStaffID).setUnlocalizedName("ancientStaff").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
 		enderporter = new ItemEnderporter(BOPConfiguration.enderporterID).setUnlocalizedName("enderporter").setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
@@ -161,19 +162,19 @@ public class BOPItems {
 		GameRegistry.addRecipe(new ItemStack(bootsAmethyst, 1), new Object [] {"# #", "# #", Character.valueOf('#'), amethyst});
 		
 		//Other
-		GameRegistry.addRecipe(new ItemStack(Item.wheat, 1), new Object[] {"###", '#', BOPItems.barleyItem});
+//		GameRegistry.addRecipe(new ItemStack(Item.wheat, 1), new Object[] {"###", '#', BOPItems.barleyItem});
 		GameRegistry.addRecipe(new ItemStack(ancientStaff, 1, 0), new Object[] {"T", "P", "H", 'T', ancientStaffTopper, 'P', ancientStaffPole, 'H', ancientStaffHandle});
 		GameRegistry.addRecipe(new ItemStack(ancientStaffHandle, 1, 0), new Object[] {"ISI", "ISI", " E ", 'I', Item.ingotIron, 'S', Block.whiteStone, 'E', Item.emerald});
 		GameRegistry.addRecipe(new ItemStack(ancientStaffPole, 1, 0), new Object[] {"ISI", "IRI", "ISI", 'I', Item.ingotIron, 'S', Block.whiteStone, 'R', Item.redstone});
 		GameRegistry.addRecipe(new ItemStack(ancientStaffTopper, 1, 0), new Object[] {" N ", "IDI", "ISI", 'I', Item.ingotIron, 'S', Block.whiteStone, 'D', Item.diamond, 'N', Item.netherStar});
-		GameRegistry.addRecipe(new ItemStack(enderporter, 1, 0), new Object[] {"IOI", "OAO", "IOI", 'I', Item.eyeOfEnder, 'O', Block.obsidian, 'A', BOPBlocks.amethystBlock});
+		GameRegistry.addRecipe(new ItemStack(enderporter, 1, 0), new Object[] {"IOI", "OAO", "IOI", 'I', Item.eyeOfEnder, 'O', Block.obsidian, 'A', Blocks.amethystBlock.get()});
 		GameRegistry.addRecipe(new ItemStack(bopDiscMud, 1), new Object[] {" M ", "MDM", " M ", 'M', mudBall, 'D', bopDisc});
 		
-		GameRegistry.addShapelessRecipe(new ItemStack(bambooItem, 9), new Object[] {BOPBlocks.bambooThatching});
+		GameRegistry.addShapelessRecipe(new ItemStack(bambooItem, 9), new Object[] {Blocks.bambooThatching.get()});
-		GameRegistry.addShapelessRecipe(new ItemStack(amethyst, 9), new Object[] {BOPBlocks.amethystBlock});
+		GameRegistry.addShapelessRecipe(new ItemStack(amethyst, 9), new Object[] {Blocks.amethystBlock.get()});
 		
 		//Plants
-		GameRegistry.addShapelessRecipe(new ItemStack(shroomPowder, 2), new Object[] {BOPBlocks.toadstool});
+		GameRegistry.addShapelessRecipe(new ItemStack(shroomPowder, 2), new Object[] {new ItemStack(Blocks.flowers.get(),1,10)});
 		
 		GameRegistry.addSmelting(mudBall.itemID, new ItemStack(mudBrick, 1), 0F);
 		
@@ -181,13 +182,13 @@ public class BOPItems {
 		LanguageRegistry.addName(mudBall, "Mud Ball");
 		LanguageRegistry.addName(mudBrick, "Mud Brick");
 		LanguageRegistry.addName(bambooItem, "Bamboo");
-		LanguageRegistry.addName(cattailItem, "Cattail");
+//		LanguageRegistry.addName(cattailItem, "Cattail");
-		LanguageRegistry.addName(shortGrassItem, "Short Grass");
+//		LanguageRegistry.addName(shortGrassItem, "Short Grass");
-		LanguageRegistry.addName(mediumGrassItem, "Medium Grass");
+//		LanguageRegistry.addName(mediumGrassItem, "Medium Grass");
-		LanguageRegistry.addName(bushItem, "Bush");
+//		LanguageRegistry.addName(bushItem, "Bush");
-		LanguageRegistry.addName(sproutItem, "Sprout");
+//		LanguageRegistry.addName(sproutItem, "Sprout");
 		LanguageRegistry.addName(mossItem, "Moss");
-		LanguageRegistry.addName(barleyItem, "Barley");
+//		LanguageRegistry.addName(barleyItem, "Barley");
 		LanguageRegistry.addName(ashes, "Pile of Ashes");
 		LanguageRegistry.addName(pickaxeMud, "Muddy Pickaxe");
 		LanguageRegistry.addName(axeMud, "Muddy Axe");

src/minecraft/biomesoplenty/configuration/BOPVanillaCompat.java

@@ -1,5 +1,6 @@
 package biomesoplenty.configuration;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.items.projectiles.DispenserBehaviorMudball;
 import net.minecraft.block.BlockDispenser;
 import net.minecraft.item.Item;
@@ -31,21 +32,21 @@ public class BOPVanillaCompat {
 		dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Item.dyePowder, 1, 2), 4, 12, 75));
 
 		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(BOPItems.ashes), 2, 8, 25));
-		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(BOPBlocks.thorn), 4, 6, 15));
+		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.plants.get(),1,5), 4, 6, 15));
 		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(BOPItems.mudBall), 2, 8, 10));
 		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Item.dyePowder, 1, 3), 4, 12, 75));
 
 		strongholdCorridor.addItem(new WeightedRandomChestContent(new ItemStack(BOPItems.mossItem), 2, 8, 50));
-		strongholdCorridor.addItem(new WeightedRandomChestContent(new ItemStack(BOPBlocks.glowFlower), 1, 4, 25));
+		strongholdCorridor.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.flowers.get(),1,3), 1, 4, 25));
-		strongholdCorridor.addItem(new WeightedRandomChestContent(new ItemStack(BOPBlocks.deathbloom), 1, 4, 25));
+		strongholdCorridor.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.flowers.get(),1,2), 1, 4, 25));
 
 		strongholdCrossing.addItem(new WeightedRandomChestContent(new ItemStack(BOPItems.mossItem), 2, 8, 50));
-		strongholdCrossing.addItem(new WeightedRandomChestContent(new ItemStack(BOPBlocks.glowFlower), 1, 4, 25));
+		strongholdCrossing.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.flowers.get(),1,3), 1, 4, 25));
-		strongholdCrossing.addItem(new WeightedRandomChestContent(new ItemStack(BOPBlocks.deathbloom), 1, 4, 25));
+		strongholdCrossing.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.flowers.get(),1,2), 1, 4, 25));
 
-		village.addItem(new WeightedRandomChestContent(new ItemStack(BOPItems.barleyItem), 4, 10, 75));
+//		village.addItem(new WeightedRandomChestContent(new ItemStack(BOPItems.barleyItem), 4, 10, 75));
 		village.addItem(new WeightedRandomChestContent(new ItemStack(BOPItems.shroomPowder), 1, 5, 50));
-		village.addItem(new WeightedRandomChestContent(new ItemStack(BOPBlocks.thorn), 2, 6, 25));
+		village.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.plants.get(),1,5), 2, 6, 25));
 		village.addItem(new WeightedRandomChestContent(new ItemStack(Item.dyePowder, 1, 2), 4, 12, 75));
 		village.addItem(new WeightedRandomChestContent(new ItemStack(Item.dyePowder, 1, 3), 4, 12, 75));
 	}

src/minecraft/biomesoplenty/helpers/AchievementHelper.java

@@ -7,6 +7,7 @@ import net.minecraft.stats.Achievement;
 import net.minecraftforge.common.AchievementPage;
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.configuration.BOPItems;
@@ -23,7 +24,7 @@ public class AchievementHelper
     private static Achievement achPromised;
     private static Achievement achMud;
     private static Achievement achShroom;
-    private static Achievement achBarley;
+//    private static Achievement achBarley;
     private static Achievement achMoss;
     
     public static AchievementPage pageBOP;
@@ -37,17 +38,17 @@ public class AchievementHelper
 	public static void init()
 	{
 	    achFlower = (new Achievement(3057, "achFlower", 0, 0, Block.plantRed, null)).registerAchievement();
-        achRedRock = (new Achievement(3058, "achRedRock", -1, 2, BOPBlocks.redRock, achFlower)).registerAchievement();
+        achRedRock = (new Achievement(3058, "achRedRock", -1, 2, new ItemStack(Blocks.redRock.get(),1,0), achFlower)).registerAchievement();
-        achThorn = (new Achievement(3059, "achThorn", 2, 1, BOPBlocks.thorn, achFlower)).registerAchievement();
+        achThorn = (new Achievement(3059, "achThorn", 2, 1, new ItemStack(Blocks.plants.get(),1,5), achFlower)).registerAchievement();
         achAsh = (new Achievement(3060, "achAsh", 1, 3, BOPItems.ashes, achFlower)).registerAchievement();
-        achOrigin = (new Achievement(3061, "achOrigin", 0, 5, BOPBlocks.originGrass, achFlower)).setSpecial().registerAchievement();
+        achOrigin = (new Achievement(3061, "achOrigin", 0, 5, Blocks.originGrass.get(), achFlower)).setSpecial().registerAchievement();
-        achPromised = (new Achievement(3062, "achPromised", 0, -5, BOPBlocks.holyGrass, achFlower)).setSpecial().registerAchievement();
+        achPromised = (new Achievement(3062, "achPromised", 0, -5, Blocks.holyGrass.get(), achFlower)).setSpecial().registerAchievement();
         achMud = (new Achievement(3063, "achMud", -2, -1, BOPItems.mudBall, achFlower)).registerAchievement();
-        achShroom = (new Achievement(3064, "achShroom", 1, -2, BOPBlocks.toadstool, achFlower)).registerAchievement();
+        achShroom = (new Achievement(3064, "achShroom", 1, -2, new ItemStack(Blocks.flowers.get(),1,10), achFlower)).registerAchievement();
-        achBarley = (new Achievement(3065, "achBarley", -2, 4, BOPItems.barleyItem, achFlower)).registerAchievement();
+//        achBarley = (new Achievement(3065, "achBarley", -2, 4, BOPItems.barleyItem, achFlower)).registerAchievement();
         achMoss = (new Achievement(3066, "achMoss", -1, -3, BOPItems.mossItem, achFlower)).registerAchievement();
 
-        pageBOP = new AchievementPage("Biomes O\' Plenty", new Achievement[] {achFlower, achRedRock, achThorn, achAsh, achOrigin, achPromised, achMud, achShroom, achBarley, achMoss});
+        pageBOP = new AchievementPage("Biomes O\' Plenty", new Achievement[] {achFlower, achRedRock, achThorn, achAsh, achOrigin, achPromised, achMud, achShroom, /*achBarley,*/ achMoss});
         AchievementPage.registerAchievementPage(pageBOP);
         
      // Add Achievement registration
@@ -68,15 +69,15 @@ public class AchievementHelper
     {
         if (BOPConfiguration.achievements == true)
         {
-            if (item.itemID == BOPBlocks.glowFlower.blockID || item.itemID == BOPBlocks.orangeFlower.blockID || item.itemID == BOPBlocks.blueFlower.blockID || item.itemID == BOPBlocks.purpleFlower.blockID || item.itemID == BOPBlocks.pinkFlower.blockID || item.itemID == BOPBlocks.whiteFlower.blockID || item.itemID == BOPBlocks.tinyFlower.blockID || item.itemID == BOPBlocks.deathbloom.blockID || item.itemID == BOPBlocks.hydrangea.blockID || item.itemID == BOPBlocks.violet.blockID || item.itemID == Block.plantRed.blockID || item.itemID == Block.plantYellow.blockID)
+            if (item.itemID == Blocks.flowers.get().blockID || item.itemID == Block.plantRed.blockID || item.itemID == Block.plantYellow.blockID)
             {
                 player.addStat(achFlower, 1);
             }
-            if (item.itemID == BOPBlocks.redRockCobble.blockID)
+            if (item.itemID == Blocks.redRock.get().blockID)
             {
                 player.addStat(achRedRock, 1);
             }
-            if (item.itemID == BOPBlocks.thorn.blockID)
+            if (item.itemID == Blocks.plants.get().blockID && item.getItemDamage() == 5)
             {
                 player.addStat(achThorn, 1);
             }
@@ -84,11 +85,11 @@ public class AchievementHelper
             {
                 player.addStat(achAsh, 1);
             }
-            if (item.itemID == BOPBlocks.originGrass.blockID)
+            if (item.itemID == Blocks.originGrass.get().blockID)
             {
                 player.addStat(achOrigin, 1);
             }
-            if (item.itemID == BOPBlocks.holyGrass.blockID || item.itemID == BOPBlocks.holyStone.blockID)
+            if (item.itemID == Blocks.holyGrass.get().blockID || item.itemID == Blocks.holyStone.get().blockID)
             {
                 player.addStat(achPromised, 1);
             }
@@ -96,14 +97,14 @@ public class AchievementHelper
             {
                 player.addStat(achMud, 1);
             }
-            if (item.itemID == BOPBlocks.toadstool.blockID)
+            if (item.itemID == Blocks.flowers.get().blockID && item.getItemDamage() == 10)
             {
                 player.addStat(achShroom, 1);
             }
-            if (item.itemID == BOPItems.barleyItem.itemID)
+//            if (item.itemID == BOPItems.barleyItem.itemID)
-            {
+//            {
-                player.addStat(achBarley, 1);
+//                player.addStat(achBarley, 1);
-            }
+//            }
             if (item.itemID == BOPItems.mossItem.itemID)
             {
                 player.addStat(achMoss, 1);

src/minecraft/biomesoplenty/helpers/BonemealUse.java

@@ -1,31 +1,13 @@
 package biomesoplenty.helpers;
 
-import biomesoplenty.blocks.BlockAcaciaSapling;
-import biomesoplenty.blocks.BlockAppleSapling;
-import biomesoplenty.blocks.BlockBambooSapling;
-import biomesoplenty.blocks.BlockBrownSapling;
-import biomesoplenty.blocks.BlockDarkSapling;
-import biomesoplenty.blocks.BlockFirSapling;
-import biomesoplenty.blocks.BlockHolySapling;
-import biomesoplenty.blocks.BlockMagicSapling;
-import biomesoplenty.blocks.BlockMangroveSapling;
-import biomesoplenty.blocks.BlockOrangeSapling;
-import biomesoplenty.blocks.BlockOriginSapling;
-import biomesoplenty.blocks.BlockPalmSapling;
-import biomesoplenty.blocks.BlockPinkSapling;
-import biomesoplenty.blocks.BlockRedSapling;
-import biomesoplenty.blocks.BlockRedwoodSapling;
-import biomesoplenty.blocks.BlockWhiteSapling;
-import biomesoplenty.blocks.BlockWillowSapling;
-import biomesoplenty.blocks.BlockYellowSapling;
-import biomesoplenty.configuration.BOPBlocks;
-import biomesoplenty.worldgen.WorldGenGiantFlowerRed;
-import biomesoplenty.worldgen.WorldGenGiantFlowerYellow;
-
 import net.minecraft.block.Block;
 import net.minecraftforge.event.Event.Result;
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.entity.player.BonemealEvent;
+import biomesoplenty.api.Blocks;
+import biomesoplenty.blocks.BlockBOPSapling;
+import biomesoplenty.worldgen.WorldGenGiantFlowerRed;
+import biomesoplenty.worldgen.WorldGenGiantFlowerYellow;
 
 public class BonemealUse
 {
@@ -34,7 +16,7 @@ public class BonemealUse
 	public void onUseBonemeal(BonemealEvent event)
 	{
 		
-		if (event.ID == BOPBlocks.firSapling.blockID)
+		if (event.ID == Blocks.saplings.get().blockID)
 		{
 			event.setResult(Result.ALLOW);
 			
@@ -42,165 +24,22 @@ public class BonemealUse
 			{
 				if ((double)event.world.rand.nextFloat() < 0.45D)
 				{
-					((BlockFirSapling)BOPBlocks.firSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
+					((BlockBOPSapling)Blocks.saplings.get()).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
 				}
 			}
 		}
 		
-		if (event.ID == BOPBlocks.redwoodSapling.blockID)
+		if (event.ID == Blocks.saplings.get().blockID) // Origin
-		{
-			event.setResult(Result.ALLOW);
-			
-			if (!event.world.isRemote)
-			{
-				if ((double)event.world.rand.nextFloat() < 0.45D)
-				{
-					((BlockRedwoodSapling)BOPBlocks.redwoodSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
-				}
-			}
-		}
-		
-		if (event.ID == BOPBlocks.palmSapling.blockID)
-		{
-			event.setResult(Result.ALLOW);
-			
-			if (!event.world.isRemote)
-			{
-				if ((double)event.world.rand.nextFloat() < 0.45D)
-				{
-					((BlockPalmSapling)BOPBlocks.palmSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
-				}
-			}
-		}
-		
-		if (event.ID == BOPBlocks.redSapling.blockID)
-		{
-			event.setResult(Result.ALLOW);
-			
-			if (!event.world.isRemote)
-			{
-				if ((double)event.world.rand.nextFloat() < 0.45D)
-				{
-					((BlockRedSapling)BOPBlocks.redSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
-				}
-			}
-		}
-		
-		if (event.ID == BOPBlocks.orangeSapling.blockID)
-		{
-			event.setResult(Result.ALLOW);
-			
-			if (!event.world.isRemote)
-			{
-				if ((double)event.world.rand.nextFloat() < 0.45D)
-				{
-					((BlockOrangeSapling)BOPBlocks.orangeSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
-				}
-			}
-		}
-		
-		if (event.ID == BOPBlocks.yellowSapling.blockID)
-		{
-			event.setResult(Result.ALLOW);
-			
-			if (!event.world.isRemote)
-			{
-				if ((double)event.world.rand.nextFloat() < 0.45D)
-				{
-					((BlockYellowSapling)BOPBlocks.yellowSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
-				}
-			}
-		}
-		
-		if (event.ID == BOPBlocks.brownSapling.blockID)
-		{
-			event.setResult(Result.ALLOW);
-			
-			if (!event.world.isRemote)
-			{
-				if ((double)event.world.rand.nextFloat() < 0.45D)
-				{
-					((BlockBrownSapling)BOPBlocks.brownSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
-				}
-			}
-		}
-		
-		if (event.ID == BOPBlocks.willowSapling.blockID)
-		{
-			event.setResult(Result.ALLOW);
-			
-			if (!event.world.isRemote)
-			{
-				if ((double)event.world.rand.nextFloat() < 0.45D)
-				{
-					((BlockWillowSapling)BOPBlocks.willowSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
-				}
-			}
-		}
-		
-		if (event.ID == BOPBlocks.appleSapling.blockID)
-		{
-			event.setResult(Result.ALLOW);
-			
-			if (!event.world.isRemote)
-			{
-				if ((double)event.world.rand.nextFloat() < 0.45D)
-				{
-					((BlockAppleSapling)BOPBlocks.appleSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
-				}
-			}
-		}
-		
-		if (event.ID == BOPBlocks.originSapling.blockID)
 		{
 			event.setResult(Result.ALLOW);
 
 			if (!event.world.isRemote)
 			{
-				((BlockOriginSapling)BOPBlocks.originSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
+				((BlockBOPSapling)Blocks.saplings.get()).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
 			}
 		}
 		
-		if (event.ID == BOPBlocks.pinkSapling.blockID)
+		if (event.ID == Blocks.saplings.get().blockID) // Holy
-		{
-			event.setResult(Result.ALLOW);
-			
-			if (!event.world.isRemote)
-			{
-				if ((double)event.world.rand.nextFloat() < 0.45D)
-				{
-					((BlockPinkSapling)BOPBlocks.pinkSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
-				}
-			}
-		}
-		
-		if (event.ID == BOPBlocks.whiteSapling.blockID)
-		{
-			event.setResult(Result.ALLOW);
-			
-			if (!event.world.isRemote)
-			{
-				if ((double)event.world.rand.nextFloat() < 0.45D)
-				{
-					((BlockWhiteSapling)BOPBlocks.whiteSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
-				}
-			}
-		}
-		
-		if (event.ID == BOPBlocks.darkSapling.blockID)
-		{
-			event.setResult(Result.ALLOW);
-			
-			if (!event.world.isRemote)
-			{
-				if ((double)event.world.rand.nextFloat() < 0.45D)
-				{
-					((BlockDarkSapling)BOPBlocks.darkSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
-				}
-			}
-		}
-		
-		if (event.ID == BOPBlocks.holySapling.blockID)
 		{
 			event.setResult(Result.ALLOW);
 			
@@ -208,12 +47,12 @@ public class BonemealUse
 			{
 				if ((double)event.world.rand.nextFloat() < 0.15D)
 				{
-					((BlockHolySapling)BOPBlocks.holySapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
+					((BlockBOPSapling)Blocks.saplings.get()).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
 				}
 			}
 		}
 		
-		if (event.ID == BOPBlocks.magicSapling.blockID)
+		if (event.ID == Blocks.saplings.get().blockID) // MAGIC
 		{
 			event.setResult(Result.ALLOW);
 			
@@ -221,53 +60,11 @@ public class BonemealUse
 			{
 				if ((double)event.world.rand.nextFloat() < 0.10D)
 				{
-					((BlockMagicSapling)BOPBlocks.magicSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
+					((BlockBOPSapling)Blocks.saplings.get()).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
 				}
 			}
 		}
-		
-		if (event.ID == BOPBlocks.mangroveSapling.blockID)
-		{
-			if (event.world.getBlockId(event.X, event.Y - 1, event.Z) == Block.sand.blockID)
-			{
-				event.setResult(Result.ALLOW);
 
-				if (!event.world.isRemote)
-				{
-					if ((double)event.world.rand.nextFloat() < 0.45D)
-					{
-						((BlockMangroveSapling)BOPBlocks.mangroveSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
-					}
-				}
-			}
-		}
-		
-		if (event.ID == BOPBlocks.acaciaSapling.blockID)
-		{
-			event.setResult(Result.ALLOW);
-			
-			if (!event.world.isRemote)
-			{
-				if ((double)event.world.rand.nextFloat() < 0.45D)
-				{
-					((BlockAcaciaSapling)BOPBlocks.acaciaSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
-				}
-			}
-		}
-		
-		if (event.ID == BOPBlocks.bambooSapling.blockID)
-		{
-			event.setResult(Result.ALLOW);
-			
-			if (!event.world.isRemote)
-			{
-				if ((double)event.world.rand.nextFloat() < 0.45D)
-				{
-					((BlockBambooSapling)BOPBlocks.bambooSapling).growTree(event.world, event.X, event.Y, event.Z, event.world.rand);
-				}
-			}
-		}
-		
 		if (event.ID == Block.plantRed.blockID)
 		{
 			event.setResult(Result.ALLOW);
@@ -296,7 +93,7 @@ public class BonemealUse
 			}
 		}
 		
-		if (event.ID == BOPBlocks.holyGrass.blockID)
+		if (event.ID == Blocks.holyGrass.get().blockID)
 		{
 			int var13 = event.X;
 			int var14 = event.Y + 1;
@@ -314,13 +111,13 @@ public class BonemealUse
 
 				if (event.world.getBlockId(var13, var14, var15) == 0)
 				{
-					if (BOPBlocks.holyTallGrass.canBlockStay(event.world, var13, var14, var15))
+					if (Blocks.plants.get().canBlockStay(event.world, var13, var14, var15))
 					{
 						event.setResult(Result.ALLOW);
 
 						if (!event.world.isRemote)
 						{
-							event.world.setBlock(var13, var14, var15, BOPBlocks.holyTallGrass.blockID, 0, 0x02);
+							event.world.setBlock(var13, var14, var15, Blocks.plants.get().blockID, 4, 0x02);
 						}      
 					}
 				}

src/minecraft/biomesoplenty/helpers/ChunkProviderPromised.java

@@ -3,6 +3,7 @@ package biomesoplenty.helpers;
 import java.util.List;
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -167,7 +168,7 @@ public class ChunkProviderPromised implements IChunkProvider
                             if (var7 <= 0)
                             {
                                 var9 = 0;
-                                var10 = (byte)BOPBlocks.holyStone.blockID;
+                                var10 = (byte)Blocks.holyStone.get().blockID;
                             }
 							else if (var11 >= var98 - 4 && var11 <= var98 + 1)
 							{

src/minecraft/biomesoplenty/helpers/CreativeTabsBOP.java

@@ -1,5 +1,6 @@
 package biomesoplenty.helpers;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.creativetab.CreativeTabs;
@@ -15,6 +16,6 @@ public class CreativeTabsBOP extends CreativeTabs
 	@Override
 	public ItemStack getIconItemStack()
 	{
-		return new ItemStack(BOPBlocks.firSapling);
+		return new ItemStack(Blocks.saplings.get(),1,6);
 	}
 }

src/minecraft/biomesoplenty/helpers/FurnaceFuel.java

@@ -1,6 +1,7 @@
 package biomesoplenty.helpers;
 
 import net.minecraft.item.ItemStack;
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPItems;
 import cpw.mods.fml.common.IFuelHandler;
@@ -15,151 +16,59 @@ public class FurnaceFuel implements IFuelHandler {
 	// Add Fuel rates
 	private static int addFuel(int par1, int par2)
     {
-        if(par1 == BOPBlocks.redwoodSapling.blockID)
+        if(par1 == Blocks.colorizedSaplings.get().blockID)
         {
             return 100;
         }
-        if(par1 == BOPBlocks.redwoodSingleSlab.blockID)
+        if(par1 == Blocks.woodenSingleSlab1.get().blockID)
         {
             return 150;
         }
-        if(par1 == BOPBlocks.redwoodStairs.blockID)
+        if(par1 == Blocks.redwoodStairs.get().blockID)
         {
             return 300;
         }
-        if(par1 == BOPBlocks.willowSapling.blockID)
+        if(par1 == Blocks.woodenSingleSlab2.get().blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.willowSingleSlab.blockID)
         {
             return 150;
         }
-        if(par1 == BOPBlocks.willowStairs.blockID)
+        if(par1 == Blocks.willowStairs.get().blockID)
         {
             return 300;
         }
-        if(par1 == BOPBlocks.firSapling.blockID)
+        if(par1 == Blocks.saplings.get().blockID)
         {
             return 100;
         }
-        if(par1 == BOPBlocks.firSingleSlab.blockID)
+        if(par1 == Blocks.firStairs.get().blockID)
-        {
-            return 150;
-        }
-        if(par1 == BOPBlocks.firStairs.blockID)
         {
             return 300;
         }
-        if(par1 == BOPBlocks.acaciaSapling.blockID)
+        if(par1 == Blocks.acaciaStairs.get().blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.acaciaSingleSlab.blockID)
-        {
-            return 150;
-        }
-        if(par1 == BOPBlocks.acaciaStairs.blockID)
         {
             return 300;
         }
-        if(par1 == BOPBlocks.pinkSapling.blockID)
+        if(par1 == Blocks.cherryStairs.get().blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.whiteSapling.blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.orangeSapling.blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.yellowSapling.blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.redSapling.blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.brownSapling.blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.appleSapling.blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.originSapling.blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.cherrySingleSlab.blockID)
-        {
-            return 150;
-        }
-        if(par1 == BOPBlocks.cherryStairs.blockID)
         {
             return 300;
         }
-        if(par1 == BOPBlocks.darkSapling.blockID)
+        if(par1 == Blocks.darkStairs.get().blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.darkSingleSlab.blockID)
-        {
-            return 150;
-        }
-        if(par1 == BOPBlocks.darkStairs.blockID)
         {
             return 300;
         }
-        if(par1 == BOPBlocks.magicSapling.blockID)
+        if(par1 == Blocks.magicStairs.get().blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.magicSingleSlab.blockID)
-        {
-            return 150;
-        }
-        if(par1 == BOPBlocks.magicStairs.blockID)
         {
             return 300;
         }
-        if(par1 == BOPBlocks.palmSapling.blockID)
+        if(par1 == Blocks.palmStairs.get().blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.palmSingleSlab.blockID)
-        {
-            return 150;
-        }
-        if(par1 == BOPBlocks.palmStairs.blockID)
         {
             return 300;
         }
-        if(par1 == BOPBlocks.mangroveSapling.blockID)
+        if(par1 == Blocks.mangroveStairs.get().blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.mangroveSingleSlab.blockID)
-        {
-            return 150;
-        }
-        if(par1 == BOPBlocks.mangroveStairs.blockID)
         {
             return 300;
         }
-        if(par1 == BOPBlocks.holySapling.blockID)
+        if(par1 == Blocks.holyStairs.get().blockID)
-        {
-            return 100;
-        }
-        if(par1 == BOPBlocks.holySingleSlab.blockID)
-        {
-            return 150;
-        }
-        if(par1 == BOPBlocks.holyStairs.blockID)
         {
             return 300;
         }

src/minecraft/biomesoplenty/helpers/TeleporterPromised.java

@@ -5,6 +5,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -160,7 +161,7 @@ public class TeleporterPromised extends Teleporter
 						this.worldServerInstance.setBlock(3, 61 - var99, 3, 0);
 						this.worldServerInstance.setBlock(3, 60 - var99, 3, 0);
 						
-						this.worldServerInstance.setBlock(0, 64 - var99, 0, BOPBlocks.promisedPortal.blockID);
+						this.worldServerInstance.setBlock(0, 64 - var99, 0, Blocks.promisedPortal.get().blockID);
 					}
 				}
 			}
@@ -208,9 +209,9 @@ public class TeleporterPromised extends Teleporter
 
 					for (int var26 = this.worldServerInstance.getActualHeight() - 1; var26 >= 0; --var26)
 					{
-						if (this.worldServerInstance.getBlockId(var48, var26, var23) == BOPBlocks.promisedPortal.blockID)
+						if (this.worldServerInstance.getBlockId(var48, var26, var23) == Blocks.promisedPortal.get().blockID)
 						{
-							while (this.worldServerInstance.getBlockId(var48, var26 - 1, var23) == BOPBlocks.promisedPortal.blockID)
+							while (this.worldServerInstance.getBlockId(var48, var26 - 1, var23) == Blocks.promisedPortal.get().blockID)
 								{
 								--var26;
 								}
@@ -244,22 +245,22 @@ public class TeleporterPromised extends Teleporter
 			var27 = (double) var14 + 0.5D;
 			int var50 = -1;
 
-			if (this.worldServerInstance.getBlockId(var12 - 1, var13, var14) == BOPBlocks.promisedPortal.blockID)
+			if (this.worldServerInstance.getBlockId(var12 - 1, var13, var14) == Blocks.promisedPortal.get().blockID)
 			{
 				var50 = 2;
 			}
 
-			if (this.worldServerInstance.getBlockId(var12 + 1, var13, var14) == BOPBlocks.promisedPortal.blockID)
+			if (this.worldServerInstance.getBlockId(var12 + 1, var13, var14) == Blocks.promisedPortal.get().blockID)
 			{
 				var50 = 0;
 			}
 
-			if (this.worldServerInstance.getBlockId(var12, var13, var14 - 1) == BOPBlocks.promisedPortal.blockID)
+			if (this.worldServerInstance.getBlockId(var12, var13, var14 - 1) == Blocks.promisedPortal.get().blockID)
 			{
 				var50 = 3;
 			}
 
-			if (this.worldServerInstance.getBlockId(var12, var13, var14 + 1) == BOPBlocks.promisedPortal.blockID)
+			if (this.worldServerInstance.getBlockId(var12, var13, var14 + 1) == Blocks.promisedPortal.get().blockID)
 			{
 				var50 = 1;
 			}
@@ -644,7 +645,7 @@ public class TeleporterPromised extends Teleporter
 						this.worldServerInstance.setBlock(3, 61 - var99, 3, 0);
 						this.worldServerInstance.setBlock(3, 60 - var99, 3, 0);
 						
-						this.worldServerInstance.setBlock(0, 64 - var99, 0, BOPBlocks.promisedPortal.blockID);
+						this.worldServerInstance.setBlock(0, 64 - var99, 0, Blocks.promisedPortal.get().blockID);
 					}
 				}
 			}
@@ -760,7 +761,7 @@ public class TeleporterPromised extends Teleporter
 					this.worldServerInstance.setBlock(3, 61 - var99, 3, 0);
 					this.worldServerInstance.setBlock(3, 60 - var99, 3, 0);
 					
-					this.worldServerInstance.setBlock(0, 64 - var99, 0, BOPBlocks.promisedPortal.blockID);
+					this.worldServerInstance.setBlock(0, 64 - var99, 0, Blocks.promisedPortal.get().blockID);
 				}
 			}
 

src/minecraft/biomesoplenty/helpers/WorldProviderPromised.java

@@ -1,6 +1,7 @@
 package biomesoplenty.helpers;
 
 import biomesoplenty.api.Biomes;
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 import biomesoplenty.configuration.BOPConfiguration;
 
@@ -67,7 +68,7 @@ public class WorldProviderPromised extends WorldProvider
     public boolean canCoordinateBeSpawn(int par1, int par2)
     {
         int var3 = this.worldObj.getFirstUncoveredBlock(par1, par2);
-        return var3 == BOPBlocks.holyGrass.blockID;
+        return var3 == Blocks.holyGrass.get().blockID;
     }
 
     /**

src/minecraft/biomesoplenty/items/ItemAncientStaff.java

@@ -1,5 +1,6 @@
 package biomesoplenty.items;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -32,7 +33,7 @@ public class ItemAncientStaff extends Item
 		if (par3EntityPlayer.dimension == 0)
 		{
 
-			if (par2World.getBlockId(0, 64 - 32, 0) != BOPBlocks.promisedPortal.blockID)
+			if (par2World.getBlockId(0, 64 - 32, 0) != Blocks.promisedPortal.get().blockID)
 			{
 
 				if (!par3EntityPlayer.worldObj.isRemote)
@@ -130,7 +131,7 @@ public class ItemAncientStaff extends Item
 				par2World.setBlock(-1, 65 - var99, 0, 0);
 				par2World.setBlock(0, 65 - var99, 0, 0);
 
-				par2World.setBlock(0, 64 - var99, 0, BOPBlocks.promisedPortal.blockID);
+				par2World.setBlock(0, 64 - var99, 0, Blocks.promisedPortal.get().blockID);
 
 				par2World.setBlock(-2, 64 - var99, 2, 0);
 				par2World.setBlock(2, 64 - var99, 2, 0);

src/minecraft/biomesoplenty/items/ItemBOPAppleLeaves.java

@@ -0,0 +1,25 @@
+package biomesoplenty.items;
+
+import net.minecraft.item.ItemBlock;
+import net.minecraft.util.Icon;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class ItemBOPAppleLeaves extends ItemBlock
+{
+    @SideOnly(Side.CLIENT)
+    private Icon texture;
+    
+    public ItemBOPAppleLeaves(int par1)
+    {
+        super(par1);
+        setMaxDamage(0);
+        setHasSubtypes(true);
+    }
+    
+    @Override
+    public int getMetadata(int meta)
+    {
+        return meta | 8;
+    }
+}

src/minecraft/biomesoplenty/items/ItemBOPColorizedLeaves.java

@@ -1,12 +1,12 @@
 package biomesoplenty.items;
 
+import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import biomesoplenty.blocks.BlockBOPColorizedLeaves;
 
 public class ItemBOPColorizedLeaves extends ItemBlock
 {
-    private static final String[] leaves = new String[] {"acacia", "mangrove", "palm", "redwood", "willow"};
-    
     public ItemBOPColorizedLeaves(int par1)
     {
         super(par1);
@@ -17,12 +17,13 @@ public class ItemBOPColorizedLeaves extends ItemBlock
     @Override
     public int getMetadata(int meta)
     {
-        return meta & 15;
+        return meta | 8;
     }
     
     @Override
     public String getUnlocalizedName(ItemStack itemStack)
     {
-        return (new StringBuilder()).append(leaves[itemStack.getItemDamage()]).append("Planks").toString();
+        BlockBOPColorizedLeaves block = (BlockBOPColorizedLeaves)Block.blocksList[itemStack.itemID];
+        return block.getLeafType(itemStack.getItemDamage());
     }
 }

src/minecraft/biomesoplenty/items/ItemBOPLeaves.java

@@ -1,12 +1,12 @@
 package biomesoplenty.items;
 
+import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import biomesoplenty.blocks.BlockBOPLeaves;
 
 public class ItemBOPLeaves extends ItemBlock
 {
-    private static final String[] leaves = new String[] {"autumn", "bamboo", "blue", "dark", "dead", "fir", "holy", "orange", "origin", "pink", "red", "white"};
-    
     public ItemBOPLeaves(int par1)
     {
         super(par1);
@@ -17,12 +17,13 @@ public class ItemBOPLeaves extends ItemBlock
     @Override
     public int getMetadata(int meta)
     {
-        return meta & 15;
+        return meta | 8;
     }
     
     @Override
     public String getUnlocalizedName(ItemStack itemStack)
     {
-        return (new StringBuilder()).append(leaves[itemStack.getItemDamage()]).append("Leaves").toString();
+        BlockBOPLeaves block = (BlockBOPLeaves)Block.blocksList[itemStack.itemID];
+        return block.getLeafType(itemStack.getItemDamage());
     }
 }

src/minecraft/biomesoplenty/items/ItemBOPLog.java

@@ -1,15 +1,12 @@
 package biomesoplenty.items;
 
-import biomesoplenty.blocks.BlockBOPLog;
-
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import biomesoplenty.blocks.BlockBOPLog;
 
 public class ItemBOPLog extends ItemBlock
 {
-    private static final String[] woodTypes = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "dead"};
-
     public ItemBOPLog(int par1)
     {
         super(par1);
@@ -26,7 +23,7 @@ public class ItemBOPLog extends ItemBlock
     @Override
     public String getUnlocalizedName(ItemStack itemStack)
     {
-        BlockBOPLog wood = (BlockBOPLog)Block.blocksList[itemStack.itemID];
+        BlockBOPLog block = (BlockBOPLog)Block.blocksList[itemStack.itemID];
-        return (new StringBuilder()).append(woodTypes[wood.getWoodType(itemStack.getItemDamage())]).append("Wood").toString();
+        return block.getWoodType(itemStack.getItemDamage());
     }
 }

src/minecraft/biomesoplenty/worldgen/WorldGenAcacia.java

@@ -2,9 +2,13 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import cpw.mods.fml.common.registry.LanguageRegistry;
+
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
 
@@ -72,7 +76,7 @@ public class WorldGenAcacia extends WorldGenerator
                         {
                             var12 = par1World.getBlockId(var10, var8, var11);
 
-                            if (var12 != 0 && var12 != BOPBlocks.acaciaLeaves.blockID && var12 != Block.grass.blockID && var12 != Block.dirt.blockID && var12 != BOPBlocks.acaciaWood.blockID)
+                            if (var12 != 0 && var12 != Blocks.leavesColorized.get().blockID && var12 != Block.grass.blockID && var12 != Block.dirt.blockID && var12 != Blocks.logs1.get().blockID)
                             {
                                 var7 = false;
                             }
@@ -117,7 +121,7 @@ public class WorldGenAcacia extends WorldGenerator
 
                                 if ((Math.abs(var15) != var13 || Math.abs(var17) != var13 || par2Random.nextInt(2) != 0 && var12 != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var14, var11, var16)])
                                 {
-									this.setBlockAndMetadata(par1World, var14, var11, var16, BOPBlocks.acaciaLeaves.blockID, 0);
+									this.setBlockAndMetadata(par1World, var14, var11, var16, Blocks.leavesColorized.get().blockID, 0);
                                 }
                             }
                         }
@@ -127,9 +131,9 @@ public class WorldGenAcacia extends WorldGenerator
                     {
                         var12 = par1World.getBlockId(par3, par4 + var11, par5);
 
-                        if (var12 == 0 || var12 == BOPBlocks.acaciaLeaves.blockID)
+                        if (var12 == 0 || var12 == Blocks.leavesColorized.get().blockID)
                         {
-                            this.setBlockAndMetadata(par1World, par3, par4 + var11, par5, BOPBlocks.acaciaWood.blockID, 0);
+                            this.setBlockAndMetadata(par1World, par3, par4 + var11, par5, Blocks.logs1.get().blockID,0);
 
                             if (this.vinesGrow && var11 > 0)
                             {
@@ -167,7 +171,7 @@ public class WorldGenAcacia extends WorldGenerator
                             {
                                 for (var15 = par5 - var13; var15 <= par5 + var13; ++var15)
                                 {
-                                    if (par1World.getBlockId(var14, var11, var15) == BOPBlocks.acaciaLeaves.blockID)
+                                    if (par1World.getBlockId(var14, var11, var15) == Blocks.leavesColorized.get().blockID)
                                     {
                                         if (par2Random.nextInt(4) == 0 && par1World.getBlockId(var14 - 1, var11, var15) == 0)
                                         {

src/minecraft/biomesoplenty/worldgen/WorldGenAlgae.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.world.World;
@@ -17,9 +18,9 @@ public class WorldGenAlgae extends WorldGenerator
             int var8 = par4 + par2Random.nextInt(4) - par2Random.nextInt(4);
             int var9 = par5 + par2Random.nextInt(8) - par2Random.nextInt(8);
 
-            if (par1World.isAirBlock(var7, var8, var9) && BOPBlocks.algae.canPlaceBlockAt(par1World, var7, var8, var9))
+            if (par1World.isAirBlock(var7, var8, var9) && Blocks.foliage.get().canPlaceBlockAt(par1World, var7, var8, var9))
             {
-                par1World.setBlock(var7, var8, var9, BOPBlocks.algae.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Blocks.foliage.get().blockID, 0, 2);
             }
         }
 

src/minecraft/biomesoplenty/worldgen/WorldGenApple.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -50,7 +51,7 @@ public class WorldGenApple extends WorldGenerator
                         {
                             var12 = par1World.getBlockId(var10, var8, var11);
 
-                            if (var12 != 0 && var12 != BOPBlocks.appleLeaves.blockID && var12 != BOPBlocks.appleLeavesFruitless.blockID)
+                            if (var12 != 0 && var12 != Blocks.leavesFruit.get().blockID)
                             {
                                 var7 = false;
                             }
@@ -95,11 +96,11 @@ public class WorldGenApple extends WorldGenerator
 									
 									if (var99 == 0)
 										{
-										this.setBlockAndMetadata(par1World, var12, var16, var14, BOPBlocks.appleLeaves.blockID, 0);
+										this.setBlockAndMetadata(par1World, var12, var16, var14, Blocks.leavesFruit.get().blockID, 3);
 										}
 									else
 										{
-										this.setBlockAndMetadata(par1World, var12, var16, var14, BOPBlocks.appleLeavesFruitless.blockID, 0);
+										this.setBlockAndMetadata(par1World, var12, var16, var14, Blocks.leavesFruit.get().blockID, 0);
 										}
                                 }
                             }
@@ -110,7 +111,7 @@ public class WorldGenApple extends WorldGenerator
                     {
                         var10 = par1World.getBlockId(par3, par4 + var16, par5);
 
-                        if (var10 == 0 || var10 == BOPBlocks.appleLeaves.blockID || var10 == BOPBlocks.appleLeavesFruitless.blockID)
+                        if (var10 == 0 || var10 == Blocks.leavesFruit.get().blockID)
                         {
                             this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Block.wood.blockID, 0);
                         }

src/minecraft/biomesoplenty/worldgen/WorldGenAppleTree2.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -36,229 +37,229 @@ public class WorldGenAppleTree2 extends WorldGenerator
                 }
             }
 
-			var1.setBlock(var3 + 0, var4 + 6, var5 + 3, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 0, var4 + 6, var5 + 3, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 0, var4 + 6, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 0, var4 + 6, var5 + 4, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 0, var4 + 14, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 0, var4 + 14, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 1, var4 + 3, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 3, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 1, var4 + 3, var5 + 9, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 3, var5 + 9, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 1, var4 + 4, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 4, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 1, var4 + 4, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 4, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 1, var4 + 5, var5 + 2, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 1, var4 + 5, var5 + 2, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 1, var4 + 5, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 5, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 1, var4 + 5, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 5, var5 + 12, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 1, var4 + 6, var5 + 4, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 6, var5 + 4, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 1, var4 + 6, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 6, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 1, var4 + 6, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 6, var5 + 12, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 1, var4 + 7, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 7, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 1, var4 + 7, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 7, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 1, var4 + 7, var5 + 13, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 1, var4 + 7, var5 + 13, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 7, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 1, var4 + 7, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 1, var4 + 12, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 1, var4 + 12, var5 + 10, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 1, var4 + 12, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 1, var4 + 12, var5 + 11, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 1, var4 + 13, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 13, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 1, var4 + 13, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 1, var4 + 13, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 1, var4 + 14, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 1, var4 + 14, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 2, var4 + 2, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 2, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 3, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 3, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 3, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 3, var5 + 10, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 4, var5 + 4, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 4, var5 + 4, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 2, var4 + 4, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 4, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 5, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 5, var5 + 10, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 5, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 5, var5 + 12, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 6, var5 + 1, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 6, var5 + 1, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 6, var5 + 13, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 6, var5 + 13, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 7, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 7, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 7, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 7, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 7, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 7, var5 + 10, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 7, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 7, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 7, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 7, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 2, var4 + 8, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 8, var5 + 4, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 2, var4 + 8, var5 + 5, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 8, var5 + 5, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 8, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 8, var5 + 8, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 2, var4 + 8, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 8, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 2, var4 + 9, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 9, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 2, var4 + 10, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 10, var5 + 11, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 2, var4 + 10, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 10, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 2, var4 + 11, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 11, var5 + 11, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 2, var4 + 11, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 11, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 2, var4 + 12, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 12, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 13, var5 + 8, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 13, var5 + 8, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 2, var4 + 13, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 13, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 13, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 13, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 13, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 13, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 2, var4 + 14, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 14, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 14, var5 + 12, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 14, var5 + 12, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 14, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 14, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 2, var4 + 14, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 14, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 2, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 2, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 2, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 2, var5 + 10, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 4, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 4, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 4, var5 + 7, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 4, var5 + 7, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 4, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 4, var5 + 10, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 4, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 4, var5 + 13, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 4, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 4, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 7, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 7, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 10, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 12, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 6, var5 + 3, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 6, var5 + 3, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 6, var5 + 9, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 6, var5 + 9, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 6, var5 + 10, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 6, var5 + 10, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 6, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 6, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 6, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 6, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 6, var5 + 16, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 6, var5 + 16, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 5, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 5, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 10, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 10, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 12, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 8, var5 + 3, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 8, var5 + 3, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 8, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 8, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 8, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 8, var5 + 8, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 9, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 9, var5 + 4, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 9, var5 + 5, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 9, var5 + 5, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 9, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 9, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 10, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 10, var5 + 10, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 10, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 10, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 11, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 11, var5 + 10, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 11, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 11, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 12, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 12, var5 + 8, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 12, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 12, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 12, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 12, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 12, var5 + 12, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 12, var5 + 12, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 12, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 12, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 13, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 13, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 13, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 13, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 13, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 13, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 13, var5 + 15, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 13, var5 + 15, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 14, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 14, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 14, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 14, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 3, var4 + 15, var5 + 8, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 15, var5 + 8, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 15, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 15, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 15, var5 + 12, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 15, var5 + 12, Blocks.leavesFruit.get().blockID, 1, 2);
 			var1.setBlock(var3 + 4, var4 + 0, var5 + 7, Block.wood.blockID, 12, 2);
-			var1.setBlock(var3 + 4, var4 + 2, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 2, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 2, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 2, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 3, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 3, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 4, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 4, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 4, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 4, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 4, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 4, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 5, var5 + 3, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 5, var5 + 3, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 5, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 5, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 5, var5 + 8, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 5, var5 + 8, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 4, var4 + 5, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 5, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 5, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 5, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 5, var5 + 16, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 5, var5 + 16, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 6, var5 + 2, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 6, var5 + 2, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 6, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 6, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 6, var5 + 11, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 6, var5 + 11, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 4, var4 + 6, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 6, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 6, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 6, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 2, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 2, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 3, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 3, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 12, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 4, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 4, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 7, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 7, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 8, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 9, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 9, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 10, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 9, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 9, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 9, var5 + 13, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 9, var5 + 13, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 9, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 9, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 9, var5 + 16, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 9, var5 + 16, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 11, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 11, var5 + 10, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 11, var5 + 11, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 11, var5 + 11, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 11, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 11, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 11, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 11, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 12, var5 + 7, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 12, var5 + 7, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 12, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 12, var5 + 10, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 12, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 12, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 4, var4 + 13, var5 + 10, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 13, var5 + 10, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 4, var4 + 13, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 13, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 14, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 14, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 14, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 14, var5 + 10, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 14, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 14, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 15, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 15, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
 			var1.setBlock(var3 + 5, var4 + 0, var5 + 7, Block.wood.blockID, 12, 2);
 			var1.setBlock(var3 + 5, var4 + 0, var5 + 8, Block.wood.blockID, 12, 2);
 			var1.setBlock(var3 + 5, var4 + 1, var5 + 7, Block.wood.blockID, 12, 2);
 			var1.setBlock(var3 + 5, var4 + 1, var5 + 8, Block.wood.blockID, 12, 2);
 			var1.setBlock(var3 + 5, var4 + 2, var5 + 7, Block.wood.blockID, 12, 2);
 			var1.setBlock(var3 + 5, var4 + 2, var5 + 8, Block.wood.blockID, 12, 2);
-			var1.setBlock(var3 + 5, var4 + 3, var5 + 4, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 3, var5 + 4, Blocks.leavesFruit.get().blockID, 1, 2);
 			var1.setBlock(var3 + 5, var4 + 3, var5 + 8, Block.wood.blockID, 12, 2);
-			var1.setBlock(var3 + 5, var4 + 4, var5 + 2, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 4, var5 + 2, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 4, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 4, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 4, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 4, var5 + 12, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 5, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 5, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 5, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 5, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 5, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 5, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 5, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 5, var5 + 12, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 5, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 5, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 5, var5 + 16, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 5, var5 + 16, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 6, var5 + 3, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 6, var5 + 3, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 6, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 6, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 6, var5 + 12, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 6, var5 + 12, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 5, var4 + 6, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 6, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 6, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 6, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 6, var5 + 15, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 6, var5 + 15, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 12, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 16, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 16, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 8, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 8, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 8, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 8, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 8, var5 + 7, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 8, var5 + 7, Blocks.leavesFruit.get().blockID, 1, 2);
 			var1.setBlock(var3 + 5, var4 + 8, var5 + 9, Block.wood.blockID, 12, 2);
-			var1.setBlock(var3 + 5, var4 + 8, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 8, var5 + 10, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 8, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 8, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 9, var5 + 3, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 9, var5 + 3, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 9, var5 + 7, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 9, var5 + 7, Blocks.leavesFruit.get().blockID, 0, 2);
 			var1.setBlock(var3 + 5, var4 + 9, var5 + 9, Block.wood.blockID, 12, 2);
 			var1.setBlock(var3 + 5, var4 + 9, var5 + 10, Block.wood.blockID, 12, 2);
-			var1.setBlock(var3 + 5, var4 + 9, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 9, var5 + 11, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 9, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 9, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 9, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 9, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
 			var1.setBlock(var3 + 5, var4 + 10, var5 + 10, Block.wood.blockID, 12, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 11, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 11, var5 + 7, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 11, var5 + 7, Blocks.leavesFruit.get().blockID, 2, 2);
 			var1.setBlock(var3 + 5, var4 + 11, var5 + 10, Block.wood.blockID, 12, 2);
-			var1.setBlock(var3 + 5, var4 + 12, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 12, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
 			var1.setBlock(var3 + 5, var4 + 12, var5 + 10, Block.wood.blockID, 12, 2);
-			var1.setBlock(var3 + 5, var4 + 12, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 12, var5 + 11, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 12, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 12, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 12, var5 + 14, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 12, var5 + 14, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 13, var5 + 7, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 13, var5 + 7, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 13, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 13, var5 + 8, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 13, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 13, var5 + 9, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 13, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 13, var5 + 10, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 13, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 13, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 14, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 14, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 5, var4 + 16, var5 + 9, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 16, var5 + 9, Blocks.leavesFruit.get().blockID, 3, 2);
 			var1.setBlock(var3 + 6, var4 + 0, var5 + 6, Block.wood.blockID, 12, 2);
 			var1.setBlock(var3 + 6, var4 + 0, var5 + 7, Block.wood.blockID, 12, 2);
 			var1.setBlock(var3 + 6, var4 + 0, var5 + 8, Block.wood.blockID, 12, 2);
@@ -268,173 +269,173 @@ public class WorldGenAppleTree2 extends WorldGenerator
 			var1.setBlock(var3 + 6, var4 + 2, var5 + 7, Block.wood.blockID, 12, 2);
 			var1.setBlock(var3 + 6, var4 + 2, var5 + 8, Block.wood.blockID, 12, 2);
 			var1.setBlock(var3 + 6, var4 + 3, var5 + 8, Block.wood.blockID, 12, 2);
-			var1.setBlock(var3 + 6, var4 + 4, var5 + 3, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 4, var5 + 3, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 4, var5 + 4, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 4, var5 + 4, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 6, var4 + 4, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 4, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
 			var1.setBlock(var3 + 6, var4 + 4, var5 + 8, Block.wood.blockID, 12, 2);
-			var1.setBlock(var3 + 6, var4 + 4, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 4, var5 + 10, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 4, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 4, var5 + 12, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 4, var5 + 14, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 4, var5 + 14, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 5, var5 + 3, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 5, var5 + 3, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 5, var5 + 4, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 5, var5 + 4, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 6, var4 + 5, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 5, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
 			var1.setBlock(var3 + 6, var4 + 5, var5 + 8, Block.wood.blockID, 12, 2);
 			var1.setBlock(var3 + 6, var4 + 5, var5 + 9, Block.wood.blockID, 12, 2);
-			var1.setBlock(var3 + 6, var4 + 5, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 5, var5 + 10, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 5, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 5, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 5, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 5, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 5, var5 + 16, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 5, var5 + 16, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 3, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 3, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 7, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 7, Blocks.leavesFruit.get().blockID, 2, 2);
 			var1.setBlock(var3 + 6, var4 + 6, var5 + 9, Block.wood.blockID, 12, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 10, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 11, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 11, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 16, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 16, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 1, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 1, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
 			var1.setBlock(var3 + 6, var4 + 7, var5 + 9, Block.wood.blockID, 12, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 10, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 12, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 12, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 16, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 16, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 1, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 1, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 2, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 2, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 3, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 3, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 8, Blocks.leavesFruit.get().blockID, 0, 2);
 			var1.setBlock(var3 + 6, var4 + 8, var5 + 9, Block.wood.blockID, 12, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 10, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 9, var5 + 2, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 9, var5 + 2, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 9, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 9, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 9, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 9, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 9, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 9, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 9, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 9, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 12, var5 + 8, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 12, var5 + 8, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 12, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 12, var5 + 10, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 12, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 12, var5 + 11, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 12, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 12, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 13, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 13, var5 + 9, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 13, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 13, var5 + 10, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 13, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 13, var5 + 11, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 14, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 14, var5 + 9, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 14, var5 + 11, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 14, var5 + 11, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 14, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 14, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 6, var4 + 15, var5 + 9, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 15, var5 + 9, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 15, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 15, var5 + 10, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 3, var5 + 3, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 3, var5 + 3, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 3, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 3, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 3, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 3, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 4, var5 + 2, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 4, var5 + 2, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 4, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 4, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 4, var5 + 7, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 4, var5 + 7, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 4, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 4, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 4, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 4, var5 + 12, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 4, var5 + 13, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 4, var5 + 13, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 7, var4 + 4, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 4, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 5, var5 + 1, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 5, var5 + 1, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 5, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 5, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 5, var5 + 12, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 5, var5 + 12, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 7, var4 + 5, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 5, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 5, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 5, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 6, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 6, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 6, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 6, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 6, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 6, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 6, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 6, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 6, var5 + 11, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 6, var5 + 11, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 7, var4 + 6, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 6, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 6, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 6, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 6, var5 + 15, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 6, var5 + 15, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 6, var5 + 17, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 6, var5 + 17, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 7, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 7, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 7, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 7, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 7, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 7, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 7, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 7, var5 + 10, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 7, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 7, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 7, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 7, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 7, var5 + 17, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 7, var5 + 17, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 8, var5 + 7, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 8, var5 + 7, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 7, var4 + 8, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 8, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 8, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 8, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 8, var5 + 16, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 8, var5 + 16, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 9, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 9, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 9, var5 + 15, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 9, var5 + 15, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 10, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 10, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 11, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 11, var5 + 9, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 7, var4 + 14, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 14, var5 + 11, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 8, var4 + 3, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 3, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 8, var4 + 3, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 3, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 8, var4 + 4, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 4, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 8, var4 + 5, var5 + 3, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 5, var5 + 3, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 8, var4 + 5, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 5, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 8, var4 + 5, var5 + 6, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 5, var5 + 6, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 8, var4 + 5, var5 + 7, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 5, var5 + 7, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 8, var4 + 5, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 5, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 8, var4 + 5, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 5, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 8, var4 + 5, var5 + 16, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 5, var5 + 16, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 6, var5 + 1, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 6, var5 + 1, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 6, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 6, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 8, var4 + 6, var5 + 7, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 6, var5 + 7, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 8, var4 + 6, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 6, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 8, var4 + 6, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 6, var5 + 12, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 8, var4 + 6, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 6, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 8, var4 + 7, var5 + 3, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 7, var5 + 3, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 7, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 7, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 8, var4 + 7, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 7, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 8, var4 + 7, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 7, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 8, var4 + 7, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 7, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 8, var4 + 8, var5 + 5, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 8, var5 + 5, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 8, var4 + 8, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 8, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 8, var4 + 8, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 8, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 8, var4 + 9, var5 + 12, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 9, var5 + 12, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 9, var4 + 2, var5 + 9, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 2, var5 + 9, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 9, var4 + 3, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 3, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 9, var4 + 3, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 3, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 9, var4 + 3, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 3, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 9, var4 + 4, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 4, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 9, var4 + 4, var5 + 5, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 4, var5 + 5, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 9, var4 + 4, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 4, var5 + 6, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 9, var4 + 4, var5 + 7, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 4, var5 + 7, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 9, var4 + 4, var5 + 10, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 4, var5 + 10, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 9, var4 + 4, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 4, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 9, var4 + 4, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 4, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 9, var4 + 5, var5 + 3, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 5, var5 + 3, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 9, var4 + 5, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 5, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 9, var4 + 5, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 5, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 9, var4 + 5, var5 + 7, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 5, var5 + 7, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 9, var4 + 5, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 5, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 9, var4 + 5, var5 + 11, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 5, var5 + 11, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 9, var4 + 6, var5 + 7, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 6, var5 + 7, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 9, var4 + 6, var5 + 12, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 6, var5 + 12, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 9, var4 + 6, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 6, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 9, var4 + 7, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 7, var5 + 5, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 9, var4 + 8, var5 + 11, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 8, var5 + 11, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 9, var4 + 8, var5 + 13, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 8, var5 + 13, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 9, var4 + 8, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 8, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 10, var4 + 4, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 10, var4 + 4, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 10, var4 + 5, var5 + 4, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 10, var4 + 5, var5 + 4, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 10, var4 + 5, var5 + 6, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 10, var4 + 5, var5 + 6, Blocks.leavesFruit.get().blockID, 1, 2);
-			var1.setBlock(var3 + 10, var4 + 5, var5 + 10, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 10, var4 + 5, var5 + 10, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 10, var4 + 5, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 5, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 10, var4 + 6, var5 + 8, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 10, var4 + 6, var5 + 8, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 10, var4 + 6, var5 + 13, BOPBlocks.appleLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 6, var5 + 13, Blocks.leavesFruit.get().blockID, 3, 2);
-			var1.setBlock(var3 + 10, var4 + 6, var5 + 14, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 6, var5 + 14, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 10, var4 + 6, var5 + 15, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 6, var5 + 15, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 10, var4 + 7, var5 + 9, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 10, var4 + 7, var5 + 9, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 11, var4 + 4, var5 + 5, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 4, var5 + 5, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 11, var4 + 5, var5 + 4, BOPBlocks.appleLeavesFruitless.blockID, 12, 2);
+			var1.setBlock(var3 + 11, var4 + 5, var5 + 4, Blocks.leavesFruit.get().blockID, 2, 2);
-			var1.setBlock(var3 + 11, var4 + 5, var5 + 6, BOPBlocks.appleLeavesFruitless.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 5, var5 + 6, Blocks.leavesFruit.get().blockID, 0, 2);
-			var1.setBlock(var3 + 11, var4 + 6, var5 + 4, BOPBlocks.appleLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 11, var4 + 6, var5 + 4, Blocks.leavesFruit.get().blockID, 1, 2);
             return true;
         }
     }

src/minecraft/biomesoplenty/worldgen/WorldGenAsh.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.util.MathHelper;
@@ -63,7 +64,7 @@ public class WorldGenAsh extends WorldGenerator
                             {
                                 double var45 = ((double)var44 + 0.5D - var24) / (var28 / 2.0D);
 
-                                if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == BOPBlocks.ashStone.blockID)
+                                if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Blocks.ashStone.get().blockID)
                                 {
                                     par1World.setBlock(var38, var41, var44, this.minableBlockId);
                                 }

src/minecraft/biomesoplenty/worldgen/WorldGenAutumn.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -49,7 +50,7 @@ public class WorldGenAutumn extends WorldGenerator
                         {
                             var12 = par1World.getBlockId(var10, var8, var11);
 
-                            if (var12 != 0 && var12 != BOPBlocks.autumnLeaves.blockID)
+                            if (var12 != 0 && var12 != Blocks.leaves1.get().blockID)
                             {
                                 var7 = false;
                             }
@@ -90,7 +91,7 @@ public class WorldGenAutumn extends WorldGenerator
 
                                 if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var12, var16, var14)])
                                 {
-                                    this.setBlockAndMetadata(par1World, var12, var16, var14, BOPBlocks.autumnLeaves.blockID, 0);
+                                    this.setBlockAndMetadata(par1World, var12, var16, var14, Blocks.leaves1.get().blockID, 0);
                                 }
                             }
                         }
@@ -100,7 +101,7 @@ public class WorldGenAutumn extends WorldGenerator
                     {
                         var10 = par1World.getBlockId(par3, par4 + var16, par5);
 
-                        if (var10 == 0 || var10 == BOPBlocks.autumnLeaves.blockID)
+                        if (var10 == 0 || var10 == Blocks.leaves1.get().blockID)
                         {
                             this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Block.wood.blockID, 2);
                         }

src/minecraft/biomesoplenty/worldgen/WorldGenAutumn2.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -49,7 +50,7 @@ public class WorldGenAutumn2 extends WorldGenerator
                         {
                             var12 = par1World.getBlockId(var10, var8, var11);
 
-                            if (var12 != 0 && var12 != BOPBlocks.orangeLeaves.blockID)
+                            if (var12 != 0 && var12 != Blocks.leaves1.get().blockID)
                             {
                                 var7 = false;
                             }
@@ -90,7 +91,7 @@ public class WorldGenAutumn2 extends WorldGenerator
 
                                 if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var12, var16, var14)])
                                 {
-                                    this.setBlockAndMetadata(par1World, var12, var16, var14, BOPBlocks.orangeLeaves.blockID, 0);
+                                    this.setBlockAndMetadata(par1World, var12, var16, var14, Blocks.leaves1.get().blockID, 7);
                                 }
                             }
                         }
@@ -100,7 +101,7 @@ public class WorldGenAutumn2 extends WorldGenerator
                     {
                         var10 = par1World.getBlockId(par3, par4 + var16, par5);
 
-                        if (var10 == 0 || var10 == BOPBlocks.orangeLeaves.blockID)
+                        if (var10 == 0 || var10 == Blocks.leaves1.get().blockID)
                         {
                             this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Block.wood.blockID, 0);
                         }

src/minecraft/biomesoplenty/worldgen/WorldGenBOPFlowers.java

@@ -0,0 +1,36 @@
+package biomesoplenty.worldgen;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+public class WorldGenBOPFlowers extends WorldGenerator
+{
+    /** The ID of the plant block used in this plant generator. */
+    private int plantBlockId;
+    private int plantBlockMeta;
+
+    public WorldGenBOPFlowers(int par1, int meta)
+    {
+        this.plantBlockId = par1;
+        this.plantBlockMeta = meta;
+    }
+
+    public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5)
+    {
+        for (int l = 0; l < 64; ++l)
+        {
+            int i1 = par3 + par2Random.nextInt(8) - par2Random.nextInt(8);
+            int j1 = par4 + par2Random.nextInt(4) - par2Random.nextInt(4);
+            int k1 = par5 + par2Random.nextInt(8) - par2Random.nextInt(8);
+
+            if (par1World.isAirBlock(i1, j1, k1) && (!par1World.provider.hasNoSky || j1 < 127) && Block.blocksList[this.plantBlockId].canBlockStay(par1World, i1, j1, k1))
+            {
+                par1World.setBlock(i1, j1, k1, this.plantBlockId, this.plantBlockMeta, 2);
+            }
+        }
+
+        return true;
+    }
+}

src/minecraft/biomesoplenty/worldgen/WorldGenBambooTree.java

@@ -2,9 +2,11 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.Direction;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
@@ -71,7 +73,7 @@ public class WorldGenBambooTree extends WorldGenerator
                         {
                             var12 = par1World.getBlockId(var10, var8, var11);
 
-                            if (var12 != 0 && var12 != BOPBlocks.bambooLeaves.blockID && var12 != Block.grass.blockID && var12 != Block.dirt.blockID && var12 != BOPBlocks.bamboo.blockID)
+                            if (var12 != 0 && var12 != Blocks.leaves1.get().blockID && var12 != Block.grass.blockID && var12 != Block.dirt.blockID && var12 != Blocks.bamboo.get().blockID)
                             {
                                 var7 = false;
                             }
@@ -115,7 +117,7 @@ public class WorldGenBambooTree extends WorldGenerator
 
                                 if ((Math.abs(var15) != var13 || Math.abs(var17) != var13 || par2Random.nextInt(2) != 0 && var12 != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var14, var11, var16)])
                                 {
-                                    this.setBlockAndMetadata(par1World, var14, var11, var16, BOPBlocks.bambooLeaves.blockID, 0);
+                                    this.setBlockAndMetadata(par1World, var14, var11, var16, Blocks.leaves1.get().blockID, 1);
                                 }
                             }
                         }
@@ -125,42 +127,42 @@ public class WorldGenBambooTree extends WorldGenerator
                     {
                         var12 = par1World.getBlockId(par3, par4 + var11, par5);
 
-                        if (var12 == 0 || var12 == BOPBlocks.bambooLeaves.blockID)
+                        if (var12 == 0 || var12 == Blocks.leaves1.get().blockID)
                         {
-                            this.setBlockAndMetadata(par1World, par3, par4 + var11, par5, BOPBlocks.bamboo.blockID, 0);
+                            this.setBlockAndMetadata(par1World, par3, par4 + var11, par5, Blocks.bamboo.get().blockID, 0);
 							
-							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 4), par5, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 4), par5, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 4), par5, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 4), par5, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 4), par5 - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 4), par5 - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 4), par5 + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 4), par5 + 1, Blocks.leaves1.get().blockID, 1);
 							
-							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 5), par5 + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 5), par5 + 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 5), par5 - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 5), par5 - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 5), par5 + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 5), par5 + 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 5), par5 - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 5), par5 - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 5), par5, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 5), par5, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 5), par5, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 5), par5, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 5), par5 - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 5), par5 - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 5), par5 + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 5), par5 + 1, Blocks.leaves1.get().blockID, 1);
 							
-							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 6), par5, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 6), par5, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 6), par5, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 6), par5, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 6), par5 - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 6), par5 - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 6), par5 + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 6), par5 + 1, Blocks.leaves1.get().blockID, 1);
 							
-							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 7), par5 + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 7), par5 + 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 7), par5 - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 7), par5 - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 7), par5 + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 7), par5 + 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 7), par5 - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 7), par5 - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 7), par5, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 7), par5, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 7), par5, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 7), par5, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 7), par5 - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 7), par5 - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 7), par5 + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 7), par5 + 1, Blocks.leaves1.get().blockID, 1);
 							
-							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 8), par5, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 - 1, par4 + (var6 - 8), par5, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 8), par5, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3 + 1, par4 + (var6 - 8), par5, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 8), par5 - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 8), par5 - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 8), par5 + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, par3, par4 + (var6 - 8), par5 + 1, Blocks.leaves1.get().blockID, 1);
 
                             if (this.vinesGrow && var11 > 0)
                             {
@@ -198,7 +200,7 @@ public class WorldGenBambooTree extends WorldGenerator
                             {
                                 for (var15 = par5 - var13; var15 <= par5 + var13; ++var15)
                                 {
-                                    if (par1World.getBlockId(var14, var11, var15) == BOPBlocks.bambooLeaves.blockID)
+                                    if (par1World.getBlockId(var14, var11, var15) == Blocks.leaves1.get().blockID)
                                     {
                                         if (par2Random.nextInt(4) == 0 && par1World.getBlockId(var14 - 1, var11, var15) == 0)
                                         {

src/minecraft/biomesoplenty/worldgen/WorldGenBambooTree2.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -71,7 +72,7 @@ public class WorldGenBambooTree2 extends WorldGenerator
                         {
                             var12 = par1World.getBlockId(var10, var8, var11);
 
-                            if (var12 != 0 && var12 != BOPBlocks.bambooLeaves.blockID && var12 != Block.grass.blockID && var12 != Block.dirt.blockID && var12 != BOPBlocks.bamboo.blockID)
+                            if (var12 != 0 && var12 != Blocks.leaves1.get().blockID && var12 != Block.grass.blockID && var12 != Block.dirt.blockID && var12 != Blocks.bamboo.get().blockID)
                             {
                                 var7 = false;
                             }
@@ -115,7 +116,7 @@ public class WorldGenBambooTree2 extends WorldGenerator
 
                                 if ((Math.abs(var15) != var13 || Math.abs(var17) != var13 || par2Random.nextInt(2) != 0 && var12 != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var14, var11, var16)])
                                 {
-                                    this.setBlockAndMetadata(par1World, var14, var11, var16, BOPBlocks.bambooLeaves.blockID, 0);
+                                    this.setBlockAndMetadata(par1World, var14, var11, var16, Blocks.leaves1.get().blockID, 1);
                                 }
                             }
                         }
@@ -125,42 +126,42 @@ public class WorldGenBambooTree2 extends WorldGenerator
                     {
                         var12 = par1World.getBlockId(X, Y + var11, Z);
 
-                        if (var12 == 0 || var12 == BOPBlocks.bambooLeaves.blockID)
+                        if (var12 == 0 || var12 == Blocks.bamboo.get().blockID)
                         {
-                            this.setBlockAndMetadata(par1World, X, Y + var11, Z, BOPBlocks.bamboo.blockID, 0);
+                            this.setBlockAndMetadata(par1World, X, Y + var11, Z, Blocks.bamboo.get().blockID, 0);
 							
-							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 4), Z, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 4), Z, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 4), Z, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 4), Z, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X, Y + (var6 - 4), Z - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X, Y + (var6 - 4), Z - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X, Y + (var6 - 4), Z + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X, Y + (var6 - 4), Z + 1, Blocks.leaves1.get().blockID, 1);
 							
-							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 5), Z + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 5), Z + 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 5), Z - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 5), Z - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 5), Z + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 5), Z + 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 5), Z - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 5), Z - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 5), Z, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 5), Z, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 5), Z, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 5), Z, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X, Y + (var6 - 5), Z - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X, Y + (var6 - 5), Z - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X, Y + (var6 - 5), Z + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X, Y + (var6 - 5), Z + 1, Blocks.leaves1.get().blockID, 1);
 							
-							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 6), Z, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 6), Z, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 6), Z, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 6), Z, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X, Y + (var6 - 6), Z - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X, Y + (var6 - 6), Z - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X, Y + (var6 - 6), Z + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X, Y + (var6 - 6), Z + 1, Blocks.leaves1.get().blockID, 1);
 							
-							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 7), Z + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 7), Z + 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 7), Z - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 7), Z - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 7), Z + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 7), Z + 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 7), Z - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 7), Z - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 7), Z, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 7), Z, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 7), Z, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 7), Z, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X, Y + (var6 - 7), Z - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X, Y + (var6 - 7), Z - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X, Y + (var6 - 7), Z + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X, Y + (var6 - 7), Z + 1, Blocks.leaves1.get().blockID, 1);
 							
-							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 8), Z, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X - 1, Y + (var6 - 8), Z, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 8), Z, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X + 1, Y + (var6 - 8), Z, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X, Y + (var6 - 8), Z - 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X, Y + (var6 - 8), Z - 1, Blocks.leaves1.get().blockID, 1);
-							this.setBlockAndMetadata(par1World, X, Y + (var6 - 8), Z + 1, BOPBlocks.bambooLeaves.blockID, 0);
+							this.setBlockAndMetadata(par1World, X, Y + (var6 - 8), Z + 1, Blocks.leaves1.get().blockID, 1);
 
                             if (this.vinesGrow && var11 > 0)
                             {
@@ -198,7 +199,7 @@ public class WorldGenBambooTree2 extends WorldGenerator
                             {
                                 for (var15 = Z - var13; var15 <= Z + var13; ++var15)
                                 {
-                                    if (par1World.getBlockId(var14, var11, var15) == BOPBlocks.bambooLeaves.blockID)
+                                    if (par1World.getBlockId(var14, var11, var15) == Blocks.bamboo.get().blockID)
                                     {
                                         if (par2Random.nextInt(4) == 0 && par1World.getBlockId(var14 - 1, var11, var15) == 0)
                                         {

src/minecraft/biomesoplenty/worldgen/WorldGenBayou1.java

@@ -2,10 +2,12 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
 
@@ -55,7 +57,7 @@ public class WorldGenBayou1 extends WorldGenerator
                         {
                             var12 = par1World.getBlockId(var10, var8, var11);
 
-                            if (var12 != 0 && var12 != BOPBlocks.willowLeaves.blockID)
+                            if (var12 != 0 && var12 != Blocks.leavesColorized.get().blockID)
                             {
                                 if (var12 != Block.waterStill.blockID && var12 != Block.waterMoving.blockID)
                                 {
@@ -110,22 +112,22 @@ public class WorldGenBayou1 extends WorldGenerator
                 if ((var8 == Block.grass.blockID || var8 == Block.dirt.blockID) && par4 < 128 - var6 - 1)
                 {
                     this.setBlock(par1World, par3, par4 - 1, par5, Block.dirt.blockID);
-                    this.setBlock(par1World, par3 - 1, par4, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 - 1, par4, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 + 1, par4, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 + 1, par4, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4, par5 - 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4, par5 - 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4, par5 + 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4, par5 + 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 - 1, par4 + 1, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 - 1, par4 + 1, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 + 1, par4 + 1, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 + 1, par4 + 1, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 1, par5 - 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 1, par5 - 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 1, par5 + 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 1, par5 + 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 - 1, par4 + 2, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 - 1, par4 + 2, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 + 1, par4 + 2, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 + 1, par4 + 2, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 2, par5 - 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 2, par5 - 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 2, par5 + 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 2, par5 + 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 - 1, par4 + 3, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 - 1, par4 + 3, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 + 1, par4 + 3, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 + 1, par4 + 3, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 3, par5 - 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 3, par5 - 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 3, par5 + 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 3, par5 + 1, Blocks.logs3.get().blockID, 1);
                     int var13;
                     int var16;
 
@@ -144,7 +146,7 @@ public class WorldGenBayou1 extends WorldGenerator
 
                                 if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var12, var16, var14)])
                                 {
-                                    this.setBlockAndMetadata(par1World, var12, var16, var14, BOPBlocks.willowLeaves.blockID, 0);
+                                    this.setBlockAndMetadata(par1World, var12, var16, var14, Blocks.leavesColorized.get().blockID, 4);
                                 }
                             }
                         }
@@ -154,9 +156,9 @@ public class WorldGenBayou1 extends WorldGenerator
                     {
                         var10 = par1World.getBlockId(par3, par4 + var16, par5);
 
-                        if (var10 == 0 || var10 == BOPBlocks.willowLeaves.blockID || var10 == Block.waterMoving.blockID || var10 == Block.waterStill.blockID)
+                        if (var10 == 0 || var10 == Blocks.leavesColorized.get().blockID || var10 == Block.waterMoving.blockID || var10 == Block.waterStill.blockID)
                         {
-                            this.setBlock(par1World, par3, par4 + var16, par5, BOPBlocks.willowWood.blockID);
+                            this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Blocks.logs3.get().blockID, 1);
                         }
                     }
 
@@ -169,7 +171,7 @@ public class WorldGenBayou1 extends WorldGenerator
                         {
                             for (var13 = par5 - var11; var13 <= par5 + var11; ++var13)
                             {
-                                if (par1World.getBlockId(var12, var16, var13) == BOPBlocks.willowLeaves.blockID)
+                                if (par1World.getBlockId(var12, var16, var13) == Blocks.leavesColorized.get().blockID)
                                 {
                                     if (par2Random.nextInt(4) == 0 && par1World.getBlockId(var12 - 1, var16, var13) == 0)
                                     {
@@ -214,7 +216,7 @@ public class WorldGenBayou1 extends WorldGenerator
      */
     private void generateVines(World par1World, int par2, int par3, int par4, int par5)
     {
-        this.setBlockAndMetadata(par1World, par2, par3, par4, BOPBlocks.willow.blockID, par5);
+        this.setBlockAndMetadata(par1World, par2, par3, par4, Blocks.willow.get().blockID, par5);
         int var6 = 4;
 
         while (true)
@@ -226,7 +228,7 @@ public class WorldGenBayou1 extends WorldGenerator
                 return;
             }
 
-            this.setBlockAndMetadata(par1World, par2, par3, par4, BOPBlocks.willow.blockID, par5);
+            this.setBlockAndMetadata(par1World, par2, par3, par4, Blocks.willow.get().blockID, par5);
             --var6;
         }
     }

src/minecraft/biomesoplenty/worldgen/WorldGenBayou2.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -55,7 +56,7 @@ public class WorldGenBayou2 extends WorldGenerator
                         {
                             var12 = par1World.getBlockId(var10, var8, var11);
 
-                            if (var12 != 0 && var12 != BOPBlocks.willowLeaves.blockID)
+                            if (var12 != 0 && var12 != Blocks.leavesColorized.get().blockID)
                             {
                                 if (var12 != Block.waterStill.blockID && var12 != Block.waterMoving.blockID)
                                 {
@@ -110,14 +111,14 @@ public class WorldGenBayou2 extends WorldGenerator
                 if ((var8 == Block.grass.blockID || var8 == Block.dirt.blockID) && par4 < 128 - var6 - 1)
                 {
                     this.setBlock(par1World, par3, par4 - 1, par5, Block.dirt.blockID);
-                    this.setBlock(par1World, par3 - 1, par4, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 - 1, par4, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 + 1, par4, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 + 1, par4, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4, par5 - 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4, par5 - 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4, par5 + 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4, par5 + 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 - 1, par4 + 1, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 - 1, par4 + 1, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 + 1, par4 + 1, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 + 1, par4 + 1, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 1, par5 - 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 1, par5 - 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 1, par5 + 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 1, par5 + 1, Blocks.logs3.get().blockID, 1);
                     int var13;
                     int var16;
 
@@ -136,7 +137,7 @@ public class WorldGenBayou2 extends WorldGenerator
 
                                 if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var12, var16, var14)])
                                 {
-                                    this.setBlockAndMetadata(par1World, var12, var16, var14, BOPBlocks.willowLeaves.blockID, 0);
+                                    this.setBlockAndMetadata(par1World, var12, var16, var14, Blocks.leavesColorized.get().blockID, 4);
                                 }
                             }
                         }
@@ -146,9 +147,9 @@ public class WorldGenBayou2 extends WorldGenerator
                     {
                         var10 = par1World.getBlockId(par3, par4 + var16, par5);
 
-                        if (var10 == 0 || var10 == BOPBlocks.willowLeaves.blockID || var10 == Block.waterMoving.blockID || var10 == Block.waterStill.blockID)
+                        if (var10 == 0 || var10 == Blocks.leavesColorized.get().blockID || var10 == Block.waterMoving.blockID || var10 == Block.waterStill.blockID)
                         {
-                            this.setBlock(par1World, par3, par4 + var16, par5, BOPBlocks.willowWood.blockID);
+                            this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Blocks.logs3.get().blockID, 1);
                         }
                     }
 
@@ -161,7 +162,7 @@ public class WorldGenBayou2 extends WorldGenerator
                         {
                             for (var13 = par5 - var11; var13 <= par5 + var11; ++var13)
                             {
-                                if (par1World.getBlockId(var12, var16, var13) == BOPBlocks.willowLeaves.blockID)
+                                if (par1World.getBlockId(var12, var16, var13) == Blocks.leavesColorized.get().blockID)
                                 {
                                     if (par2Random.nextInt(4) == 0 && par1World.getBlockId(var12 - 1, var16, var13) == 0)
                                     {
@@ -206,7 +207,7 @@ public class WorldGenBayou2 extends WorldGenerator
      */
     private void generateVines(World par1World, int par2, int par3, int par4, int par5)
     {
-        this.setBlockAndMetadata(par1World, par2, par3, par4, BOPBlocks.willow.blockID, par5);
+        this.setBlockAndMetadata(par1World, par2, par3, par4, Blocks.willow.get().blockID, par5);
         int var6 = 4;
 
         while (true)
@@ -218,7 +219,7 @@ public class WorldGenBayou2 extends WorldGenerator
                 return;
             }
 
-            this.setBlockAndMetadata(par1World, par2, par3, par4, BOPBlocks.willow.blockID, par5);
+            this.setBlockAndMetadata(par1World, par2, par3, par4, Blocks.willow.get().blockID, par5);
             --var6;
         }
     }

src/minecraft/biomesoplenty/worldgen/WorldGenBayou3.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -51,7 +52,7 @@ public class WorldGenBayou3 extends WorldGenerator
                         {
                             var12 = par1World.getBlockId(var10, var8, var11);
 
-                            if (var12 != 0 && var12 != BOPBlocks.willowLeaves.blockID)
+                            if (var12 != 0 && var12 != Blocks.leavesColorized.get().blockID)
                             {
                                 if (var12 != Block.waterStill.blockID && var12 != Block.waterMoving.blockID)
                                 {
@@ -78,26 +79,26 @@ public class WorldGenBayou3 extends WorldGenerator
                 if ((var8 == Block.grass.blockID || var8 == Block.dirt.blockID) && par4 < 128 - var6 - 1)
                 {
                     this.setBlock(par1World, par3, par4 - 1, par5, Block.dirt.blockID);
-                    this.setBlock(par1World, par3 - 1, par4, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 - 1, par4, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 + 1, par4, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 + 1, par4, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4, par5 - 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4, par5 - 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4, par5 + 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4, par5 + 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 - 1, par4 + 1, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 - 1, par4 + 1, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 + 1, par4 + 1, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 + 1, par4 + 1, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 1, par5 - 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 1, par5 - 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 1, par5 + 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 1, par5 + 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 - 1, par4 + 2, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 - 1, par4 + 2, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 + 1, par4 + 2, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 + 1, par4 + 2, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 2, par5 - 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 2, par5 - 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 2, par5 + 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 2, par5 + 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 - 1, par4 + 3, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 - 1, par4 + 3, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 + 1, par4 + 3, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 + 1, par4 + 3, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 3, par5 - 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 3, par5 - 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 3, par5 + 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 3, par5 + 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 - 1, par4 + 4, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 - 1, par4 + 4, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3 + 1, par4 + 4, par5, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3 + 1, par4 + 4, par5, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 4, par5 - 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 4, par5 - 1, Blocks.logs3.get().blockID, 1);
-                    this.setBlock(par1World, par3, par4 + 4, par5 + 1, BOPBlocks.willowWood.blockID);
+                    this.setBlockAndMetadata(par1World, par3, par4 + 4, par5 + 1, Blocks.logs3.get().blockID, 1);
                     int var13;
                     int var16;
 
@@ -105,9 +106,9 @@ public class WorldGenBayou3 extends WorldGenerator
                     {
                         var10 = par1World.getBlockId(par3, par4 + var16, par5);
 
-                        if (var10 == 0 || var10 == BOPBlocks.willowLeaves.blockID || var10 == Block.waterMoving.blockID || var10 == Block.waterStill.blockID)
+                        if (var10 == 0 || var10 == Blocks.leavesColorized.get().blockID || var10 == Block.waterMoving.blockID || var10 == Block.waterStill.blockID)
                         {
-                            this.setBlock(par1World, par3, par4 + var16, par5, BOPBlocks.willowWood.blockID);
+                            this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Blocks.logs3.get().blockID, 1);
                         }
                     }
 

src/minecraft/biomesoplenty/worldgen/WorldGenBush.java

@@ -10,10 +10,12 @@ public class WorldGenBush extends WorldGenerator
 {
     /** The ID of the plant block used in this plant generator. */
     private int plantBlockId;
+    private int plantBlockMeta;
 
-    public WorldGenBush(int par1)
+    public WorldGenBush(int par1, int meta)
     {
         this.plantBlockId = par1;
+        this.plantBlockMeta = meta;
     }
 
     public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5)
@@ -26,7 +28,7 @@ public class WorldGenBush extends WorldGenerator
 
             if (par1World.isAirBlock(var7, var8, var9) && (!par1World.provider.hasNoSky || var8 < 127) && Block.blocksList[this.plantBlockId].canBlockStay(par1World, var7, var8, var9))
             {
-                par1World.setBlock(var7, var8, var9, this.plantBlockId, 1, 2);
+                par1World.setBlock(var7, var8, var9, this.plantBlockId, this.plantBlockMeta, 2);
             }
         }
 

src/minecraft/biomesoplenty/worldgen/WorldGenCanyon.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.util.MathHelper;
@@ -63,7 +64,7 @@ public class WorldGenCanyon extends WorldGenerator
                             {
                                 double var45 = ((double)var44 + 0.5D - var24) / (var28 / 2.0D);
 
-                                if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == BOPBlocks.hardDirt.blockID)
+                                if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Blocks.hardDirt.get().blockID)
                                 {
                                     par1World.setBlock(var38, var41, var44, this.minableBlockId);
                                 }

src/minecraft/biomesoplenty/worldgen/WorldGenCanyonShrub.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -23,19 +24,19 @@ public class WorldGenCanyonShrub extends WorldGenerator
     {
         int var15;
 
-        for (boolean var6 = false; ((var15 = par1World.getBlockId(par3, par4, par5)) == 0 || var15 == BOPBlocks.acaciaLeaves.blockID) && par4 > 0; --par4)
+        for (boolean var6 = false; ((var15 = par1World.getBlockId(par3, par4, par5)) == 0 || var15 == Blocks.leavesColorized.get().blockID) && par4 > 0; --par4)
         {
             ;
         }
 
         int var7 = par1World.getBlockId(par3, par4, par5);
 
-        if (var7 == BOPBlocks.hardDirt.blockID)
+        if (var7 == Blocks.hardDirt.get().blockID)
         {
             ++par4;
 			if (par4 > 95)
 			{
-				this.setBlockAndMetadata(par1World, par3, par4, par5, BOPBlocks.acaciaWood.blockID, this.field_76526_b);
+				this.setBlockAndMetadata(par1World, par3, par4, par5, Blocks.logs1.get().blockID,0);
 
 				for (int var8 = par4; var8 <= par4 + 1; ++var8)
 				{
@@ -52,7 +53,7 @@ public class WorldGenCanyonShrub extends WorldGenerator
 
 							if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var11, var8, var13)])
 							{
-								this.setBlockAndMetadata(par1World, var11, var8, var13, BOPBlocks.acaciaLeaves.blockID, this.field_76527_a);
+								this.setBlockAndMetadata(par1World, var11, var8, var13, Blocks.leavesColorized.get().blockID, 0);
 							}
 						}
 					}

src/minecraft/biomesoplenty/worldgen/WorldGenCanyonTree.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -49,7 +50,7 @@ public class WorldGenCanyonTree extends WorldGenerator
 
                             Block block = Block.blocksList[var15];
 
-                            if (var15 != 0 && (block == null || var15 != BOPBlocks.acaciaLeaves.blockID))
+                            if (var15 != 0 && (block == null || var15 != Blocks.leavesColorized.get().blockID))
                             {
                                 var10 = false;
                             }
@@ -70,9 +71,9 @@ public class WorldGenCanyonTree extends WorldGenerator
             {
                 var11 = par1World.getBlockId(par3, par4 - 1, par5);
 
-                if ((var11 == BOPBlocks.hardDirt.blockID) && par4 < 128 - var6 - 1)
+                if ((var11 == Blocks.hardDirt.get().blockID) && par4 < 128 - var6 - 1)
                 {
-                    this.setBlock(par1World, par3, par4 - 1, par5, BOPBlocks.hardDirt.blockID);
+                    this.setBlock(par1World, par3, par4 - 1, par5, Blocks.hardDirt.get().blockID);
                     var18 = 0;
 
                     for (var13 = par4 + var6; var13 >= par4 + var7; --var13)
@@ -90,7 +91,7 @@ public class WorldGenCanyonTree extends WorldGenerator
                                 if ((Math.abs(var15) != var18 || Math.abs(var17) != var18 || var18 <= 0) && 
                                     (block == null || block.canBeReplacedByLeaves(par1World, var14, var13, var16)))
                                 {
-                                    this.setBlockAndMetadata(par1World, var14, var13, var16, BOPBlocks.acaciaLeaves.blockID, 0);
+                                    this.setBlockAndMetadata(par1World, var14, var13, var16, Blocks.leavesColorized.get().blockID, 0);
                                 }
                             }
                         }
@@ -111,9 +112,9 @@ public class WorldGenCanyonTree extends WorldGenerator
 
                         Block block = Block.blocksList[var14];
 
-                        if (var14 == 0 || block == null || var14 == BOPBlocks.acaciaLeaves.blockID)
+                        if (var14 == 0 || block == null || var14 == Blocks.leavesColorized.get().blockID)
                         {
-                            this.setBlockAndMetadata(par1World, par3, par4 + var13, par5, BOPBlocks.acaciaWood.blockID, 0);
+                            this.setBlockAndMetadata(par1World, par3, par4 + var13, par5, Blocks.logs1.get().blockID,0);
                         }
                     }
 

src/minecraft/biomesoplenty/worldgen/WorldGenCattail.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -25,9 +26,9 @@ public class WorldGenCattail extends WorldGenerator
             int var9 = par4 + par2Random.nextInt(4) - par2Random.nextInt(4);
             int var10 = par5 + par2Random.nextInt(8) - par2Random.nextInt(8);
 
-            if (par1World.isAirBlock(var8, var9, var10) && BOPBlocks.cattail.canBlockStay(par1World, var8, var9, var10))
+            if (par1World.isAirBlock(var8, var9, var10) && Blocks.plants.get().canBlockStay(par1World, var8, var9, var10))
             {
-                par1World.setBlock(var8, var9, var10, BOPBlocks.cattail.blockID);
+                par1World.setBlock(var8, var9, var10, Blocks.plants.get().blockID, 7, 2);
             }
         }
 

src/minecraft/biomesoplenty/worldgen/WorldGenCherry1.java

@@ -2,8 +2,10 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
@@ -167,7 +169,7 @@ public class WorldGenCherry1 extends WorldGenerator
                     var11[var9] = var10[var9] + var13;
                     int var14 = this.worldObj.getBlockId(var11[0], var11[1], var11[2]);
 
-                    if (var14 != 0 && var14 != BOPBlocks.pinkLeaves.blockID)
+                    if (var14 != 0 && var14 != Blocks.leaves2.get().blockID)
                     {
                         ++var13;
                     }
@@ -229,7 +231,7 @@ public class WorldGenCherry1 extends WorldGenerator
         for (int var5 = par2 + this.leafDistanceLimit; var4 < var5; ++var4)
         {
             float var6 = this.leafSize(var4 - par2);
-            this.genTreeLayer(par1, var4, par3, var6, (byte)1, BOPBlocks.pinkLeaves.blockID);
+            this.genTreeLayer(par1, var4, par3, var6, (byte)1, Blocks.leaves2.get().blockID);
         }
     }
 
@@ -335,19 +337,19 @@ public class WorldGenCherry1 extends WorldGenerator
         int var4 = this.basePos[2];
         int[] var5 = new int[] {var1, var2, var4};
         int[] var6 = new int[] {var1, var3, var4};
-        this.placeBlockLine(var5, var6, BOPBlocks.cherryWood.blockID);
+        this.placeBlockLine(var5, var6, Blocks.logs1.get().blockID);
 
         if (this.trunkSize == 2)
         {
             ++var5[0];
             ++var6[0];
-            this.placeBlockLine(var5, var6, BOPBlocks.cherryWood.blockID);
+            this.placeBlockLine(var5, var6, Blocks.logs1.get().blockID);
             ++var5[2];
             ++var6[2];
-            this.placeBlockLine(var5, var6, BOPBlocks.cherryWood.blockID);
+            this.placeBlockLine(var5, var6, Blocks.logs1.get().blockID);
             var5[0] += -1;
             var6[0] += -1;
-            this.placeBlockLine(var5, var6, BOPBlocks.cherryWood.blockID);
+            this.placeBlockLine(var5, var6, Blocks.logs1.get().blockID);
         }
     }
 
@@ -368,7 +370,7 @@ public class WorldGenCherry1 extends WorldGenerator
 
             if (this.leafNodeNeedsBase(var6))
             {
-                this.placeBlockLine(var3, var5, BOPBlocks.cherryWood.blockID);
+                this.placeBlockLine(var3, var5, Blocks.logs1.get().blockID);
             }
         }
     }
@@ -425,7 +427,7 @@ public class WorldGenCherry1 extends WorldGenerator
                 var13[var7] = MathHelper.floor_double((double)par1ArrayOfInteger[var7] + (double)var14 * var11);
                 int var16 = this.worldObj.getBlockId(var13[0], var13[1], var13[2]);
 
-                if (var16 != 0 && var16 != BOPBlocks.pinkLeaves.blockID)
+                if (var16 != 0 && var16 != Blocks.leaves2.get().blockID)
                 {
                     break;
                 }

src/minecraft/biomesoplenty/worldgen/WorldGenCherry2.java

@@ -2,8 +2,10 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
@@ -167,7 +169,7 @@ public class WorldGenCherry2 extends WorldGenerator
                     var11[var9] = var10[var9] + var13;
                     int var14 = this.worldObj.getBlockId(var11[0], var11[1], var11[2]);
 
-                    if (var14 != 0 && var14 != BOPBlocks.whiteLeaves.blockID)
+                    if (var14 != 0 && var14 != Blocks.leaves2.get().blockID)
                     {
                         ++var13;
                     }
@@ -229,7 +231,7 @@ public class WorldGenCherry2 extends WorldGenerator
         for (int var5 = par2 + this.leafDistanceLimit; var4 < var5; ++var4)
         {
             float var6 = this.leafSize(var4 - par2);
-            this.genTreeLayer(par1, var4, par3, var6, (byte)1, BOPBlocks.whiteLeaves.blockID);
+            this.genTreeLayer(par1, var4, par3, var6, (byte)1, Blocks.leaves2.get().blockID);
         }
     }
 
@@ -335,19 +337,19 @@ public class WorldGenCherry2 extends WorldGenerator
         int var4 = this.basePos[2];
         int[] var5 = new int[] {var1, var2, var4};
         int[] var6 = new int[] {var1, var3, var4};
-        this.placeBlockLine(var5, var6, BOPBlocks.cherryWood.blockID);
+        this.placeBlockLine(var5, var6, Blocks.logs1.get().blockID);
 
         if (this.trunkSize == 2)
         {
             ++var5[0];
             ++var6[0];
-            this.placeBlockLine(var5, var6, BOPBlocks.cherryWood.blockID);
+            this.placeBlockLine(var5, var6, Blocks.logs1.get().blockID);
             ++var5[2];
             ++var6[2];
-            this.placeBlockLine(var5, var6, BOPBlocks.cherryWood.blockID);
+            this.placeBlockLine(var5, var6, Blocks.logs1.get().blockID);
             var5[0] += -1;
             var6[0] += -1;
-            this.placeBlockLine(var5, var6, BOPBlocks.cherryWood.blockID);
+            this.placeBlockLine(var5, var6, Blocks.logs1.get().blockID);
         }
     }
 
@@ -368,7 +370,7 @@ public class WorldGenCherry2 extends WorldGenerator
 
             if (this.leafNodeNeedsBase(var6))
             {
-                this.placeBlockLine(var3, var5, BOPBlocks.cherryWood.blockID);
+                this.placeBlockLine(var3, var5, Blocks.logs1.get().blockID);
             }
         }
     }
@@ -425,7 +427,7 @@ public class WorldGenCherry2 extends WorldGenerator
                 var13[var7] = MathHelper.floor_double((double)par1ArrayOfInteger[var7] + (double)var14 * var11);
                 int var16 = this.worldObj.getBlockId(var13[0], var13[1], var13[2]);
 
-                if (var16 != 0 && var16 != BOPBlocks.whiteLeaves.blockID)
+                if (var16 != 0 && var16 != Blocks.leaves2.get().blockID)
                 {
                     break;
                 }

src/minecraft/biomesoplenty/worldgen/WorldGenColumn.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.world.World;
@@ -55,7 +56,7 @@ public class WorldGenColumn extends WorldGenerator
 
                         if (var11 * var11 + var12 * var12 <= var7 * var7 + 1)
                         {
-                            par1World.setBlock(var9, var8, var10, BOPBlocks.ashStone.blockID);
+                            par1World.setBlock(var9, var8, var10, Blocks.ashStone.get().blockID);
                         }
                     }
                 }

src/minecraft/biomesoplenty/worldgen/WorldGenCypress.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -51,7 +52,7 @@ public class WorldGenCypress extends WorldGenerator
                         {
                             var15 = var1.getBlockId(var13, var11, var14);
 
-                            if (var15 != 0 && var15 != BOPBlocks.willowLeaves.blockID)
+                            if (var15 != 0 && var15 != Blocks.leavesColorized.get().blockID)
                             {
                                 var10 = false;
                             }
@@ -97,7 +98,7 @@ public class WorldGenCypress extends WorldGenerator
                                 {
 									if (var2.nextInt(3) != 0)
 										{
-										this.setBlockAndMetadata(var1, var17, var16, var19, BOPBlocks.willowLeaves.blockID, 0);
+										this.setBlockAndMetadata(var1, var17, var16, var19, Blocks.leavesColorized.get().blockID, 4);
 										}
                                 }
                             }
@@ -126,19 +127,19 @@ public class WorldGenCypress extends WorldGenerator
                     {
                         var17 = var1.getBlockId(var3, var4 + var16, var5);
 
-                        if (var17 == 0 || var17 == BOPBlocks.willowLeaves.blockID)
+                        if (var17 == 0 || var17 == Blocks.leavesColorized.get().blockID)
                         {
-                            this.setBlockAndMetadata(var1, var3, var4 + var16, var5, BOPBlocks.willowWood.blockID, 0);
+                            this.setBlockAndMetadata(var1, var3, var4 + var16, var5, Blocks.logs3.get().blockID, 1);
-							this.setBlockAndMetadata(var1, var3, (var4 + var6), var5, BOPBlocks.willowWood.blockID, 0);
+							this.setBlockAndMetadata(var1, var3, (var4 + var6), var5, Blocks.logs3.get().blockID, 1);
-							this.setBlockAndMetadata(var1, var3, (var4 + var6) - 2, var5, BOPBlocks.willowWood.blockID, 0);
+							this.setBlockAndMetadata(var1, var3, (var4 + var6) - 2, var5, Blocks.logs3.get().blockID, 1);
-							this.setBlockAndMetadata(var1, var3, (var4 + var6) - 1, var5, BOPBlocks.willowWood.blockID, 0);
+							this.setBlockAndMetadata(var1, var3, (var4 + var6) - 1, var5, Blocks.logs3.get().blockID, 1);
-							this.setBlockAndMetadata(var1, var3, (var4 + var6), var5, BOPBlocks.willowWood.blockID, 0);
+							this.setBlockAndMetadata(var1, var3, (var4 + var6), var5, Blocks.logs3.get().blockID, 1);
-							this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5, BOPBlocks.willowWood.blockID, 0);
+							this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5, Blocks.logs3.get().blockID, 1);
-							this.setBlockAndMetadata(var1, var3 - 1, (var4 + var6) + 1, var5, BOPBlocks.willowLeaves.blockID, 0);
+							this.setBlockAndMetadata(var1, var3 - 1, (var4 + var6) + 1, var5, Blocks.leavesColorized.get().blockID, 4);
-							this.setBlockAndMetadata(var1, var3 + 1, (var4 + var6) + 1, var5, BOPBlocks.willowLeaves.blockID, 0);
+							this.setBlockAndMetadata(var1, var3 + 1, (var4 + var6) + 1, var5, Blocks.leavesColorized.get().blockID, 4);
-							this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5 - 1, BOPBlocks.willowLeaves.blockID, 0);
+							this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5 - 1, Blocks.leavesColorized.get().blockID, 4);
-							this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5 + 1, BOPBlocks.willowLeaves.blockID, 0);
+							this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5 + 1, Blocks.leavesColorized.get().blockID, 4);
-							this.setBlockAndMetadata(var1, var3, (var4 + var6) + 2, var5, BOPBlocks.willowLeaves.blockID, 0);
+							this.setBlockAndMetadata(var1, var3, (var4 + var6) + 2, var5, Blocks.leavesColorized.get().blockID, 4);
                         }
                     }
 

src/minecraft/biomesoplenty/worldgen/WorldGenCypress2.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -36,114 +37,114 @@ public class WorldGenCypress2 extends WorldGenerator
                 }
             }
 
-			var1.setBlock(var3 + 0, var4 + 9, var5 + 5, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 0, var4 + 9, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 0, var4 + 9, var5 + 6, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 0, var4 + 9, var5 + 6, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 0, var4 + 11, var5 + 5, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 0, var4 + 11, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 0, var4 + 11, var5 + 6, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 0, var4 + 11, var5 + 6, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 1, var4 + 9, var5 + 5, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 9, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 1, var4 + 11, var5 + 3, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 1, var4 + 11, var5 + 3, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 1, var4 + 11, var5 + 4, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 1, var4 + 11, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 1, var4 + 11, var5 + 5, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 11, var5 + 5, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 1, var4 + 12, var5 + 4, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 1, var4 + 12, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 1, var4 + 14, var5 + 3, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 14, var5 + 3, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 1, var4 + 14, var5 + 4, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 14, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 1, var4 + 14, var5 + 5, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 14, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 1, var4 + 15, var5 + 4, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 15, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 1, var4 + 15, var5 + 5, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 15, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 0, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 0, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 2, var4 + 1, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 1, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 2, var4 + 8, var5 + 8, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 8, var5 + 8, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 9, var5 + 2, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 9, var5 + 2, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 9, var5 + 4, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 9, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 9, var5 + 5, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 9, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 9, var5 + 6, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 9, var5 + 6, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 9, var5 + 7, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 9, var5 + 7, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 10, var5 + 4, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 10, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 11, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 11, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 2, var4 + 11, var5 + 5, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 11, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 12, var5 + 4, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 12, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 12, var5 + 5, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 12, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 12, var5 + 6, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 12, var5 + 6, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 13, var5 + 4, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 13, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 14, var5 + 3, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 14, var5 + 3, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 14, var5 + 4, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 14, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 14, var5 + 5, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 14, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 14, var5 + 6, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 14, var5 + 6, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 15, var5 + 4, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 15, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 2, var4 + 16, var5 + 5, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 16, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 0, var5 + 3, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 0, var5 + 3, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 0, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 0, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 0, var5 + 5, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 0, var5 + 5, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 1, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 1, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 2, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 2, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 3, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 3, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 4, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 4, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 6, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 6, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 5, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 5, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 8, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 8, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 8, var5 + 6, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 8, var5 + 6, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 8, var5 + 8, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 8, var5 + 8, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 9, var5 + 3, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 9, var5 + 3, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 9, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 9, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 9, var5 + 5, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 9, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 9, var5 + 7, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 9, var5 + 7, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 10, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 10, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 10, var5 + 6, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 10, var5 + 6, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 11, var5 + 3, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 11, var5 + 3, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 11, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 11, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 11, var5 + 6, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 11, var5 + 6, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 12, var5 + 3, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 12, var5 + 3, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 12, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 12, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 13, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 13, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 14, var5 + 2, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 14, var5 + 2, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 14, var5 + 3, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 14, var5 + 3, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 14, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 14, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 3, var4 + 14, var5 + 5, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 14, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 14, var5 + 6, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 14, var5 + 6, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 15, var5 + 4, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 15, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 15, var5 + 5, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 15, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 15, var5 + 6, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 15, var5 + 6, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 16, var5 + 3, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 16, var5 + 3, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 16, var5 + 4, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 16, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 3, var4 + 16, var5 + 5, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 16, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 0, var5 + 4, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 0, var5 + 4, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 6, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 6, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 7, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 7, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 9, var5 + 3, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 9, var5 + 3, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 4, var4 + 9, var5 + 4, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 9, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 9, var5 + 6, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 9, var5 + 6, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 0, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 0, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 1, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 1, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 2, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 2, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 3, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 3, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 4, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 11, var5 + 2, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 11, var5 + 2, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 11, var5 + 5, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 11, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 12, var5 + 4, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 12, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 13, var5 + 3, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 13, var5 + 3, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 13, var5 + 6, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 13, var5 + 6, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 14, var5 + 2, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 14, var5 + 2, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 14, var5 + 3, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 14, var5 + 3, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 14, var5 + 6, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 14, var5 + 6, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 4, var4 + 15, var5 + 5, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 15, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 5, var4 + 8, var5 + 6, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 8, var5 + 6, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 1, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 1, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 2, BOPBlocks.willowWood.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 2, Blocks.logs3.get().blockID, 1, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 4, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 5, var4 + 11, var5 + 1, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 11, var5 + 1, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 5, var4 + 11, var5 + 3, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 11, var5 + 3, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 5, var4 + 11, var5 + 4, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 11, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 5, var4 + 12, var5 + 4, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 12, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 5, var4 + 14, var5 + 4, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 14, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 5, var4 + 14, var5 + 5, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 14, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 5, var4 + 15, var5 + 5, BOPBlocks.willowLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 15, var5 + 5, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 6, var4 + 10, var5 + 4, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 10, var5 + 4, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 6, var4 + 11, var5 + 1, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 11, var5 + 1, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 6, var4 + 11, var5 + 3, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 11, var5 + 3, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 7, var4 + 10, var5 + 1, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 10, var5 + 1, Blocks.leavesColorized.get().blockID, 4, 2);
-			var1.setBlock(var3 + 7, var4 + 11, var5 + 3, BOPBlocks.willowLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 11, var5 + 3, Blocks.leavesColorized.get().blockID, 4, 2);
             return true;
         }
     }

src/minecraft/biomesoplenty/worldgen/WorldGenDarkTree2.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -36,246 +37,246 @@ public class WorldGenDarkTree2 extends WorldGenerator
                 }
             }
 
-			var1.setBlock(var3 + 0, var4 + 4, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 0, var4 + 4, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 0, var4 + 5, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 0, var4 + 5, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 2, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 2, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 3, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 3, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 3, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 3, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 4, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 4, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 4, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 4, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 5, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 5, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 5, var5 + 2, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 5, var5 + 2, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 1, var4 + 5, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 5, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 5, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 5, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 6, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 6, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 6, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 6, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 7, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 7, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 7, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 7, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 8, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 8, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 8, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 8, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 9, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 9, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 9, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 9, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 10, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 10, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 10, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 10, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 11, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 11, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 1, var4 + 12, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 12, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 5, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 5, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 5, var5 + 3, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 5, var5 + 3, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 5, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 5, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 7, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 7, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 8, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 8, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 8, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 8, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 8, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 8, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 9, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 9, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 10, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 10, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 10, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 10, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 11, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 11, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 11, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 11, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 12, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 12, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 12, var5 + 5, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 12, var5 + 5, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 2, var4 + 12, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 12, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 13, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 13, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 14, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 14, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 14, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 14, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 15, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 15, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 15, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 15, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 16, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 16, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 16, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 16, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 17, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 17, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 17, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 17, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 2, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 2, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 3, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 3, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 3, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 3, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 3, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 3, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 4, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 4, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 4, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 4, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 4, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 4, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 4, var5 + 7, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 4, var5 + 7, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 2, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 2, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 6, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 6, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 6, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 6, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 6, var5 + 8, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 6, var5 + 8, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 8, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 8, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 8, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 8, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 8, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 8, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 9, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 9, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 11, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 11, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 11, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 11, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 12, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 12, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 12, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 12, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 12, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 12, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 13, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 13, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 13, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 13, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 14, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 14, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 14, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 14, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 14, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 14, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 15, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 15, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 15, var5 + 5, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 15, var5 + 5, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 16, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 16, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 16, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 16, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 17, var5 + 3, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 17, var5 + 3, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 3, var4 + 17, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 17, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 18, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 18, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 19, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 19, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 20, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 20, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 0, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 0, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 1, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 1, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 2, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 2, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 2, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 2, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 3, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 3, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 3, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 3, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 3, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 3, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 4, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 4, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 4, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 4, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 4, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 4, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 4, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 4, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 4, var5 + 8, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 4, var5 + 8, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 5, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 5, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 5, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 5, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 5, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 5, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 5, var5 + 8, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 5, var5 + 8, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 6, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 6, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 6, var5 + 5, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 6, var5 + 5, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 6, var5 + 7, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 6, var5 + 7, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 6, var5 + 8, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 6, var5 + 8, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 9, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 9, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 9, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 9, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 11, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 11, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 11, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 11, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 11, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 11, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 12, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 12, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 12, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 12, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 12, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 12, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 13, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 13, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 13, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 13, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 13, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 13, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 13, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 13, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 14, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 14, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 14, var5 + 2, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 14, var5 + 2, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 14, var5 + 3, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 14, var5 + 3, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 14, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 14, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 15, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 15, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 15, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 15, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 15, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 15, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 15, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 15, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 15, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 15, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 16, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 16, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 16, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 16, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 16, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 16, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 17, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 17, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 17, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 17, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 17, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 17, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 18, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 18, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 19, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 19, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 19, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 19, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 4, var4 + 19, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 19, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 20, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 20, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 21, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 21, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 2, var5 + 7, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 2, var5 + 7, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 3, var5 + 7, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 3, var5 + 7, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 4, var5 + 7, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 4, var5 + 7, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 5, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 5, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 5, var5 + 7, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 5, var5 + 7, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 5, var5 + 8, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 5, var5 + 8, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 6, var5 + 6, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 6, var5 + 6, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 6, var5 + 7, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 6, var5 + 7, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 3, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 3, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 8, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 8, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 9, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 9, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 9, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 9, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 9, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 9, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 7, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 7, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 11, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 11, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 11, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 11, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 11, var5 + 5, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 11, var5 + 5, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 11, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 11, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 11, var5 + 7, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 11, var5 + 7, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 12, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 12, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 12, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 12, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 13, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 13, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 14, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 14, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 14, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 14, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 15, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 15, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 15, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 15, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 16, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 16, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 16, var5 + 4, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 16, var5 + 4, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 5, var4 + 16, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 16, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 19, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 19, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 2, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 2, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 3, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 3, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 3, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 3, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 3, var5 + 8, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 3, var5 + 8, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 4, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 4, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 4, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 4, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 4, var5 + 8, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 4, var5 + 8, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 5, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 5, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 5, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 5, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 5, var5 + 8, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 5, var5 + 8, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 7, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 7, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 8, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 8, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 2, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 2, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 9, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 9, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 9, var5 + 3, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 9, var5 + 3, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 9, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 9, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 10, var5 + 3, BOPBlocks.darkLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 10, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 11, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 11, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 11, var5 + 6, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 11, var5 + 6, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 6, var4 + 12, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 12, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 14, var5 + 4, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 14, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 14, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 14, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 15, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 15, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 16, var5 + 3, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 16, var5 + 3, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 16, var5 + 4, BOPBlocks.darkLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 16, var5 + 4, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 3, var5 + 7, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 3, var5 + 7, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 4, var5 + 7, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 4, var5 + 7, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 4, var5 + 8, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 4, var5 + 8, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 5, var5 + 0, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 5, var5 + 0, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 5, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 5, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 5, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 5, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 5, var5 + 8, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 5, var5 + 8, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 6, var5 + 0, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 6, var5 + 0, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 6, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 6, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 6, var5 + 8, BOPBlocks.darkLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 6, var5 + 8, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 7, var5 + 1, BOPBlocks.darkWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 7, var5 + 1, Blocks.logs1.get().blockID, 2, 2);
-			var1.setBlock(var3 + 7, var4 + 8, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 8, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 8, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 8, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 8, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 8, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 9, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 9, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 9, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 9, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 10, var5 + 5, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 10, var5 + 5, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 10, var5 + 6, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 10, var5 + 6, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 3, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 3, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 4, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 4, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 5, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 5, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 6, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 6, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 6, var5 + 2, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 6, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 7, var5 + 1, BOPBlocks.darkLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 7, var5 + 1, Blocks.leaves1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 7, var5 + 2, BOPBlocks.darkLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 7, var5 + 2, Blocks.leaves1.get().blockID, 3, 2);
             return true;
         }
     }

src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree.java

@@ -2,9 +2,11 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
@@ -336,19 +338,19 @@ public class WorldGenDeadTree extends WorldGenerator
         int var4 = this.basePos[2];
         int[] var5 = new int[] {var1, var2, var4};
         int[] var6 = new int[] {var1, var3, var4};
-        this.placeBlockLine(var5, var6, BOPBlocks.deadWood.blockID);
+        this.placeBlockLine(var5, var6, Blocks.logs3.get().blockID);
 
         if (this.trunkSize == 2)
         {
             ++var5[0];
             ++var6[0];
-            this.placeBlockLine(var5, var6, BOPBlocks.deadWood.blockID);
+            this.placeBlockLine(var5, var6, Blocks.logs3.get().blockID);
             ++var5[2];
             ++var6[2];
-            this.placeBlockLine(var5, var6, BOPBlocks.deadWood.blockID);
+            this.placeBlockLine(var5, var6, Blocks.logs3.get().blockID);
             var5[0] += -1;
             var6[0] += -1;
-            this.placeBlockLine(var5, var6, BOPBlocks.deadWood.blockID);
+            this.placeBlockLine(var5, var6, Blocks.logs3.get().blockID);
         }
     }
 
@@ -369,7 +371,7 @@ public class WorldGenDeadTree extends WorldGenerator
 
             if (this.leafNodeNeedsBase(var6))
             {
-                this.placeBlockLine(var3, var5, BOPBlocks.deadWood.blockID);
+                this.placeBlockLine(var3, var5, Blocks.logs3.get().blockID);
             }
         }
     }
@@ -446,7 +448,7 @@ public class WorldGenDeadTree extends WorldGenerator
         int[] var2 = new int[] {this.basePos[0], this.basePos[1] + this.heightLimit - 1, this.basePos[2]};
         int var3 = this.worldObj.getBlockId(this.basePos[0], this.basePos[1] - 1, this.basePos[2]);
 
-        if (var3 != 2 && var3 != 3 && var3 != BOPBlocks.driedDirt.blockID && var3 != BOPBlocks.mud.blockID)
+        if (var3 != 2 && var3 != 3 && var3 != Blocks.driedDirt.get().blockID && var3 != Blocks.mud.get().blockID)
         {
             return false;
         }

src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree2.java

@@ -2,9 +2,11 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
 
@@ -49,7 +51,7 @@ public class WorldGenDeadTree2 extends WorldGenerator
                         {
                             var12 = par1World.getBlockId(var10, var8, var11);
 
-                            if (var12 != 0 && var12 != BOPBlocks.deadLeaves.blockID)
+                            if (var12 != 0 && var12 != Blocks.leaves1.get().blockID)
                             {
                                 var7 = false;
                             }
@@ -90,7 +92,7 @@ public class WorldGenDeadTree2 extends WorldGenerator
 
                                 if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var12, var16, var14)])
                                 {
-                                    this.setBlockAndMetadata(par1World, var12, var16, var14, BOPBlocks.deadLeaves.blockID, 0);
+                                    this.setBlockAndMetadata(par1World, var12, var16, var14, Blocks.leaves1.get().blockID, 4);
                                 }
                             }
                         }
@@ -100,7 +102,7 @@ public class WorldGenDeadTree2 extends WorldGenerator
                     {
                         var10 = par1World.getBlockId(par3, par4 + var16, par5);
 
-                        if (var10 == 0 || var10 == BOPBlocks.deadLeaves.blockID)
+                        if (var10 == 0 || var10 == Blocks.leaves1.get().blockID)
                         {
                             this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Block.wood.blockID, 0);
                         }

src/minecraft/biomesoplenty/worldgen/WorldGenDeadTree3.java

@@ -2,9 +2,11 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
@@ -336,19 +338,19 @@ public class WorldGenDeadTree3 extends WorldGenerator
         int var4 = this.basePos[2];
         int[] var5 = new int[] {var1, var2, var4};
         int[] var6 = new int[] {var1, var3, var4};
-        this.placeBlockLine(var5, var6, BOPBlocks.deadWood.blockID);
+        this.placeBlockLine(var5, var6, Blocks.logs3.get().blockID);
 
         if (this.trunkSize == 2)
         {
             ++var5[0];
             ++var6[0];
-            this.placeBlockLine(var5, var6, BOPBlocks.deadWood.blockID);
+            this.placeBlockLine(var5, var6, Blocks.logs3.get().blockID);
             ++var5[2];
             ++var6[2];
-            this.placeBlockLine(var5, var6, BOPBlocks.deadWood.blockID);
+            this.placeBlockLine(var5, var6, Blocks.logs3.get().blockID);
             var5[0] += -1;
             var6[0] += -1;
-            this.placeBlockLine(var5, var6, BOPBlocks.deadWood.blockID);
+            this.placeBlockLine(var5, var6, Blocks.logs3.get().blockID);
         }
     }
 
@@ -369,7 +371,7 @@ public class WorldGenDeadTree3 extends WorldGenerator
 
             if (this.leafNodeNeedsBase(var6))
             {
-                this.placeBlockLine(var3, var5, BOPBlocks.deadWood.blockID);
+                this.placeBlockLine(var3, var5, Blocks.logs3.get().blockID);
             }
         }
     }
@@ -446,7 +448,7 @@ public class WorldGenDeadTree3 extends WorldGenerator
         int[] var2 = new int[] {this.basePos[0], this.basePos[1] + this.heightLimit - 1, this.basePos[2]};
         int var3 = this.worldObj.getBlockId(this.basePos[0], this.basePos[1] - 1, this.basePos[2]);
 
-        if (var3 != 2 && var3 != 3 && var3 != BOPBlocks.smolderingGrass.blockID && var3 != BOPBlocks.ash.blockID)
+        if (var3 != 2 && var3 != 3 && var3 != Blocks.smolderingGrass.get().blockID && var3 != Blocks.ash.get().blockID)
         {
             return false;
         }

src/minecraft/biomesoplenty/worldgen/WorldGenDeadlands.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -18,7 +19,7 @@ public class WorldGenDeadlands extends WorldGenerator
             int var8 = par4 + par2Random.nextInt(4) - par2Random.nextInt(4);
             int var9 = par5 + par2Random.nextInt(8) - par2Random.nextInt(8);
 
-            if (par1World.isAirBlock(var7, var8, var9) && par1World.getBlockId(var7, var8 - 1, var9) == BOPBlocks.ash.blockID)
+            if (par1World.isAirBlock(var7, var8, var9) && par1World.getBlockId(var7, var8 - 1, var9) == Blocks.ash.get().blockID)
             {
                 par1World.setBlock(var7, var8, var9, Block.fire.blockID);
             }

src/minecraft/biomesoplenty/worldgen/WorldGenDesertCactus.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -32,7 +33,7 @@ public class WorldGenDesertCactus extends WorldGenerator
 
                                 for (int var11 = 0; var11 < var10; ++var11)
                                 {
-                                    if (BOPBlocks.desertGrass.canBlockStay(par1World, var7, var8 + var11, var9))
+                                    if (Blocks.plants.get().canBlockStay(par1World, var7, var8 + var11, var9))
                                     {
                                         par1World.setBlock(var7, var8 - 1, var9, Block.sand.blockID);
                                         par1World.setBlock(var7, var8 + var11, var9, Block.cactus.blockID);

src/minecraft/biomesoplenty/worldgen/WorldGenFen2.java

@@ -2,9 +2,11 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
 
@@ -51,7 +53,7 @@ public class WorldGenFen2 extends WorldGenerator
                         {
                             var15 = par1World.getBlockId(var13, var11, var14);
 
-                            if (var15 != 0 && var15 != BOPBlocks.deadLeaves.blockID)
+                            if (var15 != 0 && var15 != Blocks.leaves1.get().blockID)
                             {
                                 var10 = false;
                             }
@@ -95,7 +97,7 @@ public class WorldGenFen2 extends WorldGenerator
 
                                 if ((Math.abs(var18) != var21 || Math.abs(var20) != var21 || var21 <= 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var17, var16, var19)])
                                 {
-                                    this.setBlock(par1World, var17, var16, var19, BOPBlocks.deadLeaves.blockID);
+                                    this.setBlockAndMetadata(par1World, var17, var16, var19, Blocks.leaves1.get().blockID, 4);
                                 }
                             }
                         }
@@ -123,7 +125,7 @@ public class WorldGenFen2 extends WorldGenerator
                     {
                         var17 = par1World.getBlockId(par3, par4 + var16, par5);
 
-                        if (var17 == 0 || var17 == BOPBlocks.deadLeaves.blockID)
+                        if (var17 == 0 || var17 == Blocks.leaves1.get().blockID)
                         {
                             this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Block.wood.blockID, 0);
                         }

src/minecraft/biomesoplenty/worldgen/WorldGenFir2.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -36,441 +37,441 @@ public class WorldGenFir2 extends WorldGenerator
                 }
             }
 
-			var1.setBlock(var3 + 0, var4 + 13, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 0, var4 + 13, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 1, var4 + 13, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 1, var4 + 13, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 7, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 7, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 10, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 10, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 10, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 10, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 13, var5 + 1, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 13, var5 + 1, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 13, var5 + 3, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 13, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 13, var5 + 4, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 13, var5 + 4, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 2, var4 + 13, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 13, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 13, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 13, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 13, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 13, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 14, var5 + 3, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 14, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 14, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 2, var4 + 14, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 22, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 22, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 22, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 22, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 4, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 8, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 8, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 10, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 10, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 10, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 10, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 10, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 10, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 13, var5 + 1, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 13, var5 + 1, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 13, var5 + 3, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 13, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 13, var5 + 4, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 13, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 13, var5 + 5, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 13, var5 + 5, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 13, var5 + 6, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 13, var5 + 6, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 3, var4 + 14, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 14, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 14, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 14, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 14, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 14, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 22, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 22, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 22, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 22, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 22, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 22, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 25, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 3, var4 + 25, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 4, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 13, var5 + 0, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 13, var5 + 0, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 13, var5 + 7, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 13, var5 + 7, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 4, var4 + 13, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 13, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 14, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 14, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 14, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 14, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 14, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 14, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 16, var5 + 12, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 16, var5 + 12, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 22, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 22, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 22, var5 + 9, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 22, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 25, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 25, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 3, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 6, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 6, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 8, var5 + 4, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 8, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 8, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 8, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 8, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 8, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 8, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 8, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 8, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 8, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 14, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 14, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 11, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 11, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 13, var5 + 4, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 13, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 13, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 13, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 13, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 13, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 14, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 14, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 14, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 14, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 14, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 14, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 14, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 14, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 16, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 16, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 17, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 17, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 17, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 17, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 19, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 19, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 19, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 19, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 20, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 20, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 20, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 20, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 20, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 20, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 22, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 22, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 22, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 22, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 22, var5 + 6, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 22, var5 + 6, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 5, var4 + 22, var5 + 10, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 22, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 23, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 23, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 23, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 23, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 25, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 5, var4 + 25, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 28, var5 + 8, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 28, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 30, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 30, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 0, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 0, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 7, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 7, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 10, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 10, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 10, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 10, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 10, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 10, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 10, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 10, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 10, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 10, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 10, var5 + 12, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 10, var5 + 12, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 10, var5 + 13, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 10, var5 + 13, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 11, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 11, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 11, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 11, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 11, var5 + 12, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 11, var5 + 12, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 13, var5 + 2, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 13, var5 + 2, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 13, var5 + 4, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 13, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 13, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 13, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 13, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 13, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 14, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 14, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 14, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 14, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 14, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 14, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 14, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 14, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 16, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 16, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 16, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 16, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 16, var5 + 12, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 16, var5 + 12, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 16, var5 + 13, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 16, var5 + 13, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 16, var5 + 16, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 16, var5 + 16, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 17, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 17, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 17, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 17, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 18, var5 + 8, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 18, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 19, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 19, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 20, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 20, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 20, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 20, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 20, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 20, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 20, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 20, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 22, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 22, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 22, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 22, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 22, var5 + 7, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 22, var5 + 7, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 22, var5 + 8, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 22, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 23, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 23, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 25, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 25, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 25, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 25, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 25, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 25, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 25, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 25, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 6, var4 + 25, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 25, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 30, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 6, var4 + 30, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 32, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 32, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 0, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 0, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 0, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 0, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 1, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 1, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 1, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 1, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 2, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 2, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 2, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 2, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 3, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 3, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 3, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 3, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 4, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 4, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 4, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 4, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 5, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 5, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 5, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 5, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 6, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 6, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 6, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 6, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 7, var5 + 3, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 7, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 7, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 7, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 7, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 7, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 7, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 7, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 7, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 7, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 8, var5 + 4, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 8, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 8, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 8, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 8, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 8, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 8, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 8, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 9, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 9, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 9, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 9, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 10, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 10, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 10, var5 + 7, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 10, var5 + 7, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 10, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 10, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 10, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 10, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 10, var5 + 10, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 10, var5 + 10, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 10, var5 + 11, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 10, var5 + 11, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 10, var5 + 12, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 10, var5 + 12, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 10, var5 + 13, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 10, var5 + 13, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 11, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 11, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 11, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 11, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 11, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 11, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 11, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 11, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 11, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 11, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 11, var5 + 12, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 11, var5 + 12, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 11, var5 + 13, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 11, var5 + 13, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 11, var5 + 15, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 11, var5 + 15, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 12, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 12, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 12, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 12, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 13, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 13, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 13, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 13, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 14, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 14, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 14, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 14, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 14, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 14, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 14, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 14, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 14, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 14, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 14, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 14, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 15, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 15, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 15, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 15, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 16, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 16, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 16, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 16, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 16, var5 + 10, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 16, var5 + 10, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 16, var5 + 11, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 16, var5 + 11, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 16, var5 + 12, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 16, var5 + 12, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 17, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 17, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 17, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 17, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 17, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 17, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 17, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 17, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 18, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 18, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 18, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 18, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 18, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 18, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 19, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 19, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 19, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 19, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 19, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 19, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 20, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 20, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 20, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 20, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 20, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 20, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 20, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 20, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 21, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 21, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 22, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 22, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 22, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 22, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 22, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 22, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 23, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 23, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 23, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 23, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 24, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 24, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 25, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 25, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 25, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 25, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 25, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 25, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 25, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 7, var4 + 25, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 26, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 26, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 27, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 27, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 28, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 28, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 28, var5 + 9, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 28, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 28, var5 + 11, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 28, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 29, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 29, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 30, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 30, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 30, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 30, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 30, var5 + 9, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 30, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 31, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 31, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 7, var4 + 31, var5 + 9, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 31, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 32, var5 + 8, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 32, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 33, var5 + 8, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 33, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 0, var5 + 7, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 0, var5 + 7, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 0, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 0, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 0, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 0, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 1, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 1, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 1, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 1, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 2, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 2, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 2, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 2, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 3, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 3, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 4, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 4, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 5, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 5, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 6, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 6, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 7, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 7, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 7, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 7, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 7, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 7, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 8, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 8, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 8, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 8, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 9, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 9, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 10, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 10, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 10, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 10, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 10, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 10, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 10, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 10, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 10, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 10, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 10, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 10, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 10, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 10, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 10, var5 + 12, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 10, var5 + 12, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 10, var5 + 13, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 10, var5 + 13, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 10, var5 + 15, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 10, var5 + 15, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 10, var5 + 17, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 10, var5 + 17, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 11, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 11, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 11, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 11, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 11, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 11, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 11, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 11, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 11, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 11, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 11, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 11, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 11, var5 + 13, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 11, var5 + 13, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 11, var5 + 14, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 11, var5 + 14, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 11, var5 + 15, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 11, var5 + 15, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 14, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 14, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 14, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 14, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 14, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 14, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 16, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 16, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 16, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 16, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 16, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 16, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 16, var5 + 12, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 16, var5 + 12, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 16, var5 + 13, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 16, var5 + 13, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 16, var5 + 15, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 16, var5 + 15, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 17, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 17, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 17, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 17, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 17, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 17, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 17, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 17, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 18, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 18, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 18, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 18, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 18, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 18, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 18, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 18, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 18, var5 + 10, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 18, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 18, var5 + 11, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 18, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 19, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 19, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 19, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 19, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 19, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 19, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 20, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 20, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 20, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 20, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 20, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 20, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 25, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 25, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 25, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 25, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 26, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 26, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 26, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 26, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 28, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 28, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 28, var5 + 8, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 28, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 28, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 28, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 8, var4 + 31, var5 + 10, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 31, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 32, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 32, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 32, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 8, var4 + 32, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 0, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 0, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 9, var4 + 7, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 7, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 7, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 7, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 8, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 8, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 8, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 8, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 10, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 10, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 10, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 10, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 10, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 10, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 10, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 10, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 9, var4 + 10, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 10, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 10, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 10, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 10, var5 + 12, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 10, var5 + 12, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 10, var5 + 13, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 10, var5 + 13, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 9, var4 + 10, var5 + 14, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 10, var5 + 14, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 10, var5 + 17, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 10, var5 + 17, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 11, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 11, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 11, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 11, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 11, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 11, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 11, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 11, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 11, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 11, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 11, var5 + 12, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 11, var5 + 12, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 11, var5 + 13, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 11, var5 + 13, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 16, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 16, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 17, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 17, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 17, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 17, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 17, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 17, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 17, var5 + 12, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 17, var5 + 12, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 17, var5 + 13, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 17, var5 + 13, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 18, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 18, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 18, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 18, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 18, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 18, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 9, var4 + 18, var5 + 9, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 18, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 19, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 19, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 19, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 19, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 19, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 19, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 19, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 19, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 20, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 20, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 20, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 20, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 20, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 20, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 20, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 20, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 20, var5 + 12, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 20, var5 + 12, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 22, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 22, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 22, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 22, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 23, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 23, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 25, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 25, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 26, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 9, var4 + 26, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 28, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 28, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 9, var4 + 31, var5 + 9, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 9, var4 + 31, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 7, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 7, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 10, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 10, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 10, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 10, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 10, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 10, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 10, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 10, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 10, var5 + 9, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 10, var4 + 10, var5 + 9, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 10, var4 + 10, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 10, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 10, var5 + 12, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 10, var5 + 12, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 10, var5 + 16, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 10, var5 + 16, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 11, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 11, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 11, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 11, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 11, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 11, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 11, var5 + 13, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 11, var5 + 13, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 11, var5 + 14, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 11, var5 + 14, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 16, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 16, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 16, var5 + 12, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 16, var5 + 12, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 16, var5 + 15, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 16, var5 + 15, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 17, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 17, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 18, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 10, var4 + 18, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 18, var5 + 7, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 10, var4 + 18, var5 + 7, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 10, var4 + 19, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 19, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 19, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 19, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 19, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 19, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 19, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 19, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 20, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 10, var4 + 20, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 28, var5 + 8, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 10, var4 + 28, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 28, var5 + 10, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 10, var4 + 28, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 10, var4 + 28, var5 + 11, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 10, var4 + 28, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 10, var5 + 4, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 10, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 10, var5 + 8, BOPBlocks.firWood.blockID, 12, 2);
+			var1.setBlock(var3 + 11, var4 + 10, var5 + 8, Blocks.logs1.get().blockID, 3, 2);
-			var1.setBlock(var3 + 11, var4 + 10, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 10, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 10, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 10, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 10, var5 + 12, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 10, var5 + 12, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 10, var5 + 13, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 10, var5 + 13, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 10, var5 + 15, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 10, var5 + 15, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 10, var5 + 16, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 10, var5 + 16, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 10, var5 + 17, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 10, var5 + 17, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 11, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 11, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 11, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 11, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 11, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 11, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 18, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 11, var4 + 18, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 18, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 11, var4 + 18, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 18, var5 + 9, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 11, var4 + 18, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 18, var5 + 11, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 11, var4 + 18, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 19, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 19, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 19, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 19, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 20, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 11, var4 + 20, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 11, var4 + 28, var5 + 10, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 11, var4 + 28, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 12, var4 + 10, var5 + 4, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 12, var4 + 10, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 12, var4 + 10, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 12, var4 + 10, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 12, var4 + 10, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 12, var4 + 10, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 12, var4 + 10, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 12, var4 + 10, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 12, var4 + 10, var5 + 13, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 12, var4 + 10, var5 + 13, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 12, var4 + 10, var5 + 14, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 12, var4 + 10, var5 + 14, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 12, var4 + 11, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 12, var4 + 11, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 12, var4 + 16, var5 + 10, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 12, var4 + 16, var5 + 10, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 12, var4 + 16, var5 + 11, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 12, var4 + 16, var5 + 11, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 12, var4 + 16, var5 + 13, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 12, var4 + 16, var5 + 13, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 12, var4 + 18, var5 + 4, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 12, var4 + 18, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 12, var4 + 18, var5 + 7, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 12, var4 + 18, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 12, var4 + 18, var5 + 9, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 12, var4 + 18, var5 + 9, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 12, var4 + 19, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 12, var4 + 19, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 13, var4 + 10, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 13, var4 + 10, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 13, var4 + 10, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 13, var4 + 10, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 13, var4 + 10, var5 + 15, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 13, var4 + 10, var5 + 15, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 13, var4 + 18, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 13, var4 + 18, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 13, var4 + 18, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 13, var4 + 18, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 14, var4 + 10, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 14, var4 + 10, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 14, var4 + 10, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 14, var4 + 10, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 14, var4 + 18, var5 + 5, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 14, var4 + 18, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 14, var4 + 18, var5 + 6, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 14, var4 + 18, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 14, var4 + 18, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 14, var4 + 18, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 15, var4 + 10, var5 + 8, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 15, var4 + 10, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
             return true;
         }
     }

src/minecraft/biomesoplenty/worldgen/WorldGenFir3.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -36,160 +37,160 @@ public class WorldGenFir3 extends WorldGenerator
                 }
             }
 
-			var1.setBlock(var3 + 0, var4 + 2, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 0, var4 + 2, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 0, var4 + 2, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 0, var4 + 2, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 1, var4 + 1, var5 + 1, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 1, var5 + 1, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 1, var4 + 1, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 1, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 1, var4 + 1, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 1, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 1, var4 + 2, var5 + 1, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 2, var5 + 1, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 1, var4 + 2, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 2, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 1, var4 + 2, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 2, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 1, var4 + 3, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 3, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 1, var4 + 4, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 4, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 1, var4 + 5, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 5, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 1, var4 + 5, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 1, var4 + 5, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 1, var5 + 0, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 1, var5 + 0, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 1, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 1, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 1, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 1, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 2, var5 + 1, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 2, var5 + 1, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 2, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 2, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 2, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 2, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 3, var5 + 2, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 3, var5 + 2, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 3, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 3, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 4, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 4, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 4, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 4, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 4, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 4, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 5, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 5, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 5, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 5, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 6, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 6, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 7, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 7, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 2, var4 + 8, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 2, var4 + 8, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 1, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 1, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 1, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 1, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 2, var5 + 0, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 2, var5 + 0, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 2, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 2, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 2, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 2, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 3, var5 + 2, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 3, var5 + 2, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 3, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 3, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 3, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 3, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 3, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 3, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 4, var5 + 1, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 4, var5 + 1, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 4, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 4, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 4, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 4, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 4, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 4, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 1, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 1, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 5, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 5, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 6, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 6, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 6, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 6, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 6, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 6, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 7, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 7, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 8, var5 + 2, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 8, var5 + 2, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 8, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 8, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 8, var5 + 4, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 3, var4 + 8, var5 + 4, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 3, var4 + 8, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 8, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 9, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 9, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 9, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 9, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 10, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 10, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 3, var4 + 11, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 3, var4 + 11, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 0, var5 + 4, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 4, var4 + 0, var5 + 4, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 4, var4 + 0, var5 + 5, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 4, var4 + 0, var5 + 5, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 4, var4 + 1, var5 + 2, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 1, var5 + 2, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 1, var5 + 4, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 4, var4 + 1, var5 + 4, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 4, var4 + 1, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 1, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 2, var5 + 0, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 2, var5 + 0, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 2, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 2, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 2, var5 + 4, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 4, var4 + 2, var5 + 4, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 4, var4 + 2, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 2, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 2, var5 + 8, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 2, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 3, var5 + 4, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 4, var4 + 3, var5 + 4, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 4, var4 + 3, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 3, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 3, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 3, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 4, var5 + 1, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 4, var5 + 1, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 4, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 4, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 4, var5 + 4, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 4, var4 + 4, var5 + 4, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 4, var4 + 4, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 4, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 5, var5 + 1, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 5, var5 + 1, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 5, var5 + 3, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 4, var4 + 5, var5 + 3, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 4, var4 + 5, var5 + 4, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 4, var4 + 5, var5 + 4, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 4, var4 + 5, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 5, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 6, var5 + 2, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 6, var5 + 2, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 6, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 6, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 6, var5 + 4, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 4, var4 + 6, var5 + 4, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 4, var4 + 6, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 6, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 6, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 6, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 2, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 2, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 4, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 4, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 4, var4 + 7, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 7, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 2, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 2, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 4, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 4, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 4, var4 + 8, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 8, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 9, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 9, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 9, var5 + 4, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 4, var4 + 9, var5 + 4, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 4, var4 + 9, var5 + 5, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 4, var4 + 9, var5 + 5, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 4, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 4, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 4, var4 + 10, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 10, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 11, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 11, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 11, var5 + 4, BOPBlocks.firLeaves.blockID, 4, 2);
+			var1.setBlock(var3 + 4, var4 + 11, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 11, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 11, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 4, var4 + 12, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 4, var4 + 12, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 0, var5 + 4, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 5, var4 + 0, var5 + 4, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 5, var4 + 1, var5 + 1, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 1, var5 + 1, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 1, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 1, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 2, var5 + 1, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 2, var5 + 1, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 2, var5 + 2, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 2, var5 + 2, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 2, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 2, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 2, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 2, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 2, var5 + 8, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 2, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 3, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 3, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 3, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 3, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 4, var5 + 1, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 4, var5 + 1, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 4, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 4, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 4, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 4, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 5, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 5, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 5, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 5, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 5, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 5, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 6, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 6, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 6, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 6, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 6, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 6, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 7, var5 + 4, BOPBlocks.firWood.blockID, 12, 2); 
+			var1.setBlock(var3 + 5, var4 + 7, var5 + 4, Blocks.logs1.get().blockID, 3, 2); 
-			var1.setBlock(var3 + 5, var4 + 8, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 8, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 8, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 8, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 9, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 9, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 9, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 9, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 10, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 10, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 5, var4 + 11, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 5, var4 + 11, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 1, var5 + 8, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 1, var5 + 8, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 2, var5 + 1, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 2, var5 + 1, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 2, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 2, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 2, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 2, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 2, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 2, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 3, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 3, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 3, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 3, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 4, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 4, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 4, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 4, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 5, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 5, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 5, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 5, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 5, var5 + 6, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 5, var5 + 6, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 6, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 6, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 7, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 7, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 6, var4 + 8, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 6, var4 + 8, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 1, var5 + 2, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 1, var5 + 2, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 2, var5 + 2, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 2, var5 + 2, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 2, var5 + 7, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 2, var5 + 7, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 3, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 3, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 3, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 3, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 4, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 4, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 5, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 5, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 7, var4 + 5, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 7, var4 + 5, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 1, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 1, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 2, var5 + 3, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 2, var5 + 3, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 2, var5 + 4, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 2, var5 + 4, Blocks.leaves1.get().blockID, 5, 2);
-			var1.setBlock(var3 + 8, var4 + 2, var5 + 5, BOPBlocks.firLeaves.blockID, 12, 2);
+			var1.setBlock(var3 + 8, var4 + 2, var5 + 5, Blocks.leaves1.get().blockID, 5, 2);
             return true;
         }
     }

src/minecraft/biomesoplenty/worldgen/WorldGenFungi1.java

@@ -2,6 +2,7 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPBlocks;
 
 import net.minecraft.block.Block;
@@ -166,22 +167,22 @@ public class WorldGenFungi1 extends WorldGenerator
                             {
                                 if (par2Random.nextInt(3) > 0 && par1World.isAirBlock(par3 - 1, par4 + var11, par5))
                                 {
-                                    this.setBlockAndMetadata(par1World, par3 - 1, par4 + var11, par5, BOPBlocks.willow.blockID, 8);
+                                    this.setBlockAndMetadata(par1World, par3 - 1, par4 + var11, par5, Blocks.willow.get().blockID, 8);
                                 }
 
                                 if (par2Random.nextInt(3) > 0 && par1World.isAirBlock(par3 + 1, par4 + var11, par5))
                                 {
-                                    this.setBlockAndMetadata(par1World, par3 + 1, par4 + var11, par5, BOPBlocks.willow.blockID, 2);
+                                    this.setBlockAndMetadata(par1World, par3 + 1, par4 + var11, par5, Blocks.willow.get().blockID, 2);
                                 }
 
                                 if (par2Random.nextInt(3) > 0 && par1World.isAirBlock(par3, par4 + var11, par5 - 1))
                                 {
-                                    this.setBlockAndMetadata(par1World, par3, par4 + var11, par5 - 1, BOPBlocks.willow.blockID, 1);
+                                    this.setBlockAndMetadata(par1World, par3, par4 + var11, par5 - 1, Blocks.willow.get().blockID, 1);
                                 }
 
                                 if (par2Random.nextInt(3) > 0 && par1World.isAirBlock(par3, par4 + var11, par5 + 1))
                                 {
-                                    this.setBlockAndMetadata(par1World, par3, par4 + var11, par5 + 1, BOPBlocks.willow.blockID, 4);
+                                    this.setBlockAndMetadata(par1World, par3, par4 + var11, par5 + 1, Blocks.willow.get().blockID, 4);
                                 }
                             }
                         }
@@ -244,7 +245,7 @@ public class WorldGenFungi1 extends WorldGenerator
      */
     private void growVines(World par1World, int par2, int par3, int par4, int par5)
     {
-        this.setBlockAndMetadata(par1World, par2, par3, par4, BOPBlocks.willow.blockID, par5);
+        this.setBlockAndMetadata(par1World, par2, par3, par4, Blocks.willow.get().blockID, par5);
         int var6 = 4;
 
         while (true)
@@ -256,7 +257,7 @@ public class WorldGenFungi1 extends WorldGenerator
                 return;
             }
 
-            this.setBlockAndMetadata(par1World, par2, par3, par4, BOPBlocks.willow.blockID, par5);
+            this.setBlockAndMetadata(par1World, par2, par3, par4, Blocks.willow.get().blockID, par5);
             --var6;
         }
     }