Doc pass

Co-authored-by: Alex Vermette <vermz@hotmail.ca>

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Ignore spotlessApply reformat
+94aa9346b1811eff7e67820b75d5098e3f83448d

.gitattributes

@@ -0,0 +1,44 @@
+* text eol=lf
+
+*.[jJ][aA][rR]          binary
+
+*.[pP][nN][gG]          binary
+*.[jJ][pP][gG]          binary
+*.[jJ][pP][eE][gG]      binary
+*.[gG][iI][fF]          binary
+*.[tT][iI][fF]          binary
+*.[tT][iI][fF][fF]      binary
+*.[iI][cC][oO]          binary
+*.[sS][vV][gG]          text
+*.[eE][pP][sS]          binary
+*.[xX][cC][fF]          binary
+
+*.[kK][aA][rR]          binary
+*.[mM]4[aA]             binary
+*.[mM][iI][dD]          binary
+*.[mM][iI][dD][iI]      binary
+*.[mM][pP]3             binary
+*.[oO][gG][gG]          binary
+*.[rR][aA]              binary
+
+*.7[zZ]                 binary
+*.[gG][zZ]              binary
+*.[tT][aA][rR]          binary
+*.[tT][gG][zZ]          binary
+*.[zZ][iI][pP]          binary
+
+*.[tT][cC][nN]          binary
+*.[sS][oO]              binary
+*.[dD][lL][lL]          binary
+*.[dD][yY][lL][iI][bB]  binary
+*.[pP][sS][dD]          binary
+*.[tT][tT][fF]          binary
+*.[oO][tT][fF]          binary
+
+*.[pP][aA][tT][cC][hH]  -text
+
+*.[bB][aA][tT]          text eol=crlf
+*.[cC][mM][dD]          text eol=crlf
+*.[pP][sS]1             text eol=crlf
+
+*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary

.github/scripts/test-no-error-reports.sh

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-RUNDIR="run"
-CRASH="crash-reports"
-SERVERLOG="server.log"
-
-if [[ -d $RUNDIR/$CRASH ]]; then
-  echo "Crash reports detected:"
-  cat $RUNDIR/$CRASH/crash*.txt
-  exit 1
-fi
-
-if grep --quiet "Fatal errors were detected" $SERVERLOG; then
-  echo "Fatal errors detected:"
-  cat server.log
-  exit 1
-fi
-
-if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" $SERVERLOG; then
-  echo "Server force stopped:"
-  cat server.log
-  exit 1
-fi
-
-if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then
-  echo "Server didn't finish startup:"
-  cat server.log
-  exit 1
-fi
-
-echo "No crash reports detected"
-exit 0
-

.github/workflows/optimize-images.yml

@@ -0,0 +1,17 @@
+name: Optimize images
+
+on:
+  pull_request:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+  push:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+jobs:
+  optimize-images:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
+    secrets: inherit

.gitignore

@@ -30,3 +30,4 @@ src/main/resources/mixins.*.json
 *.bat
 *.DS_Store
 !gradlew.bat
+layout.json

CONTRIBUTING.md

