Fix #1272 villager house generation is intersecting with the road

Added backpack support for more vanilla items/blocks

.gitmodules

@@ -1,9 +1,3 @@
 [submodule "lang"]
 	path = lang
 	url = https://github.com/ForestryMC/Forestry-Localization.git
-[submodule "api/redstoneflux"]
-	path = api/redstoneflux
-	url = https://github.com/CoFH/RedstoneFlux-API.git
-[submodule "api/forestry"]
-	path = api/forestry
-	url = https://github.com/ForestryMC/ForestryAPI.git

README.md

@@ -9,7 +9,7 @@ Forestry is a modification for the game Minecraft and known primarily for its fa
 
 [Wiki](http://forestry.sengir.net/)
 
-[Latest Builds for 1.7.10](http://jenkins.ic2.player.to/job/Forestry_Dev/)
+[Latest Builds for 1.9](http://jenkins.ic2.player.to/job/Forestry_5/)
 
 [IRC #forestry on esper.net](http://webchat.esper.net/?nick=ForestryGithub...&channels=forestry&prompt=1)
 

build.gradle

@@ -1,25 +1,27 @@
 buildscript {
 	repositories {
-		mavenCentral()
+		jcenter()
 		maven {
 			name = "forge"
 			url = "http://files.minecraftforge.net/maven"
 		}
-		maven {
+				maven {
 			name = "sonatype"
 			url = "https://oss.sonatype.org/content/repositories/snapshots/"
 		}
 	}
 	dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-		// https://github.com/ajoberstar/gradle-git
-		classpath 'org.ajoberstar:gradle-git:0.8.0'
+		classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
 	}
 }
 
-apply plugin: 'forge'
+plugins {
+	id "net.minecraftforge.gradle.forge" version "2.0.2"
+	id "com.matthewprenger.cursegradle" version "1.0.7"
+	id "se.bjurr.gitchangelog.git-changelog-gradle-plugin" version "1.32"
+}
+
 apply plugin: 'maven'
-apply plugin: 'java'
 
 version = version_major + '.' + version_minor + '.' + version_patch + '.' + getBuildNumber()
 if (project.hasProperty('buildQualifier')) {
@@ -31,29 +33,22 @@ archivesBaseName = "forestry_" + mcversion
 ext.dirDest = './build/dist'
 ext.dirLang = "./lang"
 
-ext.apiForestry = "./api/forestry"
-ext.apiRedstoneFlux = "./api/redstoneflux"
-
 // java version
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 minecraft {
 	version = mcversion + "-" + forgeversion
 	runDir = "run"
+	useDepAts = true
+	mappings = mcp_mappings
 
 	replace '@VERSION@', project.version
 	replace '@BUILD_NUMBER@', getBuildNumber()
-
-	srgExtra "PK: chylex/javacheck forestry/shade/javacheck"
 }
 
 sourceSets {
 	main {
-		java {
-			srcDir project.apiForestry
-			srcDir project.apiRedstoneFlux + "/src/main/java"
-		}
 		resources {
 			srcDir project.dirLang
 		}
@@ -61,47 +56,24 @@ sourceSets {
 }
 
 repositories {
+	maven {
+		url "http://dvs1.progwml6.com/files/maven"
+	}
 	maven {
 		name = "ic2"
 		url = "http://maven.ic2.player.to/"
 	}
-	ivy {
-		name "BuildCraft"
-		artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
-	}
-	maven {
-		name = "chickenbones"
-		url = "http://chickenbones.net/maven/"
-	}
-	maven{
-		name "tterrag Repo"
-		url "http://maven.tterrag.com/"
-	}
+}
+
+dependencies {
+	deobfCompile "mezz.jei:jei_${mcversion}:${jei_version}"
+//	deobfCompile "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
+//	runtime "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
 }
 
 configurations {
 	api
 	compile.extendsFrom api
-	shade
-	compile.extendsFrom shade
-}
-
-dependencies {
-	api 'net.industrial-craft:industrialcraft-2:2.2.790-experimental:api'
-	api name: "buildcraft", version: "7.1.12", classifier: "api"
-
-	// http://files.minecraftforge.net/CodeChickenLib/
-	compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
-
-	// http://chickenbones.net/maven
-	compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
-	compile "codechicken:NotEnoughItems:1.7.10-1.0.5.111:dev"
-	compile "codechicken:NotEnoughItems:1.7.10-1.0.5.111:src"
-
-	// http://maven.tterrag.com/
-	shade "chylex.javacheck:JavaChecker:v1.2-b1"
-
-	testCompile 'junit:junit:4.12'
 }
 
 processResources {
@@ -125,108 +97,41 @@ processResources {
 	}
 }
 
-runClient {
-	if (project.hasProperty('mcUsername')) {
-		args "--username=" + project.mcUsername
-	}
-	if (project.hasProperty('mcPassword')) {
-		args "--password=" + project.mcPassword
-	}
-}
-
-debugClient {
-	if (project.hasProperty('mcUsername')) {
-		args "--username=" + project.mcUsername
-	}
-	if (project.hasProperty('mcPassword')) {
-		args "--password=" + project.mcPassword
+// prevent java 8's strict doclint for javadocs from failing builds
+allprojects {
+	tasks.withType(Javadoc) {
+		options.addStringOption('Xdoclint:none', '-quiet')
 	}
 }
 
 jar {
-	destinationDir = file("build/tmp")
-	archiveName = "main.jar"
-
-	// Copy various READMEs and Licensing files into the jar
-	into ('forestry/api') {
-		from project.apiForestry + "/LICENSE.txt"
+	// Copy redstone api into the jar, should shade this as a maven dep...
+	from (sourceSets.api.allSource) {
+		include 'cofh/**/*.txt'
 	}
-	into ('cofh/api') {
-		from project.apiRedstoneFlux + "/LICENSE - LGPLv3.txt"
-	}
-	into ('invtweaks/api') {
-		from "./src/main/java/invtweaks/LICENSE.txt"
-	}
-
-	configurations.shade.each{ dep ->
-		from(project.zipTree(dep)){
-			exclude 'META-INF', 'META-INF/**', 'mcmod.info'
-		}
+	from (sourceSets.api.output.classesDir) {
+		include 'cofh/**/*.*'
 	}
 }
 
-task mainJar(type: Jar, dependsOn: 'reobf') {
-	from (zipTree(jar.getArchivePath())) {
-		include '**'
-		exclude '**/codechicken/**'
-		exclude '**/uristqwerty/**'
-	}
-
-	destinationDir = file(dirDest)
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-	includeEmptyDirs = false
-
-	manifest{
-		attributes 'TweakClass': 'forestry.shade.javacheck.Java7Checker'
-	}
-}
-
-task devJar(type: Jar, dependsOn: 'classes') {
-	from (sourceSets.main.output) {
-		exclude '**/codechicken/**'
-		exclude '**/uristqwerty/**'
-	}
-
-	destinationDir = file(dirDest)
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-	includeEmptyDirs = false
-
-	classifier = 'dev'
-}
-
-task apiJar(type: Jar, dependsOn: 'classes') {
-	from project.apiForestry
-	from(sourceSets.main.output) {
-		include 'forestry/api/**'
-	}
-
-	destinationDir = file(dirDest)
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-	includeEmptyDirs = false
-
-	classifier = 'api'
-}
-
-task sourceJar(type: Jar, dependsOn: 'classes') {
-	from (sourceSets.main.allSource) {
-		exclude '**/codechicken/**'
-		exclude '**/uristqwerty/**'
-	}
-
-	destinationDir = file(dirDest)
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-	includeEmptyDirs = false
-
+task sourcesJar(type: Jar) {
+	from zipTree('build/retromapping/retromappedReplacedMain.jar') // Not sure if this is how Abrar designed it, but grab the remapped src
 	classifier = 'sources'
 }
 
-task release (dependsOn: [mainJar, apiJar, devJar, sourceJar]) {
+task apiJar(type: Jar) {
+	// TODO: when FG bug is fixed, remove allSource from the api jar.
+	// https://github.com/MinecraftForge/ForgeGradle/issues/369
+	// Gradle should be able to pull them from the -sources jar.
+	from sourceSets.main.allSource
+	from sourceSets.main.output
+	include 'forestry/api/**'
+	classifier = 'api'
 }
 
 artifacts {
+	archives sourcesJar
 	archives apiJar
-	archives devJar
-	archives sourceJar
 }
 
 uploadArchives {
@@ -234,19 +139,9 @@ uploadArchives {
 		if (project.hasProperty('mavenDir')) {
 			mavenDeployer {
 				repository(url: "file://"+mavenDir)
-				
-				addFilter('api') { artifact, file ->
-					file == apiJar.archivePath
-				}
-				addFilter('dev') { artifact, file ->
-					file == devJar.archivePath
-				}
-				addFilter('source') { artifact, file ->
-					file == sourceJar.archivePath
-				}
 			}
 		} else {
-			println 'Archives upload disabled, gradle.properties is missing.'
+			println 'Archives upload disabled, mavenDir in gradle.properties is missing.'
 		}
 	}
 }
@@ -255,3 +150,35 @@ def getBuildNumber() {
 	return "$System.env.BUILD_NUMBER" != "null" ? "$System.env.BUILD_NUMBER" : "0"
 }
 
+task makeChangelog(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {
+	filePath = "changelog.html"
+	untaggedName = "Current release ${project.version}"
+	fromCommit = "5a3850c2642e535656d090d1473054d5fa8d3331"
+	toRef =  "HEAD"
+	templateContent = """
+Alpha version, still buggy. Do not create a world you care about with this version, it can and will break things severely.<br/>
+Please help the project by trying it out and <a href="https://github.com/ForestryMC/ForestryMC/issues">reporting issues here.</a><br/>
+{{#tags}}
+  <h3>{{name}}</h3>
+  <ul>
+    {{#commits}}
+    <li>{{{message}}} - {{authorName}}</li>
+    {{/commits}}
+  </ul>
+{{/tags}}
+"""
+}
+
+curseforge {
+	apiKey = project.hasProperty('curseforge_apikey') ? project.curseforge_apikey : '0'
+	project {
+		id = '59751'
+		changelog = file('changelog.html')
+		changelogType = 'html'
+		releaseType = 'alpha'
+	}
+}
+
+afterEvaluate {
+	tasks.curseforge59751.dependsOn.add(makeChangelog)
+}

cla-signatures.txt

@@ -4,3 +4,4 @@ GenuineSounds;GenuineSoundsLtd@gmail.com;2015-02-26
 airbreather;airbreather@linux.com;2015-04-10
 ganymedes01;foka_12@hotmail.com;2015-05-27
 infinityraider;theoneandonlyraider@gmail;com;2015-10-03
+girafistudios;girafi0@gmail.com;2016-06-02

gradle.properties

@@ -1,5 +1,9 @@
-mcversion=1.7.10
-forgeversion=10.13.4.1566-1.7.10
-version_major=4
-version_minor=2
-version_patch=9
+mcversion=1.9.4
+forgeversion=12.17.0.1950
+mcp_mappings=snapshot_20160525
+
+jei_version=3.4.0.+
+
+version_major=5
+version_minor=0
+version_patch=8

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jul 02 15:54:47 CDT 2014
+#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip

src/api/java/cofh/LICENSE - LGPLv3.txt

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

src/api/java/cofh/README.md

@@ -0,0 +1,11 @@
+Redstone Flux API
+====================================
+This is the standalone CoFH Energy API - also known as the "Redstone Flux" API.
+
+Make great use of it.
+
+You are of course free to modify any/all of this code and even repackage it, but then it wouldn't be an awesome crossmod API anymore, now would it?
+
+Don't be a jerk.
+
+~Team CoFH

src/api/java/cofh/api/CoFHAPIProps.java

@@ -0,0 +1,11 @@
+package cofh.api;
+
+public class CoFHAPIProps {
+
+	private CoFHAPIProps() {
+
+	}
+
+	public static final String VERSION = "1.8.9R1.2.0B1";
+
+}

src/api/java/cofh/api/energy/EnergyStorage.java

@@ -0,0 +1,162 @@
+package cofh.api.energy;
+
+import net.minecraft.nbt.NBTTagCompound;
+
+/**
+ * Reference implementation of {@link IEnergyStorage}. Use/extend this or implement your own.
+ *
+ * @author King Lemming
+ *
+ */
+public class EnergyStorage implements IEnergyStorage {
+
+	protected int energy;
+	protected int capacity;
+	protected int maxReceive;
+	protected int maxExtract;
+
+	public EnergyStorage(int capacity) {
+
+		this(capacity, capacity, capacity);
+	}
+
+	public EnergyStorage(int capacity, int maxTransfer) {
+
+		this(capacity, maxTransfer, maxTransfer);
+	}
+
+	public EnergyStorage(int capacity, int maxReceive, int maxExtract) {
+
+		this.capacity = capacity;
+		this.maxReceive = maxReceive;
+		this.maxExtract = maxExtract;
+	}
+
+	public EnergyStorage readFromNBT(NBTTagCompound nbt) {
+
+		this.energy = nbt.getInteger("Energy");
+
+		if (energy > capacity) {
+			energy = capacity;
+		}
+		return this;
+	}
+
+	public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
+
+		if (energy < 0) {
+			energy = 0;
+		}
+		nbt.setInteger("Energy", energy);
+		return nbt;
+	}
+
+	public EnergyStorage setCapacity(int capacity) {
+
+		this.capacity = capacity;
+
+		if (energy > capacity) {
+			energy = capacity;
+		}
+		return this;
+	}
+
+	public EnergyStorage setMaxTransfer(int maxTransfer) {
+
+		setMaxReceive(maxTransfer);
+		setMaxExtract(maxTransfer);
+		return this;
+	}
+
+	public EnergyStorage setMaxReceive(int maxReceive) {
+
+		this.maxReceive = maxReceive;
+		return this;
+	}
+
+	public EnergyStorage setMaxExtract(int maxExtract) {
+
+		this.maxExtract = maxExtract;
+		return this;
+	}
+
+	public int getMaxReceive() {
+
+		return maxReceive;
+	}
+
+	public int getMaxExtract() {
+
+		return maxExtract;
+	}
+
+	/**
+	 * This function is included to allow for server to client sync. Do not call this externally to the containing Tile Entity, as not all IEnergyHandlers
+	 * are guaranteed to have it.
+	 *
+	 * @param energy
+	 */
+	public void setEnergyStored(int energy) {
+
+		this.energy = energy;
+
+		if (this.energy > capacity) {
+			this.energy = capacity;
+		} else if (this.energy < 0) {
+			this.energy = 0;
+		}
+	}
+
+	/**
+	 * This function is included to allow the containing tile to directly and efficiently modify the energy contained in the EnergyStorage. Do not rely on this
+	 * externally, as not all IEnergyHandlers are guaranteed to have it.
+	 *
+	 * @param energy
+	 */
+	public void modifyEnergyStored(int energy) {
+
+		this.energy += energy;
+
+		if (this.energy > capacity) {
+			this.energy = capacity;
+		} else if (this.energy < 0) {
+			this.energy = 0;
+		}
+	}
+
+	/* IEnergyStorage */
+	@Override
+	public int receiveEnergy(int maxReceive, boolean simulate) {
+
+		int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
+
+		if (!simulate) {
+			energy += energyReceived;
+		}
+		return energyReceived;
+	}
+
+	@Override
+	public int extractEnergy(int maxExtract, boolean simulate) {
+
+		int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
+
+		if (!simulate) {
+			energy -= energyExtracted;
+		}
+		return energyExtracted;
+	}
+
+	@Override
+	public int getEnergyStored() {
+
+		return energy;
+	}
+
+	@Override
+	public int getMaxEnergyStored() {
+
+		return capacity;
+	}
+
+}

src/api/java/cofh/api/energy/IEnergyConnection.java

@@ -0,0 +1,22 @@
+package cofh.api.energy;
+
+import net.minecraft.util.EnumFacing;
+
+
+/**
+ * Implement this interface on TileEntities which should connect to energy transportation blocks. This is intended for blocks which generate energy but do not
+ * accept it; otherwise just use IEnergyHandler.
+ * <p>
+ * Note that {@link IEnergyHandler} is an extension of this.
+ *
+ * @author King Lemming
+ *
+ */
+public interface IEnergyConnection {
+
+	/**
+	 * Returns TRUE if the TileEntity can connect on a given side.
+	 */
+	boolean canConnectEnergy(EnumFacing from);
+
+}

src/api/java/cofh/api/energy/IEnergyContainerItem.java

@@ -0,0 +1,52 @@
+package cofh.api.energy;
+
+import net.minecraft.item.ItemStack;
+
+/**
+ * Implement this interface on Item classes that support external manipulation of their internal energy storages.
+ * <p>
+ * A reference implementation is provided {@link ItemEnergyContainer}.
+ *
+ * @author King Lemming
+ *
+ */
+public interface IEnergyContainerItem {
+
+	/**
+	 * Adds energy to a container item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged.
+	 *
+	 * @param container
+	 *            ItemStack to be charged.
+	 * @param maxReceive
+	 *            Maximum amount of energy to be sent into the item.
+	 * @param simulate
+	 *            If TRUE, the charge will only be simulated.
+	 * @return Amount of energy that was (or would have been, if simulated) received by the item.
+	 */
+	int receiveEnergy(ItemStack container, int maxReceive, boolean simulate);
+
+	/**
+	 * Removes energy from a container item. Returns the quantity of energy that was removed. This should always return 0 if the item cannot be externally
+	 * discharged.
+	 *
+	 * @param container
+	 *            ItemStack to be discharged.
+	 * @param maxExtract
+	 *            Maximum amount of energy to be extracted from the item.
+	 * @param simulate
+	 *            If TRUE, the discharge will only be simulated.
+	 * @return Amount of energy that was (or would have been, if simulated) extracted from the item.
+	 */
+	int extractEnergy(ItemStack container, int maxExtract, boolean simulate);
+
+	/**
+	 * Get the amount of energy currently stored in the container item.
+	 */
+	int getEnergyStored(ItemStack container);
+
+	/**
+	 * Get the max amount of energy that can be stored in the container item.
+	 */
+	int getMaxEnergyStored(ItemStack container);
+
+}

src/api/java/cofh/api/energy/IEnergyHandler.java

@@ -0,0 +1,27 @@
+package cofh.api.energy;
+
+import net.minecraft.util.EnumFacing;
+
+/**
+ * Implement this interface on Tile Entities which should handle energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
+ * <p>
+ * A reference implementation is provided {@link TileEnergyHandler}.
+ * <p>
+ * Note that {@link IEnergyReceiver} and {@link IEnergyProvider} are extensions of this.
+ *
+ * @author King Lemming
+ *
+ */
+public interface IEnergyHandler extends IEnergyConnection {
+
+	/**
+	 * Returns the amount of energy currently stored.
+	 */
+	int getEnergyStored(EnumFacing from);
+
+	/**
+	 * Returns the maximum amount of energy that can be stored.
+	 */
+	int getMaxEnergyStored(EnumFacing from);
+
+}

src/api/java/cofh/api/energy/IEnergyProvider.java

@@ -0,0 +1,29 @@
+package cofh.api.energy;
+
+import net.minecraft.util.EnumFacing;
+
+
+/**
+ * Implement this interface on Tile Entities which should provide energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
+ * <p>
+ * A reference implementation is provided {@link TileEnergyHandler}.
+ *
+ * @author King Lemming
+ *
+ */
+public interface IEnergyProvider extends IEnergyHandler {
+
+	/**
+	 * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider.
+	 *
+	 * @param from
+	 *            Orientation the energy is extracted from.
+	 * @param maxExtract
+	 *            Maximum amount of energy to extract.
+	 * @param simulate
+	 *            If TRUE, the extraction will only be simulated.
+	 * @return Amount of energy that was (or would have been, if simulated) extracted.
+	 */
+	int extractEnergy(EnumFacing from, int maxExtract, boolean simulate);
+
+}

src/api/java/cofh/api/energy/IEnergyReceiver.java

@@ -0,0 +1,29 @@
+package cofh.api.energy;
+
+import net.minecraft.util.EnumFacing;
+
+
+/**
+ * Implement this interface on Tile Entities which should receive energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
+ * <p>
+ * A reference implementation is provided {@link TileEnergyHandler}.
+ *
+ * @author King Lemming
+ *
+ */
+public interface IEnergyReceiver extends IEnergyHandler {
+
+	/**
+	 * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver.
+	 *
+	 * @param from
+	 *            Orientation the energy is received from.
+	 * @param maxReceive
+	 *            Maximum amount of energy to receive.
+	 * @param simulate
+	 *            If TRUE, the charge will only be simulated.
+	 * @return Amount of energy that was (or would have been, if simulated) received.
+	 */
+	int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate);
+
+}

src/api/java/cofh/api/energy/IEnergyStorage.java

@@ -0,0 +1,46 @@
+package cofh.api.energy;
+
+/**
+ * An energy storage is the unit of interaction with Energy inventories.<br>
+ * This is not to be implemented on TileEntities. This is for internal use only.
+ * <p>
+ * A reference implementation can be found at {@link EnergyStorage}.
+ *
+ * @author King Lemming
+ *
+ */
+public interface IEnergyStorage {
+
+	/**
+	 * Adds energy to the storage. Returns quantity of energy that was accepted.
+	 *
+	 * @param maxReceive
+	 *            Maximum amount of energy to be inserted.
+	 * @param simulate
+	 *            If TRUE, the insertion will only be simulated.
+	 * @return Amount of energy that was (or would have been, if simulated) accepted by the storage.
+	 */
+	int receiveEnergy(int maxReceive, boolean simulate);
+
+	/**
+	 * Removes energy from the storage. Returns quantity of energy that was removed.
+	 *
+	 * @param maxExtract
+	 *            Maximum amount of energy to be extracted.
+	 * @param simulate
+	 *            If TRUE, the extraction will only be simulated.
+	 * @return Amount of energy that was (or would have been, if simulated) extracted from the storage.
+	 */
+	int extractEnergy(int maxExtract, boolean simulate);
+
+	/**
+	 * Returns the amount of energy currently stored.
+	 */
+	int getEnergyStored();
+
+	/**
+	 * Returns the maximum amount of energy that can be stored.
+	 */
+	int getMaxEnergyStored();
+
+}

src/api/java/cofh/api/energy/ItemEnergyContainer.java

@@ -0,0 +1,113 @@
+package cofh.api.energy;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+/**
+ * Reference implementation of {@link IEnergyContainerItem}. Use/extend this or implement your own.
+ *
+ * @author King Lemming
+ *
+ */
+public class ItemEnergyContainer extends Item implements IEnergyContainerItem {
+
+	protected int capacity;
+	protected int maxReceive;
+	protected int maxExtract;
+
+	public ItemEnergyContainer() {
+
+	}
+
+	public ItemEnergyContainer(int capacity) {
+
+		this(capacity, capacity, capacity);
+	}
+
+	public ItemEnergyContainer(int capacity, int maxTransfer) {
+
+		this(capacity, maxTransfer, maxTransfer);
+	}
+
+	public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) {
+
+		this.capacity = capacity;
+		this.maxReceive = maxReceive;
+		this.maxExtract = maxExtract;
+	}
+
+	public ItemEnergyContainer setCapacity(int capacity) {
+
+		this.capacity = capacity;
+		return this;
+	}
+
+	public ItemEnergyContainer  setMaxTransfer(int maxTransfer) {
+
+		setMaxReceive(maxTransfer);
+		setMaxExtract(maxTransfer);
+		return this;
+	}
+
+	public ItemEnergyContainer  setMaxReceive(int maxReceive) {
+
+		this.maxReceive = maxReceive;
+		return this;
+	}
+
+	public ItemEnergyContainer  setMaxExtract(int maxExtract) {
+
+		this.maxExtract = maxExtract;
+		return this;
+	}
+
+	/* IEnergyContainerItem */
+	@Override
+	public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) {
+
+		if (!container.hasTagCompound()) {
+			container.setTagCompound(new NBTTagCompound());
+		}
+		int energy = container.getTagCompound().getInteger("Energy");
+		int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
+
+		if (!simulate) {
+			energy += energyReceived;
+			container.getTagCompound().setInteger("Energy", energy);
+		}
+		return energyReceived;
+	}
+
+	@Override
+	public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) {
+
+		if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) {
+			return 0;
+		}
+		int energy = container.getTagCompound().getInteger("Energy");
+		int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
+
+		if (!simulate) {
+			energy -= energyExtracted;
+			container.getTagCompound().setInteger("Energy", energy);
+		}
+		return energyExtracted;
+	}
+
+	@Override
+	public int getEnergyStored(ItemStack container) {
+
+		if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) {
+			return 0;
+		}
+		return container.getTagCompound().getInteger("Energy");
+	}
+
+	@Override
+	public int getMaxEnergyStored(ItemStack container) {
+
+		return capacity;
+	}
+
+}

src/api/java/cofh/api/energy/TileEnergyHandler.java

@@ -0,0 +1,70 @@
+package cofh.api.energy;
+
+import javax.annotation.Nonnull;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+
+/**
+ * Reference implementation of {@link IEnergyReceiver} and {@link IEnergyProvider}. Use/extend this or implement your own.
+ * 
+ * This class is really meant to summarize how each interface is properly used.
+ *
+ * @author King Lemming
+ *
+ */
+public class TileEnergyHandler extends TileEntity implements IEnergyReceiver, IEnergyProvider {
+
+	protected EnergyStorage storage = new EnergyStorage(32000);
+
+	@Override
+	public void readFromNBT(NBTTagCompound nbt) {
+
+		super.readFromNBT(nbt);
+		storage.readFromNBT(nbt);
+	}
+
+	@Nonnull
+	@Override
+	public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
+		nbt = super.writeToNBT(nbt);
+		storage.writeToNBT(nbt);
+		return nbt;
+	}
+
+	/* IEnergyConnection */
+	@Override
+	public boolean canConnectEnergy(EnumFacing from) {
+
+		return true;
+	}
+
+	/* IEnergyReceiver */
+	@Override
+	public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) {
+
+		return storage.receiveEnergy(maxReceive, simulate);
+	}
+
+	/* IEnergyProvider */
+	@Override
+	public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) {
+
+		return storage.extractEnergy(maxExtract, simulate);
+	}
+
+	/* IEnergyHandler */
+	@Override
+	public int getEnergyStored(EnumFacing from) {
+
+		return storage.getEnergyStored();
+	}
+
+	@Override
+	public int getMaxEnergyStored(EnumFacing from) {
+
+		return storage.getMaxEnergyStored();
+	}
+
+}

src/api/java/cofh/api/energy/package-info.java

@@ -0,0 +1,10 @@
+/**
+ * (C) 2014-2016 Team CoFH / CoFH / Cult of the Full Hub
+ * http://www.teamcofh.com
+ */
+@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|energy")
+package cofh.api.energy;
+
+import net.minecraftforge.fml.common.API;
+import cofh.api.CoFHAPIProps;
+

src/api/java/cofh/api/package-info.java

@@ -0,0 +1,9 @@
+/**
+ * (C) 2014-2016 Team CoFH / CoFH / Cult of the Full Hub
+ * http://www.teamcofh.com
+ */
+@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHLib", provides = "CoFHAPI")
+package cofh.api;
+
+import net.minecraftforge.fml.common.API;
+

src/main/java/forestry/Forestry.java

@@ -12,40 +12,30 @@ package forestry;
 
 import java.io.File;
 
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-
 import net.minecraftforge.common.MinecraftForge;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
-import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
-import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.GameRegistry.Type;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.Mod.EventHandler;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLInterModComms;
+import net.minecraftforge.fml.common.event.FMLInterModComms.IMCEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
+import net.minecraftforge.fml.common.network.NetworkRegistry;
+import net.minecraftforge.fml.common.registry.GameRegistry;
 
 import forestry.api.core.ForestryAPI;
 import forestry.core.EventHandlerCore;
 import forestry.core.config.Config;
 import forestry.core.config.Constants;
 import forestry.core.config.GameMode;
-import forestry.core.config.Version;
 import forestry.core.errors.EnumErrorCode;
 import forestry.core.errors.ErrorStateRegistry;
 import forestry.core.gui.GuiHandler;
 import forestry.core.multiblock.MultiblockEventHandler;
 import forestry.core.network.PacketHandler;
 import forestry.core.proxy.Proxies;
-import forestry.core.utils.Log;
-import forestry.core.utils.StringUtil;
 import forestry.core.worldgen.WorldGenerator;
 import forestry.plugins.PluginManager;
 
@@ -55,20 +45,22 @@ import forestry.plugins.PluginManager;
  * @author SirSengir
  */
 @Mod(
-		modid = Constants.MOD,
+		modid = Constants.MOD_ID,
 		name = "Forestry",
-		version = Version.VERSION,
+		version = Constants.VERSION,
 		guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
-		dependencies = "required-after:Forge@[10.13.4.1566,);"
-				+ "after:Buildcraft|Core@[6.1.7,);"
+		dependencies = "required-after:Forge@[12.17.0.1949,);"
+				+ "after:Buildcraft|Core@[7.2,);"
+				+ "after:BuildCraft|Energy@[7.2,);"
 				+ "after:ExtrabiomesXL;"
 				+ "after:BiomesOPlenty;"
-				+ "after:IC2@[2.0.140,);"
+				+ "after:IC2@[2.3.235,);"
 				+ "after:Natura@[2.2.0,);"
-				+ "after:HardcoreEnderExpansion;")
+				+ "after:HardcoreEnderExpansion;"
+				+ "after:basemetals;")
 public class Forestry {
 
-	@Mod.Instance(Constants.MOD)
+	@Mod.Instance(Constants.MOD_ID)
 	public static Forestry instance;
 	private File configFolder;
 
@@ -77,6 +69,7 @@ public class Forestry {
 		ForestryAPI.forestryConstants = new Constants();
 		ForestryAPI.errorStateRegistry = new ErrorStateRegistry();
 		EnumErrorCode.init();
+		FluidRegistry.enableUniversalBucket();
 	}
 
 	public static PacketHandler packetHandler;
@@ -88,17 +81,18 @@ public class Forestry {
 		// Register event handler
 		EventHandlerCore eventHandlerCore = new EventHandlerCore();
 		MinecraftForge.EVENT_BUS.register(eventHandlerCore);
-		FMLCommonHandler.instance().bus().register(eventHandlerCore);
 		MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler());
 
-		configFolder = new File(event.getModConfigurationDirectory(), "forestry");
+		configFolder = new File(event.getModConfigurationDirectory(), Constants.MOD_ID);
 		Config.load();
 
-		PluginManager.runSetup();
+		PluginManager.runSetup(event);
 
 		ForestryAPI.activeMode = new GameMode(Config.gameMode);
 
 		PluginManager.runPreInit();
+		
+		Proxies.render.registerModels();
 	}
 
 	@EventHandler
@@ -107,6 +101,8 @@ public class Forestry {
 		NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
 
 		PluginManager.runInit();
+
+		Proxies.render.registerItemAndBlockColors();
 	}
 
 	@EventHandler
@@ -137,23 +133,4 @@ public class Forestry {
 	public void processIMCMessages(IMCEvent event) {
 		PluginManager.processIMCMessages(event.getMessages());
 	}
-
-	@EventHandler
-	public void missingMapping(FMLMissingMappingsEvent event) {
-		for (MissingMapping mapping : event.get()) {
-			if (mapping.type == Type.BLOCK) {
-				Block block = GameRegistry.findBlock(Constants.MOD, StringUtil.cleanTags(mapping.name));
-				if (block != null) {
-					mapping.remap(block);
-					Log.warning("Remapping block " + mapping.name + " to " + StringUtil.cleanBlockName(block));
-				}
-			} else {
-				Item item = GameRegistry.findItem(Constants.MOD, StringUtil.cleanTags(mapping.name));
-				if (item != null) {
-					mapping.remap(item);
-					Log.warning("Remapping item " + mapping.name + " to " + StringUtil.cleanItemName(item));
-				}
-			}
-		}
-	}
 }

src/main/java/forestry/api/LICENSE.txt

@@ -0,0 +1,11 @@
+License („MIT“)
+
+Forestry API
+
+Copyright (c) 2011 - 2014 SirSengir.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/main/java/forestry/api/README.md

@@ -0,0 +1,26 @@
+Forestry API
+====================================
+
+### What is it?
+
+Forestry is a modification for the game Minecraft and known primarily for its farms and bees. This is the API for inter-mod operations.
+
+### Homepage
+
+[Wiki](http://forestry.sengir.net/)
+
+[Forums](http://forestry.sengir.net/forum/)
+
+[IRC #forestry on esper.net](http://webchat.esper.net/?nick=ForestryWiki...&channels=forestry&prompt=1)
+
+### Notes
+
+This is only the API. It is not intended to be used by itself, but rather for use either with Forestry itself or another mod which wants to use a functionality of Forestry.
+
+Package versioning follows the rules laid out by http://semver.org/
+
+Bugfixes are generally welcome. If you want to contribute something which changes game mechanics, please talk to someone with commit privileges first. Nothing is more frustrating than putting a lot of work and effort into a new game mechanic and then having the PR rejected because it doesn’t fit gameplay-wise.
+
+### License & Copyright
+
+Forestry API is (c) 2011 - 2014 SirSengir and licensed under MIT. See the LICENSE.txt for more information. Note that the core Forestry source is licensed differently! The Forestry API may also contain code contributed by CovertJaguar, Player, MysteriousAges, Binnie and others.

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

@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.minecraft.item.ItemStack;
+
+/**
+ *
+ * Some miscellaneous lists and settings for bees.
+ *
+ * @author SirSengir
+ */
+public class BeeManager {
+
+	/**
+	 * Common Village Bees
+	 */
+	public static List<IBeeGenome> commonVillageBees;
+	/**
+	 * Uncommon Village Bees (20 % of spawns)
+	 */
+	public static List<IBeeGenome> uncommonVillageBees;
+
+	/**
+	 * List of items that can induce swarming. Integer denotes x in 1000 chance.
+	 */
+	@Nonnull
+	public static final Map<ItemStack, Integer> inducers = new HashMap<>();
+
+	/**
+	 * 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;
+
+	/**
+	 * Used to check whether a player is wearing Apiarist Armor.
+	 */
+	public static IArmorApiaristHelper armorApiaristHelper;
+}

src/main/java/forestry/api/apiculture/DefaultBeeListener.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.apiculture;
+
+import forestry.api.genetics.IIndividual;
+
+/**
+ * Easily extendable default IBeeListener.
+ * By itself, this IBeeListener does nothing.
+ * BeeListeners should inherit from this class unless they need to listen for everything.
+ */
+public class DefaultBeeListener implements IBeeListener {
+	@Override
+	public void wearOutEquipment(int amount) {
+
+	}
+
+	@Override
+	public void onQueenDeath() {
+
+	}
+
+	@Override
+	public boolean onPollenRetrieved(IIndividual pollen) {
+		return false;
+	}
+
+}

src/main/java/forestry/api/apiculture/DefaultBeeModifier.java

@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+/**
+ * Easily extendable default IBeeModifier.
+ * By itself, this IBeeModifier does nothing.
+ * BeeModifiers should inherit from this class unless they modify everything.
+ */
+public class DefaultBeeModifier implements IBeeModifier {
+
+	@Override
+	public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
+
+	@Override
+	public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return 1.0f;
+	}
+
+	@Override
+	public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return 1.0f;
+	}
+
+	@Override
+	public float getProductionModifier(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
+
+	@Override
+	public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
+
+	@Override
+	public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
+
+	@Override
+	public boolean isSealed() {
+		return false;
+	}
+
+	@Override
+	public boolean isSelfLighted() {
+		return false;
+	}
+
+	@Override
+	public boolean isSunlightSimulated() {
+		return false;
+	}
+
+	@Override
+	public boolean isHellish() {
+		return false;
+	}
+
+}

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

@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * 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;
+
+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),
+	/**
+	 * If true, a naturally diurnal bee can work during the night. If true, a naturally nocturnal bee can work during the day.
+	 */
+	NEVER_SLEEPS(IAlleleBoolean.class),
+	/**
+	 * Humidity difference to its native supported one the bee can tolerate.
+	 */
+	HUMIDITY_TOLERANCE(IAlleleTolerance.class),
+	/**
+	 * If true the bee can work during rain.
+	 */
+	TOLERATES_RAIN(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);
+	
+	private final Class<? extends IAllele> alleleClass;
+	
+	EnumBeeChromosome(Class<? extends IAllele> alleleClass) {
+		this.alleleClass = alleleClass;
+	}
+
+	@Override
+	public Class<? extends IAllele> getAlleleClass() {
+		return alleleClass;
+	}
+
+	@Override
+	public String getName() {
+		return this.toString().toLowerCase(Locale.ENGLISH);
+	}
+
+	@Override
+	public ISpeciesRoot getSpeciesRoot() {
+		return BeeManager.beeRoot;
+	}
+}

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

@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * 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;
+
+import forestry.api.genetics.ISpeciesType;
+
+public enum EnumBeeType implements ISpeciesType {
+	DRONE, PRINCESS, QUEEN, LARVAE;
+
+	public static final EnumBeeType[] VALUES = values();
+
+	String name;
+
+	EnumBeeType() {
+		this.name = this.toString().toLowerCase(Locale.ENGLISH);
+	}
+
+	public String getName() {
+		return name;
+	}
+}

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

@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * 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.IFlowerRegistry;
+
+public class FlowerManager {
+	/**
+	 * <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/main/java/forestry/api/apiculture/IAlleleBeeEffect.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;
+
+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. (server)
+	 *
+	 * @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 visual bee effects. (client)
+	 *
+	 * @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 doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
+	
+}

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

@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * 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.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import forestry.api.core.IModelManager;
+import forestry.api.genetics.IAlleleSpecies;
+
+public interface IAlleleBeeSpecies extends IAlleleSpecies {
+
+	/**
+	 * @return the IBeeRoot
+	 */
+	@Override
+	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)
+	ModelResourceLocation getModel(EnumBeeType type);
+	
+	@SideOnly(Side.CLIENT)
+	void registerModels(Item item, IModelManager manager);
+
+	/**
+	 * @deprecated since Forestry 3.6.
+	 * @return Path of the texture to use for entity rendering.
+	 */
+	@Deprecated
+	String getEntityTexture();
+
+}

src/main/java/forestry/api/apiculture/IAlleleBeeSpeciesBuilder.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.IAlleleSpeciesBuilder;
+
+public interface IAlleleBeeSpeciesBuilder extends IAlleleSpeciesBuilder {
+
+	@Override
+	IAlleleBeeSpecies build();
+
+	/**
+	 * Add a product for this bee species.
+	 * Chance is between 0 and 1.
+	 */
+	IAlleleBeeSpeciesBuilder 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.
+	 */
+	IAlleleBeeSpeciesBuilder addSpecialty(ItemStack specialty, Float chance);
+
+	/**
+	 * Set the Jubilance Provider for this bee species.
+	 * Bees only produce their specialty when they are Jubilant (see IJubilanceProvider)
+	 */
+	IAlleleBeeSpeciesBuilder setJubilanceProvider(IJubilanceProvider provider);
+
+	/**
+	 * Make this species only active at night.
+	 */
+	IAlleleBeeSpeciesBuilder setNocturnal();
+
+	/** Use this if you have custom icons for bees. */
+	IAlleleBeeSpeciesBuilder setCustomBeeModelProvider(IBeeModelProvider beeIconProvider);
+
+	/** Use this if you have custom icon colours for bees (other than the default static primary + secondary colours). */
+	IAlleleBeeSpeciesBuilder setCustomBeeSpriteColourProvider(IBeeSpriteColourProvider beeIconColourProvider);
+}

src/main/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/main/java/forestry/api/apiculture/IArmorApiarist.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.apiculture;
+
+import net.minecraft.entity.EntityLivingBase;
+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 entity Entity 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
+	 */
+	boolean protectEntity(EntityLivingBase entity, ItemStack armor, String cause, boolean doProtect);
+}

src/main/java/forestry/api/apiculture/IArmorApiaristHelper.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 net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+
+/**
+ * Helper class for checking whether an entity is wearing Apiarist Armor
+ *
+ * @author Vexatos
+ */
+public interface IArmorApiaristHelper {
+
+	/**
+	 * Called when the apiarist's armor acts as protection against an attack.
+	 * @param stack ItemStack to check
+	 * @param entity Entity being attacked
+	 * @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 item is valid Apiarist Armor and should protect the player from that attack
+	 * @since Forestry 4.2
+	 */
+	boolean isArmorApiarist(ItemStack stack, EntityLivingBase entity, String cause, boolean doProtect);
+
+	/**
+	 * Called when the apiarist's armor acts as protection against an attack.
+	 * @param entity Entity being attacked
+	 * @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 The number of valid Apiarist Armor pieces the player is wearing that are actually protecting.
+	 * 			4 means full protection, but it can go higher if they are holding items like the smoker.
+	 * @since Forestry 4.2
+	 */
+	int wearsItems(EntityLivingBase entity, String cause, boolean doProtect);
+}

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

@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Set;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.biome.Biome;
+
+import forestry.api.arboriculture.ITree;
+import forestry.api.core.IErrorState;
+import forestry.api.genetics.IEffectData;
+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.
+	 */
+	@Nonnull
+	@Override
+	IBeeGenome getGenome();
+
+	/**
+	 * @return Genetic information of the bee's mate, null if unmated.
+	 */
+	@Nullable
+	@Override
+	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 an empty set if the queen can work, a set of error states if the queen can not work
+	 */
+	Set<IErrorState> getCanWork(IBeeHousing housing);
+
+	List<Biome> getSuitableBiomes();
+
+	ItemStack[] getProduceList();
+
+	ItemStack[] getSpecialtyList();
+
+	ItemStack[] produceStacks(IBeeHousing housing);
+
+	IBee spawnPrincess(IBeeHousing housing);
+
+	IBee[] spawnDrones(IBeeHousing housing);
+
+	void plantFlowerRandom(IBeeHousing housing);
+
+	ITree retrievePollen(IBeeHousing housing);
+
+	boolean pollinateRandom(IBeeHousing housing, ITree pollen);
+
+}

