Version 5.8.1 Release

Better zh_cn.lang translation file update.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,5 @@
+Thank you for reporting!
+
+For issues:
+ * Try the latest version, it may have fixed the issue already.
+ * If you crashed, please paste the crash log to [gist](https://gist.github.com/) and link it here.

.gitignore

@@ -2,15 +2,13 @@
 /*
 
 # folders
+!/.github
 !/forestry_techne
 !/gradle/wrapper
 !/src
-!/api
-!/test
 
 # files
 !/.gitignore
-!/.gitmodules
 !/CLA.txt
 !/CONTRIBUTING.md
 !/LICENSE.txt
@@ -21,4 +19,5 @@
 !/build.xml
 !/gradlew
 !/gradlew.bat
-.DS_Store
+!/cla-signatures.txt
+!/formatting-settings.jar

.gitmodules

@@ -1,9 +0,0 @@
-[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

@@ -1,4 +1,4 @@
-Forestry
+[Forestry](https://minecraft.curseforge.com/projects/forestry/files)
 ====================================
 
 ### What is it?
@@ -9,21 +9,26 @@ 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.11.2/1.12](http://jenkins.ic2.player.to/job/Forestry_1.11/)
 
-[IRC #forestry on esper.net](http://webchat.esper.net/?nick=ForestryGithub...&channels=forestry&prompt=1)
+[![Discord](https://img.shields.io/discord/417745379258400778.svg?colorB=7289DA&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHYAAABWAgMAAABnZYq0AAAACVBMVEUAAB38%2FPz%2F%2F%2F%2Bm8P%2F9AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfhBxwQJhxy2iqrAAABoElEQVRIx7WWzdGEIAyGgcMeKMESrMJ6rILZCiiBg4eYKr%2Fd1ZAfgXFm98sJfAyGNwno3G9sLucgYGpQ4OGVRxQTREMDZjF7ILSWjoiHo1n%2BE03Aw8p7CNY5IhkYd%2F%2F6MtO3f8BNhR1QWnarCH4tr6myl0cWgUVNcfMcXACP1hKrGMt8wcAyxide7Ymcgqale7hN6846uJCkQxw6GG7h2MH4Czz3cLqD1zHu0VOXMfZjHLoYvsdd0Q7ZvsOkafJ1P4QXxrWFd14wMc60h8JKCbyQvImzlFjyGoZTKzohwWR2UzSONHhYXBQOaKKsySsahwGGDnb%2FiYPJw22sCqzirSULYy1qtHhXGbtgrM0oagBV4XiTJok3GoLoDNH8ooTmBm7ZMsbpFzi2bgPGoXWXME6XT%2BRJ4GLddxJ4PpQy7tmfoU2HPN6cKg%2BledKHBKlF8oNSt5w5g5o8eXhu1IOlpl5kGerDxIVT%2BztzKepulD8utXqpChamkzzuo7xYGk%2FkpSYuviLXun5bzdRf0Krejzqyz7Z3p0I1v2d6HmA07dofmS48njAiuMgAAAAASUVORK5CYII%3D)](https://discord.gg/49XNRJk)
 
 For those interested in developement, you can also visit #forestry-dev.
 
 ### Building
 
-The API and localization files reside in their own repository. It is pulled in automatically.
+The localization files reside in their own repository. It is pulled in automatically.
 
 You may want to adjust the "./gradle.properties" file to set your mc account as needed.
 
-To setup, open a command line and run "gradlew setupDecompWorkspace" and "gradlew eclipse".
+To setup, open a command line and run "gradlew setupDecompWorkspace". Then run the following depending on your IDE:
 
-To package, open a command line and type "gradlew release".
+Eclipse: "gradlew eclipse"
+IntelliJ IDEA: "gradlew idea genIntellijRuns"
+
+To package, open a command line and type "gradlew build".
+
+For mod authors: the Forestry maven is located at http://maven.ic2.player.to/net/sengir/forestry/
 
 ### Notes
 

build.gradle

@@ -1,107 +1,76 @@
 buildscript {
 	repositories {
-		mavenCentral()
-		maven {
-			name = "forge"
-			url = "http://files.minecraftforge.net/maven"
-		}
-		maven {
-			name = "sonatype"
-			url = "https://oss.sonatype.org/content/repositories/snapshots/"
-		}
+		jcenter()
+		maven { url = "http://files.minecraftforge.net/maven" }
 	}
 	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.3-SNAPSHOT'
+		classpath "gradle.plugin.se.bjurr.gitchangelog:git-changelog-gradle-plugin:1.47"
 	}
 }
 
-apply plugin: 'forge'
+plugins {
+	id "com.matthewprenger.cursegradle" version "1.0.9"
+}
+apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'idea'
 apply plugin: 'maven'
-apply plugin: 'java'
+apply plugin: "se.bjurr.gitchangelog.git-changelog-gradle-plugin"
 
 version = version_major + '.' + version_minor + '.' + version_patch + '.' + getBuildNumber()
 if (project.hasProperty('buildQualifier')) {
 	version = project.version + '-' + project.buildQualifier
 }
-group= "net.sengir.forestry" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+group = "net.sengir.forestry" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 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 = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 minecraft {
 	version = mcversion + "-" + forgeversion
 	runDir = "run"
+	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
-		}
-	}
 }
 
 repositories {
+	maven {
+		url = 'http://maven.mcmoddev.com'
+	}
+	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 = "Modmuss50"
+		url = "http://maven.modmuss50.me"
 	}
 	maven {
-		name = "chickenbones"
-		url = "http://chickenbones.net/maven/"
-	}
-	maven{
-		name "tterrag Repo"
-		url "http://maven.tterrag.com/"
+		url = 'https://mod-buildcraft.com/maven'
 	}
 }
 
+dependencies {
+	deobfProvided "net.darkhax.tesla:Tesla-${tesla_mcversion}:${tesla_version}"
+	deobfProvided "mezz.jei:jei_${jei_mcversion}:${jei_version}:api"
+	runtimeOnly "mezz.jei:jei_${jei_mcversion}:${jei_version}"
+	deobfProvided "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
+	deobfProvided "TechReborn:TechReborn-${TR_mcversion}:${TR_version}:api"
+	deobfProvided "com.mod-buildcraft:buildcraft-api:${buildcraft_version}"
+}
+
 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 {
@@ -115,7 +84,7 @@ processResources {
 		include 'mcmod.info'
 
 		// replace version and mcversion
-		expand 'version':project.version, 'mcversion':project.minecraft.version
+		expand 'version': project.version, 'mcversion': project.minecraft.version
 	}
 
 	// copy everything else, thats not the mcmod.info
@@ -123,130 +92,52 @@ processResources {
 		exclude 'mcmod.info'
 		exclude '**/*.md'
 	}