@@ -1,29 +0,0 @@
-How to submit a bug report to Forestry
-====================================
-Please make sure the bug has not already been reported by [searching the issues](https://github.com/ForestryMC/ForestryMC/issues?q=is%3Aissue).
-
-If you can, see if the bug still happens with the latest unstable build.  
-[The latest unstable builds are available here](http://jenkins.ic2.player.to/job/Forestry_Dev/)
-
-For crashes, you must post a link to the full crash report.  
-[gist.github.com](gist.github.com) or [pastebin.com](www.pastebin.com) are good places to upload them.  
-Full crash reports are located in [the minecraft data folder](http://hopper.minecraft.net/help/finding-minecraft-data-folder/), in "crash-reports".
-
-Thank you for reporting bugs!
-
-How to contribute to Forestry
-====================================
-
-### Contributor License Agreement
-
-Before pull requests can be accepted, the contributor needs to sign a contributor license agreement. (Essentially giving a license for using his code and/or media and for re-licensing it, for details read the agreement linked below.) 
-
-### How do I sign?
-
-To keep the hassle for everyone involved to a minimum, Forestry uses CLAHub to manage the agreements. To get started, <a href="https://www.clahub.com/agreements/ForestryMC/ForestryMC">sign the Contributor License Agreement</a>.
-
-### Why is this needed?
-
-Without CLAs it at some point becomes essentially impossible to change the license of a project which accepts contributions from third parties. Without an explicit agreement every contributor would still own the copyright to his code. So as long as it (or parts of it) remain in the code base, he would have to agree to every license change. If enough time has passed, there may be dozens, perhaps even hundreds of contributors involved and it will be very hard to track down each and every one of them and get them to agree on a new license.
-
-This would make it impossible to change the license to a more permissive one at a later date, so the code would be locked into CC BY-NC-ND 3.0 until it passes into the public domain about a hundred years from now. This situation is to be avoided and that’s why you are being bothered with this CLA.

README.md

@@ -3,17 +3,9 @@ Forestry
 
 ### What is it?
 
+This is the GTNH fork of Forestry for 1.7.10.  Do not report any issues to the original Forestry team.  This fork is maintained by the GTNH team and is not supported by the original Forestry team.
 Forestry is a modification for the game Minecraft and known primarily for its farms and bees. 
 
-### Homepage
-
-[Wiki](http://forestry.sengir.net/)
-
-[Latest Builds for 1.7.10](http://jenkins.ic2.player.to/job/Forestry_Dev/)
-
-[IRC #forestry on esper.net](http://webchat.esper.net/?nick=ForestryGithub...&channels=forestry&prompt=1)
-
-For those interested in developement, you can also visit #forestry-dev.
 
 ### Building
 
@@ -31,8 +23,6 @@ Beware of ugly code.
 
 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.
 
-**If you submit a PR you must accept the [Contributor License Agreement](https://cla-assistant.io/ForestryMC/ForestryMC). There is no way around that, since otherwise changing the license later - even to something more permissive! - , becomes close to impossible.**
-
 ### License & Copyright
 
-Forestry is (c) 2011 - 2014 SirSengir and licensed under LGPL v3. See the LICENSE.txt for all the gory details or go to http://www.gnu.org/licenses/lgpl-3.0.txt for more information. Forestry also contains code contributed by CovertJaguar, Player, MysteriousAges, Binnie, RichardG, cpw and others.
+Forestry is (c) 2011 - 2014 SirSengir and licensed under LGPL v3. See the LICENSE.txt for all the gory details or go to http://www.gnu.org/licenses/lgpl-3.0.txt for more information. Forestry also contains code contributed by CovertJaguar, Player, MysteriousAges, Binnie, RichardG, cpw, the GTNH Team, and others.

build.gradle

@@ -1,747 +1,5 @@
-//version: 1650343995
-/*
-DO NOT CHANGE THIS FILE!
-
-Also, you may replace this file at any time if there is an update available.
-Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
-*/
-
-
-import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.gradle.internal.logging.text.StyledTextOutput.Style
-import org.gradle.internal.logging.text.StyledTextOutputFactory
-
-import java.util.concurrent.TimeUnit
-
-buildscript {
-    repositories {
-        maven {
-            name 'forge'
-            url 'https://maven.minecraftforge.net'
-        }
-        maven {
-            name 'sonatype'
-            url 'https://oss.sonatype.org/content/repositories/snapshots/'
-        }
-        maven {
-            name 'Scala CI dependencies'
-            url 'https://repo1.maven.org/maven2/'
-        }
-        maven {
-            name 'jitpack'
-            url 'https://jitpack.io'
-        }
-    }
-    dependencies {
-        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
-    }
-}
+//version: 1707058017
 
 plugins {
-    id 'java-library'
-    id 'idea'
-    id 'eclipse'
-    id 'scala'
-    id 'maven-publish'
-    id 'org.jetbrains.kotlin.jvm'        version '1.5.30' apply false
-    id 'org.jetbrains.kotlin.kapt'       version '1.5.30' apply false
-    id 'org.ajoberstar.grgit'            version '4.1.1'
-    id 'com.github.johnrengelman.shadow' version '4.0.4'
-    id 'com.palantir.git-version'        version '0.13.0' apply false
-    id 'de.undercouch.download'          version '5.0.1'
-    id 'com.github.gmazzo.buildconfig'   version '3.0.3'  apply false
-}
-
-if (project.file('.git/HEAD').isFile()) {
-    apply plugin: 'com.palantir.git-version'
-}
-
-def out = services.get(StyledTextOutputFactory).create('an-output')
-
-apply plugin: 'forge'
-
-def projectJavaVersion = JavaLanguageVersion.of(8)
-
-java {
-    toolchain {
-        languageVersion.set(projectJavaVersion)
-    }
-}
-
-idea {
-    module {
-        inheritOutputDirs = true
-        downloadJavadoc = true
-        downloadSources = true
-    }
-}
-
-if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
-    throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
-}
-
-checkPropertyExists("modName")
-checkPropertyExists("modId")
-checkPropertyExists("modGroup")
-checkPropertyExists("autoUpdateBuildScript")
-checkPropertyExists("minecraftVersion")
-checkPropertyExists("forgeVersion")
-checkPropertyExists("replaceGradleTokenInFile")
-checkPropertyExists("gradleTokenModId")
-checkPropertyExists("gradleTokenModName")
-checkPropertyExists("gradleTokenVersion")
-checkPropertyExists("gradleTokenGroupName")
-checkPropertyExists("apiPackage")
-checkPropertyExists("accessTransformersFile")
-checkPropertyExists("usesMixins")
-checkPropertyExists("mixinPlugin")
-checkPropertyExists("mixinsPackage")
-checkPropertyExists("coreModClass")
-checkPropertyExists("containsMixinsAndOrCoreModOnly")
-checkPropertyExists("usesShadowedDependencies")
-checkPropertyExists("developmentEnvironmentUserName")
-
-boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
-boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()
-
-String javaSourceDir = "src/main/java/"
-String scalaSourceDir = "src/main/scala/"
-String kotlinSourceDir = "src/main/kotlin/"
-
-String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
-String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
-String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/")
-if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
-    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
-}
-
-if(apiPackage) {
-    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
-        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
-    }
-}
-
-if(accessTransformersFile) {
-    String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
-    if(!getFile(targetFile).exists()) {
-        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
-    }
-}
-
-if(usesMixins.toBoolean()) {
-    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
-        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
-    }
-
-    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
-        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala  + " or " + targetPackageKotlin)
-    }
-
-    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
-    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
-    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
-    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".kt"
-    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
-        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
-    }
-}
-
-if(coreModClass) {
-    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
-    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
-    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
-    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".kt"
-    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
-        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
-    }
-}
-
-configurations.all {
-    resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
-
-    // Make sure GregTech build won't time out
-    System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
-    System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
-}
-
-// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
-try {
-    'git config core.fileMode false'.execute()
-}
-catch (Exception ignored) {
-    out.style(Style.Failure).println("git isn't installed at all")
-}
-
-// Pulls version first from the VERSION env and then git tag
-String identifiedVersion
-String versionOverride = System.getenv("VERSION") ?: null
-try {
-    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
-}
-catch (Exception ignored) {
-    out.style(Style.Failure).text(
-        'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' +
-        'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
-        'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)'
-    )
-    versionOverride = 'NO-GIT-TAG-SET'
-    identifiedVersion = versionOverride
-}
-version = minecraftVersion + '-' + identifiedVersion
-ext {
-    modVersion = identifiedVersion
-}
-
-if(identifiedVersion == versionOverride) {
-    out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
-}
-
-group = modGroup
-if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
-    archivesBaseName = customArchiveBaseName
-}
-else {
-    archivesBaseName = modId
-}
-
-def arguments = []
-def jvmArguments = []
-
-if (usesMixins.toBoolean()) {
-    arguments += [
-        "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-    ]
-    if (usesMixinDebug.toBoolean()) {
-        jvmArguments += [
-            "-Dmixin.debug.countInjections=true",
-            "-Dmixin.debug.verbose=true",
-            "-Dmixin.debug.export=true"
-        ]
-    }
-}
-
-minecraft {
-    version = minecraftVersion + '-' + forgeVersion + '-' + minecraftVersion
-    runDir = 'run'
-
-    if (replaceGradleTokenInFile) {
-        replaceIn replaceGradleTokenInFile
-        if(gradleTokenModId) {
-            replace gradleTokenModId, modId
-        }
-        if(gradleTokenModName) {
-            replace gradleTokenModName, modName
-        }
-        if(gradleTokenVersion) {
-            replace gradleTokenVersion, modVersion
-        }
-        if(gradleTokenGroupName) {
-            replace gradleTokenGroupName, modGroup
-        }
-    }
-
-    clientIntellijRun {
-        args(arguments)
-        jvmArgs(jvmArguments)
-
-        if(developmentEnvironmentUserName) {
-            args("--username", developmentEnvironmentUserName)
-        }
-    }
-
-    serverIntellijRun {
-        args(arguments)
-        jvmArgs(jvmArguments)
-    }
-}
-
-if(file('addon.gradle').exists()) {
-    apply from: 'addon.gradle'
-}
-
-apply from: 'repositories.gradle'
-
-configurations {
-    implementation.extendsFrom(shadowImplementation)  // TODO: remove after all uses are refactored
-    implementation.extendsFrom(shadowCompile)
-    implementation.extendsFrom(shadeCompile)
-}
-
-repositories {
-    maven {
-        name 'Overmind forge repo mirror'
-        url 'https://gregtech.overminddl1.com/'
-    }
-    if(usesMixins.toBoolean()) {
-        maven {
-            name 'sponge'
-            url 'https://repo.spongepowered.org/repository/maven-public'
-        }
-        maven {
-            url 'https://jitpack.io'
-        }
-    }
-}
-
-dependencies {
-    if(usesMixins.toBoolean()) {
-        annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
-        annotationProcessor('com.google.guava:guava:24.1.1-jre')
-        annotationProcessor('com.google.code.gson:gson:2.8.6')
-        annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT')
-        // using 0.8 to workaround a issue in 0.7 which fails mixin application
-        compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') {
-            // Mixin includes a lot of dependencies that are too up-to-date
-            exclude module: 'launchwrapper'
-            exclude module: 'guava'
-            exclude module: 'gson'
-            exclude module: 'commons-io'
-            exclude module: 'log4j-core'
-        }
-        compile('com.github.GTNewHorizons:SpongeMixins:1.5.0')
-    }
-}
-
-apply from: 'dependencies.gradle'
-
-def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
-def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
-def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
-
-task generateAssets {
-    if (usesMixins.toBoolean()) {
-        def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json");
-        if (!mixinConfigFile.exists()) {
-            mixinConfigFile.text = """{
-  "required": true,
-  "minVersion": "0.7.11",
-  "package": "${modGroup}.${mixinsPackage}",
-  "plugin": "${modGroup}.${mixinPlugin}",
-  "refmap": "${mixingConfigRefMap}",
-  "target": "@env(DEFAULT)",
-  "compatibilityLevel": "JAVA_8",
-  "mixins": [],
-  "client": [],
-  "server": []
-}
-"""
-        }
-    }
-}
-
-task relocateShadowJar(type: ConfigureShadowRelocation) {
-    target = tasks.shadowJar
-    prefix = modGroup + ".shadow"
-}
-
-shadowJar {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
-    dependsOn(relocateShadowJar)
-}
-
-jar {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    if(usesShadowedDependencies.toBoolean()) {
-        dependsOn(shadowJar)
-        enabled = false
-    }
-}
-
-reobf {
-    if(usesMixins.toBoolean()) {
-        addExtraSrgFile mixinSrg
-    }
-}
-
-afterEvaluate {
-    if(usesMixins.toBoolean()) {
-        tasks.compileJava {
-            options.compilerArgs += [
-                    "-AreobfSrgFile=${tasks.reobf.srg}",
-                    "-AoutSrgFile=${mixinSrg}",
-                    "-AoutRefMapFile=${refMap}",
-                    // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
-                    "-XDenableSunApiLintControl",
-                    "-XDignore.symbol.file"
-            ]
-        }
-    }
-}
-
-runClient {
-    if(developmentEnvironmentUserName) {
-        arguments += [
-                "--username",
-                developmentEnvironmentUserName
-        ]
-    }
-
-    args(arguments)
-    jvmArgs(jvmArguments)
-}
-
-runServer {
-    args(arguments)
-    jvmArgs(jvmArguments)
-}
-
-tasks.withType(JavaExec).configureEach {
-    javaLauncher.set(
-            javaToolchains.launcherFor {
-                languageVersion = projectJavaVersion
-            }
-    )
-}
-
-processResources {
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-
-        // replace modVersion and minecraftVersion
-        expand "minecraftVersion": project.minecraft.version,
-            "modVersion": modVersion,
-            "modId": modId,
-            "modName": modName
-    }
-
-    if(usesMixins.toBoolean()) {
-        from refMap
-    }
-
-    // copy everything else that's not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-}
-
-def getManifestAttributes() {
-    def manifestAttributes = [:]
-    if(!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
-        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
-    }
-
-    if(accessTransformersFile) {
-        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
-    }
-
-    if(coreModClass) {
-        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
-    }
-
-    if(usesMixins.toBoolean()) {
-        manifestAttributes += [
-                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
-                "MixinConfigs" : "mixins." + modId + ".json",
-                "ForceLoadAsMod" : !containsMixinsAndOrCoreModOnly.toBoolean()
-        ]
-    }
-    return manifestAttributes
-}
-
-task sourcesJar(type: Jar) {
-    from (sourceSets.main.allSource)
-    from (file("$projectDir/LICENSE"))
-    getArchiveClassifier().set('sources')
-}
-
-task shadowDevJar(type: ShadowJar) {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    from sourceSets.main.output
-    getArchiveClassifier().set("dev")
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
-}
-
-task relocateShadowDevJar(type: ConfigureShadowRelocation) {
-    target = tasks.shadowDevJar
-    prefix = modGroup + ".shadow"
-}
-
-task circularResolverJar(type: Jar) {
-    dependsOn(relocateShadowDevJar)
-    dependsOn(shadowDevJar)
-    enabled = false
-}
-
-task devJar(type: Jar) {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    from sourceSets.main.output
-    getArchiveClassifier().set("dev")
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    if(usesShadowedDependencies.toBoolean()) {
-        dependsOn(circularResolverJar)
-        enabled = false
-    }
-}
-
-task apiJar(type: Jar) {
-    from (sourceSets.main.allSource) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
-    }
-
-    from (sourceSets.main.output) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
-    }
-
-    from (sourceSets.main.resources.srcDirs) {
-        include("LICENSE")
-    }
-
-    getArchiveClassifier().set('api')
-}
-
-artifacts {
-    if(!noPublishedSources) {
-        archives sourcesJar
-    }
-    archives devJar
-    if(apiPackage) {
-        archives apiJar
-    }
-}
-
-// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID),
-// and isn't strictly needed with the POM so just disable it.
-tasks.withType(GenerateModuleMetadata) {
-    enabled = false
-}
-
-// workaround variable hiding in pom processing
-def projectConfigs = project.configurations
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-            if(usesShadowedDependencies.toBoolean()) {
-                artifact source: shadowJar, classifier: ""
-            }
-            if(!noPublishedSources) {
-                artifact source: sourcesJar, classifier: "sources"
-            }
-            artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
-            if (apiPackage) {
-                artifact source: apiJar, classifier: "api"
-            }
-
-            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
-            artifactId = System.getenv("ARTIFACT_ID") ?: project.name
-            // Using the identified version, not project.version as it has the prepended 1.7.10
-            version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
-
-            // remove extra garbage from minecraft and minecraftDeps configuration
-            pom.withXml {
-                def badArtifacts = [:].withDefault {[] as Set<String>}
-                for (configuration in [projectConfigs.minecraft, projectConfigs.minecraftDeps]) {
-                    for (dependency in configuration.allDependencies) {
-                        badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name
-                    }
-                }
-                // example for specifying extra stuff to ignore
-                // badArtifacts["org.example.group"] += "artifactName"
-
-                Node pomNode = asNode()
-                pomNode.dependencies.'*'.findAll() {
-                    badArtifacts[it.groupId.text()].contains(it.artifactId.text())
-                }.each() {
-                    it.parent().remove(it)
-                }
-            }
-        }
-    }
-
-    repositories {
-        maven {
-            url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
-            credentials {
-                username = System.getenv("MAVEN_USER") ?: "NONE"
-                password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
-            }
-        }
-    }
-}
-
-// Updating
-task updateBuildScript {
-    doLast {
-        if (performBuildScriptUpdate(projectDir.toString())) return
-
-        print("Build script already up-to-date!")
-    }
-}
-
-if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
-    if (autoUpdateBuildScript.toBoolean()) {
-        performBuildScriptUpdate(projectDir.toString())
-    } else {
-        out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
-    }
-}
-
-static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
-}
-
-boolean performBuildScriptUpdate(String projectDir) {
-    if (isNewBuildScriptVersionAvailable(projectDir)) {
-        def buildscriptFile = getFile("build.gradle")
-        availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
-        out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
-        return true
-    }
-    return false
-}
-
-boolean isNewBuildScriptVersionAvailable(String projectDir) {
-    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
-
-    String currentBuildScript = getFile("build.gradle").getText()
-    String currentBuildScriptHash = getVersionHash(currentBuildScript)
-    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
-    String availableBuildScriptHash = getVersionHash(availableBuildScript)
-
-    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
-    return !isUpToDate
-}
-
-static String getVersionHash(String buildScriptContent) {
-    String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
-    if(versionLine != null) {
-        return versionLine.split(": ").last()
-    }
-    return ""
-}
-
-configure(updateBuildScript) {
-    group = 'forgegradle'
-    description = 'Updates the build script to the latest version'
-}
-
-// Deobfuscation
-
-def deobf(String sourceURL) {
-    try {
-        URL url = new URL(sourceURL)
-        String fileName = url.getFile()
-
-        //get rid of directories:
-        int lastSlash = fileName.lastIndexOf("/")
-        if(lastSlash > 0) {
-            fileName = fileName.substring(lastSlash + 1)
-        }
-        //get rid of extension:
-        if(fileName.endsWith(".jar")) {
-            fileName = fileName.substring(0, fileName.lastIndexOf("."))
-        }
-
-        String hostName = url.getHost()
-        if(hostName.startsWith("www.")) {
-            hostName = hostName.substring(4)
-        }
-        List parts = Arrays.asList(hostName.split("\\."))
-        Collections.reverse(parts)
-        hostName = String.join(".", parts)
-
-        return deobf(sourceURL, hostName + "/" + fileName)
-    } catch(Exception e) {
-        return deobf(sourceURL, "deobf/" + String.valueOf(sourceURL.hashCode()))
-    }
-}
-
-// The method above is to be preferred. Use this method if the filename is not at the end of the URL.
-def deobf(String sourceURL, String fileName) {
-    String cacheDir = System.getProperty("user.home") + "/.gradle/caches/"
-    String bon2Dir = cacheDir + "forge_gradle/deobf"
-    String bon2File  = bon2Dir + "/BON2-2.5.0.jar"
-    String obfFile = cacheDir + "modules-2/files-2.1/" + fileName + ".jar"
-    String deobfFile = cacheDir + "modules-2/files-2.1/" + fileName + "-deobf.jar"
-
-    if(file(deobfFile).exists()) {
-        return files(deobfFile)
-    }
-
-    download.run {
-        src 'https://github.com/GTNewHorizons/BON2/releases/download/2.5.0/BON2-2.5.0.CUSTOM-all.jar'
-        dest bon2File
-        quiet true
-        overwrite false
-    }
-
-    download.run {
-        src sourceURL
-        dest obfFile
-        quiet true
-        overwrite false
-    }
-
-    exec {
-        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', '1.7.10', '--mappingsVer', 'stable_12', '--notch'
-        workingDir bon2Dir
-        standardOutput = new ByteArrayOutputStream()
-    }
-
-    return files(deobfFile)
-}
-
-// Helper methods
-
-def checkPropertyExists(String propertyName) {
-    if (!project.hasProperty(propertyName)) {
-        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
-    }
-}
-
-def getFile(String relativePath) {
-    return new File(projectDir, relativePath)
+    id 'com.gtnewhorizons.gtnhconvention'
 }

dependencies.gradle

@@ -1,12 +1,14 @@
 // Add your dependencies here
 
 dependencies {
-    compile('com.github.GTNewHorizons:NotEnoughItems:2.2.7-GTNH:dev')
-    compile('com.github.GTNewHorizons:inventory-tweaks:1.5.14:api')
-    compile('com.github.GTNewHorizons:BuildCraft:7.1.27:api')
-    compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
-
-    compile('curse.maven:cofh-lib-220333:2388748')
-
+    api("com.github.GTNewHorizons:GTNHLib:0.9.54:dev")
+    api('curse.maven:cofh-lib-220333:2388748')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:2.1.19:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.107-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.57:api')
+    compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly('curse.maven:craftguide-75557:2459320')
+    compileOnly('com.github.GTNewHorizons:Postea:1.4.0-mu:dev')
+    devOnlyNonPublishable('net.xonich.mc:NoHotbarNeeded:0.0.3:dev')
 }

gradle.properties

@@ -1,60 +1,238 @@
+# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable.
+# LOCAL to test local config updates.
+gtnh.settings.blowdryerTag = 0.2.0
+
+# Human-readable mod name, available for mcmod.info population.
 modName = Forestry
 
-# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
+# Conventionally lowercase.
 modId = Forestry
 
+# Root package of the mod, used to find various classes in other properties,
+# mcmod.info substitution, enabling assertions in run tasks, etc.
 modGroup = forestry
 
-# WHY is there no version field?
-# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
-# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
+# Whether to use modGroup as the maven publishing group.
+# When false, com.github.GTNewHorizons is used.
+useModGroupForPublishing = false
 
-# Will update your build.gradle automatically whenever an update is available
+# Updates your build.gradle and settings.gradle automatically whenever an update is available.
 autoUpdateBuildScript = false
 
