% Tried to improve the logic for the Tree Farmer, to support Forestry 4.

% Moved COFH API related files.
+ Added a child mod, for misc handling.
$$ Borrowed some code from MFR, to attempt forestry support. (Credit left, will re-do if I even get it working).

31 files changed, 1665 insertions, 72 deletions

diff --git a/src/Java/api/cofh/energy/EnergyStorage.java b/src/Java/cofh/energy/EnergyStorage.java
index a6ec363709..e48fc7b8ac 100644
--- a/src/Java/api/cofh/energy/EnergyStorage.java
+++ b/src/Java/cofh/energy/EnergyStorage.java
@@ -1,4 +1,4 @@
-package api.cofh.energy;
+package cofh.energy;
 
 import net.minecraft.nbt.NBTTagCompound;
 
diff --git a/src/Java/api/cofh/energy/IEnergyConnection.java b/src/Java/cofh/energy/IEnergyConnection.java
index 6351f7702d..96055c2282 100644
--- a/src/Java/api/cofh/energy/IEnergyConnection.java
+++ b/src/Java/cofh/energy/IEnergyConnection.java
@@ -1,4 +1,4 @@
-package api.cofh.energy;
+package cofh.energy;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
diff --git a/src/Java/api/cofh/energy/IEnergyContainerItem.java b/src/Java/cofh/energy/IEnergyContainerItem.java
index 1f2b8c3c52..1cce2619ae 100644
--- a/src/Java/api/cofh/energy/IEnergyContainerItem.java
+++ b/src/Java/cofh/energy/IEnergyContainerItem.java
@@ -1,4 +1,4 @@
-package api.cofh.energy;
+package cofh.energy;
 
 import net.minecraft.item.ItemStack;
 