+
+	// Move access transformers to META-INF
+	rename '(.+_at.cfg)', 'META-INF/$1'
 }
 
-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"
-	}
-	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'
-		}
+	manifest {
+		attributes 'FMLAT': 'forestry_at.cfg'
 	}
 }
 
-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 {
 	repositories {
 		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
-				}
+				repository(url: "file://" + mavenDir)
 			}
 		} else {
-			println 'Archives upload disabled, gradle.properties is missing.'
+			println 'Archives upload disabled, mavenDir in gradle.properties is missing.'
 		}
 	}
 }
@@ -255,3 +146,24 @@ 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 = file('changelog.mustache').getText('UTF-8')
+}
+
+curseforge {
+	apiKey = project.hasProperty('curseforge_apikey') ? project.curseforge_apikey : '0'
+	project {
+		id = curse_project_id
+		changelog = file('changelog.html')
+		changelogType = 'html'
+		releaseType = 'beta'
+	}
+}
+
+afterEvaluate {
+	tasks.curseforge59751.dependsOn.add(makeChangelog)
+}

changelog.mustache

@@ -0,0 +1,9 @@
+Please help the Forestry project by <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}}

cla-signatures.txt

@@ -4,3 +4,4 @@ GenuineSounds;[email protected];2015-02-26
 airbreather;[email protected];2015-04-10
 ganymedes01;[email protected];2015-05-27
 infinityraider;theoneandonlyraider@gmail;com;2015-10-03
+girafistudios;[email protected];2016-06-02

gradle.properties

@@ -1,5 +1,16 @@
-mcversion=1.7.10
-forgeversion=10.13.4.1566-1.7.10
-version_major=4
-version_minor=2
-version_patch=9
+mcversion=1.12.2
+forgeversion=14.23.4.2705
+mcp_mappings=snapshot_20171003
+curse_project_id=59751
+
+tesla_version=1.0.60
+tesla_mcversion=1.12
+jei_version=4.10.0.200
+jei_mcversion=1.12.2
+ic2_version=2.8.90-ex112
+TR_mcversion=1.12.2
+TR_version=2.13.2.561
+buildcraft_version=7.99.17
+version_major=5
+version_minor=8
+version_patch=1

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jul 02 15:54:47 CDT 2014
-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
+#Mon Jul 03 15:24:47 PDT 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip

gradlew

@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

src/main/java/forestry/Forestry.java

@@ -10,44 +10,54 @@
  ******************************************************************************/
 package forestry;
 
+import com.google.common.base.Preconditions;
+
+import javax.annotation.Nullable;
 import java.io.File;
 
-import net.minecraft.block.Block;
+import forestry.plugins.ForestryCompatPlugins;
+import forestry.plugins.PluginBuildCraftFuels;
+import forestry.plugins.PluginIC2;
+import forestry.plugins.PluginNatura;
+import forestry.plugins.PluginTechReborn;
 import net.minecraft.item.Item;
 
+import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.fluids.FluidRegistry;
 
-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.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.eventhandler.EventPriority;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.network.NetworkRegistry;
+import net.minecraftforge.fml.common.registry.GameRegistry;
 
 import forestry.api.core.ForestryAPI;
+import forestry.api.core.ForestryEvent;
 import forestry.core.EventHandlerCore;
+import forestry.core.advancements.AdvancementManager;
+import forestry.core.climate.ClimateStates;
 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.utils.MigrationHelper;
 import forestry.core.worldgen.WorldGenerator;
-import forestry.plugins.PluginManager;
+import forestry.modules.ForestryModules;
+import forestry.modules.ModuleManager;
 
 /**
  * Forestry Minecraft Mod
@@ -55,31 +65,46 @@ import forestry.plugins.PluginManager;
  * @author SirSengir
  */
 @Mod(
-		modid = Constants.MOD,
-		name = "Forestry",
-		version = Version.VERSION,
+		modid = Constants.MOD_ID,
+		name = Constants.MOD_NAME,
+		version = Constants.VERSION,
 		guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
-		dependencies = "required-after:Forge@[10.13.4.1566,);"
-				+ "after:Buildcraft|Core@[6.1.7,);"
-				+ "after:ExtrabiomesXL;"
-				+ "after:BiomesOPlenty;"
-				+ "after:IC2@[2.0.140,);"
-				+ "after:Natura@[2.2.0,);"
-				+ "after:HardcoreEnderExpansion;")
+		acceptedMinecraftVersions = "[1.12.2,1.13.0)",
+		dependencies = "required-after:forge@[14.23.4.2705,);"
+				+ "after:jei@[4.7.8.91,);"
+				+ "after:" + PluginIC2.MOD_ID + ";"
+				+ "after:" + PluginNatura.MOD_ID + ";"
+				+ "after:toughasnails;"
+				+ "after:" + PluginTechReborn.MOD_ID + ";"
+				+ "after:" + PluginBuildCraftFuels.MOD_ID + ";")
 public class Forestry {
 
-	@Mod.Instance(Constants.MOD)
+	@SuppressWarnings("NullableProblems")
+	@Mod.Instance(Constants.MOD_ID)
 	public static Forestry instance;
+	@Nullable
 	private File configFolder;
 
 	public Forestry() {
 		ForestryAPI.instance = this;
 		ForestryAPI.forestryConstants = new Constants();
 		ForestryAPI.errorStateRegistry = new ErrorStateRegistry();
+		ForestryAPI.states = ClimateStates.INSTANCE;
 		EnumErrorCode.init();
+		FluidRegistry.enableUniversalBucket();
+		MinecraftForge.EVENT_BUS.register(this);
+		ModuleManager moduleManager = ModuleManager.getInstance();
+		ForestryAPI.moduleManager = moduleManager;
+		moduleManager.registerContainers(new ForestryModules(), new ForestryCompatPlugins());
 	}
 
-	public static PacketHandler packetHandler;
+	@Nullable
+	private static PacketHandler packetHandler;
+
+	public static PacketHandler getPacketHandler() {
+		Preconditions.checkNotNull(packetHandler);
+		return packetHandler;
+	}
 
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent event) {
@@ -88,17 +113,35 @@ 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());
+		MinecraftForge.EVENT_BUS.register(Config.class);
+		Proxies.common.registerEventHandlers();
 