+# Version of Minecraft to target
 minecraftVersion = 1.7.10
+
+# Version of Minecraft Forge to target
 forgeVersion = 10.13.4.1614
 
-# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
-# restart Minecraft in development. Choose this dependent on your mod:
-# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
-# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
+# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
+channel = stable
+
+# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
+mappingsVersion = 12
+
+# Defines other MCP mappings for dependency deobfuscation.
+remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
+
+# Select a default username for testing your mod. You can always override this per-run by running
+# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer
 
-# Define a source file of your project with:
+# Enables modern Java syntax support. Valid values:
+# - false: No modern syntax, Java 8 only
+# - jabel: Jabel syntax-only support, compiles to J8 bytecode
+# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
+# - modern: Native modern Java bytecode, no downgrading
+enableModernJavaSyntax = jabel
+
+# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
+# and should *not* be used in most situations. -1 disables this.
+# forceToolchainVersion = -1
+
+# Target JVM version for JVM Downgrader bytecode downgrading.
+# Only used when enableModernJavaSyntax = jvmDowngrader
+# downgradeTargetVersion = 8
+
+# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
+# Classes will be available in META-INF/versions/N/ for each version N in this list.
+# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
+# jvmDowngraderMultiReleaseVersions = 21,25
+
+# Specifies how JVM Downgrader API stubs are provided. Options:
+# - shade: Shade minimized stubs into the jar
+# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
+# - external: Another dependency provides stubs (no constraint, no warning)
+# - (empty): Warning reminding you to configure stubs
+# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
+# jvmDowngraderStubsProvider =
+
+# Enables injecting missing generics into the decompiled source code for a better coding experience.
+# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
+enableGenericInjection = true
+
+# Generate a class with a String field for the mod version named as defined below.
+# If generateGradleTokenClass is empty or not missing, no such class will be generated.
+# If gradleTokenVersion is empty or missing, the field will not be present in the class.
+generateGradleTokenClass = forestry.Tags
+
+# Name of the token containing the project's current version to generate/replace.
+gradleTokenVersion = VERSION
+
+# [DEPRECATED] Mod ID replacement token.
+gradleTokenModId =
+
+# [DEPRECATED] Mod name replacement token.
+gradleTokenModName =
+
+# [DEPRECATED] Mod Group replacement token.
+gradleTokenGroupName =
+
+# [DEPRECATED]
+# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
 # public static final String VERSION = "GRADLETOKEN_VERSION";
 # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
-# version in @Mod([...], version = VERSION, [...])
-# Leave these properties empty to skip individual token replacements
-replaceGradleTokenInFile = Constants.java
-gradleTokenModId =
-gradleTokenModName =
-gradleTokenVersion = GRADLETOKEN_VERSION
-gradleTokenGroupName =
+# version in @Mod([...], version = VERSION, [...]).
+# Leave these properties empty to skip individual token replacements.
+replaceGradleTokenInFile =
 
 # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
 # leave this property empty.
-# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
+# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api
 apiPackage = api
 
 # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
-# Example value: mymodid_at.cfg
-accessTransformersFile =
+# There can be multiple files in a space-separated list.
+# Example value: mymodid_at.cfg nei_at.cfg
+accessTransformersFile = forestry_at.cfg
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
+
+# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
+# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
+# Mixin classes will have access to "main" classes, but not the other way around.
+separateMixinSourceSet =
+
+# Adds some debug arguments like verbose output and class export.
+usesMixinDebug = false
+
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage =
+
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
 # This parameter is for legacy compatibility only
-# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
+# Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin
 coreModClass =
+
 # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
 # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
 containsMixinsAndOrCoreModOnly = false
 
-# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
-# responsibility check the licence and request permission for distribution, if required.
+# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
+forceEnableMixins = false
+
+# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your
+# responsibility to check the license and request permission for distribution if required.
 usesShadowedDependencies = false
+
+# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access
+# their own classes, making the minimization unreliable.
+minimizeShadowedDependencies = true
+
+# If disabled, won't rename the shadowed classes.
+relocateShadowedDependencies = true
+
+# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+includeWellKnownRepositories = true
+
+# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
+# list of strings, with the acceptable keys being(case does not matter):
+# cursemaven
+# modrinth
+excludeWellKnownRepositories =
+
+# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
+# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
+# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
+usesMavenPublishing = true
+
+# Maven repository to publish the mod to.
+# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
+
+# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
+#
+# The project's ID on Modrinth. Can be either the slug or the ID.
+# Leave this empty if you don't want to publish to Modrinth.
+modrinthProjectId =
+
+# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
+# Syntax: scope1-type1:name1;scope2-type2:name2;...
+# Where scope can be one of [required, optional, incompatible, embedded],
+#       type can be one of [project, version],
+#       and the name is the Modrinth project or version slug/id of the other mod.
+# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
+modrinthRelations =
+
+# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
+#
+# The project's numeric ID on CurseForge. You can find this in the About Project box.
+# Leave this empty if you don't want to publish on CurseForge.
+curseForgeProjectId =
+
+# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
+# Syntax: type1:name1;type2:name2;...
+# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
+#       and the name is the CurseForge project slug of the other mod.
+# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
+curseForgeRelations =
+
+# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
+# projects. New projects should not use this parameter.
+# customArchiveBaseName =
+
+# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
+# runClientWorkingDirectory = run/client
+
+# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
+# runServerWorkingDirectory = run/server
+
+# Optional parameter to have the build automatically fail if an illegal version is used.
+# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
+# The check is ONLY performed if the version is a git tag.
+# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+
+# versionPattern =
+
+# Uncomment to prevent the source code from being published.
+# noPublishedSources = true
+
+# Uncomment this to disable Spotless checks.
+# This should only be uncommented to keep it easier to sync with upstream/other forks.
+# That is, if there is no other active fork/upstream, NEVER change this.
+# disableSpotless = true
+
+# Uncomment this to disable Checkstyle checks (currently wildcard import check).
+# disableCheckstyle = true
+
+# Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
+# (force use delegated build).
+# This is meant to be set in $HOME/.gradle/gradle.properties.
+# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be native build.
+# WARNING: If you do use this option, it will overwrite whatever you have in your existing projects. This might not be what you want!
+# Usually there is no need to uncomment this here as other developers do not necessarily use the same build type as you.
+# ideaOverrideBuildType = idea
+
+# Whether IDEA should run spotless checks when pressing the Build button.
+# This is meant to be set in $HOME/.gradle/gradle.properties.
+# ideaCheckSpotlessOnBuild = true
+
+# Non-GTNH properties
+org.gradle.configuration-cache = true
+org.gradle.parallel = true

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
+toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,80 +15,114 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,92 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,10 +27,14 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -51,48 +57,35 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

repositories.gradle

@@ -1,26 +1,5 @@
 // Add any additional repositiroes for your dependencies here
 
 repositories {
-    maven {
-        name 'GTNH Maven'
-        url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
-        allowInsecureProtocol
-    }
-    maven {
-        name 'ic2'
-        url 'http://maven.ic2.player.to/'
-        metadataSources {
-            mavenPom()
-            artifact()
-        }
-    }
-    maven {
-        url 'https://cursemaven.com'
-        content {
-            includeGroup 'curse.maven'
-        }
-    }
-    maven {
-        url 'https://jitpack.io'
-    }
+    mavenLocal()
 }

settings.gradle

@@ -0,0 +1,23 @@
+
+pluginManagement {
+    repositories {
+        maven {
+            // RetroFuturaGradle
+            name "GTNH Maven"
+            url "https://nexus.gtnewhorizons.com/repository/public/"
+            mavenContent {
+                includeGroup("com.gtnewhorizons")
+                includeGroupByRegex("com\\.gtnewhorizons\\..+")
+            }
+        }
+        gradlePluginPortal()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+
+plugins {
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24'
+}
+
+

src/main/java/forestry/Forestry.java

@@ -1,12 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
+ * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
+ * at http://www.gnu.org/licenses/lgpl-3.0.txt
  *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
+ * MysteriousAges
  ******************************************************************************/
 package forestry;
 
@@ -14,10 +12,10 @@ import java.io.File;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
-
 import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.ModAPIManager;
@@ -32,7 +30,6 @@ 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 forestry.api.core.ForestryAPI;
 import forestry.core.ClimateManager;
 import forestry.core.EventHandlerCore;
@@ -56,113 +53,122 @@ import forestry.plugins.PluginManager;
  * @author SirSengir
  */
 @Mod(
-		modid = Constants.MOD,
-		name = Constants.MOD,
-		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;")
+        modid = Constants.MOD,
+        name = Constants.MOD,
+        version = Constants.VERSION,
+        guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
+        dependencies = "required-after:Forge@[10.13.4.1566,);" + "required-after:gtnhlib@[0.9.41,);"
+                + "after:Buildcraft|Core@[6.1.7,);"
+                + "after:ExtrabiomesXL;"
+                + "after:BiomesOPlenty;"
+                + "after:IC2@[2.0.140,);"
+                + "after:Natura@[2.2.0,);"
+                + "after:HardcoreEnderExpansion;")
 public class Forestry {
 
-	@Mod.Instance(Constants.MOD)
-	public static Forestry instance;
-	private File configFolder;
+    @Mod.Instance(Constants.MOD)
+    public static Forestry instance;
 
-	public Forestry() {
-		ForestryAPI.instance = this;
-		ForestryAPI.climateManager = new ClimateManager();
-		ForestryAPI.forestryConstants = new Constants();
-		ForestryAPI.errorStateRegistry = new ErrorStateRegistry();
-		EnumErrorCode.init();
-	}
+    private File configFolder;
 
-	public static PacketHandler packetHandler;
+    public Forestry() {
+        ForestryAPI.instance = this;
+        ForestryAPI.climateManager = new ClimateManager();
+        ForestryAPI.forestryConstants = new Constants();
+        ForestryAPI.errorStateRegistry = new ErrorStateRegistry();
+        EnumErrorCode.init();
+    }
 
-	@EventHandler
-	public void preInit(FMLPreInitializationEvent event) {
-		checkForCoFHLib();
-		packetHandler = new PacketHandler();
+    public static PacketHandler packetHandler;
 
-		// Register event handler
-		EventHandlerCore eventHandlerCore = new EventHandlerCore();
-		MinecraftForge.EVENT_BUS.register(eventHandlerCore);
-		FMLCommonHandler.instance().bus().register(eventHandlerCore);
-		MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler());
+    public static boolean isDreamcraftLoaded;
 
-		configFolder = new File(event.getModConfigurationDirectory(), "forestry");
-		Config.load();
+    @EventHandler
+    public void preInit(FMLPreInitializationEvent event) {
+        checkForCoFHLib();
+        packetHandler = new PacketHandler();
 
-		PluginManager.runSetup();
+        isDreamcraftLoaded = Loader.isModLoaded("dreamcraft");
 
-		ForestryAPI.activeMode = new GameMode(Config.gameMode);
+        // Register event handler
+        EventHandlerCore eventHandlerCore = new EventHandlerCore();
+        MinecraftForge.EVENT_BUS.register(eventHandlerCore);
+        FMLCommonHandler.instance().bus().register(eventHandlerCore);
+        MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler());
 
-		PluginManager.runPreInit();
-	}
+        configFolder = new File(event.getModConfigurationDirectory(), "forestry");
+        Config.load();
 
-	@EventHandler
-	public void init(FMLInitializationEvent event) {
-		// Register gui handler
-		NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
+        PluginManager.runSetup();
 
-		PluginManager.runInit();
-	}
+        ForestryAPI.activeMode = new GameMode(Config.gameMode);
 
-	@EventHandler
-	public void postInit(FMLPostInitializationEvent event) {
-		PluginManager.runPostInit();
+        PluginManager.runPreInit();
+    }
 
-		// Register world generator
-		WorldGenerator worldGenerator = new WorldGenerator();
-		GameRegistry.registerWorldGenerator(worldGenerator, 0);
+    @EventHandler
+    public void init(FMLInitializationEvent event) {
+        // Register gui handler
+        NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
 
-		// Register tick handlers
-		Proxies.common.registerTickHandlers(worldGenerator);
+        PluginManager.runInit();
+    }
 
-		// Handle IMC messages.
-		PluginManager.processIMCMessages(FMLInterModComms.fetchRuntimeMessages(ForestryAPI.instance));
-	}
+    @EventHandler
+    public void postInit(FMLPostInitializationEvent event) {
+        PluginManager.runPostInit();
 
-	@EventHandler
-	public void serverStarting(FMLServerStartingEvent event) {
-		PluginManager.serverStarting(event.getServer());
-	}
+        // Parse Mail Blacklist
+        Config.parseMailBlacklist();
 
-	public File getConfigFolder() {
-		return configFolder;
-	}
+        // Register world generator
+        WorldGenerator worldGenerator = new WorldGenerator();
+        GameRegistry.registerWorldGenerator(worldGenerator, 0);
 
-	@EventHandler
-	public void processIMCMessages(IMCEvent event) {
-		PluginManager.processIMCMessages(event.getMessages());
-	}
+        // Register tick handlers
+        Proxies.common.registerTickHandlers(worldGenerator);
 
-	@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));
-				}
-			}
-		}
-	}
-	
-	private static void checkForCoFHLib() {
-		if (!ModAPIManager.INSTANCE.hasAPI("CoFHAPI|energy")) {
-			throw new RuntimeException("CoFHAPI|energy could not be found! This version of Forestry does not contain the RedstoneFlux API anymore, so you have to install either CoFHLib or CoFHCore.");
-		}
-	}
+        // Handle IMC messages.
+        PluginManager.processIMCMessages(FMLInterModComms.fetchRuntimeMessages(ForestryAPI.instance));
+    }
+
+    @EventHandler
+    public void serverStarting(FMLServerStartingEvent event) {
+        PluginManager.serverStarting(event.getServer());
+    }
+
+    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));
+                }
+            }
+        }
+    }
+
+    private static void checkForCoFHLib() {
+        if (!ModAPIManager.INSTANCE.hasAPI("CoFHAPI|energy")) {
+            throw new RuntimeException(
+                    "CoFHAPI|energy could not be found! This version of Forestry does not contain the RedstoneFlux API anymore, so you have to install either CoFHLib or CoFHCore.");
+        }
+    }
 }

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

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

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