src/main/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 IAlleleBeeSpeciesBuilder and IAlleleSpeciesBuilder 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.
+	 */
+	IAlleleBeeSpeciesBuilder 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/main/java/forestry/api/apiculture/IBeeGenome.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.apiculture;
+
+import net.minecraft.util.math.Vec3i;
+
+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 {
+
+	@Override
+	IAlleleBeeSpecies getPrimary();
+	
+	@Override
+	IAlleleBeeSpecies getSecondary();
+
+	float getSpeed();
+
+	int getLifespan();
+
+	int getFertility();
+
+	EnumTolerance getToleranceTemp();
+
+	EnumTolerance getToleranceHumid();
+
+	boolean getNeverSleeps();
+
+	boolean getToleratesRain();
+
+	boolean getCaveDwelling();
+
+	IFlowerProvider getFlowerProvider();
+
+	int getFlowering();
+
+	Vec3i getTerritory();
+
+	IAlleleBeeEffect getEffect();
+
+}

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

@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * 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.util.math.Vec3d;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+
+import com.mojang.authlib.GameProfile;
+
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+import forestry.api.core.IErrorLogicSource;
+import forestry.api.genetics.IHousing;
+
+public interface IBeeHousing extends IHousing, IErrorLogicSource {
+
+	/**
+	 * Used by BeeManager.beeRoot.createBeeHousingModifier(IBeeHousing housing)
+	 * to combine bee modifiers from several sources that can change over time.
+	 * @return IBeeModifiers from the housing, frames, etc.
+	 */
+	Iterable<IBeeModifier> getBeeModifiers();
+
+	/**
+	 * Used by BeeManager.beeRoot.createBeeHousingListener(IBeeHousing housing)
+	 * to combine bee listeners from several sources that can change over time.
+	 * @return IBeeListeners from the housing, multiblock parts, etc.
+	 */
+	Iterable<IBeeListener> getBeeListeners();
+
+	IBeeHousingInventory getBeeInventory();
+
+	IBeekeepingLogic getBeekeepingLogic();
+
+	EnumTemperature getTemperature();
+
+	EnumHumidity getHumidity();
+
+	int getBlockLightValue();
+
+	boolean canBlockSeeTheSky();
+
+	/** Must not be named "getWorld" to avoid SpecialSource issue https://github.com/md-5/SpecialSource/issues/12 */
+	World getWorldObj();
+
+	Biome getBiome();
+
+	GameProfile getOwner();
+
+	/**
+	 * @since Forestry 4.2
+	 * @return exact coordinates where bee FX should spawn from
+	 */
+	Vec3d getBeeFXCoordinates();
+}

