Merge pull request #551 from grundyboy34/patch-1

Updated RitualEffectGrowth to support non-standard farms

build.gradle

@@ -43,6 +43,10 @@ repositories {
     maven {
     	name 'TehNut Repo'
     	url 'http://tehnut.info/maven/'
+    }
+    maven {
+        name 'tterrag Repo'
+        url 'http://maven.tterrag.com/'
     }
 	ivy {
 		name "MineTweaker3"
@@ -54,9 +58,10 @@ dependencies {
     compile "codechicken:CodeChickenLib:" + config.mc_version + "-" + config.cclib_version + ":dev"
     compile "codechicken:CodeChickenCore:" + config.mc_version + "-" + config.ccc_version + ":dev"
     compile "codechicken:NotEnoughItems:" + config.mc_version + "-" + config.nei_version + ":dev"
-//	compile name: 'MineTweaker3', version: config.minetweaker_version, ext: 'jar'
-//	compile "codechicken:ForgeMultipart:1.7.10-1.1.0.314:dev"
-//	compile "info.amerifrance.guideapi:Guide-API:" + config.mc_version + "-" + config.guideapi_version + ":deobf"
+	compile name: 'MineTweaker3', version: config.minetweaker_version, ext: 'jar'
+	compile "codechicken:ForgeMultipart:1.7.10-1.1.0.314:dev"
+	compile "info.amerifrance.guideapi:Guide-API:" + config.mc_version + "-" + config.guideapi_version + ":deobf"
+    compile "team.chisel:Chisel:" + config.chisel_version + ":api"
 }
 
 minecraft {

build.properties

@@ -1,12 +1,15 @@
+#
+#Sat Oct 31 15:59:09 EDT 2015
 mod_name=BloodMagic
-forge_version=11.14.3.1499
-cclib_version=1.1.2.133
-ccc_version=1.0.5.36
-nei_version=1.0.5.104
+forge_version=10.13.4.1492-1.7.10
+ccc_version=1.0.7.47
+cclib_version=1.1.3.138
+nei_version=1.0.5.111
 //=Dependency Information
-guideapi_version=1.0.1-20
 package_group=com.wayoftime.bloodmagic
+guideapi_version=1.0.1-20
 mod_version=1.3.3
 minetweaker_version=Dev-1.7.10-3.0.9B
-build_number=12
-mc_version=1.8
+chisel_version=2.9.2.8
+build_number=16
+mc_version=1.7.10

src/api/java/forestry/api/apiculture/BeeManager.java

@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import net.minecraft.item.ItemStack;
+/**
+ * 
+ * Some miscellaneous lists and settings for bees.
+ * 
+ * @author SirSengir
+ */
+public class BeeManager {
+
+	/**
+	 * 0 - Common Village Bees 1 - Uncommon Village Bees (20 % of spawns)
+	 */
+	public static ArrayList<IBeeGenome>[] villageBees;
+
+	/**
+	 * List of items that can induce swarming. Integer denotes x in 1000 chance.
+	 */
+	public static HashMap<ItemStack, Integer> inducers = new HashMap<ItemStack, Integer>();
+
+	/**
+	 * Convenient access to AlleleManager.alleleRegistry.getSpeciesRoot("rootBees")
+	 */
+	public static IBeeRoot beeRoot;
+
+	/**
+	 * Used to create new bees.
+	 */
+	public static IBeeFactory beeFactory;
+
+	/**
+	 * Used to create new bee mutations.
+	 */
+	public static IBeeMutationFactory beeMutationFactory;
+
+	/**
+	 * Used to get Forestry's jubilance implementations.
+	 */
+	public static IJubilanceFactory jubilanceFactory;
+}

src/api/java/forestry/api/apiculture/EnumBeeChromosome.java

@@ -0,0 +1,102 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IAlleleArea;
+import forestry.api.genetics.IAlleleBoolean;
+import forestry.api.genetics.IAlleleFloat;
+import forestry.api.genetics.IAlleleFlowers;
+import forestry.api.genetics.IAlleleInteger;
+import forestry.api.genetics.IAlleleTolerance;
+import forestry.api.genetics.IChromosomeType;
+import forestry.api.genetics.ISpeciesRoot;
+
+/**
+ * Enum representing the order of chromosomes in a bee's genome and what they control.
+ * 
+ * @author SirSengir
+ */
+public enum EnumBeeChromosome implements IChromosomeType {
+	/**
+	 * Species of the bee. Alleles here must implement {@link IAlleleBeeSpecies}.
+	 */
+	SPECIES(IAlleleBeeSpecies.class),
+	/**
+	 * (Production) Speed of the bee.
+	 */
+	SPEED(IAlleleFloat.class),
+	/**
+	 * Lifespan of the bee.
+	 */
+	LIFESPAN(IAlleleInteger.class),
+	/**
+	 * Fertility of the bee. Determines number of offspring.
+	 */
+	FERTILITY(IAlleleInteger.class),
+	/**
+	 * Temperature difference to its native supported one the bee can tolerate.
+	 */
+	TEMPERATURE_TOLERANCE(IAlleleTolerance.class),
+	/**
+	 * Slightly incorrectly named. If true, a naturally dirunal bee can work during the night. If true, a naturally nocturnal bee can work during the day.
+	 */
+	NOCTURNAL(IAlleleBoolean.class),
+	/**
+	 * Not used / superseded by fixed values for the species. Probably going to be replaced with a boolean for FIRE_RESIST.
+	 */
+	@Deprecated
+	HUMIDITY(IAllele.class),
+	/**
+	 * Humidity difference to its native supported one the bee can tolerate.
+	 */
+	HUMIDITY_TOLERANCE(IAlleleTolerance.class),
+	/**
+	 * If true the bee can work during rain.
+	 */
+	TOLERANT_FLYER(IAlleleBoolean.class),
+	/**
+	 * If true, the bee can work without a clear view of the sky.
+	 */
+	CAVE_DWELLING(IAlleleBoolean.class),
+	/**
+	 * Contains the supported flower provider.
+	 */
+	FLOWER_PROVIDER(IAlleleFlowers.class),
+	/**
+	 * Determines pollination speed.
+	 */
+	FLOWERING(IAlleleInteger.class),
+	/**
+	 * Determines the size of the bee's territory.
+	 */
+	TERRITORY(IAlleleArea.class),
+	/**
+	 * Determines the bee's effect.
+	 */
+	EFFECT(IAlleleBeeEffect.class);
+	
+	Class<? extends IAllele> clss;
+	
+	EnumBeeChromosome(Class<? extends IAllele> clss) {
+		this.clss = clss;
+	}
+
+	@Override
+	public Class<? extends IAllele> getAlleleClass() {
+		return clss;
+	}
+
+	@Override
+	public String getName() {
+		return this.toString().toLowerCase();
+	}
+
+	@Override
+	public ISpeciesRoot getSpeciesRoot() {
+		return BeeManager.beeRoot;
+	}
+}

src/api/java/forestry/api/apiculture/EnumBeeType.java

@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import java.util.Locale;
+
+public enum EnumBeeType {
+	DRONE, PRINCESS, QUEEN, LARVAE, NONE;
+
+	public static final EnumBeeType[] VALUES = values();
+
+	String name;
+
+	private EnumBeeType() {
+		this.name = this.toString().toLowerCase(Locale.ENGLISH);
+	}
+
+	public String getName() {
+		return name;
+	}
+}

src/api/java/forestry/api/apiculture/FlowerManager.java

@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import java.util.ArrayList;
+
+import net.minecraft.item.ItemStack;
+
+import forestry.api.genetics.IFlowerProvider;
+import forestry.api.genetics.IFlowerRegistry;
+
+public class FlowerManager {
+	/**
+	 * ItemStacks representing simple flower blocks. Meta-sensitive, processed by the basic {@link IFlowerProvider}.
+	 * 
+	 * @deprecated since Forestry 3.4. Use {@link #IFlowerRegistry.registerPlantableFlower(ItemStack flower, double weight, String... flowerTypes)} instead.
+	 * <blockquote><pre>e.g. FlowerManager.flowerRegister.registerPlantableFlower(new ItemStack(Blocks.red_flower), 1.0, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);</pre></blockquote>
+	 */
+	@Deprecated
+	public static ArrayList<ItemStack> plainFlowers = new ArrayList<ItemStack>();
+	
+	/** 
+	 * <blockquote><pre>e.g. FlowerManager.flowerRegister.registerPlantableFlower(new ItemStack(Blocks.red_flower), 1.0, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);</pre></blockquote>
+	 */
+	public static IFlowerRegistry flowerRegistry;
+
+	public static final String FlowerTypeVanilla = "flowersVanilla";
+	public static final String FlowerTypeNether = "flowersNether";
+	public static final String FlowerTypeCacti = "flowersCacti";
+	public static final String FlowerTypeMushrooms = "flowersMushrooms";
+	public static final String FlowerTypeEnd = "flowersEnd";
+	public static final String FlowerTypeJungle = "flowersJungle";
+	public static final String FlowerTypeSnow = "flowersSnow";
+	public static final String FlowerTypeWheat = "flowersWheat";
+	public static final String FlowerTypeGourd = "flowersGourd";
+}

src/api/java/forestry/api/apiculture/IAlleleBeeEffect.java

@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.genetics.IAlleleEffect;
+import forestry.api.genetics.IEffectData;
+
+public interface IAlleleBeeEffect extends IAlleleEffect {
+	
+	/**
+	 * Called by apiaries to cause an effect in the world.
+	 * 
+	 * @param genome
+	 *            Genome of the bee queen causing this effect
+	 * @param storedData
+	 *            Object containing the stored effect data for the apiary/hive the bee is in.
+	 * @param housing {@link IBeeHousing} the bee currently resides in.
+	 * @return storedData, may have been manipulated.
+	 */
+	IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
+
+	/**
+	 * Is called to produce bee effects.
+	 * 
+	 * @param genome
+	 * @param storedData
+	 *            Object containing the stored effect data for the apiary/hive the bee is in.
+	 * @param housing {@link IBeeHousing} the bee currently resides in.
+	 * @return storedData, may have been manipulated.
+	 */
+	IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
+	
+}

src/api/java/forestry/api/apiculture/IAlleleBeeSpecies.java

@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import java.util.Map;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import forestry.api.genetics.IAlleleSpecies;
+
+public interface IAlleleBeeSpecies extends IAlleleSpecies {
+
+	/**
+	 * @return the IBeeRoot
+	 */
+	IBeeRoot getRoot();
+
+	/**
+	 * @return true if this species is only active at night.
+	 */
+	boolean isNocturnal();
+
+	/**
+	 * @return Map of possible products with the chance for drop each bee cycle. (0 - 1]
+	 */
+	Map<ItemStack, Float> getProductChances();
+
+	/**
+	 * @return Map of possible specialities with the chance for drop each bee cycle. (0 - 1]
+	 */
+	Map<ItemStack, Float> getSpecialtyChances();
+
+	/**
+	 * Only jubilant bees produce specialities.
+	 * @return true if the bee is jubilant, false otherwise.
+	 */
+	boolean isJubilant(IBeeGenome genome, IBeeHousing housing);
+
+	@SideOnly(Side.CLIENT)
+	IIcon getIcon(EnumBeeType type, int renderPass);
+
+	/**
+	 * @deprecated since Forestry 3.6.
+	 * @return Path of the texture to use for entity rendering.
+	 */
+	@Deprecated
+	String getEntityTexture();
+
+	/**
+	 * @deprecated Since Forestry 3.6 use getProductChances()
+	 * @return Map of possible products with the chance for drop each bee cycle. (0 - 100)
+	 */
+	@Deprecated
+	Map<ItemStack, Integer> getProducts();
+
+	/**
+	 * @deprecated Since Forestry 3.6 use getSpecialtyChances()
+	 * @return Map of possible specialities with the chance for drop each bee cycle. (0 - 100)
+	 */
+	@Deprecated
+	Map<ItemStack, Integer> getSpecialty();
+}

src/api/java/forestry/api/apiculture/IAlleleBeeSpeciesCustom.java

@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import net.minecraft.item.ItemStack;
+
+import forestry.api.genetics.IAlleleSpeciesCustom;
+
+public interface IAlleleBeeSpeciesCustom extends IAlleleBeeSpecies, IAlleleSpeciesCustom {
+
+	/**
+	 * Add a product for this bee species.
+	 * Chance is between 0 and 1.
+	 */
+	IAlleleBeeSpeciesCustom addProduct(ItemStack product, Float chance);
+
+	/**
+	 * Add a specialty product for this bee species.
+	 * Bees only produce their specialty when they are Jubilant (see IJubilanceProvider)
+	 * Chance is between 0 and 1.
+	 */
+	IAlleleBeeSpeciesCustom addSpecialty(ItemStack specialty, Float chance);
+
+	/**
+	 * Set the Jubilance Provider for this bee species.
+	 * Bees only produce their specialty when they are Jubilant (see IJubilanceProvider)
+	 */
+	IAlleleBeeSpeciesCustom setJubilanceProvider(IJubilanceProvider provider);
+
+	/**
+	 * Make this species only active at night.
+	 */
+	IAlleleBeeSpeciesCustom setNocturnal();
+
+	/** Use this if you have custom icons for bees. */
+	IAlleleBeeSpeciesCustom setCustomBeeIconProvider(IBeeIconProvider beeIconProvider);
+}

src/api/java/forestry/api/apiculture/IAlvearyComponent.java

@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.core.ITileStructure;
+
+/**
+ * Needs to be implemented by TileEntities that want to be part of an alveary.
+ */
+public interface IAlvearyComponent extends ITileStructure {
+
+	void registerBeeModifier(IBeeModifier modifier);
+
+	void removeBeeModifier(IBeeModifier modifier);
+
+	void registerBeeListener(IBeeListener event);
+
+	void removeBeeListener(IBeeListener event);
+
+	void addTemperatureChange(float change, float boundaryDown, float boundaryUp);
+
+	void addHumidityChange(float change, float boundaryDown, float boundaryUp);
+
+	/**
+	 * @return true if this TE has a function other than a plain alveary block. Returning true prevents the TE from becoming master.
+	 */
+	boolean hasFunction();
+
+}

src/api/java/forestry/api/apiculture/IApiaristTracker.java

@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.genetics.IBreedingTracker;
+import forestry.api.genetics.IIndividual;
+
+/**
+ * Can be used to garner information on bee breeding. See {@link forestry.api.genetics.ISpeciesRoot} for retrieval functions.
+ * 
+ * @author SirSengir
+ */
+public interface IApiaristTracker extends IBreedingTracker {
+
+	/**
+	 * Register the birth of a queen. Will mark species as discovered.
+	 * 
+	 * @param queen
+	 *            Created queen.
+	 */
+	void registerQueen(IIndividual queen);
+
+	/**
+	 * @return Amount of queens bred with this tracker.
+	 */
+	int getQueenCount();
+
+	/**
+	 * Register the birth of a princess. Will mark species as discovered.
+	 * 
+	 * @param princess
+	 *            Created princess.
+	 */
+	void registerPrincess(IIndividual princess);
+
+	/**
+	 * @return Amount of princesses bred with this tracker.
+	 */
+	int getPrincessCount();
+
+	/**
+	 * Register the birth of a drone. Will mark species as discovered.
+	 * 
+	 * @param drone
+	 *            Created drone.
+	 */
+	void registerDrone(IIndividual drone);
+
+	/**
+	 * @return Amount of drones bred with this tracker.
+	 */
+	int getDroneCount();
+
+}

src/api/java/forestry/api/apiculture/IArmorApiarist.java

@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+/**
+ * When implemented by armor piece items, allows them to act as apiarist's armor.
+ */
+public interface IArmorApiarist {
+	/**
+	 * Called when the apiarist's armor acts as protection against an attack.
+	 * 
+	 * @param player
+	 *            Player being attacked
+	 * @param armor
+	 *            Armor item
+	 * @param cause
+	 *            Optional cause of attack, such as a bee effect identifier
+	 * @param doProtect
+	 *            Whether or not to actually do the side effects of protection
+	 * @return Whether or not the armor should protect the player from that attack
+	 */
+	public boolean protectPlayer(EntityPlayer player, ItemStack armor, String cause, boolean doProtect);
+}

src/api/java/forestry/api/apiculture/IBee.java

@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import java.util.ArrayList;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.biome.BiomeGenBase;
+
+import forestry.api.core.IErrorState;
+import forestry.api.genetics.IEffectData;
+import forestry.api.genetics.IIndividual;
+import forestry.api.genetics.IIndividualLiving;
+
+/**
+ * Other implementations than Forestry's default one are not supported.
+ * 
+ * @author SirSengir
+ */
+public interface IBee extends IIndividualLiving {
+
+	/**
+	 * @return Bee's genetic information.
+	 */
+	IBeeGenome getGenome();
+
+	/**
+	 * @return Genetic information of the bee's mate, null if unmated.
+	 */
+	IBeeGenome getMate();
+
+	/**
+	 * @return true if the individual is originally of natural origin.
+	 */
+	boolean isNatural();
+
+	/**
+	 * @return generation this individual is removed from the original individual.
+	 */
+	int getGeneration();
+
+	/**
+	 * Set the natural flag on this bee.
+	 * @param flag
+	 */
+	void setIsNatural(boolean flag);
+
+	IEffectData[] doEffect(IEffectData[] storedData, IBeeHousing housing);
+
+	IEffectData[] doFX(IEffectData[] storedData, IBeeHousing housing);
+
+	/**
+	 * @return true if the bee may spawn offspring
+	 */
+	boolean canSpawn();
+
+	/**
+	 * Determines whether the queen can work.
+	 *
+	 * @param housing the {@link IBeeHousing} the bee currently resides in.
+	 * @return the error code encountered.
+	 */
+	IErrorState canWork(IBeeHousing housing);
+
+	boolean hasFlower(IBeeHousing housing);
+
+	ArrayList<BiomeGenBase> getSuitableBiomes();
+
+	ItemStack[] getProduceList();
+
+	ItemStack[] getSpecialtyList();
+
+	ItemStack[] produceStacks(IBeeHousing housing);
+
+	IBee spawnPrincess(IBeeHousing housing);
+
+	IBee[] spawnDrones(IBeeHousing housing);
+
+	void plantFlowerRandom(IBeeHousing housing);
+
+	IIndividual retrievePollen(IBeeHousing housing);
+
+	boolean pollinateRandom(IBeeHousing housing, IIndividual pollen);
+
+}

src/api/java/forestry/api/apiculture/IBeeFactory.java

@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.genetics.IClassification;
+
+public interface IBeeFactory {
+
+	/**
+	 * Creates a new bee species.
+	 * Automatically registered with AlleleManager.alleleRegistry.registerAllele()
+	 * See IAlleleBeeSpeciesCustom and IAlleleSpeciesCustom for adding additional properties to the returned species.
+	 *
+	 * @param uid Unique Identifier for this species
+	 * @param dominant Whether this species is genetically dominant (false means it is recessive)
+	 * @param authority Authority for the binomial name, e.g. "Sengir" on species of base Forestry.
+	 * @param unlocalizedName Unlocalized name for this species
+	 * @param unlocalizedDescription Unlocalized description for this species
+	 * @param branch Classification of this species
+	 * @param binomial Binomial name of the species sans genus ("Apis"). "humboldti" will have the bee species flavour name be "Apis humboldti". Feel free to use fun names or null.
+	 * @param primaryColor The outline color of this species
+	 * @param secondaryColor The body color of this species
+	 * @return a new bee species allele.
+	 */
+	IAlleleBeeSpeciesCustom createSpecies(String uid, boolean dominant, String authority, String unlocalizedName, String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor);
+
+	/**
+	 * Creates a new bee branch.
+	 * Must be registered with AlleleManager.alleleRegistry.getClassification("family.apidae").addMemberGroup();
+	 *
+	 * @param uid Unique Identifier for this branch
+	 * @param scientific approximates a "genus" in real life. Real life examples: "Micrapis", "Megapis"
+	 * @return a new bee branch
+	 */
+	IClassification createBranch(String uid, String scientific);
+}

src/api/java/forestry/api/apiculture/IBeeGenome.java

@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.genetics.EnumTolerance;
+import forestry.api.genetics.IFlowerProvider;
+import forestry.api.genetics.IGenome;
+
+/**
+ * Only the default implementation is supported.
+ * 
+ * @author SirSengir
+ * 
+ */
+public interface IBeeGenome extends IGenome {
+
+	IAlleleBeeSpecies getPrimary();
+	
+	IAlleleBeeSpecies getSecondary();
+
+	float getSpeed();
+
+	int getLifespan();
+
+	int getFertility();
+
+	EnumTolerance getToleranceTemp();
+
+	EnumTolerance getToleranceHumid();
+
+	boolean getNocturnal();
+
+	boolean getTolerantFlyer();
+
+	boolean getCaveDwelling();
+
+	IFlowerProvider getFlowerProvider();
+
+	int getFlowering();
+
+	int[] getTerritory();
+
+	IAlleleBeeEffect getEffect();
+
+}

src/api/java/forestry/api/apiculture/IBeeHousing.java

@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import net.minecraft.item.ItemStack;
+
+import forestry.api.genetics.IHousing;
+
+public interface IBeeHousing extends IBeeModifier, IBeeListener, IHousing {
+
+	ItemStack getQueen();
+
+	ItemStack getDrone();
+
+	void setQueen(ItemStack itemstack);
+
+	void setDrone(ItemStack itemstack);
+
+	/**
+	 * @return true if princesses and drones can (currently) mate in this housing to generate queens.
+	 */
+	boolean canBreed();
+
+}

src/api/java/forestry/api/apiculture/IBeeIconProvider.java

@@ -0,0 +1,14 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+public interface IBeeIconProvider {
+	void registerIcons(IIconRegister register);
+	IIcon getIcon(EnumBeeType type, int renderPass);
+}

src/api/java/forestry/api/apiculture/IBeeListener.java

@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import net.minecraft.item.ItemStack;
+
+import forestry.api.genetics.IIndividual;
+
+public interface IBeeListener {
+
+	/**
+	 * Called on queen update.
+	 * 
+	 * @param queen
+	 */
+	void onQueenChange(ItemStack queen);
+
+	/**
+	 * Called when the bees wear out the housing's equipment.
+	 * 
+	 * @param amount
+	 *            Integer indicating the amount worn out.
+	 */
+	void wearOutEquipment(int amount);
+
+	/**
+	 * Called just before the children are generated, and the queen removed.
+	 * 
+	 * @param queen
+	 */
+	void onQueenDeath(IBee queen);
+
+	/**
+	 * Called after the children have been spawned, but before the queen appears
+	 * 
+	 * @param queen
+	 */
+	void onPostQueenDeath(IBee queen);
+
+	boolean onPollenRetrieved(IBee queen, IIndividual pollen, boolean isHandled);
+	
+	boolean onEggLaid(IBee queen);
+}

src/api/java/forestry/api/apiculture/IBeeModifier.java

@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+public interface IBeeModifier {
+
+	/**
+	 * @param genome Genome of the bee this modifier is called for.
+	 * @param currentModifier Current modifier.
+	 * @return Float used to modify the base territory.
+	 */
+	float getTerritoryModifier(IBeeGenome genome, float currentModifier);
+
+	/**
+	 * @param genome Genome of the bee this modifier is called for.
+	 * @param mate
+	 * @param currentModifier Current modifier.
+	 * @return Float used to modify the base mutation chance.
+	 */
+	float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
+
+	/**
+	 * @param genome Genome of the bee this modifier is called for.
+	 * @param currentModifier Current modifier.
+	 * @return Float used to modify the life span of queens.
+	 */
+	float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
+
+	/**
+	 * @param genome Genome of the bee this modifier is called for.
+	 * @param currentModifier Current modifier.
+	 * @return Float modifying the production speed of queens.
+	 */
+	float getProductionModifier(IBeeGenome genome, float currentModifier);
+
+	/**
+	 * @param genome Genome of the bee this modifier is called for.
+	 * @return Float modifying the flowering of queens.
+	 */
+	float getFloweringModifier(IBeeGenome genome, float currentModifier);
+
+	/**
+	 * @param genome Genome of the bee this modifier is called for.
+	 * @return Float modifying the chance for a swarmer queen to die off.
+	 */
+	float getGeneticDecay(IBeeGenome genome, float currentModifier);
+	
+	/**
+	 * @return Boolean indicating if housing can ignore rain
+	 */
+	boolean isSealed();
+
+	/**
+	 * @return Boolean indicating if housing can ignore darkness/night
+	 */
+	boolean isSelfLighted();
+
+	/**
+	 * @return Boolean indicating if housing can ignore not seeing the sky
+	 */
+	boolean isSunlightSimulated();
+
+	/**
+	 * @return Boolean indicating whether this housing simulates the nether
+	 */
+	boolean isHellish();
+
+}

src/api/java/forestry/api/apiculture/IBeeMutation.java

@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IGenome;
+import forestry.api.genetics.IMutation;
+
+public interface IBeeMutation extends IMutation {
+	
+	IBeeRoot getRoot();
+	
+	/**
+	 * @param housing
+	 * @param allele0
+	 * @param allele1
+	 * @param genome0
+	 * @param genome1
+	 * @return float representing the chance for mutation to occur. note that this is 0 - 100 based, since it was an integer previously!
+	 * @deprecated since Forestry 3.6, use the IAlleleBeeSpecies / IBeeGenome version
+	 */
+	@Deprecated
+	float getChance(IBeeHousing housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1);
+
+	float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, IBeeGenome genome0, IBeeGenome genome1);
+}

src/api/java/forestry/api/apiculture/IBeeMutationCustom.java

@@ -0,0 +1,12 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.genetics.IMutationCustom;
+
+public interface IBeeMutationCustom extends IBeeMutation, IMutationCustom {
+
+}

src/api/java/forestry/api/apiculture/IBeeMutationFactory.java

@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.genetics.IAllele;
+
+public interface IBeeMutationFactory {
+	/**
+	 * Creates a new bee mutation.
+	 * Automatically registered with BeeManager.beeRoot.registerMutation()
+	 * See IBeeMutationCustom and IMutationCustom for adding additional properties to the returned mutation.
+	 *
+	 * @param parentBee0 A parent bee for this mutation
+	 * @param parentBee1 A parent bee for this mutation
+	 * @param result The resulting alleles for this mutation
+	 * @param chance The chance that breeding the two parent bees will result in this mutation
+	 * @return a new bee mutation.
+	 */
+	IBeeMutationCustom createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance);
+}

src/api/java/forestry/api/apiculture/IBeeRoot.java

@@ -0,0 +1,128 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
+import com.mojang.authlib.GameProfile;
+
+import forestry.api.core.IStructureLogic;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.ISpeciesRoot;
+
+public interface IBeeRoot extends ISpeciesRoot {
+
+	/**
+	 * @return true if passed item is a Forestry bee. Equal to getType(ItemStack stack) != EnumBeeType.NONE
+	 */
+	@Override
+	boolean isMember(ItemStack stack);
+
+	/**
+	 * @return {@link IBee} pattern parsed from the passed stack's nbt data.
+	 */
+	@Override
+	IBee getMember(ItemStack stack);
+
+	@Override
+	IBee getMember(NBTTagCompound compound);
+
+	/* GENOME CONVERSION */
+	@Override
+	IBee templateAsIndividual(IAllele[] template);
+
+	@Override
+	IBee templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive);
+
+	@Override
+	IBeeGenome templateAsGenome(IAllele[] template);
+
+	@Override
+	IBeeGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
+
+	/* BREEDING TRACKER */
+	/**
+	 * @param world
+	 * @return {@link IApiaristTracker} associated with the passed world.
+	 */
+	IApiaristTracker getBreedingTracker(World world, GameProfile player);
+
+	/* BEE SPECIFIC */
+	/**
+	 * @return type of bee encoded on the itemstack. EnumBeeType.NONE if it isn't a bee.
+	 */
+	EnumBeeType getType(ItemStack stack);
+
+	/**
+	 * @return true if passed item is a drone. Equal to getType(ItemStack stack) == EnumBeeType.DRONE
+	 */
+	boolean isDrone(ItemStack stack);
+
+	/**
+	 * @return true if passed item is mated (i.e. a queen)
+	 */
+	boolean isMated(ItemStack stack);
+
+	/**
+	 * @param genome
+	 *            Valid {@link IBeeGenome}
+	 * @return {@link IBee} from the passed genome
+	 */
+	IBee getBee(World world, IBeeGenome genome);
+
+	/**
+	 * Creates an IBee suitable for a queen containing the necessary second genome for the mate.
+	 * 
+	 * @param genome
+	 *            Valid {@link IBeeGenome}
+	 * @param mate
+	 *            Valid {@link IBee} representing the mate.
+	 * @return Mated {@link IBee} from the passed genomes.
+	 */
+	IBee getBee(World world, IBeeGenome genome, IBee mate);
+
+	/* TEMPLATES */
+	@Override
+	ArrayList<IBee> getIndividualTemplates();
+
+	/* MUTATIONS */
+	@Override
+	Collection<IBeeMutation> getMutations(boolean shuffle);
+
+	/* GAME MODE */
+	void resetBeekeepingMode();
+
+	ArrayList<IBeekeepingMode> getBeekeepingModes();
+
+	IBeekeepingMode getBeekeepingMode(World world);
+
+	IBeekeepingMode getBeekeepingMode(String name);
+
+	void registerBeekeepingMode(IBeekeepingMode mode);
+
+	void setBeekeepingMode(World world, String name);
+
+	/* MISC */
+	/**
+	 * @param housing
+	 *            Object implementing IBeeHousing.
+	 * @return IBeekeepingLogic
+	 */
+	IBeekeepingLogic createBeekeepingLogic(IBeeHousing housing);
+
+	/**
+	 * TileEntities wanting to function as alveary components need to implement structure logic for validation.
+	 * 
+	 * @return IStructureLogic for alvearies.
+	 */
+	IStructureLogic createAlvearyStructureLogic(IAlvearyComponent structure);
+
+}