@@ -8,24 +8,19 @@ 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.
+ * 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 wearOutEquipment(int amount) {}
 
-	@Override
-	public void onQueenDeath() {
-
-	}
-
-	@Override
-	public boolean onPollenRetrieved(IIndividual pollen) {
-		return false;
-	}
+    @Override
+    public void onQueenDeath() {}
 
+    @Override
+    public boolean onPollenRetrieved(IIndividual pollen) {
+        return false;
+    }
 }

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

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

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

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -10,17 +10,29 @@ import java.util.Locale;
 import forestry.api.genetics.ISpeciesType;
 
 public enum EnumBeeType implements ISpeciesType {
-	DRONE, PRINCESS, QUEEN, LARVAE, NONE;
 
-	public static final EnumBeeType[] VALUES = values();
+    DRONE,
+    PRINCESS,
+    QUEEN,
+    LARVAE,
+    NONE;
 
-	String name;
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final EnumBeeType[] VALUES = values();
 
-	EnumBeeType() {
-		this.name = this.toString().toLowerCase(Locale.ENGLISH);
-	}
+    private final String name;
 
-	public String getName() {
-		return name;
-	}
+    EnumBeeType() {
+        this.name = this.toString().toLowerCase(Locale.ENGLISH);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static EnumBeeType fromOrdinal(int ordinal) {
+        return VALUES[ordinal];
+    }
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -12,25 +12,36 @@ import net.minecraft.item.ItemStack;
 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";
+    /**
+     * <blockquote>
+     * 
+     * <pre>
+     * e.g.FlowerManager.flowerRegister.registerPlantableFlower(
+     *         new ItemStack(Blocks.red_flower),
+     *         1.0,
+     *         FlowerManager.FlowerTypeVanilla,
+     *         FlowerManager.FlowerTypeSnow);
+     * </pre>
+     * 
+     * </blockquote>
+     */
+    public static IFlowerRegistry flowerRegistry;
 
-	/**
-	 * @deprecated since Forestry 3.4. Use IFlowerRegistry.registerPlantableFlower instead.
-	 * Completely unused since Forestry 4.0, kept for backward compatibility with older mods.
-	 */
-	@Deprecated
-	public static ArrayList<ItemStack> plainFlowers = new ArrayList<ItemStack>();
+    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";
+
+    /**
+     * @deprecated since Forestry 3.4. Use IFlowerRegistry.registerPlantableFlower instead. Completely unused since
+     *             Forestry 4.0, kept for backward compatibility with older mods.
+     */
+    @Deprecated
+    public static ArrayList<ItemStack> plainFlowers = new ArrayList<ItemStack>();
 }

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

@@ -0,0 +1,9 @@
+package forestry.api.apiculture;
+
+import forestry.api.genetics.IEffectData;
+
+@SuppressWarnings("unused")
+public interface IAlleleBeeAcceleratableEffect {
+
+    IEffectData doEffectAccelerated(IBeeGenome genome, IEffectData storedData, IBeeHousing housing, float did);
+}

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

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

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

@@ -12,45 +12,44 @@ import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import forestry.api.genetics.IAlleleSpecies;
 
 public interface IAlleleBeeSpecies extends IAlleleSpecies {
 
-	/**
-	 * @return the IBeeRoot
-	 */
-	IBeeRoot getRoot();
+    /**
+     * @return the IBeeRoot
+     */
+    IBeeRoot getRoot();
 
-	/**
-	 * @return true if this species is only active at night.
-	 */
-	boolean isNocturnal();
+    /**
+     * @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 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();
+    /**
+     * @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);
+    /**
+     * Only jubilant bees produce specialities.
+     * 
+     * @return true if the bee is jubilant, false otherwise.
+     */
+    boolean isJubilant(IBeeGenome genome, IBeeHousing housing);
 
-	@SideOnly(Side.CLIENT)
-	IIcon getIcon(EnumBeeType type, int renderPass);
-
-	/**
-	 * @deprecated since Forestry 3.6.
-	 * @return Path of the texture to use for entity rendering.
-	 */
-	@Deprecated
-	String getEntityTexture();
+    @SideOnly(Side.CLIENT)
+    IIcon getIcon(EnumBeeType type, int renderPass);
 
+    /**
+     * @deprecated since Forestry 3.6.
+     * @return Path of the texture to use for entity rendering.
+     */
+    @Deprecated
+    String getEntityTexture();
 }

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

@@ -11,33 +11,40 @@ import forestry.api.genetics.IAlleleSpeciesCustom;
 
 public interface IAlleleBeeSpeciesCustom extends IAlleleBeeSpecies, IAlleleSpeciesCustom {
 
-	/**
-	 * Add a product for this bee species.
-	 * Chance is between 0 and 1.
-	 */
-	IAlleleBeeSpeciesCustom addProduct(ItemStack product, Float chance);
+    /**
+     * Add a product for this bee species. Chance is between 0 and 1.
+     */
+    IAlleleBeeSpeciesCustom addProduct(ItemStack product, Float chance);
 
-	/**
-	 * Add a specialty product for this bee species.
-	 * Bees only produce their specialty when they are Jubilant (see IJubilanceProvider)
-	 * Chance is between 0 and 1.
-	 */
-	IAlleleBeeSpeciesCustom addSpecialty(ItemStack specialty, Float chance);
+    /**
+     * Add a specialty product for this bee species. Bees only produce their specialty when they are Jubilant (see
+     * IJubilanceProvider) Chance is between 0 and 1.
+     */
+    IAlleleBeeSpeciesCustom addSpecialty(ItemStack specialty, Float chance);
 
-	/**
-	 * Set the Jubilance Provider for this bee species.
-	 * Bees only produce their specialty when they are Jubilant (see IJubilanceProvider)
-	 */
-	IAlleleBeeSpeciesCustom setJubilanceProvider(IJubilanceProvider provider);
+    /**
+     * Set the Jubilance Provider for this bee species. Bees only produce their specialty when they are Jubilant (see
+     * IJubilanceProvider)
+     */
+    IAlleleBeeSpeciesCustom setJubilanceProvider(IJubilanceProvider provider);
 
-	/**
-	 * Make this species only active at night.
-	 */
-	IAlleleBeeSpeciesCustom setNocturnal();
+    /**
+     * Get the Jubilance Provider for this bee species.
+     */
+    default IJubilanceProvider getJubilanceProvider() {
+        return null;
+    }
 
-	/** Use this if you have custom icons for bees. */
-	IAlleleBeeSpeciesCustom setCustomBeeIconProvider(IBeeIconProvider beeIconProvider);
+    /**
+     * Make this species only active at night.
+     */
+    IAlleleBeeSpeciesCustom setNocturnal();
 
-	/** Use this if you have custom icon colours for bees (other than the default static primary + secondary colours). */
-	IAlleleBeeSpeciesCustom setCustomBeeIconColourProvider(IBeeIconColourProvider beeIconColourProvider);
+    /** Use this if you have custom icons for bees. */
+    IAlleleBeeSpeciesCustom setCustomBeeIconProvider(IBeeIconProvider beeIconProvider);
+
+    /**
+     * Use this if you have custom icon colours for bees (other than the default static primary + secondary colours).
+     */
+    IAlleleBeeSpeciesCustom setCustomBeeIconColourProvider(IBeeIconColourProvider beeIconColourProvider);
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -9,49 +9,46 @@ 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.
- * 
+ * 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);
+    /**
+     * 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();
+    /**
+     * @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);
+    /**
+     * 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();
+    /**
+     * @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();
+    /**
+     * 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

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

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

@@ -16,47 +16,51 @@ import net.minecraft.item.ItemStack;
  */
 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 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
-	 * @since Forestry 4.2
-	 */
-	int wearsItems(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
+     * @since Forestry 4.2
+     */
+    int wearsItems(EntityLivingBase entity, String cause, boolean doProtect);
 
-	/**
-	 * Called when the apiarist's armor acts as protection against an attack.
-	 * @param stack ItemStack to check
-	 * @param player Player 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
-	 * @deprecated since Forestry 4.2. use the EntityLivingBase version
-	 */
-	@Deprecated
-	boolean isArmorApiarist(ItemStack stack, EntityPlayer player, String cause, boolean doProtect);
+    /**
+     * Called when the apiarist's armor acts as protection against an attack.
+     * 
+     * @param stack     ItemStack to check
+     * @param player    Player 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
+     * @deprecated since Forestry 4.2. use the EntityLivingBase version
+     */
+    @Deprecated
+    boolean isArmorApiarist(ItemStack stack, EntityPlayer player, String cause, boolean doProtect);
 
-	/**
-	 * Called when the apiarist's armor acts as protection against an attack.
-	 * @param player Player 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
-	 * @deprecated since Forestry 4.2. use the EntityLivingBase version
-	 */
-	@Deprecated
-	int wearsItems(EntityPlayer player, String cause, boolean doProtect);
+    /**
+     * Called when the apiarist's armor acts as protection against an attack.
+     * 
+     * @param player    Player 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
+     * @deprecated since Forestry 4.2. use the EntityLivingBase version
+     */
+    @Deprecated
+    int wearsItems(EntityPlayer player, String cause, boolean doProtect);
 }

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

@@ -0,0 +1,20 @@
+package forestry.api.apiculture;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+
+public interface IArmorApiaristMulti extends IArmorApiarist {
+
+    /**
+     * Called to determine how many pieces an armor "counts for". For instance, if this returns 4, the single piece will
+     * act as full protection.
+     *
+     * @param entity Entity being attacked
+     * @param armor  Armor item
+     * @param cause  Optional cause of attack, such as a bee effect identifier
+     * @return Amount of effective protected slots
+     */
+    default int getProtectionCount(EntityLivingBase entity, ItemStack armor, String cause) {
+        return 1;
+    }
+}

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -18,69 +18,70 @@ import forestry.api.genetics.IIndividualLiving;
 
 /**
  * Other implementations than Forestry's default one are not supported.
- * 
+ *
  * @author SirSengir
  */
 public interface IBee extends IIndividualLiving {
 
-	/**
-	 * @return Bee's genetic information.
-	 */
-	IBeeGenome getGenome();
+    /**
+     * @return Bee's genetic information.
+     */
+    IBeeGenome getGenome();
 
-	/**
-	 * @return Genetic information of the bee's mate, null if unmated.
-	 */
-	IBeeGenome getMate();
+    /**
+     * @return Genetic information of the bee's mate, null if unmated.
+     */
+    IBeeGenome getMate();
 
-	/**
-	 * @return true if the individual is originally of natural origin.
-	 */
-	boolean isNatural();
+    /**
+     * @return true if the individual is originally of natural origin.
+     */
+    boolean isNatural();
 
-	/**
-	 * @return generation this individual is removed from the original individual.
-	 */
-	int getGeneration();
+    /**
+     * @return generation this individual is removed from the original individual.
+     */
+    int getGeneration();
 
-	/**
-	 * Set the natural flag on this bee.
-	 * @param flag
-	 */
-	void setIsNatural(boolean flag);
+    /**
+     * Set the natural flag on this bee.
+     * 
+     * @param flag
+     */
+    void setIsNatural(boolean flag);
 
-	IEffectData[] doEffect(IEffectData[] storedData, IBeeHousing housing);
+    IEffectData[] doEffect(IEffectData[] storedData, IBeeHousing housing);
 
-	IEffectData[] doFX(IEffectData[] storedData, IBeeHousing housing);
+    IEffectData[] doFX(IEffectData[] storedData, IBeeHousing housing);
 
-	/**
-	 * @return true if the bee may spawn offspring
-	 */
-	boolean canSpawn();
+    /**
+     * @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);
+    /**
+     * 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<BiomeGenBase> getSuitableBiomes();
+    List<BiomeGenBase> getSuitableBiomes();
 
-	ItemStack[] getProduceList();
+    ItemStack[] getProduceList();
 
-	ItemStack[] getSpecialtyList();
+    ItemStack[] getSpecialtyList();
 
-	ItemStack[] produceStacks(IBeeHousing housing);
+    ItemStack[] produceStacks(IBeeHousing housing);
 
-	IBee spawnPrincess(IBeeHousing housing);
+    IBee spawnPrincess(IBeeHousing housing);
 
-	IBee[] spawnDrones(IBeeHousing housing);
+    IBee[] spawnDrones(IBeeHousing housing);
 
-	void plantFlowerRandom(IBeeHousing housing);
+    void plantFlowerRandom(IBeeHousing housing);
 
-	IIndividual retrievePollen(IBeeHousing housing);
-
-	boolean pollinateRandom(IBeeHousing housing, IIndividual pollen);
+    IIndividual retrievePollen(IBeeHousing housing);
 
+    boolean pollinateRandom(IBeeHousing housing, IIndividual pollen);
 }

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -16,32 +16,37 @@ import forestry.api.genetics.IHousing;
 
 public interface IBeeHousing extends IHousing, IClimateProvider, IErrorLogicSource {
 
-	/**
-	 * Used by BeeManager.beeRoot.createBeeHousingModifier(IBeeHousing housing)
-	 * to combine bee modifiers from several sources that can change over time.
-	 * @return IBeeModifiers from the housing, frames, etc.
-	 */
-	Iterable<IBeeModifier> getBeeModifiers();
+    /**
+     * Used by BeeManager.beeRoot.createBeeHousingModifier(IBeeHousing housing) to combine bee modifiers from several
+     * sources that can change over time.
+     * 
+     * @return IBeeModifiers from the housing, frames, etc.
+     */
+    Iterable<IBeeModifier> getBeeModifiers();
 
-	/**
-	 * Used by BeeManager.beeRoot.createBeeHousingListener(IBeeHousing housing)
-	 * to combine bee listeners from several sources that can change over time.
-	 * @return IBeeListeners from the housing, multiblock parts, etc.
-	 */
-	Iterable<IBeeListener> getBeeListeners();
+    /**
+     * Used by BeeManager.beeRoot.createBeeHousingListener(IBeeHousing housing) to combine bee listeners from several
+     * sources that can change over time.
+     * 
+     * @return IBeeListeners from the housing, multiblock parts, etc.
+     */
+    Iterable<IBeeListener> getBeeListeners();
 
-	IBeeHousingInventory getBeeInventory();
-	IBeekeepingLogic getBeekeepingLogic();
+    IBeeHousingInventory getBeeInventory();
 
-	int getBlockLightValue();
-	boolean canBlockSeeTheSky();
+    IBeekeepingLogic getBeekeepingLogic();
 
-	World getWorld();
-	GameProfile getOwner();
+    int getBlockLightValue();
 
-	/**
-	 * @since Forestry 4.2
-	 * @return exact coordinates where bee FX should spawn from
-	 */
-	Vec3 getBeeFXCoordinates();
+    boolean canBlockSeeTheSky();
+
+    World getWorld();
+
+    GameProfile getOwner();
+
+    /**
+     * @since Forestry 4.2
+     * @return exact coordinates where bee FX should spawn from
+     */
+    Vec3 getBeeFXCoordinates();
 }

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

@@ -9,18 +9,20 @@ import net.minecraft.item.ItemStack;
 
 public interface IBeeHousingInventory {
 
-	ItemStack getQueen();
-	ItemStack getDrone();
+    ItemStack getQueen();
 
-	void setQueen(ItemStack itemstack);
-	void setDrone(ItemStack itemstack);
+    ItemStack getDrone();
 
-	/**
-	 * 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);
+    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/IBeeIconColourProvider.java

@@ -9,5 +9,6 @@ package forestry.api.apiculture;
  * Custom colour provider for bees with complicated colors.
  */
 public interface IBeeIconColourProvider {
-	int getIconColour(int renderPass);
+
+    int getIconColour(int renderPass);
 }

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

@@ -9,6 +9,8 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 
 public interface IBeeIconProvider {
-	void registerIcons(IIconRegister register);
-	IIcon getIcon(EnumBeeType type, int renderPass);
+
+    void registerIcons(IIconRegister register);
+
+    IIcon getIcon(EnumBeeType type, int renderPass);
 }

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

@@ -9,21 +9,22 @@ 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 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);
+    /**
+     * 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/IBeeModifier.java

@@ -6,65 +6,72 @@
 package forestry.api.apiculture;
 
 public interface IBeeModifier {
-	/**
-	 * @param genome Genome of the bee this modifier is called for.
-	 * @param currentModifier Current modifier.
-	 * @return Float used to modify the base territory.
-	 */
-	float getTerritoryModifier(IBeeGenome genome, float currentModifier);
 
-	/**
-	 * @param genome Genome of the bee this modifier is called for.
-	 * @param mate Genome of the bee mate this modifier is called for.
-	 * @param currentModifier Current modifier.
-	 * @return Float used to modify the base mutation chance.
-	 */
-	float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
+    /**
+     * @param genome          Genome of the bee this modifier is called for.
+     * @param currentModifier Current modifier.
+     * @return Float used to modify the base territory.
+     */
+    float getTerritoryModifier(IBeeGenome genome, float currentModifier);
 
-	/**
-	 * @param genome Genome of the bee this modifier is called for.
-	 * @param currentModifier Current modifier.
-	 * @return Float used to modify the life span of queens.
-	 */
-	float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
+    /**
+     * @param genome          Genome of the bee this modifier is called for.
+     * @param 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 modifying the production speed of queens.
-	 */
-	float getProductionModifier(IBeeGenome genome, float currentModifier);
+    /**
+     * @param genome          Genome of the bee this modifier is called for.
+     * @param currentModifier Current modifier.
+     * @return Float used to modify the life span of queens.
+     */
+    float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
 
-	/**
-	 * @param genome Genome of the bee this modifier is called for.
-	 * @return Float modifying the flowering of queens.
-	 */
-	float getFloweringModifier(IBeeGenome genome, 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 chance for a swarmer queen to die off.
-	 */
-	float getGeneticDecay(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);
 
-	/**
-	 * @return Boolean indicating if housing can ignore rain
-	 */
-	boolean isSealed();
+    /**
+     * @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 darkness/night
-	 */
-	boolean isSelfLighted();
+    /**
+     * @return Boolean indicating if housing can ignore rain
+     */
+    boolean isSealed();
 
-	/**
-	 * @return Boolean indicating if housing can ignore not seeing the sky
-	 */
-	boolean isSunlightSimulated();
+    /**
+     * @return Boolean indicating if housing can ignore darkness/night. Cannot be used together with SelfUnlighted
+     */
+    boolean isSelfLighted();
 
-	/**
-	 * @return Boolean indicating whether this housing simulates the nether
-	 */
-	boolean isHellish();
+    /**
+     * @return Boolean indicating if housing can ignore lightness/day. Cannot be used together with SelfLighted
+     */
+    default boolean isSelfUnlighted() {
+        return false;
+    }
 
+    /**
+     * @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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -8,11 +8,13 @@ package forestry.api.apiculture;
 import forestry.api.genetics.IMutation;
 
 public interface IBeeMutation extends IMutation {
-	
-	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);
+
+    IBeeRoot getRoot();
+
+    /**
+     * @return float representing the chance for mutation to occur. note that this is 0 - 100 based, since it was an
+     *         integer previously!
+     */
+    float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, IBeeGenome genome0,
+            IBeeGenome genome1);
 }

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

