update to explicit dependencies

Update build scripts and CI

.github/ISSUE_TEMPLATE.md

@@ -1,5 +0,0 @@
-Thank you for reporting!
-
-For issues:
- * Try the latest version, it may have fixed the issue already.
- * If you crashed, please paste the crash log to [gist](https://gist.github.com/) and link it here.

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

@@ -0,0 +1,9 @@
+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/workflows/build-and-test.yml

@@ -0,0 +1,45 @@
+# 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-tags.yml

@@ -0,0 +1,51 @@
+# 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
+
+      - name: Publish to Maven
+        run: ./gradlew publish
+        env:
+          MAVEN_USER: ${{ secrets.MAVEN_USER }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

.gitignore

@@ -1,24 +1,29 @@
-# everything
-/*
-
-# folders
-!/.github
-!/forestry_techne
-!/gradle/wrapper
-!/src
-
-# files
-!/.gitignore
-!/.gitmodules
-!/CLA.txt
-!/CONTRIBUTING.md
-!/LICENSE.txt
-!/license-header.txt
-!/README.md
-!/gradle.properties
-!/build.gradle
-!/build.xml
-!/gradlew
-!/gradlew.bat
-!/cla-signatures.txt
-!/formatting-settings.jar
+.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
+*.bat

.gitmodules

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

CHANGELOG-2.1.1.0.md

@@ -0,0 +1,48 @@
+
+# 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*
+

CODEOWNERS

@@ -0,0 +1,3 @@
+# Any Github changes require admin approval
+/.github/** @GTNewHorizons/admin
+

README.md

@@ -1,4 +1,4 @@
-[Forestry](https://minecraft.curseforge.com/projects/forestry/files)
+Forestry
 ====================================
 
 ### What is it?
@@ -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.11 / 1.11.2](http://jenkins.ic2.player.to/job/Forestry_1.11/)
+[Latest Builds for 1.7.10](http://jenkins.ic2.player.to/job/Forestry_Dev/)
 
 [IRC #forestry on esper.net](http://webchat.esper.net/?nick=ForestryGithub...&channels=forestry&prompt=1)
 
@@ -17,7 +17,7 @@ For those interested in developement, you can also visit #forestry-dev.
 
 ### Building
 
-The localization files reside in their own repository. It is pulled in automatically.
+The API and localization files reside in their own repository. It is pulled in automatically.
 
 You may want to adjust the "./gradle.properties" file to set your mc account as needed.
 

build.gradle

@@ -1,170 +1,594 @@
+//version: 1642484596
+/*
+DO NOT CHANGE THIS FILE!
+
+Also, you may replace this file at any time if there is an update available.
+Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
+ */
+
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+import java.util.concurrent.TimeUnit
+
 buildscript {
-	repositories {
-		jcenter()
-		maven { url = "http://files.minecraftforge.net/maven" }
-	}
-	dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-		classpath "gradle.plugin.se.bjurr.gitchangelog:git-changelog-gradle-plugin:1.47"
-	}
+    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.5'
+    }
 }
 
 plugins {
-	id "com.matthewprenger.cursegradle" version "1.0.9"
+    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("maven-publish")
 }
-apply plugin: 'net.minecraftforge.gradle.forge'
-apply plugin: 'idea'
-apply plugin: 'maven'
-apply plugin: "se.bjurr.gitchangelog.git-changelog-gradle-plugin"
 