-		configFolder = new File(event.getModConfigurationDirectory(), "forestry");
-		Config.load();
+		configFolder = new File(event.getModConfigurationDirectory(), Constants.MOD_ID);
+		Config.load(event.getSide());
 
-		PluginManager.runSetup();
+		MinecraftForge.EVENT_BUS.post(new ForestryEvent.PreInit(this, event));
 
-		ForestryAPI.activeMode = new GameMode(Config.gameMode);
+		ModuleManager.runSetup(event);
+		ModuleManager.getInternalHandler().runSetup();
 
-		PluginManager.runPreInit();
+		String gameMode = Config.gameMode;
+		Preconditions.checkNotNull(gameMode);
+		ForestryAPI.activeMode = new GameMode(gameMode);
+
+		MigrationHelper.registerFixable();
+
+		ModuleManager.getInternalHandler().runPreInit(event.getSide());
+	}
+
+	@SubscribeEvent(priority = EventPriority.LOWEST)
+	public void registerItems(RegistryEvent.Register<Item> event) {
+		ModuleManager.getInternalHandler().runRegisterBackpacksAndCrates();
+	}
+
+	@SubscribeEvent
+	public void registerModels(ModelRegistryEvent event) {
+		Proxies.render.registerModels();
 	}
 
 	@EventHandler
@@ -106,12 +149,15 @@ public class Forestry {
 		// Register gui handler
 		NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
 
-		PluginManager.runInit();
+		ModuleManager.getInternalHandler().runInit();
+
+		Proxies.render.registerItemAndBlockColors();
+		AdvancementManager.registerTriggers();
 	}
 
 	@EventHandler
 	public void postInit(FMLPostInitializationEvent event) {
-		PluginManager.runPostInit();
+		ModuleManager.getInternalHandler().runPostInit();
 
 		// Register world generator
 		WorldGenerator worldGenerator = new WorldGenerator();
@@ -121,39 +167,21 @@ public class Forestry {
 		Proxies.common.registerTickHandlers(worldGenerator);
 
 		// Handle IMC messages.
-		PluginManager.processIMCMessages(FMLInterModComms.fetchRuntimeMessages(ForestryAPI.instance));
+		ModuleManager.getInternalHandler().processIMCMessages(FMLInterModComms.fetchRuntimeMessages(ForestryAPI.instance));
 	}
 
 	@EventHandler
 	public void serverStarting(FMLServerStartingEvent event) {
-		PluginManager.serverStarting(event.getServer());
+		ModuleManager.serverStarting(event.getServer());
 	}
 
+	@Nullable
 	public File getConfigFolder() {
 		return configFolder;
 	}
 
 	@EventHandler
 	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));
-				}
-			}
-		}
+		ModuleManager.getInternalHandler().processIMCMessages(event.getMessages());
 	}
 }

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/ApicultureCapabilities.java

@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * 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.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.CapabilityInject;
+
+public class ApicultureCapabilities {
+	/**
+	 * Capability for {@link IArmorApiarist}.
+	 * The {@link Capability#getDefaultInstance()} will always protect the wearer with no side effects.
+	 */
+	@CapabilityInject(IArmorApiarist.class)
+	public static Capability<IArmorApiarist> ARMOR_APIARIST;
+}

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

@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * 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.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.
+	 */
+	public static final Map<ItemStack, Integer> inducers = new HashMap<>();
+
+	/**
+	 * Convenient access to AlleleManager.alleleRegistry.getSpeciesRoot("rootBees")
+	 *
+	 * @implNote Only null if the "apiculture" module is not enabled.
+	 */
+	@Nullable
+	public static IBeeRoot beeRoot;
+
+	/**
+	 * Used to create new bees.
+	 *
+	 * @implNote Only null if the "apiculture" module is not enabled.
+	 */
+	@Nullable
+	public static IBeeFactory beeFactory;
+
+	/**
+	 * Used to create new bee mutations.
+	 *
+	 * @implNote Only null if the "apiculture" module is not enabled.
+	 */
+	@Nullable
+	public static IBeeMutationFactory beeMutationFactory;
+
+	/**
+	 * Used to get Forestry's jubilance implementations.
+	 *
+	 * @implNote Only null if the "apiculture" module is not enabled.
+	 */
+	@Nullable
+	public static IJubilanceFactory jubilanceFactory;
+
+	/**
+	 * Used to check whether a player is wearing Apiarist Armor.
+	 *
+	 * @implNote Only null if the "apiculture" module is not enabled.
+	 */
+	@Nullable
+	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,67 @@
+/*******************************************************************************
+ * 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;
+
+/**
+ * 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, @Nullable 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();
+
+	private final 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,36 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.genetics.IAlleleEffect;
+import forestry.api.genetics.IEffectData;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+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.
+	 */
+	@SideOnly(Side.CLIENT)
+	IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
+
+}

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

