forget invalid recipe entries (#30)

* Carrot is not fruit

* updateBuildScript & spotlessApply

.gitattributes

@@ -0,0 +1,37 @@
+* text eol=lf
+
+*.jar      binary
+
+*.png      binary
+*.jpg      binary
+*.jpeg     binary
+*.gif      binary
+*.tif      binary
+*.tiff     binary
+*.ico      binary
+*.svg      text
+*.eps      binary
+
+*.kar      binary
+*.m4a      binary
+*.mid      binary
+*.midi     binary
+*.mp3      binary
+*.ogg      binary
+*.ra       binary
+
+*.7z       binary
+*.gz       binary
+*.tar      binary
+*.tgz      binary
+*.zip      binary
+
+*.patch    -text
+
+*.bat      text eol=crlf
+*.cmd      text eol=crlf
+*.ps1      text eol=crlf
+
+*autogenerated binary
+
+*.tcn 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

build.gradle

@@ -1,26 +1,36 @@
-//version: 1644612407
+//version: 1661114848
 /*
-DO NOT CHANGE THIS FILE!
+ DO NOT CHANGE THIS FILE!
+ Also, you may replace this file at any time if there is an update available.
+ Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
+ */
 
-Also, you may replace this file at any time if there is an update available.
-Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
-*/
-
-import org.gradle.internal.logging.text.StyledTextOutput
-import org.gradle.internal.logging.text.StyledTextOutputFactory
-import org.gradle.internal.logging.text.StyledTextOutput.Style
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.internal.logging.text.StyledTextOutput.Style
+import org.gradle.internal.logging.text.StyledTextOutputFactory
 
+import java.nio.file.Files
+import java.nio.file.Paths
 import java.util.concurrent.TimeUnit
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
 
 buildscript {
     repositories {
+        mavenCentral()
+
         maven {
             name 'forge'
             url 'https://maven.minecraftforge.net'
         }
+        maven {
+            // GTNH ForgeGradle Fork
+            name = "GTNH Maven"
+            url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+        }
         maven {
             name 'sonatype'
             url 'https://oss.sonatype.org/content/repositories/snapshots/'
@@ -29,30 +39,37 @@ buildscript {
             name 'Scala CI dependencies'
             url 'https://repo1.maven.org/maven2/'
         }
-        maven {
-            name 'jitpack'
-            url 'https://jitpack.io'
-        }
     }
     dependencies {
-        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.9'
     }
 }
-
 plugins {
     id 'java-library'
     id 'idea'
     id 'eclipse'
     id 'scala'
     id 'maven-publish'
-    id 'org.jetbrains.kotlin.jvm'        version '1.5.30' apply false
-    id 'org.jetbrains.kotlin.kapt'       version '1.5.30' apply false
-    id 'org.ajoberstar.grgit'            version '4.1.1'
+    id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
+    id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false
+    id 'com.google.devtools.ksp' version '1.5.30-1.0.0' apply false
+    id 'org.ajoberstar.grgit' version '4.1.1'
     id 'com.github.johnrengelman.shadow' version '4.0.4'
-    id 'com.palantir.git-version'        version '0.13.0' apply false
-    id 'de.undercouch.download'          version '5.0.1'
-    id 'com.github.gmazzo.buildconfig'   version '3.0.3' apply false
+    id 'com.palantir.git-version' version '0.13.0' apply false
+    id 'de.undercouch.download' version '5.0.1'
+    id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false
+    id 'com.diffplug.spotless' version '6.7.2' apply false
 }
+boolean settingsupdated = verifySettingsGradle()
+settingsupdated = verifyGitAttributes() || settingsupdated
+if (settingsupdated)
+    throw new GradleException("Settings has been updated, please re-run task.")
+
+dependencies {
+    implementation 'com.diffplug:blowdryer:1.6.0'
+}
+
+apply plugin: 'com.diffplug.blowdryer'
 
 if (project.file('.git/HEAD').isFile()) {
     apply plugin: 'com.palantir.git-version'
@@ -78,7 +95,14 @@ idea {
     }
 }
 
-if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
+boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false
+
+if (!disableSpotless) {
+    apply plugin: 'com.diffplug.spotless'
+    apply from: Blowdryer.file('spotless.gradle')
+}
+
+if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
     throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
 }
 
@@ -103,8 +127,11 @@ checkPropertyExists("containsMixinsAndOrCoreModOnly")
 checkPropertyExists("usesShadowedDependencies")
 checkPropertyExists("developmentEnvironmentUserName")
 
-boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
-
+boolean noPublishedSources = project.hasProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
+boolean usesMixinDebug = project.hasProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()
+boolean forceEnableMixins = project.hasProperty('forceEnableMixins') ? project.forceEnableMixins.toBoolean() : false
+String channel = project.hasProperty('channel') ? project.channel : 'stable'
+String mappingsVersion = project.hasProperty('mappingsVersion') ? project.mappingsVersion : '12'
 String javaSourceDir = "src/main/java/"
 String scalaSourceDir = "src/main/scala/"
 String kotlinSourceDir = "src/main/kotlin/"
@@ -112,53 +139,53 @@ String kotlinSourceDir = "src/main/kotlin/"
 String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
 String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
 String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/")
-if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
     throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
 }
 
-if(apiPackage) {
+if (apiPackage) {
     targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
     targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
     targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+    if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
         throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
     }
 }
 
