Fix lang

Fix Alveary Swarmer and Swarm Hive
(cherry picked from commit 2577ee9c930cdc91bdf3d207cbeaaebbe1141257) Conflicts: src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java
2026-11-14 17:14:46 +00:00 · 2014-12-14 21:39:45 -08:00 · 2014-12-09 01:08:14 -08:00 · 2014-12-09 01:03:05 -08:00 · 2014-12-08 20:26:51 -08:00 · 2014-12-07 16:25:01 -08:00
1933 changed files with 62280 additions and 116343 deletions
@@ -1,9 +0,0 @@
-directory="run/crash-reports"
-if [ -d $directory ]; then
-  echo "Crash reports detected:"
-  cat $directory/*
-  exit 1
-else
-  echo "No crash reports detected"
-  exit 0
-fi
@@ -1,10 +0,0 @@
-if [ ! -z $(git diff --name-only HEAD HEAD~1 | grep build.gradle) ]; then
-  new_version="$(git log -n1 --format=format:"%H")"
-  sed --in-place "s!^//version:.*!//version: $new_version!g" build.gradle
-  git add build.gradle
-  git commit -m "[ci skip] update build script version to $new_version"
-  git push
-  echo "Updated buildscript version to $new_version"; 
-else
-  echo "Ignored buildscript version update: no changes detected"
-fi
@@ -1,45 +0,0 @@
-# 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
-
-on:
-  pull_request:
-    branches: [ master, main ]
-  push:
-    branches: [ master, main ]
-
-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 minute
-      run: |
-        mkdir run
-        echo "eula=true" > run/eula.txt  
-        timeout 10 ./gradlew runServer || true
-
-    - name: Test no crashes happend
-      run: |
-        chmod +x .github/scripts/test-no-crash-reports.sh
-        .github/scripts/test-no-crash-reports.sh
@@ -1,44 +0,0 @@
-# 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 latest build
-
-on:
-  push:
-    branches: [ master, main ]
-
-jobs:
-  build-and-release:
-    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: Update latest tag
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "latest"
-          prerelease: false
-          title: "Latest build"
-          files: build/libs/*.jar
@@ -1,45 +0,0 @@
-# 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:
-      - '*'
-
-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
@@ -1,28 +1,21 @@
-.gradle
-.settings
-/.idea/
-/run/
-/build/
-/eclipse/
-.classpath
-.project
-/bin/
-/config/
-/crash-reports/
-/logs/
-options.txt
-/saves/
-usernamecache.json
-banned-ips.json
-banned-players.json
-eula.txt
-ops.json
-server.properties
-servers.dat
-usercache.json
-whitelist.json
-/out/
-*.iml
-*.ipr
-*.iws
-src/main/resources/mixins.*.json
+# everything
+/*
+
+# folders
+!/forestry_techne
+!/gradle/wrapper
+!/src
+
+# files
+!/.gitignore
+!/.gitmodules
+!/CLA.txt
+!/CONTRIBUTING.md
+!/LICENSE.txt
+!/license-header.txt
+!/README.md
+!/application.properties
+!/build.gradle
+!/build.xml
+!/gradlew
+!/gradlew.bat
@@ -0,0 +1,6 @@
+[submodule "lang"]
+	path = lang
+	url = https://github.com/ForestryMC/Forestry-Localization.git
+[submodule "api"]
+	path = api
+	url = https://github.com/ForestryMC/ForestryAPI.git
@@ -1,48 +0,0 @@
-
-# ForestryMC
-
-Changelog of ForestryMC.
-
-
-### [#8 Fix NPE on crafting in worktable](https://github.com/GTNewHorizons/ForestryMC/pull/8)
-**Merge pull request #8 from GTNewHorizons/worktable-npe**
-* Fix NPE on crafting in worktable
-
-[4c7c7c34388aebd](https://github.com/GTNewHorizons/ForestryMC/commit/4c7c7c34388aebd)
-by Martin Robertz *2021-04-06 15:05:20*
-### No issue
-**Fix NPE on crafting in worktable**
-
-[621208393e64d97](https://github.com/GTNewHorizons/ForestryMC/commit/621208393e64d97)
-by Glease *2021-04-06 14:46:39*
-
-### [#6 Ic2 crop module](https://github.com/GTNewHorizons/ForestryMC/pull/6)
-**Ic2 crop module (#6)**
-* Added IC2-Crop-Module
-* Changed Lang repo
-* updated lang submodule
-
-[d2545b7a5990cf2](https://github.com/GTNewHorizons/ForestryMC/commit/d2545b7a5990cf2)
-by bartimaeusnek *2020-12-24 20:15:03*
-### [#7 Dirty fix for BQ3 crafting quest not triggering](https://github.com/GTNewHorizons/ForestryMC/pull/7)
-**Merge pull request #7 from GTNewHorizons/bq3_compat**
-* Dirty fix for BQ3 crafting quest not triggering
-
-[d0254997472c5be](https://github.com/GTNewHorizons/ForestryMC/commit/d0254997472c5be)
-by Martin Robertz *2021-01-22 16:15:58*
-### No issue
-**bump version**
-
-[98c0b66b6fbe598](https://github.com/GTNewHorizons/ForestryMC/commit/98c0b66b6fbe598)
-by DreamMasterXXL *2021-01-29 19:11:09*
-
-**Merge branch 'IC2-Crop-Module' into GTNH-Fixes**
-
-[5b61261d69d541b](https://github.com/GTNewHorizons/ForestryMC/commit/5b61261d69d541b)
-by DreamMasterXXL *2021-01-29 19:05:41*
-
-**Dirty fix for BQ3 crafting quest not triggering**
-
-[7320ddb44f63bfd](https://github.com/GTNewHorizons/ForestryMC/commit/7320ddb44f63bfd)
-by Glease *2021-01-22 14:41:32*
-
@@ -31,7 +31,7 @@ Beware of ugly code.

 Bugfixes are generally welcome. If you want to contribute something which changes game mechanics, please talk to someone with commit privileges first. Nothing is more frustrating than putting a lot of work and effort into a new game mechanic and then having the PR rejected because it doesn’t fit gameplay-wise.

-**If you submit a PR you must accept the [Contributor License Agreement](https://cla-assistant.io/ForestryMC/ForestryMC). There is no way around that, since otherwise changing the license later - even to something more permissive! - , becomes close to impossible.**
+**If you submit a PR you must accept the [Contributor License Agreement](https://www.clahub.com/agreements/ForestryMC/ForestryMC). There is no way around that, since otherwise changing the license later - even to something more permissive! - , becomes close to impossible.**

 ### License & Copyright

@@ -0,0 +1,6 @@
+mcversion=1.7.10
+forgeversion=10.13.0.1207
+version_major=3
+version_minor=3
+version_patch=0
+
@@ -1,520 +1,350 @@
-//version: eb0b030ab9cb1d0f9a31f11e69e1ceed1dab2c89
-/*
-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/SinTh0r4s/ExampleMod1.7.10/blob/main/build.gradle for updates.
- */
-
-
-import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
-import java.util.concurrent.TimeUnit
-
 buildscript {
-    repositories {
-        maven {
-            name = "forge"
-            url = "https://maven.minecraftforge.net"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-        maven {
-            name = "Scala CI dependencies"
-            url = "https://repo1.maven.org/maven2/"
-        }
-        maven {
-            name = "jitpack"
-            url = "https://jitpack.io"
-        }
-    }
-    dependencies {
-        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.4'
-    }
-}
-
-plugins {
-    id 'idea'
-    id 'scala'
-    id("org.ajoberstar.grgit") version("3.1.1")
-    id("com.github.johnrengelman.shadow") version("4.0.4")
-    id("com.palantir.git-version") version("0.12.3")
+	repositories {
+		mavenCentral()
+		maven {
+			name = "forge"
+			url = "http://files.minecraftforge.net/maven"
+		}
+		maven {
+			name = "sonatype"
+			url = "https://oss.sonatype.org/content/repositories/snapshots/"
+		}
+	}
+	dependencies {
+		classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+		// https://github.com/ajoberstar/gradle-git
+		classpath 'org.ajoberstar:gradle-git:0.8.0'
+	}
 }

 apply plugin: 'forge'
+apply plugin: 'maven'

-def projectJavaVersion = JavaLanguageVersion.of(8)
+loadProperties()

-java {
-    toolchain {
-        languageVersion.set(projectJavaVersion)
-    }
+version = version_major + '.' + version_minor + '.' + version_patch + '.' + getBuildNumber()
+if (project.hasProperty('buildQualifier')) {
+	version = project.version + '-' + project.buildQualifier
 }
+group= "net.sengir.forestry" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "forestry_" + mcversion

-idea {
-    module {
-        inheritOutputDirs = true
-        downloadJavadoc = true
-        downloadSources = true
-    }
-}
+ext.dirDest = './build/dist'
+ext.dirLang = "./lang"
+ext.dirApi = "./api"

-checkPropertyExists("modName")
-checkPropertyExists("modId")
-checkPropertyExists("modGroup")
-checkPropertyExists("autoUpdateBuildScript")
-checkPropertyExists("minecraftVersion")
-checkPropertyExists("forgeVersion")
-checkPropertyExists("replaceGradleTokenInFile")
-checkPropertyExists("gradleTokenModId")
-checkPropertyExists("gradleTokenModName")
-checkPropertyExists("gradleTokenVersion")
-checkPropertyExists("gradleTokenGroupName")
-checkPropertyExists("apiPackage")
-checkPropertyExists("accessTransformersFile")
-checkPropertyExists("usesMixins")
-checkPropertyExists("mixinPlugin")
-checkPropertyExists("mixinsPackage")
-checkPropertyExists("coreModClass")
-checkPropertyExists("containsMixinsAndOrCoreModOnly")
-checkPropertyExists("usesShadowedDependencies")
-checkPropertyExists("developmentEnvironmentUserName")
-
-def checkPropertyExists(String propertyName) {
-    if (project.hasProperty(propertyName) == false) {
-        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/SinTh0r4s/ExampleMod1.7.10/blob/main/gradle.properties")
-    }
-}
-
-
-String javaSourceDir = "src/main/java/"
-String scalaSourceDir = "src/main/scala/"
-
-String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
-String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
-if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) {
-    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
-}
-
-if(apiPackage) {
-    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) {
-        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
-    }
-}
-
-if(accessTransformersFile) {
-    String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
-    if(new File(targetFile).exists() == false) {
-        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
-    }
-}
-
-if(usesMixins.toBoolean()) {
-    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
-        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
-    }
-
-    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) {
-        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
-    }
-
-    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"
-    if((new File(targetFileJava).exists() || new File(targetFileScala).exists() || new File(targetFileScalaJava).exists()) == false) {
-        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
-    }
-}
-
-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"
-    if((new File(targetFileJava).exists() || new File(targetFileScala).exists() || new File(targetFileScalaJava).exists()) == false) {
-        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
-    }
-}
-
-configurations.all {
-    resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
-
-    // Make sure GregTech build won't time out
-    System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
-    System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
-}
-
-// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
-'git config core.fileMode false'.execute()
-// Pulls version from git tag
-version = minecraftVersion + "-" + gitVersion()
-group = modGroup
-archivesBaseName = modId
+ext.CraftGuideRepo = "https://github.com/Uristqwerty/CraftGuide.git"
+ext.CraftGuideTmp = "build/tmp/CraftGuide"

 minecraft {
-    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
-    runDir = "run"
+	version = mcversion + "-" + forgeversion
+	runDir = "run"

-    if (replaceGradleTokenInFile) {
-        replaceIn replaceGradleTokenInFile
-        if(gradleTokenModId) {
-            replace gradleTokenModId, modId
-        }
-        if(gradleTokenModName) {
-            replace gradleTokenModName, modName
-        }
-        if(gradleTokenVersion) {
-            replace gradleTokenVersion, versionDetails().lastTag
-        }
-        if(gradleTokenGroupName) {
-            replace gradleTokenGroupName, modGroup
-        }
-    }
+	replace '@VERSION@', project.version
+	replace '@BUILD_NUMBER@', getBuildNumber()
 }

