Fix typo (#43)

* Update Forestry.java

* spotlessApply (#42)

Co-authored-by: GitHub GTNH Actions <>

* Update Forestry.java

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.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/workflows/build-and-test.yml

@@ -1,5 +1,3 @@
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
 name: Build and test
 
@@ -11,35 +9,5 @@ on:
 
 jobs:
   build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-        cache: gradle
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: Setup the workspace
-      run: ./gradlew setupCIWorkspace
-
-    - name: Build the mod
-      run: ./gradlew build
-
-    - name: Run server for 1.5 minutes
-      run: |
-        mkdir run
-        echo "eula=true" > run/eula.txt
-        timeout 90 ./gradlew runServer 2>&1 | tee -a server.log || true
-
-    - name: Test no errors reported during server run
-      run: |
-        chmod +x .github/scripts/test-no-error-reports.sh
-        .github/scripts/test-no-error-reports.sh
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master
+    secrets: inherit

.github/workflows/release-tags.yml

@@ -1,51 +1,14 @@
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
 name: Release tagged build
 
 on:
   push:
-    tags:
-      - '*'
+    tags: [ '*' ]
+
+permissions:
+  contents: write
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set release version
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: '8'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Setup the workspace
-        run: ./gradlew setupCIWorkspace
-
-      - name: Build the mod
-        run: ./gradlew build
-
-      - name: Release under current tag
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
-          prerelease: false
-          title: "${{ env.RELEASE_VERSION }}"
-          files: build/libs/*.jar
-
-      - name: Publish to Maven
-        run: ./gradlew publish
-        env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+  release-tags:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
+    secrets: inherit

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 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-7.6-bin.zip
+networkTimeout=10000
 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-2021 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.
@@ -17,78 +17,113 @@
 #
 
 ##############################################################################
-##
-##  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/HEAD/subprojects/plugins/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
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+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
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # 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"'
 
 # 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,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    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.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -105,84 +140,105 @@ location of your Java installation."
 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=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=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" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# 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
 
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# 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

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,10 +25,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,7 +41,7 @@ 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.
@@ -51,7 +55,7 @@ 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%
@@ -61,38 +65,26 @@ echo location of your Java installation.
 
 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%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :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

settings.gradle

@@ -0,0 +1,28 @@
+
+pluginManagement {
+    repositories {
+        maven {
+            // RetroFuturaGradle
+            name "GTNH Maven"
+            url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+            allowInsecureProtocol = true
+            mavenContent {
+                includeGroup("com.gtnewhorizons.retrofuturagradle")
+            }
+        }
+        gradlePluginPortal()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+
+plugins {
+    id 'com.diffplug.blowdryerSetup' version '1.6.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains
+}
+
+blowdryerSetup {
+    repoSubfolder 'gtnhShared'
+    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.0')
+    //devLocal '.' // Use this when testing config updates locally
+}

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,12 +12,12 @@ import java.io.File;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
-
 import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.ModAPIManager;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
@@ -31,14 +29,12 @@ 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;
 import forestry.core.config.Config;
 import forestry.core.config.Constants;
 import forestry.core.config.GameMode;
-import forestry.core.config.Version;
 import forestry.core.errors.EnumErrorCode;
 import forestry.core.errors.ErrorStateRegistry;
 import forestry.core.gui.GuiHandler;
@@ -56,106 +52,114 @@ 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,);" + "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) {
-		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());
+    @EventHandler
+    public void preInit(FMLPreInitializationEvent event) {
+        checkForCoFHLib();
+        packetHandler = new PacketHandler();
 
-		configFolder = new File(event.getModConfigurationDirectory(), "forestry");
-		Config.load();
+        // Register event handler
+        EventHandlerCore eventHandlerCore = new EventHandlerCore();
+        MinecraftForge.EVENT_BUS.register(eventHandlerCore);
+        FMLCommonHandler.instance().bus().register(eventHandlerCore);
+        MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler());
 
-		PluginManager.runSetup();
+        configFolder = new File(event.getModConfigurationDirectory(), "forestry");
+        Config.load();
 
-		ForestryAPI.activeMode = new GameMode(Config.gameMode);
+        PluginManager.runSetup();
 
-		PluginManager.runPreInit();
-	}
+        ForestryAPI.activeMode = new GameMode(Config.gameMode);
 
-	@EventHandler
-	public void init(FMLInitializationEvent event) {
-		// Register gui handler
-		NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
+        PluginManager.runPreInit();
+    }
 
-		PluginManager.runInit();
-	}
+    @EventHandler
+    public void init(FMLInitializationEvent event) {
+        // Register gui handler
+        NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
 
-	@EventHandler
-	public void postInit(FMLPostInitializationEvent event) {
-		PluginManager.runPostInit();
+        PluginManager.runInit();
+    }
 
-		// Register world generator
-		WorldGenerator worldGenerator = new WorldGenerator();
-		GameRegistry.registerWorldGenerator(worldGenerator, 0);
+    @EventHandler
+    public void postInit(FMLPostInitializationEvent event) {
+        PluginManager.runPostInit();
 
-		// Register tick handlers
-		Proxies.common.registerTickHandlers(worldGenerator);
+        // Register world generator
+        WorldGenerator worldGenerator = new WorldGenerator();
+        GameRegistry.registerWorldGenerator(worldGenerator, 0);
 
-		// Handle IMC messages.
-		PluginManager.processIMCMessages(FMLInterModComms.fetchRuntimeMessages(ForestryAPI.instance));
-	}
+        // Register tick handlers
+        Proxies.common.registerTickHandlers(worldGenerator);
 
-	@EventHandler
-	public void serverStarting(FMLServerStartingEvent event) {
-		PluginManager.serverStarting(event.getServer());
-	}
+        // Handle IMC messages.
+        PluginManager.processIMCMessages(FMLInterModComms.fetchRuntimeMessages(ForestryAPI.instance));
+    }
 
-	public File getConfigFolder() {
-		return configFolder;
-	}
+    @EventHandler
+    public void serverStarting(FMLServerStartingEvent event) {
+        PluginManager.serverStarting(event.getServer());
+    }
 
-	@EventHandler
-	public void processIMCMessages(IMCEvent event) {
-		PluginManager.processIMCMessages(event.getMessages());
-	}
+    public File getConfigFolder() {
+        return configFolder;
+    }
 
-	@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));
-				}
-			}
-		}
-	}
+    @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,53 @@
 /*******************************************************************************
  * 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 1.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 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,89 @@ 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);
-	}
+    Class<? extends IAllele> clss;
 
-	@Override
-	public ISpeciesRoot getSpeciesRoot() {
-		return BeeManager.beeRoot;
-	}
+    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,22 @@ 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;
+    public static final EnumBeeType[] VALUES = values();
 
-	EnumBeeType() {
-		this.name = this.toString().toLowerCase(Locale.ENGLISH);
-	}
+    String name;
 
-	public String getName() {
-		return name;
-	}
+    EnumBeeType() {
+        this.name = this.toString().toLowerCase(Locale.ENGLISH);
+    }
+
+    public String getName() {
+        return name;
+    }
 }

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/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,65 @@
 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
+     */
+    boolean isSelfLighted();
 
-	/**
-	 * @return Boolean indicating whether this housing simulates the nether
-	 */
-	boolean isHellish();
+    /**
+     * @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,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,16 +9,17 @@ import net.minecraft.item.ItemStack;
 
 public interface IHiveFrame {
 
-	/**
-	 * Wears out a frame.
-	 * 
-	 * @param housing IBeeHousing the frame is contained in.
-	 * @param frame ItemStack containing the actual frame.
-	 * @param queen Current queen in the caller.
-	 * @param wear Integer denoting the amount worn out. The wear modifier of the current beekeeping mode has already been taken into account.
-	 * @return ItemStack containing the actual frame with adjusted damage, or null if it has been broken.
-	 */
-	ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear);
+    /**
+     * 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();
 }

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,78 @@ 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;
-	}
+    Class<? extends IAllele> clss;
 
-	@Override
-	public String getName() {
-		return this.toString().toLowerCase(Locale.ENGLISH);
-	}
+    EnumTreeChromosome(Class<? extends IAllele> clss) {
+        this.clss = clss;
+    }
 
-	@Override
-	public ISpeciesRoot getSpeciesRoot() {
-		return TreeManager.treeRoot;
-	}
+    @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,31 @@ package forestry.api.arboriculture;
 
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
-
-import com.mojang.authlib.GameProfile;
-
 import net.minecraftforge.common.util.ForgeDirection;
 
+import com.mojang.authlib.GameProfile;
 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;
+    }
 }

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

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

src/main/java/forestry/api/core/EnumTemperature.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.core;
@@ -12,68 +12,71 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 /**
- *  Many things Forestry use temperature and humidity of a biome to determine whether they can or how they can work or spawn at a given location.
- * 
- *  This enum concerns temperature.
+ * Many things Forestry use temperature and humidity of a biome to determine whether they can or how they can work or
+ * spawn at a given location.
+ *
+ * This enum concerns temperature.
  */
 public enum EnumTemperature {
-	NONE("None", "habitats/ocean"), ICY("Icy", "habitats/snow"), COLD("Cold", "habitats/taiga"),
-	NORMAL("Normal", "habitats/plains"), WARM("Warm", "habitats/jungle"), HOT("Hot", "habitats/desert"), HELLISH("Hellish", "habitats/nether");
 
-	public final String name;
-	public final String iconIndex;
+    NONE("None", "habitats/ocean"),
+    ICY("Icy", "habitats/snow"),
+    COLD("Cold", "habitats/taiga"),
+    NORMAL("Normal", "habitats/plains"),
+    WARM("Warm", "habitats/jungle"),
+    HOT("Hot", "habitats/desert"),
+    HELLISH("Hellish", "habitats/nether");
 
-	private EnumTemperature(String name, String iconIndex) {
-		this.name = name;
-		this.iconIndex = iconIndex;
-	}
+    public final String name;
+    public final String iconIndex;
 
-	public String getName() {
-		return this.name;
-	}
+    private EnumTemperature(String name, String iconIndex) {
+        this.name = name;
+        this.iconIndex = iconIndex;
+    }
 
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return ForestryAPI.textureManager.getDefault(iconIndex);
-	}
+    public String getName() {
+        return this.name;
+    }
 
-	/**
-	 * Determines the EnumTemperature given a floating point representation of
-	 * Minecraft temperature. Hellish biomes are handled based on their biome
-	 * type - check BiomeHelper.isBiomeHellish.
-	 * @param rawTemp raw temperature value
-	 * @return EnumTemperature corresponding to value of rawTemp
-	 */
-	public static EnumTemperature getFromValue(float rawTemp) {
-		if (rawTemp > 1.00f) {
-			return HOT;
-		}
-		else if (rawTemp > 0.85f) {
-			return WARM;
-		}
-		else if (rawTemp > 0.35f) {
-			return NORMAL;
-		}
-		else if (rawTemp > 0.0f) {
-			return COLD;
-		}
-		else {
-			return ICY;
-		}
-	}
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon() {
+        return ForestryAPI.textureManager.getDefault(iconIndex);
+    }
 
-	public static EnumTemperature getFromBiome(BiomeGenBase biomeGenBase) {
-		if (BiomeHelper.isBiomeHellish(biomeGenBase)) {
-			return HELLISH;
-		}
-		return getFromValue(biomeGenBase.temperature);
-	}
+    /**
+     * Determines the EnumTemperature given a floating point representation of Minecraft temperature. Hellish biomes are
+     * handled based on their biome type - check BiomeHelper.isBiomeHellish.
+     * 
+     * @param rawTemp raw temperature value
+     * @return EnumTemperature corresponding to value of rawTemp
+     */
+    public static EnumTemperature getFromValue(float rawTemp) {
+        if (rawTemp > 1.00f) {
+            return HOT;
+        } else if (rawTemp > 0.85f) {
+            return WARM;
+        } else if (rawTemp > 0.35f) {
+            return NORMAL;
+        } else if (rawTemp > 0.0f) {
+            return COLD;
+        } else {
+            return ICY;
+        }
+    }
 
-	public static EnumTemperature getFromBiome(BiomeGenBase biomeGenBase, int x, int y, int z) {
-		if (BiomeHelper.isBiomeHellish(biomeGenBase)) {
-			return HELLISH;
-		}
-		float temperature = biomeGenBase.getFloatTemperature(x, y, z);
-		return getFromValue(temperature);
-	}
+    public static EnumTemperature getFromBiome(BiomeGenBase biomeGenBase) {
+        if (BiomeHelper.isBiomeHellish(biomeGenBase)) {
+            return HELLISH;
+        }
+        return getFromValue(biomeGenBase.temperature);
+    }
+
+    public static EnumTemperature getFromBiome(BiomeGenBase biomeGenBase, int x, int y, int z) {
+        if (BiomeHelper.isBiomeHellish(biomeGenBase)) {
+            return HELLISH;
+        }
+        float temperature = biomeGenBase.getFloatTemperature(x, y, z);
+        return getFromValue(temperature);
+    }
 }