@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * 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 forestry.api.core.IModelManager;
+import forestry.api.genetics.IAlleleSpecies;
+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;
+
+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);
+}

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

@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.genetics.IAlleleSpeciesBuilder;
+import net.minecraft.item.ItemStack;
+
+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,54 @@
+/*******************************************************************************
+ * 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,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 javax.annotation.Nullable;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+
+/**
+ * When implemented as a capability by armor items, protects the wearer from negative bee effects.
+ *
+ * @see ApicultureCapabilities#ARMOR_APIARIST
+ */
+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, @Nullable String cause, boolean doProtect);
+}

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

@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.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,118 @@
+/*******************************************************************************
+ * 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.List;
+import java.util.Set;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.biome.Biome;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.core.IErrorState;
+import forestry.api.genetics.IEffectData;
+import forestry.api.genetics.IIndividual;
+import forestry.api.genetics.IIndividualLiving;
+
+/**
+ * Other implementations than Forestry's default one are not supported.
+ *
+ * @author SirSengir
+ */
+public interface IBee extends IIndividualLiving {
+
+	/**
+	 * @return Bee's genetic information.
+	 */
+	@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.
+	 */
+	void setIsNatural(boolean flag);
+
+	IEffectData[] doEffect(IEffectData[] storedData, IBeeHousing housing);
+
+	@SideOnly(Side.CLIENT)
+	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();
+
+	NonNullList<ItemStack> getProduceList();
+
+	NonNullList<ItemStack> getSpecialtyList();
+
+	NonNullList<ItemStack> produceStacks(IBeeHousing housing);
+
+	@Nullable
+	IBee spawnPrincess(IBeeHousing housing);
+
+	List<IBee> spawnDrones(IBeeHousing housing);
+
+	/**
+	 * @deprecated since Forestry 5.5.4. Use {@link #plantFlowerRandom(IBeeHousing, List)}
+	 */
+	@Deprecated
+	void plantFlowerRandom(IBeeHousing housing);
+
+	/**
+	 * Plants a random flower from the given list near the housing
+	 *
+	 * @param housing          the location the bee is living
+	 * @param potentialFlowers the flowers to choose from
+	 * @return the position of the planted flower, or null of none were planted
+	 * @since Forestry 5.5.4
+	 */
+	@Nullable
+	default BlockPos plantFlowerRandom(IBeeHousing housing, List<IBlockState> potentialFlowers) {
+		//noinspection deprecation
+		plantFlowerRandom(housing);
+		return null;
+	}
+
+	@Nullable
+	IIndividual retrievePollen(IBeeHousing housing);
+
+	boolean pollinateRandom(IBeeHousing housing, IIndividual pollen);
+
+}

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

@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * 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 modId                  The modId of the mod that is creating the 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.
+	 * @since Forestry 5.6.0.
+	 */
+	IAlleleBeeSpeciesBuilder createSpecies(String modId, 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);
+
+	/**
+	 * @deprecated since Forestry 5.6.0. use {@link #createSpecies(String, String, boolean, String, String, String, IClassification, String, int, int)}
+	 */
+	@Deprecated
+	IAlleleBeeSpeciesBuilder createSpecies(String uid, boolean dominant, String authority, String unlocalizedName, String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor);
+}

src/main/java/forestry/api/apiculture/IBeeGenome.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;
+
+import forestry.api.genetics.EnumTolerance;
+import forestry.api.genetics.IFlowerProvider;
+import forestry.api.genetics.IGenome;
+import net.minecraft.util.math.Vec3i;
+
+/**
+ * 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,53 @@
+/*******************************************************************************
+ * 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 com.mojang.authlib.GameProfile;
+import forestry.api.climate.IClimateProvider;
+import forestry.api.core.IErrorLogicSource;
+import forestry.api.core.ILocatable;
+import forestry.api.genetics.IHousing;
+import net.minecraft.util.math.Vec3d;
+
+public interface IBeeHousing extends IHousing, IErrorLogicSource, IClimateProvider, ILocatable {
+
+	/**
+	 * Used by {@link IBeeRoot#createBeeHousingModifier(IBeeHousing)}
+	 * to combine bee modifiers from several sources that can change over time.
+	 *
+	 * @return IBeeModifiers from the housing, frames, etc.
+	 */
+	Iterable<IBeeModifier> getBeeModifiers();
+
+	/**
+	 * Used by {@link IBeeRoot#createBeeHousingListener(IBeeHousing)}
+	 * 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();
+
+	int getBlockLightValue();
+
+	boolean canBlockSeeTheSky();
+
+	boolean isRaining();
+
+	@Nullable
+	GameProfile getOwner();
+
+	/**
+	 * @return exact coordinates where bee particle FX should spawn from
+	 * @since Forestry 4.2
+	 */
+	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,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;
+
+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,20 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.core.IModelManager;
+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;
+
+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,72 @@
+/*******************************************************************************
+ * 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;
+
+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, @Nullable 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/IBeeMutationBuilder.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;
+
+import forestry.api.genetics.IMutationBuilder;
+
+public interface IBeeMutationBuilder extends IMutationBuilder {
+	@Override
+	IBeeMutation build();
+}

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 IBeeMutationBuilder and IMutationBuilder 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.
+	 */
+	IBeeMutationBuilder createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance);
+}

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