-if(file("addon.gradle").exists()) {
-    apply from: "addon.gradle"
-}
-
-apply from: 'repositories.gradle'
-
-configurations {
-    implementation.extendsFrom(shadowImplementation)
+sourceSets {
+	api {
+		java {
+			srcDir CraftGuideTmp + "/src"
+			include '**/CraftGuide/api/**'
+		}
+	}
+	
+	main {
+		java {
+			srcDir project.dirApi
+		}
+		resources {
+			srcDir project.dirLang
+		}
+	}
 }

 repositories {
-    maven {
-        name = "Overmind forge repo mirror"
-        url = "https://gregtech.overminddl1.com/"
-    }
-    if(usesMixins.toBoolean()) {
-        maven {
-            name = "sponge"
-            url = "https://repo.spongepowered.org/repository/maven-public"
-        }
-        maven {
-            url = "https://jitpack.io"
-        }
-    }
+	maven {
+		name = "ic2"
+		url = "http://maven.ic2.player.to/"
+	}
+}
+
+configurations {
+	apis
+	compile.extendsFrom apis
 }

 dependencies {
-    if(usesMixins.toBoolean()) {
-        annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
-        annotationProcessor("com.google.guava:guava:24.1.1-jre")
-        annotationProcessor("com.google.code.gson:gson:2.8.6")
-        annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
-        // using 0.8 to workaround a issue in 0.7 which fails mixin application
-        compile("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
-            // Mixin includes a lot of dependencies that are too up-to-date
-            exclude module: "launchwrapper"
-            exclude module: "guava"
-            exclude module: "gson"
-            exclude module: "commons-io"
-            exclude module: "log4j-core"
-        }
-        compile("com.github.GTNewHorizons:SpongeMixins:1.3.3:dev")
-    }
+	compile 'net.industrial-craft:industrialcraft-2:2.2.575-experimental:api'
+	apis 'com.mod-buildcraft:buildcraft:6.2.1:dev'
 }

-apply from: 'dependencies.gradle'
+processResources {

-def mixinConfigJson = "mixins." + modId + ".json"
-def mixingConfigRefMap = "mixins." + modId + ".refmap.json"
-def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
-def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
+	// this will ensure that this task is redone when the versions change.
+	inputs.property "version", project.version
+	inputs.property "mcversion", project.minecraft.version

-task generateAssets {
-    if(usesMixins.toBoolean()) {
-        new File(projectDir.toString() + "/src/main/resources/", mixinConfigJson).text = """{
-  "required": true,
-  "minVersion": "0.7.11",
-  "package": "${modGroup}.${mixinsPackage}",
-  "plugin": "${modGroup}.${mixinPlugin}",
-  "refmap": "${mixingConfigRefMap}",
-  "target": "@env(DEFAULT)",
-  "compatibilityLevel": "JAVA_8"
-}
+	// replace stuff in mcmod.info, nothing else
+	from(sourceSets.main.resources.srcDirs) {
+		include 'mcmod.info'

-"""
-    }
-}
+		// replace version and mcversion
+		expand 'version':project.version, 'mcversion':project.minecraft.version
+	}

-task relocateShadowJar(type: ConfigureShadowRelocation) {
-    target = tasks.shadowJar
-    prefix = modGroup + ".shadow"
-}
-
-shadowJar {
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation]
-    dependsOn(relocateShadowJar)
-}
-
-jar {
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    if(usesShadowedDependencies.toBoolean()) {
-        dependsOn(shadowJar)
-        enabled = false
-    }
-}
-
-reobf {
-    if(usesMixins.toBoolean()) {
-        addExtraSrgFile mixinSrg
-    }
-}
-
-afterEvaluate {
-    if(usesMixins.toBoolean()) {
-        tasks.compileJava {
-            options.compilerArgs += [
-                    "-AreobfSrgFile=${tasks.reobf.srg}",
-                    "-AoutSrgFile=${mixinSrg}",
-                    "-AoutRefMapFile=${refMap}",
-                    // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
-                    "-XDenableSunApiLintControl",
-                    "-XDignore.symbol.file"
-            ]
-        }
-    }
+	// copy everything else, thats not the mcmod.info
+	from(sourceSets.main.resources.srcDirs) {
+		exclude 'mcmod.info'
+		exclude '**/*.md'
+	}
 }

 runClient {
-    def arguments = []
-
-    if(usesMixins.toBoolean()) {
-        arguments += [
-                "--mods=../build/libs/$modId-${version}.jar",
-                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-        ]
-    }
-
-    if(developmentEnvironmentUserName) {
-        arguments += [
-                "--username",
-                developmentEnvironmentUserName
-        ]
-    }
-
-    args(arguments)
+	if (project.hasProperty('mcUsername')) {
+		args "--username=" + project.mcUsername
+	}
+	if (project.hasProperty('mcPassword')) {
+		args "--password=" + project.mcPassword
+	}
 }