src/main/java/forestry/api/apiculture/IBeeHousingInventory.java

@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * 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 IBeeHousingInventory {
+
+	ItemStack getQueen();
+
+	ItemStack getDrone();
+
+	void setQueen(ItemStack itemstack);
+
+	void setDrone(ItemStack itemstack);
+
+	/**
+	 * Adds products to the housing's inventory.
+	 *
+	 * @param product ItemStack with the product to add.
+	 * @param all if true, success requires that all products are added
+	 * @return boolean indicating success or failure.
+	 */
+	boolean addProduct(ItemStack product, boolean all);
+}

src/main/java/forestry/api/apiculture/IBeeListener.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.IIndividual;
+
+public interface IBeeListener {
+
+	/**
+	 * Called when the bees wear out the housing's equipment.
+	 * @param amount Integer indicating the amount worn out.
+	 */
+	void wearOutEquipment(int amount);
+
+	/**
+	 * Called after the children have been spawned, and before the new princess is spawned.
+	 */
+	void onQueenDeath();
+
+	/**
+	 * Called when the bees have retrieved some pollen.
+	 * @return true if this bee listener handled the pollen.
+	 */
+	boolean onPollenRetrieved(IIndividual pollen);
+
+}

src/main/java/forestry/api/apiculture/IBeeModelProvider.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.apiculture;
+
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.core.IModelManager;
+
+public interface IBeeModelProvider {
+	@SideOnly(Side.CLIENT)
+	void registerModels(Item item, IModelManager manager);
+
+	@SideOnly(Side.CLIENT)
+	ModelResourceLocation getModel(EnumBeeType type);
+}