src/api/java/forestry/api/apiculture/IBeekeepingLogic.java

@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.core.INBTTagable;
+import forestry.api.genetics.IEffectData;
+
+public interface IBeekeepingLogic extends INBTTagable {
+
+	/* STATE INFORMATION */
+	int getBreedingTime();
+
+	int getTotalBreedingTime();
+
+	IBee getQueen();
+
+	IBeeHousing getHousing();
+	
+	IEffectData[] getEffectData();
+
+	/* UPDATING */
+	void update();
+
+}

src/api/java/forestry/api/apiculture/IBeekeepingMode.java

@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import java.util.ArrayList;
+
+import net.minecraft.world.World;
+
+public interface IBeekeepingMode extends IBeeModifier {
+
+	/**
+	 * @return Localized name of this beekeeping mode.
+	 */
+	String getName();
+
+	/**
+	 * @return Localized list of strings outlining the behaviour of this beekeeping mode.
+	 */
+	ArrayList<String> getDescription();
+
+	/**
+	 * @return Float used to modify the wear on comb frames.
+	 */
+	float getWearModifier();
+
+	/**
+	 * @param queen
+	 * @return fertility taking into account the birthing queen and surroundings.
+	 */
+	int getFinalFertility(IBee queen, World world, int x, int y, int z);
+
+	/**
+	 * @param queen
+	 * @return true if the queen is genetically "fatigued" and should not be reproduced anymore.
+	 */
+	boolean isFatigued(IBee queen, IBeeHousing housing);
+
+	/**
+	 * @param queen
+	 * @param housing
+	 * @return true if the queen is being overworked in the bee housing (with chance). will trigger a negative effect.
+	 */
+	boolean isOverworked(IBee queen, IBeeHousing housing);
+
+	/**
+	 * 
+	 * @param queen
+	 * @param offspring
+	 * @param housing
+	 * @return true if the genetic structure of the queen is breaking down during spawning of the offspring (with chance). will trigger a negative effect.
+	 */
+	boolean isDegenerating(IBee queen, IBee offspring, IBeeHousing housing);
+
+	/**
+	 * @param queen
+	 * @return true if an offspring of this queen is considered a natural
+	 */
+	boolean isNaturalOffspring(IBee queen);
+
+	/**
+	 * @param queen
+	 * @return true if this mode allows the passed queen or princess to be multiplied
+	 */
+	boolean mayMultiplyPrincess(IBee queen);
+
+
+}

