uncommented multi

6 files changed, 22 insertions, 34 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 205aad3546..fd5ceed89b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -266,7 +266,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 
 
 	//Tree Farm
-	/*Industrial_TreeFarm, */
+	Industrial_TreeFarm,
 	TreeFarmer_Structural,
 	Casing_PLACEHOLDER_TreeFarmer,
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java
index 0a8624354b..bf4dffb904 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java
@@ -1,4 +1,4 @@
-/*
+
 package gtPlusPlus.xmod.gregtech.api.gui;
 
 import java.util.List;
@@ -68,4 +68,4 @@ public class CONTAINER_TreeFarmer extends GT_ContainerMetaTile_Machine {
 		}
 	}
 
-}*/
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java
index 762dcbf640..b236b0ff32 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java
@@ -1,4 +1,4 @@
-/*
+
 package gtPlusPlus.xmod.gregtech.api.gui;
 
 
@@ -44,4 +44,3 @@ public class GUI_TreeFarmer extends GT_GUIContainerMetaTile_Machine {
 		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
 	}
 }
-*/
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
index 8b3fb9a42f..c728c5d8e8 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
@@ -202,7 +202,7 @@ public class TreeFarmHelper {
 									)){
 
 						if (!testBlock.getUnlocalizedName().toLowerCase().contains("air") || !testBlock.getUnlocalizedName().toLowerCase().contains("pumpkin")) {
-							Logger.WARNING("5:"+testBlock.getUnlocalizedName());
+							//Logger.WARNING("5:"+testBlock.getUnlocalizedName());
 						} else {
 							aBaseMetaTileEntity.getWorld().setBlock(aBaseMetaTileEntity.getXCoord()+xDir+i, aBaseMetaTileEntity.getYCoord()+h, aBaseMetaTileEntity.getZCoord()+zDir+j, Blocks.bookshelf);
 						}
@@ -222,14 +222,14 @@ public class TreeFarmHelper {
 							){
 
 						if (!testBlock.getUnlocalizedName().toLowerCase().contains("air") || !testBlock.getUnlocalizedName().toLowerCase().contains("pumpkin")) {
-							Logger.WARNING("0:"+testBlock.getUnlocalizedName());
+							//Logger.WARNING("0:"+testBlock.getUnlocalizedName());
 						} else {
 							aBaseMetaTileEntity.getWorld().setBlock(aBaseMetaTileEntity.getXCoord()+xDir+i, aBaseMetaTileEntity.getYCoord()+h, aBaseMetaTileEntity.getZCoord()+zDir+j, Blocks.melon_block);
 						}
 
 
 						if (isLeaves(testBlock) || isWoodLog(testBlock)){
-							Logger.WARNING("1:"+testBlock.getUnlocalizedName());
+							//Logger.WARNING("1:"+testBlock.getUnlocalizedName());
 							int posiX, posiY, posiZ;
 							posiX = aBaseMetaTileEntity.getXCoord()+xDir+i;
 							posiY = aBaseMetaTileEntity.getYCoord()+h;
@@ -440,10 +440,10 @@ public class TreeFarmHelper {
 	public static boolean isSapling(final Block log){
 		if (log != null){
 			if (OrePrefixes.sapling.contains(new ItemStack(log, 1))){
-				Logger.WARNING(""+log.getLocalizedName());
+				//Logger.WARNING(""+log.getLocalizedName());
 			}
 			if (log.getLocalizedName().toLowerCase().contains("sapling")){
-				Logger.WARNING(""+log.getLocalizedName());
+				//Logger.WARNING(""+log.getLocalizedName());
 				return true;
 			}
 		}
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 a136bf33b8..164301a22b 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,4 +1,4 @@
-/*
+
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 
 import java.util.concurrent.ScheduledExecutorService;
@@ -48,10 +48,9 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 
 
 
-	*/
 /*
 	 * Static thread for Fake World Handling
-	 *//*
+	 */
 
 
 
@@ -63,8 +62,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 		CASING_TEXTURE_ID = TAE.getIndexFromPage(1, 15);
 		mCasingName = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasings2Misc, 15);
 
-		*/
-/*if (executor == null || mTreeData == null) {
+if (executor == null || mTreeData == null) {
 			if (executor == null) {
 				executor = Executors.newScheduledThreadPool(10);				
 			}
@@ -82,7 +80,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 					}
 				}
 			}			
-		}*//*
+		}
 
 
 
@@ -106,7 +104,6 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 		}
 
 		return new String[]{
-                "[WIP] Disabled",
 				"Converts EU to Oak Logs",
 				"Speed: Very Fast | Eu Usage: 100% | Parallel: 1",				
 				"Requires a Saw, Buzz Saw or Chainsaw in GUI slot",
@@ -155,9 +152,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 
 	public boolean checkRecipe(final ItemStack aStack) {
 
-		//Logger.WARNING("Trying to process virtual tree farming");
 		if (mTreeData != null) {
-			//Logger.WARNING("Tree Data is valid");
 
 			long tVoltage = getMaxInputVoltage();
 			byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
@@ -189,13 +184,11 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 			AutoMap<ItemStack> aOutputs = new AutoMap<ItemStack>();
 
 			try {
-				//Logger.WARNING("Output Chance - "+aChance+" | Valid number? "+(aChance < 1000));
 				if (aChance < 8) {
 					//1% Chance per Tick				
 					for (int u=0; u<(Math.max(4, (MathUtils.randInt((3*tTier), 100)*tTier*tTier)/14));u++) {
 						aOutputs = mTreeData.generateOutput(0);		
 						if (aOutputs.size() > 0) {
-							Logger.WARNING("Generated some Loot, adding it to the output busses");
 
 							ItemStack aLeaves = ItemUtils.getSimpleStack(Blocks.leaves);
 
@@ -204,7 +197,6 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 									this.addOutput(aOutputItemStack);
 								}
 							}
-							Logger.WARNING("Updating Slots");
 							this.updateSlots();
 						}	
 					}			
@@ -214,12 +206,9 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 			catch (Throwable t) {
 				t.printStackTrace();
 			}
-
-			//Logger.WARNING("Valid Recipe");
 			return true;
 		}
 		else {
-			//Logger.WARNING("Invalid Recipe");
 			return false;
 		}
 		//return this.checkRecipeGeneric(4, 100, 100);
@@ -253,7 +242,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 
 							if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, true, aBlock, aMeta,
 									ModBlocks.blockCasings2Misc, 15)) {
-								Logger.WARNING("Bad centrifuge casing");
+								//Logger.WARNING("Bad centrifuge casing");
 								return false;
 							}
 							++tAmount;
@@ -295,19 +284,19 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 						long tVoltage = getMaxInputVoltage();
 						byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));						
 						if (EU.getCharge(invItem) >= tVoltage) {
-							Logger.WARNING("Can drain.");
+							//Logger.WARNING("Can drain.");
 							if (EU.discharge(invItem, (int) tVoltage, -1)) {
-								Logger.WARNING("Drained Power.");
+								//Logger.WARNING("Drained Power.");
 								didElectricDamage = true;
 							}
 							else {
-								Logger.WARNING("Failed when draining Power.");
+								//Logger.WARNING("Failed when draining Power.");
 								this.getBaseMetaTileEntity().disableWorking();
 							}
 						}							
 					}
 				}
-				Logger.WARNING("Drained Power? "+didElectricDamage);
+				//Logger.WARNING("Drained Power? "+didElectricDamage);
 
 
 
@@ -315,7 +304,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 					long aDmg = GT_MetaGenerated_Tool.getToolDamage(invItem);
 					long aDmgMax = GT_MetaGenerated_Tool.getToolMaxDamage(invItem);
 					if (aDmg < aDmgMax && GT_MetaGenerated_Tool.getPrimaryMaterial(invItem) != Materials._NULL) {
-						Logger.WARNING("dmg: "+aDmg+" | max: "+aDmgMax);
+						//Logger.WARNING("dmg: "+aDmg+" | max: "+aDmgMax);
 						GT_MetaGenerated_Tool.setToolDamage(invItem, aDmg+getDamageToComponent(invItem));							
 					}
 					else if (aDmg >= aDmgMax) {
@@ -325,4 +314,4 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 			}			
 		}		
 	}
-}*/
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java
index 8d259d9d2e..47dd3c265f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java
@@ -1,4 +1,4 @@
-/*
+
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import gtPlusPlus.api.objects.Logger;
@@ -25,4 +25,4 @@ public class GregtechIndustrialTreeFarm {
 						.getStackForm(1L));
 
 	}
-}*/
+}