+ All Multiblocks now record run-time.

$ Fixed Tree Farmer gui not showing correct power stored.
$ Fixed Tree Farmer hatch textures being incorrect on the top/bottom sides.
$ Minor fix to cutting machine structural check.

2 files changed, 77 insertions, 8 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java
index a6323726c3..5af18e1f8f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java
@@ -1,6 +1,9 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
+import java.util.concurrent.TimeUnit;
+
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -8,14 +11,17 @@ import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.*;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.players.FakeFarmer;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_TreeFarmer;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_TreeFarmer;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
+import net.minecraft.block.Block;
 import net.minecraft.entity.player.*;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.server.MinecraftServer;
 
 public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase {
@@ -24,10 +30,8 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 	
 	/**
 	 * Farm AI
-	 */
-	
+	 */	
 	private EntityPlayerMP farmerAI;
-
 	public EntityPlayerMP getFakePlayer() {
 		return this.farmerAI;
 	}
@@ -67,6 +71,9 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 
 	@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)};
+			}
 		if (aSide == 1) {
 			return new ITexture[]{new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log), new GT_RenderedTexture(true ? TexturesGtBlock.Overlay_Machine_Vent_Fast : TexturesGtBlock.Overlay_Machine_Vent)};
 		}
@@ -78,6 +85,18 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 		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;
@@ -117,10 +136,19 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 		aBaseMetaTileEntity.openGUI(aPlayer);
 		return true;
 	}
+	
+	public Block getCasingBlock() {
+		return ModBlocks.blockCasings2Misc;
+	}
 
-	@Override
-	public boolean onRunningTick(final ItemStack aStack) {
-		return super.onRunningTick(aStack);
+
+	public byte getCasingMeta() {
+		return 15;
+	}
+
+
+	public byte getCasingTextureIndex() {
+		return (byte) TAE.GTPP_INDEX(31);
 	}
 
 	@Override
@@ -130,19 +158,47 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 
 
 	@Override
+	public boolean isGivingInformation() {
+		return true;
+	}
+	
+	@Override
+	public String[] getInfoData() {
+		String[] mSuper = super.getInfoData();
+		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;
 	}
+	@Override
+	public boolean onRunningTick(final ItemStack aStack) {
+		return super.onRunningTick(aStack);
+	}
 
 	@Override
 	public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
-		//super.onPostTick(aBaseMetaTileEntity, aTick);
+		//Do Main Multi Logic first
+		super.onPostTick(aBaseMetaTileEntity, aTick);
+		
+		//Do Tree Farm logic next on server side
 		if (aBaseMetaTileEntity.isServerSide()) {
+			
+			
 			//Set Forestry Fake player Sapling Planter
 			if (this.farmerAI == null) {
 				this.farmerAI = new FakeFarmer(MinecraftServer.getServer().worldServerForDimension(this.getBaseMetaTileEntity().getWorld().provider.dimensionId));
 			}
 			
+			
+			
+			
 
 		}
 		//Client Side - do nothing
@@ -160,4 +216,17 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 		return false;
 	}
 
+
+	@Override
+	public int getPollutionPerTick(ItemStack arg0) {
+		return 0;
+	}
+
+
+	@Override
+	public void onServerStart() {
+		// TODO Auto-generated method stub
+		super.onServerStart();
+	}
+
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCuttingMachine.java
index 76c6490480..4b93adad37 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCuttingMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCuttingMachine.java
@@ -137,7 +137,7 @@ extends GregtechMeta_MultiBlockBase {
 					}
 				}
 			}
-			if ((this.mOutputHatches.size() != 0) || (this.mInputHatches.size() < 0)) {
+			if ((this.mOutputHatches.size() != 0) || (this.mInputHatches.size() != 0)) {
 				Logger.INFO("Use Busses, Not Hatches for Input/Output.");
 				return false;
 			}