src/main/java/forestry/api/core/ForestryAPI.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.core;
@@ -12,57 +12,52 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 /**
  * Forestry's API is divided into several subcategories to make it easier to understand.
- * 
- * If you need to distribute API files, try to only include the parts you are actually
- * using to minimize conflicts due to API changes.
- * 
- *  .core     - Miscallenous base classes and interfaces as well as some basics for tools, armor, game modes and stuff needed by biome mods.
- *  .fuels    - Managers and classes to facilitate adding fuels to various engines and machines.
- *  .recipes  - Managers and helpers to facilitate adding new recipes to various machines.
- *  .storage  - Managers, events and interfaces for defining new backpacks and handling backpack behaviour.
- *  .mail     - Anything related to handling letters and adding new mail carrier systems.
- *  .genetics - Shared code for all genetic subclasses.
- *  			\ .apiculture       - Bees.
- *  			\ .arboriculture    - Trees.
- *  			\ .lepidopterology  - Butterflies.
- *  
- *  Note that if Forestry is not present, all these references will be null.
+ *
+ * If you need to distribute API files, try to only include the parts you are actually using to minimize conflicts due
+ * to API changes.
+ *
+ * .core - Miscallenous base classes and interfaces as well as some basics for tools, armor, game modes and stuff needed
+ * by biome mods. .fuels - Managers and classes to facilitate adding fuels to various engines and machines. .recipes -
+ * Managers and helpers to facilitate adding new recipes to various machines. .storage - Managers, events and interfaces
+ * for defining new backpacks and handling backpack behaviour. .mail - Anything related to handling letters and adding
+ * new mail carrier systems. .genetics - Shared code for all genetic subclasses. \ .apiculture - Bees. \ .arboriculture
+ * - Trees. \ .lepidopterology - Butterflies.
+ *
+ * Note that if Forestry is not present, all these references will be null.
  */
 public class ForestryAPI {
 
-	/**
-	 * The main mod instance for Forestry.
-	 */
-	public static Object instance;
+    /**
+     * The main mod instance for Forestry.
+     */
+    public static Object instance;
 
-	/**
-	 * A {@link ITextureManager} needed for some things in the API.
-	 */
-	@SideOnly(Side.CLIENT)
-	public static ITextureManager textureManager;
+    /**
+     * A {@link ITextureManager} needed for some things in the API.
+     */
+    @SideOnly(Side.CLIENT)
+    public static ITextureManager textureManager;
 
-	public static IClimateManager climateManager;
+    public static IClimateManager climateManager;
 
-	/**
-	 * The currently active {@link IGameMode}.
-	 */
-	public static IGameMode activeMode;
+    /**
+     * The currently active {@link IGameMode}.
+     */
+    public static IGameMode activeMode;
 
-	/**
-	 * Provides information on certain Forestry constants (Villager IDs, Chest gen keys, etc)
-	 */
-	public static IForestryConstants forestryConstants;
+    /**
+     * Provides information on certain Forestry constants (Villager IDs, Chest gen keys, etc)
+     */
+    public static IForestryConstants forestryConstants;
 
-	/**
-	 * The currently enabled Forestry plugins.
-	 * Can be used to check if certain features are available, for example:
-	 * ForestryAPI.enabledPlugins.contains("APICULTURE")
-	 */
-	public static Set<String> enabledPlugins;
+    /**
+     * The currently enabled Forestry plugins. Can be used to check if certain features are available, for example:
+     * ForestryAPI.enabledPlugins.contains("APICULTURE")
+     */
+    public static Set<String> enabledPlugins;
 
-	/**
-	 * Instance of the errorStateRegistry for registering errors.
-	 * Also creates new instances of IErrorLogic.
-	 */
-	public static IErrorStateRegistry errorStateRegistry;
+    /**
+     * Instance of the errorStateRegistry for registering errors. Also creates new instances of IErrorLogic.
+     */
+    public static IErrorStateRegistry errorStateRegistry;
 }