src/api/java/forestry/api/apiculture/IHiveDrop.java

@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import java.util.Collection;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+/**
+ * Bees can be seeded either as hive drops or as mutation results.
+ * 
+ * Add IHiveDrops with HiveManager.get___Hive.addDrop
+ * 
+ * @author SirSengir
+ */
+public interface IHiveDrop {
+
+	ItemStack getPrincess(World world, int x, int y, int z, int fortune);
+
+	Collection<ItemStack> getDrones(World world, int x, int y, int z, int fortune);
+
+	Collection<ItemStack> getAdditional(World world, int x, int y, int z, int fortune);
+
+	/**
+	 * Chance to drop. Default drops have 80 (= 80 %).
+	 * 
+	 * @param world Minecraft world this is called for.
+	 * @param x x-Coordinate of the broken hive.
+	 * @param y y-Coordinate of the broken hive.
+	 * @param z z-Coordinate of the broken hive.
+	 * @return Chance for drop as an integer of 0 - 100.
+	 */
+	int getChance(World world, int x, int y, int z);
+}

src/api/java/forestry/api/apiculture/IHiveFrame.java

@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import net.minecraft.item.ItemStack;
+
+public interface IHiveFrame extends IBeeModifier {
+
+	/**
+	 * Wears out a frame.
+	 * 
+	 * @param housing
+	 *            IBeeHousing the frame is contained in.
+	 * @param frame
+	 *            ItemStack containing the actual frame.
+	 * @param queen
+	 *            Current queen in the caller.
+	 * @param wear
+	 *            Integer denoting the amount worn out. The wear modifier of the current beekeeping mode has already been taken into account.
+	 * @return ItemStack containing the actual frame with adjusted damage.
+	 */
+	ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear);
+
+}

src/api/java/forestry/api/apiculture/IJubilanceFactory.java

@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import net.minecraft.block.Block;
+
+public interface IJubilanceFactory {
+	/** The default Jubilance Provider is satisfied when the humidity and temperature are ideal for the bee. */
+	IJubilanceProvider getDefault();
+
+	/** The Requires Resource Jubilance Provider is satisfied when a specific block is under the hive. */
+	IJubilanceProvider getRequiresResource(Block block, int meta);
+}

src/api/java/forestry/api/apiculture/IJubilanceProvider.java

@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+public interface IJubilanceProvider {
+
+	/**
+	 * Returns true when conditions are right to make this species Jubilant.
+	 * Jubilant bees can produce their Specialty products.
+	 */
+	boolean isJubilant(IAlleleBeeSpecies species, IBeeGenome genome, IBeeHousing housing);
+}

src/api/java/forestry/api/apiculture/hives/HiveManager.java

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture.hives;
+
+public class HiveManager {
+
+	public static IHiveRegistry hiveRegistry;
+	public static IHiveGenHelper genHelper;
+
+}

src/api/java/forestry/api/apiculture/hives/IHiveDescription.java