@@ -0,0 +1,134 @@
+/*******************************************************************************
+ * 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.List;
+
+import com.mojang.authlib.GameProfile;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.ISpeciesRoot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
+public interface IBeeRoot extends ISpeciesRoot {
+
+	/**
+	 * @return true if passed item is a Forestry bee. Equal to getType(ItemStack stack) != null
+	 */
+	@Override
+	boolean isMember(ItemStack stack);
+
+	/**
+	 * @return {@link IBee} pattern parsed from the passed stack's nbt data. Null if the ItemStack is not a valid member.
+	 */
+	@Override
+	@Nullable
+	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 */
+
+	/**
+	 * @return {@link IApiaristTracker} associated with the passed world.
+	 */
+	@Override
+	IApiaristTracker getBreedingTracker(World world, @Nullable GameProfile player);
+
+	/* BEE SPECIFIC */
+
+	/**
+	 * @return type of bee encoded on the itemstack. null 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
+	List<IBee> getIndividualTemplates();
+
+	/* MUTATIONS */
+	@Override
+	List<IBeeMutation> getMutations(boolean shuffle);
+
+	/* GAME MODE */
+	void resetBeekeepingMode();
+
+	List<IBeekeepingMode> getBeekeepingModes();
+
+	IBeekeepingMode getBeekeepingMode(World world);
+
+	@Nullable
+	IBeekeepingMode getBeekeepingMode(String name);
+
+	void registerBeekeepingMode(IBeekeepingMode mode);
+
+	void setBeekeepingMode(World world, IBeekeepingMode mode);
+
+	/* 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,94 @@
+/*******************************************************************************
+ * 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.io.IOException;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.math.BlockPos;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+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();
+
+	/**
+	 * Force the logic to refresh any cached values and error states.
+	 * Call this when a player opens the gui so that all errors are up to date.
+	 */
+	void clearCachedValues();
+
+
+	/* 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.
+	 */
+	@SideOnly(Side.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.
+	 */
+	@SideOnly(Side.CLIENT)
+	void doBeeFX();
+
+	/**
+	 * Used by bee fx to direct bees to nearby flowers.
+	 * These positions are synced to the client from the server.
+	 */
+	List<BlockPos> getFlowerPositions();
+
+	default void readData(PacketBuffer data) throws IOException {
+
+	}
+
+	default void writeData(PacketBuffer data) {
+
+	}
+}

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

@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import java.util.List;
+
+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.
+	 */
+	List<String> getDescription();
+
+	/**
+	 * @return Float used to modify the wear on comb frames.
+	 */
+	float getWearModifier();
+
+	/**
+	 * @return fertility taking into account the birthing queen and surroundings.
+	 */
+	int getFinalFertility(IBee queen, World world, BlockPos pos);
+
+	/**
+	 * @return true if the queen is genetically "fatigued" and should not be reproduced anymore.
+	 */
+	boolean isFatigued(IBee queen, IBeeHousing housing);
+
+	/**		
+	 * @return true if the queen is being overworked in the bee housing (with chance). will trigger a negative effect.		
+	 * @deprecated bees max out at 16x productivity instead of being overworked.
+	 * TODO remove this method in 1.13
+	 */
+	@Deprecated
+	default boolean isOverworked(IBee queen, IBeeHousing housing) {
+		return false;
+	}
+
+	/**
+	 * @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);
+
+	/**
+	 * @return true if an offspring of this queen is considered a natural
+	 */
+	boolean isNaturalOffspring(IBee 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,43 @@
+/*******************************************************************************
+ * 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 net.minecraft.util.NonNullList;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
+
+/**
+ * Bees can be seeded either as hive drops or as mutation results.
+ * <p>
+ * Add IHiveDrops with HiveManager.get___Hive.addDrop
+ *
+ * @author SirSengir
+ */
+public interface IHiveDrop {
+
+	IBee getBeeType(IBlockAccess world, BlockPos pos);
+
+	NonNullList<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,37 @@
+/*******************************************************************************
+ * 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 Empty ItemStack if it has been broken.
+	 */
+	ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear);
+
+	/**
+	 * @param frame ItemStack containing the actual frame.
+	 * @return the {@link IBeeModifier} for this frame.
+	 * @since Forestry 5.5.1
+	 */
+	default IBeeModifier getBeeModifier(ItemStack frame) {
+		return getBeeModifier();
+	}
+
+	/**
+	 * @deprecated since Forestry 5.5.1. Use {@link #getBeeModifier(ItemStack)}
+	 */
+	@Deprecated
+	IBeeModifier getBeeModifier();
+}

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

@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.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,20 @@
+/*******************************************************************************
+ * 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.state.IBlockState;
+
+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(IBlockState... acceptedBlockStates);
+}

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,51 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture.hives;
+
+import java.util.Random;
+
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+
+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, Random rand, 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,69 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture.hives;
+
+import java.util.List;
+import 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();
+
+		private final String hiveUid;
+		private final String speciesUid;
+
+		HiveType(String hiveUid, String speciesUid) {
+			this.hiveUid = hiveUid;
+			this.speciesUid = speciesUid;
+		}
+
+
+		public String getHiveUid() {
+			return hiveUid;
+		}
+
+
+		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,14 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+@API(apiVersion = "4.1.0", owner = "ForestryAPI|apiculture", provides = "ForestryAPI|hives")
+package forestry.api.apiculture.hives;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import mcp.MethodsReturnNonnullByDefault;
+import net.minecraftforge.fml.common.API;

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

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

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

@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.CapabilityInject;
+
+import forestry.api.core.IArmorNaturalist;
+
+public class ArboricultureCapabilities {
+	/**
+	 * Capability for {@link IArmorNaturalist}.
+	 * The {@link Capability#getDefaultInstance()} will always show pollination with no side effects.
+	 */
+	@CapabilityInject(IArmorNaturalist.class)
+	public static Capability<IArmorNaturalist> ARMOR_NATURALIST;
+}

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