src/main/java/forestry/api/core/ForestryEvent.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.core;
@@ -10,7 +10,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import com.mojang.authlib.GameProfile;
 
 import cpw.mods.fml.common.eventhandler.Event;
-
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IBreedingTracker;
 import forestry.api.genetics.IMutation;
@@ -18,43 +17,50 @@ import forestry.api.genetics.ISpeciesRoot;
 
 public abstract class ForestryEvent extends Event {
 
-	private static abstract class BreedingEvent extends ForestryEvent {
-		public final ISpeciesRoot root;
-		public final IBreedingTracker tracker;
-		public final GameProfile username;
+    private abstract static class BreedingEvent extends ForestryEvent {
 
-		private BreedingEvent(ISpeciesRoot root, GameProfile username, IBreedingTracker tracker) {
-			super();
-			this.root = root;
-			this.username = username;
-			this.tracker = tracker;
-		}
-	}
+        public final ISpeciesRoot root;
+        public final IBreedingTracker tracker;
+        public final GameProfile username;
 
-	public static class SpeciesDiscovered extends BreedingEvent {
-		public final IAlleleSpecies species;
-		public SpeciesDiscovered(ISpeciesRoot root, GameProfile username, IAlleleSpecies species, IBreedingTracker tracker) {
-			super(root, username, tracker);
-			this.species = species;
-		}
-	}
+        private BreedingEvent(ISpeciesRoot root, GameProfile username, IBreedingTracker tracker) {
+            super();
+            this.root = root;
+            this.username = username;
+            this.tracker = tracker;
+        }
+    }
 
-	public static class MutationDiscovered extends BreedingEvent {
-		public final IMutation allele;
-		public MutationDiscovered(ISpeciesRoot root, GameProfile username, IMutation allele,  IBreedingTracker tracker) {
-			super(root, username, tracker);
-			this.allele = allele;
-		}
-	}
+    public static class SpeciesDiscovered extends BreedingEvent {
 
-	public static class SyncedBreedingTracker extends ForestryEvent {
-		public final IBreedingTracker tracker;
-		public final EntityPlayer player;
-		public SyncedBreedingTracker(IBreedingTracker tracker, EntityPlayer player) {
-			super();
-			this.tracker = tracker;
-			this.player = player;
-		}
+        public final IAlleleSpecies species;
 
-	}
+        public SpeciesDiscovered(ISpeciesRoot root, GameProfile username, IAlleleSpecies species,
+                IBreedingTracker tracker) {
+            super(root, username, tracker);
+            this.species = species;
+        }
+    }
+
+    public static class MutationDiscovered extends BreedingEvent {
+
+        public final IMutation allele;
+
+        public MutationDiscovered(ISpeciesRoot root, GameProfile username, IMutation allele, IBreedingTracker tracker) {
+            super(root, username, tracker);
+            this.allele = allele;
+        }
+    }
+
+    public static class SyncedBreedingTracker extends ForestryEvent {
+
+        public final IBreedingTracker tracker;
+        public final EntityPlayer player;
+
+        public SyncedBreedingTracker(IBreedingTracker tracker, EntityPlayer player) {
+            super();
+            this.tracker = tracker;
+            this.player = player;
+        }
+    }
 }