src/main/java/forestry/api/apiculture/IBeeModifier.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;
+
+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 Genome of the bee mate this modifier is called for.
+	 * @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/main/java/forestry/api/apiculture/IBeeMutation.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.apiculture;
+
+import forestry.api.genetics.IMutation;
+
+public interface IBeeMutation extends IMutation {
+	
+	@Override
+	IBeeRoot getRoot();
+	
+	/**
+	 * @return float representing the chance for mutation to occur. note that this is 0 - 100 based, since it was an integer previously!
+	 */
+	float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, IBeeGenome genome0, IBeeGenome genome1);
+}

src/main/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/main/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/main/java/forestry/api/apiculture/IBeeRoot.java

@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import javax.annotation.Nullable;
+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.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.
+	 */
+	@Override
+	IApiaristTracker getBreedingTracker(World world, GameProfile player);
+
+	/* BEE SPECIFIC */
+
+	/**
+	 * @return type of bee encoded on the itemstack. EnumBeeType.NONE if it isn't a bee.
+	 */
+	@Nullable
+	@Override
+	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(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 */
+
+	/**
+	 * Creates beekeepingLogic for a housing.
+	 * Should be used when the housing is created, see IBeekeepingLogic
+	 */
+	IBeekeepingLogic createBeekeepingLogic(IBeeHousing housing);
+
+	/**
+	 * Combines multiple modifiers from an IBeeHousing into one.
+	 * Stays up to date with changes to the housing's modifiers.
+	 */
+	IBeeModifier createBeeHousingModifier(IBeeHousing housing);
+
+	/**
+	 * Combines multiple listeners from an IBeeHousing into one.
+	 * Stays up to date with changes to the housing's listeners.
+	 */
+	IBeeListener createBeeHousingListener(IBeeHousing housing);
+
+}