-version = version_major + '.' + version_minor + '.' + version_patch + '.' + getBuildNumber()
-if (project.hasProperty('buildQualifier')) {
-	version = project.version + '-' + project.buildQualifier
+apply plugin: 'forge'
+
+def projectJavaVersion = JavaLanguageVersion.of(8)
+
+java {
+    toolchain {
+        languageVersion.set(projectJavaVersion)
+    }
 }
-group= "net.sengir.forestry" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "forestry_" + mcversion
 
-ext.dirDest = './build/dist'
-ext.dirLang = "./lang"
+idea {
+    module {
+        inheritOutputDirs = true
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
 
-// java version
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
+    throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
+}
+
+checkPropertyExists("modName")
+checkPropertyExists("modId")
+checkPropertyExists("modGroup")
+checkPropertyExists("autoUpdateBuildScript")
+checkPropertyExists("minecraftVersion")
+checkPropertyExists("forgeVersion")
+checkPropertyExists("replaceGradleTokenInFile")
+checkPropertyExists("gradleTokenModId")
+checkPropertyExists("gradleTokenModName")
+checkPropertyExists("gradleTokenVersion")
+checkPropertyExists("gradleTokenGroupName")
+checkPropertyExists("apiPackage")
+checkPropertyExists("accessTransformersFile")
+checkPropertyExists("usesMixins")
+checkPropertyExists("mixinPlugin")
+checkPropertyExists("mixinsPackage")
+checkPropertyExists("coreModClass")
+checkPropertyExists("containsMixinsAndOrCoreModOnly")
+checkPropertyExists("usesShadowedDependencies")
+checkPropertyExists("developmentEnvironmentUserName")
+
+boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
+
+String javaSourceDir = "src/main/java/"
+String scalaSourceDir = "src/main/scala/"
+
+String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+if((getFile(targetPackageJava).exists() || getFile(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((getFile(targetPackageJava).exists() || getFile(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(getFile(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((getFile(targetPackageJava).exists() || getFile(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((getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(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((getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(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 first from the VERSION env and then git tag
+String identifiedVersion
+try {
+    String versionOverride = System.getenv("VERSION") ?: null
+    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
+    version = minecraftVersion + "-" + identifiedVersion
+}
+catch (Exception e) {
+    throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag, or the VERSION override must be set!");
+}
+
+group = modGroup
+if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
+    archivesBaseName = customArchiveBaseName
+}
+else {
+    archivesBaseName = modId
+}
 
 minecraft {
-	version = mcversion + "-" + forgeversion
-	runDir = "run"
-	mappings = mcp_mappings
+    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
+    runDir = "run"
 
-	replace '@VERSION@', project.version
-	replace '@BUILD_NUMBER@', getBuildNumber()
+    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
+        }
+    }
 }
 
-sourceSets {
-	main {
-		resources {
-			srcDir project.dirLang
-		}
-	}
+if(file("addon.gradle").exists()) {
+    apply from: "addon.gradle"
+}
+
+apply from: 'repositories.gradle'
+
+configurations {
+    implementation.extendsFrom(shadowImplementation)  // TODO: remove after all uses are refactored
+    implementation.extendsFrom(shadowCompile)
+    implementation.extendsFrom(shadeCompile)
 }
 
 repositories {
-	maven {
-		url 'http://maven.epoxide.xyz'
-	}
-	maven {
-		url "http://dvs1.progwml6.com/files/maven"
-	}
-	maven {
-		name = "ic2"
-		url = "http://maven.ic2.player.to/"
-	}
+    maven {
+        name = "Overmind forge repo mirror"
+        url = "https://gregtech.overminddl1.com/"
+    }
+    if(usesMixins.toBoolean()) {
+        maven {
+            name = "sponge"
+            url = "https://repo.spongepowered.org/repository/maven-public"
+        }
+        maven {
+            url = "https://jitpack.io"
+        }
+    }
 }
 
 dependencies {
-	deobfCompile "net.darkhax.tesla:Tesla-${tesla_mcversion}:${tesla_version}"
-	deobfCompile "mezz.jei:jei_${jei_mcversion}:${jei_version}:api"
-	runtime "mezz.jei:jei_${jei_mcversion}:${jei_version}"
-	deobfCompile "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
+    if(usesMixins.toBoolean()) {
+        annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
+        annotationProcessor("com.google.guava:guava:24.1.1-jre")
+        annotationProcessor("com.google.code.gson:gson:2.8.6")
+        annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
+        // using 0.8 to workaround a issue in 0.7 which fails mixin application
+        compile("com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH") {
+            // Mixin includes a lot of dependencies that are too up-to-date
+            exclude module: "launchwrapper"
+            exclude module: "guava"
+            exclude module: "gson"
+            exclude module: "commons-io"
+            exclude module: "log4j-core"
+        }
+        compile("com.github.GTNewHorizons:SpongeMixins:1.5.0")
+    }
 }
 
-configurations {
-	api
-	compile.extendsFrom api
+apply from: 'dependencies.gradle'
+
+def mixingConfigRefMap = "mixins." + modId + ".refmap.json"
+def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
+def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
+
+task generateAssets {
+    if(usesMixins.toBoolean()) {
+        getFile("/src/main/resources/mixins." + modId + ".json").text = """{
+  "required": true,
+  "minVersion": "0.7.11",
+  "package": "${modGroup}.${mixinsPackage}",
+  "plugin": "${modGroup}.${mixinPlugin}",
+  "refmap": "${mixingConfigRefMap}",
+  "target": "@env(DEFAULT)",
+  "compatibilityLevel": "JAVA_8"
 }
 
-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'
-	}
-
-	// Move access transformers to META-INF
-	rename '(.+_at.cfg)', 'META-INF/$1'
+"""
+    }
 }
 
-// prevent java 8's strict doclint for javadocs from failing builds
-allprojects {
-	tasks.withType(Javadoc) {
-		options.addStringOption('Xdoclint:none', '-quiet')
-	}
+task relocateShadowJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowJar
+    prefix = modGroup + ".shadow"
+}
+
+shadowJar {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+    dependsOn(relocateShadowJar)
 }
 
 jar {
-	manifest {
-		attributes 'FMLAT': 'forestry_at.cfg'
-	}
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(shadowJar)
+        enabled = false
+    }
 }
 
-task sourcesJar(type: Jar) {
-	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) {
-	// 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 apiJar
-}
-
-uploadArchives {
-	repositories {
-		if (project.hasProperty('mavenDir')) {
-			mavenDeployer {
-				repository(url: "file://"+mavenDir)
-			}
-		} else {
-			println 'Archives upload disabled, mavenDir in gradle.properties is missing.'
-		}
-	}
-}
-
-def getBuildNumber() {
-	return "$System.env.BUILD_NUMBER" != "null" ? "$System.env.BUILD_NUMBER" : "0"
-}
-
-task makeChangelog(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {
-	filePath = "changelog.html"
-	untaggedName = "Current release ${project.version}"
-	fromCommit = "5a3850c2642e535656d090d1473054d5fa8d3331"
-	toRef =  "HEAD"
-	templateContent = file('changelog.mustache').getText('UTF-8')
-}
-
-curseforge {
-	apiKey = project.hasProperty('curseforge_apikey') ? project.curseforge_apikey : '0'
-	project {
-		id = curse_project_id
-		changelog = file('changelog.html')
-		changelogType = 'html'
-		releaseType = 'beta'
-		addGameVersion '1.12'
-	}
+reobf {
+    if(usesMixins.toBoolean()) {
+        addExtraSrgFile mixinSrg
+    }
 }
 
 afterEvaluate {
-	tasks.curseforge59751.dependsOn.add(makeChangelog)
+    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
+    }
+
+    if(usesMixins.toBoolean()) {
+        from refMap
+    }
+
+    // copy everything else, thats not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}
+
+def getManifestAttributes() {
+    def manifestAttributes = [:]
+    if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
+        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
+    }
+
+    if(accessTransformersFile) {
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
+    }
+
+    if(coreModClass) {
+        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
+    }
+
+    if(usesMixins.toBoolean()) {
+        manifestAttributes += [
+                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+                "MixinConfigs" : "mixins." + modId + ".json",
+                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+        ]
+    }
+    return manifestAttributes
+}
+
+task sourcesJar(type: Jar) {
+    from (sourceSets.main.allJava)
+    from (file("$projectDir/LICENSE"))
+    getArchiveClassifier().set('sources')
+}
+
+task shadowDevJar(type: ShadowJar) {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+}
+
+task relocateShadowDevJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowDevJar
+    prefix = modGroup + ".shadow"
+}
+
+task circularResolverJar(type: Jar) {
+    dependsOn(relocateShadowDevJar)
+    dependsOn(shadowDevJar)
+    enabled = false
+}
+
+task devJar(type: Jar) {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(circularResolverJar)
+        enabled = false
+    }
+}
+
+task apiJar(type: Jar) {
+    from (sourceSets.main.allJava) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.output) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.resources.srcDirs) {
+        include("LICENSE")
+    }
+
+    getArchiveClassifier().set('api')
+}
+
+artifacts {
+    if(!noPublishedSources) {
+        archives sourcesJar
+    }
+    archives devJar
+    if(apiPackage) {
+        archives apiJar
+    }
+}
+
+// publishing
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifact source: usesShadowedDependencies.toBoolean() ? shadowJar : jar, classifier: ""
+            if(!noPublishedSources) {
+                artifact source: sourcesJar, classifier: "src"
+            }
+            artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
+            if (apiPackage) {
+                artifact source: apiJar, classifier: "api"
+            }
+
+            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
+            artifactId = System.getenv("ARTIFACT_ID") ?: project.name
+            // Using the identified version, not project.version as it has the prepended 1.7.10
+            version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
+        }
+    }
+
+    repositories {
+        maven {
+            url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
+            credentials {
+                username = System.getenv("MAVEN_USER") ?: "NONE"
+                password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
+            }
+        }
+    }
+}
+
+// Updating
+task updateBuildScript {
+    doLast {
+        if (performBuildScriptUpdate(projectDir.toString())) return
+
+        print("Build script already up-to-date!")
+    }
+}
+
+if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
+    if (autoUpdateBuildScript.toBoolean()) {
+        performBuildScriptUpdate(projectDir.toString())
+    } else {
+        println("Build script update available! Run 'gradle updateBuildScript'")
+    }
+}
+
+static URL availableBuildScriptUrl() {
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
+}
+
+boolean performBuildScriptUpdate(String projectDir) {
+    if (isNewBuildScriptVersionAvailable(projectDir)) {
+        def buildscriptFile = getFile("build.gradle")
+        availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
+        print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
+        return true
+    }
+    return false
+}
+
+boolean isNewBuildScriptVersionAvailable(String projectDir) {
+    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
+
+    String currentBuildScript = getFile("build.gradle").getText()
+    String currentBuildScriptHash = getVersionHash(currentBuildScript)
+    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
+    String availableBuildScriptHash = getVersionHash(availableBuildScript)
+
+    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
+    return !isUpToDate
+}
+
+static String getVersionHash(String buildScriptContent) {
+    String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
+    if(versionLine != null) {
+        return versionLine.split(": ").last()
+    }
+    return ""
+}
+
+configure(updateBuildScript) {
+    group = 'forgegradle'
+    description = 'Updates the build script to the latest version'
+}
+
+// Helper methods
+
+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/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
+    }
+}
+
+def getFile(String relativePath) {
+    return new File(projectDir, relativePath)
 }

changelog.mustache

@@ -1,9 +0,0 @@
-Please help the Forestry project by <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}}

cla-signatures.txt

@@ -4,4 +4,3 @@ 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

@@ -0,0 +1,14 @@
+// Add your dependencies here
+
+dependencies {
+    compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.1:dev")
+    compile("com.github.GTNewHorizons:NotEnoughItems:2.1.22-GTNH:dev")
+    compile("com.github.GTNewHorizons:inventory-tweaks:1.5.13: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,14 +1,60 @@
-mcversion=1.12.1
-forgeversion=14.22.0.2469
-mcp_mappings=snapshot_20170904
-curse_project_id=59751
+modName = Forestry
 
-tesla_version=1.0.60
-tesla_mcversion=1.12
-jei_version=4.7.8.92
-jei_mcversion=1.12.1
-ic2_version=2.8.24-ex112
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+modId = Forestry
 
-version_major=5
-version_minor=5
-version_patch=4
+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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Jul 03 15:24:47 PDT 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
+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

gradlew

@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/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.
+#
 
 ##############################################################################
 ##
@@ -6,42 +22,6 @@
 ##
 ##############################################################################
 
-# 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
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -56,9 +36,49 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+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
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -85,7 +105,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -105,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -150,11 +170,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@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
@@ -8,14 +24,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
 
@@ -46,10 +62,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows 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.
@@ -60,11 +75,6 @@ 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

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

repositories.gradle

@@ -0,0 +1,22 @@
+// Add any additional repositiroes for your dependencies here
+
+repositories {
+    maven {
+        name = "GTNH"
+        url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+    }
+    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/invtweaks/LICENSE.txt

@@ -1,21 +0,0 @@
-## 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

@@ -1,69 +0,0 @@
-/*
- * 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

@@ -1,47 +0,0 @@
-/*
- * 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

@@ -1,34 +0,0 @@
-/*
- * 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

@@ -1,30 +0,0 @@
-/*
- * 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

@@ -1,75 +0,0 @@
-/*
- * 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

@@ -1,52 +0,0 @@
-/*
- * 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

@@ -1,38 +0,0 @@
-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

@@ -1,89 +0,0 @@
-/*
- * 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

@@ -1,16 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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

@@ -10,43 +10,45 @@
  ******************************************************************************/
 package forestry;
 
-import com.google.common.base.Preconditions;
-
-import javax.annotation.Nullable;
 import java.io.File;
 
-import forestry.plugins.compat.PluginNatura;
-import net.minecraftforge.client.event.ModelRegistryEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
 
-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.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.network.NetworkRegistry;
-import net.minecraftforge.fml.common.registry.GameRegistry;
+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 forestry.api.core.ForestryAPI;
+import forestry.core.ClimateManager;
 import forestry.core.EventHandlerCore;
-import forestry.core.climate.ClimateEventHandler;
 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;
-import forestry.plugins.compat.PluginIC2;
 
 /**
  * Forestry Minecraft Mod
@@ -54,39 +56,32 @@ import forestry.plugins.compat.PluginIC2;
  * @author SirSengir
  */
 @Mod(
-		modid = Constants.MOD_ID,
-		name = Constants.MOD_NAME,
+		modid = Constants.MOD,
+		name = Constants.MOD,
 		version = Constants.VERSION,
 		guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
-		acceptedMinecraftVersions = "[1.12, 1.12.1]",
-		dependencies = "required-after:forge@[14.21.1.2395,);"
-				+ "after:jei@[4.7.8.91,);"
-				+ "after:" + PluginIC2.modId + ";"
-				+ "after:" + PluginNatura.modId + ";")
+		dependencies = "required-after:Forge@[10.13.4.1566,);"
+				+ "after:Buildcraft|Core@[6.1.7,);"
+				+ "after:ExtrabiomesXL;"
+				+ "after:BiomesOPlenty;"
+				+ "after:IC2@[2.0.140,);"
+				+ "after:Natura@[2.2.0,);"
+				+ "after:HardcoreEnderExpansion;")
 public class Forestry {
 
-	@SuppressWarnings("NullableProblems")
-	@Mod.Instance(Constants.MOD_ID)
+	@Mod.Instance(Constants.MOD)
 	public static Forestry instance;
-	@Nullable
 	private File configFolder;
 
 	public Forestry() {
 		ForestryAPI.instance = this;
+		ForestryAPI.climateManager = new ClimateManager();
 		ForestryAPI.forestryConstants = new Constants();
 		ForestryAPI.errorStateRegistry = new ErrorStateRegistry();
 		EnumErrorCode.init();
-		FluidRegistry.enableUniversalBucket();
-		MinecraftForge.EVENT_BUS.register(this);
 	}
 
-	@Nullable
-	private static PacketHandler packetHandler;
-
-	public static PacketHandler getPacketHandler() {
-		Preconditions.checkState(packetHandler != null);
-		return packetHandler;
-	}
+	public static PacketHandler packetHandler;
 
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent event) {
@@ -95,27 +90,17 @@ 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());
-		MinecraftForge.EVENT_BUS.register(new ClimateEventHandler());
-		Proxies.common.registerEventHandlers();
 
-		configFolder = new File(event.getModConfigurationDirectory(), Constants.MOD_ID);
-		Config.load(event.getSide());
+		configFolder = new File(event.getModConfigurationDirectory(), "forestry");
+		Config.load();
 
-		PluginManager.runSetup(event);
+		PluginManager.runSetup();
 
-		String gameMode = Config.gameMode;
-		Preconditions.checkState(gameMode != null);
-		ForestryAPI.activeMode = new GameMode(gameMode);
+		ForestryAPI.activeMode = new GameMode(Config.gameMode);
 
-		PluginManager.runPreInit(event.getSide());
-
-	}
-
-	@SubscribeEvent
-	public void registerModels(ModelRegistryEvent event) {
-		PluginManager.runRegisterBackpacksAndCrates();
-		Proxies.render.registerModels();
+		PluginManager.runPreInit();
 	}
 
 	@EventHandler
@@ -124,8 +109,6 @@ public class Forestry {
 		NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
 
 		PluginManager.runInit();
-
-		Proxies.render.registerItemAndBlockColors();
 	}
 
 	@EventHandler
@@ -148,7 +131,6 @@ public class Forestry {
 		PluginManager.serverStarting(event.getServer());
 	}
 
-	@Nullable
 	public File getConfigFolder() {
 		return configFolder;
 	}
@@ -157,4 +139,23 @@ 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

@@ -1,11 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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/ApicultureCapabilities.java

@@ -1,13 +0,0 @@
-package forestry.api.apiculture;
-
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.CapabilityInject;
-
-public class ApicultureCapabilities {
-	/**
-	 * Capability for {@link IArmorApiarist}.
-	 * The {@link Capability#getDefaultInstance()} will always protect the wearer with no side effects.
-	 */
-	@CapabilityInject(IArmorApiarist.class)
-	public static Capability<IArmorApiarist> ARMOR_APIARIST;
-}

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

@@ -1,36 +1,31 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- *
+ * 
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import net.minecraft.item.ItemStack;
-
 /**
+ * 
  * Some miscellaneous lists and settings for bees.
- *
+ * 
  * @author SirSengir
  */
 public class BeeManager {
 
 	/**
-	 * Common Village Bees
+	 * 0 - Common Village Bees 1 - Uncommon Village Bees (20 % of spawns)
 	 */
-	public static List<IBeeGenome> commonVillageBees;
-	/**
-	 * Uncommon Village Bees (20 % of spawns)
-	 */
-	public static List<IBeeGenome> uncommonVillageBees;
+	public static ArrayList<IBeeGenome>[] villageBees;
 
 	/**
 	 * List of items that can induce swarming. Integer denotes x in 1000 chance.
 	 */
-	public static final Map<ItemStack, Integer> inducers = new HashMap<>();
+	public static HashMap<ItemStack, Integer> inducers = new HashMap<ItemStack, Integer>();
 
 	/**
 	 * Convenient access to AlleleManager.alleleRegistry.getSpeciesRoot("rootBees")

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

@@ -1,12 +1,10 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- *
+ * 
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import javax.annotation.Nullable;
-
 /**
  * Easily extendable default IBeeModifier.
  * By itself, this IBeeModifier does nothing.
@@ -14,52 +12,42 @@ import javax.annotation.Nullable;
  */
 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, @Nullable IBeeGenome mate, float currentModifier) {
+	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,9 +44,14 @@ public enum EnumBeeChromosome implements IChromosomeType {
 	 */
 	TEMPERATURE_TOLERANCE(IAlleleTolerance.class),
 	/**
-	 * If true, a naturally diurnal bee can work during the night. If true, a naturally nocturnal bee can work during the day.
+	 * 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.
 	 */
-	NEVER_SLEEPS(IAlleleBoolean.class),
+	NOCTURNAL(IAlleleBoolean.class),
+	/**
+	 * Not used / superseded by fixed values for the species. Probably going to be replaced with a boolean for FIRE_RESIST.
+	 */
+	@Deprecated
+	HUMIDITY(IAllele.class),
 	/**
 	 * Humidity difference to its native supported one the bee can tolerate.
 	 */
@@ -54,7 +59,7 @@ public enum EnumBeeChromosome implements IChromosomeType {
 	/**
 	 * If true the bee can work during rain.
 	 */
-	TOLERATES_RAIN(IAlleleBoolean.class),
+	TOLERANT_FLYER(IAlleleBoolean.class),
 	/**
 	 * If true, the bee can work without a clear view of the sky.
 	 */
@@ -75,16 +80,16 @@ public enum EnumBeeChromosome implements IChromosomeType {
 	 * Determines the bee's effect.
 	 */
 	EFFECT(IAlleleBeeEffect.class);
-
-	private final Class<? extends IAllele> alleleClass;
-
-	EnumBeeChromosome(Class<? extends IAllele> alleleClass) {
-		this.alleleClass = alleleClass;
+	
+	Class<? extends IAllele> clss;
+	
+	EnumBeeChromosome(Class<? extends IAllele> clss) {
+		this.clss = clss;
 	}
 
 	@Override
 	public Class<? extends IAllele> getAlleleClass() {
-		return alleleClass;
+		return clss;
 	}
 
 	@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,11 +10,11 @@ import java.util.Locale;
 import forestry.api.genetics.ISpeciesType;
 
 public enum EnumBeeType implements ISpeciesType {
-	DRONE, PRINCESS, QUEEN, LARVAE;
+	DRONE, PRINCESS, QUEEN, LARVAE, NONE;
 
 	public static final EnumBeeType[] VALUES = values();
 
-	private final String name;
+	String name;
 
 	EnumBeeType() {
 		this.name = this.toString().toLowerCase(Locale.ENGLISH);

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

@@ -1,15 +1,19 @@
 /*******************************************************************************
  * 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;
 
@@ -23,4 +27,10 @@ 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,36 +1,36 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- *
+ * 
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
 import forestry.api.genetics.IAlleleEffect;
 import forestry.api.genetics.IEffectData;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public interface IAlleleBeeEffect extends IAlleleEffect {
-
+	
 	/**
-	 * 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.
+	 * Called by apiaries to cause an effect in the world.
+	 * 
+	 * @param genome
+	 *            Genome of the bee queen causing this effect
+	 * @param storedData
+	 *            Object containing the stored effect data for the apiary/hive the bee is in.
+	 * @param housing {@link IBeeHousing} the bee currently resides in.
 	 * @return storedData, may have been manipulated.
 	 */
 	IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
 
 	/**
-	 * Is called to produce 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.
+	 * Is called to produce bee effects.
+	 * 
+	 * @param genome
+	 * @param storedData
+	 *            Object containing the stored effect data for the apiary/hive the bee is in.
+	 * @param housing {@link IBeeHousing} the bee currently resides in.
 	 * @return storedData, may have been manipulated.
 	 */
-	@SideOnly(Side.CLIENT)
 	IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
-
+	
 }

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

@@ -7,20 +7,19 @@ package forestry.api.apiculture;
 
 import java.util.Map;
 
-import forestry.api.core.IModelManager;
-import forestry.api.genetics.IAlleleSpecies;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraft.util.IIcon;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import forestry.api.genetics.IAlleleSpecies;
 
 public interface IAlleleBeeSpecies extends IAlleleSpecies {
 
 	/**
 	 * @return the IBeeRoot
 	 */
-	@Override
 	IBeeRoot getRoot();
 
 	/**
@@ -40,14 +39,18 @@ public interface IAlleleBeeSpecies extends IAlleleSpecies {
 
 	/**
 	 * Only jubilant bees produce specialities.
-	 *
 	 * @return true if the bee is jubilant, false otherwise.
 	 */
 	boolean isJubilant(IBeeGenome genome, IBeeHousing housing);
 
 	@SideOnly(Side.CLIENT)
-	ModelResourceLocation getModel(EnumBeeType type);
+	IIcon getIcon(EnumBeeType type, int renderPass);
+
+	/**
+	 * @deprecated since Forestry 3.6.
+	 * @return Path of the texture to use for entity rendering.
+	 */
+	@Deprecated
+	String getEntityTexture();
 
-	@SideOnly(Side.CLIENT)
-	void registerModels(Item item, IModelManager manager);
 }

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

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

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

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

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

@@ -1,29 +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 javax.annotation.Nullable;
-
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
 /**
- * When implemented as a capability by armor items, protects the wearer from negative bee effects.
- *
- * @see ApicultureCapabilities#ARMOR_APIARIST
+ * When implemented by armor piece items, allows them to act as apiarist's armor.
  */
 public interface IArmorApiarist {
 	/**
 	 * Called when the apiarist's armor acts as protection against an attack.
 	 *
-	 * @param entity    Entity being attacked
-	 * @param armor     Armor item
-	 * @param cause     Optional cause of attack, such as a bee effect identifier
+	 * @param entity Entity being attacked
+	 * @param armor Armor item
+	 * @param cause  Optional cause of attack, such as a bee effect identifier
 	 * @param doProtect Whether or not to actually do the side effects of protection
 	 * @return Whether or not the armor should protect the player from that attack
 	 */
-	boolean protectEntity(EntityLivingBase entity, ItemStack armor, @Nullable String cause, boolean doProtect);
+	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,6 +6,7 @@
 package forestry.api.apiculture;
 
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
 /**
@@ -17,10 +18,9 @@ public interface IArmorApiaristHelper {
 
 	/**
 	 * Called when the apiarist's armor acts as protection against an attack.
-	 *
-	 * @param stack     ItemStack to check
-	 * @param entity    Entity being attacked
-	 * @param cause     Optional cause of attack, such as a bee effect identifier
+	 * @param stack ItemStack to check
+	 * @param entity Entity being attacked
+	 * @param cause Optional cause of attack, such as a bee effect identifier
 	 * @param doProtect Whether or not to actually do the side effects of protection
 	 * @return Whether or not the item is valid Apiarist Armor and should protect the player from that attack
 	 * @since Forestry 4.2
@@ -29,13 +29,34 @@ public interface IArmorApiaristHelper {
 
 	/**
 	 * Called when the apiarist's armor acts as protection against an attack.
-	 *
-	 * @param entity    Entity being attacked
-	 * @param cause     Optional cause of attack, such as a bee effect identifier
+	 * @param 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.
-	 * 4 means full protection, but it can go higher if they are holding items like the smoker.
+	 * @return The number of valid Apiarist Armor pieces the player is wearing that are actually protecting
 	 * @since Forestry 4.2
 	 */
 	int wearsItems(EntityLivingBase entity, String cause, boolean doProtect);
+
+	/**
+	 * Called when the apiarist's armor acts as protection against an attack.
+	 * @param stack ItemStack to check
+	 * @param player Player being attacked
+	 * @param cause Optional cause of attack, such as a bee effect identifier
+	 * @param doProtect Whether or not to actually do the side effects of protection
+	 * @return Whether or not the item is valid Apiarist Armor and should protect the player from that attack
+	 * @deprecated since Forestry 4.2. use the EntityLivingBase version
+	 */
+	@Deprecated
+	boolean isArmorApiarist(ItemStack stack, EntityPlayer player, String cause, boolean doProtect);
+
+	/**
+	 * Called when the apiarist's armor acts as protection against an attack.
+	 * @param player Player being attacked
+	 * @param cause Optional cause of attack, such as a bee effect identifier
+	 * @param doProtect Whether or not to actually do the side effects of protection
+	 * @return The number of valid Apiarist Armor pieces the player is wearing that are actually protecting
+	 * @deprecated since Forestry 4.2. use the EntityLivingBase version
+	 */
+	@Deprecated
+	int wearsItems(EntityPlayer player, String cause, boolean doProtect);
 }

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

@@ -1,29 +1,24 @@
 /*******************************************************************************
  * 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.List;
 import java.util.Set;
 
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.biome.BiomeGenBase;
+
 import forestry.api.core.IErrorState;
 import forestry.api.genetics.IEffectData;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IIndividualLiving;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.biome.Biome;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 /**
  * Other implementations than Forestry's default one are not supported.
- *
+ * 
  * @author SirSengir
  */
 public interface IBee extends IIndividualLiving {
@@ -31,14 +26,11 @@ public interface IBee extends IIndividualLiving {
 	/**
 	 * @return Bee's genetic information.
 	 */
-	@Override
 	IBeeGenome getGenome();
 
 	/**
 	 * @return Genetic information of the bee's mate, null if unmated.
 	 */
-	@Nullable
-	@Override
 	IBeeGenome getMate();
 
 	/**
@@ -53,12 +45,12 @@ public interface IBee extends IIndividualLiving {
 
 	/**
 	 * Set the natural flag on this bee.
+	 * @param flag
 	 */
 	void setIsNatural(boolean flag);
 
 	IEffectData[] doEffect(IEffectData[] storedData, IBeeHousing housing);
 
-	@SideOnly(Side.CLIENT)
 	IEffectData[] doFX(IEffectData[] storedData, IBeeHousing housing);
 
 	/**
@@ -68,46 +60,25 @@ public interface IBee extends IIndividualLiving {
 
 	/**
 	 * Determines whether the queen can work.
-	 *
 	 * @param housing the {@link IBeeHousing} the bee currently resides in.
 	 * @return an empty set if the queen can work, a set of error states if the queen can not work
 	 */
 	Set<IErrorState> getCanWork(IBeeHousing housing);
 
-	List<Biome> getSuitableBiomes();
+	List<BiomeGenBase> getSuitableBiomes();
 
-	NonNullList<ItemStack> getProduceList();
+	ItemStack[] getProduceList();
 
-	NonNullList<ItemStack> getSpecialtyList();
+	ItemStack[] getSpecialtyList();
 
-	NonNullList<ItemStack> produceStacks(IBeeHousing housing);
+	ItemStack[] produceStacks(IBeeHousing housing);
 
-	@Nullable
 	IBee spawnPrincess(IBeeHousing housing);
 
-	List<IBee> spawnDrones(IBeeHousing housing);
+	IBee[] spawnDrones(IBeeHousing housing);
 
-	/**
-	 * @deprecated since Forestry 5.5.4. Use {@link #plantFlowerRandom(IBeeHousing, List)}
-	 */
-	@Deprecated
 	void plantFlowerRandom(IBeeHousing housing);
 
-	/**
-	 * Plants a random flower from the given list near the housing
-	 * @param housing the location the bee is living
-	 * @param potentialFlowers the flowers to choose from
-	 * @return the position of the planted flower, or null of none were planted
-	 * @since Forestry 5.5.4
-	 */
-	@Nullable
-	default BlockPos plantFlowerRandom(IBeeHousing housing, List<IBlockState> potentialFlowers) {
-		//noinspection deprecation
-		plantFlowerRandom(housing);
-		return null;
-	}
-
-	@Nullable
 	IIndividual retrievePollen(IBeeHousing housing);
 
 	boolean pollinateRandom(IBeeHousing housing, IIndividual pollen);

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

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

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- *
+ * 
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -8,19 +8,17 @@ package forestry.api.apiculture;
 import forestry.api.genetics.EnumTolerance;
 import forestry.api.genetics.IFlowerProvider;
 import forestry.api.genetics.IGenome;
-import net.minecraft.util.math.Vec3i;
 
 /**
  * Only the default implementation is supported.
- *
+ * 
  * @author SirSengir
+ * 
  */
 public interface IBeeGenome extends IGenome {
 
-	@Override
 	IAlleleBeeSpecies getPrimary();
-
-	@Override
+	
 	IAlleleBeeSpecies getSecondary();
 
 	float getSpeed();
@@ -33,9 +31,9 @@ public interface IBeeGenome extends IGenome {
 
 	EnumTolerance getToleranceHumid();
 
-	boolean getNeverSleeps();
+	boolean getNocturnal();
 
-	boolean getToleratesRain();
+	boolean getTolerantFlyer();
 
 	boolean getCaveDwelling();
 
@@ -43,7 +41,7 @@ public interface IBeeGenome extends IGenome {
 
 	int getFlowering();
 
-	Vec3i getTerritory();
+	int[] getTerritory();
 
 	IAlleleBeeEffect getEffect();
 

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

@@ -1,53 +1,47 @@
 /*******************************************************************************
  * 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 net.minecraft.util.Vec3;
+import net.minecraft.world.World;
 
 import com.mojang.authlib.GameProfile;
-import forestry.api.climate.IClimateProvider;
-import forestry.api.core.IErrorLogicSource;
-import forestry.api.core.ILocatable;
-import forestry.api.genetics.IHousing;
-import net.minecraft.util.math.Vec3d;
 
-public interface IBeeHousing extends IHousing, IErrorLogicSource, IClimateProvider, ILocatable {
+import forestry.api.core.IClimateProvider;
+import forestry.api.core.IErrorLogicSource;
+import forestry.api.genetics.IHousing;
+
+public interface IBeeHousing extends IHousing, IClimateProvider, IErrorLogicSource {
 
 	/**
-	 * Used by {@link IBeeRoot#createBeeHousingModifier(IBeeHousing)}
+	 * Used by BeeManager.beeRoot.createBeeHousingModifier(IBeeHousing housing)
 	 * to combine bee modifiers from several sources that can change over time.
-	 *
 	 * @return IBeeModifiers from the housing, frames, etc.
 	 */
 	Iterable<IBeeModifier> getBeeModifiers();
 
 	/**
-	 * Used by {@link IBeeRoot#createBeeHousingListener(IBeeHousing)}
+	 * Used by BeeManager.beeRoot.createBeeHousingListener(IBeeHousing housing)
 	 * to combine bee listeners from several sources that can change over time.
-	 *
 	 * @return IBeeListeners from the housing, multiblock parts, etc.
 	 */
 	Iterable<IBeeListener> getBeeListeners();
 
 	IBeeHousingInventory getBeeInventory();
-
 	IBeekeepingLogic getBeekeepingLogic();
 
 	int getBlockLightValue();
-
 	boolean canBlockSeeTheSky();
 
-	boolean isRaining();
-
-	@Nullable
+	World getWorld();
 	GameProfile getOwner();
 
 	/**
-	 * @return exact coordinates where bee particle FX should spawn from
 	 * @since Forestry 4.2
+	 * @return exact coordinates where bee FX should spawn from
 	 */
-	Vec3d getBeeFXCoordinates();
+	Vec3 getBeeFXCoordinates();
 }

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

@@ -10,18 +10,16 @@ import net.minecraft.item.ItemStack;
 public interface IBeeHousingInventory {
 
 	ItemStack getQueen();
-
 	ItemStack getDrone();
 
 	void setQueen(ItemStack itemstack);
-
 	void setDrone(ItemStack itemstack);
 
 	/**
 	 * Adds products to the housing's inventory.
 	 *
 	 * @param product ItemStack with the product to add.
-	 * @param all     if true, success requires that all products are added
+	 * @param all if true, success requires that all products are added
 	 * @return boolean indicating success or failure.
 	 */
 	boolean addProduct(ItemStack product, boolean all);

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

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

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

@@ -0,0 +1,14 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+public interface IBeeIconProvider {
+	void registerIcons(IIconRegister register);
+	IIcon getIcon(EnumBeeType type, int renderPass);
+}

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

@@ -11,7 +11,6 @@ public interface IBeeListener {
 
 	/**
 	 * Called when the bees wear out the housing's equipment.
-	 *
 	 * @param amount Integer indicating the amount worn out.
 	 */
 	void wearOutEquipment(int amount);
@@ -23,7 +22,6 @@ public interface IBeeListener {
 
 	/**
 	 * Called when the bees have retrieved some pollen.
-	 *
 	 * @return true if this bee listener handled the pollen.
 	 */
 	boolean onPollenRetrieved(IIndividual pollen);

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

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

@@ -5,33 +5,31 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import javax.annotation.Nullable;
-
 public interface IBeeModifier {
 	/**
-	 * @param genome          Genome of the bee this modifier is called for.
+	 * @param genome Genome of the bee this modifier is called for.
 	 * @param currentModifier Current modifier.
 	 * @return Float used to modify the base territory.
 	 */
 	float getTerritoryModifier(IBeeGenome genome, float currentModifier);
 
 	/**
-	 * @param genome          Genome of the bee this modifier is called for.
-	 * @param mate            Genome of the bee mate this modifier is called for.
+	 * @param genome Genome of the bee this modifier is called for.
+	 * @param mate Genome of the bee mate this modifier is called for.
 	 * @param currentModifier Current modifier.
 	 * @return Float used to modify the base mutation chance.
 	 */
 	float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
 
 	/**
-	 * @param genome          Genome of the bee this modifier is called for.
+	 * @param genome Genome of the bee this modifier is called for.
 	 * @param currentModifier Current modifier.
 	 * @return Float used to modify the life span of queens.
 	 */
-	float getLifespanModifier(IBeeGenome genome, @Nullable IBeeGenome mate, float currentModifier);
+	float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
 
 	/**
-	 * @param genome          Genome of the bee this modifier is called for.
+	 * @param genome Genome of the bee this modifier is called for.
 	 * @param currentModifier Current modifier.
 	 * @return Float modifying the production speed of queens.
 	 */

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- *
+ * 
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -8,10 +8,9 @@ package forestry.api.apiculture;
 import forestry.api.genetics.IMutation;
 
 public interface IBeeMutation extends IMutation {
-
-	@Override
+	
 	IBeeRoot getRoot();
-
+	
 	/**
 	 * @return float representing the chance for mutation to occur. note that this is 0 - 100 based, since it was an integer previously!
 	 */

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

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

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

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

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

@@ -1,33 +1,34 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- *
+ * 
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import javax.annotation.Nullable;
-import java.util.List;
+import java.util.ArrayList;
+import java.util.Collection;
 
-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 {
 
 	/**
-	 * @return true if passed item is a Forestry bee. Equal to getType(ItemStack stack) != null
+	 * @return true if passed item is a Forestry bee. Equal to getType(ItemStack stack) != EnumBeeType.NONE
 	 */
 	@Override
 	boolean isMember(ItemStack stack);
 
 	/**
-	 * @return {@link IBee} pattern parsed from the passed stack's nbt data. Null if the ItemStack is not a valid member.
+	 * @return {@link IBee} pattern parsed from the passed stack's nbt data.
 	 */
 	@Override
-	@Nullable
 	IBee getMember(ItemStack stack);
 
 	@Override
@@ -47,19 +48,16 @@ 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, @Nullable GameProfile player);
+	IApiaristTracker getBreedingTracker(World world, GameProfile player);
 
 	/* BEE SPECIFIC */
-
 	/**
-	 * @return type of bee encoded on the itemstack. null if it isn't a bee.
+	 * @return type of bee encoded on the itemstack. EnumBeeType.NONE if it isn't a bee.
 	 */
-	@Nullable
 	@Override
 	EnumBeeType getType(ItemStack stack);
 
@@ -74,45 +72,45 @@ public interface IBeeRoot extends ISpeciesRoot {
 	boolean isMated(ItemStack stack);
 
 	/**
-	 * @param genome Valid {@link IBeeGenome}
+	 * @param genome
+	 *            Valid {@link IBeeGenome}
 	 * @return {@link IBee} from the passed genome
 	 */
-	IBee getBee(IBeeGenome genome);
+	IBee getBee(World world, IBeeGenome genome);
 
 	/**
 	 * Creates an IBee suitable for a queen containing the necessary second genome for the mate.
-	 *
-	 * @param genome Valid {@link IBeeGenome}
-	 * @param mate   Valid {@link IBee} representing the mate.
+	 * 
+	 * @param genome
+	 *            Valid {@link IBeeGenome}
+	 * @param mate
+	 *            Valid {@link IBee} representing the mate.
 	 * @return Mated {@link IBee} from the passed genomes.
 	 */
 	IBee getBee(World world, IBeeGenome genome, IBee mate);
 
 	/* TEMPLATES */
-
 	@Override
-	List<IBee> getIndividualTemplates();
+	ArrayList<IBee> getIndividualTemplates();
 
 	/* MUTATIONS */
 	@Override
-	List<IBeeMutation> getMutations(boolean shuffle);
+	Collection<IBeeMutation> getMutations(boolean shuffle);
 
 	/* GAME MODE */
 	void resetBeekeepingMode();
 
-	List<IBeekeepingMode> getBeekeepingModes();
+	ArrayList<IBeekeepingMode> getBeekeepingModes();
 
 	IBeekeepingMode getBeekeepingMode(World world);
 
-	@Nullable
 	IBeekeepingMode getBeekeepingMode(String name);
 
 	void registerBeekeepingMode(IBeekeepingMode mode);
 
-	void setBeekeepingMode(World world, IBeekeepingMode mode);
+	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/IBeekeepingLogic.java

@@ -1,35 +1,25 @@
 /*******************************************************************************
  * 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.io.IOException;
-import java.util.List;
-
-import forestry.api.core.INbtReadable;
-import forestry.api.core.INbtWritable;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.core.INBTTagable;
 
 /**
  * Stores beekeeping logic for bee housings.
  * Get one with BeeManager.beeRoot.createBeekeepingLogic(IBeeHousing housing)
- * Save and load it to NBT using the INbtWritable methods.
+ * Save and load it to NBT using the INBTTagable methods.
  */
-public interface IBeekeepingLogic extends INbtWritable, INbtReadable {
+public interface IBeekeepingLogic extends INBTTagable {
 
 	/* SERVER */
 
 	/**
 	 * Checks that the bees can work, setting error conditions on the housing where needed
-	 *
 	 * @return true if no errors are present and doWork should be called
 	 */
 	boolean canWork();
@@ -39,20 +29,14 @@ public interface IBeekeepingLogic extends INbtWritable, INbtReadable {
 	 */
 	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 */
 
 	/**
-	 * Sync to client by using {@link #writeToNBT(NBTTagCompound)} in your {@link TileEntity#getUpdateTag()}
+	 * Call this when the housing comes into view of the client.
+	 * (i.e. when tile.getDescriptionPacket() is called)
 	 */
 	void syncToClient();
-
 	void syncToClient(EntityPlayerMP player);
 
 	/**
@@ -66,27 +50,12 @@ public interface IBeekeepingLogic extends INbtWritable, INbtReadable {
 	 * Whether bee fx should be active.
 	 * Internally, this is automatically synced to the client.
 	 */
-	@SideOnly(Side.CLIENT)
 	boolean canDoBeeFX();
 
 	/**
 	 * Display bee fx. Calls IBee.doFX(IEffectData[] storedData, IBeeHousing housing) on the queen.
 	 * Internally, the queen is automatically synced to the client for the fx.
 	 */
-	@SideOnly(Side.CLIENT)
 	void doBeeFX();
 
-	/**
-	 * Used by bee fx to direct bees to nearby flowers.
-	 * These positions are synced to the client from the server.
-	 */
-	List<BlockPos> getFlowerPositions();
-
-	default void readData(PacketBuffer data) throws IOException {
-
-	}
-
-	default void writeData(PacketBuffer data) {
-
-	}
 }

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

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

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

@@ -1,43 +1,38 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- *
+ * 
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import java.util.Collection;
+
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
 
 /**
  * Bees can be seeded either as hive drops or as mutation results.
- * <p>
+ * 
  * Add IHiveDrops with HiveManager.get___Hive.addDrop
- *
+ * 
  * @author SirSengir
  */
 public interface IHiveDrop {
 
-	IBee getBeeType(IBlockAccess world, BlockPos pos);
+	ItemStack getPrincess(World world, int x, int y, int z, int fortune);
 
-	NonNullList<ItemStack> getExtraItems(IBlockAccess world, BlockPos pos, int fortune);
+	Collection<ItemStack> getDrones(World world, int x, int y, int z, int fortune);
+
+	Collection<ItemStack> getAdditional(World world, int x, int y, int z, int fortune);
 
 	/**
-	 * Chance to drop a bee or extra items. Default drops have 0.80 (= 80 %).
-	 *
+	 * Chance to drop. Default drops have 80 (= 80 %).
+	 * 
 	 * @param world Minecraft world this is called for.
-	 * @param pos   Coordinates of the broken hive.
-	 * @return Chance for drop as a float of 0.0 - 1.0.
+	 * @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.
 	 */
-	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);
+	int getChance(World world, int x, int y, int z);
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- *
+ * 
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.apiculture;
@@ -11,27 +11,14 @@ public interface IHiveFrame {
 
 	/**
 	 * Wears out a frame.
-	 *
+	 * 
 	 * @param housing IBeeHousing the frame is contained in.
-	 * @param frame   ItemStack containing the actual frame.
-	 * @param queen   Current queen in the caller.
-	 * @param wear    Integer denoting the amount worn out. The wear modifier of the current beekeeping mode has already been taken into account.
-	 * @return ItemStack containing the actual frame with adjusted damage, or Empty ItemStack if it has been broken.
+	 * @param frame ItemStack containing the actual frame.
+	 * @param queen Current queen in the caller.
+	 * @param wear Integer denoting the amount worn out. The wear modifier of the current beekeeping mode has already been taken into account.
+	 * @return ItemStack containing the actual frame with adjusted damage, or null if it has been broken.
 	 */
 	ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear);
 
-	/**
-	 * @param frame ItemStack containing the actual frame.
-	 * @return the {@link IBeeModifier} for this frame.
-	 * @since Forestry 5.5.1
-	 */
-	default IBeeModifier getBeeModifier(ItemStack frame) {
-		return getBeeModifier();
-	}
-
-	/**
-	 * @deprecated since Forestry 5.5.1. Use {@link #getBeeModifier(ItemStack)}
-	 */
-	@Deprecated
 	IBeeModifier getBeeModifier();
 }

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

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

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

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

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

@@ -5,30 +5,25 @@
  ******************************************************************************/
 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 position that the hive should try to generate at.
-	 * returns null if the hive can't be placed anywhere.
+	 * return a Y value that the hive should try to generate at.
+	 * returns negative if the hive can't be placed anywhere.
 	 */
-	@Nullable
-	BlockPos getPosForHive(World world, int x, int z);
+	int getYForHive(World world, int x, int z);
 
 	/**
 	 * returns true if the hive can be generated at this location.
 	 * Used for advanced conditions, like checking that the ground below the hive is a certain type.
 	 */
-	boolean isValidLocation(World world, BlockPos pos);
+	boolean isValidLocation(World world, int x, int y, int z);
 
 	/**
 	 * returns true if the hive can safely replace the block at this location.
 	 */
-	boolean canReplace(IBlockState blockState, World world, BlockPos pos);
+	boolean canReplace(World world, int x, int y, int z);
 
 }

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

@@ -6,53 +6,19 @@
 package forestry.api.apiculture.hives;
 
 import java.util.List;
-import java.util.Locale;
 
 import forestry.api.apiculture.IHiveDrop;
-import net.minecraft.util.IStringSerializable;
 
 public interface IHiveRegistry {
 
 	/* Forestry Hive Names */
-	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();
-
-		private final String hiveUid;
-		private final String speciesUid;
-
-		HiveType(String hiveUid, String speciesUid) {
-			this.hiveUid = hiveUid;
-			this.speciesUid = speciesUid;
-		}
-
-
-		public String getHiveUid() {
-			return hiveUid;
-		}
-
-
-		public String getSpeciesUid() {
-			return speciesUid;
-		}
-
-		@Override
-		public String getName() {
-			return name().toLowerCase(Locale.ENGLISH);
-		}
-
-		public int getMeta() {
-			return ordinal();
-		}
-	}
+	public static final String forest = "Forestry:forest";
+	public static final String meadows = "Forestry:meadows";
+	public static final String desert = "Forestry:desert";
+	public static final String jungle = "Forestry:jungle";
+	public static final String end = "Forestry:end";
+	public static final String snow = "Forestry:snow";
+	public static final String swamp = "Forestry:swamp";
 
 	/**
 	 * Adds a new hive to be generated in the world.
@@ -63,6 +29,5 @@ 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,12 +3,6 @@
  *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-@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 javax.annotation.ParametersAreNonnullByDefault;
-
-import mcp.MethodsReturnNonnullByDefault;
-import net.minecraftforge.fml.common.API;
+import cpw.mods.fml.common.API;

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

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

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

@@ -1,14 +0,0 @@
-package forestry.api.arboriculture;
-
-import forestry.api.core.IArmorNaturalist;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.CapabilityInject;
-
-public class ArboricultureCapabilities {
-	/**
-	 * Capability for {@link IArmorNaturalist}.
-	 * The {@link Capability#getDefaultInstance()} will always show pollination with no side effects.
-	 */
-	@CapabilityInject(IArmorNaturalist.class)
-	public static Capability<IArmorNaturalist> ARMOR_NATURALIST;
-}

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

@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import java.util.Locale;
-import java.util.Random;
-
-public enum EnumForestryWoodType implements IWoodType {
-	LARCH(4),
-	TEAK(4),
-	ACACIA(4),
-	LIME(4),
-	CHESTNUT(4),
-	WENGE(4),
-	BAOBAB(4),
-	SEQUOIA(3, 4.0f),
-
-	KAPOK(4),
-	EBONY(4),
-	MAHOGANY(4),
-	BALSA(4, 1.0f),
-	WILLOW(4),
-	WALNUT(4),
-	GREENHEART(4, 7.5f),
-	CHERRY(4),
-
-	MAHOE(4),
-	POPLAR(4),
-	PALM(4),
-	PAPAYA(4),
-	PINE(4, 3.0f),
-	PLUM(4),
-	MAPLE(4),
-	CITRUS(4),
-
-	GIGANTEUM(3, 4.0f),
-	IPE(4),
-	PADAUK(4),
-	COCOBOLO(4),
-	ZEBRAWOOD(4);
-
-	public static final float DEFAULT_HARDNESS = 2.0f;
-	public static final EnumForestryWoodType[] VALUES = values();
-
-	private final int carbonization;
-	private final float hardness;
-
-	EnumForestryWoodType(int carbonization) {
-		this(carbonization, DEFAULT_HARDNESS);
-	}
-
-	EnumForestryWoodType(int carbonization, float hardness) {
-		this.carbonization = carbonization;
-		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();
-	}
-
-	public static EnumForestryWoodType byMetadata(int meta) {
-		if (meta < 0 || meta >= VALUES.length) {
-			meta = 0;
-		}
-		return VALUES[meta];
-	}
-
-	@Override
-	public int getCarbonization() {
-		return carbonization;
-	}
-
-	@Override
-	public float getCharcoalChance(int numberOfCharcoal) {
-		if (numberOfCharcoal == 3) {
-			return 0.75F;
-		} else if (numberOfCharcoal == 4) {
-			return 0.5F;
-		} else if (numberOfCharcoal == 5) {
-			return 0.25F;
-		}
-		return 0.15F;
-	}
-
-	@Override
-	public String getPlankTexture() {
-		return "forestry:blocks/wood/planks." + getName();
-	}
-
-	@Override
-	public String getDoorLowerTexture() {
-		return "forestry:blocks/doors/" + getName() + "_lower";
-	}
-
-	@Override
-	public String getDoorUpperTexture() {
-		return "forestry:blocks/doors/" + getName() + "_upper";
-	}
-
-	@Override
-	public String getBarkTexture() {
-		return "forestry:blocks/wood/bark." + getName();
-	}
-
-	@Override
-	public String getHeartTexture() {
-		return "forestry:blocks/wood/heart." + getName();
-	}
-}

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

@@ -5,16 +5,16 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
+import net.minecraft.util.StatCollector;
+
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IFruitFamily;
-import forestry.core.utils.Translator;
 
 public enum EnumFruitFamily implements IFruitFamily {
 	PRUNES("prunes", "Prunus domestica"),
 	POMES("pomes", "Pomum"),
 	JUNGLE("jungle", "Tropicus"),
-	NUX("nuts", "Nux"),
-	NONE("none", "None");
+	NUX("nuts", "Nux");
 
 	private final String uid;
 	private final String scientific;
@@ -37,12 +37,12 @@ public enum EnumFruitFamily implements IFruitFamily {
 
 	@Override
 	public String getName() {
-		return Translator.translateToLocal("for.family." + uid);
+		return StatCollector.translateToLocal("for.family." + uid);
 	}
 
 	@Override
 	public String getDescription() {
-		return Translator.translateToLocal("for.family." + uid + ".description");
+		return StatCollector.translateToLocal("for.family." + uid + ".description");
 	}
 
 }

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

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

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

@@ -1,14 +1,10 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- *
+ * 
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-public enum EnumPileType {
-	WOOD,
-	DIRT,
-	ASH;
-
-	public static final EnumPileType[] VALUES = values();
+public enum EnumGrowthConditions {
+	HOSTILE, PALTRY, NORMAL, GOOD, EXCELLENT
 }

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

@@ -1,20 +1,23 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- *
+ * 
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
 import java.util.Locale;
 
+import net.minecraftforge.common.EnumPlantType;
+
 import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IAlleleArea;
 import forestry.api.genetics.IAlleleBoolean;
 import forestry.api.genetics.IAlleleFloat;
 import forestry.api.genetics.IAlleleInteger;
+import forestry.api.genetics.IAllelePlantType;
 import forestry.api.genetics.IChromosomeType;
 import forestry.api.genetics.IFruitFamily;
 import forestry.api.genetics.ISpeciesRoot;
-import net.minecraftforge.common.EnumPlantType;
 
 public enum EnumTreeChromosome implements IChromosomeType {
 
@@ -23,6 +26,10 @@ public enum EnumTreeChromosome implements IChromosomeType {
 	 * will actually yield fruit with this species. - Native {@link EnumPlantType} for this tree. Combines with the PLANT chromosome.
 	 */
 	SPECIES(IAlleleTreeSpecies.class),
+	/**
+	 * {@link IGrowthProvider}, determines conditions required by the tree to grow.
+	 */
+	GROWTH(IAlleleGrowth.class),
 	/**
 	 * A float modifying the height of the tree. Taken into account at worldgen.
 	 */
@@ -39,10 +46,18 @@ public enum EnumTreeChromosome implements IChromosomeType {
 	 * Chance for fruit leaves and/or drops.
 	 */
 	YIELD(IAlleleFloat.class),
+	/**
+	 * May add additional tolerances for {@link EnumPlantTypes}.
+	 */
+	PLANT(IAllelePlantType.class),
 	/**
 	 * Determines the speed at which fruit will ripen on this tree.
 	 */
 	SAPPINESS(IAlleleFloat.class),
+	/**
+	 * Territory for leaf effects. Unused.
+	 */
+	TERRITORY(IAlleleArea.class),
 	/**
 	 * Leaf effect. Unused.
 	 */
@@ -56,17 +71,18 @@ public enum EnumTreeChromosome implements IChromosomeType {
 	/**
 	 * Determines if the tree can burn.
 	 */
-	FIREPROOF(IAlleleBoolean.class),;
-
-	private final Class<? extends IAllele> alleleClass;
-
-	EnumTreeChromosome(Class<? extends IAllele> alleleClass) {
-		this.alleleClass = alleleClass;
+	FIREPROOF(IAlleleBoolean.class),
+	;
+	
+	Class<? extends IAllele> clss;
+	
+	EnumTreeChromosome(Class<? extends IAllele> clss) {
+		this.clss = clss;
 	}
 
 	@Override
 	public Class<? extends IAllele> getAlleleClass() {
-		return alleleClass;
+		return clss;
 	}
 
 	@Override

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

@@ -1,117 +0,0 @@
-package forestry.api.arboriculture;
-
-import java.util.Locale;
-import java.util.Random;
-
-import net.minecraft.block.BlockPlanks;
-
-public enum EnumVanillaWoodType implements IWoodType {
-	OAK(BlockPlanks.EnumType.OAK, 5),
-	SPRUCE(BlockPlanks.EnumType.SPRUCE, 4),
-	BIRCH(BlockPlanks.EnumType.BIRCH, 4),
-	JUNGLE(BlockPlanks.EnumType.JUNGLE, 5),
-	ACACIA(BlockPlanks.EnumType.ACACIA, 4),
-	DARK_OAK(BlockPlanks.EnumType.DARK_OAK, 5);
-
-	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;
-
-	EnumVanillaWoodType(BlockPlanks.EnumType vanillaType, int carbonization) {
-		this.vanillaType = vanillaType;
-		this.carbonization = carbonization;
-	}
-
-	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();
-	}
-
-	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 float getCharcoalChance(int numberOfCharcoal) {
-		if (numberOfCharcoal == 3) {
-			return 0.75F;
-		} else if (numberOfCharcoal == 4) {
-			return 0.5F;
-		} else if (numberOfCharcoal == 5) {
-			return 0.25F;
-		}
-		return 0.15F;
-	}
-
-	@Override
-	public String getPlankTexture() {
-		if (this == DARK_OAK) {
-			return "blocks/planks_big_oak";
-		}
-		return "blocks/planks_" + getName();
-	}
-
-	@Override
-	public String getDoorLowerTexture() {
-		if (this == OAK) {
-			return "blocks/door_wood_lower";
-		}
-		return "blocks/door_wood_lower";
-	}
-
-	@Override
-	public String getDoorUpperTexture() {
-		if (this == OAK) {
-			return "blocks/door_wood_upper";
-		}
-		return "blocks/door_" + getName() + "_upper";
-	}
-
-	@Override
-	public String getBarkTexture() {
-		if (this == DARK_OAK) {
-			return "blocks/log_big_oak";
-		}
-		return "blocks/log_" + getName();
-	}
-
-	@Override
-	public String getHeartTexture() {
-		if (this == DARK_OAK) {
-			return "blocks/log_big_oak_top";
-		}
-		return "blocks/log_" + getName() + "_top";
-	}
-}

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

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

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

@@ -1,16 +1,17 @@
 /*******************************************************************************
  * 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.item.ItemStack;
+import forestry.api.genetics.IAllele;
 
-public interface ILeafProvider {
-	
-	void init(IAlleleTreeSpecies treeSpecies);
+/**
+ * Simple allele encapsulating an {@link IGrowthProvider}.
+ */
+public interface IAlleleGrowth extends IAllele {
 
-	ItemStack getDecorativeLeaves();
-	
-}
+	IGrowthProvider getProvider();
+
+}

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

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

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

@@ -1,27 +1,26 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- *
+ * 
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
 import java.util.Collection;
 
-import forestry.api.core.IModelManager;
-import forestry.api.genetics.IAlleleProperty;
+import net.minecraft.util.IIcon;
+
+import net.minecraftforge.common.EnumPlantType;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IFruitFamily;
-import 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;
 
-public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty<IAlleleTreeSpecies> {
+public interface IAlleleTreeSpecies extends IAlleleSpecies {
 
-	@Override
 	ITreeRoot getRoot();
-
+	
 	/**
 	 * @return Native plant type of this species.
 	 */
@@ -37,33 +36,16 @@ public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty<IAll
 	 */
 	ITreeGenerator getGenerator();
 
-	/**
-	 * @return The modid from the mod of the species.
-	 */
-	String getModID();
-	
-	/**
-	 * @return Float between 0 and 1 representing the rarity of the species, will affect spawn rate. If it's 0, it will not spawn.
-	 */
-	float getRarity();
+	/* TEXTURES AND OVERRIDES */
+	int getLeafColour(boolean pollinated);
 
-	IWoodProvider getWoodProvider();
-	
-	ILeafProvider getLeafProvider();
-	
-	IGrowthProvider getGrowthProvider();
-
-	/* MODELS AND OVERRIDES */
 	@SideOnly(Side.CLIENT)
-	ILeafSpriteProvider getLeafSpriteProvider();
+	IIcon getLeafIcon(boolean pollinated, boolean fancy);
 
+	@SideOnly(Side.CLIENT)
+	IIcon getGermlingIcon(EnumGermlingType type, int renderPass);
+	
 	@SideOnly(Side.CLIENT)
 	int getGermlingColour(EnumGermlingType type, int renderPass);
 
-	@SideOnly(Side.CLIENT)
-	ModelResourceLocation getGermlingModel(EnumGermlingType type);
-
-	@SideOnly(Side.CLIENT)
-	void registerModels(Item item, IModelManager manager, EnumGermlingType type);
-
 }

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

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import forestry.api.genetics.IAlleleSpeciesBuilder;
-import forestry.api.genetics.IFruitFamily;
-import net.minecraftforge.common.EnumPlantType;
-
-public interface IAlleleTreeSpeciesBuilder extends IAlleleSpeciesBuilder {
-
-	@Override
-	IAlleleTreeSpecies build();
-
-	/**
-	 * Add a fruit family for this tree. Trees can have multiple fruit families.
-	 */
-	IAlleleTreeSpeciesBuilder addFruitFamily(IFruitFamily family);
-
-	/**
-	 * Set the minecraft plant type for this tree. Default is Plains.
-	 */
-	IAlleleTreeSpeciesBuilder setPlantType(EnumPlantType type);
-	
-	/**
-	 * Set rarity of the species, will affect spawn rate in the world. Must be a float between 0 and 1. If it's 0, it will not spawn.
-	 */
-	IAlleleTreeSpeciesBuilder setRarity(float rarity);
-	
-	/**
-	 * Set the growth provider.
-	 */
-	IAlleleTreeSpeciesBuilder setGrowthProvider(IGrowthProvider growthProvider);
-
-}

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

@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import net.minecraftforge.common.EnumPlantType;
+
+import forestry.api.genetics.IAlleleSpeciesCustom;
+import forestry.api.genetics.IFruitFamily;
+
+public interface IAlleleTreeSpeciesCustom extends IAlleleSpeciesCustom, IAlleleTreeSpecies {
+
+	/** Add a fruit family for this tree. Trees can have multiple fruit families. */
+	IAlleleTreeSpeciesCustom addFruitFamily(IFruitFamily family);
+
+	/** Set the minecraft plant type for this tree. Default is Plains. */
+	IAlleleTreeSpeciesCustom setPlantType(EnumPlantType type);
+
+}

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

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

@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+/**
+ * Provides icons for saplings, pollen, etc.
+ * You must implement this yourself to use TreeManager.treeFactory.createSpecies()
+ * There is no default implementation because every sapling has a unique icon.
+ */
+public interface IGermlingIconProvider {
+	void registerIcons(IIconRegister register);
+	IIcon getIcon(EnumGermlingType type, int renderPass);
+}

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

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import forestry.api.core.IModelManager;
-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;
-
-/**
- * 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 IGermlingModelProvider {
-	@SideOnly(Side.CLIENT)
-	void registerModels(Item item, IModelManager manager, EnumGermlingType type);
-
-	@SideOnly(Side.CLIENT)
-	ModelResourceLocation getModel(EnumGermlingType type);
-
-	/**
-	 * Provides color for sapling. See {@link ILeafSpriteProvider} for pollen color.
-	 *
-	 * @param type       the germling type to render
-	 * @param renderPass renderPass of rendering
-	 * @return sapling color for renderPass
-	 */
-	int getSpriteColor(EnumGermlingType type, int renderPass);
-}

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

@@ -5,14 +5,34 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
 
 public interface IGrowthProvider {
 
-	boolean canSpawn(ITree tree, World world, BlockPos pos);
-	
-	boolean isBiomeValid(ITree tree, Biome biome);
-	
+	/**
+	 * Check to see whether a sapling at the given location with the given genome can grow into a tree.
+	 * 
+	 * @param genome Genome of the tree this is called for.
+	 * @param world Minecraft world the tree will inhabit.
+	 * @param xPos x-Coordinate to attempt growth at.
+	 * @param yPos y-Coordinate to attempt growth at.
+	 * @param zPos z-Coordinate to attempt growth at.
+	 * @param expectedGirth Trunk size of the tree to generate.
+	 * @param expectedHeight Height of the tree to generate.
+	 * @return true if the tree can grow at the given coordinates, false otherwise.
+	 */
+	boolean canGrow(ITreeGenome genome, World world, int xPos, int yPos, int zPos, int expectedGirth, int expectedHeight);
+
+	EnumGrowthConditions getGrowthConditions(ITreeGenome genome, World world, int xPos, int yPos, int zPos);
+
+	/**
+	 * @return Short, human-readable identifier used in the treealyzer.
+	 */
+	String getDescription();
+
+	/**
+	 * @return Detailed description of growth behaviour used in the treealyzer.
+	 */
+	String[] getInfo();
+
 }

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

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

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

@@ -1,15 +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.Random;
-
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public interface ILeafTickHandler {
-	boolean onRandomLeafTick(ITree tree, World world, Random rand, BlockPos pos, boolean isDestroyed);
+	boolean onRandomLeafTick(ITree tree, World world, int x, int y, int z, boolean isDestroyed);
 }

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

@@ -1,23 +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.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public interface IToolGrafter {
 	/**
 	 * Called by leaves to determine the increase in sapling droprate.
-	 *
+	 * 
 	 * @param stack ItemStack containing the grafter.
 	 * @param world Minecraft world the player and the target block inhabit.
-	 * @param pos   Coordinate of the broken leaf block.
+	 * @param x x-Coordinate of the broken leaf block.
+	 * @param y y-Coordinate of the broken leaf block.
+	 * @param z z-Coordinate of the broken leaf block.
 	 * @return Float representing the factor the usual drop chance is to be multiplied by.
 	 */
-	float getSaplingModifier(ItemStack stack, World world, EntityPlayer player, BlockPos pos);
+	float getSaplingModifier(ItemStack stack, World world, EntityPlayer player, int x, int y, int z);
 }

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

@@ -1,67 +1,58 @@
 /*******************************************************************************
  * 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 java.util.List;
-import java.util.Map;
+import java.util.EnumSet;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenerator;
 
 import com.mojang.authlib.GameProfile;
+
+import net.minecraftforge.common.EnumPlantType;
+
 import forestry.api.genetics.IEffectData;
 import forestry.api.genetics.IIndividual;
 import forestry.api.world.ITreeGenData;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public interface ITree extends IIndividual, ITreeGenData {
 
 	void mate(ITree other);
 
-	IEffectData[] doEffect(IEffectData[] storedData, World world, BlockPos pos);
+	IEffectData[] doEffect(IEffectData[] storedData, World world, int x, int y, int z);
 
-	@SideOnly(Side.CLIENT)
-	IEffectData[] doFX(IEffectData[] storedData, World world, BlockPos pos);
+	IEffectData[] doFX(IEffectData[] storedData, World world, int x, int y, int z);
 
-	@Override
 	ITreeGenome getGenome();
 
-	@Nullable
 	ITreeGenome getMate();
 
+	EnumSet<EnumPlantType> getPlantTypes();
+
 	/**
 	 * @since Forestry 4.0
 	 */
-	List<ITree> getSaplings(World world, @Nullable GameProfile playerProfile, BlockPos pos, float modifier);
+	ITree[] getSaplings(World world, GameProfile playerProfile, int x, int y, int z, float modifier);
 
-	// Products, Chance
-	Map<ItemStack, Float> getProducts();
+	ItemStack[] getProduceList();
 
-	// Specialties, Chance
-	Map<ItemStack, Float> getSpecialties();
+	ItemStack[] getSpecialtyList();
 
-	NonNullList<ItemStack> produceStacks(World world, BlockPos pos, int ripeningTime);
+	ItemStack[] produceStacks(World world, int x, int y, int z, int ripeningTime);
 
 	/**
 	 * @return Boolean indicating whether a sapling can stay planted at the given position.
 	 */
-	boolean canStay(IBlockAccess world, BlockPos pos);
+	boolean canStay(World world, int x, int y, int z);
 
 	/**
-	 * @return Position that this tree can grow. May be different from pos if there are multiple saplings.
-	 * Returns null if a sapling at the given position can not grow into a tree.
+	 * @return Boolean indicating whether a sapling at the given position can grow into a tree.
 	 */
-	@Override
-	@Nullable
-	BlockPos canGrow(World world, BlockPos pos, int expectedGirth, int expectedHeight);
+	boolean canGrow(World world, int x, int y, int z, int expectedGirth, int expectedHeight);
 
 	/**
 	 * @return Integer denoting the maturity (block ticks) required for a sapling to attempt to grow into a tree.
@@ -72,16 +63,19 @@ public interface ITree extends IIndividual, ITreeGenData {
 	 * @return Integer denoting how resilient leaf blocks are against adverse influences (i.e. caterpillars).
 	 */
 	int getResilience();
-
+	
 	/**
 	 * @return Integer denoting the size of the tree trunk.
 	 */
-	@Override
-	int getGirth();
+	int getGirth(World world, int x, int y, int z);
 
-	WorldGenerator getTreeGenerator(World world, BlockPos pos, boolean wasBonemealed);
+	/**
+	 * @return Growth conditions at the given position.
+	 */
+	EnumGrowthConditions getGrowthCondition(World world, int x, int y, int z);
+
+	WorldGenerator getTreeGenerator(World world, int x, int y, int z, boolean wasBonemealed);
 
-	@Override
 	ITree copy();
 
 	boolean isPureBred(EnumTreeChromosome chromosome);

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

@@ -13,28 +13,7 @@ public interface ITreeFactory {
 	/**
 	 * Creates a new tree species.
 	 * Automatically registered with AlleleManager.alleleRegistry.registerAllele()
-	 * See IAlleleTreeSpeciesBuilder and IAlleleSpeciesBuilder for adding additional properties to the returned species.
-	 *
-	 * @param uid                    Unique Identifier for this species
-	 * @param unlocalizedName        Unlocalized name for this species
-	 * @param authority              Authority for the binomial name, e.g. "Sengir" on species of base Forestry.
-	 * @param unlocalizedDescription Unlocalized description for this species
-	 * @param dominant               Whether this species is genetically dominant (false means it is recessive)
-	 * @param branch                 Classification of this species
-	 * @param binomial               Binomial name of the species sans genus. "humboldti" will have the bee species flavour name be "Apis humboldti". Feel free to use fun names or null.
-	 * @param modID                  The modID from the mod of the species
-	 * @param leafSpriteProvider     The leaf sprite provider for this species
-	 * @param germlingModelProvider  The germling model provider for this species
-	 * @param woodProvider           The wood texture provider. It is used to get wood textures for the charcoal pile.
-	 * @param generator              The tree generator
-	 * @return a new tree species allele.
-	 */
-	IAlleleTreeSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String modID, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, IWoodProvider woodProvider, ITreeGenerator generator);
-
-	/**
-	 * Creates a new tree species.
-	 * Automatically registered with AlleleManager.alleleRegistry.registerAllele()
-	 * See IAlleleTreeSpeciesBuilder and IAlleleSpeciesBuilder for adding additional properties to the returned species.
+	 * See IAlleleTreeSpeciesCustom and IAlleleSpeciesCustom for adding additional properties to the returned species.
 	 *
 	 * @param uid Unique Identifier for this species
 	 * @param unlocalizedName Unlocalized name for this species
@@ -43,17 +22,13 @@ public interface ITreeFactory {
 	 * @param dominant Whether this species is genetically dominant (false means it is recessive)
 	 * @param branch Classification of this species
 	 * @param binomial Binomial name of the species sans genus. "humboldti" will have the bee species flavour name be "Apis humboldti". Feel free to use fun names or null.
-	 * @param modID The modID from the mod of the species
-	 * @param leafSpriteProvider The leaf sprite provider for this species
-	 * @param germlingModelProvider The germling model provider for this species
-	 * @param woodProvider The wood texture provider. It is used to get wood textures for the charcoal pile.
+	 * @param leafIconProvider The leaf icon provider for this species
+	 * @param germlingIconProvider The germling icon provider for this species
 	 * @param generator The tree generator
 	 * @return a new tree species allele.
 	 */
-	IAlleleTreeSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String modID, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, IWoodProvider woodProvider, ITreeGenerator generator, ILeafProvider leafProvider);
-	
-	/**
-	 * Get one of the built-in Forestry leaf types. Default type is deciduous.
-	 */
-	ILeafSpriteProvider getLeafIconProvider(EnumLeafType enumLeafType, Color color, Color colorPollinated);
+	IAlleleTreeSpeciesCustom createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, ILeafIconProvider leafIconProvider, IGermlingIconProvider germlingIconProvider, ITreeGenerator generator);
+
+	/** Get one of the built-in Forestry leaf types. Default type is deciduous. */
+	ILeafIconProvider getLeafIconProvider(EnumLeafType enumLeafType, Color color, Color colorPollinated);
 }

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

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

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

@@ -1,35 +1,40 @@
 /*******************************************************************************
  * Copyright 2011-2014 SirSengir
- *
+ * 
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
 package forestry.api.arboriculture;
 
+import java.util.EnumSet;
+
+import net.minecraftforge.common.EnumPlantType;
+
 import forestry.api.genetics.IGenome;
-import net.minecraft.item.ItemStack;
 
 public interface ITreeGenome extends IGenome {
 
-	@Override
 	IAlleleTreeSpecies getPrimary();
 
-	@Override
 	IAlleleTreeSpecies getSecondary();
 
 	IFruitProvider getFruitProvider();
 
+	IGrowthProvider getGrowthProvider();
+
 	float getHeight();
 
 	float getFertility();
 
 	/**
 	 * @return Determines either a) how many fruit leaves there are or b) the chance for any fruit leave to drop a sapling. Exact usage determined by the
-	 * IFruitProvider
+	 *         IFruitProvider
 	 */
 	float getYield();
 
 	float getSappiness();
 
+	EnumSet<EnumPlantType> getPlantTypes();
+
 	/**
 	 * @return Amount of random block ticks required for a sapling to mature into a fully grown tree.
 	 */
@@ -38,15 +43,4 @@ public interface ITreeGenome extends IGenome {
 	int getGirth();
 
 	IAlleleLeafEffect getEffect();
-	
-	/**
-	 * 
-	 * @return A ItemStack that is used in getPickBlock of the leave block.
-	 */
-	ItemStack getDecorativeLeaves();
-
-	/**
-	 * @return true if this genome matches one of the default template genomes
-	 */
-	boolean matchesTemplateGenome();
 }