% More work on rewriting the Tree Farmer.

% Renamed Tree Farmer Casing.
% Cleaned up a few imports.
$ Fixed assorted minor bugs with Multis.
$ Fixed Issue with GT_Utilities via ASM.

21 files changed, 855 insertions, 362 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
index 9ab0f2eefb..7c11e7232b 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
@@ -42,8 +42,16 @@ public class BlockPos implements Serializable{
 		this.xPos = x;
 		this.yPos = y;
 		this.zPos = z;
-		this.dim = dim.provider.dimensionId;
-		this.world = dim;
+		
+		if (dim != null) {
+			this.dim = dim.provider.dimensionId;
+			this.world = dim;			
+		}
+		else {
+			this.dim = 0;
+			this.world = null;			
+		}
+		
 	}
 	
 	public BlockPos(IGregTechTileEntity b) {
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java b/src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java
new file mode 100644
index 0000000000..d0c1f3f040
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java
@@ -0,0 +1,253 @@
+package gtPlusPlus.api.objects.minecraft;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import gtPlusPlus.api.objects.data.AutoMap;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.World;
+import net.minecraftforge.common.DimensionManager;
+
+public class FakeBlockPos extends BlockPos {
+
+	private static final long serialVersionUID = -6442245826092414593L;
+	private Block aBlockAtPos;
+	private int aBlockMetaAtPos = 0;
+	
+	public static FakeBlockPos generateBlockPos(String sUUID) {
+		String[] s2 = sUUID.split("@");
+		return new FakeBlockPos(s2);
+	}
+	
+	public FakeBlockPos(String[] s){
+		this(Integer.parseInt(s[1]), Integer.parseInt(s[2]), Integer.parseInt(s[3]), Integer.parseInt(s[0]));
+	}
+
+	public FakeBlockPos(int x, int y, int z, Block aBlock, int aMeta){
+		this(x, y, z, 0);
+		aBlockAtPos = aBlock;
+		aBlockMetaAtPos = aMeta;
+	}
+
+	private FakeBlockPos(int x, int y, int z, int dim){
+		this(x, y, z, DimensionManager.getWorld(dim));
+	}
+
+	private FakeBlockPos(int x, int y, int z, World dim){
+		super(x, y, z, null);
+	}
+
+	public String getLocationString() {
+		String S = ""+this.xPos+"@"+this.yPos+"@"+this.zPos;
+		return S;
+	}
+	
+	public String getUniqueIdentifier() {
+		String S = ""+this.xPos+"@"+this.yPos+"@"+this.zPos+this.aBlockAtPos.getLocalizedName()+"@"+this.aBlockMetaAtPos;
+		return S;
+	}	
+
+	@Override
+	public  int hashCode() {
+		int hash = 5;
+		hash += (13 * this.xPos);
+		hash += (19 * this.yPos);
+		hash += (31 * this.zPos);
+		hash += (17 * this.dim);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object other) {
+		if (other == null) {
+			return false;
+		}
+		if (other == this) {
+			return true;
+		}
+		if(!(other instanceof FakeBlockPos)) {
+			return false;
+		}
+		FakeBlockPos otherPoint = (FakeBlockPos) other;
+		return this.xPos == otherPoint.xPos && this.yPos == otherPoint.yPos && this.zPos == otherPoint.zPos;
+	}
+
+	public int distanceFrom(FakeBlockPos target) {
+		if (target.dim != this.dim) {
+			return Short.MIN_VALUE;
+		}    	
+		return distanceFrom(target.xPos, target.yPos, target.zPos);
+	}
+
+	/**
+	 *
+	 * @param x X coordinate of target.
+	 * @param y Y coordinate of target.
+	 * @param z Z coordinate of target.
+	 * @return square of distance
+	 */
+	public int distanceFrom(int x, int y, int z) {
+		int distanceX = this.xPos - x;
+		int distanceY = this.yPos - y;
+		int distanceZ = this.zPos - z;
+		return distanceX * distanceX + distanceY * distanceY + distanceZ * distanceZ;
+	}
+
+	public boolean isWithinRange(FakeBlockPos target, int range) {    	
+		if (target.dim != this.dim) {
+			return false;
+		}    	
+		return isWithinRange(target.xPos, target.yPos, target.zPos, range);
+	}
+
+	public boolean isWithinRange(int x, int y, int z, int range) {
+		return distanceFrom(x, y, z) <= (range * range);
+	}
+
+	
+	public FakeBlockPos getUp() {
+		return new FakeBlockPos(this.xPos, this.yPos+1, this.zPos, this.dim);
+	}
+	
+	public FakeBlockPos getDown() {
+		return new FakeBlockPos(this.xPos, this.yPos-1, this.zPos, this.dim);
+	}	
+
+	public FakeBlockPos getXPos() {
+		return new FakeBlockPos(this.xPos+1, this.yPos, this.zPos, this.dim);
+	}
+	
+	public FakeBlockPos getXNeg() {
+		return new FakeBlockPos(this.xPos-1, this.yPos, this.zPos, this.dim);
+	}
+	
+	public FakeBlockPos getZPos() {
+		return new FakeBlockPos(this.xPos, this.yPos, this.zPos+1, this.dim);
+	}
+
+	public FakeBlockPos getZNeg() {
+		return new FakeBlockPos(this.xPos, this.yPos, this.zPos-1, this.dim);
+	}
+	
+	public AutoMap<BlockPos> getSurroundingBlocks(){
+		AutoMap<BlockPos> sides = new AutoMap<BlockPos>();
+		sides.put(getUp());
+		sides.put(getDown());
+		sides.put(getXPos());
+		sides.put(getXNeg());
+		sides.put(getZPos());
+		sides.put(getZNeg());		
+		return sides;
+	}
+	
+	public Block getBlockAtPos() {
+		return getBlockAtPos(this);
+	}
+	
+	public Block getBlockAtPos(FakeBlockPos pos) {
+		return getBlockAtPos(world, pos);
+	}
+	
+	public Block getBlockAtPos(World world, FakeBlockPos pos) {
+		return aBlockAtPos;
+	}
+	
+	public int getMetaAtPos() {
+		return getMetaAtPos(this);
+	}
+	
+	public int getMetaAtPos(FakeBlockPos pos) {
+		return getMetaAtPos(world, pos);
+	}
+	
+	public int getMetaAtPos(World world, FakeBlockPos pos) {
+		return aBlockMetaAtPos;
+	}
+	
+	public boolean hasSimilarNeighbour() {
+		return hasSimilarNeighbour(false);
+	}	
+	
+	/**
+	 * @param strict - Does this check Meta Data?
+	 * @return - Does this block have a neighbour that is the same?
+	 */
+	public boolean hasSimilarNeighbour(boolean strict) {		
+		for (BlockPos g : getSurroundingBlocks().values()) {
+			if (getBlockAtPos(g) == getBlockAtPos()) {
+				if (!strict) {
+					return true;
+				}
+				else {
+					if (getMetaAtPos() == getMetaAtPos(g)) {
+						return true;
+					}
+				}
+			}
+		}		
+		return false;
+	}
+	
+	public AutoMap<BlockPos> getSimilarNeighbour() {
+		return getSimilarNeighbour(false);
+	}	
+	
+	/**
+	 * @param strict - Does this check Meta Data?
+	 * @return - Does this block have a neighbour that is the same?
+	 */
+	public AutoMap<BlockPos> getSimilarNeighbour(boolean strict) {
+		AutoMap<BlockPos> sides = new AutoMap<BlockPos>();		
+		for (BlockPos g : getSurroundingBlocks().values()) {
+			if (getBlockAtPos(g) == getBlockAtPos()) {
+				if (!strict) {
+					sides.put(g);
+				}
+				else {
+					if (getMetaAtPos() == getMetaAtPos(g)) {
+						sides.put(g);
+					}
+				}
+			}
+		}		
+		return sides;
+	}
+	
+	public Set<BlockPos> getValidNeighboursAndSelf(){
+		AutoMap<BlockPos> h = getSimilarNeighbour(true);
+		h.put(this);		
+		Set<BlockPos> result = new HashSet<BlockPos>();
+		for (BlockPos f : h.values()) {
+			result.add(f);
+		}		
+		return result;
+	}
+	
+    /**
+     * Called when a plant grows on this block, only implemented for saplings using the WorldGen*Trees classes right now.
+     * Modder may implement this for custom plants.
+     * This does not use ForgeDirection, because large/huge trees can be located in non-representable direction,
+     * so the source location is specified.
+     * Currently this just changes the block to dirt if it was grass.
+     *
+     * Note: This happens DURING the generation, the generation may not be complete when this is called.
+     *
+     * @param world Current world
+     * @param x Soil X
+     * @param y Soil Y
+     * @param z Soil Z
+     * @param sourceX Plant growth location X
+     * @param sourceY Plant growth location Y
+     * @param sourceZ Plant growth location Z
+     */
+    public void onPlantGrow(FakeWorld world, int x, int y, int z, int sourceX, int sourceY, int sourceZ)
+    {
+        if (getBlockAtPos() == Blocks.grass || getBlockAtPos() == Blocks.farmland)
+        {
+            this.aBlockAtPos = Blocks.dirt;
+            this.aBlockMetaAtPos = 0;
+        }
+    }
+	
+}
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/FakeWorld.java b/src/Java/gtPlusPlus/api/objects/minecraft/FakeWorld.java
index 38cde74317..21e7a7d331 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/FakeWorld.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/FakeWorld.java
@@ -1,5 +1,156 @@
 package gtPlusPlus.api.objects.minecraft;
 
-public class FakeWorld {
+import java.util.HashMap;
 
+import gregtech.api.enums.Materials;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class FakeWorld implements IBlockAccess {
+
+	public HashMap<String, FakeBlockPos> mFakeWorldData = new HashMap<String, FakeBlockPos>();
+	
+	/**
+	 * Must be an odd number
+	 */
+	private int aWorldSize = 99;
+	private final int aDistanceFromOrigin;
+	private final int aWorldHeight;
+	
+	public FakeWorld() {
+		this(99);
+	}
+	
+	public FakeWorld(int aSize) {
+		if (MathUtils.isNumberEven(aSize)) {
+			aSize++;
+		}
+		aWorldSize = aSize;
+		aDistanceFromOrigin = ((aWorldSize-1)/2);
+		aWorldHeight = aDistanceFromOrigin >= 255 ? 255 : aDistanceFromOrigin;
+		Logger.INFO("Created a Fake World with data:");
+		Logger.INFO("World Size: "+aWorldSize);
+		Logger.INFO("Distance from Origin in each dir: "+aDistanceFromOrigin);
+		Logger.INFO("World Height: "+aWorldHeight);
+		init();
+	}
+	
+	private void init() {
+		Logger.INFO("Setting all Blocks in Fake World to Air.");
+		for (int y=0;y<=aWorldHeight;y++) {
+			for (int x=-aDistanceFromOrigin;x<=aDistanceFromOrigin;x++) {
+				for (int z=-aDistanceFromOrigin;z<=aDistanceFromOrigin;z++) {
+					FakeBlockPos aTempPos = new FakeBlockPos(x, y, z, Blocks.air, 0);
+					mFakeWorldData.put(aTempPos.getLocationString(), aTempPos);
+				}
+			}
+		}
+		Logger.INFO("Initialisation of FakeWorld is now complete.");
+	}
+	
+	public FakeBlockPos getBlockAtCoords(int x, int y, int z) {
+		String S = ""+x+"@"+y+"@"+z;
+		FakeBlockPos aBlock = mFakeWorldData.get(S);	
+		return aBlock;		
+	}
+	
+	public void setBlockAtCoords(int x, int y, int z, Block aBlock, int aMeta) {
+		FakeBlockPos aTempPos = new FakeBlockPos(x, y, z, aBlock, aMeta);
+		Logger.INFO("Setting "+x+", "+y+", "+z+" to "+aBlock.getLocalizedName()+":"+aMeta);
+		mFakeWorldData.put(aTempPos.getLocationString(), aTempPos);		
+	}
+	
+	public AutoMap<ItemStack> getAllBlocksStoredInFakeWorld(){
+		AutoMap<ItemStack> aOutput = new AutoMap<ItemStack>();		
+		for (FakeBlockPos aPos : mFakeWorldData.values()) {
+			if (aPos.getBlockAtPos() == Blocks.air) {
+				continue;
+			}
+			else {
+				ItemStack aTempStack = ItemUtils.simpleMetaStack(aPos.getBlockAtPos(), aPos.getMetaAtPos(), 1);
+				if (ItemUtils.checkForInvalidItems(aTempStack)) {
+					aOutput.put(aTempStack);
+				}
+			}
+		}		
+		return aOutput;
+	}
+
+	public Block getBlock(int x, int y, int z) {
+		FakeBlockPos aPos = getBlockAtCoords(x, y, z);
+		return aPos.getBlockAtPos();
+	}
+
+	public boolean isAirBlock(int x, int y, int z) {
+		Block aBlock = getBlock(x, y, z);
+		return aBlock == Blocks.air || aBlock.getMaterial() == Material.air;
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	@Override
+	public TileEntity getTileEntity(int p_147438_1_, int p_147438_2_, int p_147438_3_) {
+		return null;
+	}
+
+	@Override
+	public int getLightBrightnessForSkyBlocks(int p_72802_1_, int p_72802_2_, int p_72802_3_, int p_72802_4_) {
+		return 0;
+	}
+
+	@Override
+	public int getBlockMetadata(int x, int y, int z) {
+		return getBlockAtCoords(x, y, z).getMetaAtPos();
+	}
+
+	@Override
+	public int isBlockProvidingPowerTo(int p_72879_1_, int p_72879_2_, int p_72879_3_, int p_72879_4_) {
+		return 0;
+	}
+
+	@Override
+	public BiomeGenBase getBiomeGenForCoords(int p_72807_1_, int p_72807_2_) {
+		return BiomeGenBase.plains;
+	}
+
+	@Override
+	public int getHeight() {
+		return aWorldHeight;
+	}
+
+	@Override
+	public boolean extendedLevelsInChunkCache() {
+		return false;
+	}
+
+	@Override
+	public boolean isSideSolid(int x, int y, int z, ForgeDirection side, boolean _default) {
+		if (!isAirBlock(x, y, z)) {
+			return true;
+		}
+		return false;
+	}
+	
+	
+	
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index fe3934ed10..33198e8d41 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -8,7 +8,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.TextureSet;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
@@ -23,8 +22,6 @@ import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index 6bb0ea8be8..277114a6ae 100644
--- a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -7,16 +7,7 @@ import java.util.Map;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.TC_Aspects;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
@@ -27,8 +18,13 @@ import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
 
 public class BaseOreComponent extends Item{
 
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index d032384638..3b3ba88e88 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -31,6 +31,7 @@ import net.minecraft.util.IChatComponent;
 import net.minecraft.world.World;
 
 import gregtech.GT_Mod;
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -959,5 +960,17 @@ public class Utils {
 	public static long getTicksFromSeconds(long aSeconds) {
 		return (aSeconds*20);
 	}
+	
+	public static byte getTier(long l) {
+		byte i = -1;
+		do {
+			++i;
+			if (i >= GT_Values.V.length) {
+				return i;
+			}
+		} while (l > GT_Values.V[i]);
+		i = (byte) MathUtils.getValueWithinRange(i, 0, 15);
+		return i;
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/math/MathUtils.java b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
index f9a4d8f548..4ba9d54271 100644
--- a/src/Java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
@@ -692,4 +692,9 @@ public class MathUtils {
 		return Math.max(Math.min(aInput, aMax), aMin);
 	}
 
+	public static int getValueWithinRange(byte aInput, int aMin, int aMax) {
+		int aAmount = Math.max(Math.min(aInput, aMax), aMin);
+		return aAmount;
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Utility.java b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Utility.java
new file mode 100644
index 0000000000..36c09688bc
--- /dev/null
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Utility.java
@@ -0,0 +1,117 @@
+package gtPlusPlus.preloader.asm.transformers;
+
+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static org.objectweb.asm.Opcodes.ACC_STATIC;
+import static org.objectweb.asm.Opcodes.ASM5;
+import static org.objectweb.asm.Opcodes.INVOKESTATIC;
+import static org.objectweb.asm.Opcodes.IRETURN;
+import static org.objectweb.asm.Opcodes.LLOAD;
+
+import org.apache.logging.log4j.Level;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+
+public class ClassTransformer_GT_Utility {
+
+	private final boolean isValid;
+	private final ClassReader reader;
+	private final ClassWriter writer;
+	private final String className;
+
+	public ClassTransformer_GT_Utility(byte[] basicClass, String aClassName) {
+		
+		className = aClassName;
+		ClassReader aTempReader = null;
+		ClassWriter aTempWriter = null;
+
+		aTempReader = new ClassReader(basicClass);
+		aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
+		aTempReader.accept(new localClassVisitor(aTempWriter, className), 0);
+
+		if (aTempReader != null && aTempWriter != null) {
+			isValid = true;
+		} else {
+			isValid = false;
+		}
+		
+		FMLRelaunchLog.log("[GT++ ASM] Gregtech Utilities Patch", Level.INFO, "Valid patch? " + isValid + ".");
+		reader = aTempReader;
+		writer = aTempWriter;
+
+		if (reader != null && writer != null) {
+			FMLRelaunchLog.log("[GT++ ASM] Gregtech Utilities Patch", Level.INFO, "Attempting Method Injection.");
+			injectMethod("getTier");			
+		}
+
+	}
+
+	public boolean isValidTransformer() {
+		return isValid;
+	}
+
+	public ClassReader getReader() {
+		return reader;
+	}
+
+	public ClassWriter getWriter() {
+		return writer;
+	}
+
+	public boolean injectMethod(String aMethodName) {
+		MethodVisitor mv;
+		boolean didInject = false;
+		ClassWriter cw = getWriter();	
+		FMLRelaunchLog.log("[GT++ ASM] Gregtech Utilities Patch", Level.INFO, "Injecting " + aMethodName + ".");		
+		if (aMethodName.equals("getTier")) {
+			mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "getTier", "(J)B", null, null);
+			mv.visitCode();
+			Label l0 = new Label();
+			mv.visitLabel(l0);
+			mv.visitLineNumber(23, l0);
+			mv.visitVarInsn(LLOAD, 0);
+			mv.visitMethodInsn(INVOKESTATIC, "gtPlusPlus/core/util/Utils", "getTier", "(J)B", false);
+			mv.visitInsn(IRETURN);
+			Label l1 = new Label();
+			mv.visitLabel(l1);
+			mv.visitLocalVariable("l", "J", null, l0, l1, 0);
+			mv.visitMaxs(2, 2);
+			mv.visitEnd();
+			didInject = true;
+		}
+		FMLRelaunchLog.log("[GT++ ASM] Gregtech Utilities Patch", Level.INFO, "Method injection complete.");
+		return didInject;
+	}
+
+	public final class localClassVisitor extends ClassVisitor {
+
+		String aClassName;
+
+		public localClassVisitor(ClassVisitor cv, String aName) {
+			super(ASM5, cv);
+			aClassName = aName;
+		}
+
+		@Override
+		public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+			MethodVisitor methodVisitor;
+
+			if (name.equals("getTier")) {
+				methodVisitor = null;
+			} else {
+				methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
+			}
+
+			if (methodVisitor == null) {
+				FMLRelaunchLog.log("[GT++ ASM] Gregtech Utilities Patch", Level.INFO,
+						"Found method " + name + ", removing.");
+			}
+			return methodVisitor;
+		}
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_Hazmat.java b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_Hazmat.java
index 59edf8dec0..52e4d7d99d 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_Hazmat.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_Hazmat.java
@@ -115,6 +115,7 @@ public class ClassTransformer_IC2_Hazmat {
 			mv.visitLocalVariable("living", "L"+aEntityLivingBase+";", null, l0, l1, 0);
 			mv.visitMaxs(1, 1);
 			mv.visitEnd();
+			didInject = true;
 		}
 		FMLRelaunchLog.log("[GT++ ASM] IC2 Hazmat Patch", Level.INFO, "Method injection complete.");
 		return didInject;
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
index 3f5897d590..7955e57f76 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -122,6 +122,11 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
 		 * Gregtech ASM Patches
 		 */
 		
+		//Make GT_Utilities safer		
+		if (transformedName.equals("gtPlusPlus.preloader.asm.transformers.ClassTransformer_GT_Utility")) {	
+			FMLRelaunchLog.log("[GT++ ASM] Gregtech Utilities Patch", Level.INFO, "Transforming %s", transformedName);
+			return new ClassTransformer_GT_Utility(basicClass, transformedName).getWriter().toByteArray();
+		}
 		//Try patch achievements
 		if (transformedName.equals("gregtech.loaders.misc.GT_Achievements")) {	
 			FMLRelaunchLog.log("[GT++ ASM] Gregtech Achievements Patch", Level.INFO, "Transforming %s", transformedName);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 516f78038d..e352712138 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -577,6 +577,7 @@ GT_MetaTileEntity_MultiBlockBase {
 			tTier = (byte) aControlCoreTier;
 		}
 
+		tTier = (byte) MathUtils.getValueWithinRange(tTier, 0, 9);
 
 		GT_Recipe tRecipe = aRecipe != null ? aRecipe : findRecipe(
 				getBaseMetaTileEntity(), mLastRecipe, false,
@@ -1922,8 +1923,8 @@ GT_MetaTileEntity_MultiBlockBase {
 				return true;
 			}
 			else if (aFoundBlock != aExpectedBlock) {
-				log("A1 - Found: "+aFoundBlock.getLocalizedName()+":"+aFoundMeta+", Expected: "+aExpectedBlock.getLocalizedName()+":"+aExpectedMeta);	
 				if (GTplusplus.CURRENT_LOAD_PHASE == INIT_PHASE.STARTED) {
+					log("A1 - Found: "+aFoundBlock.getLocalizedName()+":"+aFoundMeta+", Expected: "+aExpectedBlock.getLocalizedName()+":"+aExpectedMeta);	
 					log("Loc: "+(new BlockPos(aBaseMetaTileEntity).getLocationString()));
 				}
 				return false;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
index 8dd52c7074..528aed2029 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
@@ -60,7 +60,7 @@ extends GregtechMetaCasingBlocksAbstract {
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Autocrafter Frame");
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Cutting Factory Frame");
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Tesla Containment Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Casing "); //Tree Farmer Textures
+		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Sterile Farm Casing"); //Tree Farmer Textures
 		GregtechItemList.Casing_ThermalCentrifuge.set(new ItemStack(this, 1, 0));
 		GregtechItemList.Casing_Refinery_External.set(new ItemStack(this, 1, 1));
 		GregtechItemList.Casing_Refinery_Structural.set(new ItemStack(this, 1, 2));
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
index 8f107b8ab6..1c7109fad2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
@@ -60,7 +60,8 @@ public class CasingTextureHandler2 {
 				case 14:
 					return TexturesGtBlock.Casing_Material_RedSteel.getIcon();
 				case 15:
-					if (aSide <2) {
+					return TexturesGtBlock.Casing_Machine_Acacia_Log.getIcon();	
+					/*if (aSide <2) {
 						if (aSide == 1) {
 							return TexturesGtBlock.Casing_Machine_Podzol.getIcon();					
 						}
@@ -68,7 +69,7 @@ public class CasingTextureHandler2 {
 					}
 					else {
 						return TexturesGtBlock.Casing_Machine_Farm_Manager.getIcon();					
-					}
+					}*/
 				default:
 					return TexturesGtBlock.Overlay_UU_Matter.getIcon();
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
index 624058f356..a87fac1dfd 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
@@ -285,6 +285,37 @@ public class TreeFarmHelper {
 		}
 		return SAWTOOL.NONE;
 	}
+	
+	public static boolean isCorrectPart(final ItemStack aStack) {
+		if (aStack != null){
+			//Utils.LOG_WARNING("Found "+aStack.getDisplayName()+" in the GUI slot.");
+			if ((aStack.getItem() instanceof GT_MetaGenerated_Item_02) || (aStack.getItem() instanceof GT_MetaGenerated_Tool)){
+				if (OrePrefixes.craftingTool.contains(aStack)){
+					if (aStack.getDisplayName().toLowerCase().contains("saw") || aStack.getDisplayName().toLowerCase().contains("gt.metatool.01")){
+						if (aStack.getItemDamage() == 10){
+							return true;
+						}
+						else if (aStack.getItemDamage() == 140  || aStack.getDisplayName().toLowerCase().contains("gt.metatool.01.140")){
+							return true;
+						}
+						else if (aStack.getItemDamage() == 110  || aStack.getDisplayName().toLowerCase().contains("gt.metatool.01.110")){
+							return true;
+						}
+						else if (aStack.getItemDamage() == 112  || aStack.getDisplayName().toLowerCase().contains("gt.metatool.01.112")){
+							return true;
+						}
+						else if (aStack.getItemDamage() == 114  || aStack.getDisplayName().toLowerCase().contains("gt.metatool.01.114")){
+							return true;
+						}
+						else {
+							return false;
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
 
 	public static boolean isHumusLoaded = false;
 	public static boolean isForestryLogsLoaded = false;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java
index 7437bf19da..c9f2d493ab 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java
@@ -2,10 +2,15 @@ package gtPlusPlus.xmod.gregtech.common.helpers.treefarm;
 
 import java.util.Random;
 
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.FakeBlockPos;
+import gtPlusPlus.api.objects.minecraft.FakeWorld;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockSapling;
+import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Direction;
@@ -15,14 +20,26 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 public class TreeGenerator {
 
-	public static AutoMap<ItemStack> generateOutput(int aTreeSize){
-		AutoMap<ItemStack> aOutputMap = new AutoMap<ItemStack>();
-		
-		
-		return aOutputMap;
+	private final FakeTreeInFakeWorldGenerator mTreeData;
+	
+	public TreeGenerator() {
+		Logger.INFO("Created Fake Tree Generator.");
+		mTreeData = new FakeTreeInFakeWorldGenerator();		
+		if (!mTreeData.hasGenerated) {
+			mTreeData.generate(null, CORE.RANDOM, 0, 0, 0);
+    	}		
+	}
+	
+	public AutoMap<ItemStack> generateOutput(int aTreeSize){
+		AutoMap<ItemStack> aTemp = new AutoMap<ItemStack>();
+		AutoMap<ItemStack> aOutputMap = mTreeData.getOutputFromTree();
+		if (aOutputMap != null && aOutputMap.size() > 0) {
+			return aOutputMap;
+		}		
+		return aTemp;
 	}
 	
-	public class FakeWorldGenerator extends WorldGenAbstractTree
+	public class FakeTreeInFakeWorldGenerator extends WorldGenAbstractTree
 	{
 	    /** The minimum height of a generated tree. */
 	    private final int minTreeHeight;
@@ -33,21 +50,29 @@ public class TreeGenerator {
 	    /** The metadata value of the leaves to use in tree generation. */
 	    private final int metaLeaves;
 	    
+	    private final AutoMap<FakeWorld> mFakeWorld;
+	    private final int mTreesToGenerate;
+	    
+	    private int mCurrentGeneratorIteration = 0;
+	    
 	    private boolean hasGenerated = false;
 	    private AutoMap<ItemStack> aOutputsFromGenerator = new AutoMap<ItemStack>();
 
-	    public FakeWorldGenerator()
+	    public FakeTreeInFakeWorldGenerator()
 	    {
-	        this(4, 0, 0, false);
+	        this(4, 0, 0, false, 5000);
 	    }
 
-	    public FakeWorldGenerator(int aMinHeight, int aWoodMeta, int aLeafMeta, boolean aVines)
+	    public FakeTreeInFakeWorldGenerator(int aMinHeight, int aWoodMeta, int aLeafMeta, boolean aVines, int aTreeCount)
 	    {
 	        super(false);
 	        this.minTreeHeight = aMinHeight;
 	        this.metaWood = aWoodMeta;
 	        this.metaLeaves = aLeafMeta;
 	        this.vinesGrow = aVines;
+	        this.mFakeWorld = new AutoMap<FakeWorld>();
+	        this.mTreesToGenerate = aTreeCount;
+			Logger.INFO("Created Fake Tree In Fake World Instance.");
 	    }
 
 	    
@@ -55,17 +80,66 @@ public class TreeGenerator {
 	    	if (!hasGenerated) {
 	    		generate(null, CORE.RANDOM, 0, 0, 0);
 	    	}	    	
-	    	return aOutputsFromGenerator;
+	    	AutoMap<ItemStack> aOutputMap = new AutoMap<ItemStack>();		
+			int aRandomTreeID = MathUtils.randInt(0, this.mFakeWorld.size()-1);
+			FakeWorld aWorld = this.mFakeWorld.get(aRandomTreeID);
+			if (aWorld != null) {
+				aOutputMap = aWorld.getAllBlocksStoredInFakeWorld();				
+			}	
+			return aOutputMap;
+	    	
 	    }
 	    
+	    @Override
+	    protected boolean func_150523_a(Block p_150523_1_)
+	    {
+	        return p_150523_1_.getMaterial() == Material.air || p_150523_1_.getMaterial() == Material.leaves || p_150523_1_ == Blocks.grass || p_150523_1_ == Blocks.dirt || p_150523_1_ == Blocks.log || p_150523_1_ == Blocks.log2 || p_150523_1_ == Blocks.sapling || p_150523_1_ == Blocks.vine;
+	    }
+
+	    @Override
+	    protected boolean isReplaceable(World world, int x, int y, int z)
+	    {
+	    	FakeWorld aWorld = getWorld();
+	        Block block = aWorld.getBlock(x, y, z);
+	        return block.isAir(null, x, y, z) || block.isLeaves(null, x, y, z) || block.isWood(null, x, y, z) || func_150523_a(block);
+	    }	    
 	    
 	    @Override
-	    public boolean generate(World aWorld, Random aRand, int aWorldX, int aWorldRealY, int aWorldZ){
-	    	
+	    public boolean generate(World world, Random aRand, int aWorldX, int aWorldRealY, int aWorldZ){	    	
 	    	//Only Generate Once - This object is Cached
 	    	if (hasGenerated) {
 	    		return hasGenerated;
+	    	}	    	
+	    	else {	    		
+	    		for (int yy=0;yy<mTreesToGenerate;yy++) {	    			
+	    			generateTree(0, 0, 0);
+	    	        mCurrentGeneratorIteration++;
+	    		}
+	    		hasGenerated = true;
+	    		if (this.mFakeWorld.size() > 0) {	    			
+	    			for (FakeWorld aWorld : this.mFakeWorld) {
+	    				for (ItemStack aBlockInFakeWorld : aWorld.getAllBlocksStoredInFakeWorld()) {
+	    					aOutputsFromGenerator.add(aBlockInFakeWorld);
+	    				}
+	    			}	    			
+	    			return true;
+	    		}
+	    		else {
+	    			return false;
+	    		}	    		
+	    	}   	
+	    }
+	    
+	    public FakeWorld getWorld() {
+	    	FakeWorld aWorld = this.mFakeWorld.get(mCurrentGeneratorIteration);
+	    	if (aWorld == null) {
+	    		aWorld = (this.mFakeWorld.set(mCurrentGeneratorIteration, new FakeWorld(200)));
 	    	}
+	    	return aWorld;
+	    }
+	    
+	    public boolean generateTree(int aWorldX, int aWorldRealY, int aWorldZ) {
+	    	FakeWorld aWorld = getWorld();
 	    	
 	    	//Set some static values
 	    	
@@ -103,7 +177,7 @@ public class TreeGenerator {
 	                        {
 	                            block = aWorld.getBlock(j1, i1, k1);
 
-	                            if (!this.isReplaceable(aWorld, j1, i1, k1))
+	                            if (!this.isReplaceable(null, j1, i1, k1))
 	                            {
 	                                flag = false;
 	                            }
@@ -123,11 +197,12 @@ public class TreeGenerator {
 	            else
 	            {
 	                Block block2 = aWorld.getBlock(aWorldX, aWorldY - 1, aWorldZ);
+	                FakeBlockPos aBlockToGrowPlantOn = aWorld.getBlockAtCoords(aWorldX, aWorldY-1, aWorldZ);
 
 	                boolean isSoil = block2.canSustainPlant(aWorld, aWorldX, aWorldY - 1, aWorldZ, ForgeDirection.UP, (BlockSapling)Blocks.sapling);
 	                if (isSoil && aWorldY < 256 - l - 1)
 	                {
-	                    block2.onPlantGrow(aWorld, aWorldX, aWorldY - 1, aWorldZ, aWorldX, aWorldY, aWorldZ);
+	                	aBlockToGrowPlantOn.onPlantGrow(aWorld, aWorldX, aWorldY - 1, aWorldZ, aWorldX, aWorldY, aWorldZ);
 	                    b0 = 3;
 	                    byte b1 = 0;
 	                    int l1;
@@ -152,7 +227,7 @@ public class TreeGenerator {
 	                                {
 	                                    Block block1 = aWorld.getBlock(i2, k1, k2);
 
-	                                    if (block1.isAir(aWorld, i2, k1, k2) || block1.isLeaves(aWorld, i2, k1, k2))
+	                                    if (block1.isAir(null, i2, k1, k2) || block1.isLeaves(null, i2, k1, k2))
 	                                    {
 	                                        this.setBlockAndNotifyAdequately(aWorld, i2, k1, k2, Blocks.leaves, this.metaLeaves);
 	                                    }
@@ -165,7 +240,7 @@ public class TreeGenerator {
 	                    {
 	                        block = aWorld.getBlock(aWorldX, aWorldY + k1, aWorldZ);
 
-	                        if (block.isAir(aWorld, aWorldX, aWorldY + k1, aWorldZ) || block.isLeaves(aWorld, aWorldX, aWorldY + k1, aWorldZ))
+	                        if (block.isAir(null, aWorldX, aWorldY + k1, aWorldZ) || block.isLeaves(null, aWorldX, aWorldY + k1, aWorldZ))
 	                        {
 	                            this.setBlockAndNotifyAdequately(aWorld, aWorldX, aWorldY + k1, aWorldZ, Blocks.log, this.metaWood);
 
@@ -205,24 +280,24 @@ public class TreeGenerator {
 	                            {
 	                                for (j2 = aWorldZ - l1; j2 <= aWorldZ + l1; ++j2)
 	                                {
-	                                    if (aWorld.getBlock(i2, k1, j2).isLeaves(aWorld, i2, k1, j2))
+	                                    if (aWorld.getBlock(i2, k1, j2).isLeaves(null, i2, k1, j2))
 	                                    {
-	                                        if (CORE.RANDOM.nextInt(4) == 0 && aWorld.getBlock(i2 - 1, k1, j2).isAir(aWorld, i2 - 1, k1, j2))
+	                                        if (CORE.RANDOM.nextInt(4) == 0 && aWorld.getBlock(i2 - 1, k1, j2).isAir(null, i2 - 1, k1, j2))
 	                                        {
 	                                            this.growVines(aWorld, i2 - 1, k1, j2, 8);
 	                                        }
 
-	                                        if (CORE.RANDOM.nextInt(4) == 0 && aWorld.getBlock(i2 + 1, k1, j2).isAir(aWorld, i2 + 1, k1, j2))
+	                                        if (CORE.RANDOM.nextInt(4) == 0 && aWorld.getBlock(i2 + 1, k1, j2).isAir(null, i2 + 1, k1, j2))
 	                                        {
 	                                            this.growVines(aWorld, i2 + 1, k1, j2, 2);
 	                                        }
 
-	                                        if (CORE.RANDOM.nextInt(4) == 0 && aWorld.getBlock(i2, k1, j2 - 1).isAir(aWorld, i2, k1, j2 - 1))
+	                                        if (CORE.RANDOM.nextInt(4) == 0 && aWorld.getBlock(i2, k1, j2 - 1).isAir(null, i2, k1, j2 - 1))
 	                                        {
 	                                            this.growVines(aWorld, i2, k1, j2 - 1, 1);
 	                                        }
 
-	                                        if (CORE.RANDOM.nextInt(4) == 0 && aWorld.getBlock(i2, k1, j2 + 1).isAir(aWorld, i2, k1, j2 + 1))
+	                                        if (CORE.RANDOM.nextInt(4) == 0 && aWorld.getBlock(i2, k1, j2 + 1).isAir(null, i2, k1, j2 + 1))
 	                                        {
 	                                            this.growVines(aWorld, i2, k1, j2 + 1, 4);
 	                                        }
@@ -246,8 +321,6 @@ public class TreeGenerator {
 	                            }
 	                        }
 	                    }
-
-	    	            hasGenerated = true;
 	                    return true;
 	                }
 	                else
@@ -262,32 +335,27 @@ public class TreeGenerator {
 	        }
 	    }
 
-	    /**
+		/**
 	     * Grows vines downward from the given block for a given length. Args: World, x, starty, z, vine-length
 	     */
-	    private void growVines(World aWorld, int aX, int aY, int aZ, int aMeta)
+	    private void growVines(FakeWorld aWorld, int aX, int aY, int aZ, int aMeta)
 	    {
-	        this.setBlockAndNotifyAdequately(aWorld, aX, aY, aZ, Blocks.vine, aMeta);
-	        int i1 = 4;
-
-	        while (true)
-	        {
-	            --aY;
-
-	            if (!aWorld.getBlock(aX, aY, aZ).isAir(aWorld, aX, aY, aZ) || i1 <= 0)
-	            {
-	                return;
-	            }
-
-	            this.setBlockAndNotifyAdequately(aWorld, aX, aY, aZ, Blocks.vine, aMeta);
-	            --i1;
+	        int aLoopSize = vinesGrow ? MathUtils.randInt(0, 4) : 0;	        
+	        for (int i=0;i<aLoopSize;i++) {
+	            this.setBlockAndNotifyAdequately(aWorld, aX, aY, aZ, Blocks.vine, aMeta);	        	
 	        }
 	    }
 
 		@Override
-		protected void setBlockAndNotifyAdequately(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMeta) {
-			
-			super.setBlockAndNotifyAdequately(aWorld, aX, aY, aZ, aBlock, aMeta);
+		protected void setBlockAndNotifyAdequately(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMeta) {	
+			setBlockAndNotifyAdequately(getWorld(), aX, aY, aZ, aBlock, aMeta);			
+		}
+		
+		protected void setBlockAndNotifyAdequately(FakeWorld aWorld, int aX, int aY, int aZ, Block aBlock, int aMeta) {			
+			if (aBlock != null && (aMeta >= 0 && aMeta <= Short.MAX_VALUE)) {
+				aWorld.setBlockAtCoords(aX, aY, aZ, aBlock, aMeta);
+				//aOutputsFromGenerator.put(ItemUtils.simpleMetaStack(aBlock, aMeta, 1));
+			}			
 		}
 	}
 	
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
index 9081e6bc64..5968ea189c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
@@ -1,48 +1,58 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.TAE;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
-import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.slots.SlotBuzzSaw.SAWTOOL;
-import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_TreeFarmer;
-import gtPlusPlus.xmod.gregtech.api.gui.GUI_TreeFarmer;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.helpers.TreeFarmHelper;
+import gtPlusPlus.xmod.gregtech.common.helpers.treefarm.TreeGenerator;
 import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
 
 public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase {
 
-	public final static int TEX_INDEX = 31;
-	protected boolean mIsCurrentlyWorking = false;
-
-
-
+	public static int CASING_TEXTURE_ID;
+	public static String mCryoFuelName = "Gelid Cryotheum";
+	public static String mCasingName = "Advanced Cryogenic Casing";
+	public static String mHatchName = "Cryotheum Hatch";
+	public static FluidStack mFuelStack;
+	public static TreeGenerator mTreeData;
 
 	public GregtechMetaTileEntityTreeFarm(final int aID, final String aName, final String aNameRegional) {
 		super(aID, aName, aNameRegional);
+		mFuelStack = FluidUtils.getFluidStack("cryotheum", 1);
+		CASING_TEXTURE_ID = TAE.getIndexFromPage(1, 15);
+		mCryoFuelName = mFuelStack.getLocalizedName();
+		mCasingName = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasings2Misc, 15);
+		mHatchName = ItemUtils.getLocalizedNameOfBlock(GregTech_API.sBlockMachines, 967);
 	}
 
 	public GregtechMetaTileEntityTreeFarm(final String aName) {
 		super(aName);
+		mFuelStack = FluidUtils.getFluidStack("cryotheum", 1);
+		CASING_TEXTURE_ID = TAE.getIndexFromPage(1, 15);
+		mCryoFuelName = mFuelStack.getLocalizedName();
+		mCasingName = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasings2Misc, 15);
+		mHatchName = ItemUtils.getLocalizedNameOfBlock(GregTech_API.sBlockMachines, 967);
 	}
 
-	public boolean isCurrentlyWorking() {
-		return this.mIsCurrentlyWorking;
+	public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
+		return (IMetaTileEntity) new GregtechMetaTileEntityTreeFarm(this.mName);
 	}
 
 	@Override
@@ -50,206 +60,106 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 		return "Tree Farm";
 	}
 
-	@Override
 	public String[] getTooltip() {
-		return new String[]{
-		        "THIS MULTIBLOCK IS DISABLED - DO NOT BUILD",
-		};
-	}
-
-	@Override
-	public long maxEUStore() {
-		return 3244800; //13*13*150*128
-	}
 
-	@Override
-	public boolean drainEnergyInput(final long aEU) {
-		if (aEU <= 0L) {
-			return true;
+		if (mCasingName.toLowerCase().contains(".name")) {
+			mCasingName = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasings2Misc, 15);
 		}
-		
-		//Special Override, so that this function uses internally stored power first.
-		if (this.getEUVar() >= aEU) {
-			this.setEUVar(this.getEUVar()-aEU);
-			return true;
+		if (mCryoFuelName.toLowerCase().contains(".")) {
+			mCryoFuelName = FluidUtils.getFluidStack("cryotheum", 1).getLocalizedName();
 		}
-		
-		for (final GT_MetaTileEntity_Hatch_Energy tHatch : this.mEnergyHatches) {
-			if (isValidMetaTileEntity((MetaTileEntity) tHatch)
-					&& tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(aEU, false)) {
-				return true;
-			}
+		if (mHatchName.toLowerCase().contains(".name")) {
+			mHatchName = ItemUtils.getLocalizedNameOfBlock(GregTech_API.sBlockMachines, 967);
 		}
-		return false;
+		
+		return new String[]{
+				"Factory Grade Tree Growth Simulator",
+				"Speed: Very Fast | Eu Usage: 100% | Parallel: 1",				
+				//"Consumes 1L of "+mCryoFuelName+"/t during operation",
+				"Constructed exactly the same as a normal Vacuum Freezer",
+				"Use "+mCasingName+"s (10 at least!)",
+				"1x " + mHatchName + " (Required)",
+				"TAG_HIDE_HATCHES"
+		};
 	}
 
-	@Override
-	public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
-		if (aSide == 0) {
-			return new ITexture[]{new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log)};
+	public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+			final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+		if (aSide == aFacing) {
+			return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[CASING_TEXTURE_ID],
+					new GT_RenderedTexture((IIconContainer) (aActive ? TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active : TexturesGtBlock.Overlay_Machine_Controller_Advanced))};
 		}
-		if (aSide == 1) {
-			return new ITexture[]{new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log), new GT_RenderedTexture(isCurrentlyWorking() ? TexturesGtBlock.Overlay_Machine_Vent_Fast : TexturesGtBlock.Overlay_Machine_Vent)};
-		}
-		return new ITexture[]{new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager)};
-	}
-
-	@Override
-	public GT_Recipe.GT_Recipe_Map getRecipeMap() {
-		return null;
-	}
-
-
-	@Override
-	public void loadNBTData(NBTTagCompound arg0) {
-		super.loadNBTData(arg0);
-	}
-
-
-	@Override
-	public void saveNBTData(NBTTagCompound arg0) {
-		super.saveNBTData(arg0);
-	}
-
-	@Override
-	public boolean isAccessAllowed(final EntityPlayer aPlayer) {
-		return true;
-	}
-
-	@Override
-	public boolean allowCoverOnSide(final byte aSide, final GT_ItemStack aCoverID) {
-		return (GregTech_API.getCoverBehavior(aCoverID.toStack()).isSimpleCover()) && (super.allowCoverOnSide(aSide, aCoverID));
-	}
-
-	@Override
-	public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-		return new GregtechMetaTileEntityTreeFarm(this.mName);
+		return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[CASING_TEXTURE_ID]};
 	}
 
 	@Override
 	public boolean hasSlotInGUI() {
 		return true;
 	}
-
-	@Override
-	public String getCustomGUIResourceName() {
-		return "TreeFarmer";
-	}	
-
-	@Override
-	public Object getClientGUI(final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) {
-		return new GUI_TreeFarmer(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "TreeFarmer.png");
-	}
-
-	@Override
-	public Object getServerGUI(final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) {
-		return new CONTAINER_TreeFarmer(aPlayerInventory, aBaseMetaTileEntity);
-	}
-
+	
 	@Override
-	public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
-		if (aBaseMetaTileEntity.isClientSide() || aBaseMetaTileEntity.getWorld().isRemote) {
-			Logger.WARNING("Doing nothing Client Side.");
-			return false;
-		}
-		aBaseMetaTileEntity.openGUI(aPlayer);
+	public boolean requiresVanillaGtGUI() {
 		return true;
 	}
 
-	public Block getCasingBlock() {
-		return ModBlocks.blockCasings2Misc;
-	}
-
-
-	public byte getCasingMeta() {
-		return 15;
-	}
-
-
-	public byte getCasingTextureIndex() {
-		return (byte) TAE.GTPP_INDEX(31);
-	}
-
-	@Override
-	public int getMaxEfficiency(ItemStack p0) {
-		return 10000;
-	}
-
 	@Override
-	public String[] getExtraInfoData() {
-		String[] mSuper = new String[0];
-		String[] mDesc = new String[mSuper.length+1];		
-		mDesc[0] = "Yggdrasil"; // Machine name		
-		for (int i=0;i<mSuper.length;i++) {
-			mDesc[i+1] = mSuper[i];
-		}
-		return mDesc;
-	}
-
-	@Override
-	public boolean explodesOnComponentBreak(ItemStack p0) {
-		return false;
+	public String getCustomGUIResourceName() {
+		return "VacuumFreezer";
 	}
-	@Override
-	public boolean onRunningTick(final ItemStack aStack) {
-		//Logger.INFO("s");
 
-		return super.onRunningTick(aStack);
+	public GT_Recipe.GT_Recipe_Map getRecipeMap() {			
+		return null;
 	}
 
-	@Override
-	public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
-		//Do Main Multi Logic first
-		super.onPostTick(aBaseMetaTileEntity, aTick);
-
-		//Do Tree Farm logic next on server side, once per second
-		if (aBaseMetaTileEntity.isServerSide() && (aTick % 20 == 0)) {			
-
-			//Simple Repairs for a simple machine
-			if (isCurrentlyWorking()) {
-				this.mSolderingTool = true;
-			}
-
-			if (this.getBaseMetaTileEntity().isServerSide()) {	
-				if (this.mEnergyHatches.size() > 0) {
-					for (GT_MetaTileEntity_Hatch_Energy j : this.mEnergyHatches) {
-						//Logger.INFO(""+j.getInputTier());
-						if (this.getEUVar() <= (this.maxEUStore()-GT_Values.V[(int) j.getInputTier()])) {
-							this.setEUVar(this.getEUVar()+GT_Values.V[(int) j.getInputTier()]);
-							j.setEUVar(j.getEUVar()-GT_Values.V[(int) j.getInputTier()]);
-						}
-						else if (this.getEUVar() > (this.maxEUStore()-GT_Values.V[(int) j.getInputTier()])) {
-							long diff = (this.maxEUStore()-this.getEUVar());
-							this.setEUVar(this.getEUVar()+diff);
-							j.setEUVar(j.getEUVar()-diff);
-						}
+	public boolean isCorrectMachinePart(final ItemStack aStack) {
+		return TreeFarmHelper.isCorrectPart(aStack);
+	}
+
+	public boolean isFacingValid(final byte aFacing) {
+		return aFacing > 1;
+	}
+
+	public boolean checkRecipe(final ItemStack aStack) {
+		Logger.INFO("Trying to process virtual tree farming");
+		if (mTreeData != null) {
+			Logger.INFO("Tree Data is valid");
+			this.getBaseMetaTileEntity().enableWorking();
+			this.mMaxProgresstime = 100;
+			this.mEUt = -500;
+			this.mEfficiencyIncrease = 10000;
+			
+			int aChance = MathUtils.randInt(0, 10000);
+			AutoMap<ItemStack> aOutputs = new AutoMap<ItemStack>();
+			
+			try {
+				Logger.INFO("Output Chance - "+aChance+" | Valid number? "+(aChance < 100));
+			if (aChance < 100) {
+				//1% Chance per Tick
+				aOutputs = mTreeData.generateOutput(0);		
+				if (aOutputs.size() > 0) {
+					Logger.INFO("Generated some Loot, adding it to the output busses");
+					for (ItemStack aOutputItemStack : aOutputs) {
+						this.addOutput(aOutputItemStack);
 					}
+					Logger.INFO("Updating Slots");
+					this.updateSlots();
 				}	
+			}				
 			}
-
-
-			//Try Work
-			if (this.drainEnergyInput(32)) {
-				BlockPos t;			
-				if ((t = TreeFarmHelper.checkForLogsInGrowArea(this.getBaseMetaTileEntity())) != null) {
-					//Logger.INFO("Lets try find new logs/branches.");
-					TreeFarmHelper.findTreeFromBase(this.getBaseMetaTileEntity().getWorld(), t);
-				}
+			catch (Throwable t) {
+				t.printStackTrace();
 			}
-
-
+			
+			Logger.INFO("Valid Recipe");
+			return true;
+		}
+		else {
+			Logger.INFO("Invalid Recipe");
+			this.getBaseMetaTileEntity().disableWorking();
+			return false;
 		}
+		//return this.checkRecipeGeneric(4, 100, 100);
 	}
-
-
-	@Override
-	public boolean checkRecipe(ItemStack p0) {		
-		mIsCurrentlyWorking = (isCorrectMachinePart(p0) && this.getEUVar() > 0);		
-		if (isCurrentlyWorking()) {
-			return true;
-		}		
-		return false;
-	}	
 	
 	@Override
 	public int getMaxParallelRecipes() {
@@ -261,121 +171,68 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 		return 0;
 	}
 
-
-	@Override
-	public boolean isCorrectMachinePart(final ItemStack aStack) {
-		boolean isValid = false;
-		final SAWTOOL currentInputItem = TreeFarmHelper.isCorrectMachinePart(aStack);
-		if (currentInputItem != SAWTOOL.NONE){			
-			isValid = true;
-		}
-		return isValid;
-	}
-
-	@Override
 	public boolean checkMultiblock(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) {
-		Logger.WARNING("Step 1");
-		final int xDir = net.minecraftforge.common.util.ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 7;
-		final int zDir = net.minecraftforge.common.util.ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 7;
-
-		for (int i = -7; i <= 7; i++) {
-			Logger.WARNING("Step 2");
-			for (int j = -7; j <= 7; j++) {
-				Logger.WARNING("Step 3");
-				for (int h = 0; h <= 1; h++) {
-					Logger.WARNING("Step 4");
-					final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
-					//Farm Floor inner 14x14
-					if (((i != -7) && (i != 7)) && ((j != -7) && (j != 7))) {
-						Logger.WARNING("Step 5 - H:"+h);
-						// Farm Dirt Floor and Inner Air/Log space.
-						if (h == 0) {
-							//Dirt Floor
-							if (!TreeFarmHelper.isDirtBlock(aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j))) {
-								Logger.MACHINE_INFO("Dirt like block missing from inner 14x14.");
-								Logger.MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
-								return false;
-							}
-						}
-					}
-					//Dealt with inner 5x5, now deal with the exterior.
-					else {
-						Logger.WARNING("Step 6 - H:"+h);
-						//Deal with all 4 sides (Fenced area)
-						if (h == 1) {
-							if (!TreeFarmHelper.isFenceBlock(aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j))) {
-								Logger.MACHINE_INFO("Fence/Gate missing from outside the second layer.");
-								Logger.MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
+		int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
+		int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
+		int tAmount = 0;
+		if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) {
+			return false;
+		} else {
+			for (int i = -1; i < 2; ++i) {
+				for (int j = -1; j < 2; ++j) {
+					for (int h = -1; h < 2; ++h) {
+						if (h != 0 || (xDir + i != 0 || zDir + j != 0) && (i != 0 || j != 0)) {
+							IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i,
+									h, zDir + j);
+							Block aBlock = aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j);
+							int aMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j);
+
+							if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, true, aBlock, aMeta,
+									ModBlocks.blockCasings2Misc, 15)) {
+								Logger.INFO("Bad centrifuge casing");
 								return false;
 							}
-						}
-						//Deal with Bottom edges (Add Hatches/Busses first, othercheck make sure it's dirt) //TODO change the casings to not dirt~?
-						else if (h == 0) {
-							if (tTileEntity != null)
-								if ((!this.addMaintenanceToMachineList(tTileEntity, TAE.GTPP_INDEX(TEX_INDEX))) && (!this.addInputToMachineList(tTileEntity, TAE.GTPP_INDEX(TEX_INDEX))) && (!this.addOutputToMachineList(tTileEntity, TAE.GTPP_INDEX(TEX_INDEX))) && (!this.addEnergyInputToMachineList(tTileEntity, TAE.GTPP_INDEX(TEX_INDEX)))) {
-									if (((xDir + i) != 0) || ((zDir + j) != 0)) {//no controller
+							++tAmount;
 
-										if (tTileEntity.getMetaTileID() != 752) {
-											Logger.MACHINE_INFO("Farm Keeper Casings Missing from one of the edges on the bottom edge. x:"+(xDir+i)+" y:"+h+" z:"+(zDir+j)+" | "+aBaseMetaTileEntity.getClass());
-											Logger.MACHINE_INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName()+" "+tTileEntity.getMetaTileID());
-											return false;
-										}
-										Logger.WARNING("Found a farm keeper.");
-									}
-								}
 						}
 					}
 				}
 			}
+			return tAmount >= 10;
 		}
+	}
 
-		//Must have at least one energy hatch.
-		if (this.mEnergyHatches != null) {
-			for (int i = 0; i < this.mEnergyHatches.size(); i++) {
-				if (this.mEnergyHatches.get(i).mTier < 1){
-					Logger.MACHINE_INFO("You require at LEAST MV tier Energy Hatches.");
-					Logger.MACHINE_INFO(this.mOutputHatches.get(i).getBaseMetaTileEntity().getXCoord()+","+this.mOutputHatches.get(i).getBaseMetaTileEntity().getYCoord()+","+this.mOutputHatches.get(i).getBaseMetaTileEntity().getZCoord());
-					return false;
-				}
-			}
-		}
-		//Must have at least one output hatch.
-		if (this.mOutputHatches != null) {
-			for (int i = 0; i < this.mOutputHatches.size(); i++) {
-
-				if (this.mOutputHatches.get(i).mTier < 1){
-					Logger.MACHINE_INFO("You require at LEAST MV tier Output Hatches.");
-					Logger.MACHINE_INFO(this.mOutputHatches.get(i).getBaseMetaTileEntity().getXCoord()+","+this.mOutputHatches.get(i).getBaseMetaTileEntity().getYCoord()+","+this.mOutputHatches.get(i).getBaseMetaTileEntity().getZCoord());
-					Logger.MACHINE_INFO(this.mOutputHatches.get(i).getBaseMetaTileEntity().getInventoryName());
-					return false;
-				}
-			}
-		}
-		//Must have at least one input hatch.
-		if (this.mInputHatches != null) {
-			for (int i = 0; i < this.mInputHatches.size(); i++) {
-				if (this.mInputHatches.get(i).mTier < 1){
-					Logger.MACHINE_INFO("You require at LEAST MV tier Input Hatches.");
-					Logger.MACHINE_INFO(this.mOutputHatches.get(i).getBaseMetaTileEntity().getXCoord()+","+this.mOutputHatches.get(i).getBaseMetaTileEntity().getYCoord()+","+this.mOutputHatches.get(i).getBaseMetaTileEntity().getZCoord());
-					Logger.MACHINE_INFO(this.mOutputHatches.get(i).getBaseMetaTileEntity().getInventoryName());
-					return false;
-				}
-			}
-		}
-		Logger.MACHINE_INFO("Multiblock Formed.");
-		return true;
+	public int getMaxEfficiency(final ItemStack aStack) {
+		return 10000;
 	}
 
+	public int getPollutionPerTick(final ItemStack aStack) {
+		return 25;
+	}
 
-	@Override
-	public int getPollutionPerTick(ItemStack arg0) {
+	public int getDamageToComponent(final ItemStack aStack) {
 		return 0;
 	}
 
+	public boolean explodesOnComponentBreak(final ItemStack aStack) {
+		return false;
+	}
 
 	@Override
-	public void onServerStart() {		
-		super.onServerStart();
+	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		if (mTreeData == null) {
+			mTreeData = new TreeGenerator();
+		}
+		if (mTreeData != null) {
+			//this.getBaseMetaTileEntity().enableWorking();
+		}
+		
+		
+		/*if (this.getBaseMetaTileEntity().isActive()) {
+			if (!this.depleteInput(mFuelStack.copy())) {
+				this.getBaseMetaTileEntity().setActive(false);
+			}
+		}	*/
+		super.onPostTick(aBaseMetaTileEntity, aTick);
 	}
-
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java
index fc0cb85bac..031bf16b17 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java
@@ -6,7 +6,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import cofh.asmhooks.block.BlockWater;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -18,7 +17,6 @@ import gregtech.api.util.FishPondFakeRecipe;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.Recipe_GT;
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
@@ -31,7 +29,6 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.Gregtech
 import ic2.core.init.BlocksItems;
 import ic2.core.init.InternalName;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockAir;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java
index 7c1cc343ed..d5b7337187 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java
@@ -3,10 +3,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.b
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
 public class GregtechMetaTileEntity_BedrockMiningPlatform1 extends GregtechMetaTileEntity_BedrockMiningPlatformBase {
 	public GregtechMetaTileEntity_BedrockMiningPlatform1(final int aID, final String aName, final String aNameRegional) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java
index fb4884e278..2a94804937 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java
@@ -168,7 +168,7 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G
 			}
 		}
 		
-		this.mEUt = 8000;
+		this.mEUt = -8000;
 		this.mMaxProgresstime = 1;
 		this.mEfficiencyIncrease = 10000;
 		
diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java b/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
index 8cdfb2afb6..b1353cc481 100644
--- a/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
+++ b/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
@@ -1,16 +1,11 @@
 package gtPlusPlus.xmod.thaumcraft;
 
-import java.util.Arrays;
-import java.util.List;
-
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectCompat;
 import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectStack;
-import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java b/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
index 6cd5af02b6..56ad95c5e3 100644
--- a/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
+++ b/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
@@ -7,7 +7,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 
 import gregtech.api.enums.TC_Aspects;
-import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.GT_ThaumcraftCompat;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;