src/main/java/forestry/api/apiculture/IBeeSpriteColourProvider.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;
+
+/**
+ * Custom colour provider for bees with complicated colors.
+ */
+public interface IBeeSpriteColourProvider {
+	int getSpriteColour(int renderPass);
+}

src/main/java/forestry/api/apiculture/IBeekeepingLogic.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.apiculture;
+
+import javax.annotation.Nonnull;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.math.BlockPos;
+
+import forestry.api.core.INbtReadable;
+import forestry.api.core.INbtWritable;
+
+/**
+ * Stores beekeeping logic for bee housings.
+ * Get one with BeeManager.beeRoot.createBeekeepingLogic(IBeeHousing housing)
+ * Save and load it to NBT using the INbtWritable methods.
+ */
+public interface IBeekeepingLogic extends INbtWritable, INbtReadable {
+
+	/* SERVER */
+
+	/**
+	 * Checks that the bees can work, setting error conditions on the housing where needed
+	 * @return true if no errors are present and doWork should be called
+	 */
+	boolean canWork();
+
+	/**
+	 * Performs actual work, breeding, production, etc.
+	 */
+	void doWork();
+
+
+	/* CLIENT */
+
+	/**
+	 * Sync to client by using {@link #writeToNBT(NBTTagCompound)} in your {@link TileEntity#getUpdateTag()}
+	 */
+	void syncToClient();
+
+	void syncToClient(EntityPlayerMP player);
+
+	/**
+	 * Get the progress bar for breeding and production.
+	 * To avoid network spam, this is only available server-side,
+	 * and must be synced manually to the client when a GUI is open.
+	 */
+	int getBeeProgressPercent();
+
+	/**
+	 * Whether bee fx should be active.
+	 * Internally, this is automatically synced to the client.
+	 */
+	boolean canDoBeeFX();
+
+	/**
+	 * Display bee fx. Calls IBee.doFX(IEffectData[] storedData, IBeeHousing housing) on the queen.
+	 * Internally, the queen is automatically synced to the client for the fx.
+	 */
+	void doBeeFX();
+
+	/**
+	 * Used by bee fx to direct bees to nearby flowers.
+	 * These positions are synced to the client from the server.
+	 */
+	@Nonnull
+	List<BlockPos> getFlowerPositions();
+}

