Add support for Tesla power

(no fix for vanilla leaves, the harvest event is fired server-side only)

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

@@ -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

.github/scripts/update-version.sh

@@ -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

.github/workflows/build-and-test.yml

@@ -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

.github/workflows/release-latest.yml

@@ -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

.github/workflows/release-tags.yml

@@ -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

.gitignore

@@ -1,28 +1,24 @@
-.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
+!/api
+!/test
+
+# files
+!/.gitignore
+!/.gitmodules
+!/CLA.txt
+!/CONTRIBUTING.md
+!/LICENSE.txt
+!/license-header.txt
+!/README.md
+!/gradle.properties
+!/build.gradle
+!/build.xml
+!/gradlew
+!/gradlew.bat
+.DS_Store

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lang"]
+	path = lang
+	url = https://github.com/ForestryMC/Forestry-Localization.git

CHANGELOG-2.1.1.0.md

@@ -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*
-

README.md

@@ -9,7 +9,7 @@ Forestry is a modification for the game Minecraft and known primarily for its fa
 
 [Wiki](http://forestry.sengir.net/)
 
-[Latest Builds for 1.7.10](http://jenkins.ic2.player.to/job/Forestry_Dev/)
+[Latest Builds for 1.9](http://jenkins.ic2.player.to/job/Forestry_5/)
 
 [IRC #forestry on esper.net](http://webchat.esper.net/?nick=ForestryGithub...&channels=forestry&prompt=1)
 

build.gradle

@@ -1,520 +1,187 @@
-//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'
-    }
+	repositories {
+		jcenter()
+		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:2.2-SNAPSHOT'
+	}
 }
 
 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")
+	id "net.minecraftforge.gradle.forge" version "2.0.2"
+	id "com.matthewprenger.cursegradle" version "1.0.7"
+	id "se.bjurr.gitchangelog.git-changelog-gradle-plugin" version "1.32"
 }
 
-apply plugin: 'forge'
+apply plugin: 'maven'
 
-def projectJavaVersion = JavaLanguageVersion.of(8)
-
-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"
 
-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
+// java version
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 minecraft {
-    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
-    runDir = "run"
+	version = mcversion + "-" + forgeversion
+	runDir = "run"
+	mappings = mcp_mappings
 
-    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 {
+	main {
+		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 {
+		url 'http://maven.epoxide.xyz'
+	}
+	maven {
+		url "http://dvs1.progwml6.com/files/maven"
+	}
+	maven {
+		name = "ic2"
+		url = "http://maven.ic2.player.to/"
+	}
 }
 
 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")
-    }
+	deobfCompile "net.darkhax.tesla:Tesla:${tesla_version}"
+	deobfCompile "mezz.jei:jei_${mcversion}:${jei_version}:api"
+	runtime "mezz.jei:jei_${mcversion}:${jei_version}"
+	deobfCompile "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
 }
 
-apply from: 'dependencies.gradle'
-
-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"
-
-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"
+configurations {
+	api
+	compile.extendsFrom api
 }
 
-"""
-    }
+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 'version':project.version, 'mcversion':project.minecraft.version
+	}
+
+	// copy everything else, thats not the mcmod.info
+	from(sourceSets.main.resources.srcDirs) {
+		exclude 'mcmod.info'
+		exclude '**/*.md'
+	}
 }
 
-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)
+// prevent java 8's strict doclint for javadocs from failing builds
+allprojects {
+	tasks.withType(Javadoc) {
+		options.addStringOption('Xdoclint:none', '-quiet')
+	}
 }
 
 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"
-            ]
-        }
-    }
-}
-
-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)
-}
-
-runServer {
-    def arguments = []
-
-    if (usesMixins.toBoolean()) {
-        arguments += [
-                "--mods=../build/libs/$modId-${version}.jar",
-                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-        ]
-    }
-
-    args(arguments)
-}
-
-tasks.withType(JavaExec).configureEach {
-    javaLauncher.set(
-            javaToolchains.launcherFor {
-                languageVersion = projectJavaVersion
-            }
-    )
-}
-
-processResources
-        {
-            // this will ensure that this task is redone when the versions change.
-            inputs.property "version", project.version
-            inputs.property "mcversion", project.minecraft.version
-
-            // replace stuff in mcmod.info, nothing else
-            from(sourceSets.main.resources.srcDirs) {
-                include 'mcmod.info'
-
-                // replace 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
+	// Copy redstone api into the jar, should shade this as a maven dep...
+	from (sourceSets.api.allSource) {
+		include 'cofh/**/*.txt'
+	}
+	from (sourceSets.api.output.classesDir) {
+		include 'cofh/**/*.*'
+	}
 }
 
 task sourcesJar(type: Jar) {
-    from (sourceSets.main.allJava)
-    from (file("$projectDir/LICENSE"))
-    getArchiveClassifier().set('sources')
-}
-
-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 relocateShadowDevJar(type: ConfigureShadowRelocation) {
-    target = tasks.shadowDevJar
-    prefix = modGroup + ".shadow"
-}
-
-task circularResolverJar(type: Jar) {
-    dependsOn(relocateShadowDevJar)
-    dependsOn(shadowDevJar)
-    enabled = false
-}
-
-task devJar(type: Jar) {
-    from sourceSets.main.output
-    getArchiveClassifier().set("dev")
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    if(usesShadowedDependencies.toBoolean()) {
-        dependsOn(circularResolverJar)
-        enabled = false
-    }
+	from zipTree('build/retromapping/retromappedReplacedMain.jar') // Not sure if this is how Abrar designed it, but grab the remapped src
+	classifier = 'sources'
 }
 
 task apiJar(type: Jar) {
-    from (sourceSets.main.allJava) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString() + '/**'
-    }
-
-    from (sourceSets.main.output) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString() + '/**'
-    }
-
-    from (sourceSets.main.resources.srcDirs) {
-        include("LICENSE")
-    }
-
-    getArchiveClassifier().set('api')
+	// TODO: when FG bug is fixed, remove allSource from the api jar.
+	// https://github.com/MinecraftForge/ForgeGradle/issues/369
+	// Gradle should be able to pull them from the -sources jar.
+	from sourceSets.main.allSource
+	from sourceSets.main.output
+	include 'forestry/api/**'
+	classifier = 'api'
 }
 
 artifacts {
-    archives sourcesJar
-    archives devJar
-    if(apiPackage) {
-        archives apiJar
-    }
+	archives sourcesJar
+	archives apiJar
 }
 
-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)
+			}
+		} else {
+			println 'Archives upload disabled, mavenDir in gradle.properties is missing.'
+		}
+	}
 }
 
-// Updating
-task updateBuildScript {
-    doLast {
-        if (updateBuildScript()) return
-
-        print("Build script already up-to-date!")
-    }
+def getBuildNumber() {
+	return "$System.env.BUILD_NUMBER" != "null" ? "$System.env.BUILD_NUMBER" : "0"
 }
 
-if (isNewBuildScriptVersionAvailable()) {
-    if (autoUpdateBuildScript.toBoolean()) {
-        updateBuildScript()
-    } else {
-        println("Build script update available! Run 'gradle updateBuildScript'")
-    }
+task makeChangelog(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {
+	filePath = "changelog.html"
+	untaggedName = "Current release ${project.version}"
+	fromCommit = "5a3850c2642e535656d090d1473054d5fa8d3331"
+	toRef =  "HEAD"
+	templateContent = """
+Alpha version, still buggy. Do not create a world you care about with this version, it can and will break things severely.<br/>
+Please help the project by trying it out and <a href="https://github.com/ForestryMC/ForestryMC/issues">reporting issues here.</a><br/>
+{{#tags}}
+  <h3>{{name}}</h3>
+  <ul>
+    {{#commits}}
+    <li>{{{message}}} - {{authorName}}</li>
+    {{/commits}}
+  </ul>
+{{/tags}}
+"""
 }
 
-static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/SinTh0r4s/ExampleMod1.7.10/main/build.gradle")
+curseforge {
+	apiKey = project.hasProperty('curseforge_apikey') ? project.curseforge_apikey : '0'
+	project {
+		id = '59751'
+		changelog = file('changelog.html')
+		changelogType = 'html'
+		releaseType = 'alpha'
+	}
 }
 
-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'
+afterEvaluate {
+	tasks.curseforge59751.dependsOn.add(makeChangelog)
 }

cla-signatures.txt

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

dependencies.gradle

@@ -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")
-}

gradle.properties

@@ -1,60 +1,11 @@
-modName = Forestry
+mcversion=1.10.2
+forgeversion=12.18.0.2005-1.10.0
+mcp_mappings=snapshot_20160525
 
-# This is a case-sensitive string to identify your mod. Convention is to use lower case.
-modId = Forestry
+tesla_version=1.9.4-1.1.0.24
+jei_version=3.7.3.221
+ic2_version=2.5.5-ex19
 
-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
+version_major=5
+version_minor=1
+version_patch=8

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Mon Sep 14 12:28:28 PDT 2015
 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.7-bin.zip

gradlew

@@ -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 "$@"

gradlew.bat

@@ -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

jitpack.yml

@@ -1,2 +0,0 @@
-before_install:
-  - ./gradlew setupCIWorkspace

repositories.gradle

@@ -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"
-    }
-}

src/api/java/cofh/LICENSE - LGPLv3.txt

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

src/api/java/cofh/README.md

@@ -0,0 +1,11 @@
+Redstone Flux API
+====================================
+This is the standalone CoFH Energy API - also known as the "Redstone Flux" API.
+
+Make great use of it.
+
+You are of course free to modify any/all of this code and even repackage it, but then it wouldn't be an awesome crossmod API anymore, now would it?
+
+Don't be a jerk.
+
+~Team CoFH

src/api/java/cofh/api/CoFHAPIProps.java

@@ -0,0 +1,11 @@
+package cofh.api;
+
+public class CoFHAPIProps {
+
+	private CoFHAPIProps() {
+
+	}
+
+	public static final String VERSION = "1.8.9R1.2.0B1";
+
+}

src/api/java/cofh/api/energy/EnergyStorage.java

@@ -0,0 +1,162 @@
+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 EnergyStorage setCapacity(int capacity) {
+
+		this.capacity = capacity;
+
+		if (energy > capacity) {
+			energy = capacity;
+		}
+		return this;
+	}
+
+	public EnergyStorage setMaxTransfer(int maxTransfer) {
+
+		setMaxReceive(maxTransfer);
+		setMaxExtract(maxTransfer);
+		return this;
+	}
+
+	public EnergyStorage setMaxReceive(int maxReceive) {
+
+		this.maxReceive = maxReceive;
+		return this;
+	}
+
+	public EnergyStorage setMaxExtract(int maxExtract) {
+
+		this.maxExtract = maxExtract;
+		return this;
+	}
+
+	public int getMaxReceive() {
+
+		return maxReceive;
+	}
+
+	public int getMaxExtract() {
+
+		return maxExtract;
+	}
+
+	/**
+	 * This function is included to allow for server to 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;
+	}
+
+}

src/api/java/cofh/api/energy/IEnergyConnection.java

@@ -0,0 +1,22 @@
+package cofh.api.energy;
+
+import net.minecraft.util.EnumFacing;
+
+
+/**
+ * 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.
+ * <p>
+ * 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(EnumFacing from);
+
+}

src/api/java/cofh/api/energy/IEnergyContainerItem.java

@@ -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.
+ * <p>
+ * 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);
+
+}

src/api/java/cofh/api/energy/IEnergyHandler.java

@@ -0,0 +1,27 @@
+package cofh.api.energy;
+
+import net.minecraft.util.EnumFacing;
+
+/**
+ * Implement this interface on Tile Entities which should handle energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
+ * <p>
+ * A reference implementation is provided {@link TileEnergyHandler}.
+ * <p>
+ * Note that {@link IEnergyReceiver} and {@link IEnergyProvider} are extensions of this.
+ *
+ * @author King Lemming
+ *
+ */
+public interface IEnergyHandler extends IEnergyConnection {
+
+	/**
+	 * Returns the amount of energy currently stored.
+	 */
+	int getEnergyStored(EnumFacing from);
+
+	/**
+	 * Returns the maximum amount of energy that can be stored.
+	 */
+	int getMaxEnergyStored(EnumFacing from);
+
+}

src/api/java/cofh/api/energy/IEnergyProvider.java

@@ -0,0 +1,29 @@
+package cofh.api.energy;
+
+import net.minecraft.util.EnumFacing;
+
+
+/**
+ * Implement this interface on Tile Entities which should provide energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
+ * <p>
+ * A reference implementation is provided {@link TileEnergyHandler}.
+ *
+ * @author King Lemming
+ *
+ */
+public interface IEnergyProvider extends IEnergyHandler {
+
+	/**
+	 * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider.
+	 *
+	 * @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(EnumFacing from, int maxExtract, boolean simulate);
+
+}

src/api/java/cofh/api/energy/IEnergyReceiver.java

@@ -0,0 +1,29 @@
+package cofh.api.energy;
+
+import net.minecraft.util.EnumFacing;
+
+
+/**
+ * Implement this interface on Tile Entities which should receive energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
+ * <p>
+ * A reference implementation is provided {@link TileEnergyHandler}.
+ *
+ * @author King Lemming
+ *
+ */
+public interface IEnergyReceiver extends IEnergyHandler {
+
+	/**
+	 * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver.
+	 *
+	 * @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(EnumFacing from, int maxReceive, boolean simulate);
+
+}

src/api/java/cofh/api/energy/IEnergyStorage.java

@@ -0,0 +1,46 @@
+package cofh.api.energy;
+
+/**
+ * An energy storage is the unit of interaction with Energy inventories.<br>
+ * This is not to be implemented on TileEntities. This is for internal use only.
+ * <p>
+ * 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();
+
+}

src/api/java/cofh/api/energy/ItemEnergyContainer.java

@@ -0,0 +1,113 @@
+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 ItemEnergyContainer  setMaxTransfer(int maxTransfer) {
+
+		setMaxReceive(maxTransfer);
+		setMaxExtract(maxTransfer);
+		return this;
+	}
+
+	public ItemEnergyContainer  setMaxReceive(int maxReceive) {
+
+		this.maxReceive = maxReceive;
+		return this;
+	}
+
+	public ItemEnergyContainer  setMaxExtract(int maxExtract) {
+
+		this.maxExtract = maxExtract;
+		return this;
+	}
+
+	/* IEnergyContainerItem */
+	@Override
+	public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) {
+
+		if (!container.hasTagCompound()) {
+			container.setTagCompound(new NBTTagCompound());
+		}
+		int energy = container.getTagCompound().getInteger("Energy");
+		int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
+
+		if (!simulate) {
+			energy += energyReceived;
+			container.getTagCompound().setInteger("Energy", energy);
+		}
+		return energyReceived;
+	}
+
+	@Override
+	public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) {
+
+		if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) {
+			return 0;
+		}
+		int energy = container.getTagCompound().getInteger("Energy");
+		int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
+
+		if (!simulate) {
+			energy -= energyExtracted;
+			container.getTagCompound().setInteger("Energy", energy);
+		}
+		return energyExtracted;
+	}
+
+	@Override
+	public int getEnergyStored(ItemStack container) {
+
+		if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) {
+			return 0;
+		}
+		return container.getTagCompound().getInteger("Energy");
+	}
+
+	@Override
+	public int getMaxEnergyStored(ItemStack container) {
+
+		return capacity;
+	}
+
+}

src/api/java/cofh/api/energy/TileEnergyHandler.java

@@ -0,0 +1,70 @@
+package cofh.api.energy;
+
+import javax.annotation.Nonnull;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+
+/**
+ * Reference implementation of {@link IEnergyReceiver} and {@link IEnergyProvider}. Use/extend this or implement your own.
+ * 
+ * This class is really meant to summarize how each interface is properly used.
+ *
+ * @author King Lemming
+ *
+ */
+public class TileEnergyHandler extends TileEntity implements IEnergyReceiver, IEnergyProvider {
+
+	protected EnergyStorage storage = new EnergyStorage(32000);
+
+	@Override
+	public void readFromNBT(NBTTagCompound nbt) {
+
+		super.readFromNBT(nbt);
+		storage.readFromNBT(nbt);
+	}
+
+	@Nonnull
+	@Override
+	public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
+		nbt = super.writeToNBT(nbt);
+		storage.writeToNBT(nbt);
+		return nbt;
+	}
+
+	/* IEnergyConnection */
+	@Override
+	public boolean canConnectEnergy(EnumFacing from) {
+
+		return true;
+	}
+
+	/* IEnergyReceiver */
+	@Override
+	public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) {
+
+		return storage.receiveEnergy(maxReceive, simulate);
+	}
+
+	/* IEnergyProvider */
+	@Override
+	public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) {
+
+		return storage.extractEnergy(maxExtract, simulate);
+	}
+
+	/* IEnergyHandler */
+	@Override
+	public int getEnergyStored(EnumFacing from) {
+
+		return storage.getEnergyStored();
+	}
+
+	@Override
+	public int getMaxEnergyStored(EnumFacing from) {
+
+		return storage.getMaxEnergyStored();
+	}
+
+}

src/api/java/cofh/api/energy/package-info.java

@@ -0,0 +1,10 @@
+/**
+ * (C) 2014-2016 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 net.minecraftforge.fml.common.API;
+import cofh.api.CoFHAPIProps;
+

src/api/java/cofh/api/package-info.java

@@ -0,0 +1,9 @@
+/**
+ * (C) 2014-2016 Team CoFH / CoFH / Cult of the Full Hub
+ * http://www.teamcofh.com
+ */
+@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHLib", provides = "CoFHAPI")
+package cofh.api;
+
+import net.minecraftforge.fml.common.API;
+

src/api/java/invtweaks/LICENSE.txt

@@ -0,0 +1,21 @@
+## Inventory Tweaks Mod license (MIT)
+
+Copyright (c) 2011-2013 Marwane Kalam-Alami
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/api/java/invtweaks/api/IItemTree.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2013 Andrew Crocker
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package invtweaks.api;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Random;
+
+@SuppressWarnings("unused")
+public interface IItemTree {
+    void registerOre(String category, String name, String oreName, int order);
+
+    boolean matches(List<IItemTreeItem> items, String keyword);
+
+    boolean isKeywordValid(String keyword);
+
+    Collection<IItemTreeCategory> getAllCategories();
+
+    IItemTreeCategory getRootCategory();
+
+    void setRootCategory(IItemTreeCategory category);
+
+    IItemTreeCategory getCategory(String keyword);
+
+    boolean isItemUnknown(String id, int damage);
+
+    List<IItemTreeItem> getItems(String id, int damage);
+
+    List<IItemTreeItem> getItems(String name);
+
+    IItemTreeItem getRandomItem(Random r);
+
+    boolean containsItem(String name);
+
+    boolean containsCategory(String name);
+
+    IItemTreeCategory addCategory(String parentCategory, String newCategory) throws NullPointerException;
+
+    void addCategory(String parentCategory, IItemTreeCategory newCategory) throws NullPointerException;
+
+    IItemTreeItem addItem(String parentCategory, String name, String id, int damage, int order)
+            throws NullPointerException;
+
+    void addItem(String parentCategory, IItemTreeItem newItem) throws NullPointerException;
+
+    int getKeywordDepth(String keyword);
+
+    int getKeywordOrder(String keyword);
+}

src/api/java/invtweaks/api/IItemTreeCategory.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2013 Andrew Crocker
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package invtweaks.api;
+
+import java.util.Collection;
+import java.util.List;
+
+@SuppressWarnings("unused")
+public interface IItemTreeCategory {
+    boolean contains(IItemTreeItem item);
+
+    void addCategory(IItemTreeCategory category);
+
+    void addItem(IItemTreeItem item);
+
+    Collection<IItemTreeCategory> getSubCategories();
+
+    Collection<List<IItemTreeItem>> getItems();
+
+    String getName();
+
+    int getCategoryOrder();
+
+    int findCategoryOrder(String keyword);
+
+    int findKeywordDepth(String keyword);
+}

src/api/java/invtweaks/api/IItemTreeItem.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Andrew Crocker
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package invtweaks.api;
+
+@SuppressWarnings("unused")
+public interface IItemTreeItem extends Comparable<IItemTreeItem> {
+    String getName();
+
+    String getId();
+
+    int getDamage();
+
+    int getOrder();
+}

src/api/java/invtweaks/api/IItemTreeListener.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2013 Andrew Crocker
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package invtweaks.api;
+
+import java.util.EventListener;
+
+@SuppressWarnings("unused")
+public interface IItemTreeListener extends EventListener {
+    void onTreeLoaded(IItemTree tree);
+}

src/api/java/invtweaks/api/InvTweaksAPI.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2013 Andrew Crocker
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package invtweaks.api;
+
+import invtweaks.api.container.ContainerSection;
+import net.minecraft.item.ItemStack;
+
+/**
+ * Interface to access functions exposed by Inventory Tweaks
+ * <p/>
+ * The main @Mod instance of the mod implements this interface, so a refernce to it can
+ * be obtained via @Instance("inventorytweaks") or methods in net.minecraftforge.fml.common.Loader
+ * <p/>
+ * All of these functions currently have no effect if called on a dedicated server.
+ */
+@SuppressWarnings("unused")
+public interface InvTweaksAPI {
+    /**
+     * Add a listener for ItemTree load events
+     */
+    void addOnLoadListener(IItemTreeListener listener);
+
+    /**
+     * Remove a listener for ItemTree load events
+     *
+     * @return true if the listener was previously added
+     */
+    boolean removeOnLoadListener(IItemTreeListener listener);
+
+    /**
+     * Toggle sorting shortcut state.
+     */
+    void setSortKeyEnabled(boolean enabled);
+
+    /**
+     * Toggle sorting shortcut supression.
+     * Unlike setSortKeyEnabled, this flag is automatically cleared when GUIs are closed.
+     */
+    void setTextboxMode(boolean enabled);
+
+    /**
+     * Compare two items using the default (non-rule based) algorithm,
+     * sutable for an implementation of Comparator&lt;ItemStack&gt;.
+     *
+     * @param i
+     * @param j
+     * @return A value with a sign representing the relative order of the item stacks
+     */
+    int compareItems(ItemStack i, ItemStack j);
+
+    /**
+     * Initiate a sort as if the player had clicked on a sorting button or pressed the sort key.
+     */
+    void sort(ContainerSection section, SortingMethod method);
+}

src/api/java/invtweaks/api/SortingMethod.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2013 Andrew Crocker
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package invtweaks.api;
+
+@SuppressWarnings("unused")
+public enum SortingMethod {
+    /**
+     * Standard 'r' sorting for generic inventories
+     */
+    DEFAULT,
+    /**
+     * Sort method creating vertical columns of items.
+     * Used for chests only, requires container to have a valid row size for correct results.
+     */
+    VERTICAL,
+    /**
+     * Sort method creating horizontal rows of items.
+     * Used for chests only, requires container to have a valid row size for correct results.
+     */
+    HORIZONTAL,
+    /**
+     * Sort method for player inventory.
+     * Applies to extra player-specified sorting rules for the main inventory.
+     * Will always operate on main inventory.
+     */
+    INVENTORY,
+    /**
+     * Attempts to even the number of items in each stack of the same type of item, without moving full stacks.
+     * Used in crafting grid sorting.
+     */
+    EVEN_STACKS,
+}

src/api/java/invtweaks/api/container/ChestContainer.java

@@ -0,0 +1,38 @@
+package invtweaks.api.container;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A marker for containers that have a chest-like persistant storage component. Enables the Inventroy Tweaks sorting
+ * buttons for this container.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface ChestContainer {
+    // Set to true if the Inventory Tweaks sorting buttons should be shown for this container.
+    boolean showButtons() default true;
+
+    // Size of a chest row
+    int rowSize() default 9;
+
+    // Uses 'large chest' mode for sorting buttons
+    // (Renders buttons vertically down the right side of the GUI)
+    boolean isLargeChest() default false;
+
+    // Annotation for method to get size of a chest row if it is not a fixed size for this container class
+    // Signature int func()
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    @interface RowSizeCallback {
+    }
+
+    // Annotation for method to get size of a chest row if it is not a fixed size for this container class
+    // Signature int func()
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    @interface IsLargeCallback {
+    }
+}

src/api/java/invtweaks/api/container/ContainerSection.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2013 Andrew Crocker
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package invtweaks.api.container;
+
+/**
+ * Names for specific parts of containers. For unknown container types (such as mod containers), only INVENTORY and
+ * CHEST sections are available.
+ */
+@SuppressWarnings("unused")
+public enum ContainerSection {
+    /**
+     * The player's inventory
+     */
+    INVENTORY,
+    /**
+     * The player's inventory (only the hotbar)
+     */
+    INVENTORY_HOTBAR,
+    /**
+     * The player's inventory (all except the hotbar)
+     */
+    INVENTORY_NOT_HOTBAR,
+    /**
+     * The chest or dispenser contents. Also used for unknown container contents.
+     */
+    CHEST,
+    /**
+     * The crafting input
+     */
+    CRAFTING_IN,
+    /**
+     * The crafting input, for containters that store it internally
+     */
+    CRAFTING_IN_PERSISTENT,
+    /**
+     * The crafting output
+     */
+    CRAFTING_OUT,
+    /**
+     * The armor slots
+     */
+    ARMOR,
+    /**
+     * The furnace input
+     */
+    FURNACE_IN,
+    /**
+     * The furnace output
+     */
+    FURNACE_OUT,
+    /**
+     * The furnace fuel
+     */
+    FURNACE_FUEL,
+    /**
+     * The enchantment table slot
+     */
+    ENCHANTMENT,
+    /**
+     * The three bottles slots in brewing tables
+     * NOTE: Do not use without also using BREWING_INGREDIENT.
+     */
+    BREWING_BOTTLES,
+    /**
+     * The top slot in brewing tables
+     * NOTE: Do not use without also using BREWING_BOTTLES.
+     */
+    BREWING_INGREDIENT
+}

src/api/java/invtweaks/api/container/ContainerSectionCallback.java

@@ -0,0 +1,16 @@
+package invtweaks.api.container;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A marker for a method to call which returns the set of ContainerSections for this container.
+ * <p/>
+ * Signature of the method should be Map<ContainerSection, List<Slot>> func()
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface ContainerSectionCallback {
+}

src/api/java/invtweaks/api/container/IgnoreContainer.java

@@ -0,0 +1,15 @@
+package invtweaks.api.container;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Use this annotation to override inherited annotation properties and mark a Container as unsortable.
+ * This effect is inherited as well.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface IgnoreContainer {
+}

src/api/java/invtweaks/api/container/InventoryContainer.java

@@ -0,0 +1,20 @@
+package invtweaks.api.container;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A marker for containers that need special treatment, such as crafting inputs or alternate player inventory positions,
+ * but do not have a chest-like component.
+ * <p/>
+ * Does not enable the Inventory Tweaks sorting buttons for this container.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface InventoryContainer {
+    // Set to true if the Inventory Tweaks options button should be shown for this container.
+    // (For instance, if you are replacing a vanilla container such as the player's inventory)
+    boolean showOptions() default true;
+}

src/main/java/forestry/Forestry.java

@@ -12,41 +12,30 @@ 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.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
-import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
-import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.GameRegistry.Type;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.Mod.EventHandler;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLInterModComms;
+import net.minecraftforge.fml.common.event.FMLInterModComms.IMCEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
+import net.minecraftforge.fml.common.network.NetworkRegistry;
+import net.minecraftforge.fml.common.registry.GameRegistry;
 
 import forestry.api.core.ForestryAPI;
-import forestry.core.ClimateManager;
 import forestry.core.EventHandlerCore;
 import forestry.core.config.Config;
 import forestry.core.config.Constants;
 import forestry.core.config.GameMode;
-import forestry.core.config.Version;
 import forestry.core.errors.EnumErrorCode;
 import forestry.core.errors.ErrorStateRegistry;
 import forestry.core.gui.GuiHandler;
 import forestry.core.multiblock.MultiblockEventHandler;
 import forestry.core.network.PacketHandler;
 import forestry.core.proxy.Proxies;
-import forestry.core.utils.Log;
-import forestry.core.utils.StringUtil;
 import forestry.core.worldgen.WorldGenerator;
 import forestry.plugins.PluginManager;
 
@@ -56,29 +45,25 @@ import forestry.plugins.PluginManager;
  * @author SirSengir
  */
 @Mod(
-		modid = Constants.MOD,
-		name = Constants.MOD,
+		modid = Constants.MOD_ID,
+		name = "Forestry",
 		version = Constants.VERSION,
 		guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
-		dependencies = "required-after:Forge@[10.13.4.1566,);"
-				+ "after:Buildcraft|Core@[6.1.7,);"
-				+ "after:ExtrabiomesXL;"
-				+ "after:BiomesOPlenty;"
-				+ "after:IC2@[2.0.140,);"
-				+ "after:Natura@[2.2.0,);"
-				+ "after:HardcoreEnderExpansion;")
+		acceptedMinecraftVersions = "[1.10]",
+		dependencies = "required-after:Forge@[12.18.0.1989,);"
+				+ "after:JEI@[3.7.0,);")
 public class Forestry {
 
-	@Mod.Instance(Constants.MOD)
+	@Mod.Instance(Constants.MOD_ID)
 	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();
+		FluidRegistry.enableUniversalBucket();
 	}
 
 	public static PacketHandler packetHandler;
@@ -90,17 +75,18 @@ public class Forestry {
 		// Register event handler
 		EventHandlerCore eventHandlerCore = new EventHandlerCore();
 		MinecraftForge.EVENT_BUS.register(eventHandlerCore);
-		FMLCommonHandler.instance().bus().register(eventHandlerCore);
 		MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler());
 
-		configFolder = new File(event.getModConfigurationDirectory(), "forestry");
+		configFolder = new File(event.getModConfigurationDirectory(), Constants.MOD_ID);
 		Config.load();
 
-		PluginManager.runSetup();
+		PluginManager.runSetup(event);
 
 		ForestryAPI.activeMode = new GameMode(Config.gameMode);
 
 		PluginManager.runPreInit();
+		
+		Proxies.render.registerModels();
 	}
 
 	@EventHandler
@@ -109,6 +95,8 @@ public class Forestry {
 		NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
 
 		PluginManager.runInit();
+
+		Proxies.render.registerItemAndBlockColors();
 	}
 
 	@EventHandler
@@ -139,23 +127,4 @@ public class Forestry {
 	public void processIMCMessages(IMCEvent event) {
 		PluginManager.processIMCMessages(event.getMessages());
 	}
-
-	@EventHandler
-	public void missingMapping(FMLMissingMappingsEvent event) {
-		for (MissingMapping mapping : event.get()) {
-			if (mapping.type == Type.BLOCK) {
-				Block block = GameRegistry.findBlock(Constants.MOD, StringUtil.cleanTags(mapping.name));
-				if (block != null) {
-					mapping.remap(block);
-					Log.warning("Remapping block " + mapping.name + " to " + StringUtil.cleanBlockName(block));
-				}
-			} else {
-				Item item = GameRegistry.findItem(Constants.MOD, StringUtil.cleanTags(mapping.name));
-				if (item != null) {
-					mapping.remap(item);
-					Log.warning("Remapping item " + mapping.name + " to " + StringUtil.cleanItemName(item));
-				}
-			}
-		}
-	}
 }

src/main/java/forestry/api/LICENSE.txt

@@ -0,0 +1,11 @@
+License („MIT“)
+
+Forestry API
+
+Copyright (c) 2011 - 2014 SirSengir.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/main/java/forestry/api/README.md

@@ -0,0 +1,26 @@
+Forestry API
+====================================
+
+### What is it?
+
+Forestry is a modification for the game Minecraft and known primarily for its farms and bees. This is the API for inter-mod operations.
+
+### Homepage
+
+[Wiki](http://forestry.sengir.net/)
+
+[Forums](http://forestry.sengir.net/forum/)
+
+[IRC #forestry on esper.net](http://webchat.esper.net/?nick=ForestryWiki...&channels=forestry&prompt=1)
+
+### Notes
+
+This is only the API. It is not intended to be used by itself, but rather for use either with Forestry itself or another mod which wants to use a functionality of Forestry.
+
+Package versioning follows the rules laid out by http://semver.org/
+
+Bugfixes are generally welcome. If you want to contribute something which changes game mechanics, please talk to someone with commit privileges first. Nothing is more frustrating than putting a lot of work and effort into a new game mechanic and then having the PR rejected because it doesn’t fit gameplay-wise.
+
+### License & Copyright
+
+Forestry API is (c) 2011 - 2014 SirSengir and licensed under MIT. See the LICENSE.txt for more information. Note that the core Forestry source is licensed differently! The Forestry API may also contain code contributed by CovertJaguar, Player, MysteriousAges, Binnie and others.

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

@@ -1,31 +1,39 @@
 /*******************************************************************************
  * 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 javax.annotation.Nonnull;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import net.minecraft.item.ItemStack;
+
 /**
- * 
+ *
  * Some miscellaneous lists and settings for bees.
- * 
+ *
  * @author SirSengir
  */
 public class BeeManager {
 
 	/**
-	 * 0 - Common Village Bees 1 - Uncommon Village Bees (20 % of spawns)
+	 * Common Village Bees
 	 */
-	public static ArrayList<IBeeGenome>[] villageBees;
+	public static List<IBeeGenome> commonVillageBees;
+	/**
+	 * Uncommon Village Bees (20 % of spawns)
+	 */
+	public static List<IBeeGenome> uncommonVillageBees;
 
 	/**
 	 * List of items that can induce swarming. Integer denotes x in 1000 chance.
 	 */
-	public static HashMap<ItemStack, Integer> inducers = new HashMap<ItemStack, Integer>();
+	@Nonnull
+	public static final Map<ItemStack, Integer> inducers = new HashMap<>();
 
 	/**
 	 * Convenient access to AlleleManager.alleleRegistry.getSpeciesRoot("rootBees")

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -12,42 +12,52 @@ package forestry.api.apiculture;
  */
 public class DefaultBeeModifier implements IBeeModifier {
 
+	@Override
 	public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
 		return 1.0f;
 	}
 
+	@Override
 	public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
 		return 1.0f;
 	}
 
+	@Override
 	public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
 		return 1.0f;
 	}
 
+	@Override
 	public float getProductionModifier(IBeeGenome genome, float currentModifier) {
 		return 1.0f;
 	}
 
+	@Override
 	public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
 		return 1.0f;
 	}
 
+	@Override
 	public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
 		return 1.0f;
 	}
 
+	@Override
 	public boolean isSealed() {
 		return false;
 	}
 
+	@Override
 	public boolean isSelfLighted() {
 		return false;
 	}
 
+	@Override
 	public boolean isSunlightSimulated() {
 		return false;
 	}
 
+	@Override
 	public boolean isHellish() {
 		return false;
 	}

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -19,7 +19,7 @@ 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 {
@@ -44,14 +44,9 @@ public enum EnumBeeChromosome implements IChromosomeType {
 	 */
 	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.
+	 * If true, a naturally diurnal 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),
+	NEVER_SLEEPS(IAlleleBoolean.class),
 	/**
 	 * Humidity difference to its native supported one the bee can tolerate.
 	 */
@@ -59,7 +54,7 @@ public enum EnumBeeChromosome implements IChromosomeType {
 	/**
 	 * If true the bee can work during rain.
 	 */
-	TOLERANT_FLYER(IAlleleBoolean.class),
+	TOLERATES_RAIN(IAlleleBoolean.class),
 	/**
 	 * If true, the bee can work without a clear view of the sky.
 	 */
@@ -81,15 +76,15 @@ public enum EnumBeeChromosome implements IChromosomeType {
 	 */
 	EFFECT(IAlleleBeeEffect.class);
 	
-	Class<? extends IAllele> clss;
+	private final Class<? extends IAllele> alleleClass;
 	
-	EnumBeeChromosome(Class<? extends IAllele> clss) {
-		this.clss = clss;
+	EnumBeeChromosome(Class<? extends IAllele> alleleClass) {
+		this.alleleClass = alleleClass;
 	}
 
 	@Override
 	public Class<? extends IAllele> getAlleleClass() {
-		return clss;
+		return alleleClass;
 	}
 
 	@Override

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -10,7 +10,7 @@ import java.util.Locale;
 import forestry.api.genetics.ISpeciesType;
 
 public enum EnumBeeType implements ISpeciesType {
-	DRONE, PRINCESS, QUEEN, LARVAE, NONE;
+	DRONE, PRINCESS, QUEEN, LARVAE;
 
 	public static final EnumBeeType[] VALUES = values();
 

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

@@ -1,19 +1,15 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
-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>
+	/**
+	 * <blockquote><pre>e.g. FlowerManager.flowerRegister.registerPlantableFlower(new ItemStack(Blocks.RED_FLOWER), 1.0, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);</pre></blockquote>
 	 */
 	public static IFlowerRegistry flowerRegistry;
 
@@ -27,10 +23,4 @@ public class FlowerManager {
 	public static final String FlowerTypeWheat = "flowersWheat";
 	public static final String FlowerTypeGourd = "flowersGourd";
 
-	/**
-	 * @deprecated since Forestry 3.4. Use IFlowerRegistry.registerPlantableFlower instead.
-	 * Completely unused since Forestry 4.0, kept for backward compatibility with older mods.
-	 */
-	@Deprecated
-	public static ArrayList<ItemStack> plainFlowers = new ArrayList<ItemStack>();
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -11,23 +11,20 @@ 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.
+	 * Called by apiaries to cause an effect in the world. (server)
+	 *
+	 * @param genome Genome of the bee queen causing this effect
+	 * @param storedData Object containing the stored effect data for the apiary/hive the bee is in.
 	 * @param housing {@link IBeeHousing} the bee currently resides in.
 	 * @return storedData, may have been manipulated.
 	 */
 	IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
 
 	/**
-	 * Is called to produce bee effects.
-	 * 
-	 * @param genome
-	 * @param storedData
-	 *            Object containing the stored effect data for the apiary/hive the bee is in.
+	 * Is called to produce visual bee effects. (client)
+	 *
+	 * @param genome Genome of the bee queen causing this effect
+	 * @param storedData Object containing the stored effect data for the apiary/hive the bee is in.
 	 * @param housing {@link IBeeHousing} the bee currently resides in.
 	 * @return storedData, may have been manipulated.
 	 */

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

@@ -7,12 +7,13 @@ package forestry.api.apiculture;
 
 import java.util.Map;
 
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import forestry.api.core.IModelManager;
 import forestry.api.genetics.IAlleleSpecies;
 
 public interface IAlleleBeeSpecies extends IAlleleSpecies {
@@ -20,6 +21,7 @@ public interface IAlleleBeeSpecies extends IAlleleSpecies {
 	/**
 	 * @return the IBeeRoot
 	 */
+	@Override
 	IBeeRoot getRoot();
 
 	/**
@@ -44,13 +46,8 @@ public interface IAlleleBeeSpecies extends IAlleleSpecies {
 	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();
-
+	ModelResourceLocation getModel(EnumBeeType type);
+	
+	@SideOnly(Side.CLIENT)
+	void registerModels(Item item, IModelManager manager);
 }

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

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

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -10,14 +10,14 @@ 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.
 	 */
@@ -30,7 +30,7 @@ public interface IApiaristTracker extends IBreedingTracker {
 
 	/**
 	 * Register the birth of a princess. Will mark species as discovered.
-	 * 
+	 *
 	 * @param princess
 	 *            Created princess.
 	 */
@@ -43,7 +43,7 @@ public interface IApiaristTracker extends IBreedingTracker {
 
 	/**
 	 * Register the birth of a drone. Will mark species as discovered.
-	 * 
+	 *
 	 * @param drone
 	 *            Created drone.
 	 */

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

@@ -1,12 +1,11 @@
 /*******************************************************************************
  * 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;
 
 /**
@@ -23,17 +22,4 @@ public interface IArmorApiarist {
 	 * @return Whether or not the armor should protect the player from that attack
 	 */
 	boolean protectEntity(EntityLivingBase entity, ItemStack armor, String cause, boolean doProtect);
-
-	/**
-	 * Called when the apiarist's armor acts as protection against an attack.
-	 * 
-	 * @param player Player being attacked
-	 * @param armor Armor item
-	 * @param cause Optional cause of attack, such as a bee effect identifier
-	 * @param doProtect Whether or not to actually do the side effects of protection
-	 * @return Whether or not the armor should protect the player from that attack
-	 * @deprecated since Forestry 4.2. Use protectEntity
-	 */
-	@Deprecated
-	public boolean protectPlayer(EntityPlayer player, ItemStack armor, String cause, boolean doProtect);
 }

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

@@ -6,7 +6,6 @@
 package forestry.api.apiculture;
 
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
 /**
@@ -32,31 +31,9 @@ public interface IArmorApiaristHelper {
 	 * @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
+	 * @return The number of valid Apiarist Armor pieces the player is wearing that are actually protecting.
+	 * 			4 means full protection, but it can go higher if they are holding items like the smoker.
 	 * @since Forestry 4.2
 	 */
 	int wearsItems(EntityLivingBase entity, String cause, boolean doProtect);
-
-	/**
-	 * 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);
 }

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

@@ -1,24 +1,26 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Set;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.Biome;
 
+import forestry.api.arboriculture.ITree;
 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 {
@@ -26,11 +28,15 @@ public interface IBee extends IIndividualLiving {
 	/**
 	 * @return Bee's genetic information.
 	 */
+	@Nonnull
+	@Override
 	IBeeGenome getGenome();
 
 	/**
 	 * @return Genetic information of the bee's mate, null if unmated.
 	 */
+	@Nullable
+	@Override
 	IBeeGenome getMate();
 
 	/**
@@ -65,7 +71,7 @@ public interface IBee extends IIndividualLiving {
 	 */
 	Set<IErrorState> getCanWork(IBeeHousing housing);
 
-	List<BiomeGenBase> getSuitableBiomes();
+	List<Biome> getSuitableBiomes();
 
 	ItemStack[] getProduceList();
 
@@ -79,8 +85,8 @@ public interface IBee extends IIndividualLiving {
 
 	void plantFlowerRandom(IBeeHousing housing);
 
-	IIndividual retrievePollen(IBeeHousing housing);
+	ITree retrievePollen(IBeeHousing housing);
 
-	boolean pollinateRandom(IBeeHousing housing, IIndividual pollen);
+	boolean pollinateRandom(IBeeHousing housing, ITree pollen);
 
 }

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

@@ -12,7 +12,7 @@ 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.
+	 * See IAlleleBeeSpeciesBuilder and IAlleleSpeciesBuilder 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)
@@ -25,7 +25,7 @@ public interface IBeeFactory {
 	 * @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);
+	IAlleleBeeSpeciesBuilder createSpecies(String uid, boolean dominant, String authority, String unlocalizedName, String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor);
 
 	/**
 	 * Creates a new bee branch.

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

@@ -1,24 +1,28 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import net.minecraft.util.math.Vec3i;
+
 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 {
 
+	@Override
 	IAlleleBeeSpecies getPrimary();
 	
+	@Override
 	IAlleleBeeSpecies getSecondary();
 
 	float getSpeed();
@@ -31,9 +35,9 @@ public interface IBeeGenome extends IGenome {
 
 	EnumTolerance getToleranceHumid();
 
-	boolean getNocturnal();
+	boolean getNeverSleeps();
 
-	boolean getTolerantFlyer();
+	boolean getToleratesRain();
 
 	boolean getCaveDwelling();
 
@@ -41,7 +45,7 @@ public interface IBeeGenome extends IGenome {
 
 	int getFlowering();
 
-	int[] getTerritory();
+	Vec3i getTerritory();
 
 	IAlleleBeeEffect getEffect();
 

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

@@ -1,20 +1,22 @@
 /*******************************************************************************
  * 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.util.math.Vec3d;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
 
 import com.mojang.authlib.GameProfile;
 
-import forestry.api.core.IClimateProvider;
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
 import forestry.api.core.IErrorLogicSource;
 import forestry.api.genetics.IHousing;
 
-public interface IBeeHousing extends IHousing, IClimateProvider, IErrorLogicSource {
+public interface IBeeHousing extends IHousing, IErrorLogicSource {
 
 	/**
 	 * Used by BeeManager.beeRoot.createBeeHousingModifier(IBeeHousing housing)
@@ -31,17 +33,27 @@ public interface IBeeHousing extends IHousing, IClimateProvider, IErrorLogicSour
 	Iterable<IBeeListener> getBeeListeners();
 
 	IBeeHousingInventory getBeeInventory();
+
 	IBeekeepingLogic getBeekeepingLogic();
 
+	EnumTemperature getTemperature();
+
+	EnumHumidity getHumidity();
+
 	int getBlockLightValue();
+
 	boolean canBlockSeeTheSky();
 
-	World getWorld();
+	/** Must not be named "getWorld" to avoid SpecialSource issue https://github.com/md-5/SpecialSource/issues/12 */
+	World getWorldObj();
+
+	Biome getBiome();
+
 	GameProfile getOwner();
 
 	/**
 	 * @since Forestry 4.2
 	 * @return exact coordinates where bee FX should spawn from
 	 */
-	Vec3 getBeeFXCoordinates();
+	Vec3d getBeeFXCoordinates();
 }

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

@@ -10,9 +10,11 @@ import net.minecraft.item.ItemStack;
 public interface IBeeHousingInventory {
 
 	ItemStack getQueen();
+
 	ItemStack getDrone();
 
 	void setQueen(ItemStack itemstack);
+
 	void setDrone(ItemStack itemstack);
 
 	/**

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

@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.core.IModelManager;
+
+public interface IBeeModelProvider {
+	@SideOnly(Side.CLIENT)
+	void registerModels(Item item, IModelManager manager);
+
+	@SideOnly(Side.CLIENT)
+	ModelResourceLocation getModel(EnumBeeType type);
+}

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -9,6 +9,7 @@ import forestry.api.genetics.IMutation;
 
 public interface IBeeMutation extends IMutation {
 	
+	@Override
 	IBeeRoot getRoot();
 	
 	/**

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

@@ -5,8 +5,9 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import forestry.api.genetics.IMutationCustom;
-
-public interface IBeeMutationCustom extends IBeeMutation, IMutationCustom {
+import forestry.api.genetics.IMutationBuilder;
 
+public interface IBeeMutationBuilder extends IMutationBuilder {
+	@Override
+	IBeeMutation build();
 }

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

@@ -11,7 +11,7 @@ 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.
+	 * See IBeeMutationBuilder and IMutationBuilder for adding additional properties to the returned mutation.
 	 *
 	 * @param parentBee0 A parent bee for this mutation
 	 * @param parentBee1 A parent bee for this mutation
@@ -19,5 +19,5 @@ public interface IBeeMutationFactory {
 	 * @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);
+	IBeeMutationBuilder createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance);
 }

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

@@ -1,22 +1,21 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.List;
 
+import com.mojang.authlib.GameProfile;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.ISpeciesRoot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
-import com.mojang.authlib.GameProfile;
-
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.ISpeciesRoot;
-
 public interface IBeeRoot extends ISpeciesRoot {
 
 	/**
@@ -48,16 +47,20 @@ public interface IBeeRoot extends ISpeciesRoot {
 	IBeeGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
 
 	/* BREEDING TRACKER */
+
 	/**
 	 * @param world
 	 * @return {@link IApiaristTracker} associated with the passed world.
 	 */
+	@Override
 	IApiaristTracker getBreedingTracker(World world, GameProfile player);
 
 	/* BEE SPECIFIC */
+
 	/**
 	 * @return type of bee encoded on the itemstack. EnumBeeType.NONE if it isn't a bee.
 	 */
+	@Nullable
 	@Override
 	EnumBeeType getType(ItemStack stack);
 
@@ -76,11 +79,11 @@ public interface IBeeRoot extends ISpeciesRoot {
 	 *            Valid {@link IBeeGenome}
 	 * @return {@link IBee} from the passed genome
 	 */
-	IBee getBee(World world, IBeeGenome genome);
+	IBee getBee(IBeeGenome genome);
 
 	/**
 	 * Creates an IBee suitable for a queen containing the necessary second genome for the mate.
-	 * 
+	 *
 	 * @param genome
 	 *            Valid {@link IBeeGenome}
 	 * @param mate
@@ -95,7 +98,7 @@ public interface IBeeRoot extends ISpeciesRoot {
 
 	/* MUTATIONS */
 	@Override
-	Collection<IBeeMutation> getMutations(boolean shuffle);
+	List<IBeeMutation> getMutations(boolean shuffle);
 
 	/* GAME MODE */
 	void resetBeekeepingMode();
@@ -111,6 +114,7 @@ public interface IBeeRoot extends ISpeciesRoot {
 	void setBeekeepingMode(World world, String name);
 
 	/* MISC */
+
 	/**
 	 * Creates beekeepingLogic for a housing.
 	 * Should be used when the housing is created, see IBeekeepingLogic

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

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

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

@@ -1,20 +1,27 @@
 /*******************************************************************************
  * 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 javax.annotation.Nonnull;
+import java.util.List;
 
-import forestry.api.core.INBTTagable;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.math.BlockPos;
+
+import forestry.api.core.INbtReadable;
+import forestry.api.core.INbtWritable;
 
 /**
  * Stores beekeeping logic for bee housings.
  * Get one with BeeManager.beeRoot.createBeekeepingLogic(IBeeHousing housing)
- * Save and load it to NBT using the INBTTagable methods.
+ * Save and load it to NBT using the INbtWritable methods.
  */
-public interface IBeekeepingLogic extends INBTTagable {
+public interface IBeekeepingLogic extends INbtWritable, INbtReadable {
 
 	/* SERVER */
 
@@ -29,14 +36,20 @@ public interface IBeekeepingLogic extends INBTTagable {
 	 */
 	void doWork();
 
+	/**
+	 * Force the logic to refresh any cached values and error states.
+	 * Call this when a player opens the gui so that all errors are up to date.
+	 */
+	void clearCachedValues();
+
 
 	/* CLIENT */
 
 	/**
-	 * Call this when the housing comes into view of the client.
-	 * (i.e. when tile.getDescriptionPacket() is called)
+	 * Sync to client by using {@link #writeToNBT(NBTTagCompound)} in your {@link TileEntity#getUpdateTag()}
 	 */
 	void syncToClient();
+
 	void syncToClient(EntityPlayerMP player);
 
 	/**
@@ -58,4 +71,10 @@ public interface IBeekeepingLogic extends INBTTagable {
 	 */
 	void doBeeFX();
 
+	/**
+	 * Used by bee fx to direct bees to nearby flowers.
+	 * These positions are synced to the client from the server.
+	 */
+	@Nonnull
+	List<BlockPos> getFlowerPositions();
 }

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

@@ -1,12 +1,13 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
 import java.util.ArrayList;
 
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public interface IBeekeepingMode {
@@ -30,7 +31,7 @@ public interface IBeekeepingMode {
 	 * @param queen
 	 * @return fertility taking into account the birthing queen and surroundings.
 	 */
-	int getFinalFertility(IBee queen, World world, int x, int y, int z);
+	int getFinalFertility(IBee queen, World world, BlockPos pos);
 
 	/**
 	 * @param queen
@@ -46,7 +47,7 @@ public interface IBeekeepingMode {
 	boolean isOverworked(IBee queen, IBeeHousing housing);
 
 	/**
-	 * 
+	 *
 	 * @param queen
 	 * @param offspring
 	 * @param housing

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -8,31 +8,37 @@ package forestry.api.apiculture;
 import java.util.Collection;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
 
 /**
  * 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);
+	IBee getBeeType(IBlockAccess world, BlockPos pos);
 
-	Collection<ItemStack> getDrones(World world, int x, int y, int z, int fortune);
-
-	Collection<ItemStack> getAdditional(World world, int x, int y, int z, int fortune);
+	Collection<ItemStack> getExtraItems(IBlockAccess world, BlockPos pos, int fortune);
 
 	/**
-	 * Chance to drop. Default drops have 80 (= 80 %).
-	 * 
+	 * Chance to drop a bee or extra items. Default drops have 0.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.
+	 * @param pos Coordinates of the broken hive.
+	 * @return Chance for drop as a float of 0.0 - 1.0.
 	 */
-	int getChance(World world, int x, int y, int z);
+	double getChance(IBlockAccess world, BlockPos pos, int fortune);
+
+	/**
+	 * Chance for the princess to be ignoble. Default is around 0.4 to 0.7 (40% - 70%).
+	 *
+	 * @param world Minecraft world this is called for.
+	 * @param pos Coordinates of the broken hive.
+	 * @return Chance for ignoble as a float of 0.0 - 1.0.
+	 */
+	double getIgnobleChance(IBlockAccess world, BlockPos pos, int fortune);
 }

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

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

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

@@ -0,0 +1,25 @@
+package forestry.api.apiculture;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public interface IHiveTile {
+	/**
+	 * Call to calm agitated bees. Used by the smoker to stop wild bees from attacking as much.
+	 * Bees will not stay calm for very long.
+	 */
+	void calmBees();
+
+	boolean isAngry();
+
+	/**
+	 * Called when the hive is attacked.
+	 */
+	void onAttack(World world, BlockPos pos, EntityPlayer player);
+
+	/**
+	 * Called when the hive is broken.
+	 */
+	void onBroken(World world, BlockPos pos, EntityPlayer player, boolean canHarvest);
+}

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

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

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

@@ -5,9 +5,12 @@
  ******************************************************************************/
 package forestry.api.apiculture.hives;
 
-import net.minecraft.block.Block;
+import java.util.Random;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.Biome;
 
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
@@ -22,27 +25,28 @@ public interface IHiveDescription {
 	/**
 	 * The hive block to be placed in the world.
 	 */
-	Block getBlock();
-	int getMeta();
+	IBlockState getBlockState();
 
 	/**
 	 * returns true if the hive can be generated in these conditions.
 	 * Used as a fast early-elimination check for hives that have no hope of spawning in the area.
 	 */
-	boolean isGoodBiome(BiomeGenBase biome);
+	boolean isGoodBiome(Biome biome);
+
 	boolean isGoodHumidity(EnumHumidity humidity);
+
 	boolean isGoodTemperature(EnumTemperature temperature);
 
 	/**
 	 * float representing the relative chance a hive will generate in a chunk.
 	 * Default is 1.0, higher numbers result in more hives, smaller will result in fewer.
 	 * Tree hives want around 3.0 to 4.0 since there are less locations to generate on.
- 	 */
+	 */
 	float getGenChance();
 
 	/**
 	 * Called after successful hive generation.
 	 * world, x, y, z give the location of the new hive.
 	 **/
-	void postGen(World world, int x, int y, int z);
+	void postGen(World world, Random rand, BlockPos pos);
 }

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

@@ -5,25 +5,30 @@
  ******************************************************************************/
 package forestry.api.apiculture.hives;
 
+import javax.annotation.Nullable;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public interface IHiveGen {
 
 	/**
-	 * return a Y value that the hive should try to generate at.
-	 * returns negative if the hive can't be placed anywhere.
+	 * return a position that the hive should try to generate at.
+	 * returns null if the hive can't be placed anywhere.
 	 */
-	int getYForHive(World world, int x, int z);
+	@Nullable
+	BlockPos getPosForHive(World world, int x, int z);
 
 	/**
 	 * returns true if the hive can be generated at this location.
 	 * Used for advanced conditions, like checking that the ground below the hive is a certain type.
 	 */
-	boolean isValidLocation(World world, int x, int y, int z);
+	boolean isValidLocation(World world, BlockPos pos);
 
 	/**
 	 * returns true if the hive can safely replace the block at this location.
 	 */
-	boolean canReplace(World world, int x, int y, int z);
+	boolean canReplace(IBlockState blockState, World world, BlockPos pos);
 
 }

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

@@ -5,20 +5,59 @@
  ******************************************************************************/
 package forestry.api.apiculture.hives;
 
+import javax.annotation.Nonnull;
 import java.util.List;
+import java.util.Locale;
+
+import net.minecraft.util.IStringSerializable;
 
 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";
+	enum HiveType implements IStringSerializable {
+		FOREST("forestry:forest", "forestry.speciesForest"),
+		MEADOWS("forestry:meadows", "forestry.speciesMeadows"),
+		DESERT("forestry:desert", "forestry.speciesModest"),
+		JUNGLE("forestry:jungle", "forestry.speciesTropical"),
+		END("forestry:end", "forestry.speciesEnded"),
+		SNOW("forestry:snow", "forestry.speciesWintry"),
+		SWAMP("forestry:swamp", "forestry.speciesMarshy"),
+		SWARM("forestry:swarm", "forestry.speciesForest");
+		
+		public static final HiveType[] VALUES = values();
+
+		@Nonnull
+		private final String hiveUid;
+		@Nonnull
+		private final String speciesUid;
+
+		HiveType(@Nonnull String hiveUid, @Nonnull String speciesUid) {
+			this.hiveUid = hiveUid;
+			this.speciesUid = speciesUid;
+		}
+
+		@Nonnull
+		public String getHiveUid() {
+			return hiveUid;
+		}
+
+		@Nonnull
+		public String getSpeciesUid() {
+			return speciesUid;
+		}
+
+		@Override
+		public String getName() {
+			return name().toLowerCase(Locale.ENGLISH);
+		}
+
+		public int getMeta() {
+			return ordinal();
+		}
+		
+	}
 
 	/**
 	 * Adds a new hive to be generated in the world.
@@ -29,5 +68,6 @@ public interface IHiveRegistry {
 	 * Add drops to a registered hive.
 	 */
 	void addDrops(String hiveName, IHiveDrop... drops);
+
 	void addDrops(String hiveName, List<IHiveDrop> drop);
 }

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

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

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

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

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

@@ -0,0 +1,102 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import javax.annotation.Nonnull;
+import java.util.Locale;
+import java.util.Random;
+
+public enum EnumForestryWoodType implements IWoodType {
+	LARCH(4, 20),
+	TEAK(4, 20),
+	ACACIA(4, 20),
+	LIME(4, 19),
+	CHESTNUT(4, 21),
+	WENGE(4, 20),
+	BAOBAB(4, 20),
+	SEQUOIA(3, 18, 4.0f),
+
+	KAPOK(4, 20),
+	EBONY(4, 20),
+	MAHOGANY(4, 20),
+	BALSA(4, 20, 1.0f),
+	WILLOW(4, 20),
+	WALNUT(4, 21),
+	GREENHEART(4, 20, 7.5f),
+	CHERRY(4, 20),
+
+	MAHOE(4, 20),
+	POPLAR(4, 20),
+	PALM(4, 20),
+	PAPAYA(4, 20),
+	PINE(4, 20, 3.0f),
+	PLUM(4, 20),
+	MAPLE(4, 20),
+	CITRUS(4, 20),
+
+	GIGANTEUM(3, 18, 4.0f),
+	IPE(4, 20),
+	PADAUK(4, 20),
+	COCOBOLO(4, 20),
+	ZEBRAWOOD(4, 20);
+
+	public static final float DEFAULT_HARDNESS = 2.0f;
+	public static final EnumForestryWoodType[] VALUES = values();
+
+	private final int carbonization;
+	private final int combustability;
+	private final float hardness;
+
+	EnumForestryWoodType(int carbonization, int combustability) {
+		this(carbonization, combustability, DEFAULT_HARDNESS);
+	}
+
+	EnumForestryWoodType(int carbonization, int combustability, float hardness) {
+		this.carbonization = carbonization;
+		this.combustability = combustability;
+		this.hardness = hardness;
+	}
+
+	@Override
+	public float getHardness() {
+		return hardness;
+	}
+	
+	public static EnumForestryWoodType getRandom(Random random) {
+		return VALUES[random.nextInt(VALUES.length)];
+	}
+
+	@Override
+	public String toString() {
+		return super.toString().toLowerCase(Locale.ENGLISH);
+	}
+	
+	@Override
+	public String getName() {
+		return toString();
+	}
+
+	@Override
+	public int getMetadata() {
+		return ordinal();
+	}
+
+	@Nonnull
+	public static EnumForestryWoodType byMetadata(int meta) {
+		if (meta < 0 || meta >= VALUES.length) {
+			meta = 0;
+		}
+		return VALUES[meta];
+	}
+
+	public int getCarbonization() {
+		return carbonization;
+	}
+
+	public int getCombustability() {
+		return combustability;
+	}
+}

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

@@ -5,7 +5,7 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IFruitFamily;
@@ -37,12 +37,12 @@ public enum EnumFruitFamily implements IFruitFamily {
 
 	@Override
 	public String getName() {
-		return StatCollector.translateToLocal("for.family." + uid);
+		return I18n.translateToLocal("for.family." + uid);
 	}
 
 	@Override
 	public String getDescription() {
-		return StatCollector.translateToLocal("for.family." + uid + ".description");
+		return I18n.translateToLocal("for.family." + uid + ".description");
 	}
 
 }

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

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

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;

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

@@ -5,8 +5,10 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import forestry.api.genetics.IMutationCustom;
-
-public interface ITreeMutationCustom extends ITreeMutation, IMutationCustom {
-
+public enum EnumPileType{
+	WOOD,
+	DIRT,
+	ASH;
+	
+	public static final EnumPileType[] VALUES = values();
 }

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

@@ -1,14 +1,12 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
 import java.util.Locale;
 
-import net.minecraftforge.common.EnumPlantType;
-
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IAlleleArea;
 import forestry.api.genetics.IAlleleBoolean;
@@ -18,6 +16,7 @@ import forestry.api.genetics.IAllelePlantType;
 import forestry.api.genetics.IChromosomeType;
 import forestry.api.genetics.IFruitFamily;
 import forestry.api.genetics.ISpeciesRoot;
+import net.minecraftforge.common.EnumPlantType;
 
 public enum EnumTreeChromosome implements IChromosomeType {
 
@@ -28,7 +27,9 @@ public enum EnumTreeChromosome implements IChromosomeType {
 	SPECIES(IAlleleTreeSpecies.class),
 	/**
 	 * {@link IGrowthProvider}, determines conditions required by the tree to grow.
+	 * @deprecated unused
 	 */
+	@Deprecated
 	GROWTH(IAlleleGrowth.class),
 	/**
 	 * A float modifying the height of the tree. Taken into account at worldgen.
@@ -47,16 +48,20 @@ public enum EnumTreeChromosome implements IChromosomeType {
 	 */
 	YIELD(IAlleleFloat.class),
 	/**
-	 * May add additional tolerances for {@link EnumPlantTypes}.
+	 * May add additional tolerances for {@link EnumPlantType}.
+	 * @deprecated this is tied to species directly
 	 */
+	@Deprecated
 	PLANT(IAllelePlantType.class),
 	/**
 	 * Determines the speed at which fruit will ripen on this tree.
 	 */
 	SAPPINESS(IAlleleFloat.class),
 	/**
-	 * Territory for leaf effects. Unused.
+	 * Territory for leaf effects.
+	 * @deprecated unused
 	 */
+	@Deprecated
 	TERRITORY(IAlleleArea.class),
 	/**
 	 * Leaf effect. Unused.
@@ -66,23 +71,34 @@ public enum EnumTreeChromosome implements IChromosomeType {
 	 * Amount of random ticks which need to elapse before a sapling will grow into a tree.
 	 */
 	MATURATION(IAlleleInteger.class),
-
+	
 	GIRTH(IAlleleInteger.class),
+	/**
+	 * The combustibility of the wood, when it burn to charcoal and the combustibility of the charcoal.
+	 * @deprecated this is tied to species directly
+	 */
+	@Deprecated
+	COMBUSTIBILITY(IAlleleInteger.class),
+	/**
+	 * The amount of charcoal that a wood pile ash drop;
+	 * @deprecated this is tied to species directly
+	 */
+	@Deprecated
+	CARBONIZATION(IAlleleInteger.class),
 	/**
 	 * Determines if the tree can burn.
 	 */
-	FIREPROOF(IAlleleBoolean.class),
-	;
+	FIREPROOF(IAlleleBoolean.class),;
 	
-	Class<? extends IAllele> clss;
+	Class<? extends IAllele> alleleClass;
 	
-	EnumTreeChromosome(Class<? extends IAllele> clss) {
-		this.clss = clss;
+	EnumTreeChromosome(Class<? extends IAllele> alleleClass) {
+		this.alleleClass = alleleClass;
 	}
 
 	@Override
 	public Class<? extends IAllele> getAlleleClass() {
-		return clss;
+		return alleleClass;
 	}
 
 	@Override

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

@@ -0,0 +1,74 @@
+package forestry.api.arboriculture;
+
+import javax.annotation.Nonnull;
+import java.util.Locale;
+import java.util.Random;
+
+import net.minecraft.block.BlockPlanks;
+
+public enum EnumVanillaWoodType implements IWoodType {
+	OAK(BlockPlanks.EnumType.OAK, 5, 20),
+	SPRUCE(BlockPlanks.EnumType.SPRUCE, 4, 19),
+	BIRCH(BlockPlanks.EnumType.BIRCH, 4, 19),
+	JUNGLE(BlockPlanks.EnumType.JUNGLE, 5, 20),
+	ACACIA(BlockPlanks.EnumType.ACACIA, 4, 20),
+	DARK_OAK(BlockPlanks.EnumType.DARK_OAK, 5, 20);
+
+	public static final EnumVanillaWoodType[] VALUES = values();
+
+	public static EnumVanillaWoodType getRandom(Random random) {
+		return VALUES[random.nextInt(VALUES.length)];
+	}
+
+	private final BlockPlanks.EnumType vanillaType;
+	private final int carbonization;
+	private final int combustability;
+
+	EnumVanillaWoodType(BlockPlanks.EnumType vanillaType, int carbonization, int combustability) {
+		this.vanillaType = vanillaType;
+		this.carbonization = carbonization;
+		this.combustability = combustability;
+	}
+
+	public BlockPlanks.EnumType getVanillaType() {
+		return vanillaType;
+	}
+
+	@Override
+	public String toString() {
+		return super.toString().toLowerCase(Locale.ENGLISH);
+	}
+
+	@Override
+	public String getName() {
+		return toString();
+	}
+
+	@Override
+	public int getMetadata() {
+		return ordinal();
+	}
+
+	@Nonnull
+	public static EnumVanillaWoodType byMetadata(int meta) {
+		if (meta < 0 || meta >= VALUES.length) {
+			meta = 0;
+		}
+		return VALUES[meta];
+	}
+
+	@Override
+	public float getHardness() {
+		return 2.0F;
+	}
+
+	@Override
+	public int getCarbonization() {
+		return carbonization;
+	}
+
+	@Override
+	public int getCombustability() {
+		return combustability;
+	}
+}

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

@@ -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);
-	}
-}

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

@@ -1,17 +1,27 @@
 /*******************************************************************************
  * 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;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import forestry.api.genetics.IAlleleProperty;
 
 /**
  * Simple allele encapsulating an {@link IFruitProvider}.
  */
-public interface IAlleleFruit extends IAllele {
+public interface IAlleleFruit extends IAlleleProperty<IAlleleFruit> {
 
+	@Nonnull
 	IFruitProvider getProvider();
 
+	@Nullable
+	String getModelName();
+
+	@Nonnull
+	String getModID();
+
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;

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

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

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

@@ -1,51 +1,70 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
+import javax.annotation.Nonnull;
 import java.util.Collection;
 
-import net.minecraft.util.IIcon;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
 
 import net.minecraftforge.common.EnumPlantType;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
+import forestry.api.core.IModelManager;
+import forestry.api.genetics.IAlleleProperty;
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IFruitFamily;
 
-public interface IAlleleTreeSpecies extends IAlleleSpecies {
+public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty<IAlleleTreeSpecies> {
 
+	@Nonnull
+	@Override
 	ITreeRoot getRoot();
 	
 	/**
 	 * @return Native plant type of this species.
 	 */
+	@Nonnull
 	EnumPlantType getPlantType();
 
 	/**
 	 * @return List of all {@link IFruitFamily}s which can grow on leaves generated by this species.
 	 */
+	@Nonnull
 	Collection<IFruitFamily> getSuitableFruit();
 
 	/**
 	 * @return Tree generator for this species.
 	 */
+	@Nonnull
 	ITreeGenerator getGenerator();
-
-	/* TEXTURES AND OVERRIDES */
-	int getLeafColour(boolean pollinated);
-
+	
+	/**
+	 * @return The modid from the mod of the species.
+	 */
+	@Nonnull
+	String getModID();
+	
+	IWoodProvider getWoodProvider();
+	
+	/* MODELS AND OVERRIDES */
 	@SideOnly(Side.CLIENT)
-	IIcon getLeafIcon(boolean pollinated, boolean fancy);
-
-	@SideOnly(Side.CLIENT)
-	IIcon getGermlingIcon(EnumGermlingType type, int renderPass);
+	@Nonnull
+	ILeafSpriteProvider getLeafSpriteProvider();
 	
 	@SideOnly(Side.CLIENT)
 	int getGermlingColour(EnumGermlingType type, int renderPass);
 
+	@SideOnly(Side.CLIENT)
+	@Nonnull
+	ModelResourceLocation getGermlingModel(EnumGermlingType type);
+	
+	@SideOnly(Side.CLIENT)
+	void registerModels(Item item, IModelManager manager, EnumGermlingType type);
+
 }

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

@@ -7,15 +7,18 @@ package forestry.api.arboriculture;
 
 import net.minecraftforge.common.EnumPlantType;
 
-import forestry.api.genetics.IAlleleSpeciesCustom;
+import forestry.api.genetics.IAlleleSpeciesBuilder;
 import forestry.api.genetics.IFruitFamily;
 
-public interface IAlleleTreeSpeciesCustom extends IAlleleSpeciesCustom, IAlleleTreeSpecies {
+public interface IAlleleTreeSpeciesBuilder extends IAlleleSpeciesBuilder {
+
+	@Override
+	IAlleleTreeSpecies build();
 
 	/** Add a fruit family for this tree. Trees can have multiple fruit families. */
-	IAlleleTreeSpeciesCustom addFruitFamily(IFruitFamily family);
+	IAlleleTreeSpeciesBuilder addFruitFamily(IFruitFamily family);
 
 	/** Set the minecraft plant type for this tree. Default is Plains. */
-	IAlleleTreeSpeciesCustom setPlantType(EnumPlantType type);
+	IAlleleTreeSpeciesBuilder setPlantType(EnumPlantType type);
 
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;

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

@@ -1,17 +1,24 @@
 /*******************************************************************************
  * 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 javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import forestry.api.genetics.IFruitFamily;
 
@@ -19,38 +26,49 @@ public interface IFruitProvider {
 
 	IFruitFamily getFamily();
 
-	int getColour(ITreeGenome genome, IBlockAccess world, int x, int y, int z, int ripeningTime);
+	int getColour(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime);
 
-	boolean markAsFruitLeaf(ITreeGenome genome, World world, int x, int y, int z);
+	/** return the color to use for decorative leaves. Usually the ripe color. */
+	int getDecorativeColor();
+
+	boolean isFruitLeaf(ITreeGenome genome, World world, BlockPos pos);
 
 	int getRipeningPeriod();
 
 	// / Products, Chance
-	ItemStack[] getProducts();
+	@Nonnull
+	Map<ItemStack, Float> getProducts();
 
 	// / Specialty, Chance
-	ItemStack[] getSpecialty();
+	@Nonnull
+	Map<ItemStack, Float> getSpecialty();
 
-	ItemStack[] getFruits(ITreeGenome genome, World world, int x, int y, int z, int ripeningTime);
+	@Nonnull
+	List<ItemStack> getFruits(ITreeGenome genome, World world, BlockPos pos, int ripeningTime);
 
 	/**
 	 * @return Short, human-readable identifier used in the treealyzer.
 	 */
 	String getDescription();
 
+	@Nullable
+	String getModelName();
+
+	@Nonnull
+	String getModID();
+
 	/* 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.
+	 * @param ripeningTime Elapsed ripening time for the fruit.
+	 * @return ResourceLocation 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);
+	@Nullable
+	ResourceLocation getSprite(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime);
+
+	/** return the ResourceLocation to display on decorative leaves */
+	@Nullable
+	ResourceLocation getDecorativeSprite();
 
 	/**
 	 * @return true if this fruit provider requires fruit blocks to spawn, false otherwise.
@@ -59,16 +77,12 @@ public interface IFruitProvider {
 
 	/**
 	 * Tries to spawn a fruit block at the potential position when the tree generates.
-	 * 
-	 * @param genome
-	 * @param world
-	 * @param x
-	 * @param y
-	 * @param z
+	 * Spawning a fruit has a random chance of success based on {@link ITreeGenome#getSappiness()}
+	 *
 	 * @return true if a fruit block was spawned, false otherwise.
 	 */
-	boolean trySpawnFruitBlock(ITreeGenome genome, World world, int x, int y, int z);
+	boolean trySpawnFruitBlock(ITreeGenome genome, World world, Random rand, BlockPos pos);
 
 	@SideOnly(Side.CLIENT)
-	void registerIcons(IIconRegister register);
+	void registerSprites();
 }

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

@@ -5,15 +5,25 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.util.IIcon;
+import javax.annotation.Nonnull;
+
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.core.IModelManager;
 
 /**
  * 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);
+public interface IGermlingModelProvider {
+	@SideOnly(Side.CLIENT)
+	void registerModels(Item item, IModelManager manager, EnumGermlingType type);
+
+	@Nonnull
+	ModelResourceLocation getModel(EnumGermlingType type);
 }

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

@@ -1,29 +1,33 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- * 
+ *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
+import javax.annotation.Nullable;
+
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+/**
+ * @deprecated this is being removed to simplify trees
+ */
+@Deprecated
 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 pos Coordinates 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.
+	 * @return position that the tree can grow, null 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);
+	@Nullable
+	BlockPos canGrow(ITreeGenome genome, World world, BlockPos pos, int expectedGirth, int expectedHeight);
 
 	/**
 	 * @return Short, human-readable identifier used in the treealyzer.