@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture.hives;
+
+import net.minecraft.block.Block;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+
+public interface IHiveDescription {
+
+	/**
+	 * The hive generator for this hive.
+	 */
+	IHiveGen getHiveGen();
+
+	/**
+	 * The hive block to be placed in the world.
+	 */
+	Block getBlock();
+	int getMeta();
+
+	/**
+	 * returns true if the hive can be generated in these conditions.
+	 * Used as a fast early-elimination check for hives that have no hope of spawning in the area.
+	 */
+	boolean isGoodBiome(BiomeGenBase biome);
+	boolean isGoodHumidity(EnumHumidity humidity);
+	boolean isGoodTemperature(EnumTemperature temperature);
+
+	/**
+	 * float representing the relative chance a hive will generate in a chunk.
+	 * Default is 1.0, higher numbers result in more hives, smaller will result in fewer.
+	 * Tree hives want around 3.0 to 4.0 since there are less locations to generate on.
+ 	 */
+	float getGenChance();
+
+	/**
+	 * Called after successful hive generation.
+	 * world, x, y, z give the location of the new hive.
+	 **/
+	void postGen(World world, int x, int y, int z);
+}

src/api/java/forestry/api/apiculture/hives/IHiveGen.java

@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture.hives;
+
+import net.minecraft.world.World;
+
+public interface IHiveGen {
+
+	/**
+	 * return a Y value that the hive should try to generate at.
+	 * returns negative if the hive can't be placed anywhere.
+	 */
+	int getYForHive(World world, int x, int z);
+
+	/**
+	 * returns true if the hive can be generated at this location.
+	 * Used for advanced conditions, like checking that the ground below the hive is a certain type.
+	 */
+	boolean isValidLocation(World world, int x, int y, int z);
+
+	/**
+	 * returns true if the hive can safely replace the block at this location.
+	 */
+	boolean canReplace(World world, int x, int y, int z);
+
+}

src/api/java/forestry/api/apiculture/hives/IHiveGenHelper.java

@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture.hives;
+
+import net.minecraft.block.Block;
+
+public interface IHiveGenHelper {
+
+	/**
+	 * Returns a hiveGen for a hive that spawns on the ground.
+	 * validGroundBlocks specifies which block materials it can spawn on.
+	 */
+	IHiveGen ground(Block... validGroundBlocks);
+
+	/**
+	 * Returns a hiveGen for a hive that spawns in trees.
+	 */
+	IHiveGen tree();
+
+}

src/api/java/forestry/api/apiculture/hives/IHiveRegistry.java

@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture.hives;
+
+import java.util.List;
+
+import forestry.api.apiculture.IHiveDrop;
+
+public interface IHiveRegistry {
+
+	/* Forestry Hive Names */
+	public static final String forest = "Forestry:forest";
+	public static final String meadows = "Forestry:meadows";
+	public static final String desert = "Forestry:desert";
+	public static final String jungle = "Forestry:jungle";
+	public static final String end = "Forestry:end";
+	public static final String snow = "Forestry:snow";
+	public static final String swamp = "Forestry:swamp";
+
+	/**
+	 * Adds a new hive to be generated in the world.
+	 */
+	void registerHive(String hiveName, IHiveDescription hiveDescription);
+
+	/**
+	 * Add drops to a registered hive.
+	 */
+	void addDrops(String hiveName, IHiveDrop... drops);
+	void addDrops(String hiveName, List<IHiveDrop> drop);
+}

src/api/java/forestry/api/apiculture/hives/package-info.java

@@ -0,0 +1,8 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+@API(apiVersion="4.1.0", owner="ForestryAPI|apiculture", provides="ForestryAPI|hives")
+package forestry.api.apiculture.hives;
+import cpw.mods.fml.common.API;

src/api/java/forestry/api/apiculture/package-info.java

@@ -0,0 +1,8 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+@API(apiVersion="3.3.0", owner="ForestryAPI|core", provides="ForestryAPI|apiculture")
+package forestry.api.apiculture;
+import cpw.mods.fml.common.API;

src/api/java/forestry/api/arboriculture/EnumGermlingType.java