@@ -8,5 +8,4 @@ package forestry.api.apiculture;
 import forestry.api.genetics.IMutationCustom;
 
 public interface IBeeMutationCustom extends IBeeMutation, IMutationCustom {
-
 }

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

@@ -8,16 +8,17 @@ package forestry.api.apiculture;
 import forestry.api.genetics.IAllele;
 
 public interface IBeeMutationFactory {
-	/**
-	 * Creates a new bee mutation.
-	 * Automatically registered with BeeManager.beeRoot.registerMutation()
-	 * See IBeeMutationCustom and IMutationCustom for adding additional properties to the returned mutation.
-	 *
-	 * @param parentBee0 A parent bee for this mutation
-	 * @param parentBee1 A parent bee for this mutation
-	 * @param result The resulting alleles for this mutation
-	 * @param chance The chance that breeding the two parent bees will result in this mutation
-	 * @return a new bee mutation.
-	 */
-	IBeeMutationCustom createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance);
+
+    /**
+     * Creates a new bee mutation. Automatically registered with BeeManager.beeRoot.registerMutation() See
+     * IBeeMutationCustom and IMutationCustom for adding additional properties to the returned mutation.
+     *
+     * @param parentBee0 A parent bee for this mutation
+     * @param parentBee1 A parent bee for this mutation
+     * @param result     The resulting alleles for this mutation
+     * @param chance     The chance that breeding the two parent bees will result in this mutation
+     * @return a new bee mutation.
+     */
+    IBeeMutationCustom createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result,
+            int chance);
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -19,114 +19,109 @@ import forestry.api.genetics.ISpeciesRoot;
 
 public interface IBeeRoot extends ISpeciesRoot {
 
-	/**
-	 * @return true if passed item is a Forestry bee. Equal to getType(ItemStack stack) != EnumBeeType.NONE
-	 */
-	@Override
-	boolean isMember(ItemStack stack);
+    /**
+     * @return true if passed item is a Forestry bee. Equal to getType(ItemStack stack) != EnumBeeType.NONE
+     */
+    @Override
+    boolean isMember(ItemStack stack);
 
-	/**
-	 * @return {@link IBee} pattern parsed from the passed stack's nbt data.
-	 */
-	@Override
-	IBee getMember(ItemStack stack);
+    /**
+     * @return {@link IBee} pattern parsed from the passed stack's nbt data.
+     */
+    @Override
+    IBee getMember(ItemStack stack);
 
-	@Override
-	IBee getMember(NBTTagCompound compound);
+    @Override
+    IBee getMember(NBTTagCompound compound);
 
-	/* GENOME CONVERSION */
-	@Override
-	IBee templateAsIndividual(IAllele[] template);
+    /* GENOME CONVERSION */
+    @Override
+    IBee templateAsIndividual(IAllele[] template);
 
-	@Override
-	IBee templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive);
+    @Override
+    IBee templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive);
 
-	@Override
-	IBeeGenome templateAsGenome(IAllele[] template);
+    @Override
+    IBeeGenome templateAsGenome(IAllele[] template);
 
-	@Override
-	IBeeGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
+    @Override
+    IBeeGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
 
-	/* BREEDING TRACKER */
-	/**
-	 * @param world
-	 * @return {@link IApiaristTracker} associated with the passed world.
-	 */
-	IApiaristTracker getBreedingTracker(World world, GameProfile player);
+    /* BREEDING TRACKER */
+    /**
+     * @param world
+     * @return {@link IApiaristTracker} associated with the passed world.
+     */
+    IApiaristTracker getBreedingTracker(World world, GameProfile player);
 
-	/* BEE SPECIFIC */
-	/**
-	 * @return type of bee encoded on the itemstack. EnumBeeType.NONE if it isn't a bee.
-	 */
-	@Override
-	EnumBeeType getType(ItemStack stack);
+    /* BEE SPECIFIC */
+    /**
+     * @return type of bee encoded on the itemstack. EnumBeeType.NONE if it isn't a bee.
+     */
+    @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 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);
+    /**
+     * @return true if passed item is mated (i.e. a queen)
+     */
+    boolean isMated(ItemStack stack);
 
-	/**
-	 * @param genome
-	 *            Valid {@link IBeeGenome}
-	 * @return {@link IBee} from the passed genome
-	 */
-	IBee getBee(World world, IBeeGenome genome);
+    /**
+     * @param genome Valid {@link IBeeGenome}
+     * @return {@link IBee} from the passed genome
+     */
+    IBee getBee(World world, IBeeGenome genome);
 
-	/**
-	 * Creates an IBee suitable for a queen containing the necessary second genome for the mate.
-	 * 
-	 * @param genome
-	 *            Valid {@link IBeeGenome}
-	 * @param mate
-	 *            Valid {@link IBee} representing the mate.
-	 * @return Mated {@link IBee} from the passed genomes.
-	 */
-	IBee getBee(World world, IBeeGenome genome, IBee mate);
+    /**
+     * Creates an IBee suitable for a queen containing the necessary second genome for the mate.
+     *
+     * @param genome Valid {@link IBeeGenome}
+     * @param mate   Valid {@link IBee} representing the mate.
+     * @return Mated {@link IBee} from the passed genomes.
+     */
+    IBee getBee(World world, IBeeGenome genome, IBee mate);
 
-	/* TEMPLATES */
-	@Override
-	ArrayList<IBee> getIndividualTemplates();
+    /* TEMPLATES */
+    @Override
+    ArrayList<IBee> getIndividualTemplates();
 
-	/* MUTATIONS */
-	@Override
-	Collection<IBeeMutation> getMutations(boolean shuffle);
+    /* MUTATIONS */
+    @Override
+    Collection<IBeeMutation> getMutations(boolean shuffle);
 
-	/* GAME MODE */
-	void resetBeekeepingMode();
+    /* GAME MODE */
+    void resetBeekeepingMode();
 