src/main/java/forestry/api/apiculture/IBeekeepingMode.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.apiculture;
+
+import java.util.ArrayList;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public interface IBeekeepingMode {
+
+	/**
+	 * @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, BlockPos pos);
+
+	/**
+	 * @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);
+
+	/**
+	 * @return the bee modifier for this mode
+	 */
+	IBeeModifier getBeeModifier();
+}

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

@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * 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.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
+
+/**
+ * Bees can be seeded either as hive drops or as mutation results.
+ *
+ * Add IHiveDrops with HiveManager.get___Hive.addDrop
+ *
+ * @author SirSengir
+ */
+public interface IHiveDrop {
+
+	IBee getBeeType(IBlockAccess world, BlockPos pos);
+
+	Collection<ItemStack> getExtraItems(IBlockAccess world, BlockPos pos, int fortune);
+
+	/**
+	 * Chance to drop a bee or extra items. Default drops have 0.80 (= 80 %).
+	 *
+	 * @param world Minecraft world this is called for.
+	 * @param pos Coordinates of the broken hive.
+	 * @return Chance for drop as a float of 0.0 - 1.0.
+	 */
+	double getChance(IBlockAccess world, BlockPos pos, int fortune);
+
+	/**
+	 * Chance for the princess to be ignoble. Default is around 0.4 to 0.7 (40% - 70%).
+	 *
+	 * @param world Minecraft world this is called for.
+	 * @param pos Coordinates of the broken hive.
+	 * @return Chance for ignoble as a float of 0.0 - 1.0.
+	 */
+	double getIgnobleChance(IBlockAccess world, BlockPos pos, int fortune);
+}

src/main/java/forestry/api/apiculture/IHiveFrame.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 net.minecraft.item.ItemStack;
+
+public interface IHiveFrame {
+
+	/**
+	 * 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, or null if it has been broken.
+	 */
+	ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear);
+
+	IBeeModifier getBeeModifier();
+}

src/main/java/forestry/api/apiculture/IHiveTile.java

@@ -0,0 +1,25 @@
+package forestry.api.apiculture;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public interface IHiveTile {
+	/**
+	 * Call to calm agitated bees. Used by the smoker to stop wild bees from attacking as much.
+	 * Bees will not stay calm for very long.
+	 */
+	void calmBees();
+
+	boolean isAngry();
+
+	/**
+	 * Called when the hive is attacked.
+	 */
+	void onAttack(World world, BlockPos pos, EntityPlayer player);
+
+	/**
+	 * Called when the hive is broken.
+	 */
+	void onBroken(World world, BlockPos pos, EntityPlayer player, boolean canHarvest);
+}

src/main/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/main/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/main/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/main/java/forestry/api/apiculture/hives/IHiveDescription.java

@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * 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.state.IBlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+
+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.
+	 */
+	IBlockState getBlockState();
+
+	/**
+	 * 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(Biome 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, BlockPos pos);
+}

src/main/java/forestry/api/apiculture/hives/IHiveGen.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.apiculture.hives;
+
+import javax.annotation.Nullable;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public interface IHiveGen {
+
+	/**
+	 * return a position that the hive should try to generate at.
+	 * returns null if the hive can't be placed anywhere.
+	 */
+	@Nullable
+	BlockPos getPosForHive(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, BlockPos pos);
+
+	/**
+	 * returns true if the hive can safely replace the block at this location.
+	 */
+	boolean canReplace(IBlockState blockState, World world, BlockPos pos);
+
+}

src/main/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/main/java/forestry/api/apiculture/hives/IHiveRegistry.java