-runServer {
-    def arguments = []
-
-    if (usesMixins.toBoolean()) {
-        arguments += [
-                "--mods=../build/libs/$modId-${version}.jar",
-                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-        ]
-    }
-
-    args(arguments)
+debugClient {
+	if (project.hasProperty('mcUsername')) {
+		args "--username=" + project.mcUsername
+	}
+	if (project.hasProperty('mcPassword')) {
+		args "--password=" + project.mcPassword
+	}
 }

-tasks.withType(JavaExec).configureEach {
-    javaLauncher.set(
-            javaToolchains.launcherFor {
-                languageVersion = projectJavaVersion
-            }
-    )
+task echoVersion << {
+	printNextVersion()
 }

-processResources
-        {
-            // this will ensure that this task is redone when the versions change.
-            inputs.property "version", project.version
-            inputs.property "mcversion", project.minecraft.version
-
-            // replace stuff in mcmod.info, nothing else
-            from(sourceSets.main.resources.srcDirs) {
-                include 'mcmod.info'
-
-                // replace version and mcversion
-                expand "minecraftVersion": project.minecraft.version,
-                        "modVersion": versionDetails().lastTag,
-                        "modId": modId,
-                        "modName": modName
-            }
-
-            // copy everything else, thats not the mcmod.info
-            from(sourceSets.main.resources.srcDirs) {
-                exclude 'mcmod.info'
-            }
-        }
-
-def getManifestAttributes() {
-    def manifestAttributes = [:]
-    if(containsMixinsAndOrCoreModOnly.toBoolean() == false) {
-        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
-    }
-
-    if(accessTransformersFile) {
-        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
-    }
-
-    if(coreModClass) {
-        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
-    }
-
-    if(usesMixins.toBoolean()) {
-        manifestAttributes += [
-                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
-                "MixinConfigs" : mixinConfigJson,
-                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
-        ]
-    }
-    return manifestAttributes
+def saveVersion() {
+	ant.propertyfile(
+		file: "application.properties") {
+		entry( key:"version_major", type:"int", value: version_major)
+		entry( key:"version_minor", type:"int", value: version_minor)
+		entry( key:"version_patch", type:"int", value: version_patch)
+	}
+	project.version = version_major + '.' + version_minor + '.' + version_patch + '.' + getBuildNumber()
+	printNextVersion()
 }

-task sourcesJar(type: Jar) {
-    from (sourceSets.main.allJava)
-    from (file("$projectDir/LICENSE"))
-    getArchiveClassifier().set('sources')
+def printNextVersion() {
+	println '*************************************************************'
+	println 'The next build will be version: ' +  project.version
+	println '*************************************************************'
 }

-task shadowDevJar(type: ShadowJar) {
-    from sourceSets.main.output
-    getArchiveClassifier().set("dev")
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation]
+task bumpMajor << {
+	project.version_major = Integer.parseInt(project.version_major) + 1
+	project.version_minor = "0"
+	project.version_patch = "0"
+	saveVersion()
 }

-task relocateShadowDevJar(type: ConfigureShadowRelocation) {
-    target = tasks.shadowDevJar
-    prefix = modGroup + ".shadow"
+task bumpMinor << {
+	project.version_minor = Integer.parseInt(project.version_minor) + 1
+	project.version_patch = "0"
+	saveVersion()
 }

-task circularResolverJar(type: Jar) {
-    dependsOn(relocateShadowDevJar)
-    dependsOn(shadowDevJar)
-    enabled = false
+task bumpPatch << {
+	project.version_patch = Integer.parseInt(project.version_patch) + 1
+	saveVersion()
 }

-task devJar(type: Jar) {
-    from sourceSets.main.output
-    getArchiveClassifier().set("dev")
+import org.ajoberstar.grgit.Grgit

-    manifest {
-        attributes(getManifestAttributes())
-    }
+task initCraftGuide << {
+	def localRepo = file(CraftGuideTmp)

-    if(usesShadowedDependencies.toBoolean()) {
-        dependsOn(circularResolverJar)
-        enabled = false
-    }
+	if (localRepo.exists()) {
+		println 'Updating CraftGuide repo'
+		def grgit = Grgit.open(localRepo)
+		grgit.pull()
+		grgit.close()
+	} else {
+		println 'Cloning CraftGuide repo'
+		def grgit = Grgit.clone(dir: localRepo, uri: CraftGuideRepo)
+		grgit.close()
+	}
 }

-task apiJar(type: Jar) {
-    from (sourceSets.main.allJava) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString() + '/**'
-    }
+jar {
+	destinationDir = file("build/tmp")
+	archiveName = "main.jar"

-    from (sourceSets.main.output) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString() + '/**'
-    }
+	from {
+		configurations.apis.collect {
+			it.isDirectory() ? it : zipTree(it).matching {
+				include '**/api/**'
+			}
+		}
+	}
+}

-    from (sourceSets.main.resources.srcDirs) {
-        include("LICENSE")
-    }
+task mainJarSigned ( type: Jar, dependsOn: 'reobf' ) {
+	from (zipTree(jar.getArchivePath())) {
+		exclude '**/api/**'
+		exclude '**/codechicken/**'
+		exclude '**/old/lang/**'
+	}

-    getArchiveClassifier().set('api')
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+	destinationDir = file("build/tmp")
+	archiveName = "signed.jar"
+
+	doLast {
+		if (project.hasProperty('signingKeystore')) {
+			ant.signjar(jar: getArchivePath(),
+				alias: signingAlias,
+				keystore: signingKeystore,
+				storepass: signingStorepass)
+		} else {
+			println 'Signing disabled, gradle.properties is missing.'
+		}
+	}
+}
+
+task mainJar ( type: Zip, dependsOn: mainJarSigned ) {
+	from (zipTree(mainJarSigned.getArchivePath())) {
+		include '**'
+	}
+
+	from (zipTree(jar.getArchivePath())) {
+		include '**'
+		exclude '**/codechicken/**'
+		exclude '**/old/lang/**'
+	}
+
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+	destinationDir = file(dirDest)
+	includeEmptyDirs = false
+	extension = 'jar'
+}
+
+task devJarSigned ( type: Jar, dependsOn: 'classes' ) {
+	from(sourceSets.main.output) {
+		exclude '**/api/**'
+		exclude '**/codechicken/**'
+		exclude '**/old/lang/**'
+	}
+
+	destinationDir = file("build/tmp")
+	archiveName = "signed-dev.jar"
+
+	doLast {
+		if (project.hasProperty('signingKeystore')) {
+			ant.signjar(jar: getArchivePath(),
+				alias: signingAlias,
+				keystore: signingKeystore,
+				storepass: signingStorepass)
+		} else {
+			println 'Signing disabled, gradle.properties is missing.'
+		}
+	}
+}
+
+task devJar ( type: Zip, dependsOn: devJarSigned ) {
+	from (zipTree(devJarSigned.getArchivePath())) {
+		include '**'
+	}
+
+	from(sourceSets.main.allSource) {
+		include '**'
+		exclude '**/codechicken/**'
+		exclude '**/old/lang/**'
+	}
+
+	from(sourceSets.main.output) {
+		include '**'
+		exclude '**/codechicken/**'
+		exclude '**/old/lang/**'
+	}
+
+	from {
+		configurations.apis.collect {
+			it.isDirectory() ? it : zipTree(it).matching {
+				include '**/api/**'
+			}
+		}
+	}
+
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+	destinationDir = file(dirDest)
+	extension = 'jar'
+
+	classifier = 'dev'
+}
+
+task apiJar(type: Jar, dependsOn: 'classes') {
+	from (dirApi) {
+		include '**'
+	}
+	
+	from (sourceSets.main.output) {
+		include 'forestry/api/**'
+	}
+	
+	destinationDir = file(dirDest)
+	extension = 'jar'
+	classifier = 'api'
+}
+
+task release(dependsOn: [apiJar, devJar, mainJar]) {
+	doLast {
+		println '*************************************************************'
+		println 'This build will be version: ' +  project.version
+		println '*************************************************************'
+	}
+}
+
+afterEvaluate {
+	compileApiJava.dependsOn initCraftGuide
 }

 artifacts {
-    archives sourcesJar
-    archives devJar
-    if(apiPackage) {
-        archives apiJar
-    }
+	archives apiJar
+	archives devJar
 }

-install{
-    repositories{
-        mavenInstaller{
-            pom.withXml {
-                def repositoriesNode = asNode().appendNode("repositories")
-                project.repositories.each { repository ->
-                    def repositoryNode = repositoriesNode.appendNode("repository")
-                    repositoryNode.appendNode("name", repository.name)
-                    repositoryNode.appendNode("url", repository.properties.get("url"))
-                }
-            }
-        }
-    }
+uploadArchives {
+	repositories {
+		if (project.hasProperty('mavenDir')) {
+			mavenDeployer {
+				repository(url: "file://"+mavenDir)
+				
+				addFilter('api') { artifact, file ->
+					file == apiJar.archivePath
+				}
+				addFilter('dev') { artifact, file ->
+					file == devJar.archivePath
+				}
+			}
+		} else {
+			println 'Archives upload disabled, gradle.properties is missing.'
+		}
+	}
 }

-// Updating
-task updateBuildScript {
-    doLast {
-        if (updateBuildScript()) return
+def loadProperties() {
+	println('loading application.properties')

-        print("Build script already up-to-date!")
-    }
+	file("application.properties").withReader { reader ->
+		def userProps = new Properties()
+		userProps.load(reader)
+
+		for (Map.Entry property in userProps) {
+			project.ext[property.getKey()] = property.getValue()
+		}
+	}
 }

-if (isNewBuildScriptVersionAvailable()) {
-    if (autoUpdateBuildScript.toBoolean()) {
-        updateBuildScript()
-    } else {
-        println("Build script update available! Run 'gradle updateBuildScript'")
-    }
+def getBuildNumber() {
+	return "$System.env.BUILD_NUMBER" != "null" ? "$System.env.BUILD_NUMBER" : "0"
 }

-static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/SinTh0r4s/ExampleMod1.7.10/main/build.gradle")
-}
-
-static boolean updateBuildScript() {
-    if (isNewBuildScriptVersionAvailable()) {
-        def buildscriptFile = new File("build.gradle")
-        availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
-        print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
-        return true
-    }
-    return false
-}
-
-static boolean isNewBuildScriptVersionAvailable() {
-    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
-
-    String currentBuildScript = new File("build.gradle").getText()
-    String currentBuildScriptHash = getVersionHash(currentBuildScript)
-    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
-    String availableBuildScriptHash = getVersionHash(availableBuildScript)
-
-    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
-    return !isUpToDate
-}
-
-static String getVersionHash(String buildScriptContent) {
-    String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
-    if(versionLine != null) {
-        return versionLine.split(": ").last()
-    }
-    return ""
-}
-
-configure(updateBuildScript) {
-    group = 'forgegradle'
-    description = 'Updates the build script to the latest version'
-}
@@ -1,6 +0,0 @@
-Account;Email;Date;
-samtrion;[email protected];2015-01-18
-GenuineSounds;[email protected];2015-02-26
-airbreather;[email protected];2015-04-10
-ganymedes01;[email protected];2015-05-27
-infinityraider;theoneandonlyraider@gmail;com;2015-10-03
@@ -1,13 +0,0 @@
-// Add your dependencies here
-
-dependencies {
-    compile("com.github.GTNewHorizons:NotEnoughItems:master-SNAPSHOT:dev")
-    compile("com.github.GTNewHorizons:inventory-tweaks:master-SNAPSHOT:api")
-
-    compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
-    compile("com.mod-buildcraft:buildcraft:7.1.23:dev")
-
-    // buildcraft shades cofh-core
-    //compileOnly("curse.maven:cofh-core-69162:2388751")
-    compileOnly("curse.maven:craftguide-75557:2459320")
-}
@@ -1,60 +0,0 @@
-modName = Forestry
-
-# This is a case-sensitive string to identify your mod. Convention is to use lower case.
-modId = Forestry
-
-modGroup = forestry
-
-# WHY is there no version field?
-# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
-# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
-
-# Will update your build.gradle automatically whenever an update is available
-autoUpdateBuildScript = false
-
-minecraftVersion = 1.7.10
-forgeVersion = 10.13.4.1614
-
-# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you
-# restart Minecraft in development. Choose this dependent on your mod:
-# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
-# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
-developmentEnvironmentUserName = "Developer"
-
-# Define a source file of your project with:
-# public static final String VERSION = "GRADLETOKEN_VERSION";
-# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's
-# version in @Mod([...], version = VERSION, [...])
-# Leave these properties empty to skip individual token replacements
-replaceGradleTokenInFile = Constants.java
-gradleTokenModId =
-gradleTokenModName =
-gradleTokenVersion = GRADLETOKEN_VERSION
-gradleTokenGroupName =
-
-# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can
-# leave this property empty.
-# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
-apiPackage = api
-
-# Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/
-# Example value: mymodid_at.cfg
-accessTransformersFile =
-
-# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
-usesMixins = false
-# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
-mixinPlugin =
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
-mixinsPackage =
-# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
-# This parameter is for legacy compatability only
-# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
-coreModClass =
-# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
-# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
-containsMixinsAndOrCoreModOnly = false
-
-# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
-# responsibility check the licence and request permission for distribution, if required.
-usesShadowedDependencies = false
@@ -1,5 +1,6 @@
+#Wed Jul 02 15:54:47 CDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
@@ -1,20 +1,4 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+#!/usr/bin/env bash

 ##############################################################################
 ##
@@ -22,6 +6,47 @@
 ##
 ##############################################################################

+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -36,49 +61,9 @@ while [ -h "$PRG" ] ; do
    fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
+cd "`dirname \"$PRG\"`/" >&-
 APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
+cd "$SAVED" >&-

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

@@ -105,7 +90,7 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
    MAX_FD_LIMIT=`ulimit -H -n`
    if [ $? -eq 0 ] ; then
        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -125,11 +110,10 @@ if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi

-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`

    # We build the pattern for arguments to be converted via cygpath
    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -170,19 +154,11 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
 }
-APP_ARGS=$(save "$@")
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -24,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal

+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

@@ -62,9 +46,10 @@ echo location of your Java installation.
 goto fail

 :init
-@rem Get command-line arguments, handling Windows variants
+@rem Get command-line arguments, handling Windowz variants

 if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args

 :win9xME_args
@rem Slurp the command line arguments.
@@ -75,6 +60,11 @@ set _SKIP=2
 if "x%~1" == "x" goto execute

 set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$

 :execute
@rem Setup the command line
@@ -1,2 +0,0 @@
-before_install:
-  - ./gradlew setupCIWorkspace
@@ -1,18 +0,0 @@
-// Add any additional repositiroes for your dependencies here
-
-repositories {
-    maven {
-        name = "ic2"
-        url = "http://maven.ic2.player.to/"
-        metadataSources {
-            mavenPom()
-            artifact()
-        }
-    }
-    maven {
-        url "https://cursemaven.com"
-    }
-    maven {
-        url = "https://jitpack.io"
-    }
-}
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2013 "Erogenous Beef"
+Copyright (c) 2014 ChickenBones

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:

-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
@@ -0,0 +1,38 @@
+package codechicken.nei;
+
+public class VisiblityData
+{
+    public boolean showUtilityButtons = true;
+    public boolean showStateButtons = true;
+    /**
+     * Item panel and associated buttons
+     */
+    public boolean showItemPanel = true;
+    /**
+     * Item and search section
+     */
+    public boolean showItemSection = true;
+    /**
+     * Dropdown and Item search field
+     */
+    public boolean showSearchSection = true;
+    /**
+     * All widgets except options button
+     */
+    public boolean showWidgets = true;
+    /**
+     * The entire NEI interface, aka hidden
+     */
+    public boolean showNEI = true;
+    public boolean enableDeleteMode = true;
+    
+    public void translateDependancies()
+    {
+        if(!showNEI)
+            showWidgets = false;
+        if(!showWidgets)
+            showItemSection = showUtilityButtons = showStateButtons = false;
+        if(!showItemSection)
+            showSearchSection = showItemPanel = false;
+    }
+}
@@ -0,0 +1,49 @@
+package codechicken.nei.api;
+
+import codechicken.nei.VisiblityData;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.item.ItemStack;
+
+import java.util.List;
+
+/**
+ * If this is implemented on a gui, it will be automatically registered
+ */
+public interface INEIGuiHandler
+{
+    public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility);
+    
+    /**
+     * NEI will give the specified item to the InventoryRange returned if the player's inventory is full.
+     * return null for no range
+     */
+    public Iterable<Integer> getItemSpawnSlots(GuiContainer gui, ItemStack item);
+    
+    /**
+     * @return A list of TaggedInventoryAreas that will be used with the savestates.
+     */
+    public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui);
+    
+    /**
+     * Handles clicks while an itemstack has been dragged from the item panel. Use this to set configurable slots and the like. 
+     * Changes made to the stackSize of the dragged stack will be kept
+     * @param gui The current gui instance
+     * @param mousex The x position of the mouse
+     * @param mousey The y position of the mouse
+     * @param draggedStack The stack being dragged from the item panel
+     * @param button The button presed
+     * @return True if the drag n drop was handled. False to resume processing through other routes. The held stack will be deleted if draggedStack.stackSize == 0
+     */
+    public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button);
+    
+    /**
+     * Used to prevent the item panel from drawing on top of other gui elements.
+     * This function will also be called with a 1x1 size rectangle on the mouse position for determining if the given coordinate should override item panel functions such as scrolling
+     * @param x The x coordinate of the rectangle bounding the slot
+     * @param y The y coordinate of the rectangle bounding the slot
+     * @param w The w coordinate of the rectangle bounding the slot
+     * @param h The h coordinate of the rectangle bounding the slot
+     * @return true if the item panel slot within the specified rectangle should not be rendered.
+     */
+    public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h);
+}
@@ -0,0 +1,48 @@
+package codechicken.nei.api;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
+import java.util.HashSet;
+
+public class TaggedInventoryArea
+{
+    public HashSet<Integer> slots = new HashSet<Integer>();
+    public String tagName;
+    /**
+     * Only for player inventories.
+     */
+    private IInventory inventory;
+    /**
+     * Other inventories
+     */
+    private Container container;
+    
+    public TaggedInventoryArea(InventoryPlayer invPlayer)
+    {
+        this("InventoryPlayer", 0, 39, null);
+        inventory = invPlayer;
+    }
+    
+    public TaggedInventoryArea(String name, int first, int last, Container container)
+    {
+        this.container = container;
+        tagName = name;
+        for(int i = first; i <= last; i++)
+            slots.add(i);
+    }
+
+    public ItemStack getStackInSlot(int i)
+    {
+        if(inventory != null)
+            return inventory.getStackInSlot(i);
+        return container.getSlot(i).getStack();
+    }
+    
+    public boolean isContainer()
+    {
+        return inventory == null;
+    }
+}
@@ -0,0 +1,11 @@
+package cofh.api;
+
+public class CoFHAPIProps {
+
+	private CoFHAPIProps() {
+
+	}
+
+	public static final String VERSION = "1.7.10R1.0.1";
+
+}
@@ -0,0 +1,158 @@
+package cofh.api.energy;
+
+import net.minecraft.nbt.NBTTagCompound;
+
+/**
+ * Reference implementation of {@link IEnergyStorage}. Use/extend this or implement your own.
+ * 
+ * @author King Lemming
+ * 
+ */
+public class EnergyStorage implements IEnergyStorage {
+
+	protected int energy;
+	protected int capacity;
+	protected int maxReceive;
+	protected int maxExtract;
+
+	public EnergyStorage(int capacity) {
+
+		this(capacity, capacity, capacity);
+	}
+
+	public EnergyStorage(int capacity, int maxTransfer) {
+
+		this(capacity, maxTransfer, maxTransfer);
+	}
+
+	public EnergyStorage(int capacity, int maxReceive, int maxExtract) {
+
+		this.capacity = capacity;
+		this.maxReceive = maxReceive;
+		this.maxExtract = maxExtract;
+	}
+
+	public EnergyStorage readFromNBT(NBTTagCompound nbt) {
+
+		this.energy = nbt.getInteger("Energy");
+
+		if (energy > capacity) {
+			energy = capacity;
+		}
+		return this;
+	}
+
+	public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
+
+		if (energy < 0) {
+			energy = 0;
+		}
+		nbt.setInteger("Energy", energy);
+		return nbt;
+	}
+
+	public void setCapacity(int capacity) {
+
+		this.capacity = capacity;
+
+		if (energy > capacity) {
+			energy = capacity;
+		}
+	}
+
+	public void setMaxTransfer(int maxTransfer) {
+
+		setMaxReceive(maxTransfer);
+		setMaxExtract(maxTransfer);
+	}
+
+	public void setMaxReceive(int maxReceive) {
+
+		this.maxReceive = maxReceive;
+	}
+
+	public void setMaxExtract(int maxExtract) {
+
+		this.maxExtract = maxExtract;
+	}
+
+	public int getMaxReceive() {
+
+		return maxReceive;
+	}
+
+	public int getMaxExtract() {
+
+		return maxExtract;
+	}
+
+	/**
+	 * This function is included to allow for server -&gt; client sync. Do not call this externally to the containing Tile Entity, as not all IEnergyHandlers are
+	 * guaranteed to have it.
+	 * 
+	 * @param energy
+	 */
+	public void setEnergyStored(int energy) {
+
+		this.energy = energy;
+
+		if (this.energy > capacity) {
+			this.energy = capacity;
+		} else if (this.energy < 0) {
+			this.energy = 0;
+		}
+	}
+
+	/**
+	 * This function is included to allow the containing tile to directly and efficiently modify the energy contained in the EnergyStorage. Do not rely on this
+	 * externally, as not all IEnergyHandlers are guaranteed to have it.
+	 * 
+	 * @param energy
+	 */
+	public void modifyEnergyStored(int energy) {
+
+		this.energy += energy;
+
+		if (this.energy > capacity) {
+			this.energy = capacity;
+		} else if (this.energy < 0) {
+			this.energy = 0;
+		}
+	}
+
+	/* IEnergyStorage */
+	@Override
+	public int receiveEnergy(int maxReceive, boolean simulate) {
+
+		int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
+
+		if (!simulate) {
+			energy += energyReceived;
+		}
+		return energyReceived;
+	}
+
+	@Override
+	public int extractEnergy(int maxExtract, boolean simulate) {
+
+		int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
+
+		if (!simulate) {
+			energy -= energyExtracted;
+		}
+		return energyExtracted;
+	}
+
+	@Override
+	public int getEnergyStored() {
+
+		return energy;
+	}
+
+	@Override
+	public int getMaxEnergyStored() {
+
+		return capacity;
+	}
+
+}
@@ -0,0 +1,21 @@
+package cofh.api.energy;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+/**
+ * Implement this interface on TileEntities which should connect to energy transportation blocks. This is intended for blocks which generate energy but do not
+ * accept it; otherwise just use IEnergyHandler.
+ * 
+ * Note that {@link IEnergyHandler} is an extension of this.
+ * 
+ * @author King Lemming
+ * 
+ */
+public interface IEnergyConnection {
+
+	/**
+	 * Returns TRUE if the TileEntity can connect on a given side.
+	 */
+	boolean canConnectEnergy(ForgeDirection from);
+
+}
@@ -0,0 +1,52 @@
+package cofh.api.energy;
+
+import net.minecraft.item.ItemStack;
+
+/**
+ * Implement this interface on Item classes that support external manipulation of their internal energy storages.
+ * 
+ * A reference implementation is provided {@link ItemEnergyContainer}.
+ * 
+ * @author King Lemming
+ * 
+ */
+public interface IEnergyContainerItem {
+
+	/**
+	 * Adds energy to a container item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged.
+	 * 
+	 * @param container
+	 *            ItemStack to be charged.
+	 * @param maxReceive
+	 *            Maximum amount of energy to be sent into the item.
+	 * @param simulate
+	 *            If TRUE, the charge will only be simulated.
+	 * @return Amount of energy that was (or would have been, if simulated) received by the item.
+	 */
+	int receiveEnergy(ItemStack container, int maxReceive, boolean simulate);
+
+	/**
+	 * Removes energy from a container item. Returns the quantity of energy that was removed. This should always return 0 if the item cannot be externally
+	 * discharged.
+	 * 
+	 * @param container
+	 *            ItemStack to be discharged.
+	 * @param maxExtract
+	 *            Maximum amount of energy to be extracted from the item.
+	 * @param simulate
+	 *            If TRUE, the discharge will only be simulated.
+	 * @return Amount of energy that was (or would have been, if simulated) extracted from the item.
+	 */
+	int extractEnergy(ItemStack container, int maxExtract, boolean simulate);
+
+	/**
+	 * Get the amount of energy currently stored in the container item.
+	 */
+	int getEnergyStored(ItemStack container);
+
+	/**
+	 * Get the max amount of energy that can be stored in the container item.
+	 */
+	int getMaxEnergyStored(ItemStack container);
+
+}
@@ -0,0 +1,51 @@
+package cofh.api.energy;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+/**
+ * Implement this interface on Tile Entities which should handle energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
+ * 
+ * A reference implementation is provided {@link TileEnergyHandler}.
+ * 
+ * @author King Lemming
+ * 
+ */
+public interface IEnergyHandler extends IEnergyConnection {
+
+	/**
+	 * Add energy to an IEnergyHandler, internal distribution is left entirely to the IEnergyHandler.
+	 * 
+	 * @param from
+	 *            Orientation the energy is received from.
+	 * @param maxReceive
+	 *            Maximum amount of energy to receive.
+	 * @param simulate
+	 *            If TRUE, the charge will only be simulated.
+	 * @return Amount of energy that was (or would have been, if simulated) received.
+	 */
+	int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate);
+
+	/**
+	 * Remove energy from an IEnergyHandler, internal distribution is left entirely to the IEnergyHandler.
+	 * 
+	 * @param from
+	 *            Orientation the energy is extracted from.
+	 * @param maxExtract
+	 *            Maximum amount of energy to extract.
+	 * @param simulate
+	 *            If TRUE, the extraction will only be simulated.
+	 * @return Amount of energy that was (or would have been, if simulated) extracted.
+	 */
+	int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate);
+
+	/**
+	 * Returns the amount of energy currently stored.
+	 */
+	int getEnergyStored(ForgeDirection from);
+
+	/**
+	 * Returns the maximum amount of energy that can be stored.
+	 */
+	int getMaxEnergyStored(ForgeDirection from);
+
+}
@@ -0,0 +1,45 @@
+package cofh.api.energy;
+
+/**
+ * An energy storage is the unit of interaction with Energy inventories.
+ * 
+ * A reference implementation can be found at {@link EnergyStorage}.
+ * 
+ * @author King Lemming
+ * 
+ */
+public interface IEnergyStorage {
+
+	/**
+	 * Adds energy to the storage. Returns quantity of energy that was accepted.
+	 * 
+	 * @param maxReceive
+	 *            Maximum amount of energy to be inserted.
+	 * @param simulate
+	 *            If TRUE, the insertion will only be simulated.
+	 * @return Amount of energy that was (or would have been, if simulated) accepted by the storage.
+	 */
+	int receiveEnergy(int maxReceive, boolean simulate);
+
+	/**
+	 * Removes energy from the storage. Returns quantity of energy that was removed.
+	 * 
+	 * @param maxExtract
+	 *            Maximum amount of energy to be extracted.
+	 * @param simulate
+	 *            If TRUE, the extraction will only be simulated.
+	 * @return Amount of energy that was (or would have been, if simulated) extracted from the storage.
+	 */
+	int extractEnergy(int maxExtract, boolean simulate);
+
+	/**
+	 * Returns the amount of energy currently stored.
+	 */
+	int getEnergyStored();
+
+	/**
+	 * Returns the maximum amount of energy that can be stored.
+	 */
+	int getMaxEnergyStored();
+
+}
@@ -0,0 +1,110 @@
+package cofh.api.energy;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+/**
+ * Reference implementation of {@link IEnergyContainerItem}. Use/extend this or implement your own.
+ * 
+ * @author King Lemming
+ * 
+ */
+public class ItemEnergyContainer extends Item implements IEnergyContainerItem {
+
+	protected int capacity;
+	protected int maxReceive;
+	protected int maxExtract;
+
+	public ItemEnergyContainer() {
+
+	}
+
+	public ItemEnergyContainer(int capacity) {
+
+		this(capacity, capacity, capacity);
+	}
+
+	public ItemEnergyContainer(int capacity, int maxTransfer) {
+
+		this(capacity, maxTransfer, maxTransfer);
+	}
+
+	public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) {
+
+		this.capacity = capacity;
+		this.maxReceive = maxReceive;
+		this.maxExtract = maxExtract;
+	}
+
+	public ItemEnergyContainer setCapacity(int capacity) {
+
+		this.capacity = capacity;
+		return this;
+	}
+
+	public void setMaxTransfer(int maxTransfer) {
+
+		setMaxReceive(maxTransfer);
+		setMaxExtract(maxTransfer);
+	}
+
+	public void setMaxReceive(int maxReceive) {
+
+		this.maxReceive = maxReceive;
+	}
+
+	public void setMaxExtract(int maxExtract) {
+
+		this.maxExtract = maxExtract;
+	}
+
+	/* IEnergyContainerItem */
+	@Override
+	public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) {
+
+		if (container.stackTagCompound == null) {
+			container.stackTagCompound = new NBTTagCompound();
+		}
+		int energy = container.stackTagCompound.getInteger("Energy");
+		int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
+
+		if (!simulate) {
+			energy += energyReceived;
+			container.stackTagCompound.setInteger("Energy", energy);
+		}
+		return energyReceived;
+	}
+
+	@Override
+	public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) {
+
+		if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) {
+			return 0;
+		}
+		int energy = container.stackTagCompound.getInteger("Energy");
+		int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
+
+		if (!simulate) {
+			energy -= energyExtracted;
+			container.stackTagCompound.setInteger("Energy", energy);
+		}
+		return energyExtracted;
+	}
+
+	@Override
+	public int getEnergyStored(ItemStack container) {
+
+		if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) {
+			return 0;
+		}
+		return container.stackTagCompound.getInteger("Energy");
+	}
+
+	@Override
+	public int getMaxEnergyStored(ItemStack container) {
+
+		return capacity;
+	}
+
+}
@@ -0,0 +1,62 @@
+package cofh.api.energy;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
+
+/**
+ * Reference implementation of {@link IEnergyHandler}. Use/extend this or implement your own.
+ * 
+ * @author King Lemming
+ * 
+ */
+public class TileEnergyHandler extends TileEntity implements IEnergyHandler {
+
+	protected final EnergyStorage storage = new EnergyStorage(32000);
+
+	@Override
+	public void readFromNBT(NBTTagCompound nbt) {
+
+		super.readFromNBT(nbt);
+		storage.readFromNBT(nbt);
+	}
+
+	@Override
+	public void writeToNBT(NBTTagCompound nbt) {
+
+		super.writeToNBT(nbt);
+		storage.writeToNBT(nbt);
+	}
+
+	/* IEnergyHandler */
+	@Override
+	public boolean canConnectEnergy(ForgeDirection from) {
+
+		return true;
+	}
+
+	@Override
+	public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
+
+		return storage.receiveEnergy(maxReceive, simulate);
+	}
+
+	@Override
+	public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
+
+		return storage.extractEnergy(maxExtract, simulate);
+	}
+
+	@Override
+	public int getEnergyStored(ForgeDirection from) {
+
+		return storage.getEnergyStored();
+	}
+
+	@Override
+	public int getMaxEnergyStored(ForgeDirection from) {
+
+		return storage.getMaxEnergyStored();
+	}
+
+}
@@ -0,0 +1,10 @@
+/**
+ * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub
+ * http://www.teamcofh.com
+ */
+@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|energy")
+package cofh.api.energy;
+
+import cofh.api.CoFHAPIProps;
+import cpw.mods.fml.common.API;
+
@@ -0,0 +1,9 @@
+/**
+ * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub
+ * http://www.teamcofh.com
+ */
+@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHLib", provides = "CoFHAPI")
+package cofh.api;
+
+import cpw.mods.fml.common.API;
+
@@ -4,51 +4,43 @@
 * are made available under the terms of the GNU Lesser Public License v3
 * which accompanies this distribution, and is available at
 * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
+ * 
 * Various Contributors including, but not limited to:
 * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
 ******************************************************************************/
 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.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
 import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
 import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.GameRegistry.Type;
-
-import 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.api.fuels.EngineBronzeFuel;
+import forestry.api.fuels.EngineCopperFuel;
+import forestry.api.fuels.FermenterFuel;
+import forestry.api.fuels.FuelManager;
+import forestry.api.fuels.GeneratorFuel;
+import forestry.api.fuels.MoistenerFuel;
+import forestry.api.fuels.RainSubstrate;
+import forestry.core.ForestryCore;
+import forestry.core.config.Defaults;
+import forestry.core.config.ForestryItem;
 import forestry.core.config.Version;
-import forestry.core.errors.EnumErrorCode;
-import forestry.core.errors.ErrorStateRegistry;
-import forestry.core.gui.GuiHandler;
-import forestry.core.multiblock.MultiblockEventHandler;
 import forestry.core.network.PacketHandler;
 import forestry.core.proxy.Proxies;
-import forestry.core.utils.Log;
+import forestry.core.utils.FluidMap;
+import forestry.core.utils.ItemStackMap;
 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;

 /**
 * Forestry Minecraft Mod
@@ -56,106 +48,103 @@ 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 = Defaults.MOD,
+		name = "Forestry",
+		version = Version.VERSION,
+		dependencies = "required-after:Forge@[10.13.0.1207,);"
+		+ "after:Buildcraft|Core@[6.1.7,);"
+		+ "after:ExtrabiomesXL;"
+		+ "after:BiomesOPlenty;"
+		+ "after:IC2@[2.0.140,)")
+//, certificateFingerprint = Version.FINGERPRINT)
 public class Forestry {

-	@Mod.Instance(Constants.MOD)
+	@Mod.Instance(Defaults.MOD)
 	public static Forestry instance;
 	private File configFolder;

 	public Forestry() {
-		ForestryAPI.instance = this;
-		ForestryAPI.climateManager = new ClimateManager();
-		ForestryAPI.forestryConstants = new Constants();
-		ForestryAPI.errorStateRegistry = new ErrorStateRegistry();
-		EnumErrorCode.init();
+		FuelManager.fermenterFuel = new ItemStackMap<FermenterFuel>();
+		FuelManager.moistenerResource = new ItemStackMap<MoistenerFuel>();
+		FuelManager.rainSubstrate = new ItemStackMap<RainSubstrate>();
+		FuelManager.bronzeEngineFuel = new FluidMap<EngineBronzeFuel>();
+		FuelManager.copperEngineFuel = new ItemStackMap<EngineCopperFuel>();
+		FuelManager.generatorFuel = new FluidMap<GeneratorFuel>();
 	}
-
+	@SidedProxy(clientSide = "forestry.core.ForestryClient", serverSide = "forestry.core.ForestryCore")
+	public static ForestryCore core = new ForestryCore();
 	public static PacketHandler packetHandler;

 	@EventHandler
 	public void preInit(FMLPreInitializationEvent event) {
 		packetHandler = new PacketHandler();
-
-		// Register event handler
-		EventHandlerCore eventHandlerCore = new EventHandlerCore();
-		MinecraftForge.EVENT_BUS.register(eventHandlerCore);
-		FMLCommonHandler.instance().bus().register(eventHandlerCore);
-		MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler());
-
+		
 		configFolder = new File(event.getModConfigurationDirectory(), "forestry");
-		Config.load();

-		PluginManager.runSetup();
-
-		ForestryAPI.activeMode = new GameMode(Config.gameMode);
-
-		PluginManager.runPreInit();
+		core.preInit(event.getSourceFile(), this);
 	}

 	@EventHandler
 	public void init(FMLInitializationEvent event) {
-		// Register gui handler
-		NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
-
-		PluginManager.runInit();
+		core.init(this);
 	}

 	@EventHandler
 	public void postInit(FMLPostInitializationEvent event) {
-		PluginManager.runPostInit();
-
-		// Register world generator
-		WorldGenerator worldGenerator = new WorldGenerator();
-		GameRegistry.registerWorldGenerator(worldGenerator, 0);
-
-		// Register tick handlers
-		Proxies.common.registerTickHandlers(worldGenerator);
-
-		// Handle IMC messages.
-		PluginManager.processIMCMessages(FMLInterModComms.fetchRuntimeMessages(ForestryAPI.instance));
+		core.postInit();
 	}

 	@EventHandler
 	public void serverStarting(FMLServerStartingEvent event) {
-		PluginManager.serverStarting(event.getServer());
+		core.serverStarting(event.getServer());
 	}

 	public File getConfigFolder() {
 		return configFolder;
 	}
+	/*@EventHandler
+	 public void fingerprintWarning(FMLFingerprintViolationEvent event) {
+	 Proxies.log.info("Fingerprint of the mod jar is invalid. The jar file was tampered with.");
+	 FMLInterModComms.sendMessage("Railcraft", "securityViolation", "Fingerprint of jar file did not match.");
+	 FMLInterModComms.sendMessage("Thaumcraft", "securityViolation", "Fingerprint of jar file did not match.");
+	 FMLInterModComms.sendMessage("IC2", "securityViolation", "Fingerprint of jar file did not match.");
+	 }*/

 	@EventHandler
 	public void processIMCMessages(IMCEvent event) {
-		PluginManager.processIMCMessages(event.getMessages());
+		core.processIMCMessages(event.getMessages());
 	}

 	@EventHandler
 	public void missingMapping(FMLMissingMappingsEvent event) {
-		for (MissingMapping mapping : event.get()) {
+		for (MissingMapping mapping : event.get())
 			if (mapping.type == Type.BLOCK) {
-				Block block = GameRegistry.findBlock(Constants.MOD, StringUtil.cleanTags(mapping.name));
+				Block block = GameRegistry.findBlock(Defaults.MOD, StringUtil.cleanTags(mapping.name));
 				if (block != null) {
 					mapping.remap(block);
-					Log.warning("Remapping block " + mapping.name + " to " + StringUtil.cleanBlockName(block));
+					Proxies.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));
+				Block block = GameRegistry.findBlock(Defaults.MOD, StringUtil.cleanTags(mapping.name));
+				if (block != null) {
+					mapping.remap(Item.getItemFromBlock(block));
+					Proxies.log.warning("Remapping item " + mapping.name + " to " + StringUtil.cleanBlockName(block));
+				} else if (mapping.name.equals("Forestry:builderBackpack")) {
+					mapping.remap(ForestryItem.builderBackpack.item());
+					Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.builderBackpack.name());
+				} else if (mapping.name.equals("Forestry:builderBackpackT2")) {
+					mapping.remap(ForestryItem.builderBackpackT2.item());
+					Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.builderBackpackT2.name());
+				} else if (mapping.name.equals("Forestry:adventurerBackpack")) {
+					mapping.remap(ForestryItem.adventurerBackpack.item());
+					Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.adventurerBackpack.name());
+				} else if (mapping.name.equals("Forestry:adventurerBackpackT2")) {
+					mapping.remap(ForestryItem.adventurerBackpackT2.item());
+					Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.adventurerBackpackT2.name());
+				} else if (mapping.name.equals("Forestry:shortMead")) {
+					mapping.remap(ForestryItem.beverage.item());
+					Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.beverage.name());
 				}
 			}
-		}
 	}
 }
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * 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;
-
-	/**
-	 * 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;
-
-	/**
-	 * Used to create new bees.
-	 */
-	public static IBeeFactory beeFactory;
-
-	/**
-	 * Used to create new bee mutations.
-	 */
-	public static IBeeMutationFactory beeMutationFactory;
-
-	/**
-	 * Used to get Forestry's jubilance implementations.
-	 */
-	public static IJubilanceFactory jubilanceFactory;
-
-	/**
-	 * Used to check whether a player is wearing Apiarist Armor.
-	 */
-	public static IArmorApiaristHelper armorApiaristHelper;
-}
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import forestry.api.genetics.IIndividual;
-
-/**
- * Easily extendable default IBeeListener.
- * By itself, this IBeeListener does nothing.
- * BeeListeners should inherit from this class unless they need to listen for everything.
- */
-public class DefaultBeeListener implements IBeeListener {
-	@Override
-	public void wearOutEquipment(int amount) {
-
-	}
-
-	@Override
-	public void onQueenDeath() {
-
-	}
-
-	@Override
-	public boolean onPollenRetrieved(IIndividual pollen) {
-		return false;
-	}
-
-}
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- * 
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-/**
- * Easily extendable default IBeeModifier.
- * By itself, this IBeeModifier does nothing.
- * BeeModifiers should inherit from this class unless they modify everything.
- */
-public class DefaultBeeModifier implements IBeeModifier {
-
-	public float getTerritoryModifier(IBeeGenome genome, 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 getProductionModifier(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 boolean isSealed() {
-		return false;
-	}
-
-	public boolean isSelfLighted() {
-		return false;
-	}
-
-	public boolean isSunlightSimulated() {
-		return false;
-	}
-
-	public boolean isHellish() {
-		return false;
-	}
-
-}
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- * 
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import java.util.Locale;
-
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IAlleleArea;
-import forestry.api.genetics.IAlleleBoolean;
-import forestry.api.genetics.IAlleleFloat;
-import forestry.api.genetics.IAlleleFlowers;
-import forestry.api.genetics.IAlleleInteger;
-import forestry.api.genetics.IAlleleTolerance;
-import forestry.api.genetics.IChromosomeType;
-import forestry.api.genetics.ISpeciesRoot;
-
-/**
- * Enum representing the order of chromosomes in a bee's genome and what they control.
- * 
- * @author SirSengir
- */
-public enum EnumBeeChromosome implements IChromosomeType {
-	/**
-	 * Species of the bee. Alleles here must implement {@link IAlleleBeeSpecies}.
-	 */
-	SPECIES(IAlleleBeeSpecies.class),
-	/**
-	 * (Production) Speed of the bee.
-	 */
-	SPEED(IAlleleFloat.class),
-	/**
-	 * Lifespan of the bee.
-	 */
-	LIFESPAN(IAlleleInteger.class),
-	/**
-	 * Fertility of the bee. Determines number of offspring.
-	 */
-	FERTILITY(IAlleleInteger.class),
-	/**
-	 * Temperature difference to its native supported one the bee can tolerate.
-	 */
-	TEMPERATURE_TOLERANCE(IAlleleTolerance.class),
-	/**
-	 * Slightly incorrectly named. If true, a naturally dirunal bee can work during the night. If true, a naturally nocturnal bee can work during the day.
-	 */
-	NOCTURNAL(IAlleleBoolean.class),
-	/**
-	 * Not used / superseded by fixed values for the species. Probably going to be replaced with a boolean for FIRE_RESIST.
-	 */
-	@Deprecated
-	HUMIDITY(IAllele.class),
-	/**
-	 * Humidity difference to its native supported one the bee can tolerate.
-	 */
-	HUMIDITY_TOLERANCE(IAlleleTolerance.class),
-	/**
-	 * If true the bee can work during rain.
-	 */
-	TOLERANT_FLYER(IAlleleBoolean.class),
-	/**
-	 * If true, the bee can work without a clear view of the sky.
-	 */
-	CAVE_DWELLING(IAlleleBoolean.class),
-	/**
-	 * Contains the supported flower provider.
-	 */
-	FLOWER_PROVIDER(IAlleleFlowers.class),
-	/**
-	 * Determines pollination speed.
-	 */
-	FLOWERING(IAlleleInteger.class),
-	/**
-	 * Determines the size of the bee's territory.
-	 */
-	TERRITORY(IAlleleArea.class),
-	/**
-	 * Determines the bee's effect.
-	 */
-	EFFECT(IAlleleBeeEffect.class);
-	
-	Class<? extends IAllele> clss;
-	
-	EnumBeeChromosome(Class<? extends IAllele> clss) {
-		this.clss = clss;
-	}
-
-	@Override
-	public Class<? extends IAllele> getAlleleClass() {
-		return clss;
-	}
-
-	@Override
-	public String getName() {
-		return this.toString().toLowerCase(Locale.ENGLISH);
-	}
-
-	@Override
-	public ISpeciesRoot getSpeciesRoot() {
-		return BeeManager.beeRoot;
-	}
-}
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- * 
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import java.util.Locale;
-
-import forestry.api.genetics.ISpeciesType;
-
-public enum EnumBeeType implements ISpeciesType {
-	DRONE, PRINCESS, QUEEN, LARVAE, NONE;
-
-	public static final EnumBeeType[] VALUES = values();
-
-	String name;
-
-	EnumBeeType() {
-		this.name = this.toString().toLowerCase(Locale.ENGLISH);
-	}
-
-	public String getName() {
-		return name;
-	}
-}
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * 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.item.ItemStack;
-
-import forestry.api.genetics.IFlowerRegistry;
-
-public class FlowerManager {
-	/** 
-	 * <blockquote><pre>e.g. FlowerManager.flowerRegister.registerPlantableFlower(new ItemStack(Blocks.red_flower), 1.0, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);</pre></blockquote>
-	 */
-	public static IFlowerRegistry flowerRegistry;
-
-	public static final String FlowerTypeVanilla = "flowersVanilla";
-	public static final String FlowerTypeNether = "flowersNether";
-	public static final String FlowerTypeCacti = "flowersCacti";
-	public static final String FlowerTypeMushrooms = "flowersMushrooms";
-	public static final String FlowerTypeEnd = "flowersEnd";
-	public static final String FlowerTypeJungle = "flowersJungle";
-	public static final String FlowerTypeSnow = "flowersSnow";
-	public static final String FlowerTypeWheat = "flowersWheat";
-	public static final String FlowerTypeGourd = "flowersGourd";
-
-	/**
-	 * @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>();
-}
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- * 
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import forestry.api.genetics.IAlleleEffect;
-import forestry.api.genetics.IEffectData;
-
-public interface IAlleleBeeEffect extends IAlleleEffect {
-	
-	/**
-	 * Called by apiaries to cause an effect in the world.
-	 * 
-	 * @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);
-	
-}
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import java.util.Map;
-
-import net.minecraft.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 true if this species is only active at night.
-	 */
-	boolean isNocturnal();
-
-	/**
-	 * @return Map of possible products with the chance for drop each bee cycle. (0 - 1]
-	 */
-	Map<ItemStack, Float> getProductChances();
-
-	/**
-	 * @return Map of possible specialities with the chance for drop each bee cycle. (0 - 1]
-	 */
-	Map<ItemStack, Float> getSpecialtyChances();
-
-	/**
-	 * Only jubilant bees produce specialities.
-	 * @return true if the bee is jubilant, false otherwise.
-	 */
-	boolean isJubilant(IBeeGenome genome, IBeeHousing housing);
-
-	@SideOnly(Side.CLIENT)
-	IIcon getIcon(EnumBeeType type, int renderPass);
-
-	/**
-	 * @deprecated since Forestry 3.6.
-	 * @return Path of the texture to use for entity rendering.
-	 */
-	@Deprecated
-	String getEntityTexture();
-
-}
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import net.minecraft.item.ItemStack;
-
-import forestry.api.genetics.IAlleleSpeciesCustom;
-
-public interface IAlleleBeeSpeciesCustom extends IAlleleBeeSpecies, IAlleleSpeciesCustom {
-
-	/**
-	 * Add a product for this bee species.
-	 * Chance is between 0 and 1.
-	 */
-	IAlleleBeeSpeciesCustom addProduct(ItemStack product, Float chance);
-
-	/**
-	 * Add a 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);
-
-	/**
-	 * 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 icon colours for bees (other than the default static primary + secondary colours). */
-	IAlleleBeeSpeciesCustom setCustomBeeIconColourProvider(IBeeIconColourProvider beeIconColourProvider);
-}
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- * 
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import forestry.api.genetics.IBreedingTracker;
-import forestry.api.genetics.IIndividual;
-
-/**
- * Can be used to garner information on bee breeding. See {@link forestry.api.genetics.ISpeciesRoot} for retrieval functions.
- * 
- * @author SirSengir
- */
-public interface IApiaristTracker extends IBreedingTracker {
-
-	/**
-	 * Register the birth of a queen. Will mark species as discovered.
-	 * 
-	 * @param queen
-	 *            Created queen.
-	 */
-	void registerQueen(IIndividual queen);
-
-	/**
-	 * @return Amount of queens bred with this tracker.
-	 */
-	int getQueenCount();
-
-	/**
-	 * Register the birth of a princess. Will mark species as discovered.
-	 * 
-	 * @param princess
-	 *            Created princess.
-	 */
-	void registerPrincess(IIndividual princess);
-
-	/**
-	 * @return Amount of princesses bred with this tracker.
-	 */
-	int getPrincessCount();
-
-	/**
-	 * Register the birth of a drone. Will mark species as discovered.
-	 * 
-	 * @param drone
-	 *            Created drone.
-	 */
-	void registerDrone(IIndividual drone);
-
-	/**
-	 * @return Amount of drones bred with this tracker.
-	 */
-	int getDroneCount();
-
-}
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- * 
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-/**
- * When implemented by armor piece items, allows them to act as apiarist's armor.
- */
-public interface IArmorApiarist {
-	/**
-	 * Called when the apiarist's armor acts as protection against an attack.
-	 *
-	 * @param entity Entity being attacked
-	 * @param armor Armor item
-	 * @param cause  Optional cause of attack, such as a bee effect identifier
-	 * @param doProtect Whether or not to actually do the side effects of protection
-	 * @return Whether or not the armor should protect the player from that attack
-	 */
-	boolean protectEntity(EntityLivingBase entity, ItemStack armor, String cause, boolean doProtect);
-
-	/**
-	 * Called when the apiarist's armor acts as protection against an attack.
-	 * 
-	 * @param player Player being attacked
-	 * @param armor Armor item
-	 * @param cause Optional cause of attack, such as a bee effect identifier
-	 * @param doProtect Whether or not to actually do the side effects of protection
-	 * @return Whether or not the armor should protect the player from that attack
-	 * @deprecated since Forestry 4.2. Use protectEntity
-	 */
-	@Deprecated
-	public boolean protectPlayer(EntityPlayer player, ItemStack armor, String cause, boolean doProtect);
-}
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-/**
- * Helper class for checking whether an entity is wearing Apiarist Armor
- *
- * @author Vexatos
- */
-public interface IArmorApiaristHelper {
-
-	/**
-	 * Called when the apiarist's armor acts as protection against an attack.
-	 * @param stack ItemStack to check
-	 * @param entity Entity being attacked
-	 * @param cause Optional cause of attack, such as a bee effect identifier
-	 * @param doProtect Whether or not to actually do the side effects of protection
-	 * @return Whether or not the item is valid Apiarist Armor and should protect the player from that attack
-	 * @since Forestry 4.2
-	 */
-	boolean isArmorApiarist(ItemStack stack, EntityLivingBase entity, String cause, boolean doProtect);
-
-	/**
-	 * Called when the apiarist's armor acts as protection against an attack.
-	 * @param entity Entity being attacked
-	 * @param cause Optional cause of attack, such as a bee effect identifier
-	 * @param doProtect Whether or not to actually do the side effects of protection
-	 * @return The number of valid Apiarist Armor pieces the player is wearing that are actually protecting
-	 * @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 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);
-}
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * 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;
-
-/**
- * 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 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 generation this individual is removed from the original individual.
-	 */
-	int getGeneration();
-
-	/**
-	 * Set the natural flag on this bee.
-	 * @param flag
-	 */
-	void setIsNatural(boolean flag);
-
-	IEffectData[] doEffect(IEffectData[] storedData, IBeeHousing housing);
-
-	IEffectData[] doFX(IEffectData[] storedData, IBeeHousing housing);
-
-	/**
-	 * @return true if the bee may spawn offspring
-	 */
-	boolean canSpawn();
-
-	/**
-	 * Determines whether the queen can work.
-	 * @param housing the {@link IBeeHousing} the bee currently resides in.
-	 * @return an empty set if the queen can work, a set of error states if the queen can not work
-	 */
-	Set<IErrorState> getCanWork(IBeeHousing housing);
-
-	List<BiomeGenBase> getSuitableBiomes();
-
-	ItemStack[] getProduceList();
-
-	ItemStack[] getSpecialtyList();
-
-	ItemStack[] produceStacks(IBeeHousing housing);
-
-	IBee spawnPrincess(IBeeHousing housing);
-
-	IBee[] spawnDrones(IBeeHousing housing);
-
-	void plantFlowerRandom(IBeeHousing housing);
-
-	IIndividual retrievePollen(IBeeHousing housing);
-
-	boolean pollinateRandom(IBeeHousing housing, IIndividual pollen);
-
-}
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import forestry.api.genetics.IClassification;
-
-public interface IBeeFactory {
-
-	/**
-	 * Creates a new bee species.
-	 * Automatically registered with AlleleManager.alleleRegistry.registerAllele()
-	 * See 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);
-}
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- * 
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import forestry.api.genetics.EnumTolerance;
-import forestry.api.genetics.IFlowerProvider;
-import forestry.api.genetics.IGenome;
-
-/**
- * Only the default implementation is supported.
- * 
- * @author SirSengir
- * 
- */
-public interface IBeeGenome extends IGenome {
-
-	IAlleleBeeSpecies getPrimary();
-	
-	IAlleleBeeSpecies getSecondary();
-
-	float getSpeed();
-
-	int getLifespan();
-
-	int getFertility();
-
-	EnumTolerance getToleranceTemp();
-
-	EnumTolerance getToleranceHumid();
-
-	boolean getNocturnal();
-
-	boolean getTolerantFlyer();
-
-	boolean getCaveDwelling();
-
-	IFlowerProvider getFlowerProvider();
-
-	int getFlowering();
-
-	int[] getTerritory();
-
-	IAlleleBeeEffect getEffect();
-
-}
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * 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;
-
-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.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();
-
-	int getBlockLightValue();
-	boolean canBlockSeeTheSky();
-
-	World getWorld();
-	GameProfile getOwner();
-
-	/**
-	 * @since Forestry 4.2
-	 * @return exact coordinates where bee FX should spawn from
-	 */
-	Vec3 getBeeFXCoordinates();
-}
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import net.minecraft.item.ItemStack;
-
-public interface IBeeHousingInventory {
-
-	ItemStack getQueen();
-	ItemStack getDrone();
-
-	void setQueen(ItemStack itemstack);
-	void setDrone(ItemStack itemstack);
-
-	/**
-	 * Adds products to the housing's inventory.
-	 *
-	 * @param product ItemStack with the product to add.
-	 * @param all if true, success requires that all products are added
-	 * @return boolean indicating success or failure.
-	 */
-	boolean addProduct(ItemStack product, boolean all);
-}
@@ -1,13 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-/**
- * Custom colour provider for bees with complicated colors.
- */
-public interface IBeeIconColourProvider {
-	int getIconColour(int renderPass);
-}
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.util.IIcon;
-
-public interface IBeeIconProvider {
-	void registerIcons(IIconRegister register);
-	IIcon getIcon(EnumBeeType type, int renderPass);
-}
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import forestry.api.genetics.IIndividual;
-
-public interface IBeeListener {
-
-	/**
-	 * Called when the bees wear out the housing's equipment.
-	 * @param amount Integer indicating the amount worn out.
-	 */
-	void wearOutEquipment(int amount);
-
-	/**
-	 * Called after the children have been spawned, and before the new princess is spawned.
-	 */
-	void onQueenDeath();
-
-	/**
-	 * Called when the bees have retrieved some pollen.
-	 * @return true if this bee listener handled the pollen.
-	 */
-	boolean onPollenRetrieved(IIndividual pollen);
-
-}
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-public interface IBeeModifier {
-	/**
-	 * @param genome Genome of the bee this modifier is called for.
-	 * @param currentModifier Current modifier.
-	 * @return Float used to modify the base territory.
-	 */
-	float getTerritoryModifier(IBeeGenome genome, float currentModifier);
-
-	/**
-	 * @param genome Genome of the bee this modifier is called for.
-	 * @param mate Genome of the bee mate this modifier is called for.
-	 * @param currentModifier Current modifier.
-	 * @return Float used to modify the base mutation chance.
-	 */
-	float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
-
-	/**
-	 * @param genome Genome of the bee this modifier is called for.
-	 * @param currentModifier Current modifier.
-	 * @return Float used to modify the life span of queens.
-	 */
-	float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
-
-	/**
-	 * @param genome Genome of the bee this modifier is called for.
-	 * @param currentModifier Current modifier.
-	 * @return Float modifying the production speed of queens.
-	 */
-	float getProductionModifier(IBeeGenome genome, float currentModifier);
-
-	/**
-	 * @param genome Genome of the bee this modifier is called for.
-	 * @return Float modifying the flowering of queens.
-	 */
-	float getFloweringModifier(IBeeGenome genome, float currentModifier);
-
-	/**
-	 * @param genome Genome of the bee this modifier is called for.
-	 * @return Float modifying the chance for a swarmer queen to die off.
-	 */
-	float getGeneticDecay(IBeeGenome genome, float currentModifier);
-
-	/**
-	 * @return Boolean indicating if housing can ignore rain
-	 */
-	boolean isSealed();
-
-	/**
-	 * @return Boolean indicating if housing can ignore darkness/night
-	 */
-	boolean isSelfLighted();
-
-	/**
-	 * @return Boolean indicating if housing can ignore not seeing the sky
-	 */
-	boolean isSunlightSimulated();
-
-	/**
-	 * @return Boolean indicating whether this housing simulates the nether
-	 */
-	boolean isHellish();
-
-}
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- * 
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import forestry.api.genetics.IMutation;
-
-public interface IBeeMutation extends IMutation {
-	
-	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);
-}
@@ -1,12 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import forestry.api.genetics.IMutationCustom;
-
-public interface IBeeMutationCustom extends IBeeMutation, IMutationCustom {
-
-}
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import forestry.api.genetics.IAllele;
-
-public interface IBeeMutationFactory {
-	/**
-	 * Creates a new bee mutation.
-	 * Automatically registered with BeeManager.beeRoot.registerMutation()
-	 * See IBeeMutationCustom and IMutationCustom for adding additional properties to the returned mutation.
-	 *
-	 * @param parentBee0 A parent bee for this mutation
-	 * @param parentBee1 A parent bee for this mutation
-	 * @param result The resulting alleles for this mutation
-	 * @param chance The chance that breeding the two parent bees will result in this mutation
-	 * @return a new bee mutation.
-	 */
-	IBeeMutationCustom createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance);
-}
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * 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.Collection;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-
-import com.mojang.authlib.GameProfile;
-
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.ISpeciesRoot;
-
-public interface IBeeRoot extends ISpeciesRoot {
-
-	/**
-	 * @return true if passed item is a Forestry bee. Equal to getType(ItemStack stack) != EnumBeeType.NONE
-	 */
-	@Override
-	boolean isMember(ItemStack stack);
-
-	/**
-	 * @return {@link IBee} pattern parsed from the passed stack's nbt data.
-	 */
-	@Override
-	IBee getMember(ItemStack stack);
-
-	@Override
-	IBee getMember(NBTTagCompound compound);
-
-	/* GENOME CONVERSION */
-	@Override
-	IBee templateAsIndividual(IAllele[] template);
-
-	@Override
-	IBee templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive);
-
-	@Override
-	IBeeGenome templateAsGenome(IAllele[] template);
-
-	@Override
-	IBeeGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
-
-	/* BREEDING TRACKER */
-	/**
-	 * @param world
-	 * @return {@link IApiaristTracker} associated with the passed world.
-	 */
-	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);
-
-	/**
-	 * @return true if passed item is a drone. Equal to getType(ItemStack stack) == EnumBeeType.DRONE
-	 */
-	boolean isDrone(ItemStack stack);
-
-	/**
-	 * @return true if passed item is mated (i.e. a queen)
-	 */
-	boolean isMated(ItemStack stack);
-
-	/**
-	 * @param genome
-	 *            Valid {@link IBeeGenome}
-	 * @return {@link IBee} from the passed genome
-	 */
-	IBee getBee(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);
-
-	/* TEMPLATES */
-	@Override
-	ArrayList<IBee> getIndividualTemplates();
-
-	/* MUTATIONS */
-	@Override
-	Collection<IBeeMutation> getMutations(boolean shuffle);
-
-	/* GAME MODE */
-	void resetBeekeepingMode();
-
-	ArrayList<IBeekeepingMode> getBeekeepingModes();
-
-	IBeekeepingMode getBeekeepingMode(World world);
-
-	IBeekeepingMode getBeekeepingMode(String name);
-
-	void registerBeekeepingMode(IBeekeepingMode mode);
-
-	void setBeekeepingMode(World world, String name);
-
-	/* MISC */
-	/**
-	 * Creates beekeepingLogic for a housing.
-	 * Should be used when the housing is created, see IBeekeepingLogic
-	 */
-	IBeekeepingLogic createBeekeepingLogic(IBeeHousing housing);
-
-	/**
-	 * Combines multiple modifiers from an IBeeHousing into one.
-	 * Stays up to date with changes to the housing's modifiers.
-	 */
-	IBeeModifier createBeeHousingModifier(IBeeHousing housing);
-
-	/**
-	 * Combines multiple listeners from an IBeeHousing into one.
-	 * Stays up to date with changes to the housing's listeners.
-	 */
-	IBeeListener createBeeHousingListener(IBeeHousing housing);
-
-}
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * 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;
-
-/**
- * Stores beekeeping logic for bee housings.
- * Get one with BeeManager.beeRoot.createBeekeepingLogic(IBeeHousing housing)
- * Save and load it to NBT using the INBTTagable methods.
- */
-public interface IBeekeepingLogic extends INBTTagable {
-
-	/* SERVER */
-
-	/**
-	 * Checks that the bees can work, setting error conditions on the housing where needed
-	 * @return true if no errors are present and doWork should be called
-	 */
-	boolean canWork();
-
-	/**
-	 * Performs actual work, breeding, production, etc.
-	 */
-	void doWork();
-
-
-	/* CLIENT */
-
-	/**
-	 * Call this when the housing comes into view of the client.
-	 * (i.e. when tile.getDescriptionPacket() is called)
-	 */
-	void syncToClient();
-	void syncToClient(EntityPlayerMP player);
-
-	/**
-	 * Get the progress bar for breeding and production.
-	 * To avoid network spam, this is only available server-side,
-	 * and must be synced manually to the client when a GUI is open.
-	 */
-	int getBeeProgressPercent();
-
-	/**
-	 * Whether bee fx should be active.
-	 * Internally, this is automatically synced to the client.
-	 */
-	boolean canDoBeeFX();
-
-	/**
-	 * Display bee fx. Calls IBee.doFX(IEffectData[] storedData, IBeeHousing housing) on the queen.
-	 * Internally, the queen is automatically synced to the client for the fx.
-	 */
-	void doBeeFX();
-
-}
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * 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 list of strings outlining the behaviour of this beekeeping mode.
-	 */
-	ArrayList<String> getDescription();
-
-	/**
-	 * @return Float used to modify the wear on comb frames.
-	 */
-	float getWearModifier();
-
-	/**
-	 * @param queen
-	 * @return fertility taking into account the birthing queen and surroundings.
-	 */
-	int getFinalFertility(IBee queen, World world, 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
-	 * @param housing
-	 * @return true if the queen is being overworked in the bee housing (with chance). will trigger a negative effect.
-	 */
-	boolean isOverworked(IBee queen, IBeeHousing housing);
-
-	/**
-	 * 
-	 * @param queen
-	 * @param offspring
-	 * @param housing
-	 * @return true if the genetic structure of the queen is breaking down during spawning of the offspring (with chance). will trigger a negative effect.
-	 */
-	boolean isDegenerating(IBee queen, IBee offspring, IBeeHousing housing);
-
-	/**
-	 * @param queen
-	 * @return true if an offspring of this queen is considered a natural
-	 */
-	boolean isNaturalOffspring(IBee queen);
-
-	/**
-	 * @param queen
-	 * @return true if this mode allows the passed queen or princess to be multiplied
-	 */
-	boolean mayMultiplyPrincess(IBee queen);
-
-	/**
-	 * @return the bee modifier for this mode
-	 */
-	IBeeModifier getBeeModifier();
-}
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * 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);
-
-	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);
-
-	/**
-	 * 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);
-}
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- * 
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import net.minecraft.item.ItemStack;
-
-public interface IHiveFrame {
-
-	/**
-	 * Wears out a frame.
-	 * 
-	 * @param housing IBeeHousing the frame is contained in.
-	 * @param frame ItemStack containing the actual frame.
-	 * @param queen Current queen in the caller.
-	 * @param wear Integer denoting the amount worn out. The wear modifier of the current beekeeping mode has already been taken into account.
-	 * @return ItemStack containing the actual frame with adjusted damage, or null if it has been broken.
-	 */
-	ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear);
-
-	IBeeModifier getBeeModifier();
-}
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import net.minecraft.block.Block;
-
-public interface IJubilanceFactory {
-	/** The default Jubilance Provider is satisfied when the humidity and temperature are ideal for the bee. */
-	IJubilanceProvider getDefault();
-
-	/** The Requires Resource Jubilance Provider is satisfied when a specific block is under the hive. */
-	IJubilanceProvider getRequiresResource(Block block, int meta);
-}
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-public interface IJubilanceProvider {
-
-	/**
-	 * Returns true when conditions are right to make this species Jubilant.
-	 * Jubilant bees can produce their Specialty products.
-	 */
-	boolean isJubilant(IAlleleBeeSpecies species, IBeeGenome genome, IBeeHousing housing);
-}
@@ -1,13 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture.hives;
-
-public class HiveManager {
-
-	public static IHiveRegistry hiveRegistry;
-	public static IHiveGenHelper genHelper;
-
-}
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture.hives;
-
-import net.minecraft.block.Block;
-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 block to be placed in the world.
-	 */
-	Block getBlock();
-	int getMeta();
-
-	/**
-	 * 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);
-
-	/**
-	 * 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);
-}
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture.hives;
-
-import net.minecraft.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);
-
-	/**
-	 * 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);
-
-}
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture.hives;
-
-import net.minecraft.block.Block;
-
-public interface IHiveGenHelper {
-
-	/**
-	 * Returns a hiveGen for a hive that spawns on the ground.
-	 * validGroundBlocks specifies which block materials it can spawn on.
-	 */
-	IHiveGen ground(Block... validGroundBlocks);
-
-	/**
-	 * Returns a hiveGen for a hive that spawns in trees.
-	 */
-	IHiveGen tree();
-
-}
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture.hives;
-
-import java.util.List;
-
-import forestry.api.apiculture.IHiveDrop;
-
-public interface IHiveRegistry {
-
-	/* Forestry Hive Names */
-	public static final String forest = "Forestry:forest";
-	public static final String meadows = "Forestry:meadows";
-	public static final String desert = "Forestry:desert";
-	public static final String jungle = "Forestry:jungle";
-	public static final String end = "Forestry:end";
-	public static final String snow = "Forestry:snow";
-	public static final String swamp = "Forestry:swamp";
-
-	/**
-	 * 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);
-}
@@ -1,8 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-@API(apiVersion="4.1.0", owner="ForestryAPI|apiculture", provides="ForestryAPI|hives")
-package forestry.api.apiculture.hives;
-import cpw.mods.fml.common.API;
@@ -1,8 +0,0 @@
-/*******************************************************************************
- * 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")
-package forestry.api.apiculture;
-import cpw.mods.fml.common.API;
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import net.minecraft.util.StatCollector;
-
-import forestry.api.genetics.AlleleManager;
-import forestry.api.genetics.IFruitFamily;
-
-public enum EnumFruitFamily implements IFruitFamily {
-	PRUNES("prunes", "Prunus domestica"),
-	POMES("pomes", "Pomum"),
-	JUNGLE("jungle", "Tropicus"),
-	NUX("nuts", "Nux");
-
-	private final String uid;
-	private final String scientific;
-
-	EnumFruitFamily(String uid, String scientific) {
-		this.uid = uid;
-		this.scientific = scientific;
-		AlleleManager.alleleRegistry.registerFruitFamily(this);
-	}
-
-	@Override
-	public String getUID() {
-		return "forestry." + uid;
-	}
-
-	@Override
-	public String getScientific() {
-		return this.scientific;
-	}
-
-	@Override
-	public String getName() {
-		return StatCollector.translateToLocal("for.family." + uid);
-	}
-
-	@Override
-	public String getDescription() {
-		return StatCollector.translateToLocal("for.family." + uid + ".description");
-	}
-
-}
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- * 
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import forestry.api.genetics.ISpeciesType;
-
-public enum EnumGermlingType implements ISpeciesType {
-	SAPLING("sapling"), BLOSSOM("blossom"), POLLEN("pollen"), GERMLING("germling"), NONE("none");
-
-	public static final EnumGermlingType[] VALUES = values();
-	
-	private final String name;
-
-	EnumGermlingType(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-}
@@ -1,10 +0,0 @@
-/*******************************************************************************
- * 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
-}
@@ -1,10 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-public enum EnumLeafType {
-	DECIDUOUS, CONIFERS, JUNGLE, WILLOW, MAPLE, PALM
-}
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- * 
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import java.util.Locale;
-
-import net.minecraftforge.common.EnumPlantType;
-
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IAlleleArea;
-import forestry.api.genetics.IAlleleBoolean;
-import forestry.api.genetics.IAlleleFloat;
-import forestry.api.genetics.IAlleleInteger;
-import forestry.api.genetics.IAllelePlantType;
-import forestry.api.genetics.IChromosomeType;
-import forestry.api.genetics.IFruitFamily;
-import forestry.api.genetics.ISpeciesRoot;
-
-public enum EnumTreeChromosome implements IChromosomeType {
-
-	/**
-	 * Determines the following: - WorldGen, including the used wood blocks - {@link IFruitFamily}s supported. Limits which {@link IFruitProvider}
-	 * will actually yield fruit with this species. - Native {@link EnumPlantType} for this tree. Combines with the PLANT chromosome.
-	 */
-	SPECIES(IAlleleTreeSpecies.class),
-	/**
-	 * {@link IGrowthProvider}, determines conditions required by the tree to grow.
-	 */
-	GROWTH(IAlleleGrowth.class),
-	/**
-	 * A float modifying the height of the tree. Taken into account at worldgen.
-	 */
-	HEIGHT(IAlleleFloat.class),
-	/**
-	 * Chance for saplings.
-	 */
-	FERTILITY(IAlleleFloat.class),
-	/**
-	 * {@link IFruitProvider}, determines if and what fruits are grown on the tree. Limited by the {@link IFruitFamily}s the species supports.
-	 */
-	FRUITS(IAlleleFruit.class),
-	/**
-	 * Chance for fruit leaves and/or drops.
-	 */
-	YIELD(IAlleleFloat.class),
-	/**
-	 * May add additional tolerances for {@link 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;
-	}
-
-	@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;
-	}
-
-}
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import java.util.Locale;
-import java.util.Random;
-
-import net.minecraft.nbt.NBTTagCompound;
-
-public enum EnumWoodType {
-	LARCH, TEAK, ACACIA, LIME, CHESTNUT,
-	WENGE, BAOBAB, SEQUOIA(4.0f), KAPOK, EBONY,
-	MAHOGANY, BALSA(1.0f), WILLOW, WALNUT, GREENHEART(7.5f),
-	CHERRY, MAHOE, POPLAR, PALM, PAPAYA,
-	PINE(3.0f), PLUM, MAPLE, CITRUS, GIGANTEUM,
-	IPE, PADAUK, COCOBOLO, ZEBRAWOOD;
-
-	public static final float DEFAULT_HARDNESS = 2.0f;
-	public static final EnumWoodType[] VALUES = values();
-
-	private final float hardness;
-
-	EnumWoodType() {
-		this.hardness = DEFAULT_HARDNESS;
-	}
-
-	EnumWoodType(float hardness) {
-		this.hardness = 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 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;
-	}
-
-	public static EnumWoodType getRandom(Random random) {
-		return VALUES[random.nextInt(VALUES.length)];
-	}
-
-	@Override
-	public String toString() {
-		return super.toString().toLowerCase(Locale.ENGLISH);
-	}
-}
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- * 
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import forestry.api.genetics.IAllele;
-
-/**
- * Simple allele encapsulating an {@link IFruitProvider}.
- */
-public interface IAlleleFruit extends IAllele {
-
-	IFruitProvider getProvider();
-
-}
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- * 
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import forestry.api.genetics.IAllele;
-
-/**
- * Simple allele encapsulating an {@link IGrowthProvider}.
- */
-public interface IAlleleGrowth extends IAllele {
-
-	IGrowthProvider getProvider();
-
-}
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * 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;
-
-/**
- * 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);
-
-}
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * 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;
-
-public interface IAlleleTreeSpecies extends IAlleleSpecies {
-
-	ITreeRoot getRoot();
-	
-	/**
-	 * @return Native plant type of this species.
-	 */
-	EnumPlantType getPlantType();
-
-	/**
-	 * @return List of all {@link IFruitFamily}s which can grow on leaves generated by this species.
-	 */
-	Collection<IFruitFamily> getSuitableFruit();
-
-	/**
-	 * @return Tree generator for this species.
-	 */
-	ITreeGenerator getGenerator();
-
-	/* TEXTURES AND OVERRIDES */
-	int getLeafColour(boolean pollinated);
-
-	@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);
-
-}
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import net.minecraftforge.common.EnumPlantType;
-
-import forestry.api.genetics.IAlleleSpeciesCustom;
-import forestry.api.genetics.IFruitFamily;
-
-public interface IAlleleTreeSpeciesCustom extends IAlleleSpeciesCustom, IAlleleTreeSpecies {
-
-	/** Add a fruit family for this tree. Trees can have multiple fruit families. */
-	IAlleleTreeSpeciesCustom addFruitFamily(IFruitFamily family);
-
-	/** Set the minecraft plant type for this tree. Default is Plains. */
-	IAlleleTreeSpeciesCustom setPlantType(EnumPlantType type);
-
-}
@@ -1,12 +0,0 @@
-/*******************************************************************************
- * 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 {
-
-}
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * 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.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();
-
-	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);
-
-	int getRipeningPeriod();
-
-	// / Products, Chance
-	ItemStack[] getProducts();
-
-	// / Specialty, Chance
-	ItemStack[] getSpecialty();
-
-	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();
-
-	/* 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();
-
-	/**
-	 * 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);
-}
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * 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.client.renderer.texture.IIconRegister;
-import net.minecraft.util.IIcon;
-
-/**
- * Provides icons for saplings, pollen, etc.
- * You must implement this yourself to use TreeManager.treeFactory.createSpecies()
- * There is no default implementation because every sapling has a unique icon.
- */
-public interface IGermlingIconProvider {
-	void registerIcons(IIconRegister register);
-	IIcon getIcon(EnumGermlingType type, int renderPass);
-}
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * 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;
-
-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);
-
-	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();
-
-}
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import net.minecraft.util.IIcon;
-
-/**
- * Provides icons for leaves. Used by TreeManager.treeFactory.createSpecies()
- * Get a default Forestry implementation from TreeManager.treeFactory.getLeafIconProvider() or implement your own.
- *
- * If you implement your own, be sure to register the icons.
- * Icon registration is not done here because these icons are heavily reused.
- */
-public interface ILeafIconProvider {
-	IIcon getIcon(boolean pollinated, boolean fancy);
-	int getColor(boolean pollinated);
-}
@@ -1,12 +0,0 @@
-/*******************************************************************************
- * 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;
-
-public interface ILeafTickHandler {
-	boolean onRandomLeafTick(ITree tree, World world, int x, int y, int z, boolean isDestroyed);
-}
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- * 
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.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);
-}
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * 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;
-
-public interface ITree extends IIndividual, ITreeGenData {
-
-	void mate(ITree other);
-
-	IEffectData[] doEffect(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 getMate();
-
-	EnumSet<EnumPlantType> getPlantTypes();
-
-	/**
-	 * @since Forestry 4.0
-	 */
-	ITree[] getSaplings(World world, GameProfile playerProfile, int x, int y, int z, float modifier);
-
-	ItemStack[] getProduceList();
-
-	ItemStack[] getSpecialtyList();
-
-	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 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 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 Growth conditions at the given position.
-	 */
-	EnumGrowthConditions getGrowthCondition(World world, int x, int y, int z);
-
-	WorldGenerator getTreeGenerator(World world, int x, int y, int z, boolean wasBonemealed);
-
-	ITree copy();
-
-	boolean isPureBred(EnumTreeChromosome chromosome);
-
-	boolean canBearFruit();
-}
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * 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.awt.Color;
-
-import forestry.api.genetics.IClassification;
-
-public interface ITreeFactory {
-	/**
-	 * Creates a new tree species.
-	 * Automatically registered with AlleleManager.alleleRegistry.registerAllele()
-	 * See IAlleleTreeSpeciesCustom and IAlleleSpeciesCustom for adding additional properties to the returned species.
-	 *
-	 * @param uid Unique Identifier for this species
-	 * @param unlocalizedName Unlocalized name for this species
-	 * @param authority Authority for the binomial name, e.g. "Sengir" on species of base Forestry.
-	 * @param unlocalizedDescription Unlocalized description for this species
-	 * @param dominant Whether this species is genetically dominant (false means it is recessive)
-	 * @param branch Classification of this species
-	 * @param binomial Binomial name of the species sans genus. "humboldti" will have the bee species flavour name be "Apis humboldti". Feel free to use fun names or null.
-	 * @param leafIconProvider The leaf icon provider for this species
-	 * @param germlingIconProvider The germling icon provider for this species
-	 * @param generator The tree generator
-	 * @return a new tree species allele.
-	 */
-	IAlleleTreeSpeciesCustom createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, ILeafIconProvider leafIconProvider, IGermlingIconProvider germlingIconProvider, ITreeGenerator generator);
-
-	/** Get one of the built-in Forestry leaf types. Default type is deciduous. */
-	ILeafIconProvider getLeafIconProvider(EnumLeafType enumLeafType, Color color, Color colorPollinated);
-}
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * 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 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);
-
-	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);
-
-	/**
-	 * @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);
-}
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * 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;
-
-public interface ITreeGenome extends IGenome {
-
-	IAlleleTreeSpecies getPrimary();
-
-	IAlleleTreeSpecies getSecondary();
-
-	IFruitProvider getFruitProvider();
-
-	IGrowthProvider getGrowthProvider();
-
-	float getHeight();
-
-	float getFertility();
-
-	/**
-	 * @return Determines either a) how many fruit leaves there are or b) the chance for any fruit leave to drop a sapling. Exact usage determined by the
-	 *         IFruitProvider
-	 */
-	float getYield();
-
-	float getSappiness();
-
-	EnumSet<EnumPlantType> getPlantTypes();
-
-	/**
-	 * @return Amount of random block ticks required for a sapling to mature into a fully grown tree.
-	 */
-	int getMaturationTime();
-
-	int getGirth();
-
-	IAlleleLeafEffect getEffect();
-}
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * 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 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 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);
-
-}
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * 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;
-
-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);
-}
@@ -1,12 +0,0 @@
-/*******************************************************************************
- * 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.IMutationCustom;
-
-public interface ITreeMutationCustom extends ITreeMutation, IMutationCustom {
-
-}
Author	SHA1	Message	Date
CovertJaguar	990d4990db	Fix lang	2014-12-14 21:39:45 -08:00
mezz	ce232e808e	Fix Alveary Swarmer and Swarm Hive (cherry picked from commit 2577ee9c930cdc91bdf3d207cbeaaebbe1141257) Conflicts: src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java	2014-12-09 01:08:14 -08:00
mezz	31574a9c6e	Cleanup (cherry picked from commit `4f95ceab29`)	2014-12-09 01:03:05 -08:00
mezz	cd9a4110ee	Refactor out worktable canCraftRecipe logic to RecipeUtil	2014-12-08 20:26:51 -08:00
mezz	6b35ff2ba1	Improve null safety of memorized recipe isValid check (cherry picked from commit `23ffb78ab3`)	2014-12-07 16:25:01 -08:00
mezz	5133e721cc	Add blacklist to worktable memory, blacklist non-empty maps (cherry picked from commit `2cb1959421`)	2014-12-07 16:18:23 -08:00
mezz	09ced92f5b	Support left click drag on Worktable (cherry picked from commit `029604222c`)	2014-12-07 16:18:17 -08:00
mezz	12477a7711	Fix crash when crafting with a Map on a Worktable	2014-12-07 16:17:21 -08:00
mezz	b7dc4d9144	Fix #359 Crafting with a worktable does not trigger achievements. (cherry picked from commit `c010977a0b`)	2014-12-07 16:16:24 -08:00
mezz	da48d317ff	Fix #362 Missing Analyzer Crafting recipe (cherry picked from commit `7ffb9d5c1d`)	2014-12-07 15:32:02 -08:00
mezz	5bfb11e952	Fix #353 Alveary heater/fan energy consumption, animation (cherry picked from commit `475d99eae8`)	2014-12-07 15:30:30 -08:00
mezz	4dffb9f352	Fix biome error in Alveary (cherry picked from commit `d0244ece32`)	2014-12-07 15:30:20 -08:00
mezz	beadb47539	Fix #356 Worktable using the wrong wood with Shift-use all (cherry picked from commit `0105f36668`)	2014-12-07 15:30:08 -08:00
mezz	6301d3c193	Fix #357 Forestry stained glass not silk touchable (cherry picked from commit `ab3ba0c4db`)	2014-12-07 15:30:02 -08:00
mezz	883863e047	Safety check for IC2 Plugin. #351 (cherry picked from commit `38009bb32a`)	2014-12-07 15:29:42 -08:00
mezz	2c14f02151	Fix #352 Backpack deletion/duplication bug (cherry picked from commit `d827a0f132`)	2014-12-07 15:29:07 -08:00
CovertJaguar	00771b1a42	Bump version	2014-11-30 17:22:40 -08:00
CovertJaguar	46ec2f2740	Merge branch 'dev' into release_3.3	2014-11-30 17:21:03 -08:00
mezz	ac653d46c1	Fix #326 decorative leaves should not pollinate	2014-11-15 04:15:20 -08:00
mezz	63d9935d01	Minor code cleanup	2014-11-15 04:15:14 -08:00
mezz	ba695b977d	Fix #325 Centrifuge dupe bug	2014-11-15 04:13:46 -08:00
CovertJaguar	6b1dfb1596	Set submodules	2014-11-15 04:12:44 -08:00
CovertJaguar	fff02be71d	Bump version to 3.2	2014-11-08 21:40:45 -08:00
CovertJaguar	0e5b9e4957	Merge branch 'dev' into release_3.2 Conflicts: src/main/resources/assets/forestry/textures/blocks/storage/apatite.png src/main/resources/assets/forestry/textures/blocks/storage/bronze.png src/main/resources/assets/forestry/textures/blocks/storage/copper.png src/main/resources/assets/forestry/textures/blocks/storage/tin.png	2014-11-08 21:39:26 -08:00
MysteriousAges	3415030fbf	Revert "Storage block textures - Apatite, Bronze, Copper, Tin." This reverts commit `c8fd93873a`.	2014-10-24 20:18:30 -07:00