-	ArrayList<IBeekeepingMode> getBeekeepingModes();
+    ArrayList<IBeekeepingMode> getBeekeepingModes();
 
-	IBeekeepingMode getBeekeepingMode(World world);
+    IBeekeepingMode getBeekeepingMode(World world);
 
-	IBeekeepingMode getBeekeepingMode(String name);
+    IBeekeepingMode getBeekeepingMode(String name);
 
-	void registerBeekeepingMode(IBeekeepingMode mode);
+    void registerBeekeepingMode(IBeekeepingMode mode);
 
-	void setBeekeepingMode(World world, String name);
+    void setBeekeepingMode(World world, String name);
 
-	/* MISC */
-	/**
-	 * Creates beekeepingLogic for a housing.
-	 * Should be used when the housing is created, see IBeekeepingLogic
-	 */
-	IBeekeepingLogic createBeekeepingLogic(IBeeHousing housing);
+    /* 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);
+    /**
+     * 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/IBeekeepingLogic.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -10,52 +10,48 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import forestry.api.core.INBTTagable;
 
 /**
- * Stores beekeeping logic for bee housings.
- * Get one with BeeManager.beeRoot.createBeekeepingLogic(IBeeHousing housing)
+ * Stores beekeeping logic for bee housings. Get one with BeeManager.beeRoot.createBeekeepingLogic(IBeeHousing housing)
  * Save and load it to NBT using the INBTTagable methods.
  */
 public interface IBeekeepingLogic extends INBTTagable {
 
-	/* SERVER */
+    /* 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();
+    /**
+     * 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();
+    /**
+     * Performs actual work, breeding, production, etc.
+     */
+    void doWork();
 
+    /* CLIENT */
 
-	/* CLIENT */
+    /**
+     * Call this when the housing comes into view of the client. (i.e. when tile.getDescriptionPacket() is called)
+     */
+    void syncToClient();
 
-	/**
-	 * Call this when the housing comes into view of the client.
-	 * (i.e. when tile.getDescriptionPacket() is called)
-	 */
-	void syncToClient();
-	void syncToClient(EntityPlayerMP player);
+    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();
+    /**
+     * Get the progress bar for breeding and production. To avoid network spam, this is only available server-side, and
+     * must be synced manually to the client when a GUI is open.
+     */
+    int getBeeProgressPercent();
 
-	/**
-	 * Whether bee fx should be active.
-	 * Internally, this is automatically synced to the client.
-	 */
-	boolean canDoBeeFX();
-
-	/**
-	 * Display bee fx. Calls IBee.doFX(IEffectData[] storedData, IBeeHousing housing) on the queen.
-	 * Internally, the queen is automatically synced to the client for the fx.
-	 */
-	void doBeeFX();
+    /**
+     * Whether bee fx should be active. Internally, this is automatically synced to the client.
+     */
+    boolean canDoBeeFX();
 
+    /**
+     * Display bee fx. Calls IBee.doFX(IEffectData[] storedData, IBeeHousing housing) on the queen. Internally, the
+     * queen is automatically synced to the client for the fx.
+     */
+    void doBeeFX();
 }

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

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

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

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

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

@@ -1,24 +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 java.util.List;
+
+import javax.annotation.Nullable;
+
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 
 public interface IHiveFrame {
 
-	/**
-	 * Wears out a frame.
-	 * 
-	 * @param housing IBeeHousing the frame is contained in.
-	 * @param frame ItemStack containing the actual frame.
-	 * @param queen Current queen in the caller.
-	 * @param wear Integer denoting the amount worn out. The wear modifier of the current beekeeping mode has already been taken into account.
-	 * @return ItemStack containing the actual frame with adjusted damage, or null if it has been broken.
-	 */
-	ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear);
+    /**
+     * Wears out a frame.
+     *
+     * @param housing IBeeHousing the frame is contained in.
+     * @param frame   ItemStack containing the actual frame.
+     * @param queen   Current queen in the caller.
+     * @param wear    Integer denoting the amount worn out. The wear modifier of the current beekeeping mode has already
+     *                been taken into account.
+     * @return ItemStack containing the actual frame with adjusted damage, or null if it has been broken.
+     */
+    ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear);
 
-	IBeeModifier getBeeModifier();
+    IBeeModifier getBeeModifier();
+
+    /**
+     * Provides an override for the "Hold Shift" tooltip info for a frame.<br>
+     * Called by {@link forestry.apiculture.EventHandlerApiculture#addFrameTooltip(ItemTooltipEvent)}.
+     *
+     * @return The info to display for this frame, or null if default generated info.
+     */
+    @Nullable
+    default List<String> getFrameTooltip() {
+        return null;
+    }
 }

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

@@ -8,9 +8,10 @@ package forestry.api.apiculture;
 import net.minecraft.block.Block;
 
 public interface IJubilanceFactory {
-	/** The default Jubilance Provider is satisfied when the humidity and temperature are ideal for the bee. */
-	IJubilanceProvider getDefault();
 
-	/** The Requires Resource Jubilance Provider is satisfied when a specific block is under the hive. */
-	IJubilanceProvider getRequiresResource(Block block, int meta);
+    /** The default Jubilance Provider is satisfied when the humidity and temperature are ideal for the bee. */
+    IJubilanceProvider getDefault();
+
+    /** The Requires Resource Jubilance Provider is satisfied when a specific block is under the hive. */
+    IJubilanceProvider getRequiresResource(Block block, int meta);
 }

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

@@ -7,9 +7,13 @@ 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);
+    /**
+     * 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);
+
+    default String getDescription() {
+        return null;
+    }
 }

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

@@ -7,7 +7,6 @@ package forestry.api.apiculture.hives;
 
 public class HiveManager {
 
-	public static IHiveRegistry hiveRegistry;
-	public static IHiveGenHelper genHelper;
-
+    public static IHiveRegistry hiveRegistry;
+    public static IHiveGenHelper genHelper;
 }

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

@@ -14,35 +14,37 @@ import forestry.api.core.EnumTemperature;
 
 public interface IHiveDescription {
 
-	/**
-	 * The hive generator for this hive.
-	 */
-	IHiveGen getHiveGen();
+    /**
+     * The hive generator for this hive.
+     */
+    IHiveGen getHiveGen();
 
-	/**
-	 * The hive block to be placed in the world.
-	 */
-	Block getBlock();
-	int getMeta();
+    /**
+     * The hive block to be placed in the world.
+     */
+    Block getBlock();
 
-	/**
-	 * returns true if the hive can be generated in these conditions.
-	 * Used as a fast early-elimination check for hives that have no hope of spawning in the area.
-	 */
-	boolean isGoodBiome(BiomeGenBase biome);
-	boolean isGoodHumidity(EnumHumidity humidity);
-	boolean isGoodTemperature(EnumTemperature temperature);
+    int getMeta();
 
-	/**
-	 * 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();
+    /**
+     * returns true if the hive can be generated in these conditions. Used as a fast early-elimination check for hives
+     * that have no hope of spawning in the area.
+     */
+    boolean isGoodBiome(BiomeGenBase biome);
 
-	/**
-	 * Called after successful hive generation.
-	 * world, x, y, z give the location of the new hive.
-	 **/
-	void postGen(World world, int x, int y, int z);
+    boolean isGoodHumidity(EnumHumidity humidity);
+
+    boolean isGoodTemperature(EnumTemperature temperature);
+
+    /**
+     * float representing the relative chance a hive will generate in a chunk. Default is 1.0, higher numbers result in
+     * more hives, smaller will result in fewer. Tree hives want around 3.0 to 4.0 since there are less locations to
+     * generate on.
+     */
+    float getGenChance();
+
+    /**
+     * Called after successful hive generation. world, x, y, z give the location of the new hive.
+     **/
+    void postGen(World world, int x, int y, int z);
 }

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

@@ -9,21 +9,19 @@ import net.minecraft.world.World;
 
 public interface IHiveGen {
 
-	/**
-	 * return a Y value that the hive should try to generate at.
-	 * returns negative if the hive can't be placed anywhere.
-	 */
-	int getYForHive(World world, int x, int z);
+    /**
+     * return a Y value that the hive should try to generate at. returns negative if the hive can't be placed anywhere.
+     */
+    int getYForHive(World world, int x, int z);
 
-	/**
-	 * returns true if the hive can be generated at this location.
-	 * Used for advanced conditions, like checking that the ground below the hive is a certain type.
-	 */
-	boolean isValidLocation(World world, int x, int y, int z);
-
-	/**
-	 * returns true if the hive can safely replace the block at this location.
-	 */
-	boolean canReplace(World world, int x, int y, int z);
+    /**
+     * returns true if the hive can be generated at this location. Used for advanced conditions, like checking that the
+     * ground below the hive is a certain type.
+     */
+    boolean isValidLocation(World world, int x, int y, int z);
 
+    /**
+     * returns true if the hive can safely replace the block at this location.
+     */
+    boolean canReplace(World world, int x, int y, int z);
 }

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

@@ -9,15 +9,14 @@ 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();
+    /**
+     * 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

@@ -11,23 +11,24 @@ import forestry.api.apiculture.IHiveDrop;
 
 public interface IHiveRegistry {
 
-	/* Forestry Hive Names */
-	public static final String forest = "Forestry:forest";
-	public static final String meadows = "Forestry:meadows";
-	public static final String desert = "Forestry:desert";
-	public static final String jungle = "Forestry:jungle";
-	public static final String end = "Forestry:end";
-	public static final String snow = "Forestry:snow";
-	public static final String swamp = "Forestry:swamp";
+    /* Forestry Hive Names */
+    public static final String forest = "Forestry:forest";
+    public static final String meadows = "Forestry:meadows";
+    public static final String desert = "Forestry:desert";
+    public static final String jungle = "Forestry:jungle";
+    public static final String end = "Forestry:end";
+    public static final String snow = "Forestry:snow";
+    public static final String swamp = "Forestry:swamp";
 
-	/**
-	 * Adds a new hive to be generated in the world.
-	 */
-	void registerHive(String hiveName, IHiveDescription hiveDescription);
+    /**
+     * 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);
+    /**
+     * 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

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

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

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

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

@@ -11,38 +11,38 @@ import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IFruitFamily;
 
 public enum EnumFruitFamily implements IFruitFamily {
-	PRUNES("prunes", "Prunus domestica"),
-	POMES("pomes", "Pomum"),
-	JUNGLE("jungle", "Tropicus"),
-	NUX("nuts", "Nux");
 
-	private final String uid;
-	private final String scientific;
+    PRUNES("prunes", "Prunus domestica"),
+    POMES("pomes", "Pomum"),
+    JUNGLE("jungle", "Tropicus"),
+    NUX("nuts", "Nux");
 
-	EnumFruitFamily(String uid, String scientific) {
-		this.uid = uid;
-		this.scientific = scientific;
-		AlleleManager.alleleRegistry.registerFruitFamily(this);
-	}
+    private final String uid;
+    private final String scientific;
 
-	@Override
-	public String getUID() {
-		return "forestry." + uid;
-	}
+    EnumFruitFamily(String uid, String scientific) {
+        this.uid = uid;
+        this.scientific = scientific;
+        AlleleManager.alleleRegistry.registerFruitFamily(this);
+    }
 
-	@Override
-	public String getScientific() {
-		return this.scientific;
-	}
+    @Override
+    public String getUID() {
+        return "forestry." + uid;
+    }
 
-	@Override
-	public String getName() {
-		return StatCollector.translateToLocal("for.family." + uid);
-	}
+    @Override
+    public String getScientific() {
+        return this.scientific;
+    }
 
-	@Override
-	public String getDescription() {
-		return StatCollector.translateToLocal("for.family." + uid + ".description");
-	}
+    @Override
+    public String getName() {
+        return StatCollector.translateToLocal("for.family." + uid);
+    }
 
+    @Override
+    public String getDescription() {
+        return StatCollector.translateToLocal("for.family." + uid + ".description");
+    }
 }

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

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

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

@@ -1,10 +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 EnumGrowthConditions {
-	HOSTILE, PALTRY, NORMAL, GOOD, EXCELLENT
+    HOSTILE,
+    PALTRY,
+    NORMAL,
+    GOOD,
+    EXCELLENT
 }

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

@@ -6,5 +6,10 @@
 package forestry.api.arboriculture;
 
 public enum EnumLeafType {
-	DECIDUOUS, CONIFERS, JUNGLE, WILLOW, MAPLE, PALM
+    DECIDUOUS,
+    CONIFERS,
+    JUNGLE,
+    WILLOW,
+    MAPLE,
+    PALM
 }

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

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

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

@@ -11,59 +11,83 @@ import java.util.Random;
 import net.minecraft.nbt.NBTTagCompound;
 
 public enum EnumWoodType {
-	LARCH, TEAK, ACACIA, LIME, CHESTNUT,
-	WENGE, BAOBAB, SEQUOIA(4.0f), KAPOK, EBONY,
-	MAHOGANY, BALSA(1.0f), WILLOW, WALNUT, GREENHEART(7.5f),
-	CHERRY, MAHOE, POPLAR, PALM, PAPAYA,
-	PINE(3.0f), PLUM, MAPLE, CITRUS, GIGANTEUM,
-	IPE, PADAUK, COCOBOLO, ZEBRAWOOD;
 
-	public static final float DEFAULT_HARDNESS = 2.0f;
-	public static final EnumWoodType[] VALUES = values();
+    LARCH,
+    TEAK,
+    ACACIA,
+    LIME,
+    CHESTNUT,
+    WENGE,
+    BAOBAB,
+    SEQUOIA(4.0f),
+    KAPOK,
+    EBONY,
+    MAHOGANY,
+    BALSA(1.0f),
+    WILLOW,
+    WALNUT,
+    GREENHEART(7.5f),
+    CHERRY,
+    MAHOE,
+    POPLAR,
+    PALM,
+    PAPAYA,
+    PINE(3.0f),
+    PLUM,
+    MAPLE,
+    CITRUS,
+    GIGANTEUM,
+    IPE,
+    PADAUK,
+    COCOBOLO,
+    ZEBRAWOOD;
 
-	private final float hardness;
+    public static final float DEFAULT_HARDNESS = 2.0f;
+    public static final EnumWoodType[] VALUES = values();
 
-	EnumWoodType() {
-		this.hardness = DEFAULT_HARDNESS;
-	}
+    private final float hardness;
 
-	EnumWoodType(float hardness) {
-		this.hardness = hardness;
-	}
+    EnumWoodType() {
+        this.hardness = DEFAULT_HARDNESS;
+    }
 
-	public float getHardness() {
-		return hardness;
-	}
+    EnumWoodType(float hardness) {
+        this.hardness = hardness;
+    }
 
-	/**
-	 * @deprecated since Forestry 4.2. Woods use itemDamage instead of NBT now
-	 */
-	@Deprecated
-	public void saveToCompound(NBTTagCompound compound) {
-		compound.setInteger("WoodType", ordinal());
-	}
+    public float getHardness() {
+        return hardness;
+    }
 