@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * 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 java.util.Random;
+
+public enum EnumForestryWoodType implements IWoodType {
+	LARCH(4),
+	TEAK(4),
+	ACACIA(4),
+	LIME(4),
+	CHESTNUT(4),
+	WENGE(4),
+	BAOBAB(4),
+	SEQUOIA(3, 4.0f),
+
+	KAPOK(4),
+	EBONY(4),
+	MAHOGANY(4),
+	BALSA(4, 1.0f),
+	WILLOW(4),
+	WALNUT(4),
+	GREENHEART(4, 7.5f),
+	CHERRY(4),
+
+	MAHOE(4),
+	POPLAR(4),
+	PALM(4),
+	PAPAYA(4),
+	PINE(4, 3.0f),
+	PLUM(4),
+	MAPLE(4),
+	CITRUS(4),
+
+	GIGANTEUM(3, 4.0f),
+	IPE(4),
+	PADAUK(4),
+	COCOBOLO(4),
+	ZEBRAWOOD(4);
+
+	public static final float DEFAULT_HARDNESS = 2.0f;
+	public static final EnumForestryWoodType[] VALUES = values();
+
+	private final int carbonization;
+	private final float hardness;
+
+	EnumForestryWoodType(int carbonization) {
+		this(carbonization, DEFAULT_HARDNESS);
+	}
+
+	EnumForestryWoodType(int carbonization, float hardness) {
+		this.carbonization = carbonization;
+		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();
+	}
+
+	public static EnumForestryWoodType byMetadata(int meta) {
+		if (meta < 0 || meta >= VALUES.length) {
+			meta = 0;
+		}
+		return VALUES[meta];
+	}
+
+	@Override
+	public int getCarbonization() {
+		return carbonization;
+	}
+
+	@Override
+	public float getCharcoalChance(int numberOfCharcoal) {
+		if (numberOfCharcoal == 3) {
+			return 0.75F;
+		} else if (numberOfCharcoal == 4) {
+			return 0.5F;
+		} else if (numberOfCharcoal == 5) {
+			return 0.25F;
+		}
+		return 0.15F;
+	}
+
+	@Override
+	public String getPlankTexture() {
+		return "forestry:blocks/wood/planks." + getName();
+	}
+
+	@Override
+	public String getDoorLowerTexture() {
+		return "forestry:blocks/doors/" + getName() + "_lower";
+	}
+
+	@Override
+	public String getDoorUpperTexture() {
+		return "forestry:blocks/doors/" + getName() + "_upper";
+	}
+
+	@Override
+	public String getBarkTexture() {
+		return "forestry:blocks/wood/bark." + getName();
+	}
+
+	@Override
+	public String getHeartTexture() {
+		return "forestry:blocks/wood/heart." + getName();
+	}
+}

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

@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.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"),
+	NONE("none", "None");
+
+	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/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,82 @@
+/*******************************************************************************
+ * 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 forestry.api.genetics.IAllele;
+import forestry.api.genetics.IAlleleBoolean;
+import forestry.api.genetics.IAlleleFloat;
+import forestry.api.genetics.IAlleleInteger;
+import forestry.api.genetics.IChromosomeType;
+import forestry.api.genetics.IFruitFamily;
+import forestry.api.genetics.ISpeciesRoot;
+import net.minecraftforge.common.EnumPlantType;
+
+public enum EnumTreeChromosome implements IChromosomeType {
+
+	/**
+	 * Determines the following: - WorldGen, including the used wood blocks - {@link IFruitFamily}s supported. Limits which {@link IFruitProvider}
+	 * will actually yield fruit with this species. - Native {@link EnumPlantType} for this tree. Combines with the PLANT chromosome.
+	 */
+	SPECIES(IAlleleTreeSpecies.class),
+	/**
+	 * 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),
+	/**
+	 * Determines the speed at which fruit will ripen on this tree.
+	 */
+	SAPPINESS(IAlleleFloat.class),
+	/**
+	 * Leaf effect. Unused.
+	 */
+	EFFECT(IAlleleLeafEffect.class),
+	/**
+	 * Amount of random ticks which need to elapse before a sapling will grow into a tree.
+	 */
+	MATURATION(IAlleleInteger.class),
+
+	GIRTH(IAlleleInteger.class),
+	/**
+	 * Determines if the tree can burn.
+	 */
+	FIREPROOF(IAlleleBoolean.class),;
+
+	private final 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,122 @@
+/*******************************************************************************
+ * 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 java.util.Random;
+
+import net.minecraft.block.BlockPlanks;
+
+public enum EnumVanillaWoodType implements IWoodType {
+	OAK(BlockPlanks.EnumType.OAK, 5),
+	SPRUCE(BlockPlanks.EnumType.SPRUCE, 4),
+	BIRCH(BlockPlanks.EnumType.BIRCH, 4),
+	JUNGLE(BlockPlanks.EnumType.JUNGLE, 5),
+	ACACIA(BlockPlanks.EnumType.ACACIA, 4),
+	DARK_OAK(BlockPlanks.EnumType.DARK_OAK, 5);
+
+	public static final EnumVanillaWoodType[] VALUES = values();
+
+	public static EnumVanillaWoodType getRandom(Random random) {
+		return VALUES[random.nextInt(VALUES.length)];
+	}
+
+	private final BlockPlanks.EnumType vanillaType;
+	private final int carbonization;
+
+	EnumVanillaWoodType(BlockPlanks.EnumType vanillaType, int carbonization) {
+		this.vanillaType = vanillaType;
+		this.carbonization = carbonization;
+	}
+
+	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();
+	}
+
+	public static EnumVanillaWoodType byMetadata(int meta) {
+		if (meta < 0 || meta >= VALUES.length) {
+			meta = 0;
+		}
+		return VALUES[meta];
+	}
+
+	@Override
+	public float getHardness() {
+		return 2.0F;
+	}
+
+	@Override
+	public int getCarbonization() {
+		return carbonization;
+	}
+
+	@Override
+	public float getCharcoalChance(int numberOfCharcoal) {
+		if (numberOfCharcoal == 3) {
+			return 0.75F;
+		} else if (numberOfCharcoal == 4) {
+			return 0.5F;
+		} else if (numberOfCharcoal == 5) {
+			return 0.25F;
+		}
+		return 0.15F;
+	}
+
+	@Override
+	public String getPlankTexture() {
+		if (this == DARK_OAK) {
+			return "blocks/planks_big_oak";
+		}
+		return "blocks/planks_" + getName();
+	}
+
+	@Override
+	public String getDoorLowerTexture() {
+		if (this == OAK) {
+			return "blocks/door_wood_lower";
+		}
+		return "blocks/door_wood_lower";
+	}
+
+	@Override
+	public String getDoorUpperTexture() {
+		if (this == OAK) {
+			return "blocks/door_wood_upper";
+		}
+		return "blocks/door_" + getName() + "_upper";
+	}
+
+	@Override
+	public String getBarkTexture() {
+		if (this == DARK_OAK) {
+			return "blocks/log_big_oak";
+		}
+		return "blocks/log_" + getName();
+	}
+
+	@Override
+	public String getHeartTexture() {
+		if (this == DARK_OAK) {
+			return "blocks/log_big_oak_top";
+		}
+		return "blocks/log_" + getName() + "_top";
+	}
+}

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

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

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

@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import forestry.api.genetics.IAlleleEffect;
+import forestry.api.genetics.IEffectData;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+/**
+ * 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,67 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import java.util.Collection;
+
+import net.minecraft.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> {
+
+	@Override
+	ITreeRoot getRoot();
+
+	/**
+	 * @return Native plant type of this species.
+	 */
+	EnumPlantType getPlantType();
+
+	/**
+	 * @return List of all {@link IFruitFamily}s which can grow on leaves generated by this species.
+	 */
+	Collection<IFruitFamily> getSuitableFruit();
+
+	/**
+	 * @return Tree generator for this species.
+	 */
+	ITreeGenerator getGenerator();
+	
+	/**
+	 * @return Float between 0 and 1 representing the rarity of the species, will affect spawn rate. If it's 0, it will not spawn.
+	 */
+	float getRarity();
+
+	IWoodProvider getWoodProvider();
+	
+	ILeafProvider getLeafProvider();
+	
+	IGrowthProvider getGrowthProvider();
+
+	/* MODELS AND OVERRIDES */
+	@SideOnly(Side.CLIENT)
+	ILeafSpriteProvider getLeafSpriteProvider();
+
+	@SideOnly(Side.CLIENT)
+	int getGermlingColour(EnumGermlingType type, int renderPass);
+
+	@SideOnly(Side.CLIENT)
+	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,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 forestry.api.genetics.IAlleleSpeciesBuilder;
+import forestry.api.genetics.IFruitFamily;
+import net.minecraftforge.common.EnumPlantType;
+
+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);
+	
+	/**
+	 * Set rarity of the species, will affect spawn rate in the world. Must be a float between 0 and 1. If it's 0, it will not spawn.
+	 */
+	IAlleleTreeSpeciesBuilder setRarity(float rarity);
+	
+	/**
+	 * Set the growth provider.
+	 */
+	IAlleleTreeSpeciesBuilder setGrowthProvider(IGrowthProvider growthProvider);
+
+}

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/ICharcoalManager.java