@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * 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 javax.annotation.Nonnull;
+import java.util.List;
+import java.util.Locale;
+
+import net.minecraft.util.IStringSerializable;
+
+import forestry.api.apiculture.IHiveDrop;
+
+public interface IHiveRegistry {
+
+	/* Forestry Hive Names */
+	enum HiveType implements IStringSerializable {
+		FOREST("forestry:forest", "forestry.speciesForest"),
+		MEADOWS("forestry:meadows", "forestry.speciesMeadows"),
+		DESERT("forestry:desert", "forestry.speciesModest"),
+		JUNGLE("forestry:jungle", "forestry.speciesTropical"),
+		END("forestry:end", "forestry.speciesEnded"),
+		SNOW("forestry:snow", "forestry.speciesWintry"),
+		SWAMP("forestry:swamp", "forestry.speciesMarshy"),
+		SWARM("forestry:swarm", "forestry.speciesForest");
+		
+		public static final HiveType[] VALUES = values();
+
+		@Nonnull
+		private final String hiveUid;
+		@Nonnull
+		private final String speciesUid;
+
+		HiveType(@Nonnull String hiveUid, @Nonnull String speciesUid) {
+			this.hiveUid = hiveUid;
+			this.speciesUid = speciesUid;
+		}
+
+		@Nonnull
+		public String getHiveUid() {
+			return hiveUid;
+		}
+
+		@Nonnull
+		public String getSpeciesUid() {
+			return speciesUid;
+		}
+
+		@Override
+		public String getName() {
+			return name().toLowerCase(Locale.ENGLISH);
+		}
+
+		public int getMeta() {
+			return ordinal();
+		}
+		
+	}
+
+	/**
+	 * 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/main/java/forestry/api/apiculture/hives/package-info.java

@@ -0,0 +1,9 @@
+/*******************************************************************************
+ * 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 net.minecraftforge.fml.common.API;

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

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

src/main/java/forestry/api/arboriculture/EnumForestryWoodType.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 javax.annotation.Nonnull;
+import java.util.Locale;
+import java.util.Random;
+
+public enum EnumForestryWoodType implements IWoodType {
+	LARCH, TEAK, ACACIA, LIME,
+	CHESTNUT, WENGE, BAOBAB, SEQUOIA(4.0f),
+
+	KAPOK, EBONY, MAHOGANY, BALSA(1.0f),
+	WILLOW, WALNUT, GREENHEART(7.5f), CHERRY,
+
+	MAHOE, POPLAR, PALM, PAPAYA,
+	PINE(3.0f), PLUM, MAPLE, CITRUS,
+
+	GIGANTEUM, IPE, PADAUK, COCOBOLO,
+	ZEBRAWOOD;
+
+	public static final float DEFAULT_HARDNESS = 2.0f;
+	public static final EnumForestryWoodType[] VALUES = values();
+
+	private final float hardness;
+
+	EnumForestryWoodType() {
+		this(DEFAULT_HARDNESS);
+	}
+
+	EnumForestryWoodType(float hardness) {
+		this.hardness = hardness;
+	}
+
+	@Override
+	public float getHardness() {
+		return hardness;
+	}
+	
+	public static EnumForestryWoodType getRandom(Random random) {
+		return VALUES[random.nextInt(VALUES.length)];
+	}
+
+	@Override
+	public String toString() {
+		return super.toString().toLowerCase(Locale.ENGLISH);
+	}
+	
+	@Override
+	public String getName() {
+		return toString();
+	}
+
+	@Override
+	public int getMetadata() {
+		return ordinal();
+	}
+
+	@Nonnull
+	public static EnumForestryWoodType byMetadata(int meta) {
+		if (meta < 0 || meta >= VALUES.length) {
+			meta = 0;
+		}
+		return VALUES[meta];
+	}
+}

src/main/java/forestry/api/arboriculture/EnumFruitFamily.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.arboriculture;
+
+import net.minecraft.util.text.translation.I18n;
+
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IFruitFamily;
+
+public enum EnumFruitFamily implements IFruitFamily {
+	PRUNES("prunes", "Prunus domestica"),
+	POMES("pomes", "Pomum"),
+	JUNGLE("jungle", "Tropicus"),
+	NUX("nuts", "Nux");
+
+	private final String uid;
+	private final String scientific;
+
+	EnumFruitFamily(String uid, String scientific) {
+		this.uid = uid;
+		this.scientific = scientific;
+		AlleleManager.alleleRegistry.registerFruitFamily(this);
+	}
+
+	@Override
+	public String getUID() {
+		return "forestry." + uid;
+	}
+
+	@Override
+	public String getScientific() {
+		return this.scientific;
+	}
+
+	@Override
+	public String getName() {
+		return I18n.translateToLocal("for.family." + uid);
+	}
+
+	@Override
+	public String getDescription() {
+		return I18n.translateToLocal("for.family." + uid + ".description");
+	}
+
+}

src/main/java/forestry/api/arboriculture/EnumGermlingType.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.arboriculture;
+
+import forestry.api.genetics.ISpeciesType;
+
+public enum EnumGermlingType implements ISpeciesType {
+	SAPLING("sapling"), POLLEN("pollen");
+
+	public static final EnumGermlingType[] VALUES = values();
+	
+	private final String name;
+
+	EnumGermlingType(String name) {
+		this.name = name;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+}

src/main/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/main/java/forestry/api/arboriculture/EnumLeafType.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 EnumLeafType {
+	DECIDUOUS, CONIFERS, JUNGLE, WILLOW, MAPLE, PALM
+}

src/main/java/forestry/api/arboriculture/EnumPileType.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.arboriculture;
+
+public enum EnumPileType{
+	WOOD,
+	DIRT,
+	ASH;
+	
+	public static final EnumPileType[] VALUES = values();
+}

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

@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * 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.Locale;
+
+import net.minecraftforge.common.EnumPlantType;
+
+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;
+
+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 EnumPlantType}.
+	 */
+	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),
+	/**
+	 * The combustibility of the wood, when it burn to charcoal and the combustibility of the charcoal.
+	 */
+	COMBUSTIBILITY(IAlleleInteger.class),
+	/**
+	 * The amount of charcoal that a wood pile ash drop;
+	 */
+	CARBONIZATION(IAlleleInteger.class),
+	/**
+	 * Determines if the tree can burn.
+	 */
+	FIREPROOF(IAlleleBoolean.class),;
+	
+	Class<? extends IAllele> alleleClass;
+	
+	EnumTreeChromosome(Class<? extends IAllele> alleleClass) {
+		this.alleleClass = alleleClass;
+	}
+
+	@Override
+	public Class<? extends IAllele> getAlleleClass() {
+		return alleleClass;
+	}
+
+	@Override
+	public String getName() {
+		return this.toString().toLowerCase(Locale.ENGLISH);
+	}
+
+	@Override
+	public ISpeciesRoot getSpeciesRoot() {
+		return TreeManager.treeRoot;
+	}
+
+}

src/main/java/forestry/api/arboriculture/EnumVanillaWoodType.java

@@ -0,0 +1,60 @@
+package forestry.api.arboriculture;
+
+import javax.annotation.Nonnull;
+import java.util.Locale;
+import java.util.Random;
+
+import net.minecraft.block.BlockPlanks;
+
+public enum EnumVanillaWoodType implements IWoodType {
+	OAK(BlockPlanks.EnumType.OAK),
+	SPRUCE(BlockPlanks.EnumType.SPRUCE),
+	BIRCH(BlockPlanks.EnumType.BIRCH),
+	JUNGLE(BlockPlanks.EnumType.JUNGLE),
+	ACACIA(BlockPlanks.EnumType.ACACIA),
+	DARK_OAK(BlockPlanks.EnumType.DARK_OAK);
+
+	public static final EnumVanillaWoodType[] VALUES = values();
+
+	public static EnumVanillaWoodType getRandom(Random random) {
+		return VALUES[random.nextInt(VALUES.length)];
+	}
+
+	private final BlockPlanks.EnumType vanillaType;
+
+	EnumVanillaWoodType(BlockPlanks.EnumType vanillaType) {
+		this.vanillaType = vanillaType;
+	}
+
+	public BlockPlanks.EnumType getVanillaType() {
+		return vanillaType;
+	}
+
+	@Override
+	public String toString() {
+		return super.toString().toLowerCase(Locale.ENGLISH);
+	}
+
+	@Override
+	public String getName() {
+		return toString();
+	}
+
+	@Override
+	public int getMetadata() {
+		return ordinal();
+	}
+
+	@Nonnull
+	public static EnumVanillaWoodType byMetadata(int meta) {
+		if (meta < 0 || meta >= VALUES.length) {
+			meta = 0;
+		}
+		return VALUES[meta];
+	}
+
+	@Override
+	public float getHardness() {
+		return 2.0F;
+	}
+}

src/main/java/forestry/api/arboriculture/IAlleleFruit.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.arboriculture;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import forestry.api.genetics.IAlleleProperty;
+
+/**
+ * Simple allele encapsulating an {@link IFruitProvider}.
+ */
+public interface IAlleleFruit extends IAlleleProperty<IAlleleFruit> {
+
+	@Nonnull
+	IFruitProvider getProvider();
+
+	@Nullable
+	String getModelName();
+
+	@Nonnull
+	String getModID();
+
+}

src/main/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/main/java/forestry/api/arboriculture/IAlleleLeafEffect.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.arboriculture;
+
+import net.minecraft.util.math.BlockPos;
+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, BlockPos pos);
+
+}

src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.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.arboriculture;
+
+import javax.annotation.Nonnull;
+import java.util.Collection;
+
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
+
+import net.minecraftforge.common.EnumPlantType;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.core.IModelManager;
+import forestry.api.genetics.IAlleleProperty;
+import forestry.api.genetics.IAlleleSpecies;
+import forestry.api.genetics.IFruitFamily;
+
+public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty<IAlleleTreeSpecies> {
+
+	@Nonnull
+	@Override
+	ITreeRoot getRoot();
+	
+	/**
+	 * @return Native plant type of this species.
+	 */
+	@Nonnull
+	EnumPlantType getPlantType();
+
+	/**
+	 * @return List of all {@link IFruitFamily}s which can grow on leaves generated by this species.
+	 */
+	@Nonnull
+	Collection<IFruitFamily> getSuitableFruit();
+
+	/**
+	 * @return Tree generator for this species.
+	 */
+	@Nonnull
+	ITreeGenerator getGenerator();
+	
+	/**
+	 * @return The modid from the mod of the species.
+	 */
+	@Nonnull
+	String getModID();
+	
+	IWoodProvider getWoodProvider();
+	
+	/* MODELS AND OVERRIDES */
+	@SideOnly(Side.CLIENT)
+	@Nonnull
+	ILeafSpriteProvider getLeafSpriteProvider();
+	
+	@SideOnly(Side.CLIENT)
+	int getGermlingColour(EnumGermlingType type, int renderPass);
+
+	@SideOnly(Side.CLIENT)
+	@Nonnull
+	ModelResourceLocation getGermlingModel(EnumGermlingType type);
+	
+	@SideOnly(Side.CLIENT)
+	void registerModels(Item item, IModelManager manager, EnumGermlingType type);
+
+}