-if(accessTransformersFile) {
+if (accessTransformersFile) {
     String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
-    if(!getFile(targetFile).exists()) {
+    if (!getFile(targetFile).exists()) {
         throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
     }
 }
 
-if(usesMixins.toBoolean()) {
-    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
+if (usesMixins.toBoolean()) {
+    if (mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
         throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
     }
 
     targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
     targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
     targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
-        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala  + " or " + targetPackageKotlin)
+    if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
     }
 
     String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
     String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
     String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
     String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".kt"
-    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
+    if (!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
         throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
     }
 }
 
-if(coreModClass) {
+if (coreModClass) {
     String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
     String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
     String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
     String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".kt"
-    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
+    if (!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
         throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
     }
 }
@@ -175,7 +202,7 @@ configurations.all {
 try {
     'git config core.fileMode false'.execute()
 }
-catch (Exception e) {
+catch (Exception ignored) {
     out.style(Style.Failure).println("git isn't installed at all")
 }
 
@@ -185,10 +212,10 @@ String versionOverride = System.getenv("VERSION") ?: null
 try {
     identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
 }
-catch (Exception e) {
+catch (Exception ignored) {
     out.style(Style.Failure).text(
         'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' +
-        'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
+            'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
         'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)'
     )
     versionOverride = 'NO-GIT-TAG-SET'
@@ -199,28 +226,31 @@ ext {
     modVersion = identifiedVersion
 }
 
-if( identifiedVersion.equals(versionOverride) ) {
+if (identifiedVersion == versionOverride) {
     out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
 }
 
 group = modGroup
-if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
+if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
     archivesBaseName = customArchiveBaseName
-}
-else {
+} else {
     archivesBaseName = modId
 }
 
 def arguments = []
 def jvmArguments = []
 
-if(usesMixins.toBoolean()) {
+if (usesMixins.toBoolean() || forceEnableMixins) {
     arguments += [
-            "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-    ]
-    jvmArguments += [
-            "-Dmixin.debug.countInjections=true", "-Dmixin.debug.verbose=true", "-Dmixin.debug.export=true"
+        "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
     ]
+    if (usesMixinDebug.toBoolean()) {
+        jvmArguments += [
+            "-Dmixin.debug.countInjections=true",
+            "-Dmixin.debug.verbose=true",
+            "-Dmixin.debug.export=true"
+        ]
+    }
 }
 
 minecraft {
@@ -229,16 +259,16 @@ minecraft {
 
     if (replaceGradleTokenInFile) {
         replaceIn replaceGradleTokenInFile
-        if(gradleTokenModId) {
+        if (gradleTokenModId) {
             replace gradleTokenModId, modId
         }
-        if(gradleTokenModName) {
+        if (gradleTokenModName) {
             replace gradleTokenModName, modName
         }
-        if(gradleTokenVersion) {
+        if (gradleTokenVersion) {
             replace gradleTokenVersion, modVersion
         }
-        if(gradleTokenGroupName) {
+        if (gradleTokenGroupName) {
             replace gradleTokenGroupName, modGroup
         }
     }
@@ -247,7 +277,7 @@ minecraft {
         args(arguments)
         jvmArgs(jvmArguments)
 
-        if(developmentEnvironmentUserName) {
+        if (developmentEnvironmentUserName) {
             args("--username", developmentEnvironmentUserName)
         }
     }
@@ -258,7 +288,7 @@ minecraft {
     }
 }
 
-if(file('addon.gradle').exists()) {
+if (file('addon.gradle').exists()) {
     apply from: 'addon.gradle'
 }
 
@@ -275,7 +305,7 @@ repositories {
         name 'Overmind forge repo mirror'
         url 'https://gregtech.overminddl1.com/'
     }
-    if(usesMixins.toBoolean()) {
+    if (usesMixins.toBoolean() || forceEnableMixins) {
         maven {
             name 'sponge'
             url 'https://repo.spongepowered.org/repository/maven-public'
@@ -287,11 +317,13 @@ repositories {
 }
 
 dependencies {
-    if(usesMixins.toBoolean()) {
+    if (usesMixins.toBoolean()) {
         annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
         annotationProcessor('com.google.guava:guava:24.1.1-jre')
         annotationProcessor('com.google.code.gson:gson:2.8.6')
         annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT')
+    }
+    if (usesMixins.toBoolean() || forceEnableMixins) {
         // using 0.8 to workaround a issue in 0.7 which fails mixin application
         compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') {
             // Mixin includes a lot of dependencies that are too up-to-date
@@ -312,18 +344,23 @@ def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfig
 def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
 
 task generateAssets {
-    if(usesMixins.toBoolean()) {
-        getFile("/src/main/resources/mixins." + modId + ".json").text = """{
+    if (usesMixins.toBoolean()) {
+        def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json");
+        if (!mixinConfigFile.exists()) {
+            mixinConfigFile.text = """{
   "required": true,
   "minVersion": "0.7.11",
   "package": "${modGroup}.${mixinsPackage}",
   "plugin": "${modGroup}.${mixinPlugin}",
   "refmap": "${mixingConfigRefMap}",
   "target": "@env(DEFAULT)",
-  "compatibilityLevel": "JAVA_8"
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [],
+  "client": [],
+  "server": []
 }
-
 """
+        }
     }
 }
 
@@ -344,7 +381,10 @@ shadowJar {
     }
 
     minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+    configurations = [
+        project.configurations.shadowImplementation,
+        project.configurations.shadowCompile
+    ]
     dependsOn(relocateShadowJar)
 }
 
@@ -359,38 +399,38 @@ jar {
         attributes(getManifestAttributes())
     }
 
-    if(usesShadowedDependencies.toBoolean()) {
+    if (usesShadowedDependencies.toBoolean()) {
         dependsOn(shadowJar)
         enabled = false
     }
 }
 
 reobf {
-    if(usesMixins.toBoolean()) {
+    if (usesMixins.toBoolean()) {
         addExtraSrgFile mixinSrg
     }
 }
 
 afterEvaluate {
-    if(usesMixins.toBoolean()) {
+    if (usesMixins.toBoolean()) {
         tasks.compileJava {
             options.compilerArgs += [
-                    "-AreobfSrgFile=${tasks.reobf.srg}",
-                    "-AoutSrgFile=${mixinSrg}",
-                    "-AoutRefMapFile=${refMap}",
-                    // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
-                    "-XDenableSunApiLintControl",
-                    "-XDignore.symbol.file"
+                "-AreobfSrgFile=${tasks.reobf.srg}",
+                "-AoutSrgFile=${mixinSrg}",
+                "-AoutRefMapFile=${refMap}",
+                // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
+                "-XDenableSunApiLintControl",
+                "-XDignore.symbol.file"
             ]
         }
     }
 }
 
 runClient {
-    if(developmentEnvironmentUserName) {
+    if (developmentEnvironmentUserName) {
         arguments += [
-                "--username",
-                developmentEnvironmentUserName
+            "--username",
+            developmentEnvironmentUserName
         ]
     }
 
@@ -405,9 +445,9 @@ runServer {
 
 tasks.withType(JavaExec).configureEach {
     javaLauncher.set(
-            javaToolchains.launcherFor {
-                languageVersion = projectJavaVersion
-            }
+        javaToolchains.launcherFor {
+            languageVersion = projectJavaVersion
+        }
     )
 }
 
@@ -415,6 +455,7 @@ processResources {
     // this will ensure that this task is redone when the versions change.
     inputs.property "version", project.version
     inputs.property "mcversion", project.minecraft.version
+    exclude("spotless.gradle")
 
     // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
@@ -427,43 +468,44 @@ processResources {
             "modName": modName
     }
 
-    if(usesMixins.toBoolean()) {
+    if (usesMixins.toBoolean()) {
         from refMap
     }
 
     // copy everything else that's not the mcmod.info
     from(sourceSets.main.resources.srcDirs) {
         exclude 'mcmod.info'
+        exclude 'spotless.gradle'
     }
 }
 
 def getManifestAttributes() {
     def manifestAttributes = [:]
-    if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
+    if (!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
         manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
     }
 
-    if(accessTransformersFile) {
-        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
+    if (accessTransformersFile) {
+        manifestAttributes += ["FMLAT": accessTransformersFile.toString()]
     }
 
-    if(coreModClass) {
+    if (coreModClass) {
         manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
     }
 
-    if(usesMixins.toBoolean()) {
+    if (usesMixins.toBoolean()) {
         manifestAttributes += [
-                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
-                "MixinConfigs" : "mixins." + modId + ".json",
-                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+            "TweakClass"    : "org.spongepowered.asm.launch.MixinTweaker",
+            "MixinConfigs"  : "mixins." + modId + ".json",
+            "ForceLoadAsMod": !containsMixinsAndOrCoreModOnly.toBoolean()
         ]
     }
     return manifestAttributes
 }
 
 task sourcesJar(type: Jar) {
-    from (sourceSets.main.allJava)
-    from (file("$projectDir/LICENSE"))
+    from(sourceSets.main.allSource)
+    from(file("$projectDir/LICENSE"))
     getArchiveClassifier().set('sources')
 }
 
@@ -482,7 +524,10 @@ task shadowDevJar(type: ShadowJar) {
     }
 
     minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+    configurations = [
+        project.configurations.shadowImplementation,
+        project.configurations.shadowCompile
+    ]
 }
 
 task relocateShadowDevJar(type: ConfigureShadowRelocation) {
@@ -510,22 +555,22 @@ task devJar(type: Jar) {
         attributes(getManifestAttributes())
     }
 
-    if(usesShadowedDependencies.toBoolean()) {
+    if (usesShadowedDependencies.toBoolean()) {
         dependsOn(circularResolverJar)
         enabled = false
     }
 }
 
 task apiJar(type: Jar) {
-    from (sourceSets.main.allJava) {
+    from(sourceSets.main.allSource) {
         include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
     }
 
-    from (sourceSets.main.output) {
+    from(sourceSets.main.output) {
         include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
     }
 
-    from (sourceSets.main.resources.srcDirs) {
+    from(sourceSets.main.resources.srcDirs) {
         include("LICENSE")
     }
 
@@ -533,11 +578,11 @@ task apiJar(type: Jar) {
 }
 
 artifacts {
-    if(!noPublishedSources) {
+    if (!noPublishedSources) {
         archives sourcesJar
     }
     archives devJar
-    if(apiPackage) {
+    if (apiPackage) {
         archives apiJar
     }
 }
@@ -548,15 +593,18 @@ tasks.withType(GenerateModuleMetadata) {
     enabled = false
 }
 
+// workaround variable hiding in pom processing
+def projectConfigs = project.configurations
+
 publishing {
     publications {
         maven(MavenPublication) {
             from components.java
-            if(usesShadowedDependencies.toBoolean()) {
+            if (usesShadowedDependencies.toBoolean()) {
                 artifact source: shadowJar, classifier: ""
             }
-            if(!noPublishedSources) {
-                artifact source: sourcesJar, classifier: "src"
+            if (!noPublishedSources) {
+                artifact source: sourcesJar, classifier: "sources"
             }
             artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
             if (apiPackage) {
@@ -568,16 +616,23 @@ publishing {
             // Using the identified version, not project.version as it has the prepended 1.7.10
             version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
 
-            // remove extra garbage from who knows where
+            // remove extra garbage from minecraft and minecraftDeps configuration
             pom.withXml {
-                def badPomGroup = ['net.minecraft', 'com.google.code.findbugs', 'org.ow2.asm', 'com.typesafe.akka', 'com.typesafe', 'org.scala-lang',
-                                   'org.scala-lang.plugins', 'net.sf.jopt-simple', 'lzma', 'com.mojang', 'org.apache.commons', 'org.apache.httpcomponents',
-                                   'commons-logging', 'java3d', 'net.sf.trove4j', 'com.ibm.icu', 'com.paulscode', 'io.netty', 'com.google.guava',
-                                   'commons-io', 'commons-codec', 'net.java.jinput', 'net.java.jutils', 'com.google.code.gson', 'org.apache.logging.log4j',
-                                   'org.lwjgl.lwjgl', 'tv.twitch', 'org.jetbrains.kotlin', '']
+                def badArtifacts = [:].withDefault { [] as Set<String> }
+                for (configuration in [
+                    projectConfigs.minecraft,
+                    projectConfigs.minecraftDeps
+                ]) {
+                    for (dependency in configuration.allDependencies) {
+                        badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name
+                    }
+                }
+                // example for specifying extra stuff to ignore
+                // badArtifacts["org.example.group"] += "artifactName"
+
                 Node pomNode = asNode()
                 pomNode.dependencies.'*'.findAll() {
-                    badPomGroup.contains(it.groupId.text())
+                    badArtifacts[it.groupId.text()].contains(it.artifactId.text())
                 }.each() {
                     it.parent().remove(it)
                 }
@@ -605,7 +660,7 @@ task updateBuildScript {
     }
 }
 
-if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
+if (!project.getGradle().startParameter.isOffline() && isNewBuildScriptVersionAvailable(projectDir.toString())) {
     if (autoUpdateBuildScript.toBoolean()) {
         performBuildScriptUpdate(projectDir.toString())
     } else {
@@ -614,7 +669,40 @@ if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
 }
 
 static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/build.gradle")
+}
+
+static URL exampleSettingsGradleUrl() {
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/settings.gradle.example")
+}
+
+static URL exampleGitAttributesUrl() {
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/.gitattributes")
+}
+
+
+boolean verifyGitAttributes() {
+    def gitattributesFile = getFile(".gitattributes")
+    if (!gitattributesFile.exists()) {
+        println("Downloading default .gitattributes")
+        exampleGitAttributesUrl().withInputStream { i -> gitattributesFile.withOutputStream { it << i } }
+        exec {
+            workingDir '.'
+            commandLine 'git', 'add', '--renormalize', '.'
+        }
+        return true
+    }
+    return false
+}
+
+boolean verifySettingsGradle() {
+    def settingsFile = getFile("settings.gradle")
+    if (!settingsFile.exists()) {
+        println("Downloading default settings.gradle")
+        exampleSettingsGradleUrl().withInputStream { i -> settingsFile.withOutputStream { it << i } }
+        return true
+    }
+    return false
 }
 
 boolean performBuildScriptUpdate(String projectDir) {
@@ -622,6 +710,10 @@ boolean performBuildScriptUpdate(String projectDir) {
         def buildscriptFile = getFile("build.gradle")
         availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
         out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
+        boolean settingsupdated = verifySettingsGradle()
+        settingsupdated = verifyGitAttributes() || settingsupdated
+        if (settingsupdated)
+            throw new GradleException("Settings has been updated, please re-run task.")
         return true
     }
     return false
@@ -641,7 +733,7 @@ boolean isNewBuildScriptVersionAvailable(String projectDir) {
 
 static String getVersionHash(String buildScriptContent) {
     String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
-    if(versionLine != null) {
+    if (versionLine != null) {
         return versionLine.split(": ").last()
     }
     return ""
@@ -652,7 +744,103 @@ configure(updateBuildScript) {
     description = 'Updates the build script to the latest version'
 }
 
-// Deobfuscation
+// Parameter Deobfuscation
+
+task deobfParams {
+    doLast {
+
+        String mcpDir = "$project.gradle.gradleUserHomeDir/caches/minecraft/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion"
+        String mcpZIP = "$mcpDir/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip"
+        String paramsCSV = "$mcpDir/params.csv"
+
+        download.run {
+            src "https://maven.minecraftforge.net/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion-$minecraftVersion/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip"
+            dest mcpZIP
+            overwrite false
+        }
+
+        if (!file(paramsCSV).exists()) {
+            println("Extracting MCP archive ...")
+            unzip(mcpZIP, mcpDir)
+        }
+
+        println("Parsing params.csv ...")
+        Map<String, String> params = new HashMap<>()
+        Files.lines(Paths.get(paramsCSV)).forEach { line ->
+            String[] cells = line.split(",")
+            if (cells.length > 2 && cells[0].matches("p_i?\\d+_\\d+_")) {
+                params.put(cells[0], cells[1])
+            }
+        }
+
+        out.style(Style.Success).println("Modified ${replaceParams(file("$projectDir/src/main/java"), params)} files!")
+        out.style(Style.Failure).println("Don't forget to verify that the code still works as before!\n It could be broken due to duplicate variables existing now\n or parameters taking priority over other variables.")
+    }
+}
+
+static int replaceParams(File file, Map<String, String> params) {
+    int fileCount = 0
+
+    if (file.isDirectory()) {
+        for (File f : file.listFiles()) {
+            fileCount += replaceParams(f, params)
+        }
+        return fileCount
+    }
+    println("Visiting ${file.getName()} ...")
+    try {
+        String content = new String(Files.readAllBytes(file.toPath()))
+        int hash = content.hashCode()
+        params.forEach { key, value ->
+            content = content.replaceAll(key, value)
+        }
+        if (hash != content.hashCode()) {
+            Files.write(file.toPath(), content.getBytes("UTF-8"))
+            return 1
+        }
+    } catch (Exception e) {
+        e.printStackTrace()
+    }
+    return 0
+}
+
+// Credit: bitsnaps (https://gist.github.com/bitsnaps/00947f2dce66f4bbdabc67d7e7b33681)
+static unzip(String zipFileName, String outputDir) {
+    byte[] buffer = new byte[16384]
+    ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFileName))
+    ZipEntry zipEntry = zis.getNextEntry()
+    while (zipEntry != null) {
+        File newFile = new File(outputDir + File.separator, zipEntry.name)
+        if (zipEntry.isDirectory()) {
+            if (!newFile.isDirectory() && !newFile.mkdirs()) {
+                throw new IOException("Failed to create directory $newFile")
+            }
+        } else {
+            // fix for Windows-created archives
+            File parent = newFile.parentFile
+            if (!parent.isDirectory() && !parent.mkdirs()) {
+                throw new IOException("Failed to create directory $parent")
+            }
+            // write file content
+            FileOutputStream fos = new FileOutputStream(newFile)
+            int len = 0
+            while ((len = zis.read(buffer)) > 0) {
+                fos.write(buffer, 0, len)
+            }
+            fos.close()
+        }
+        zipEntry = zis.getNextEntry()
+    }
+    zis.closeEntry()
+    zis.close()
+}
+
+configure(deobfParams) {
+    group = 'forgegradle'
+    description = 'Rename all obfuscated parameter names inherited from Minecraft classes'
+}
+
+// Dependency Deobfuscation
 
 def deobf(String sourceURL) {
     try {
@@ -661,42 +849,57 @@ def deobf(String sourceURL) {
 
         //get rid of directories:
         int lastSlash = fileName.lastIndexOf("/")
-        if(lastSlash > 0) {
+        if (lastSlash > 0) {
             fileName = fileName.substring(lastSlash + 1)
         }
         //get rid of extension:
-        if(fileName.endsWith(".jar")) {
+        if (fileName.endsWith(".jar") || fileName.endsWith(".litemod")) {
             fileName = fileName.substring(0, fileName.lastIndexOf("."))
         }
 
         String hostName = url.getHost()
-        if(hostName.startsWith("www.")) {
+        if (hostName.startsWith("www.")) {
             hostName = hostName.substring(4)
         }
         List parts = Arrays.asList(hostName.split("\\."))
         Collections.reverse(parts)
         hostName = String.join(".", parts)
 
-        return deobf(sourceURL, hostName + "/" + fileName)
-    } catch(Exception e) {
-        return deobf(sourceURL, "deobf/" + String.valueOf(sourceURL.hashCode()))
+        return deobf(sourceURL, "$hostName/$fileName")
+    } catch (Exception e) {
+        return deobf(sourceURL, "deobf/${sourceURL.hashCode()}")
     }
 }
 
 // The method above is to be preferred. Use this method if the filename is not at the end of the URL.
-def deobf(String sourceURL, String fileName) {
-    String cacheDir = System.getProperty("user.home") + "/.gradle/caches/"
-    String bon2Dir = cacheDir + "forge_gradle/deobf"
-    String bon2File  = bon2Dir + "/BON2-2.5.0.jar"
-    String obfFile = cacheDir + "modules-2/files-2.1/" + fileName + ".jar"
-    String deobfFile = cacheDir + "modules-2/files-2.1/" + fileName + "-deobf.jar"
+def deobf(String sourceURL, String rawFileName) {
+    String bon2Version = "2.5.1"
+    String fileName = URLDecoder.decode(rawFileName, "UTF-8")
+    String cacheDir = "$project.gradle.gradleUserHomeDir/caches"
+    String bon2Dir = "$cacheDir/forge_gradle/deobf"
+    String bon2File = "$bon2Dir/BON2-${bon2Version}.jar"
+    String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar"
+    String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar"
 
-    if(file(deobfFile).exists()) {
+    if (file(deobfFile).exists()) {
         return files(deobfFile)
     }
 
+    String mappingsVer
+    String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/'
+    if (remoteMappings) {
+        String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion"
+        String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip"
+
+        zipMappings(mappingsZIP, remoteMappings, bon2Dir)
+
+        mappingsVer = "snapshot_$id"
+    } else {
+        mappingsVer = "${channel}_$mappingsVersion"
+    }
+
     download.run {
-        src 'https://github.com/GTNewHorizons/BON2/releases/download/2.5.0/BON2-2.5.0.CUSTOM-all.jar'
+        src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
         dest bon2File
         quiet true
         overwrite false
@@ -710,18 +913,52 @@ def deobf(String sourceURL, String fileName) {
     }
 
     exec {
-        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', '1.7.10', '--mappingsVer', 'stable_12', '--notch'
+        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
         workingDir bon2Dir
-        standardOutput = new ByteArrayOutputStream()
+        standardOutput = new FileOutputStream("${deobfFile}.log")
     }
 
     return files(deobfFile)
 }
 
+def zipMappings(String zipPath, String url, String bon2Dir) {
+    File zipFile = new File(zipPath)
+    if (zipFile.exists()) {
+        return
+    }
+
+    String fieldsCache = "$bon2Dir/data/fields.csv"
+    String methodsCache = "$bon2Dir/data/methods.csv"
+
+    download.run {
+        src "${url}fields.csv"
+        dest fieldsCache
+        quiet true
+    }
+    download.run {
+        src "${url}methods.csv"
+        dest methodsCache
+        quiet true
+    }
+
+    zipFile.getParentFile().mkdirs()
+    ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))
+
+    zos.putNextEntry(new ZipEntry("fields.csv"))
+    Files.copy(Paths.get(fieldsCache), zos)
+    zos.closeEntry()
+
+    zos.putNextEntry(new ZipEntry("methods.csv"))
+    Files.copy(Paths.get(methodsCache), zos)
+    zos.closeEntry()
+
+    zos.close()
+}
+
 // Helper methods
 
 def checkPropertyExists(String propertyName) {
-    if (project.hasProperty(propertyName) == false) {
+    if (!project.hasProperty(propertyName)) {
         throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
     }
 }

settings.gradle

@@ -0,0 +1,10 @@
+plugins {
+    id 'com.diffplug.blowdryerSetup' version '1.6.0'
+}
+
+apply plugin: 'com.diffplug.blowdryerSetup'
+
+blowdryerSetup {
+    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.5')
+    //devLocal '.' // Use this when testing config updates locally
+}

src/main/java/forestry/Forestry.java

@@ -10,16 +10,10 @@
  ******************************************************************************/
 package forestry;
 
-import java.io.File;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-
-import net.minecraftforge.common.MinecraftForge;
-
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.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 +25,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;
@@ -49,6 +41,10 @@ import forestry.core.utils.Log;
 import forestry.core.utils.StringUtil;
 import forestry.core.worldgen.WorldGenerator;
 import forestry.plugins.PluginManager;
+import java.io.File;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraftforge.common.MinecraftForge;
 
 /**
  * Forestry Minecraft Mod
@@ -56,106 +52,115 @@ 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,54 +1,54 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
 import 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

@@ -13,19 +13,14 @@ import forestry.api.genetics.IIndividual;
  * 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,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,44 +12,43 @@ package forestry.api.apiculture;
  */
 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,12 +1,10 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import java.util.Locale;
-
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IAlleleArea;
 import forestry.api.genetics.IAlleleBoolean;
@@ -16,89 +14,90 @@ import forestry.api.genetics.IAlleleInteger;
 import forestry.api.genetics.IAlleleTolerance;
 import forestry.api.genetics.IChromosomeType;
 import forestry.api.genetics.ISpeciesRoot;
+import java.util.Locale;
 
 /**
  * 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;
-	}
+    /**
+     * 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 Class<? extends IAllele> getAlleleClass() {
-		return clss;
-	}
+    Class<? extends IAllele> clss;
 
-	@Override
-	public String getName() {
-		return this.toString().toLowerCase(Locale.ENGLISH);
-	}
+    EnumBeeChromosome(Class<? extends IAllele> clss) {
+        this.clss = clss;
+    }
 
-	@Override
-	public ISpeciesRoot getSpeciesRoot() {
-		return BeeManager.beeRoot;
-	}
+    @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,26 +1,29 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import forestry.api.genetics.ISpeciesType;
 import java.util.Locale;
 
-import forestry.api.genetics.ISpeciesType;
-
 public enum EnumBeeType implements ISpeciesType {
-	DRONE, PRINCESS, QUEEN, LARVAE, NONE;
+    DRONE,
+    PRINCESS,
+    QUEEN,
+    LARVAE,
+    NONE;
 
-	public static final EnumBeeType[] VALUES = values();
+    public static final EnumBeeType[] VALUES = values();
 
-	String name;
+    String name;
 
-	EnumBeeType() {
-		this.name = this.toString().toLowerCase(Locale.ENGLISH);
-	}
+    EnumBeeType() {
+        this.name = this.toString().toLowerCase(Locale.ENGLISH);
+    }
 
-	public String getName() {
-		return name;
-	}
+    public String getName() {
+        return name;
+    }
 }

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

@@ -1,36 +1,34 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import forestry.api.genetics.IFlowerRegistry;
 import java.util.ArrayList;
-
 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;
+    /**
+     * <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";
+    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>();
+    /**
+     * @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/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,27 @@ 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

@@ -5,52 +5,48 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import forestry.api.genetics.IAlleleSpecies;
 import java.util.Map;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import forestry.api.genetics.IAlleleSpecies;
-
 public interface IAlleleBeeSpecies extends IAlleleSpecies {
 
-	/**
-	 * @return the IBeeRoot
-	 */
-	IBeeRoot getRoot();
+    /**
+     * @return 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

@@ -5,39 +5,38 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import net.minecraft.item.ItemStack;
-
 import forestry.api.genetics.IAlleleSpeciesCustom;
+import net.minecraft.item.ItemStack;
 
 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();
+    /**
+     * Make this species only active at night.
+     */
+    IAlleleBeeSpeciesCustom setNocturnal();
 
-	/** Use this if you have custom icons for bees. */
-	IAlleleBeeSpeciesCustom setCustomBeeIconProvider(IBeeIconProvider beeIconProvider);
+    /** 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);
+    /** 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;
@@ -10,48 +10,47 @@ import forestry.api.genetics.IIndividual;
 
 /**
  * Can be used to garner information on bee breeding. See {@link forestry.api.genetics.ISpeciesRoot} for retrieval functions.
- * 
+ *
  * @author SirSengir
  */
 public interface IApiaristTracker extends IBreedingTracker {
 
-	/**
-	 * Register the birth of a queen. Will mark species as discovered.
-	 * 
-	 * @param queen
-	 *            Created queen.
-	 */
-	void registerQueen(IIndividual queen);
+    /**
+     * 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,27 @@ 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 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 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,47 @@ 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,86 +1,83 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import java.util.List;
-import java.util.Set;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.biome.BiomeGenBase;
-
 import forestry.api.core.IErrorState;
 import forestry.api.genetics.IEffectData;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IIndividualLiving;
+import java.util.List;
+import java.util.Set;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.biome.BiomeGenBase;
 
 /**
  * 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,40 @@ 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,47 +1,48 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import net.minecraft.util.Vec3;
-import net.minecraft.world.World;
-
 import com.mojang.authlib.GameProfile;
-
 import forestry.api.core.IClimateProvider;
 import forestry.api.core.IErrorLogicSource;
 import forestry.api.genetics.IHousing;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
 
 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,5 @@ 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,7 @@ 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,20 @@ 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,64 @@
 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 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 mate Genome of the bee mate this modifier is called for.
+     * @param currentModifier Current modifier.
+     * @return Float used to modify the base mutation chance.
+     */
+    float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
 
-	/**
-	 * @param genome Genome of the bee this modifier is called for.
-	 * @param currentModifier Current modifier.
-	 * @return Float used to modify the life span of queens.
-	 */
-	float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
+    /**
+     * @param genome Genome of the bee this modifier is called for.
+     * @param currentModifier Current modifier.
+     * @return Float used to modify the life span of queens.
+     */
+    float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
 
-	/**
-	 * @param genome Genome of the bee this modifier is called for.
-	 * @param currentModifier Current modifier.
-	 * @return Float modifying the production speed of queens.
-	 */
-	float getProductionModifier(IBeeGenome genome, float currentModifier);
+    /**
+     * @param genome Genome of the bee this modifier is called for.
+     * @param currentModifier Current modifier.
+     * @return Float modifying the production speed of queens.
+     */
+    float getProductionModifier(IBeeGenome genome, float currentModifier);
 
-	/**
-	 * @param genome Genome of the bee this modifier is called for.
-	 * @return Float modifying the flowering of queens.
-	 */
-	float getFloweringModifier(IBeeGenome genome, float currentModifier);
+    /**
+     * @param genome Genome of the bee this modifier is called for.
+     * @return Float modifying the flowering of queens.
+     */
+    float getFloweringModifier(IBeeGenome genome, float currentModifier);
 
-	/**
-	 * @param genome Genome of the bee this modifier is called for.
-	 * @return Float modifying the chance for a swarmer queen to die off.
-	 */
-	float getGeneticDecay(IBeeGenome genome, float currentModifier);
+    /**
+     * @param genome Genome of the bee this modifier is called for.
+     * @return Float modifying the chance for a swarmer queen to die off.
+     */
+    float getGeneticDecay(IBeeGenome genome, float currentModifier);
 
-	/**
-	 * @return Boolean indicating if housing can ignore rain
-	 */
-	boolean isSealed();
+    /**
+     * @return Boolean indicating if housing can ignore rain
+     */
+    boolean isSealed();
 
-	/**
-	 * @return Boolean indicating if housing can ignore darkness/night
-	 */
-	boolean isSelfLighted();
+    /**
+     * @return Boolean indicating if housing can ignore darkness/night
+     */
+    boolean isSelfLighted();
 
-	/**
-	 * @return Boolean indicating if housing can ignore not seeing the sky
-	 */
-	boolean isSunlightSimulated();
-
-	/**
-	 * @return Boolean indicating whether this housing simulates the nether
-	 */
-	boolean isHellish();
+    /**
+     * @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,16 @@ 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

@@ -7,6 +7,4 @@ package forestry.api.apiculture;
 
 import forestry.api.genetics.IMutationCustom;
 
-public interface IBeeMutationCustom extends IBeeMutation, 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,132 +1,128 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import com.mojang.authlib.GameProfile;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.ISpeciesRoot;
 import java.util.ArrayList;
 import java.util.Collection;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
-import com.mojang.authlib.GameProfile;
-
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.ISpeciesRoot;
-
 public interface IBeeRoot extends ISpeciesRoot {
 
-	/**
-	 * @return true if passed item is a Forestry bee. Equal to getType(ItemStack stack) != EnumBeeType.NONE
-	 */
-	@Override
-	boolean isMember(ItemStack stack);
+    /**
+     * @return 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,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.apiculture;
 
-import net.minecraft.entity.player.EntityPlayerMP;
-
 import forestry.api.core.INBTTagable;
+import net.minecraft.entity.player.EntityPlayerMP;
 
 /**
  * Stores beekeeping logic for bee housings.
@@ -16,46 +15,45 @@ import forestry.api.core.INBTTagable;
  */
 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,73 +1,72 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
 import java.util.ArrayList;
-
 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,38 +1,37 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
 import java.util.Collection;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 /**
  * Bees can be seeded either as hive drops or as mutation results.
- * 
+ *
  * Add IHiveDrops with HiveManager.get___Hive.addDrop
- * 
+ *
  * @author SirSengir
  */
 public interface IHiveDrop {
 
-	ItemStack getPrincess(World world, int x, int y, int z, int fortune);
+    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,16 @@ 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,9 @@ 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 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 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,9 @@ 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);
 }

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

@@ -5,44 +5,46 @@
  ******************************************************************************/
 package forestry.api.apiculture.hives;
 
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
 import net.minecraft.block.Block;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 
-import forestry.api.core.EnumHumidity;
-import forestry.api.core.EnumTemperature;
-
 public interface IHiveDescription {
 
-	/**
-	 * The hive generator for this hive.
-	 */
-	IHiveGen getHiveGen();
+    /**
+     * The hive 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,20 @@ 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

@@ -5,29 +5,29 @@
  ******************************************************************************/
 package forestry.api.apiculture.hives;
 
-import java.util.List;
-
 import forestry.api.apiculture.IHiveDrop;
+import java.util.List;
 
 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

@@ -5,44 +5,42 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import net.minecraft.util.StatCollector;
-
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IFruitFamily;
+import net.minecraft.util.StatCollector;
 
 public enum EnumFruitFamily implements IFruitFamily {
-	PRUNES("prunes", "Prunus domestica"),
-	POMES("pomes", "Pomum"),
-	JUNGLE("jungle", "Tropicus"),
-	NUX("nuts", "Nux");
+    PRUNES("prunes", "Prunus domestica"),
+    POMES("pomes", "Pomum"),
+    JUNGLE("jungle", "Tropicus"),
+    NUX("nuts", "Nux");
 
-	private final String uid;
-	private final String scientific;
+    private final String uid;
+    private final String scientific;
 
-	EnumFruitFamily(String uid, String scientific) {
-		this.uid = uid;
-		this.scientific = scientific;
-		AlleleManager.alleleRegistry.registerFruitFamily(this);
-	}
+    EnumFruitFamily(String uid, String scientific) {
+        this.uid = uid;
+        this.scientific = scientific;
+        AlleleManager.alleleRegistry.registerFruitFamily(this);
+    }
 
-	@Override
-	public String getUID() {
-		return "forestry." + uid;
-	}
+    @Override
+    public String getUID() {
+        return "forestry." + uid;
+    }
 
-	@Override
-	public String getScientific() {
-		return this.scientific;
-	}
+    @Override
+    public String getScientific() {
+        return this.scientific;
+    }
 
-	@Override
-	public String getName() {
-		return StatCollector.translateToLocal("for.family." + uid);
-	}
-
-	@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,21 @@ package forestry.api.arboriculture;
 import forestry.api.genetics.ISpeciesType;
 
 public enum EnumGermlingType implements ISpeciesType {
-	SAPLING("sapling"), BLOSSOM("blossom"), POLLEN("pollen"), GERMLING("germling"), NONE("none");
+    SAPLING("sapling"),
+    BLOSSOM("blossom"),
+    POLLEN("pollen"),
+    GERMLING("germling"),
+    NONE("none");
 
-	public static final EnumGermlingType[] VALUES = values();
-	
-	private final String name;
+    public static final EnumGermlingType[] VALUES = values();
 
-	EnumGermlingType(String name) {
-		this.name = name;
-	}
+    private final String name;
 
-	public String getName() {
-		return 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,14 +1,10 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import java.util.Locale;
-
-import net.minecraftforge.common.EnumPlantType;
-
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IAlleleArea;
 import forestry.api.genetics.IAlleleBoolean;
@@ -18,81 +14,82 @@ import forestry.api.genetics.IAllelePlantType;
 import forestry.api.genetics.IChromosomeType;
 import forestry.api.genetics.IFruitFamily;
 import forestry.api.genetics.ISpeciesRoot;
+import java.util.Locale;
+import net.minecraftforge.common.EnumPlantType;
 
 public enum EnumTreeChromosome implements IChromosomeType {
 
-	/**
-	 * Determines the following: - WorldGen, including the used wood blocks - {@link IFruitFamily}s supported. Limits which {@link IFruitProvider}
-	 * will actually yield fruit with this species. - Native {@link EnumPlantType} for this tree. Combines with the PLANT chromosome.
-	 */
-	SPECIES(IAlleleTreeSpecies.class),
-	/**
-	 * {@link IGrowthProvider}, determines conditions required by the tree to grow.
-	 */
-	GROWTH(IAlleleGrowth.class),
-	/**
-	 * A float modifying the height of the tree. Taken into account at worldgen.
-	 */
-	HEIGHT(IAlleleFloat.class),
-	/**
-	 * Chance for saplings.
-	 */
-	FERTILITY(IAlleleFloat.class),
-	/**
-	 * {@link IFruitProvider}, determines if and what fruits are grown on the tree. Limited by the {@link IFruitFamily}s the species supports.
-	 */
-	FRUITS(IAlleleFruit.class),
-	/**
-	 * Chance for fruit leaves and/or drops.
-	 */
-	YIELD(IAlleleFloat.class),
-	/**
-	 * May add additional tolerances for {@link EnumPlantTypes}.
-	 */
-	PLANT(IAllelePlantType.class),
-	/**
-	 * Determines the speed at which fruit will ripen on this tree.
-	 */
-	SAPPINESS(IAlleleFloat.class),
-	/**
-	 * Territory for leaf effects. Unused.
-	 */
-	TERRITORY(IAlleleArea.class),
-	/**
-	 * Leaf effect. Unused.
-	 */
-	EFFECT(IAlleleLeafEffect.class),
-	/**
-	 * Amount of random ticks which need to elapse before a sapling will grow into a tree.
-	 */
-	MATURATION(IAlleleInteger.class),
+    /**
+     * 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

@@ -7,63 +7,85 @@ package forestry.api.arboriculture;
 
 import java.util.Locale;
 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;
+    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();
+    public static final float DEFAULT_HARDNESS = 2.0f;
+    public static final EnumWoodType[] VALUES = values();
 
-	private final float hardness;
+    private final float hardness;
 
-	EnumWoodType() {
-		this.hardness = DEFAULT_HARDNESS;
-	}
+    EnumWoodType() {
+        this.hardness = DEFAULT_HARDNESS;
+    }
 
-	EnumWoodType(float hardness) {
-		this.hardness = hardness;
-	}
+    EnumWoodType(float hardness) {
+        this.hardness = hardness;
+    }
 
-	public float getHardness() {
-		return hardness;
-	}
+    public float getHardness() {
+        return hardness;
+    }
 
-	/**
-	 * @deprecated since Forestry 4.2. Woods use itemDamage instead of NBT now
-	 */
-	@Deprecated
-	public void saveToCompound(NBTTagCompound compound) {
-		compound.setInteger("WoodType", ordinal());
-	}
+    /**
+     * @deprecated since Forestry 4.2. Woods use itemDamage instead of NBT now
+     */
+    @Deprecated
+    public void saveToCompound(NBTTagCompound compound) {
+        compound.setInteger("WoodType", ordinal());
+    }
 
-	/**
-	 * @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 static EnumWoodType getFromCompound(NBTTagCompound compound) {
+        if (compound != null) {
+            int typeOrdinal = compound.getInteger("WoodType");
+            if (typeOrdinal >= 0 && typeOrdinal < VALUES.length) {
+                return VALUES[typeOrdinal];
+            }
+        }
 
-		return EnumWoodType.LARCH;
-	}
+        return EnumWoodType.LARCH;
+    }
 
-	public static EnumWoodType getRandom(Random random) {
-		return VALUES[random.nextInt(VALUES.length)];
-	}
+    public static EnumWoodType getRandom(Random random) {
+        return VALUES[random.nextInt(VALUES.length)];
+    }
 
-	@Override
-	public String toString() {
-		return super.toString().toLowerCase(Locale.ENGLISH);
-	}
+    @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,20 +1,18 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import net.minecraft.world.World;
-
 import forestry.api.genetics.IAlleleEffect;
 import forestry.api.genetics.IEffectData;
+import net.minecraft.world.World;
 
 /**
  * Simple allele encapsulating a leaf effect. (Not implemented)
  */
 public interface IAlleleLeafEffect extends IAlleleEffect {
 
-	IEffectData doEffect(ITreeGenome genome, IEffectData storedData, World world, 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,51 +1,46 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import java.util.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;
+import java.util.Collection;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.common.EnumPlantType;
 
 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

@@ -5,17 +5,15 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import net.minecraftforge.common.EnumPlantType;
-
 import forestry.api.genetics.IAlleleSpeciesCustom;
 import forestry.api.genetics.IFruitFamily;
+import net.minecraftforge.common.EnumPlantType;
 
 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,12 +1,10 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
 import forestry.api.genetics.IBreedingTracker;
 
-public interface IArboristTracker extends IBreedingTracker {
-
-}
+public interface IArboristTracker extends IBreedingTracker {}

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

@@ -1,74 +1,72 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import forestry.api.genetics.IFruitFamily;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import forestry.api.genetics.IFruitFamily;
-
 public interface IFruitProvider {
 
-	IFruitFamily getFamily();
+    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

@@ -14,6 +14,7 @@ import net.minecraft.util.IIcon;
  * 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

@@ -15,6 +15,7 @@ import net.minecraft.util.IIcon;
  * 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,5 @@ 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,15 @@ 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,84 +1,80 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import java.util.EnumSet;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
-
 import com.mojang.authlib.GameProfile;
-
-import net.minecraftforge.common.EnumPlantType;
-
 import forestry.api.genetics.IEffectData;
 import forestry.api.genetics.IIndividual;
 import forestry.api.world.ITreeGenData;
+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;
 
 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

@@ -5,30 +5,39 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
+import forestry.api.genetics.IClassification;
 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);
+    /**
+     * 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);
+    /** 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

@@ -5,34 +5,31 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
+import com.mojang.authlib.GameProfile;
+import forestry.api.world.ITreeGenData;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
-
-import com.mojang.authlib.GameProfile;
-
 import net.minecraftforge.common.util.ForgeDirection;
 
-import forestry.api.world.ITreeGenData;
-
 /**
  * Implements the tree generation for a tree species.
  */
 public interface ITreeGenerator {
-	WorldGenerator getWorldGenerator(ITreeGenData tree);
+    WorldGenerator getWorldGenerator(ITreeGenData tree);
 
-	void setLogBlock(ITreeGenome genome, World world, int x, int y, int z, ForgeDirection facing);
+    void setLogBlock(ITreeGenome genome, 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);
+    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 setLogBlock(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);
 
-	/**
-	 * @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 setLeaves(World world, GameProfile owner, int x, int y, int z, boolean decorative);
 }

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

@@ -1,46 +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;
 
-import java.util.EnumSet;
-
-import net.minecraftforge.common.EnumPlantType;
-
 import forestry.api.genetics.IGenome;
+import java.util.EnumSet;
+import net.minecraftforge.common.EnumPlantType;
 
 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,25 +1,32 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import net.minecraft.world.World;
-
 import forestry.api.genetics.IMutation;
 import forestry.api.genetics.ISpeciesRoot;
+import net.minecraft.world.World;
 
 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

@@ -7,6 +7,4 @@ package forestry.api.arboriculture;
 
 import forestry.api.genetics.IMutationCustom;
 
-public interface ITreeMutationCustom extends ITreeMutation, 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,99 +1,95 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
+import com.mojang.authlib.GameProfile;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IChromosome;
+import forestry.api.genetics.ISpeciesRoot;
 import java.util.ArrayList;
 import java.util.Collection;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
-import com.mojang.authlib.GameProfile;
-
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IChromosome;
-import forestry.api.genetics.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,13 @@ 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,24 @@
 package forestry.api.circuits;
 
 public enum CircuitSocketType implements ICircuitSocketType {
-	NONE("none"),
-	FARM("forestry.farm"),
-	ELECTRIC_ENGINE("forestry.electric.engine"),
-	MACHINE("forestry.machine");
+    NONE("none"),
+    FARM("forestry.farm"),
+    ELECTRIC_ENGINE("forestry.electric.engine"),
+    MACHINE("forestry.machine");
 
-	private final String uid;
+    private final String uid;
 
-	CircuitSocketType(String uid) {
-		this.uid = uid;
-	}
+    CircuitSocketType(String uid) {
+        this.uid = uid;
+    }
 
-	@Override
-	public String getUid() {
-		return uid;
-	}
+    @Override
+    public String getUid() {
+        return uid;
+    }
 
-	@Override
-	public boolean equals(ICircuitSocketType socketType) {
-		return uid.equals(socketType.getUid());
-	}
+    @Override
+    public boolean equals(ICircuitSocketType socketType) {
+        return uid.equals(socketType.getUid());
+    }
 }

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

@@ -1,32 +1,30 @@
 /*******************************************************************************
  * 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();
+    String getUID();
 
-	boolean requiresDiscovery();
+    boolean requiresDiscovery();
 
-	int getLimit();
+    int getLimit();
 
-	String getName();
+    String getName();
 
-	boolean isCircuitable(Object tile);
+    boolean isCircuitable(Object tile);
 
-	void onInsertion(int slot, Object tile);
+    void onInsertion(int slot, Object tile);
 
-	void onLoad(int slot, Object tile);
+    void onLoad(int slot, Object tile);
 
-	void onRemoval(int slot, Object tile);
+    void onRemoval(int slot, Object tile);
 
-	void onTick(int slot, Object tile);
+    void onTick(int slot, Object tile);
 
-	void addTooltip(List<String> list);
+    void addTooltip(List<String> list);
 }

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

@@ -1,36 +1,34 @@
 /*******************************************************************************
  * 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 forestry.api.core.INBTTagable;
+import java.util.List;
 
 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,24 @@
 /*******************************************************************************
  * 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,8 @@
 /*******************************************************************************
  * 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 {
-
-}
+public interface ICircuitLibrary {}

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

@@ -1,37 +1,35 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.circuits;
 
 import java.util.Map;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 public interface ICircuitRegistry {
 
-	/* CIRCUITS */
-	Map<String, ICircuit> getRegisteredCircuits();
+    /* 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

@@ -10,9 +10,9 @@ package forestry.api.circuits;
  * See CircuitSocketType for Forestry's uses.
  */
 public interface ICircuitSocketType {
-	/** unique identifier for this socket type */
-	String getUid();
+    /** unique identifier for this socket type */
+    String getUid();
 
-	/** comparison using uid */
-	boolean equals(ICircuitSocketType socketType);
+    /** 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

@@ -2,35 +2,33 @@ package forestry.api.core;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import net.minecraft.world.biome.BiomeGenBase;
-
 import net.minecraftforge.common.BiomeDictionary;
 
 public class BiomeHelper {
 
-	private static final Map<BiomeGenBase, Boolean> isBiomeHellishCache = new HashMap<BiomeGenBase, Boolean>();
+    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,43 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.core;
 
 /**
  *  Many things Forestry use temperature and humidity of a biome to determine whether they can or how they can work or spawn at a given location.
- * 
- *  This enum concerns humidity. 
+ *
+ *  This enum concerns humidity.
  */
 public enum EnumHumidity {
-	ARID("Arid"), NORMAL("Normal"), DAMP("Damp");
+    ARID("Arid"),
+    NORMAL("Normal"),
+    DAMP("Damp");
 
-	public final String name;
+    public final String name;
 
-	private EnumHumidity(String name) {
-		this.name = name;
-	}
+    private EnumHumidity(String name) {
+        this.name = name;
+    }
 
-	public String getName() {
-		return this.name;
-	}
+    public String getName() {
+        return this.name;
+    }
 
-	/**
-	 * Determines the EnumHumidity given a floating point representation of Minecraft Rainfall.
-	 * To check if rainfall is possible in a biome, use BiomeHelper.canRainOrSnow().
-	 * @param rawHumidity raw rainfall value
-	 * @return EnumHumidity corresponding to rainfall value
-	 */
-	public static EnumHumidity getFromValue(float rawHumidity) {
-		if (rawHumidity > 0.85f) { // matches BiomeGenBase.isHighHumidity()
-			return DAMP;
-		}
-		else if (rawHumidity >= 0.3f) {
-			return NORMAL;
-		}
-		else {
-			return ARID;
-		}
-	}
+    /**
+     * 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,79 +1,79 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.core;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.biome.BiomeGenBase;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
 /**
  *  Many things Forestry use temperature and humidity of a biome to determine whether they can or how they can work or spawn at a given location.
- * 
+ *
  *  This enum concerns temperature.
  */
 public enum EnumTemperature {
-	NONE("None", "habitats/ocean"), ICY("Icy", "habitats/snow"), COLD("Cold", "habitats/taiga"),
-	NORMAL("Normal", "habitats/plains"), WARM("Warm", "habitats/jungle"), HOT("Hot", "habitats/desert"), HELLISH("Hellish", "habitats/nether");
+    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;
+    public final String name;
+    public final String iconIndex;
 
-	private EnumTemperature(String name, String iconIndex) {
-		this.name = name;
-		this.iconIndex = iconIndex;
-	}
+    private EnumTemperature(String name, String iconIndex) {
+        this.name = name;
+        this.iconIndex = iconIndex;
+    }
 
-	public String getName() {
-		return this.name;
-	}
+    public String getName() {
+        return this.name;
+    }
 
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return ForestryAPI.textureManager.getDefault(iconIndex);
-	}
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon() {
+        return ForestryAPI.textureManager.getDefault(iconIndex);
+    }
 
-	/**
-	 * Determines the EnumTemperature given a floating point representation of
-	 * Minecraft temperature. Hellish biomes are handled based on their biome
-	 * type - check BiomeHelper.isBiomeHellish.
-	 * @param rawTemp raw temperature value
-	 * @return EnumTemperature corresponding to value of rawTemp
-	 */
-	public static EnumTemperature getFromValue(float rawTemp) {
-		if (rawTemp > 1.00f) {
-			return HOT;
-		}
-		else if (rawTemp > 0.85f) {
-			return WARM;
-		}
-		else if (rawTemp > 0.35f) {
-			return NORMAL;
-		}
-		else if (rawTemp > 0.0f) {
-			return COLD;
-		}
-		else {
-			return ICY;
-		}
-	}
+    /**
+     * 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) {
-		if (BiomeHelper.isBiomeHellish(biomeGenBase)) {
-			return HELLISH;
-		}
-		return getFromValue(biomeGenBase.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);
-	}
+    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,21 +1,20 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.core;
 
-import java.util.Set;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import java.util.Set;
 
 /**
  * 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.
@@ -25,44 +24,44 @@ import cpw.mods.fml.relauncher.SideOnly;
  *  			\ .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,60 +1,60 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.core;
 
-import net.minecraft.entity.player.EntityPlayer;
-
 import com.mojang.authlib.GameProfile;
-
 import cpw.mods.fml.common.eventhandler.Event;
-
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IBreedingTracker;
 import forestry.api.genetics.IMutation;
 import forestry.api.genetics.ISpeciesRoot;
+import net.minecraft.entity.player.EntityPlayer;
 
 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 {
+        public final ISpeciesRoot root;
+        public final IBreedingTracker tracker;
+        public final GameProfile username;
 
-		private BreedingEvent(ISpeciesRoot root, GameProfile username, IBreedingTracker tracker) {
-			super();
-			this.root = root;
-			this.username = username;
-			this.tracker = tracker;
-		}
-	}
+        private BreedingEvent(ISpeciesRoot root, GameProfile username, IBreedingTracker tracker) {
+            super();
+            this.root = root;
+            this.username = username;
+            this.tracker = tracker;
+        }
+    }
 
-	public static class SpeciesDiscovered extends BreedingEvent {
-		public final IAlleleSpecies species;
-		public SpeciesDiscovered(ISpeciesRoot root, GameProfile username, IAlleleSpecies species, IBreedingTracker tracker) {
-			super(root, username, tracker);
-			this.species = species;
-		}
-	}
+    public static class SpeciesDiscovered extends BreedingEvent {
+        public final IAlleleSpecies 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 SpeciesDiscovered(
+                ISpeciesRoot root, GameProfile username, IAlleleSpecies species, IBreedingTracker tracker) {
+            super(root, username, tracker);
+            this.species = species;
+        }
+    }
 
-	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 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,16 @@ 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

@@ -11,13 +11,13 @@
 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 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 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/IErrorLogic.java

@@ -15,30 +15,31 @@ import java.io.IOException;
  */
 public interface IErrorLogic extends IErrorSource {
 
-	/**
-	 * Sets the errorState when condition is true, and unsets it when condition is false.
-	 * @return condition
-	 */
-	boolean setCondition(boolean condition, IErrorState errorState);
+    /**
+     * Sets the errorState when condition is true, and unsets it when condition is false.
+     * @return condition
+     */
+    boolean setCondition(boolean condition, IErrorState errorState);
 
-	/**
-	 * @return true if the error state is active.
-	 */
-	boolean contains(IErrorState state);
+    /**
+     * @return true if the error state is active.
+     */
+    boolean contains(IErrorState state);
 
-	/**
-	 * @return true if there are any active error states.
-	 */
-	boolean hasErrors();
+    /**
+     * @return true if there are any active error states.
+     */
+    boolean hasErrors();
 
-	/**
-	 * Sets all active error states to false
-	 */
-	void clearErrors();
+    /**
+     * Sets all active error states to false
+     */
+    void clearErrors();
 
-	/**
-	 * Network serialization for syncing errors to the client from the server.
-	 */
-	void writeData(DataOutputStream data) throws IOException;
-	void readData(DataInputStream data) throws IOException;
+    /**
+     * Network serialization for syncing errors to the client from the server.
+     */
+    void writeData(DataOutputStream data) throws IOException;
+
+    void readData(DataInputStream data) throws IOException;
 }

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

@@ -9,5 +9,5 @@ package forestry.api.core;
  * An IErrorLogicSource uses an instance of IErrorLogic to deal with its errors.
  */
 public interface IErrorLogicSource {
-	IErrorLogic getErrorLogic();
+    IErrorLogic getErrorLogic();
 }

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

@@ -8,8 +8,8 @@ package forestry.api.core;
 import com.google.common.collect.ImmutableSet;
 
 public interface IErrorSource {
-	/**
-	 * @return the active error states. An empty Set indicates no errors.
-	 */
-	ImmutableSet<IErrorState> getErrorStates();
+    /**
+     * @return the active error states. An empty Set indicates no errors.
+     */
+    ImmutableSet<IErrorState> getErrorStates();
 }

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

@@ -5,30 +5,28 @@
  ******************************************************************************/
 package forestry.api.core;
 
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.util.IIcon;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
 
 /**
  *
  * @author CovertJaguar <http://www.railcraft.info/>
  */
 public interface IErrorState {
-	
-	short getID();
-	
-	String getUniqueName();
 
-	String getDescription();
+    short getID();
 
-	String getHelp();
+    String getUniqueName();
 
-	@SideOnly(Side.CLIENT)
-	void registerIcons(IIconRegister register);
+    String getDescription();
 
-	@SideOnly(value = Side.CLIENT)
-	IIcon getIcon();
+    String getHelp();
 
+    @SideOnly(Side.CLIENT)
+    void registerIcons(IIconRegister register);
+
+    @SideOnly(value = Side.CLIENT)
+    IIcon getIcon();
 }

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

@@ -8,12 +8,15 @@ package forestry.api.core;
 import java.util.Set;
 
 public interface IErrorStateRegistry {
-	void registerErrorState(IErrorState state);
-	void addAlias(IErrorState state, String name);
+    void registerErrorState(IErrorState state);
 
-	IErrorState getErrorState(short id);
-	IErrorState getErrorState(String name);
-	Set<IErrorState> getErrorStates();
+    void addAlias(IErrorState state, String name);
 
-	IErrorLogic createErrorLogic();
+    IErrorState getErrorState(short id);
+
+    IErrorState getErrorState(String name);
+
+    Set<IErrorState> getErrorStates();
+
+    IErrorLogic createErrorLogic();
 }

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

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

src/main/java/forestry/api/core/IGameMode.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;
@@ -9,33 +9,32 @@ import net.minecraft.item.ItemStack;
 
 public interface IGameMode {
 
-	/**
-	 * @return Human-readable identifier for the game mode. (i.e. 'EASY', 'NORMAL', 'HARD')
-	 */
-	String getIdentifier();
+    /**
+     * @return Human-readable identifier for the game mode. (i.e. 'EASY', 'NORMAL', 'HARD')
+     */
+    String getIdentifier();
 
-	/**
-	 * @param ident Identifier for the setting. (See the gamemode config.)
-	 * @return Value of the requested setting, false if unknown setting.
-	 */
-	boolean getBooleanSetting(String ident);
-	
-	/**
-	 * @param ident Identifier for the setting. (See the gamemode config.)
-	 * @return Value of the requested setting, 0 if unknown setting.
-	 */
-	int getIntegerSetting(String ident);
+    /**
+     * @param ident Identifier for the setting. (See the gamemode config.)
+     * @return Value of the requested setting, false if unknown setting.
+     */
+    boolean getBooleanSetting(String ident);
 
-	/**
-	 * @param ident Identifier for the setting. (See the gamemode config.)
-	 * @return Value of the requested setting, 0 if unknown setting.
-	 */
-	float getFloatSetting(String ident);
+    /**
+     * @param ident Identifier for the setting. (See the gamemode config.)
+     * @return Value of the requested setting, 0 if unknown setting.
+     */
+    int getIntegerSetting(String ident);
 
-	/**
-	 * @param ident Identifier for the setting. (See the gamemode config.)
-	 * @return Value of the requested setting, an itemstack containing an apple if unknown setting.
-	 */
-	ItemStack getStackSetting(String ident);
+    /**
+     * @param ident Identifier for the setting. (See the gamemode config.)
+     * @return Value of the requested setting, 0 if unknown setting.
+     */
+    float getFloatSetting(String ident);
 
+    /**
+     * @param ident Identifier for the setting. (See the gamemode config.)
+     * @return Value of the requested setting, an itemstack containing an apple if unknown setting.
+     */
+    ItemStack getStackSetting(String ident);
 }