@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import java.util.Collection;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+
+/**
+ * Provides functions that are related to the forestry charcoal pile.
+ */
+public interface ICharcoalManager {
+	/**
+	 * Registers the given block as a valid block for the charcoal pile wall and adds the given charcoal amount to it.
+	 * <p>
+	 * This method unlike {@link #registerWall(IBlockState, int)} ignores the metadata of the actual block and
+	 * only compares the world block with the given block.
+	 */
+	void registerWall(Block block, int amount);
+
+	/**
+	 * Registers the given block as a valid block for the charcoal pile wall and adds the given charcoal amount to it.
+	 * <p>
+	 * This method unlike {@link #registerWall(Block, int)} compares the world state with the given state and not
+	 * only the block.
+	 */
+	void registerWall(IBlockState blockState, int amount);
+
+	/**
+	 * Registers your implementation of the {@link ICharcoalPileWall} interface.
+	 */
+	void registerWall(ICharcoalPileWall wall);
+
+	/**
+	 * @return A collection with all registered charcoal pile walls.
+	 */
+	Collection<ICharcoalPileWall> getWalls();
+}

src/main/java/forestry/api/arboriculture/ICharcoalPileWall.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 net.minecraft.block.state.IBlockState;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
+
+public interface ICharcoalPileWall {
+
+	int getCharcoalAmount();
+	
+	boolean matches(IBlockState state);
+
+	@Deprecated
+	default NonNullList<ItemStack> getDisplyItems(){
+		return getDisplayItems();
+	}
+
+	NonNullList<ItemStack> getDisplayItems();
+	
+}

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

@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * 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 java.util.Map;
+import java.util.Random;
+
+import forestry.api.genetics.IFruitFamily;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
+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;
+
+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
+	Map<ItemStack, Float> getProducts();
+
+	// / Specialty, Chance
+	Map<ItemStack, Float> getSpecialty();
+
+	NonNullList<ItemStack> getFruits(ITreeGenome genome, World world, BlockPos pos, int ripeningTime);
+
+	/**
+	 * @return Short, human-readable identifier used in the treealyzer.
+	 */
+	String getDescription();
+
+	@Nullable
+	String getModelName();
+
+	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,34 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import forestry.api.core.IModelManager;
+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;
+
+/**
+ * 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 {
+	@SideOnly(Side.CLIENT)
+	void registerModels(Item item, IModelManager manager, EnumGermlingType type);
+
+	@SideOnly(Side.CLIENT)
+	ModelResourceLocation getModel(EnumGermlingType type);
+
+	/**
+	 * Provides color for sapling. See {@link ILeafSpriteProvider} for pollen color.
+	 *
+	 * @param type       the germling type to render
+	 * @param renderPass renderPass of rendering
+	 * @return sapling color for renderPass
+	 */
+	int getSpriteColor(EnumGermlingType type, int renderPass);
+}

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

@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * 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 net.minecraft.world.biome.Biome;
+
+public interface IGrowthProvider {
+
+	boolean canSpawn(ITree tree, World world, BlockPos pos);
+	
+	boolean isBiomeValid(ITree tree, Biome biome);
+	
+}

src/main/java/forestry/api/arboriculture/ILeafProvider.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.arboriculture;
+
+import net.minecraft.item.ItemStack;
+
+public interface ILeafProvider {
+	
+	void init(IAlleleTreeSpecies treeSpecies);
+
+	ItemStack getDecorativeLeaves();
+	
+}