src/main/java/forestry/api/arboriculture/IAlleleTreeSpeciesBuilder.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.minecraftforge.common.EnumPlantType;
+
+import forestry.api.genetics.IAlleleSpeciesBuilder;
+import forestry.api.genetics.IFruitFamily;
+
+public interface IAlleleTreeSpeciesBuilder extends IAlleleSpeciesBuilder {
+
+	@Override
+	IAlleleTreeSpecies build();
+
+	/** Add a fruit family for this tree. Trees can have multiple fruit families. */
+	IAlleleTreeSpeciesBuilder addFruitFamily(IFruitFamily family);
+
+	/** Set the minecraft plant type for this tree. Default is Plains. */
+	IAlleleTreeSpeciesBuilder setPlantType(EnumPlantType type);
+
+}

src/main/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/main/java/forestry/api/arboriculture/IFruitProvider.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.arboriculture;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.genetics.IFruitFamily;
+
+public interface IFruitProvider {
+
+	IFruitFamily getFamily();
+
+	int getColour(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime);
+
+	/** return the color to use for decorative leaves. Usually the ripe color. */
+	int getDecorativeColor();
+
+	boolean isFruitLeaf(ITreeGenome genome, World world, BlockPos pos);
+
+	int getRipeningPeriod();
+
+	// / Products, Chance
+	@Nonnull
+	Map<ItemStack, Float> getProducts();
+
+	// / Specialty, Chance
+	@Nonnull
+	Map<ItemStack, Float> getSpecialty();
+
+	@Nonnull
+	List<ItemStack> getFruits(ITreeGenome genome, World world, BlockPos pos, int ripeningTime);
+
+	/**
+	 * @return Short, human-readable identifier used in the treealyzer.
+	 */
+	String getDescription();
+
+	@Nullable
+	String getModelName();
+
+	@Nonnull
+	String getModID();
+
+	/* TEXTURE OVERLAY */
+
+	/**
+	 * @param ripeningTime Elapsed ripening time for the fruit.
+	 * @return ResourceLocation of the texture to overlay on the leaf block.
+	 */
+	@Nullable
+	ResourceLocation getSprite(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime);
+
+	/** return the ResourceLocation to display on decorative leaves */
+	@Nullable
+	ResourceLocation getDecorativeSprite();
+
+	/**
+	 * @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.
+	 * Spawning a fruit has a random chance of success based on {@link ITreeGenome#getSappiness()}
+	 *
+	 * @return true if a fruit block was spawned, false otherwise.
+	 */
+	boolean trySpawnFruitBlock(ITreeGenome genome, World world, Random rand, BlockPos pos);
+
+	@SideOnly(Side.CLIENT)
+	void registerSprites();
+}

src/main/java/forestry/api/arboriculture/IGermlingModelProvider.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.arboriculture;
+
+import javax.annotation.Nonnull;
+
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
+
+import forestry.api.core.IModelManager;
+
+/**
+ * Provides icons for saplings, pollen, etc.
+ * You must implement this yourself to use TreeManager.treeFactory.createSpecies()
+ * There is no default implementation because every sapling has a unique icon.
+ */
+public interface IGermlingModelProvider {
+	void registerModels(Item item, IModelManager manager, EnumGermlingType type);
+
+	@Nonnull
+	ModelResourceLocation getModel(EnumGermlingType type);
+}

src/main/java/forestry/api/arboriculture/IGrowthProvider.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.arboriculture;
+
+import javax.annotation.Nullable;
+
+import net.minecraft.util.math.BlockPos;
+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 pos Coordinates to attempt growth at.
+	 * @param expectedGirth Trunk size of the tree to generate.
+	 * @param expectedHeight Height of the tree to generate.
+	 * @return position that the tree can grow, null otherwise.
+	 */
+	@Nullable
+	BlockPos canGrow(ITreeGenome genome, World world, BlockPos pos, int expectedGirth, int expectedHeight);
+
+	EnumGrowthConditions getGrowthConditions(ITreeGenome genome, World world, BlockPos pos);
+
+	/**
+	 * @return Short, human-readable identifier used in the treealyzer.
+	 */
+	String getDescription();
+
+	/**
+	 * @return Detailed description of growth behaviour used in the treealyzer.
+	 */
+	String[] getInfo();
+
+}

src/main/java/forestry/api/arboriculture/ILeafSpriteProvider.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 javax.annotation.Nonnull;
+
+import net.minecraft.util.ResourceLocation;
+
+/**
+ * Provides icons for leaves. Used by TreeManager.treeFactory.createSpecies()
+ * Get a default Forestry implementation from TreeManager.treeFactory.getLeafIconProvider() or implement your own.
+ *
+ * If you implement your own, be sure to register the icons.
+ * Icon registration is not done here because these icons are heavily reused.
+ */
+public interface ILeafSpriteProvider {
+	@Nonnull
+	ResourceLocation getSprite(boolean pollinated, boolean fancy);
+
+	int getColor(boolean pollinated);
+}

src/main/java/forestry/api/arboriculture/ILeafTickHandler.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.arboriculture;
+
+import java.util.Random;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public interface ILeafTickHandler {
+	boolean onRandomLeafTick(ITree tree, World world, Random rand, BlockPos pos, boolean isDestroyed);
+}

src/main/java/forestry/api/arboriculture/IToolGrafter.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;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+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 pos 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, BlockPos pos);
+}

src/main/java/forestry/api/arboriculture/ITree.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.arboriculture;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+import com.mojang.authlib.GameProfile;
+
+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, BlockPos pos);
+
+	IEffectData[] doFX(IEffectData[] storedData, World world, BlockPos pos);
+
+	@Nonnull
+	@Override
+	ITreeGenome getGenome();
+
+	ITreeGenome getMate();
+
+	EnumSet<EnumPlantType> getPlantTypes();
+
+	/**
+	 * @since Forestry 4.0
+	 */
+	ITree[] getSaplings(World world, GameProfile playerProfile, BlockPos pos, float modifier);
+
+	// Products, Chance
+	@Nonnull
+	Map<ItemStack, Float> getProducts();
+
+	// Specialties, Chance
+	@Nonnull
+	Map<ItemStack, Float> getSpecialties();
+
+	@Nonnull
+	List<ItemStack> produceStacks(World world, BlockPos pos, int ripeningTime);
+
+	/**
+	 * @return Boolean indicating whether a sapling can stay planted at the given position.
+	 */
+	boolean canStay(IBlockAccess world, BlockPos pos);
+
+	/**
+	 * @return Position that this tree can grow. May be different from pos if there are multiple saplings.
+	 * Returns null if a sapling at the given position can not grow into a tree.
+	 */
+	@Override
+	@Nullable
+	BlockPos canGrow(World world, BlockPos pos, 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();
+	
+	/**
+	 * @return Integer denoting the size of the tree trunk.
+	 */
+	@Override
+	int getGirth(World world, BlockPos pos);
+
+	/**
+	 * @return Growth conditions at the given position.
+	 */
+	EnumGrowthConditions getGrowthCondition(World world, BlockPos pos);
+
+	WorldGenerator getTreeGenerator(World world, BlockPos pos, boolean wasBonemealed);
+
+	@Override
+	ITree copy();
+
+	boolean isPureBred(EnumTreeChromosome chromosome);
+
+	boolean canBearFruit();
+}

src/main/java/forestry/api/arboriculture/ITreeFactory.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.arboriculture;
+
+import javax.annotation.Nonnull;
+import java.awt.Color;
+
+import forestry.api.genetics.IClassification;
+
+public interface ITreeFactory {
+	/**
+	 * Creates a new tree species.
+	 * Automatically registered with AlleleManager.alleleRegistry.registerAllele()
+	 * See IAlleleTreeSpeciesBuilder and IAlleleSpeciesBuilder for adding additional properties to the returned species.
+	 *
+	 * @param uid Unique Identifier for this species
+	 * @param unlocalizedName Unlocalized name for this species
+	 * @param authority Authority for the binomial name, e.g. "Sengir" on species of base Forestry.
+	 * @param unlocalizedDescription Unlocalized description for this species
+	 * @param dominant Whether this species is genetically dominant (false means it is recessive)
+	 * @param branch Classification of this species
+	 * @param binomial Binomial name of the species sans genus. "humboldti" will have the bee species flavour name be "Apis humboldti". Feel free to use fun names or null.
+	 * @param modID The modID from the mod of the species
+	 * @param leafSpriteProvider The leaf sprite provider for this species
+	 * @param germlingModelProvider The germling model provider for this species
+	 * @param woodProvider The wood texture provider. It is used to get wood textures for the charcoal pile.
+	 * @param generator The tree generator
+	 * @return a new tree species allele.
+	 */
+	IAlleleTreeSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String modID, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, @Nonnull IWoodProvider woodProvider, ITreeGenerator generator);
+
+	/** Get one of the built-in Forestry leaf types. Default type is deciduous. */
+	ILeafSpriteProvider getLeafIconProvider(EnumLeafType enumLeafType, Color color, Color colorPollinated);
+}