-	/**
-	 * @deprecated since Forestry 4.2. Woods use itemDamage instead of NBT now
-	 */
-	@Deprecated
-	public static EnumWoodType getFromCompound(NBTTagCompound compound) {
-		if (compound != null) {
-			int typeOrdinal = compound.getInteger("WoodType");
-			if (typeOrdinal >= 0 && typeOrdinal < VALUES.length) {
-				return VALUES[typeOrdinal];
-			}
-		}
+    /**
+     * @deprecated since Forestry 4.2. Woods use itemDamage instead of NBT now
+     */
+    @Deprecated
+    public void saveToCompound(NBTTagCompound compound) {
+        compound.setInteger("WoodType", ordinal());
+    }
 
-		return EnumWoodType.LARCH;
-	}
+    /**
+     * @deprecated since Forestry 4.2. Woods use itemDamage instead of NBT now
+     */
+    @Deprecated
+    public static EnumWoodType getFromCompound(NBTTagCompound compound) {
+        if (compound != null) {
+            int typeOrdinal = compound.getInteger("WoodType");
+            if (typeOrdinal >= 0 && typeOrdinal < VALUES.length) {
+                return VALUES[typeOrdinal];
+            }
+        }
 
-	public static EnumWoodType getRandom(Random random) {
-		return VALUES[random.nextInt(VALUES.length)];
-	}
+        return EnumWoodType.LARCH;
+    }
 
-	@Override
-	public String toString() {
-		return super.toString().toLowerCase(Locale.ENGLISH);
-	}
+    public static EnumWoodType getRandom(Random random) {
+        return VALUES[random.nextInt(VALUES.length)];
+    }
+
+    @Override
+    public String toString() {
+        return super.toString().toLowerCase(Locale.ENGLISH);
+    }
 }

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
@@ -15,6 +15,5 @@ import forestry.api.genetics.IEffectData;
  */
 public interface IAlleleLeafEffect extends IAlleleEffect {
 
-	IEffectData doEffect(ITreeGenome genome, IEffectData storedData, World world, int x, int y, int z);
-
+    IEffectData doEffect(ITreeGenome genome, IEffectData storedData, World world, int x, int y, int z);
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
@@ -8,44 +8,41 @@ package forestry.api.arboriculture;
 import java.util.Collection;
 
 import net.minecraft.util.IIcon;
-
 import net.minecraftforge.common.EnumPlantType;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IFruitFamily;
 
 public interface IAlleleTreeSpecies extends IAlleleSpecies {
 
-	ITreeRoot getRoot();
-	
-	/**
-	 * @return Native plant type of this species.
-	 */
-	EnumPlantType getPlantType();
+    ITreeRoot getRoot();
 
-	/**
-	 * @return List of all {@link IFruitFamily}s which can grow on leaves generated by this species.
-	 */
-	Collection<IFruitFamily> getSuitableFruit();
+    /**
+     * @return Native plant type of this species.
+     */
+    EnumPlantType getPlantType();
 
-	/**
-	 * @return Tree generator for this species.
-	 */
-	ITreeGenerator getGenerator();
+    /**
+     * @return List of all {@link IFruitFamily}s which can grow on leaves generated by this species.
+     */
+    Collection<IFruitFamily> getSuitableFruit();
 
-	/* TEXTURES AND OVERRIDES */
-	int getLeafColour(boolean pollinated);
+    /**
+     * @return Tree generator for this species.
+     */
+    ITreeGenerator getGenerator();
 
-	@SideOnly(Side.CLIENT)
-	IIcon getLeafIcon(boolean pollinated, boolean fancy);
+    /* TEXTURES AND OVERRIDES */
+    int getLeafColour(boolean pollinated);
 
-	@SideOnly(Side.CLIENT)
-	IIcon getGermlingIcon(EnumGermlingType type, int renderPass);
-	
-	@SideOnly(Side.CLIENT)
-	int getGermlingColour(EnumGermlingType type, int renderPass);
+    @SideOnly(Side.CLIENT)
+    IIcon getLeafIcon(boolean pollinated, boolean fancy);
 
+    @SideOnly(Side.CLIENT)
+    IIcon getGermlingIcon(EnumGermlingType type, int renderPass);
+
+    @SideOnly(Side.CLIENT)
+    int getGermlingColour(EnumGermlingType type, int renderPass);
 }

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

@@ -12,10 +12,9 @@ import forestry.api.genetics.IFruitFamily;
 
 public interface IAlleleTreeSpeciesCustom extends IAlleleSpeciesCustom, IAlleleTreeSpecies {
 
-	/** Add a fruit family for this tree. Trees can have multiple fruit families. */
-	IAlleleTreeSpeciesCustom addFruitFamily(IFruitFamily family);
-
-	/** Set the minecraft plant type for this tree. Default is Plains. */
-	IAlleleTreeSpeciesCustom setPlantType(EnumPlantType type);
+    /** Add a fruit family for this tree. Trees can have multiple fruit families. */
+    IAlleleTreeSpeciesCustom addFruitFamily(IFruitFamily family);
 
+    /** Set the minecraft plant type for this tree. Default is Plains. */
+    IAlleleTreeSpeciesCustom setPlantType(EnumPlantType type);
 }

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

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

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

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

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

@@ -9,11 +9,12 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 
 /**
- * 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.
+ * 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 IGermlingIconProvider {
-	void registerIcons(IIconRegister register);
-	IIcon getIcon(EnumGermlingType type, int renderPass);
+
+    void registerIcons(IIconRegister register);
+
+    IIcon getIcon(EnumGermlingType type, int renderPass);
 }

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

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

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

@@ -8,13 +8,15 @@ package forestry.api.arboriculture;
 import net.minecraft.util.IIcon;
 
 /**
- * Provides icons for leaves. Used by TreeManager.treeFactory.createSpecies()
- * Get a default Forestry implementation from TreeManager.treeFactory.getLeafIconProvider() or implement your own.
+ * Provides icons for leaves. Used by TreeManager.treeFactory.createSpecies() Get a default Forestry implementation from
+ * TreeManager.treeFactory.getLeafIconProvider() or implement your own.
  *
- * If you implement your own, be sure to register the icons.
- * Icon registration is not done here because these icons are heavily reused.
+ * 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 ILeafIconProvider {
-	IIcon getIcon(boolean pollinated, boolean fancy);
-	int getColor(boolean pollinated);
+
+    IIcon getIcon(boolean pollinated, boolean fancy);
+
+    int getColor(boolean pollinated);
 }

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

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

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

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

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

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

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

@@ -10,25 +10,28 @@ import java.awt.Color;
 import forestry.api.genetics.IClassification;
 
 public interface ITreeFactory {
-	/**
-	 * Creates a new tree species.
-	 * Automatically registered with AlleleManager.alleleRegistry.registerAllele()
-	 * See IAlleleTreeSpeciesCustom and IAlleleSpeciesCustom 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 leafIconProvider The leaf icon provider for this species
-	 * @param germlingIconProvider The germling icon provider for this species
-	 * @param generator The tree generator
-	 * @return a new tree species allele.
-	 */
-	IAlleleTreeSpeciesCustom createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, ILeafIconProvider leafIconProvider, IGermlingIconProvider germlingIconProvider, ITreeGenerator generator);
 
-	/** Get one of the built-in Forestry leaf types. Default type is deciduous. */
-	ILeafIconProvider getLeafIconProvider(EnumLeafType enumLeafType, Color color, Color colorPollinated);
+    /**
+     * Creates a new tree species. Automatically registered with AlleleManager.alleleRegistry.registerAllele() See
+     * IAlleleTreeSpeciesCustom and IAlleleSpeciesCustom 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 leafIconProvider       The leaf icon provider for this species
+     * @param germlingIconProvider   The germling icon provider for this species
+     * @param generator              The tree generator
+     * @return a new tree species allele.
+     */
+    IAlleleTreeSpeciesCustom createSpecies(String uid, String unlocalizedName, String authority,
+            String unlocalizedDescription, boolean dominant, IClassification branch, String binomial,
+            ILeafIconProvider leafIconProvider, IGermlingIconProvider germlingIconProvider, ITreeGenerator generator);
+
+    /** Get one of the built-in Forestry leaf types. Default type is deciduous. */
+    ILeafIconProvider getLeafIconProvider(EnumLeafType enumLeafType, Color color, Color colorPollinated);
 }

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

@@ -7,32 +7,32 @@ package forestry.api.arboriculture;
 
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
+import net.minecraftforge.common.util.ForgeDirection;
 
 import com.mojang.authlib.GameProfile;
 
-import net.minecraftforge.common.util.ForgeDirection;
-
 import forestry.api.world.ITreeGenData;
 
 /**
  * Implements the tree generation for a tree species.
  */
 public interface ITreeGenerator {
-	WorldGenerator getWorldGenerator(ITreeGenData tree);
 
-	void setLogBlock(ITreeGenome genome, World world, int x, int y, int z, ForgeDirection facing);
+    WorldGenerator getWorldGenerator(ITreeGenData tree);
 
-	void setLeaves(ITreeGenome genome, World world, GameProfile owner, int x, int y, int z, boolean decorative);
+    void setLogBlock(ITreeGenome genome, World world, int x, int y, int z, ForgeDirection facing);
 
-	/**
-	 * @deprecated since Forestry 4.2. use the genome version
-	 */
-	@Deprecated
-	void setLogBlock(World world, int x, int y, int z, ForgeDirection facing);
+    void setLeaves(ITreeGenome genome, World world, GameProfile owner, int x, int y, int z, boolean decorative);
 
-	/**
-	 * @deprecated since Forestry 4.2. use the genome version
-	 */
-	@Deprecated
-	void setLeaves(World world, GameProfile owner, int x, int y, int z, boolean decorative);
+    /**
+     * @deprecated since Forestry 4.2. use the genome version
+     */
+    @Deprecated
+    void setLogBlock(World world, int x, int y, int z, ForgeDirection facing);
+
+    /**
+     * @deprecated since Forestry 4.2. use the genome version
+     */
+    @Deprecated
+    void setLeaves(World world, GameProfile owner, int x, int y, int z, boolean decorative);
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
@@ -13,34 +13,34 @@ import forestry.api.genetics.IGenome;
 
 public interface ITreeGenome extends IGenome {
 
-	IAlleleTreeSpecies getPrimary();
+    IAlleleTreeSpecies getPrimary();
 
-	IAlleleTreeSpecies getSecondary();
+    IAlleleTreeSpecies getSecondary();
 
-	IFruitProvider getFruitProvider();
+    IFruitProvider getFruitProvider();
 
-	IGrowthProvider getGrowthProvider();
+    IGrowthProvider getGrowthProvider();
 
-	float getHeight();
+    float getHeight();
 
-	float getFertility();
+    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();
+    /**
+     * @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();
+    float getSappiness();
 
-	EnumSet<EnumPlantType> getPlantTypes();
+    EnumSet<EnumPlantType> getPlantTypes();
 
-	/**
-	 * @return Amount of random block ticks required for a sapling to mature into a fully grown tree.
-	 */
-	int getMaturationTime();
+    /**
+     * @return Amount of random block ticks required for a sapling to mature into a fully grown tree.
+     */
+    int getMaturationTime();
 
-	int getGirth();
+    int getGirth();
 
-	IAlleleLeafEffect getEffect();
+    IAlleleLeafEffect getEffect();
 }

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

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

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
@@ -11,15 +11,16 @@ import forestry.api.genetics.IMutation;
 import forestry.api.genetics.ISpeciesRoot;
 
 public interface ITreeMutation extends IMutation {
-	
-	/**
-	 * @return {@link ISpeciesRoot} this mutation is associated with.
-	 */
-	ITreeRoot getRoot();
 
-	/**
-	 * @return float representing the percent chance for mutation to occur, from 0.0 to 100.0.
-	 * @since Forestry 4.0
-	 */
-	float getChance(World world, int x, int y, int z, IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1, ITreeGenome genome0, ITreeGenome genome1);
+    /**
+     * @return {@link ISpeciesRoot} this mutation is associated with.
+     */
+    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, int x, int y, int z, IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1,
+            ITreeGenome genome0, ITreeGenome genome1);
 }

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