src/main/java/forestry/api/arboriculture/ILeafSpriteProvider.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.ResourceLocation;
+
+/**
+ * Provides icons for leaves. Used by TreeManager.treeFactory.createSpecies()
+ * Get a default Forestry implementation from TreeManager.treeFactory.getLeafIconProvider() or implement your own.
+ * <p>
+ * 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 {
+	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,90 @@
+/*******************************************************************************
+ * 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 java.util.List;
+import java.util.Map;
+
+import com.mojang.authlib.GameProfile;
+import forestry.api.genetics.IEffectData;
+import forestry.api.genetics.IIndividual;
+import forestry.api.world.ITreeGenData;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenerator;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+public interface ITree extends IIndividual, ITreeGenData {
+
+	void mate(ITree other);
+
+	IEffectData[] doEffect(IEffectData[] storedData, World world, BlockPos pos);
+
+	@SideOnly(Side.CLIENT)
+	IEffectData[] doFX(IEffectData[] storedData, World world, BlockPos pos);
+
+	@Override
+	ITreeGenome getGenome();
+
+	@Nullable
+	ITreeGenome getMate();
+
+	/**
+	 * @since Forestry 4.0
+	 */
+	List<ITree> getSaplings(World world, @Nullable GameProfile playerProfile, BlockPos pos, float modifier);
+
+	// Products, Chance
+	Map<ItemStack, Float> getProducts();
+
+	// Specialties, Chance
+	Map<ItemStack, Float> getSpecialties();
+
+	NonNullList<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();
+
+	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,47 @@
+/*******************************************************************************
+ * 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 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
+	 * @param leafProvider The leaf provider
+	 * @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, IWoodProvider woodProvider, ITreeGenerator generator, @Nullable ILeafProvider leafProvider);
+
+	/**
+	 * @deprecated since Forestry 5.6.0. use {@link #createSpecies(String, String, String, String, boolean, IClassification, String, String, ILeafSpriteProvider, IGermlingModelProvider, IWoodProvider, ITreeGenerator, ILeafProvider)}
+	 */
+	@Deprecated
+	IAlleleTreeSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String modID, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, 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);
+}

src/main/java/forestry/api/arboriculture/ITreeGenerator.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.arboriculture;
+
+import javax.annotation.Nullable;
+
+import com.mojang.authlib.GameProfile;
+import forestry.api.world.ITreeGenData;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+/**
+ * Implements the tree generation for a tree species.
+ */
+public interface ITreeGenerator {
+	WorldGenerator getWorldGenerator(ITreeGenData tree);
+
+	boolean setLogBlock(ITreeGenome genome, World world, BlockPos pos, EnumFacing facing);
+
+	boolean setLeaves(ITreeGenome genome, World world, @Nullable GameProfile owner, BlockPos pos);
+}

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

@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * 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.item.ItemStack;
+
+import forestry.api.genetics.IGenome;
+
+public interface ITreeGenome extends IGenome {
+
+	@Override
+	IAlleleTreeSpecies getPrimary();
+
+	@Override
+	IAlleleTreeSpecies getSecondary();
+
+	IFruitProvider getFruitProvider();
+
+	float getHeight();
+
+	float getFertility();
+
+	/**
+	 * @return Determines either a) how many fruit leaves there are or b) the chance for any fruit leave to drop a sapling. Exact usage determined by the
+	 * IFruitProvider
+	 */
+	float getYield();
+
+	float getSappiness();
+
+	/**
+	 * @return Amount of random block ticks required for a sapling to mature into a fully grown tree.
+	 */
+	int getMaturationTime();
+
+	int getGirth();
+
+	boolean getFireproof();
+
+	IAlleleLeafEffect getEffect();
+	
+	/**
+	 * 
+	 * @return A ItemStack that is used in getPickBlock of the leave block.
+	 */
+	ItemStack getDecorativeLeaves();
+
+	/**
+	 * @return true if this genome matches one of the default template genomes
+	 */
+	boolean matchesTemplateGenome();
+}

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

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

src/main/java/forestry/api/arboriculture/ITreeMutation.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.arboriculture;
+
+import forestry.api.genetics.IMutation;
+import forestry.api.genetics.ISpeciesRoot;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public interface ITreeMutation extends IMutation {
+
+	/**
+	 * @return {@link ISpeciesRoot} this mutation is associated with.
+	 */
+	@Override
+	ITreeRoot getRoot();
+
+	/**
+	 * @return float representing the percent chance for mutation to occur, from 0.0 to 100.0.
+	 * @since Forestry 4.0
+	 */
+	float getChance(World world, BlockPos pos, IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1, ITreeGenome genome0, ITreeGenome genome1);
+}

src/main/java/forestry/api/arboriculture/ITreeMutationBuilder.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.arboriculture;
+
+import forestry.api.genetics.IMutationBuilder;
+
+public interface ITreeMutationBuilder extends IMutationBuilder {
+	@Override
+	ITreeMutation build();
+}

src/main/java/forestry/api/arboriculture/ITreeMutationFactory.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 forestry.api.genetics.IAllele;
+
+public interface ITreeMutationFactory {
+	/**
+	 * Creates a new tree mutation.
+	 * Automatically registered with TreeManager.treeRoot.registerMutation()
+	 * See ITreeMutationBuilder and IMutationBuilder for adding additional properties to the returned mutation.
+	 *
+	 * @param parentTree0 A parent tree for this mutation
+	 * @param parentTree1 A parent tree for this mutation
+	 * @param result      The resulting alleles for this mutation
+	 * @param chance      The chance that breeding the two parent trees will result in this mutation
+	 * @return a new tree mutation.
+	 */
+	ITreeMutationBuilder createMutation(IAlleleTreeSpecies parentTree0, IAlleleTreeSpecies parentTree1, IAllele[] result, int chance);
+}