@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+public enum EnumGermlingType {
+	SAPLING("sapling"), BLOSSOM("blossom"), POLLEN("pollen"), GERMLING("germling"), NONE("none");
+
+	public static final EnumGermlingType[] VALUES = values();
+	
+	private final String name;
+
+	private EnumGermlingType(String name) {
+		this.name = name;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+}

src/api/java/forestry/api/arboriculture/EnumGrowthConditions.java

@@ -0,0 +1,10 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+public enum EnumGrowthConditions {
+	HOSTILE, PALTRY, NORMAL, GOOD, EXCELLENT
+}

src/api/java/forestry/api/arboriculture/EnumTreeChromosome.java

@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IAlleleArea;
+import forestry.api.genetics.IAlleleBoolean;
+import forestry.api.genetics.IAlleleFloat;
+import forestry.api.genetics.IAlleleInteger;
+import forestry.api.genetics.IAllelePlantType;
+import forestry.api.genetics.IChromosomeType;
+import forestry.api.genetics.IFruitFamily;
+import forestry.api.genetics.ISpeciesRoot;
+import net.minecraftforge.common.EnumPlantType;
+
+public enum EnumTreeChromosome implements IChromosomeType {
+
+	/**
+	 * Determines the following: - WorldGen, including the used wood blocks - {@link IFruitFamily}s supported. Limits which {@link IFruitProvider}
+	 * will actually yield fruit with this species. - Native {@link EnumPlantType} for this tree. Combines with the PLANT chromosome.
+	 */
+	SPECIES(IAlleleTreeSpecies.class),
+	/**
+	 * {@link IGrowthProvider}, determines conditions required by the tree to grow.
+	 */
+	GROWTH(IAlleleGrowth.class),
+	/**
+	 * A float modifying the height of the tree. Taken into account at worldgen.
+	 */
+	HEIGHT(IAlleleFloat.class),
+	/**
+	 * Chance for saplings.
+	 */
+	FERTILITY(IAlleleFloat.class),
+	/**
+	 * {@link IFruitProvider}, determines if and what fruits are grown on the tree. Limited by the {@link IFruitFamily}s the species supports.
+	 */
+	FRUITS(IAlleleFruit.class),
+	/**
+	 * Chance for fruit leaves and/or drops.
+	 */
+	YIELD(IAlleleFloat.class),
+	/**
+	 * May add additional tolerances for {@link EnumPlantTypes}.
+	 */
+	PLANT(IAllelePlantType.class),
+	/**
+	 * Determines the speed at which fruit will ripen on this tree.
+	 */
+	SAPPINESS(IAlleleFloat.class),
+	/**
+	 * Territory for leaf effects. Unused.
+	 */
+	TERRITORY(IAlleleArea.class),
+	/**
+	 * Leaf effect. Unused.
+	 */
+	EFFECT(IAlleleLeafEffect.class),
+	/**
+	 * Amount of random ticks which need to elapse before a sapling will grow into a tree.
+	 */
+	MATURATION(IAlleleInteger.class),
+
+	GIRTH(IAlleleInteger.class),
+	/**
+	 * Determines if the tree can burn.
+	 */
+	FIREPROOF(IAlleleBoolean.class),
+	;
+	
+	Class<? extends IAllele> clss;
+	
+	EnumTreeChromosome(Class<? extends IAllele> clss) {
+		this.clss = clss;
+	}
+
+	@Override
+	public Class<? extends IAllele> getAlleleClass() {
+		return clss;
+	}
+
+	@Override
+	public String getName() {
+		return this.toString().toLowerCase();
+	}
+
+	@Override
+	public ISpeciesRoot getSpeciesRoot() {
+		return AlleleManager.alleleRegistry.getSpeciesRoot("rootTrees");
+	}
+
+}

src/api/java/forestry/api/arboriculture/IAlleleFruit.java

@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import forestry.api.genetics.IAllele;
+
+/**
+ * Simple allele encapsulating an {@link IFruitProvider}.
+ */
+public interface IAlleleFruit extends IAllele {
+
+	IFruitProvider getProvider();
+
+}

src/api/java/forestry/api/arboriculture/IAlleleGrowth.java

@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import forestry.api.genetics.IAllele;
+
+/**
+ * Simple allele encapsulating an {@link IGrowthProvider}.
+ */
+public interface IAlleleGrowth extends IAllele {
+
+	IGrowthProvider getProvider();
+
+}

src/api/java/forestry/api/arboriculture/IAlleleLeafEffect.java

@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import net.minecraft.world.World;
+
+import forestry.api.genetics.IAlleleEffect;
+import forestry.api.genetics.IEffectData;
+
+/**
+ * Simple allele encapsulating a leaf effect. (Not implemented)
+ */
+public interface IAlleleLeafEffect extends IAlleleEffect {
+
+	IEffectData doEffect(ITreeGenome genome, IEffectData storedData, World world, int x, int y, int z);
+
+}

src/api/java/forestry/api/arboriculture/IAlleleTreeSpecies.java

@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import java.util.Collection;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraftforge.common.EnumPlantType;
+
+import forestry.api.genetics.IAlleleSpecies;
+import forestry.api.genetics.IFruitFamily;
+
+public interface IAlleleTreeSpecies extends IAlleleSpecies {
+
+	ITreeRoot getRoot();
+	
+	/**
+	 * @return Native plant type of this species.
+	 */
+	EnumPlantType getPlantType();
+
+	/**
+	 * @return List of all {@link IFruitFamily}s which can grow on leaves generated by this species.
+	 */
+	Collection<IFruitFamily> getSuitableFruit();
+
+	/**
+	 * @param tree
+	 * @param world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @return Tree generator for the tree at the given location.
+	 */
+	WorldGenerator getGenerator(ITree tree, World world, int x, int y, int z);
+
+	/**
+	 * @return All available generator classes for this species.
+	 */
+	Class<? extends WorldGenerator>[] getGeneratorClasses();
+
+	/* TEXTURES AND OVERRIDES */
+	int getLeafColour(ITree tree);
+
+	short getLeafIconIndex(ITree tree, boolean fancy);
+
+	@SideOnly(Side.CLIENT)
+	IIcon getGermlingIcon(EnumGermlingType type, int renderPass);
+	
+	@SideOnly(Side.CLIENT)
+	int getGermlingColour(EnumGermlingType type, int renderPass);
+	
+	/**
+	 * 
+	 * @return Array of ItemStacks representing logs that these tree produces, the first one being the primary one
+	 */
+	ItemStack[] getLogStacks();
+
+}

src/api/java/forestry/api/arboriculture/IArboristTracker.java

@@ -0,0 +1,12 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import forestry.api.genetics.IBreedingTracker;
+
+public interface IArboristTracker extends IBreedingTracker {
+
+}

src/api/java/forestry/api/arboriculture/IFruitProvider.java

@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import forestry.api.genetics.IFruitFamily;
+
+public interface IFruitProvider {
+
+	IFruitFamily getFamily();
+
+	int getColour(ITreeGenome genome, IBlockAccess world, int x, int y, int z, int ripeningTime);
+
+	boolean markAsFruitLeaf(ITreeGenome genome, World world, int x, int y, int z);
+
+	int getRipeningPeriod();
+
+	// / Products, Chance
+	ItemStack[] getProducts();
+
+	// / Specialty, Chance
+	ItemStack[] getSpecialty();
+
+	ItemStack[] getFruits(ITreeGenome genome, World world, int x, int y, int z, int ripeningTime);
+
+	/**
+	 * @return Short, human-readable identifier used in the treealyzer.
+	 */
+	String getDescription();
+
+	/* TEXTURE OVERLAY */
+	/**
+	 * @param genome
+	 * @param world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @param ripeningTime
+	 *            Elapsed ripening time for the fruit.
+	 * @param fancy
+	 * @return IIcon index of the texture to overlay on the leaf block.
+	 */
+	short getIconIndex(ITreeGenome genome, IBlockAccess world, int x, int y, int z, int ripeningTime, boolean fancy);
+
+	/**
+	 * @return true if this fruit provider requires fruit blocks to spawn, false otherwise.
+	 */
+	boolean requiresFruitBlocks();
+
+	/**
+	 * Tries to spawn a fruit block at the potential position when the tree generates.
+	 * 
+	 * @param genome
+	 * @param world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @return true if a fruit block was spawned, false otherwise.
+	 */
+	boolean trySpawnFruitBlock(ITreeGenome genome, World world, int x, int y, int z);
+
+	@SideOnly(Side.CLIENT)
+	void registerIcons(IIconRegister register);
+}

src/api/java/forestry/api/arboriculture/IGrowthProvider.java

@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import net.minecraft.world.World;
+
+public interface IGrowthProvider {
+
+	/**
+	 * Check to see whether a sapling at the given location with the given genome can grow into a tree.
+	 * 
+	 * @param genome Genome of the tree this is called for.
+	 * @param world Minecraft world the tree will inhabit.
+	 * @param xPos x-Coordinate to attempt growth at.
+	 * @param yPos y-Coordinate to attempt growth at.
+	 * @param zPos z-Coordinate to attempt growth at.
+	 * @param expectedGirth Trunk size of the tree to generate.
+	 * @param expectedHeight Height of the tree to generate.
+	 * @return true if the tree can grow at the given coordinates, false otherwise.
+	 */
+	boolean canGrow(ITreeGenome genome, World world, int xPos, int yPos, int zPos, int expectedGirth, int expectedHeight);
+
+	EnumGrowthConditions getGrowthConditions(ITreeGenome genome, World world, int xPos, int yPos, int zPos);
+
+	/**
+	 * @return Short, human-readable identifier used in the treealyzer.
+	 */
+	String getDescription();
+
+	/**
+	 * @return Detailed description of growth behaviour used in the treealyzer.
+	 */
+	String[] getInfo();
+
+}

src/api/java/forestry/api/arboriculture/ILeafTickHandler.java

@@ -0,0 +1,12 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import net.minecraft.world.World;
+
+public interface ILeafTickHandler {
+	boolean onRandomLeafTick(ITree tree, World world, int biomeId, int x, int y, int z, boolean isDestroyed);
+}

src/api/java/forestry/api/arboriculture/IToolGrafter.java

@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public interface IToolGrafter {
+	/**
+	 * Called by leaves to determine the increase in sapling droprate.
+	 * 
+	 * @param stack ItemStack containing the grafter.
+	 * @param world Minecraft world the player and the target block inhabit.
+	 * @param x x-Coordinate of the broken leaf block.
+	 * @param y y-Coordinate of the broken leaf block.
+	 * @param z z-Coordinate of the broken leaf block.
+	 * @return Float representing the factor the usual drop chance is to be multiplied by.
+	 */
+	float getSaplingModifier(ItemStack stack, World world, EntityPlayer player, int x, int y, int z);
+}

src/api/java/forestry/api/arboriculture/ITree.java

@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import java.util.EnumSet;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+import net.minecraftforge.common.EnumPlantType;
+
+import forestry.api.genetics.IEffectData;
+import forestry.api.genetics.IIndividual;
+import forestry.api.world.ITreeGenData;
+
+public interface ITree extends IIndividual, ITreeGenData {
+
+	void mate(ITree other);
+
+	IEffectData[] doEffect(IEffectData[] storedData, World world, int biomeid, int x, int y, int z);
+
+	IEffectData[] doFX(IEffectData[] storedData, World world, int biomeid, int x, int y, int z);
+
+	ITreeGenome getGenome();
+
+	ITreeGenome getMate();
+
+	EnumSet<EnumPlantType> getPlantTypes();
+
+	ITree[] getSaplings(World world, int x, int y, int z, float modifier);
+
+	ItemStack[] getProduceList();
+
+	ItemStack[] getSpecialtyList();
+
+	ItemStack[] produceStacks(World world, int x, int y, int z, int ripeningTime);
+
+	/**
+	 * 
+	 * @param world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @return Boolean indicating whether a sapling can stay planted at the given position.
+	 */
+	boolean canStay(World world, int x, int y, int z);
+
+	/**
+	 * 
+	 * @param world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @return Boolean indicating whether a sapling at the given position can grow into a tree.
+	 */
+	boolean canGrow(World world, int x, int y, int z, int expectedGirth, int expectedHeight);
+
+	/**
+	 * @return Integer denoting the maturity (block ticks) required for a sapling to attempt to grow into a tree.
+	 */
+	int getRequiredMaturity();
+
+	/**
+	 * @return Integer denoting how resilient leaf blocks are against adverse influences (i.e. caterpillars).
+	 */
+	int getResilience();
+	
+	/**
+	 * @param world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @return Integer denoting the size of the tree trunk.
+	 */
+	int getGirth(World world, int x, int y, int z);
+
+	
+	
+	/**
+	 * 
+	 * @param world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @return Growth conditions at the given position.
+	 */
+	EnumGrowthConditions getGrowthCondition(World world, int x, int y, int z);
+
+	WorldGenerator getTreeGenerator(World world, int x, int y, int z, boolean wasBonemealed);
+
+	ITree copy();
+
+	boolean isPureBred(EnumTreeChromosome chromosome);
+
+	boolean canBearFruit();
+}

src/api/java/forestry/api/arboriculture/ITreeGenome.java

@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import java.util.EnumSet;
+
+import net.minecraftforge.common.EnumPlantType;
+
+import forestry.api.genetics.IGenome;
+
+public interface ITreeGenome extends IGenome {
+
+	IAlleleTreeSpecies getPrimary();
+
+	IAlleleTreeSpecies getSecondary();
+
+	IFruitProvider getFruitProvider();
+
+	IGrowthProvider getGrowthProvider();
+
+	float getHeight();
+
+	float getFertility();
+
+	/**
+	 * @return Determines either a) how many fruit leaves there are or b) the chance for any fruit leave to drop a sapling. Exact usage determined by the
+	 *         IFruitProvider
+	 */
+	float getYield();
+
+	float getSappiness();
+
+	EnumSet<EnumPlantType> getPlantTypes();
+
+	/**
+	 * @return Amount of random block ticks required for a sapling to mature into a fully grown tree.
+	 */
+	int getMaturationTime();
+
+	int getGirth();
+
+	IAlleleLeafEffect getEffect();
+}

src/api/java/forestry/api/arboriculture/ITreeModifier.java

@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+public interface ITreeModifier {
+
+	/**
+	 * 
+	 * @param genome
+	 * @return Float used to modify the height.
+	 */
+	float getHeightModifier(ITreeGenome genome, float currentModifier);
+
+	/**
+	 * 
+	 * @param genome
+	 * @return Float used to modify the yield.
+	 */
+	float getYieldModifier(ITreeGenome genome, float currentModifier);
+
+	/**
+	 * 
+	 * @param genome
+	 * @return Float used to modify the sappiness.
+	 */
+	float getSappinessModifier(ITreeGenome genome, float currentModifier);
+
+	/**
+	 * 
+	 * @param genome
+	 * @return Float used to modify the maturation.
+	 */
+	float getMaturationModifier(ITreeGenome genome, float currentModifier);
+
+	/**
+	 * @param genome0
+	 * @param genome1
+	 * @return Float used to modify the base mutation chance.
+	 */
+	float getMutationModifier(ITreeGenome genome0, ITreeGenome genome1, float currentModifier);
+
+}

src/api/java/forestry/api/arboriculture/ITreeMutation.java

@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import net.minecraft.world.World;
+
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IGenome;
+import forestry.api.genetics.IMutation;
+import forestry.api.genetics.ISpeciesRoot;
+
+public interface ITreeMutation extends IMutation {
+	
+	/**
+	 * @return {@link ISpeciesRoot} this mutation is associated with.
+	 */
+	ITreeRoot getRoot();
+	
+	/**
+	 * @param world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @param allele0
+	 * @param allele1
+	 * @param genome0
+	 * @param genome1
+	 * @return float representing the chance for mutation to occur. note that this is 0 - 100 based, since it was an integer previously!
+	 */
+	float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1);
+}

src/api/java/forestry/api/arboriculture/ITreeRoot.java

@@ -0,0 +1,113 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
+import com.mojang.authlib.GameProfile;
+
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IChromosome;
+import forestry.api.genetics.IIndividual;
+import forestry.api.genetics.ISpeciesRoot;
+
+public interface ITreeRoot extends ISpeciesRoot {
+
+	@Override
+	boolean isMember(ItemStack itemstack);
+
+	@Override
+	ITree getMember(ItemStack itemstack);
+
+	@Override
+	ITree getMember(NBTTagCompound compound);
+
+	@Override
+	ITree templateAsIndividual(IAllele[] template);
+
+	@Override
+	ITree templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive);
+
+	@Override
+	ITreeGenome templateAsGenome(IAllele[] template);
+
+	@Override
+	ITreeGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
+
+	/**
+	 * @param world
+	 * @return {@link IArboristTracker} associated with the passed world.
+	 */
+	@Override
+	IArboristTracker getBreedingTracker(World world, GameProfile player);
+
+	/* TREE SPECIFIC */
+	/**
+	 * Register a leaf tick handler.
+	 * @param handler the {@link ILeafTickHandler} to register.
+	 */
+	void registerLeafTickHandler(ILeafTickHandler handler);
+
+	Collection<ILeafTickHandler> getLeafTickHandlers();
+
+	/**
+	 * @return type of tree encoded on the itemstack. EnumBeeType.NONE if it isn't a tree.
+	 */
+	EnumGermlingType getType(ItemStack stack);
+
+	ITree getTree(World world, int x, int y, int z);
+
+	ITree getTree(World world, ITreeGenome genome);
+
+	boolean plantSapling(World world, ITree tree, GameProfile owner, int x, int y, int z);
+
+	/**
+	 * @deprecated since Forestry 3.5.0. Use ITreeGenData setLeavesDecorative.
+	 */
+	@Deprecated
+	// decorative=true for creative and player-placed leaves. No decay, pollination, or drops.
+	boolean setLeaves(World world, IIndividual tree, GameProfile owner, int x, int y, int z, boolean decorative);
+
+	/**
+	 * @deprecated since Forestry 3.5.0. Use ITreeGenData setLeaves.
+	 */
+	@Deprecated
+	// set normal leaves created as worldgen
+	boolean setLeaves(World world, IIndividual tree, GameProfile owner, int x, int y, int z);
+
+	@Override
+	IChromosome[] templateAsChromosomes(IAllele[] template);
+
+	@Override
+	IChromosome[] templateAsChromosomes(IAllele[] templateActive, IAllele[] templateInactive);
+
+	boolean setFruitBlock(World world, IAlleleFruit allele, float sappiness, short[] indices, int x, int y, int z);
+
+	/* GAME MODE */
+	ArrayList<ITreekeepingMode> getTreekeepingModes();
+
+	ITreekeepingMode getTreekeepingMode(World world);
+
+	ITreekeepingMode getTreekeepingMode(String name);
+
+	void registerTreekeepingMode(ITreekeepingMode mode);
+
+	void setTreekeepingMode(World world, String name);
+
+	/* TEMPLATES */
+	@Override
+	ArrayList<ITree> getIndividualTemplates();
+
+	/* MUTATIONS */
+	@Override
+	Collection<ITreeMutation> getMutations(boolean shuffle);
+
+}

src/api/java/forestry/api/arboriculture/ITreekeepingMode.java

@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import java.util.ArrayList;
+
+public interface ITreekeepingMode extends ITreeModifier {
+
+	/**
+	 * @return Localized name of this treekeeping mode.
+	 */
+	String getName();
+
+	/**
+	 * @return Localized list of strings outlining the behaviour of this treekeeping mode.
+	 */
+	ArrayList<String> getDescription();
+
+}