@@ -8,5 +8,4 @@ package forestry.api.arboriculture;
 import forestry.api.genetics.IMutationCustom;
 
 public interface ITreeMutationCustom extends ITreeMutation, IMutationCustom {
-
 }

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

@@ -8,16 +8,17 @@ package forestry.api.arboriculture;
 import forestry.api.genetics.IAllele;
 
 public interface ITreeMutationFactory {
-	/**
-	 * Creates a new tree mutation.
-	 * Automatically registered with TreeManager.treeRoot.registerMutation()
-	 * See ITreeMutationCustom and IMutationCustom 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.
-	 */
-	ITreeMutationCustom createMutation(IAlleleTreeSpecies parentTree0, IAlleleTreeSpecies parentTree1, IAllele[] result, int chance);
+
+    /**
+     * Creates a new tree mutation. Automatically registered with TreeManager.treeRoot.registerMutation() See
+     * ITreeMutationCustom and IMutationCustom 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.
+     */
+    ITreeMutationCustom createMutation(IAlleleTreeSpecies parentTree0, IAlleleTreeSpecies parentTree1, IAllele[] result,
+            int chance);
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
@@ -20,80 +20,80 @@ import forestry.api.genetics.ISpeciesRoot;
 
 public interface ITreeRoot extends ISpeciesRoot {
 
-	@Override
-	boolean isMember(ItemStack itemstack);
+    @Override
+    boolean isMember(ItemStack itemstack);
 
-	@Override
-	ITree getMember(ItemStack itemstack);
+    @Override
+    ITree getMember(ItemStack itemstack);
 
-	@Override
-	ITree getMember(NBTTagCompound compound);
+    @Override
+    ITree getMember(NBTTagCompound compound);
 
-	@Override
-	ITree templateAsIndividual(IAllele[] template);
+    @Override
+    ITree templateAsIndividual(IAllele[] template);
 
-	@Override
-	ITree templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive);
+    @Override
+    ITree templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive);
 
-	@Override
-	ITreeGenome templateAsGenome(IAllele[] template);
+    @Override
+    ITreeGenome templateAsGenome(IAllele[] template);
 
-	@Override
-	ITreeGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
+    @Override
+    ITreeGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
 
-	/**
-	 * @param world
-	 * @return {@link IArboristTracker} associated with the passed world.
-	 */
-	@Override
-	IArboristTracker getBreedingTracker(World world, GameProfile player);
+    /**
+     * @param world
+     * @return {@link IArboristTracker} associated with the passed world.
+     */
+    @Override
+    IArboristTracker getBreedingTracker(World world, GameProfile player);
 
-	/* TREE SPECIFIC */
-	/**
-	 * Register a leaf tick handler.
-	 * @param handler the {@link ILeafTickHandler} to register.
-	 */
-	void registerLeafTickHandler(ILeafTickHandler handler);
+    /* TREE SPECIFIC */
+    /**
+     * Register a leaf tick handler.
+     * 
+     * @param handler the {@link ILeafTickHandler} to register.
+     */
+    void registerLeafTickHandler(ILeafTickHandler handler);
 
-	Collection<ILeafTickHandler> getLeafTickHandlers();
+    Collection<ILeafTickHandler> getLeafTickHandlers();
 
-	/**
-	 * @return type of tree encoded on the itemstack. EnumGermlingType.NONE if it isn't a tree.
-	 */
-	@Override
-	EnumGermlingType getType(ItemStack stack);
+    /**
+     * @return type of tree encoded on the itemstack. EnumGermlingType.NONE if it isn't a tree.
+     */
+    @Override
+    EnumGermlingType getType(ItemStack stack);
 
-	ITree getTree(World world, int x, int y, int z);
+    ITree getTree(World world, int x, int y, int z);
 
-	ITree getTree(World world, ITreeGenome genome);
+    ITree getTree(World world, ITreeGenome genome);
 
-	boolean plantSapling(World world, ITree tree, GameProfile owner, int x, int y, int z);
+    boolean plantSapling(World world, ITree tree, GameProfile owner, int x, int y, int z);
 
-	@Override
-	IChromosome[] templateAsChromosomes(IAllele[] template);
+    @Override
+    IChromosome[] templateAsChromosomes(IAllele[] template);
 
-	@Override
-	IChromosome[] templateAsChromosomes(IAllele[] templateActive, IAllele[] templateInactive);
+    @Override
+    IChromosome[] templateAsChromosomes(IAllele[] templateActive, IAllele[] templateInactive);
 
-	boolean setFruitBlock(World world, IAlleleFruit allele, float sappiness, short[] indices, int x, int y, int z);
+    boolean setFruitBlock(World world, IAlleleFruit allele, float sappiness, short[] indices, int x, int y, int z);
 
-	/* GAME MODE */
-	ArrayList<ITreekeepingMode> getTreekeepingModes();
+    /* GAME MODE */
+    ArrayList<ITreekeepingMode> getTreekeepingModes();
 
-	ITreekeepingMode getTreekeepingMode(World world);
+    ITreekeepingMode getTreekeepingMode(World world);
 
-	ITreekeepingMode getTreekeepingMode(String name);
+    ITreekeepingMode getTreekeepingMode(String name);
 
-	void registerTreekeepingMode(ITreekeepingMode mode);
+    void registerTreekeepingMode(ITreekeepingMode mode);
 
-	void setTreekeepingMode(World world, String name);
+    void setTreekeepingMode(World world, String name);
 
-	/* TEMPLATES */
-	@Override
-	ArrayList<ITree> getIndividualTemplates();
-
-	/* MUTATIONS */
-	@Override
-	Collection<ITreeMutation> getMutations(boolean shuffle);
+    /* TEMPLATES */
+    @Override
+    ArrayList<ITree> getIndividualTemplates();
 
+    /* MUTATIONS */
+    @Override
+    Collection<ITreeMutation> getMutations(boolean shuffle);
 }

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

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

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

@@ -8,9 +8,14 @@ package forestry.api.arboriculture;
 import net.minecraft.item.ItemStack;
 
 public interface IWoodItemAccess {
-	ItemStack getLog(EnumWoodType woodType, boolean fireproof);
-	ItemStack getPlanks(EnumWoodType woodType, boolean fireproof);
-	ItemStack getSlab(EnumWoodType woodType, boolean fireproof);
-	ItemStack getFence(EnumWoodType woodType, boolean fireproof);
-	ItemStack getStairs(EnumWoodType woodType, boolean fireproof);
+
+    ItemStack getLog(EnumWoodType woodType, boolean fireproof);
+
+    ItemStack getPlanks(EnumWoodType woodType, boolean fireproof);
+
+    ItemStack getSlab(EnumWoodType woodType, boolean fireproof);
+
+    ItemStack getFence(EnumWoodType woodType, boolean fireproof);
+
+    ItemStack getStairs(EnumWoodType woodType, boolean fireproof);
 }

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

@@ -7,23 +7,23 @@ package forestry.api.arboriculture;
 
 public class TreeManager {
 
-	/**
-	 * Convenient access to AlleleManager.alleleRegistry.getSpeciesRoot("rootTrees")
-	 */
-	public static ITreeRoot treeRoot;
+    /**
+     * Convenient access to AlleleManager.alleleRegistry.getSpeciesRoot("rootTrees")
+     */
+    public static ITreeRoot treeRoot;
 
-	/**
-	 * Convenient access to wood items.
-	 */
-	public static IWoodItemAccess woodItemAccess;
+    /**
+     * Convenient access to wood items.
+     */
+    public static IWoodItemAccess woodItemAccess;
 
-	/**
-	 * Used to create new trees.
-	 */
-	public static ITreeFactory treeFactory;
+    /**
+     * Used to create new trees.
+     */
+    public static ITreeFactory treeFactory;
 
-	/**
-	 * Used to create new tree mutations.
-	 */
-	public static ITreeMutationFactory treeMutationFactory;
+    /**
+     * Used to create new tree mutations.
+     */
+    public static ITreeMutationFactory treeMutationFactory;
 }

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

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

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

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

src/main/java/forestry/api/circuits/CircuitSocketType.java

@@ -6,24 +6,25 @@
 package forestry.api.circuits;
 
 public enum CircuitSocketType implements ICircuitSocketType {
-	NONE("none"),
-	FARM("forestry.farm"),
-	ELECTRIC_ENGINE("forestry.electric.engine"),
-	MACHINE("forestry.machine");
 
-	private final String uid;
+    NONE("none"),
+    FARM("forestry.farm"),
+    ELECTRIC_ENGINE("forestry.electric.engine"),
+    MACHINE("forestry.machine");
 
-	CircuitSocketType(String uid) {
-		this.uid = uid;
-	}
+    private final String uid;
 
-	@Override
-	public String getUid() {
-		return uid;
-	}
+    CircuitSocketType(String uid) {
+        this.uid = uid;
+    }
 
-	@Override
-	public boolean equals(ICircuitSocketType socketType) {
-		return uid.equals(socketType.getUid());
-	}
+    @Override
+    public String getUid() {
+        return uid;
+    }
+
+    @Override
+    public boolean equals(ICircuitSocketType socketType) {
+        return uid.equals(socketType.getUid());
+    }
 }

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

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

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.circuits;
@@ -11,26 +11,26 @@ import forestry.api.core.INBTTagable;
 
 public interface ICircuitBoard extends INBTTagable {
 
-	int getPrimaryColor();
+    int getPrimaryColor();
 
-	int getSecondaryColor();
+    int getSecondaryColor();
 
-	void addTooltip(List<String> list);
+    void addTooltip(List<String> list);
 
-	void onInsertion(Object tile);
+    void onInsertion(Object tile);
 
-	void onLoad(Object tile);
+    void onLoad(Object tile);
 
-	void onRemoval(Object tile);
+    void onRemoval(Object tile);
 
-	void onTick(Object tile);
-	
-	ICircuit[] getCircuits();
+    void onTick(Object tile);
 
-	/**
-	 * Specifies where a circuit can be used.
-	 * @since Forestry 4.0
-	 */
-	ICircuitSocketType getSocketType();
+    ICircuit[] getCircuits();
 
+    /**
+     * Specifies where a circuit can be used.
+     * 
+     * @since Forestry 4.0
+     */
+    ICircuitSocketType getSocketType();
 }

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

@@ -1,25 +1,25 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.circuits;
 
 public interface ICircuitLayout {
 
-	/** unique ID for this circuit layout */
-	String getUID();
+    /** unique ID for this circuit layout */
+    String getUID();
 
-	/** localized name for this circuit layout */
-	String getName();
+    /** localized name for this circuit layout */
+    String getName();
 
-	/** localized string for how this circuit layout is used */
-	String getUsage();
-
-	/**
-	 * Specifies where a circuit layout is used.
-	 * @since Forestry 4.0
-	 */
-	ICircuitSocketType getSocketType();
+    /** localized string for how this circuit layout is used */
+    String getUsage();
 
+    /**
+     * Specifies where a circuit layout is used.
+     * 
+     * @since Forestry 4.0
+     */
+    ICircuitSocketType getSocketType();
 }

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

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

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

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

src/main/java/forestry/api/circuits/ICircuitSocketType.java

@@ -6,13 +6,14 @@
 package forestry.api.circuits;
 
 /**
- * Specifies where a circuit layout can be used. (i.e. farm, machine, engine, etc)
- * See CircuitSocketType for Forestry's uses.
+ * Specifies where a circuit layout can be used. (i.e. farm, machine, engine, etc) See CircuitSocketType for Forestry's
+ * uses.
  */
 public interface ICircuitSocketType {
-	/** unique identifier for this socket type */
-	String getUid();
 
-	/** comparison using uid */
-	boolean equals(ICircuitSocketType socketType);
+    /** unique identifier for this socket type */
+    String getUid();
+
+    /** comparison using uid */
+    boolean equals(ICircuitSocketType socketType);
 }

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

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

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

@@ -5,4 +5,5 @@
  ******************************************************************************/
 @API(apiVersion = "3.1.0", owner = "ForestryAPI|core", provides = "ForestryAPI|circuits")
 package forestry.api.circuits;
+
 import cpw.mods.fml.common.API;

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

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