src/main/java/forestry/api/core/IArmorNaturalist.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.core;
@@ -10,16 +10,13 @@ import net.minecraft.item.ItemStack;
 
 public interface IArmorNaturalist {
 
-	/**
-	 * Called when the naturalist's armor acts as spectacles for seeing pollinated tree leaves/flowers.
-	 * 
-	 * @param player
-	 *            Player doing the viewing
-	 * @param armor
-	 *            Armor item
-	 * @param doSee
-	 *            Whether or not to actually do the side effects of viewing
-	 * @return true if the armor actually allows the player to see pollination.
-	 */
-	public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee);
+    /**
+     * Called when the naturalist's armor acts as spectacles for seeing pollinated tree leaves/flowers.
+     *
+     * @param player Player doing the viewing
+     * @param armor  Armor item
+     * @param doSee  Whether or not to actually do the side effects of viewing
+     * @return true if the armor actually allows the player to see pollination.
+     */
+    public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee);
 }

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

@@ -1,23 +1,22 @@
 /*******************************************************************************
- * 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.api.core;
 
 public interface IClimateControlled {
-	/**
-	 * Change the temperature, but not lower than boundaryDown or higher than boundaryUp.
-	 */
-	void addTemperatureChange(float change, float boundaryDown, float boundaryUp);
 
-	/**
-	 * Change the humidity, but not lower than boundaryDown or higher than boundaryUp.
-	 */
-	void addHumidityChange(float change, float boundaryDown, float boundaryUp);
+    /**
+     * Change the temperature, but not lower than boundaryDown or higher than boundaryUp.
+     */
+    void addTemperatureChange(float change, float boundaryDown, float boundaryUp);
+
+    /**
+     * Change the humidity, but not lower than boundaryDown or higher than boundaryUp.
+     */
+    void addHumidityChange(float change, float boundaryDown, float boundaryUp);
 }

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

@@ -14,5 +14,4 @@ public interface IClimateManager {
     float getHumidity(World world, int x, int y, int z);
 
     IClimateProvider getDefaultClimate(World world, int x, int y, int z);
-
 }

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

@@ -3,6 +3,7 @@ package forestry.api.core;
 import net.minecraft.world.biome.BiomeGenBase;
 
 public interface IClimateProvider {
+
     BiomeGenBase getBiome();
 
     EnumTemperature getTemperature();