src/api/java/forestry/api/arboriculture/package-info.java

@@ -0,0 +1,8 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+@API(apiVersion="2.3.0", owner="ForestryAPI|core", provides="ForestryAPI|arboriculture")
+package forestry.api.arboriculture;
+import cpw.mods.fml.common.API;

src/api/java/forestry/api/circuits/ChipsetManager.java

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.circuits;
+
+public class ChipsetManager {
+
+	public static ISolderManager solderManager;
+	public static ICircuitRegistry circuitRegistry;
+
+}

src/api/java/forestry/api/circuits/ICircuit.java

@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.circuits;
+
+import java.util.List;
+
+import net.minecraft.tileentity.TileEntity;
+
+public interface ICircuit {
+	String getUID();
+
+	boolean requiresDiscovery();
+
+	int getLimit();
+
+	String getName();
+
+	boolean isCircuitable(TileEntity tile);
+
+	void onInsertion(int slot, TileEntity tile);
+
+	void onLoad(int slot, TileEntity tile);
+
+	void onRemoval(int slot, TileEntity tile);
+
+	void onTick(int slot, TileEntity tile);
+
+	void addTooltip(List<String> list);
+}

src/api/java/forestry/api/circuits/ICircuitBoard.java

@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.circuits;
+
+import java.util.List;
+
+import net.minecraft.tileentity.TileEntity;
+
+import forestry.api.core.INBTTagable;
+
+public interface ICircuitBoard extends INBTTagable {
+
+	int getPrimaryColor();
+
+	int getSecondaryColor();
+
+	void addTooltip(List<String> list);
+
+	void onInsertion(TileEntity tile);
+
+	void onLoad(TileEntity tile);
+
+	void onRemoval(TileEntity tile);
+
+	void onTick(TileEntity tile);
+	
+	ICircuit[] getCircuits();
+
+}

src/api/java/forestry/api/circuits/ICircuitLayout.java

@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.circuits;
+
+public interface ICircuitLayout {
+
+	String getUID();
+
+	String getName();
+
+	String getUsage();
+
+}

src/api/java/forestry/api/circuits/ICircuitLibrary.java

@@ -0,0 +1,10 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.circuits;
+
+public interface ICircuitLibrary {
+
+}

src/api/java/forestry/api/circuits/ICircuitRegistry.java

@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.circuits;
+
+import java.util.Map;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public interface ICircuitRegistry {
+
+	/* CIRCUITS */
+	Map<String, ICircuit> getRegisteredCircuits();
+
+	void registerCircuit(ICircuit circuit);
+
+	ICircuit getCircuit(String uid);
+
+	ICircuitLibrary getCircuitLibrary(World world, String playername);
+
+	/* LAYOUTS */
+	Map<String, ICircuitLayout> getRegisteredLayouts();
+
+	void registerLayout(ICircuitLayout layout);
+
+	ICircuitLayout getLayout(String uid);
+
+	ICircuitLayout getDefaultLayout();
+
+	ICircuitBoard getCircuitboard(ItemStack itemstack);
+
+	boolean isChipset(ItemStack itemstack);
+
+}

src/api/java/forestry/api/circuits/ISolderManager.java

@@ -0,0 +1,14 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.circuits;
+
+import net.minecraft.item.ItemStack;
+
+public interface ISolderManager {
+
+	void addRecipe(ICircuitLayout layout, ItemStack resource, ICircuit circuit);
+
+}

src/api/java/forestry/api/circuits/package-info.java

@@ -0,0 +1,8 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+@API(apiVersion="2.0.0", owner="ForestryAPI|core", provides="ForestryAPI|circuits")
+package forestry.api.circuits;
+import cpw.mods.fml.common.API;

src/api/java/forestry/api/core/BiomeHelper.java

@@ -0,0 +1,36 @@
+package forestry.api.core;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.world.biome.BiomeGenBase;
+
+import net.minecraftforge.common.BiomeDictionary;
+
+public class BiomeHelper {
+
+	private static final Map<BiomeGenBase, Boolean> isBiomeHellishCache = new HashMap<BiomeGenBase, Boolean>();
+
+	/**
+	 * Determines if it can rain or snow in the given biome.
+	 */
+	public static boolean canRainOrSnow(BiomeGenBase biomeGenBase) {
+		return biomeGenBase.getEnableSnow() || biomeGenBase.canSpawnLightningBolt();
+	}
+
+	/**
+	 * Determines if a given BiomeGenBase is of HELLISH temperature, since it is treated separately from actual temperature values.
+	 * Uses the BiomeDictionary.
+	 * @param biomeGen BiomeGenBase of the biome in question
+	 * @return true, if the BiomeGenBase is a Nether-type biome; false otherwise.
+	 */
+	public static boolean isBiomeHellish(BiomeGenBase biomeGen) {
+		if (isBiomeHellishCache.containsKey(biomeGen)) {
+			return isBiomeHellishCache.get(biomeGen);
+		}
+
+		boolean isBiomeHellish = BiomeDictionary.isBiomeOfType(biomeGen, BiomeDictionary.Type.NETHER);
+		isBiomeHellishCache.put(biomeGen, isBiomeHellish);
+		return isBiomeHellish;
+	}
+}

src/api/java/forestry/api/core/EnumHumidity.java