diff --git a/src/Java/api/cofh/energy/IEnergyHandler.java b/src/Java/cofh/energy/IEnergyHandler.java
index 9d3385c4c0..89ea0b4eb7 100644
--- a/src/Java/api/cofh/energy/IEnergyHandler.java
+++ b/src/Java/cofh/energy/IEnergyHandler.java
@@ -1,4 +1,4 @@
-package api.cofh.energy;
+package cofh.energy;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
diff --git a/src/Java/api/cofh/energy/IEnergyProvider.java b/src/Java/cofh/energy/IEnergyProvider.java
index ace09db65e..1f92549c53 100644
--- a/src/Java/api/cofh/energy/IEnergyProvider.java
+++ b/src/Java/cofh/energy/IEnergyProvider.java
@@ -1,4 +1,4 @@
-package api.cofh.energy;
+package cofh.energy;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
diff --git a/src/Java/api/cofh/energy/IEnergyReceiver.java b/src/Java/cofh/energy/IEnergyReceiver.java
index 68b071b028..537b4679d5 100644
--- a/src/Java/api/cofh/energy/IEnergyReceiver.java
+++ b/src/Java/cofh/energy/IEnergyReceiver.java
@@ -1,4 +1,4 @@
-package api.cofh.energy;
+package cofh.energy;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
diff --git a/src/Java/api/cofh/energy/IEnergyStorage.java b/src/Java/cofh/energy/IEnergyStorage.java
index bf999f8670..d105df55c1 100644
--- a/src/Java/api/cofh/energy/IEnergyStorage.java
+++ b/src/Java/cofh/energy/IEnergyStorage.java
@@ -1,4 +1,4 @@
-package api.cofh.energy;
+package cofh.energy;
 
 public abstract interface IEnergyStorage
 {
diff --git a/src/Java/api/cofh/energy/ItemEnergyContainer.java b/src/Java/cofh/energy/ItemEnergyContainer.java
index f4da898919..697532abe3 100644
--- a/src/Java/api/cofh/energy/ItemEnergyContainer.java
+++ b/src/Java/cofh/energy/ItemEnergyContainer.java
@@ -1,4 +1,4 @@
-package api.cofh.energy;
+package cofh.energy;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/api/cofh/energy/TileEnergyHandler.java b/src/Java/cofh/energy/TileEnergyHandler.java
index 606b0ba44b..24cd3c0e34 100644
--- a/src/Java/api/cofh/energy/TileEnergyHandler.java
+++ b/src/Java/cofh/energy/TileEnergyHandler.java
@@ -1,4 +1,4 @@
-package api.cofh.energy;
+package cofh.energy;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/Java/cofh/mod/BaseMod.java b/src/Java/cofh/mod/BaseMod.java
new file mode 100644
index 0000000000..7ab858eabd
--- /dev/null
+++ b/src/Java/cofh/mod/BaseMod.java
@@ -0,0 +1,284 @@
+package cofh.mod;
+
+import cofh.mod.updater.IUpdatableMod;
+import cofh.mod.updater.ModRange;
+import cofh.mod.updater.ModVersion;
+import com.google.common.base.Strings;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.ICrashCallable;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.ModContainer;
+import cpw.mods.fml.common.ObfuscationReflectionHelper;
+import cpw.mods.fml.common.network.NetworkCheckHandler;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.common.versioning.InvalidVersionSpecificationException;
+import cpw.mods.fml.relauncher.FMLLaunchHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.IReloadableResourceManager;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StringTranslate;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.helpers.Loader;
+import org.apache.logging.log4j.spi.AbstractLogger;
+
+public abstract class BaseMod implements IUpdatableMod {
+
+	protected File _configFolder;
+	protected final String _modid;
+	protected final Logger _log;
+
+	protected BaseMod(Logger log) {
+
+		String name = getModId();
+		_modid = name.toLowerCase(Locale.US);
+		_log = log;
+		init();
+	}
+
+	protected BaseMod() {
+
+		String name = getModId();
+		_modid = name.toLowerCase(Locale.US);
+		_log = LogManager.getLogger(name);
+		init();
+	}
+
+	private void init() {
+
+		ModContainer container = cpw.mods.fml.common.Loader.instance().activeModContainer();
+		if (container.getSource().isDirectory()) {
+			FMLCommonHandler.instance().registerCrashCallable(new CrashCallable("Loaded from a directory"));
+		} else {
+			try {
+				JarFile jar = new JarFile(container.getSource());
+				ZipEntry file = jar.getEntry("vers.prop");
+				if (file != null) {
+					BufferedReader reader = new BufferedReader(new InputStreamReader(jar.getInputStream(file)));
+					String data = reader.readLine();
+					FMLCommonHandler.instance().registerCrashCallable(new CrashCallable(data));
+				} else {
+					FMLCommonHandler.instance().registerCrashCallable(new CrashCallable("Lacking version information."));
+				}
+				jar.close();
+			} catch (IOException e) {
+				FMLCommonHandler.instance().registerCrashCallable(new CrashCallable("Error reading version information." + e.getMessage()));
+			}
+		}
+	}
+
+	@NetworkCheckHandler
+	public final boolean networkCheck(Map<String, String> remoteVersions, Side side) throws InvalidVersionSpecificationException {
+
+		if (!requiresRemoteFrom(side)) {
+			return true;
+		}
+		Mod mod = getClass().getAnnotation(Mod.class);
+		String _modid = mod.modid();
+		if (!remoteVersions.containsKey(_modid)) {
+			return false;
+		}
+		String remotes = mod.acceptableRemoteVersions();
+		if (!"*".equals(remotes)) {
+
+			String remote = remoteVersions.get(_modid);
+			if (Strings.isNullOrEmpty(remotes)) {
+				return getModVersion().equalsIgnoreCase(remote);
+			}
+			return ModRange.createFromVersionSpec(_modid, remotes).containsVersion(new ModVersion(_modid, remote));
+		}
+		return true;
+	}
+
+	protected boolean requiresRemoteFrom(Side side) {
+
+		return true;
+	}
+
+	protected String getConfigBaseFolder() {
+
+		String base = getClass().getPackage().getName();
+		int i = base.indexOf('.');
+		if (i >= 0) {
+			return base.substring(0, i);
+		}
+		return "";
+	}
+
+	protected void setConfigFolderBase(File folder) {
+
+		_configFolder = new File(folder, getConfigBaseFolder() + "/" + _modid + "/");
+	}
+
+	protected File getConfig(String name) {
+
+		return new File(_configFolder, name + ".cfg");
+	}
+
+	protected File getClientConfig() {
+
+		return getConfig("client");
+	}
+
+	protected File getCommonConfig() {
+
+		return getConfig("common");
+	}
+
+	protected String getAssetDir() {
+
+		return _modid;
+	}
+
+	@Override
+	public Logger getLogger() {
+
+		return _log;
+	}
+
+	private void loadLanguageFile(Properties lang, InputStream stream) throws Throwable {
+
+		InputStreamReader is = new InputStreamReader(stream, "UTF-8");
+
+		Properties langPack = new Properties();
+		langPack.load(is);
+
+		lang.putAll(langPack);
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	private void loadLanguageFile(String lang, Properties langPack) {
+
+		HashMap<String, String> parsedLangFile = new HashMap<String, String>();
+		parsedLangFile.putAll((Map) langPack); // lovely casting hack
+
+		LanguageRegistry.instance().injectLanguage(lang.intern(), parsedLangFile);
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	protected void loadLang() {
+
+		if (FMLLaunchHandler.side() == Side.CLIENT) {
+			try {
+				loadClientLang();
+				return;
+			} catch (Throwable t) {
+				_log.error(AbstractLogger.CATCHING_MARKER, "???", t);
+			}
+		}
+
+		String path = "assets/" + getAssetDir() + "/language/";
+		String lang = "en_US";
+		try (InputStream is = Loader.getResource(path + lang + ".lang", null).openStream();) {
+			Properties langPack = new Properties();
+			loadLanguageFile(langPack, is);
+
+			StringTranslate i = ObfuscationReflectionHelper.getPrivateValue(StringTranslate.class, null, "instance", "field_74817_a");
+			Map m = ObfuscationReflectionHelper.getPrivateValue(StringTranslate.class, i, "field_74816_c", "languageList");
+			m.putAll(langPack);
+		} catch (Throwable t) {
+			_log.catching(Level.INFO, t);
+		}
+	}
+
+	@SideOnly(Side.CLIENT)
+	private void loadClientLang() {
+
+		IReloadableResourceManager manager = (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager();
+		manager.registerReloadListener(new LangManager(manager));
+	}
+
+	@SideOnly(Side.CLIENT)
+	private class LangManager implements IResourceManagerReloadListener {
+
+		private final String _path;
+
+		public LangManager(IResourceManager manager) {
+
+			_path = getAssetDir() + ":language/";
+			onResourceManagerReload(manager);
+		}
+
+		@Override
+		public void onResourceManagerReload(IResourceManager manager) {
+
+			String l = null;
+			try {
+				l = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode();
+			} catch (Throwable t) {
+				_log.catching(Level.WARN, t);
+			}
+
+			for (String lang : Arrays.asList("en_US", l)) {
+				if (lang != null) {
+					Properties langPack = new Properties();
+					try {
+						List<IResource> files = manager.getAllResources(new ResourceLocation(_path + lang + ".lang"));
+						for (IResource file : files) {
+							if (file.getInputStream() == null) {
+								_log.warn("A resource pack defines an entry for language '" + lang + "' but the InputStream is null.");
+								continue;
+							}
+							try {
+								loadLanguageFile(langPack, file.getInputStream());
+							} catch (Throwable t) {
+								_log.warn(AbstractLogger.CATCHING_MARKER, "A resource pack has a file for language '" + lang + "' but the file is invalid.", t);
+							}
+						}
+					} catch (Throwable t) {
+						_log.info(AbstractLogger.CATCHING_MARKER, "No language data for '" + lang + "'", t);
+					}
+					loadLanguageFile(lang, langPack);
+				}
+			}
+
+			Minecraft.getMinecraft().getLanguageManager().onResourceManagerReload(manager);
+		}
+	}
+
+	private class CrashCallable implements ICrashCallable {
+
+		private final String data;
+
+		private CrashCallable(String data) {
+
+			this.data = data;
+		}
+
+		@Override
+		public String call() throws Exception {
+
+			return data;
+		}
+
+		@Override
+		public String getLabel() {
+
+			return getModId();
+		}
+
+	}
+
+}
diff --git a/src/Java/cofh/mod/ChildMod.java b/src/Java/cofh/mod/ChildMod.java
new file mode 100644
index 0000000000..b07c35a8a1
--- /dev/null
+++ b/src/Java/cofh/mod/ChildMod.java
@@ -0,0 +1,17 @@
+package cofh.mod;
+
+import cpw.mods.fml.common.Mod;
+
+
+public @interface ChildMod {
+
+	/**
+	 * The {@link Mod} instance defining this ChildMod
+	 */
+	Mod[] mod();
+
+	/**
+	 * The parent {@link Mod}
+	 */
+	String parent();
+}
diff --git a/src/Java/cofh/mod/ChildModContainer.java b/src/Java/cofh/mod/ChildModContainer.java
new file mode 100644
index 0000000000..994fde93a8
--- /dev/null
+++ b/src/Java/cofh/mod/ChildModContainer.java
@@ -0,0 +1,43 @@
+package cofh.mod;
+
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.eventbus.EventBus;
+
+import cpw.mods.fml.common.*;
+import cpw.mods.fml.common.discovery.ModCandidate;
+import cpw.mods.fml.common.versioning.ArtifactVersion;
+
+public class ChildModContainer extends FMLModContainer {
+
+	private final String parent;
+
+	@SuppressWarnings("unchecked")
+	public ChildModContainer(String className, ModCandidate container, Map<String, Object> modDescriptor) {
+
+		super(className, container, (Map<String, Object>)((List<Object>)modDescriptor.get("mod")).get(0));
+
+		parent = (String) modDescriptor.get("parent");
+	}
+
+    @Override
+    public boolean registerBus(EventBus bus, LoadController controller) {
+
+    	Map<String, ModContainer> list = Loader.instance().getIndexedModList();
+    	l: {
+    		if (!list.containsKey(parent)) {
+    			break l;
+    		}
+    		for (ArtifactVersion info : this.getMetadata().dependencies) {
+    			if (!list.containsKey(info.getLabel()) && !ModAPIManager.INSTANCE.hasAPI(info.getLabel())) {
+    				break l;
+    			}
+    		}
+	    	return super.registerBus(bus, controller);
+    	}
+
+    	return false;
+    }
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java b/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java
index 592b41b0e9..146af86302 100644
--- a/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java
+++ b/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java
@@ -8,7 +8,7 @@ import ic2.api.item.*;
 
 import java.util.List;
 
-import api.cofh.energy.ItemEnergyContainer;
+import cofh.energy.ItemEnergyContainer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/Java/gtPlusPlus/xmod/forestry/Forestry.java b/src/Java/gtPlusPlus/xmod/forestry/Forestry.java
new file mode 100644
index 0000000000..b21d9a154d
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/forestry/Forestry.java
@@ -0,0 +1,127 @@
+package gtPlusPlus.xmod.forestry;
+
+import static cpw.mods.fml.common.registry.GameRegistry.findBlock;
+import static cpw.mods.fml.common.registry.GameRegistry.findItem;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.forestry.trees.ForestryLeaf;
+import gtPlusPlus.xmod.forestry.trees.ForestrySapling;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+
+import cofh.mod.ChildMod;
+import cpw.mods.fml.common.*;
+import cpw.mods.fml.common.Mod.CustomProperty;
+import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+
+@ChildMod(parent = CORE.MODID, mod = @Mod(modid = "Gregtech++|CompatForestry",
+name = "GT++ Compat: Forestry",
+version = CORE.VERSION,
+dependencies = "after:Miscutils;after:Forestry",
+customProperties = @CustomProperty(k = "cofhversion", v = "true")))
+public class Forestry {
+
+	private static final String name = "Forestry";
+
+	@EventHandler
+	public void load(FMLInitializationEvent e) {
+
+		try {
+			initForestry();
+		} catch (Throwable $) {
+			ModContainer This = FMLCommonHandler.instance().findContainerFor(this);
+			LogManager.getLogger(This.getModId()).log(Level.ERROR, "There was a problem loading " + This.getName(), $);
+		}
+	}
+
+	private static void initForestry() {
+
+		Item item;
+
+		item = findItem(name, "sapling");
+		Block block = findBlock(name, "saplingGE");
+		if (item != null && block != null) {
+			ForestrySapling sapling = new ForestrySapling(item, block);
+			//MFRRegistry.registerPlantable(sapling);
+			//MFRRegistry.registerFertilizable(sapling);
+		} else
+			//Utils.LOG_WARNING("Forestry sapling/block null!");
+
+		block = findBlock(name, "soil");
+		if (block != null) {
+			//ForestryBogEarth bog = new ForestryBogEarth(block);
+			//MFRRegistry.registerPlantable(bog);
+			//MFRRegistry.registerFertilizable(bog);
+			//MFRRegistry.registerHarvestable(bog);
+			//MFRRegistry.registerFruit(bog);
+		} else
+			//Utils.LOG_WARNING("Forestry bog earth null!");
+
+		for (int i = 1; true; ++i) {
+			block = findBlock(name, "log" + i);
+			l: if (block == null) {
+				if (i > 1)
+					Utils.LOG_WARNING("Forestry logs null at " + i + ".");
+				else {
+					block = findBlock(name, "logs");
+					if (block != null) {
+						break l;
+					}
+					Utils.LOG_WARNING("Forestry logs null!");
+				}
+				break;
+			}
+			//MFRRegistry.registerHarvestable(new HarvestableWood(block));
+			//MFRRegistry.registerFruitLogBlock(block);
+		}
+
+		for (int i = 1; true; ++i) {
+			block = findBlock(name, "fireproofLog" + i);
+			l: if (block == null) {
+				if (i > 1)
+					Utils.LOG_WARNING("Forestry logs null at " + i + ".");
+				else {
+					block = findBlock(name, "logsFireproof");
+					if (block != null) {
+						break l;
+					}
+					Utils.LOG_WARNING("Forestry logs null!");
+				}
+				break;
+			}
+			//MFRRegistry.registerHarvestable(new HarvestableWood(block));
+			//MFRRegistry.registerFruitLogBlock(block);
+		}
+
+		block = findBlock(name, "leaves");
+		if (block != null) {
+			ForestryLeaf leaf = new ForestryLeaf(block);
+			//MFRRegistry.registerFertilizable(leaf);
+			//MFRRegistry.registerHarvestable(leaf);
+			//MFRRegistry.registerFruit(leaf);
+		} else
+			Utils.LOG_WARNING("Forestry leaves null!");
+
+		block = findBlock(name, "pods");
+		item = findItem(name, "grafterProven");
+		if (block != null) {
+			//ForestryPod pod = new ForestryPod(block, item);
+			//MFRRegistry.registerFertilizable(pod);
+			//MFRRegistry.registerHarvestable(pod);
+			//MFRRegistry.registerFruit(pod);
+		} else
+			Utils.LOG_WARNING("Forestry pods null!");
+	}
+
+	@EventHandler
+	public static void postInit(FMLPostInitializationEvent e) {
+		//MFRRegistry.registerLiquidDrinkHandler("bioethanol", new DrinkHandlerBiofuel());
+		//TileEntityUnifier.updateUnifierLiquids();
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/forestry/trees/ForestryLeaf.java b/src/Java/gtPlusPlus/xmod/forestry/trees/ForestryLeaf.java
new file mode 100644
index 0000000000..e2550f4643
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/forestry/trees/ForestryLeaf.java
@@ -0,0 +1,160 @@
+package gtPlusPlus.xmod.forestry.trees;
+
+import java.util.*;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import powercrystals.minefactoryreloaded.api.*;
+import powercrystals.minefactoryreloaded.farmables.harvestables.HarvestableTreeLeaves;
+import forestry.api.arboriculture.*;
+import forestry.api.genetics.*;
+
+
+public class ForestryLeaf extends HarvestableTreeLeaves implements IFactoryFruit
+{
+	private ITreeRoot root;
+	private ReplacementBlock repl;
+	protected Item _item;
+
+	public ForestryLeaf(Block block)
+	{
+		super(block);
+		root = (ITreeRoot)AlleleManager.alleleRegistry.getSpeciesRoot("rootTrees");
+		repl = EmptyReplacement.INSTANCE;
+		_item = Item.getItemFromBlock(block);
+	}
+
+	@Override
+	public boolean canBePicked(World world, int x, int y, int z)
+	{
+		TileEntity te = world.getTileEntity(x, y, z);
+		if (te instanceof IFruitBearer)
+		{
+			IFruitBearer fruit = (IFruitBearer)te;
+			return fruit.getRipeness() >= 0.99f;
+		}
+		return false;
+	}
+
+	public boolean canFertilize(World world, int x, int y, int z)
+	{
+		return !canBePicked(world, x, y, z);
+	}
+
+	public boolean fertilize(World world, Random rand, int x, int y, int z)
+	{
+		TileEntity te = world.getTileEntity(x, y, z);
+		if (te instanceof IFruitBearer)
+		{
+			IFruitBearer fruit = (IFruitBearer)te;
+			fruit.addRipeness(1f);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public ReplacementBlock getReplacementBlock(World world, int x, int y, int z)
+	{
+		return repl;
+	}
+
+	@Override
+	public void prePick(World world, int x, int y, int z)
+	{
+	}
+
+	@Override // HARVESTER
+	public List<ItemStack> getDrops(World world, Random rand, Map<String, Boolean> settings, int x, int y, int z)
+	{
+		ITree tree = getTree(world, x, y, z);
+		if (tree == null)
+			return null;
+
+		ArrayList<ItemStack> prod = new ArrayList<ItemStack>();
+
+		float modifier = 1f;
+		if (settings.get("silkTouch") == Boolean.TRUE)
+		{
+			ItemStack item = new ItemStack(_item);
+			NBTTagCompound tag = new NBTTagCompound();
+			tree.writeToNBT(tag);
+			item.setTagCompound(tag);
+			prod.add(item);
+		}
+		else
+		{
+			boolean hasMate = tree.getMate() != null;
+			for (ITree s : getSaplings(tree, world, x, y, z, modifier))
+				if (s != null) {
+					if ((hasMate && !s.isGeneticEqual(tree)) || rand.nextInt(32) == 0)
+						if (rand.nextBoolean())
+							prod.add(root.getMemberStack(s, EnumGermlingType.POLLEN.ordinal()));
+
+					prod.add(root.getMemberStack(s, EnumGermlingType.SAPLING.ordinal()));
+				}
+
+			getFruits(world, x, y, z, tree, prod);
+		}
+
+		return prod;
+	}
+
+	
+	private static ITree[] getSaplings(ITree tree, World world, int x, int y, int z, float modifier) {
+		return tree.getSaplings(world, null, x, y, z, modifier);
+	}
+
+	@Override // FRUIT PICKER
+	public List<ItemStack> getDrops(World world, Random rand, int x, int y, int z)
+	{
+		ITree tree = getTree(world, x, y, z);
+		if (tree == null)
+			return null;
+
+		ArrayList<ItemStack> prod = new ArrayList<ItemStack>();
+		getFruits(world, x, y, z, tree, prod);
+		return prod;
+	}
+
+	private ITree getTree(World world, int x, int y, int z)
+	{
+		TileEntity te = world.getTileEntity(x, y, z);
+		if (te instanceof IPollinatable) {
+			IIndividual t = ((IPollinatable)te).getPollen();
+			if (t instanceof ITree)
+				return (ITree)t;
+		}
+		return null;
+	}
+
+	private void getFruits(World world, int x, int y, int z, ITree tree, ArrayList<ItemStack> prod)
+	{
+		TileEntity te = world.getTileEntity(x, y, z);
+		if (te instanceof IFruitBearer)
+		{
+			IFruitBearer fruit = (IFruitBearer)te;
+			if (fruit.hasFruit())
+			{
+				//int period = tree.getGenome().getFruitProvider().getRipeningPeriod();
+				//ItemStack[] o = tree.produceStacks(world, x, y, z, (int)(fruit.getRipeness() * period + 0.1f));
+				prod.addAll(fruit.pickFruit(null));
+			}
+		}
+	}
+
+	@Override
+	public void postPick(World world, int x, int y, int z)
+	{
+		TileEntity te = world.getTileEntity(x, y, z);
+		if (te instanceof IFruitBearer)
+		{
+			IFruitBearer fruit = (IFruitBearer)te;
+			fruit.addRipeness(-fruit.getRipeness());
+		}
+	}
+}
diff --git a/src/Java/gtPlusPlus/xmod/forestry/tr