@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.core;
+
+/**
+ *  Many things Forestry use temperature and humidity of a biome to determine whether they can or how they can work or spawn at a given location.
+ * 
+ *  This enum concerns humidity. 
+ */
+public enum EnumHumidity {
+	ARID("Arid"), NORMAL("Normal"), DAMP("Damp");
+
+	public final String name;
+
+	private EnumHumidity(String name) {
+		this.name = name;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	/**
+	 * Determines the EnumHumidity given a floating point representation of Minecraft Rainfall.
+	 * To check if rainfall is possible in a biome, use BiomeHelper.canRainOrSnow().
+	 * @param rawHumidity raw rainfall value
+	 * @return EnumHumidity corresponding to rainfall value
+	 */
+	public static EnumHumidity getFromValue(float rawHumidity) {
+		if (rawHumidity > 0.85f) { // matches BiomeGenBase.isHighHumidity()
+			return DAMP;
+		}
+		else if (rawHumidity >= 0.3f) {
+			return NORMAL;
+		}
+		else {
+			return ARID;
+		}
+	}
+}

src/api/java/forestry/api/core/EnumTemperature.java

@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.core;
+
+import net.minecraft.util.IIcon;
+import net.minecraft.world.biome.BiomeGenBase;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/**
+ *  Many things Forestry use temperature and humidity of a biome to determine whether they can or how they can work or spawn at a given location.
+ * 
+ *  This enum concerns temperature.
+ */
+public enum EnumTemperature {
+	NONE("None", "habitats/ocean"), ICY("Icy", "habitats/snow"), COLD("Cold", "habitats/taiga"),
+	NORMAL("Normal", "habitats/plains"), WARM("Warm", "habitats/jungle"), HOT("Hot", "habitats/desert"), HELLISH("Hellish", "habitats/nether");
+
+	public final String name;
+	public final String iconIndex;
+
+	private EnumTemperature(String name, String iconIndex) {
+		this.name = name;
+		this.iconIndex = iconIndex;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon() {
+		return ForestryAPI.textureManager.getDefault(iconIndex);
+	}
+
+	/**
+	 * Determines the EnumTemperature given a floating point representation of
+	 * Minecraft temperature. Hellish biomes are handled based on their biome
+	 * type - check BiomeHelper.isBiomeHellish.
+	 * @param rawTemp raw temperature value
+	 * @return EnumTemperature corresponding to value of rawTemp
+	 */
+	public static EnumTemperature getFromValue(float rawTemp) {
+		if (rawTemp > 1.00f) {
+			return HOT;
+		}
+		else if (rawTemp > 0.80f) {
+			return WARM;
+		}
+		else if (rawTemp > 0.30f) {
+			return NORMAL;
+		}
+		else if (rawTemp > 0.0f) {
+			return COLD;
+		}
+		else {
+			return ICY;
+		}
+	}
+
+	public static EnumTemperature getFromBiome(BiomeGenBase biomeGenBase) {
+		if (BiomeHelper.isBiomeHellish(biomeGenBase)) {
+			return HELLISH;
+		}
+		return getFromValue(biomeGenBase.temperature);
+	}
+}

src/api/java/forestry/api/core/ErrorStateRegistry.java

@@ -0,0 +1,77 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2011-2014 SirSengir.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v3
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * Various Contributors including, but not limited to:
+ * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ *******************************************************************************
+ */
+package forestry.api.core;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/**
+ *
+ * @author CovertJaguar <http://www.railcraft.info/>
+ */
+public class ErrorStateRegistry {
+
+	private static final BiMap<Short, IErrorState> states = HashBiMap.create();
+	private static final Map<String, IErrorState> stateNames = new HashMap<String, IErrorState>();
+	private static final Set<IErrorState> stateView = Collections.unmodifiableSet(states.inverse().keySet());
+
+	public static void registerErrorState(IErrorState state) {
+		if (states.containsKey(state.getID()))
+			throw new RuntimeException("Forestry Error State does not possess a unique id.");
+		states.put(state.getID(), state);
+		addStateName(state, state.getUniqueName());
+	}
+
+	public static void addAlias(IErrorState state, String name) {
+		if (!states.values().contains(state))
+			throw new RuntimeException("Forestry Error State did not exist while trying to register alias.");
+		addStateName(state, name);
+	}
+
+	private static void addStateName(IErrorState state, String name) {
+		if (!name.contains(":"))
+			throw new RuntimeException("Forestry Error State name must be in the format <modid>:<name>.");
+		if (stateNames.containsKey(name))
+			throw new RuntimeException("Forestry Error State does not possess a unique name.");
+		stateNames.put(name, state);
+	}
+
+	public static IErrorState getErrorState(short id) {
+		return states.get(id);
+	}
+
+	public static IErrorState getErrorState(String name) {
+		return stateNames.get(name);
+	}
+
+	public static Set<IErrorState> getErrorStates() {
+		return stateView;
+	}
+
+	@SideOnly(Side.CLIENT)
+	public static void initIcons(IIconRegister register) {
+		for (IErrorState code : states.values()) {
+			code.registerIcons(register);
+		}
+	}
+}

src/api/java/forestry/api/core/ForestryAPI.java

@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.core;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/**
+ * Forestry's API is divided into several subcategories to make it easier to understand.
+ * 
+ * If you need to distribute API files, try to only include the parts you are actually
+ * using to minimize conflicts due to API changes.
+ * 
+ *  .core     - Miscallenous base classes and interfaces as well as some basics for tools, armor, game modes and stuff needed by biome mods.
+ *  .fuels    - Managers and classes to facilitate adding fuels to various engines and machines.
+ *  .recipes  - Managers and helpers to facilitate adding new recipes to various machines.
+ *  .storage  - Managers, events and interfaces for defining new backpacks and handling backpack behaviour.
+ *  .mail     - Anything related to handling letters and adding new mail carrier systems.
+ *  .genetics - Shared code for all genetic subclasses.
+ *  			\ .apiculture       - Bees.
+ *  			\ .arboriculture    - Trees.
+ *  			\ .lepidopterology  - Butterflies.
+ *  
+ *  Note that if Forestry is not present, all these references will be null.
+ */
+public class ForestryAPI {
+
+	/**
+	 * The main mod instance for Forestry.
+	 */
+	public static Object instance;
+
+	/**
+	 * A {@link ITextureManager} needed for some things in the API.
+	 */
+	@SideOnly(Side.CLIENT)
+	public static ITextureManager textureManager;
+
+	/**
+	 * The currently active {@link IGameMode}.
+	 */
+	public static IGameMode activeMode;
+
+	/**
+	 * Provides information on certain Forestry constants (Villager IDs, Chest gen keys, etc)
+	 */
+	public static IForestryConstants forestryConstants;
+	
+}

src/api/java/forestry/api/core/ForestryEvent.java

@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.core;
+
+import net.minecraft.entity.player.EntityPlayer;
+
+import com.mojang.authlib.GameProfile;
+
+import cpw.mods.fml.common.eventhandler.Event;
+
+import forestry.api.genetics.IAlleleSpecies;
+import forestry.api.genetics.IBreedingTracker;
+import forestry.api.genetics.IMutation;
+import forestry.api.genetics.ISpeciesRoot;
+
+public abstract class ForestryEvent extends Event {
+
+	private static abstract class BreedingEvent extends ForestryEvent {
+		public final ISpeciesRoot root;
+		public final IBreedingTracker tracker;
+		public final GameProfile username;
+
+		private BreedingEvent(ISpeciesRoot root, GameProfile username, IBreedingTracker tracker) {
+			super();
+			this.root = root;
+			this.username = username;
+			this.tracker = tracker;
+		}
+	}
+
+	public static class SpeciesDiscovered extends BreedingEvent {
+		public final IAlleleSpecies species;
+		public SpeciesDiscovered(ISpeciesRoot root, GameProfile username, IAlleleSpecies species, IBreedingTracker tracker) {
+			super(root, username, tracker);
+			this.species = species;
+		}
+	}
+
+	public static class MutationDiscovered extends BreedingEvent {
+		public final IMutation allele;
+		public MutationDiscovered(ISpeciesRoot root, GameProfile username, IMutation allele,  IBreedingTracker tracker) {
+			super(root, username, tracker);
+			this.allele = allele;
+		}
+	}
+
+	public static class SyncedBreedingTracker extends ForestryEvent {
+		public final IBreedingTracker tracker;
+		public final EntityPlayer player;
+		public SyncedBreedingTracker(IBreedingTracker tracker, EntityPlayer player) {
+			super();
+			this.tracker = tracker;
+			this.player = player;
+		}
+
+	}
+}

src/api/java/forestry/api/core/IArmorNaturalist.java

@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.core;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+public interface IArmorNaturalist {
+
+	/**
+	 * Called when the naturalist's armor acts as spectacles for seeing pollinated tree leaves/flowers.
+	 * 
+	 * @param player
+	 *            Player doing the viewing
+	 * @param armor
+	 *            Armor item
+	 * @param doSee
+	 *            Whether or not to actually do the side effects of viewing
+	 * @return true if the armor actually allows the player to see pollination.
+	 */
+	public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee);
+}

src/api/java/forestry/api/core/IErrorState.java

@@ -0,0 +1,41 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2011-2014 SirSengir.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v3
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * Various Contributors including, but not limited to:
+ * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ *******************************************************************************
+ */
+package forestry.api.core;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/**
+ *
+ * @author CovertJaguar <http://www.railcraft.info/>
+ */
+public interface IErrorState {
+	
+	short getID();
+	
+	String getUniqueName();
+
+	String getDescription();
+
+	String getHelp();
+
+	@SideOnly(Side.CLIENT)
+	void registerIcons(IIconRegister register);
+
+	@SideOnly(value = Side.CLIENT)
+	IIcon getIcon();
+
+}

src/api/java/forestry/api/core/IForestryConstants.java

@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.core;
+
+public interface IForestryConstants {
+
+	/**
+	 * @return The villager ID for the Apiarist Villager.
+	 */
+	public int getApicultureVillagerID();
+	
+	/**
+	 * @return The villager ID for the Arborist Villager.
+	 */
+	public int getArboricultureVillagerID();
+	
+	/**
+	 * @return The ChestGenHooks key for adding items to the Forestry Villager chest.
+	 */
+	public String getVillagerChestGenKey();
+}

src/api/java/forestry/api/core/IGameMode.java

@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.core;
+
+import net.minecraft.item.ItemStack;
+
+public interface IGameMode {
+
+	/**
+	 * @return Human-readable identifier for the game mode. (i.e. 'EASY', 'NORMAL', 'HARD')
+	 */
+	String getIdentifier();
+
+	/**
+	 * @param ident Identifier for the setting. (See the gamemode config.)
+	 * @return Value of the requested setting, false if unknown setting.
+	 */
+	boolean getBooleanSetting(String ident);
+	
+	/**
+	 * @param ident Identifier for the setting. (See the gamemode config.)
+	 * @return Value of the requested setting, 0 if unknown setting.
+	 */
+	int getIntegerSetting(String ident);
+
+	/**
+	 * @param ident Identifier for the setting. (See the gamemode config.)
+	 * @return Value of the requested setting, 0 if unknown setting.
+	 */
+	float getFloatSetting(String ident);
+
+	/**
+	 * @param ident Identifier for the setting. (See the gamemode config.)
+	 * @return Value of the requested setting, an itemstack containing an apple if unknown setting.
+	 */
+	ItemStack getStackSetting(String ident);
+
+}

src/api/java/forestry/api/core/IIconProvider.java

@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.core;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/**
+ * Provides icons, needed in some interfaces, most notably for bees and trees. 
+ */
+public interface IIconProvider {
+	
+	@SideOnly(Side.CLIENT)
+	IIcon getIcon(short texUID);
+	
+	@SideOnly(Side.CLIENT)
+	void registerIcons(IIconRegister register);
+
+}

src/api/java/forestry/api/core/INBTTagable.java

@@ -0,0 +1,14 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.core;
+
+import net.minecraft.nbt.NBTTagCompound;
+
+public interface INBTTagable {
+	void readFromNBT(NBTTagCompound nbttagcompound);
+
+	void writeToNBT(NBTTagCompound nbttagcompound);
+}

src/api/java/forestry/api/core/IStructureLogic.java

@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.core;
+
+public interface IStructureLogic extends INBTTagable {
+
+	/**
+	 * @return String unique to the type of structure controlled by this structure logic.
+	 */
+	String getTypeUID();
+
+	/**
+	 * Called by {@link ITileStructure}'s validateStructure().
+	 */
+	void validateStructure();
+
+}

src/api/java/forestry/api/core/ITextureManager.java

@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.core;
+
+import net.minecraft.util.IIcon;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public interface ITextureManager {
+
+	void registerIconProvider(IIconProvider provider);
+
+	IIcon getIcon(short texUID);
+
+	IIcon getDefault(String ident);
+}

src/api/java/forestry/api/core/ITileStructure.java

@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.core;
+
+import net.minecraft.inventory.ISidedInventory;
+import net.minecraft.tileentity.TileEntity;
+
+/**
+ * The basis for multiblock components. 
+ */
+public interface ITileStructure {
+
+	/**
+	 * @return String unique to the type of structure controlled by this structure logic. Should map to {@link IStructureLogic}
+	 */
+	String getTypeUID();
+
+	/**
+	 * Should map to {@link IStructureLogic}
+	 */
+	void validateStructure();
+
+	/**
+	 * Called when the structure resets.
+	 */
+	void onStructureReset();
+
+	/**
+	 * @return TileEntity that is the master in this structure, null if no structure exists.
+	 */
+	ITileStructure getCentralTE();
+
+	/**
+	 * Called to set the master TileEntity. Implementing TileEntity should keep track of the master's coordinates, not refer to the TE object itself.
+	 * 
+	 * @param tile
+	 */
+	void setCentralTE(TileEntity tile);
+
+	/**
+	 * @return ISidedInventory representing the inventory accessed from this block.
+	 */
+	ISidedInventory getStructureInventory();
+
+	/**
+	 * Only called on Forestry's own blocks.
+	 */
+	void makeMaster();
+
+	/**
+	 * @return true if this TE is the master in a structure, false otherwise.
+	 */
+	boolean isMaster();
+
+	/**
+	 * @return true if the TE is master or has a master.
+	 */
+	boolean isIntegratedIntoStructure();
+
+}

src/api/java/forestry/api/core/IToolPipette.java

@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2014 SirSengir.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v3
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * Various Contributors including, but not limited to:
+ * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ ******************************************************************************/
+package forestry.api.core;
+
+import net.minecraft.item.ItemStack;
+
+import net.minecraftforge.fluids.FluidStack;
+
+/**
+ * Taken from BuildCraft 5.0.x
+ */
+public interface IToolPipette {
+
+    /**
+     * @param pipette
+     *            ItemStack of the pipette.
+     * @return Capacity of the pipette.
+     */
+    int getCapacity(ItemStack pipette);
+
+    /**
+     * @param pipette
+     * @return true if the pipette can pipette.
+     */
+    boolean canPipette(ItemStack pipette);
+
+    /**
+     * Fills the pipette with the given liquid stack.
+     *
+     * @param pipette
+     * @param liquid
+     * @param doFill
+     * @return Amount of liquid used in filling the pipette.
+     */
+    int fill(ItemStack pipette, FluidStack liquid, boolean doFill);
+
+    /**
+     * Drains liquid from the pipette
+     *
+     * @param pipette
+     * @param maxDrain
+     * @param doDrain
+     * @return Fluid stack representing the liquid and amount drained from the pipette.
+     */
+    FluidStack drain(ItemStack pipette, int maxDrain, boolean doDrain);
+}

src/api/java/forestry/api/core/IToolScoop.java

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.core;
+
+/**
+ * Marks a tool as a scoop. 
+ */
+public interface IToolScoop {
+
+}

src/api/java/forestry/api/core/Tabs.java

@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.core;
+
+import net.minecraft.creativetab.CreativeTabs;
+
+/**
+ *  References to the specialised tabs added by Forestry to creative inventory. 
+ */
+public class Tabs {
+
+	public static CreativeTabs tabApiculture;
+	public static CreativeTabs tabArboriculture;
+	public static CreativeTabs tabLepidopterology;
+
+}

src/api/java/forestry/api/core/package-info.java

@@ -0,0 +1,8 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+@API(apiVersion="3.0.0", owner="Forestry", provides="ForestryAPI|core")
+package forestry.api.core;
+import cpw.mods.fml.common.API;

src/api/java/forestry/api/farming/Farmables.java

@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.farming;
+
+import java.util.Collection;
+import java.util.HashMap;
+
+public class Farmables {
+	/**
+	 * Can be used to add IFarmables to some of the vanilla farm logics.
+	 * 
+	 * Identifiers: farmArboreal farmWheat farmGourd farmInfernal farmPoales farmSucculentes farmVegetables farmShroom
+	 */
+	public static HashMap<String, Collection<IFarmable>> farmables = new HashMap<String, Collection<IFarmable>>();
+
+	public static IFarmInterface farmInterface;
+}

src/api/java/forestry/api/farming/ICrop.java

@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.farming;
+
+import java.util.Collection;
+
+import net.minecraft.item.ItemStack;
+
+public interface ICrop {
+
+	/**
+	 * Harvests this crop. Performs the necessary manipulations to set the crop into a "harvested" state.
+	 * 
+	 * @return Products harvested.
+	 */
+	Collection<ItemStack> harvest();
+
+}

src/api/java/forestry/api/farming/IFarmComponent.java

@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.farming;
+
+import forestry.api.core.ITileStructure;
+
+public interface IFarmComponent extends ITileStructure {
+
+	boolean hasFunction();
+
+	void registerListener(IFarmListener listener);
+
+	void removeListener(IFarmListener listener);
+}

src/api/java/forestry/api/farming/IFarmHousing.java

@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.farming;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+
+public interface IFarmHousing {
+
+	int[] getCoords();
+
+	int[] getArea();
+
+	int[] getOffset();
+
+	World getWorld();
+
+	/**
+	 * Will run the work cycle on a master TE. Will do nothing on any other farm component.
+	 * 
+	 * @return true if any work was done, false otherwise.
+	 */
+	boolean doWork();
+
+	boolean hasLiquid(FluidStack liquid);
+
+	void removeLiquid(FluidStack liquid);
+
+	boolean hasResources(ItemStack[] resources);
+
+	void removeResources(ItemStack[] resources);
+
+	/**
+	 * Callback for {@link IFarmLogic}s to plant a sapling, seed, germling, stem. Will remove the appropriate germling from the farm's inventory. It's up to the
+	 * logic to only call this on a valid location.
+	 * 
+	 * @param farmable
+	 * @param world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @return true if planting was successful, false otherwise.
+	 */
+	boolean plantGermling(IFarmable farmable, World world, int x, int y, int z);
+
+	/* INTERACTION WITH HATCHES */
+	boolean acceptsAsGermling(ItemStack itemstack);
+
+	boolean acceptsAsResource(ItemStack itemstack);
+
+	boolean acceptsAsFertilizer(ItemStack itemstack);
+
+	/* LOGIC */
+	/**
+	 * Set a farm logic for the given direction. UP/DOWN/UNKNOWN are invalid!
+	 * 
+	 * @param direction
+	 * @param logic
+	 */
+	void setFarmLogic(ForgeDirection direction, IFarmLogic logic);
+
+	/**
+	 * Reset the farm logic for the given direction to default. UP/DOWN/UNKNOWN are invalid!
+	 * 
+	 * @param direction
+	 */
+	void resetFarmLogic(ForgeDirection direction);
+}

src/api/java/forestry/api/farming/IFarmInterface.java

@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.farming;
+
+import forestry.api.core.IStructureLogic;
+
+public interface IFarmInterface {
+
+	/**
+	 * Creates {@link IStructureLogic} for use in farm components.
+	 * 
+	 * @param structure
+	 *            {@link IFarmComponent} to create the logic for.
+	 * @return {@link IStructureLogic} for use in farm components
+	 */
+	IStructureLogic createFarmStructureLogic(IFarmComponent structure);
+}

src/api/java/forestry/api/farming/IFarmListener.java

@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.farming;
+
+import java.util.Collection;
+
+import net.minecraft.item.ItemStack;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+public interface IFarmListener {
+
+	/**
+	 * Called before a crop is harvested.
+	 * 
+	 * @param crop
+	 *            ICrop about to be harvested.
+	 * @return true to cancel further processing of this crop.
+	 */
+	boolean beforeCropHarvest(ICrop crop);
+
+	/**
+	 * Called after a crop has been harvested, but before harvested items are stowed in the farms inventory.
+	 * 
+	 * @param harvested
+	 *            Collection of harvested stacks. May be manipulated. Ensure removal of stacks with 0 or less items!
+	 * @param crop
+	 *            Harvested {@link ICrop}
+	 */
+	void afterCropHarvest(Collection<ItemStack> harvested, ICrop crop);
+
+	/**
+	 * Called after the stack of collected items has been returned by the farm logic, but before it is added to the farm's pending queue.
+	 * 
+	 * @param collected
+	 *            Collection of collected stacks. May be manipulated. Ensure removal of stacks with 0 or less items!
+	 * @param logic
+	 */
+	void hasCollected(Collection<ItemStack> collected, IFarmLogic logic);
+
+	/**
+	 * Called after farmland has successfully been cultivated by a farm logic.
+	 * 
+	 * @param logic
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @param direction
+	 * @param extent
+	 */
+	void hasCultivated(IFarmLogic logic, int x, int y, int z, ForgeDirection direction, int extent);
+
+	/**
+	 * Called after the stack of harvested crops has been returned by the farm logic, but before it is added to the farm's pending queue.
+	 * 
+	 * @param harvested
+	 * @param logic
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @param direction
+	 * @param extent
+	 */
+	void hasScheduledHarvest(Collection<ICrop> harvested, IFarmLogic logic, int x, int y, int z, ForgeDirection direction, int extent);
+
+	/**
+	 * Can be used to cancel farm task on a per side/{@link IFarmLogic} basis.
+	 * 
+	 * @param logic
+	 * @param direction
+	 * @return true to skip any work action on the given logic and direction for this work cycle.
+	 */
+	boolean cancelTask(IFarmLogic logic, ForgeDirection direction);
+}

src/api/java/forestry/api/farming/IFarmLogic.java

@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.farming;
+
+import java.util.Collection;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+public interface IFarmLogic {
+
+	int getFertilizerConsumption();
+
+	int getWaterConsumption(float hydrationModifier);
+
+	boolean isAcceptedResource(ItemStack itemstack);
+
+	boolean isAcceptedGermling(ItemStack itemstack);
+
+	Collection<ItemStack> collect();
+
+	boolean cultivate(int x, int y, int z, ForgeDirection direction, int extent);
+
+	Collection<ICrop> harvest(int x, int y, int z, ForgeDirection direction, int extent);
+
+	IFarmLogic setManual(boolean manual);
+
+	@SideOnly(Side.CLIENT)
+	IIcon getIcon();
+
+	ResourceLocation getSpriteSheet();
+	
+	String getName();
+}

src/api/java/forestry/api/farming/IFarmable.java

@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.farming;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+/**
+ * IGermling describes a crop or other harvestable object and can be used to inspect item stacks and blocks for matches.
+ */
+public interface IFarmable {
+
+	/**
+	 * @param world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @return true if the block at the given location is a "sapling" for this type, i.e. a non-harvestable immature version of the crop.
+	 */
+	boolean isSaplingAt(World world, int x, int y, int z);
+
+	/**
+	 * @param world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @return {@link ICrop} if the block at the given location is a harvestable and mature crop, null otherwise.
+	 */
+	ICrop getCropAt(World world, int x, int y, int z);
+
+	/**
+	 * @param itemstack
+	 * @return true if the item is a valid germling (plantable sapling, seed, etc.) for this type.
+	 */
+	boolean isGermling(ItemStack itemstack);
+
+	/**
+	 * @param itemstack
+	 * @return true if the item is something that can drop from this type without actually being harvested as a crop. (Apples or sapling from decaying leaves.)
+	 */
+	boolean isWindfall(ItemStack itemstack);
+
+	/**
+	 * Plants a sapling by manipulating the world. The {@link IFarmLogic} should have verified the given location as valid. Called by the {@link IFarmHousing}
+	 * which handles resources.
+	 * 
+	 * @param germling
+	 * @param world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @return true on success, false otherwise.
+	 */
+	boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z);
+
+}

src/api/java/forestry/api/farming/package-info.java

@@ -0,0 +1,8 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+@API(apiVersion="1.1.0", owner="ForestryAPI|core", provides="ForestryAPI|farming")
+package forestry.api.farming;
+import cpw.mods.fml.common.API;

src/api/java/forestry/api/food/BeverageManager.java

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.food;
+
+public class BeverageManager {
+	public static IBeverageEffect[] effectList = new IBeverageEffect[128];
+
+	public static IInfuserManager infuserManager;
+	public static IIngredientManager ingredientManager;
+}

src/api/java/forestry/api/food/IBeverageEffect.java

@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.food;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+
+public interface IBeverageEffect {
+	int getId();
+
+	void doEffect(World world, EntityPlayer player);
+
+	String getDescription();
+}

src/api/java/forestry/api/food/IInfuserManager.java

@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.food;
+
+import net.minecraft.item.ItemStack;
+
+public interface IInfuserManager {
+
+	void addMixture(int meta, ItemStack ingredient, IBeverageEffect effect);
+
+	void addMixture(int meta, ItemStack[] ingredients, IBeverageEffect effect);
+
+	ItemStack getSeasoned(ItemStack base, ItemStack[] ingredients);
+
+	boolean hasMixtures(ItemStack[] ingredients);
+
+	boolean isIngredient(ItemStack itemstack);
+
+	ItemStack[] getRequired(ItemStack[] ingredients);
+
+}

src/api/java/forestry/api/food/IIngredientManager.java

@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.food;
+
+import net.minecraft.item.ItemStack;
+
+public interface IIngredientManager {
+
+	String getDescription(ItemStack itemstack);
+
+	void addIngredient(ItemStack ingredient, String description);
+
+}

src/api/java/forestry/api/food/package-info.java

@@ -0,0 +1,8 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+@API(apiVersion="1.1.0", owner="ForestryAPI|core", provides="ForestryAPI|food")
+package forestry.api.food;
+import cpw.mods.fml.common.API;

src/api/java/forestry/api/fuels/EngineBronzeFuel.java

@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.fuels;
+
+import net.minecraftforge.fluids.Fluid;
+
+public class EngineBronzeFuel {
+	/**
+	 * Item that is valid fuel for a biogas engine.
+	 */
+	public final Fluid liquid;
+	/**
+	 * Power produced by this fuel per work cycle of the engine.
+	 */
+	public final int powerPerCycle;
+	/**
+	 * How many work cycles a single "stack" of this type lasts.
+	 */
+	public final int burnDuration;
+	/**
+	 * By how much the normal heat dissipation rate of 1 is multiplied when using this fuel type.
+	 */
+	public final int dissipationMultiplier;
+
+	public EngineBronzeFuel(Fluid liquid, int powerPerCycle, int burnDuration, int dissipationMultiplier) {
+		this.liquid = liquid;
+		this.powerPerCycle = powerPerCycle;
+		this.burnDuration = burnDuration;
+		this.dissipationMultiplier = dissipationMultiplier;
+	}
+}

src/api/java/forestry/api/fuels/EngineCopperFuel.java

@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.fuels;
+
+import net.minecraft.item.ItemStack;
+
+public class EngineCopperFuel {
+
+	/**
+	 * Item that is valid fuel for a peat-fired engine.
+	 */
+	public final ItemStack fuel;
+	/**
+	 * Power produced by this fuel per work cycle.
+	 */
+	public final int powerPerCycle;
+	/**
+	 * Amount of work cycles this item lasts before being consumed.
+	 */
+	public final int burnDuration;
+
+	public EngineCopperFuel(ItemStack fuel, int powerPerCycle, int burnDuration) {
+		this.fuel = fuel;
+		this.powerPerCycle = powerPerCycle;
+		this.burnDuration = burnDuration;
+	}
+
+}

src/api/java/forestry/api/fuels/FermenterFuel.java

@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.fuels;
+
+import net.minecraft.item.ItemStack;
+
+public class FermenterFuel {
+	/**
+	 * Item that is a valid fuel for the fermenter (i.e. fertilizer).
+	 */
+	public final ItemStack item;
+	/**
+	 * How much is fermeted per work cycle, i.e. how much biomass is produced per cycle.
+	 */
+	public final int fermentPerCycle;
+	/**
+	 * Amount of work cycles a single item of this fuel lasts before expiring.
+	 */
+	public final int burnDuration;
+
+	public FermenterFuel(ItemStack item, int fermentPerCycle, int burnDuration) {
+		this.item = item;
+		this.fermentPerCycle = fermentPerCycle;
+		this.burnDuration = burnDuration;
+	}
+}

src/api/java/forestry/api/fuels/FuelManager.java

@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ * 
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.fuels;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+
+import java.util.HashMap;
+
+
+public class FuelManager {
+	/**
+	 * Add new fuels for the fermenter here (i.e. fertilizer).
+	 */
+	public static HashMap<ItemStack, FermenterFuel> fermenterFuel;
+	/**
+	 * Add new resources for the moistener here (i.e. wheat)
+	 */
+	public static HashMap<ItemStack, MoistenerFuel> moistenerResource;
+	/**
+	 * Add new substrates for the rainmaker here
+	 */
+	public static HashMap<ItemStack, RainSubstrate> rainSubstrate;
+	/**
+	 * Add new fuels for EngineBronze (= biogas engine) here
+	 */
+	public static HashMap<Fluid, EngineBronzeFuel> bronzeEngineFuel;
+	/**
+	 * Add new fuels for EngineCopper (= peat-fired engine) here
+	 */
+	public static HashMap<ItemStack, EngineCopperFuel> copperEngineFuel;
+	/**
+	 * Add new fuels for Generator here
+	 */
+	public static HashMap<Fluid, GeneratorFuel> generatorFuel;
+
+}