Improve localization

# Conflicts:
#	src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java
#	src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java

.gitignore

@@ -1,21 +1,28 @@
+# everything
+/*
+
 .gradle
 # IntelliJ
 /build
 /run
-/eclipse
 /out
-/bin
-/classes
 .idea
 *.iml
 *.ipr
 *.iws
-# minecraft
-/config
-/logs
-/saves
-/options.txt
-/usernamecache.json
+classes/
 
-changelog.html
-*.bat
+
+# folders
+!/gradle/wrapper
+!/src
+
+# files
+!/.gitignore
+!/LICENSE.txt
+!/license-header.txt
+!/README.md
+!/gradle.properties
+!/build.gradle
+!/gradlew
+!/gradlew.bat

README.md

@@ -1,46 +1,4 @@
-[Binnie mods](https://minecraft.curseforge.com/projects/binnies-mods/files)
-====================================
-
-### What is it?
-Binnie’s Mods is a suite of mods designed to expand the [Forestry](https://github.com/ForestryMC/ForestryMC) mod. 
-It both extends the bee and tree breeding aspect by adding many new species with varied products,
-along with new features such as fully breedable flowers and genetic manipulation.
-
-### Homepage
-
-[Wiki](https://binnie.mods.wiki/wiki/Main_Page)
-
-[Latest Builds for 1.7.10](https://ci.bymarcin.com/job/Binnie-Mods-MC1.7.10/)
-
-### Mods
-
-[![](https://binnie.mods.wiki/w/images/binnie/9/91/Extra_Bees_Header.png)](https://binnie.mods.wiki/wiki/Extra_Bees)
-
-Extra Bees expands upon the bee breeding of Forestry by adding 107 new bee species to forestry. These bees cover a large spectrum of different effects and products, giving you the ability to produce everything from dyes to rare metal dusts purely from bees. It also adds the Apiarist Database, a tool to keep track of discovered species, mutations and traits. There are also new alveary components which help improve and streamline bee production. 
-
-
-[![](https://binnie.mods.wiki/w/images/binnie/5/59/Extra_Trees_Header.png)](https://binnie.mods.wiki/wiki/Extra_Trees)
-
-Extra Trees both increases the number of tree species and adds many new aesthetic uses. There are 96 new tree species, such as Banana, Brazil nut and Douglas-fir. This comes with many new fruits as well as 35 new wooden planks. Extra Trees allows these, as well as Forestry and vanilla planks, to be combined to give doors, gates and various designs of fences. The woodworker allows planks to be combined to give patterned tiles, allowing you to build beautiful wooden floors, and the same can be done with stained glass. A group of machines such as the brewery and distillery allow you to use the fruits you grow to make a variety of wines, ciders and spirits.
-
-
-[![](https://binnie.mods.wiki/w/images/binnie/3/34/Botany_Header.png)](https://binnie.mods.wiki/wiki/Botany)
-
-Botany adds an entirely new breeding system to Forestry: flowers. There are 46 different species that can be bred, including both vanilla flowers and new ones such as Fuschia and Lilies. The colour of the flowers can be transferred and selectively bred, meaning that each flower can be one of a possible 80 different colours. These new flowers can be bred manually in small gardens using a trowel and fertiliser, with careful care taken to maintain the desired pH or moisture, or grown on the large scale in Forestry farms. 
-
-[![](https://binnie.mods.wiki/w/images/binnie/4/4e/Genetics_Header.png)](https://binnie.mods.wiki/wiki/Genetics)
-
-Genetics is for those who want to eschew conventional breeding, and want to enter the realm of genetic manipulation. Here, genes can be isolated, sequenced and then inoculated back into different species, making it easier to obtain the perfect genome. Bees, trees, butterflies and flowers can all be manipulated in this way. They can also be acclimatised to different environments to build tolerance to hostile climates.
-
-[![](https://binnie.mods.wiki/w/images/binnie/d/d7/Binnie_Core_Header.png)](https://binnie.mods.wiki/wiki/Binnie_Core)
-
-Binnie Core is a mod which contains a lot of the core functionality such as networking and GUI's for the other mods. The only in game features it currently contains are the Compartments
-
-### Warning
-
-Removed unused (unfinished) items and blocks: Honey Crystal, Alcohol, etc.
-
-### Building
+## Binnie mods
 
 The master branch will always contain the latest released version with possibly some bug fixes for that version that will eventually be released.
 New versions will be created in branched named like {mc_version}-{mod_version}

build.gradle

@@ -1,91 +1,91 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
         maven {
             name = "forge"
-            url = "https://files.minecraftforge.net/maven"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-        maven {
-            url "https://plugins.gradle.org/m2/"
+            url = "http://files.minecraftforge.net/maven"
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-        classpath "gradle.plugin.se.bjurr.gitchangelog:git-changelog-gradle-plugin:1.47"
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
     }
 }
 
-plugins {
-    id "com.matthewprenger.cursegradle" version "1.0.6"
-}
-apply plugin: "se.bjurr.gitchangelog.git-changelog-gradle-plugin"
-apply plugin: 'forge'
-
-version = "2.0.29"
-if (System.getenv("BUILD_NUMBER") != null) {
-    version = version + "." + System.getenv("BUILD_NUMBER")
-}
-group = "binnie" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "binnie-mods-1.7.10-gtnh"
+apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'idea'
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
-// uncomment this hack if you use old IDEA
-/*sourceSets {
-    main {
-        output.resourcesDir = output.classesDir
-    }
-}*/
+version = version_major + '.' + version_minor + '.' + version_patch
+if (System.getenv("BUILD_NUMBER") != null) {
+    version = version + "-" + System.getenv("BUILD_NUMBER")
+}
+group = "binnie" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "binnie-mods-1.11.2"
 
 minecraft {
-    version = "1.7.10-10.13.4.1614-1.7.10"
-    runDir = "eclipse"
+    version = mcversion + "-" + forgeversion
+    mappings = mcp_mappings
+    runDir = "run"
+}
+
+repositories {
+    maven {
+        name = "jei"
+        url "http://dvs1.progwml6.com/files/maven"
+    }
+    maven {
+        name = "ic2, forestry"
+        url = "http://maven.ic2.player.to/"
+    }
+    ivy {
+        name 'JEI Bees'
+        artifactPattern "http://addons-origin.cursecdn.com/files/${jeibees_cf}/[module]-[revision]-[classifier].[ext]"
+    }
+}
+
+dependencies {
+    deobfCompile "net.sengir.forestry:forestry_${mcversion}:${forestry_version}"
+    deobfCompile "mezz.jei:jei_${mcversion}:${jei_version}:api"
+    runtime "mezz.jei:jei_${mcversion}:${jei_version}"
+    deobfCompile name: 'jeibees', version: jeibees_version, ext: 'jar', classifier: "dev"
+	deobfCompile "net.industrial-craft:industrialcraft-2:${ic2_version}"
 }
 
 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'
-        expand 'version': project.version, 
+        expand 'version': project.version,
                 'mcversion': project.minecraft.version,
-                'modid': "BinnieMods"
+                'modid': "binniemods"
     }
-        
+
+    // copy everything else, thats not the mcmod.info
     from(sourceSets.main.resources.srcDirs) {
         exclude 'mcmod.info'
     }
 }
 
-task gitChangelogTask(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {
-    filePath = "changelog.html"
-    untaggedName = "Current release ${project.version}"
-    fromCommit = "dbc5c1a564c39e4a9c042411d1bdbe450985ce2c"
-    toRef =  "HEAD"
-    templateContent = file('changelog.mustache').getText('UTF-8')
-}
-
-curseforge {
-    apiKey = project.hasProperty('curseforge_apikey') ? project.curseforge_apikey : '0'
-    project {
-        id = '223525'
-        changelog = file('changelog.html')
-        changelogType = 'html'
-        releaseType = 'release'
-        relations {
-            requiredLibrary 'forestry'
-            incompatible 'binnie-fix'
-            incompatible 'binniepatcher'
-            incompatible 'more-binnie-fixes'
-        }
+// prevent java 8's strict doclint for javadocs from failing builds
+allprojects {
+    tasks.withType(Javadoc) {
+        options.addStringOption('Xdoclint:none', '-quiet')
     }
 }
 
-afterEvaluate {
-    tasks.curseforge223525.dependsOn.add(gitChangelogTask)
+uploadArchives {
+    repositories {
+        if (project.hasProperty('mavenDir')) {
+            mavenDeployer {
+                repository(url: "file://" + mavenDir)
+            }
+        } else {
+            println 'Archives upload disabled, mavenDir in gradle.properties is missing.'
+        }
+    }
 }

changelog.mustache

@@ -1,8 +0,0 @@
-{{#tags}}
-  <h3>{{name}}</h3>
-  <ul>
-    {{#commits}}
-    <li>{{{message}}} - {{authorName}}</li>
-    {{/commits}}
-  </ul>
-{{/tags}}

gradle.properties

@@ -0,0 +1,18 @@
+# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
+# This is required to provide enough memory for the Minecraft decompilation process.
+org.gradle.jvmargs=-Xmx3G
+
+mcversion=1.11.2
+forgeversion=13.20.0.2315
+mcp_mappings=snapshot_20161220
+
+forestry_version=5.3.4.119
+ic2_version=2.7.71-ex111
+
+version_major=2
+version_minor=0
+version_patch=0
+
+jei_version=4.5.0.287
+jeibees_cf=2376/963
+jeibees_version=0.9.0.4-mc1.11.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn () {
+warn ( ) {
     echo "$*"
 }
 
-die () {
+die ( ) {
     echo
     echo "$*"
     echo
@@ -154,19 +154,11 @@ if $cygwin ; then
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
 }
-APP_ARGS=$(save "$@")
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -1,84 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-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=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+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=-d64 -Xmx2G
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

src/main/java/binnie/Binnie.java

@@ -1,22 +1,20 @@
 package binnie;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import binnie.core.ManagerBase;
 import binnie.core.genetics.ManagerGenetics;
-import binnie.core.item.ManagerItem;
 import binnie.core.liquid.ManagerLiquid;
 import binnie.core.machines.ManagerMachine;
 import binnie.core.mod.config.ManagerConfig;
 import binnie.core.resource.ManagerResource;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public final class Binnie {
-	public static List<ManagerBase> Managers = new ArrayList<>();
-	public static ManagerGenetics Genetics = new ManagerGenetics();
-	public static ManagerConfig Configuration = new ManagerConfig();
-	public static ManagerLiquid Liquid = new ManagerLiquid();
-	public static ManagerMachine Machine = new ManagerMachine();
-	public static ManagerItem Item = new ManagerItem();
-	public static ManagerResource Resource = new ManagerResource();
+	public static final List<ManagerBase> MANAGERS = new ArrayList<>();
+	public static final ManagerGenetics GENETICS = new ManagerGenetics();
+	public static final ManagerConfig CONFIGURATION = new ManagerConfig();
+	public static final ManagerLiquid LIQUID = new ManagerLiquid();
+	public static final ManagerMachine MACHINE = new ManagerMachine();
+	public static final ManagerResource RESOURCE = new ManagerResource();
 }

src/main/java/binnie/Constants.java

@@ -0,0 +1,16 @@
+package binnie;
+
+public final class Constants {
+
+	public static final String CORE_MOD_ID = "binniecore";
+	public static final String BOTANY_MOD_ID = "botany";
+	public static final String EXTRA_TREES_MOD_ID = "extratrees";
+	public static final String GENETICS_MOD_ID = "genetics";
+
+	public static final String LIQUID_JUICE = "juice";
+	public static final String LIQUID_WATER = "water";
+	public static final String LIQUID_SEED_OIL = "seedoil";
+	public static final String LIQUID_CREOSOTE = "Creosote Oil";
+	public static final String LIQUID_BIO_ETHANOL = "bioethanol";
+	public static final String LIQUID_FOR_HONEY = "for.honey";
+}

src/main/java/binnie/botany/Botany.java

@@ -1,23 +1,48 @@
 package binnie.botany;
 
+import javax.annotation.Nullable;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import net.minecraftforge.event.entity.player.BonemealEvent;
+import net.minecraftforge.event.entity.player.PlayerInteractEvent;
+import net.minecraftforge.event.world.BlockEvent;
+
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.SidedProxy;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.eventhandler.Event;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
+import binnie.Constants;
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumSoilType;
+import binnie.botany.api.IBlockSoil;
 import binnie.botany.api.IFlower;
-import binnie.botany.api.gardening.IBlockSoil;
+import binnie.botany.api.IFlowerRoot;
+import binnie.botany.api.IGardeningManager;
 import binnie.botany.ceramic.BlockCeramic;
-import binnie.botany.ceramic.BlockCeramicBrick;
 import binnie.botany.ceramic.BlockCeramicPatterned;
-import binnie.botany.ceramic.BlockStained;
+import binnie.botany.ceramic.BlockStainedGlass;
+import binnie.botany.ceramic.brick.BlockCeramicBrick;
 import binnie.botany.core.BotanyCore;
 import binnie.botany.core.BotanyGUI;
 import binnie.botany.core.ModuleCore;
 import binnie.botany.flower.BlockFlower;
-import binnie.botany.flower.ItemFlower;
+import binnie.botany.flower.ItemBotany;
 import binnie.botany.flower.ItemInsulatedTube;
 import binnie.botany.flower.TileEntityFlower;
 import binnie.botany.gardening.BlockPlant;
 import binnie.botany.gardening.BlockSoil;
-import binnie.botany.gardening.Gardening;
 import binnie.botany.gardening.ItemSoilMeter;
 import binnie.botany.gardening.ItemTrowel;
 import binnie.botany.gardening.ModuleGardening;
@@ -34,44 +59,24 @@ import binnie.core.item.ItemMisc;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
 import binnie.core.proxy.IProxyCore;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.eventhandler.Event;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import net.minecraft.block.Block;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.event.entity.player.BonemealEvent;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
-import net.minecraftforge.event.world.BlockEvent;
 
-@Mod(
-	modid = "Botany",
-	name = "Botany",
-	useMetadata = true,
-	dependencies = "after:BinnieCore"
-)
+@Mod(modid = Constants.BOTANY_MOD_ID, name = "Binnie's Botany", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
 public class Botany extends AbstractMod {
-	@Mod.Instance("Botany")
+	public static final float AGE_CHANCE = 0.2f;
+
+	@SuppressWarnings("NullableProblems")
+	@Mod.Instance(Constants.BOTANY_MOD_ID)
 	public static Botany instance;
-
-	@SidedProxy(
-		clientSide = "binnie.botany.proxy.ProxyClient",
-		serverSide = "binnie.botany.proxy.ProxyServer"
-	)
+	@SuppressWarnings("NullableProblems")
+	@SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer")
 	public static Proxy proxy;
-
+	/* MODULE GENETIC */
 	public static BlockFlower flower;
-	public static Item seed;
-	public static Item pollen;
+	public static ItemBotany flowerItem;
+	public static ItemBotany seed;
+	public static ItemBotany pollen;
 	public static ItemDictionary database;
+	/* MODULE GARDENING */
 	public static BlockPlant plant;
 	public static ItemTrowel trowelWood;
 	public static ItemTrowel trowelStone;
@@ -87,34 +92,35 @@ public class Botany extends AbstractMod {
 	public static ItemInsulatedTube insulatedTube;
 	public static ItemSoilMeter soilMeter;
 	public static ItemMisc misc;
-	public static ItemFlower flowerItem;
 	public static ItemPigment pigment;
 	public static ItemClay clay;
 	public static BlockCeramic ceramic;
 	public static BlockCeramicPatterned ceramicTile;
-	public static BlockStained stained;
+	public static BlockStainedGlass stained;
 	public static BlockCeramicBrick ceramicBrick;
+	@Nullable
+	public static Item botanistBackpack;
 
-	public Botany() {
-		Botany.instance = this;
+	@Mod.EventHandler
+	public void preInit(final FMLPreInitializationEvent evt) {
+		this.preInit();
 	}
 
 	@Mod.EventHandler
-	public void preInit(FMLPreInitializationEvent event) {
-		addModule(new ModuleCore());
-		addModule(new ModuleGenetics());
-		addModule(new ModuleGardening());
-		preInit();
+	public void init(final FMLInitializationEvent evt) {
+		this.init();
 	}
 
 	@Mod.EventHandler
-	public void init(FMLInitializationEvent event) {
-		init();
+	public void postInit(final FMLPostInitializationEvent evt) {
+		this.postInit();
 	}
 
-	@Mod.EventHandler
-	public void postInit(FMLPostInitializationEvent event) {
-		postInit();
+	@Override
+	protected void registerModules() {
+		this.addModule(new ModuleCore());
+		this.addModule(new ModuleGenetics());
+		this.addModule(new ModuleGardening());
 	}
 
 	@Override
@@ -144,7 +150,7 @@ public class Botany extends AbstractMod {
 
 	@Override
 	public String getModID() {
-		return "botany";
+		return Constants.BOTANY_MOD_ID;
 	}
 
 	@Override
@@ -152,185 +158,166 @@ public class Botany extends AbstractMod {
 		return PacketHandler.class;
 	}
 
+	@Override
+	public boolean isActive() {
+		return BinnieCore.isBotanyActive();
+	}
+
 	@SubscribeEvent
-	public void onShearFlower(PlayerInteractEvent event) {
-		if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
+	public void onShearFlower(final PlayerInteractEvent.RightClickBlock event) {
+		EntityPlayer player = event.getEntityPlayer();
+		if (player == null) {
 			return;
 		}
 
-		if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null && event.entityPlayer.getHeldItem().getItem() == Items.shears) {
-			TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
-			if (tile instanceof TileEntityFlower) {
-				TileEntityFlower flower = (TileEntityFlower) tile;
-				flower.onShear();
-				event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
-			}
+		ItemStack heldItem = player.getHeldItemMainhand();
+		if (heldItem.isEmpty()) {
+			return;
 		}
 
-		if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null && event.entityPlayer.getHeldItem().getItem() == Botany.pollen) {
-			TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
-			if (tile instanceof TileEntityFlower) {
-				TileEntityFlower flower = (TileEntityFlower) tile;
-				IFlower pollen = BotanyCore.getFlowerRoot().getMember(event.entityPlayer.getHeldItem());
-				if (pollen != null && flower.canMateWith(pollen)) {
-					flower.mateWith(pollen);
-					if (!event.entityPlayer.capabilities.isCreativeMode) {
-						ItemStack heldItem = event.entityPlayer.getHeldItem();
-						heldItem.stackSize--;
-					}
+		TileEntity tile = event.getWorld().getTileEntity(event.getPos());
+		if (!(tile instanceof TileEntityFlower)) {
+			return;
+		}
+
+		TileEntityFlower flower = (TileEntityFlower) tile;
+		if (heldItem.getItem() == Items.SHEARS) {
+			flower.onShear();
+			heldItem.damageItem(1, player);
+		} else if (heldItem.getItem() == Botany.pollen) {
+			IFlower pollen = BotanyCore.getFlowerRoot().getMember(heldItem);
+			if (pollen != null && flower.canMateWith(pollen)) {
+				flower.mateWith(pollen);
+				if (!player.capabilities.isCreativeMode) {
+					heldItem.shrink(1);
 				}
 			}
 		}
 	}
 
 	@SubscribeEvent
-	public void onFertiliseSoil(PlayerInteractEvent event) {
-		if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK || event.world == null) {
+	public void onFertiliseSoil(final PlayerInteractEvent.RightClickBlock event) {
+		World world = event.getWorld();
+		if (world == null) {
 			return;
 		}
 
-		if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == null) {
+		BlockPos pos = event.getPos();
+		EntityPlayer player = event.getEntityPlayer();
+		if (player == null) {
 			return;
 		}
 
-		int y = event.y;
-		Block block = event.world.getBlock(event.x, y, event.z);
-		if (block == null || !Gardening.isSoil(block)) {
-			block = event.world.getBlock(event.x, --y, event.z);
+		ItemStack heldItem = player.getHeldItemMainhand();
+		if (heldItem.isEmpty()) {
+			return;
 		}
-		if (block == null || !Gardening.isSoil(block)) {
+		
+		IGardeningManager gardening = BotanyCore.getGardening();
+		Block block = world.getBlockState(event.getPos()).getBlock();
+		if (!gardening.isSoil(block)) {
+			pos = pos.down();
+			block = world.getBlockState(pos).getBlock();
+		}
+
+		if (!gardening.isSoil(block)) {
 			return;
 		}
 
 		IBlockSoil soil = (IBlockSoil) block;
-		if (Gardening.isNutrientFertiliser(event.entityPlayer.getHeldItem()) && soil.getType(event.world, event.x, y, event.z) != EnumSoilType.FLOWERBED) {
-			EnumSoilType type = soil.getType(event.world, event.x, y, event.z);
-			int next = Math.min(type.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
-			if (soil.fertilise(event.world, event.x, y, event.z, EnumSoilType.values()[next]) && !event.entityPlayer.capabilities.isCreativeMode) {
-				ItemStack heldItem = event.entityPlayer.getHeldItem();
-				heldItem.stackSize--;
+		int fertiliserStrength = gardening.getFertiliserStrength(heldItem);
+		if (gardening.isNutrientFertiliser(heldItem) && soil.getType(world, pos) != EnumSoilType.FLOWERBED) {
+			EnumSoilType type = soil.getType(world, pos);
+			int next = Math.min(type.ordinal() + fertiliserStrength, 2);
+			if (soil.fertilise(world, pos, EnumSoilType.values()[next]) && !player.capabilities.isCreativeMode) {
+				heldItem.shrink(1);
 				return;
 			}
 		}
 
-		if (Gardening.isAcidFertiliser(event.entityPlayer.getHeldItem()) && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ACID) {
-			EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
-			int next = Math.max(pH.ordinal() - Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 0);
-			if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next]) && !event.entityPlayer.capabilities.isCreativeMode) {
-				ItemStack heldItem2 = event.entityPlayer.getHeldItem();
-				heldItem2.stackSize--;
+		if (gardening.isAcidFertiliser(heldItem) && soil.getPH(world, pos) != EnumAcidity.ACID) {
+			EnumAcidity pH = soil.getPH(world, pos);
+			int next = Math.max(pH.ordinal() - fertiliserStrength, 0);
+			if (soil.setPH(world, pos, EnumAcidity.values()[next]) && !player.capabilities.isCreativeMode) {
+				heldItem.shrink(1);
 				return;
 			}
 		}
 
-		if (Gardening.isAlkalineFertiliser(event.entityPlayer.getHeldItem()) && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ALKALINE) {
-			EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
-			int next = Math.min(pH.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
-			if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next]) && !event.entityPlayer.capabilities.isCreativeMode) {
-				ItemStack heldItem3 = event.entityPlayer.getHeldItem();
-				heldItem3.stackSize--;
+		if (gardening.isAlkalineFertiliser(heldItem) && soil.getPH(world, pos) != EnumAcidity.ALKALINE) {
+			EnumAcidity pH = soil.getPH(world, pos);
+			int next = Math.min(pH.ordinal() + fertiliserStrength, 2);
+			if (soil.setPH(world, pos, EnumAcidity.values()[next]) && !player.capabilities.isCreativeMode) {
+				heldItem.shrink(1);
 				return;
 			}
 		}
 
-		if (Gardening.isWeedkiller(event.entityPlayer.getHeldItem()) && Gardening.addWeedKiller(event.world, event.x, y, event.z) && !event.entityPlayer.capabilities.isCreativeMode) {
-			ItemStack heldItem4 = event.entityPlayer.getHeldItem();
-			heldItem4.stackSize--;
+		if (gardening.isWeedkiller(heldItem) && gardening.addWeedKiller(world, pos) && !player.capabilities.isCreativeMode) {
+			heldItem.shrink(1);
 		}
 	}
 
 	@SubscribeEvent
-	public void plantVanilla(BlockEvent.PlaceEvent event) {
-		World world = event.world;
-		int x = event.x;
-		int y = event.y;
-		int z = event.z;
-		Block block = world.getBlock(x, y - 1, z);
-		if (!(block instanceof IBlockSoil)) {
+	public void plantVanilla(final BlockEvent.PlaceEvent event) {
+		World world = event.getWorld();
+		BlockPos pos = event.getPos();
+		Block block = world.getBlockState(pos.down()).getBlock();
+
+		if (!BotanyCore.getGardening().isSoil(block)) {
 			return;
 		}
-
-		IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.itemInHand);
+		EntityPlayer player = event.getPlayer();
+		ItemStack heldItem = player.getHeldItem(event.getHand());
+		IFlowerRoot flowerRoot = BotanyCore.getFlowerRoot();
+		IFlower flower = flowerRoot.getConversion(heldItem);
 		if (flower != null) {
-			Gardening.plant(world, x, y, z, flower, event.player.getGameProfile());
+			flowerRoot.plant(world, pos, flower, player.getGameProfile());
 		}
 	}
 
 	@Deprecated
-	public void onPlantVanilla(PlayerInteractEvent event) {
-		if (!BinnieCore.proxy.isSimulating(event.world) || event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
-			return;
-		}
-		if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == null) {
+	public void onPlantVanilla(final PlayerInteractEvent.RightClickBlock event) {
+		BlockPos pos = event.getPos();
+		World world = event.getWorld();
+		EntityPlayer player = event.getEntityPlayer();
+		ItemStack heldItem = player.getHeldItemMainhand();
+		if (!BinnieCore.getBinnieProxy().isSimulating(event.getWorld())) {
 			return;
 		}
 
-		World world = event.world;
-		int x = event.x;
-		int y = event.y;
-		int z = event.z;
-		Block block = world.getBlock(x, y, z);
-		int py = -1;
-		if (block instanceof IBlockSoil && (world.isAirBlock(x, y + 1, z) || world.getBlock(x, y, z).isReplaceable(world, x, y, z))) {
-			py = 1;
-		}
-
-		if (py < 0) {
-			return;
-		}
-
-		IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.entityPlayer.getHeldItem());
-		if (flower != null && Gardening.plant(world, x, y + py, z, flower, event.entityPlayer.getGameProfile()) && !event.entityPlayer.capabilities.isCreativeMode) {
-			ItemStack heldItem = event.entityPlayer.getHeldItem();
-			heldItem.stackSize--;
+		if (!heldItem.isEmpty()) {
+			Block block = world.getBlockState(pos).getBlock();
+			int py = -1;
+			if (block instanceof IBlockSoil && (world.isAirBlock(pos.up()) || block.isReplaceable(world, pos))) {
+				py = 1;
+			}
+			if (py >= 0) {
+				IFlowerRoot flowerRoot = BotanyCore.getFlowerRoot();
+				IFlower flower = flowerRoot.getConversion(heldItem);
+				if (flower != null && flowerRoot.plant(world, pos.add(0, py, 0), flower, player.getGameProfile()) && !player.capabilities.isCreativeMode) {
+					heldItem.shrink(1);
+				}
+			}
 		}
 	}
 
 	@SubscribeEvent
-	public void onBonemeal(BonemealEvent event) {
-		Block block = event.world.getBlock(event.x, event.y, event.z);
-		if (Gardening.isSoil(block)) {
+	public void onBonemeal(final BonemealEvent event) {
+		BlockPos pos = event.getPos();
+		Block block = event.getBlock().getBlock();
+		if (BotanyCore.getGardening().isSoil(block)) {
 			IBlockSoil soil = (IBlockSoil) block;
-			if (soil.fertilise(event.world, event.x, event.y, event.z, EnumSoilType.LOAM)) {
+			if (soil.fertilise(event.getWorld(), pos, EnumSoilType.LOAM)) {
 				event.setResult(Event.Result.ALLOW);
 			}
 		}
-
-		TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
+		TileEntity tile = event.getWorld().getTileEntity(pos);
 		if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).onBonemeal()) {
 			event.setResult(Event.Result.ALLOW);
 		}
 	}
 
-	@Override
-	public boolean isActive() {
-		return BinnieCore.isBotanyActive();
-	}
-
-	@Mod.EventHandler
-	public void onIMC(FMLInterModComms.IMCEvent event) {
-		for (FMLInterModComms.IMCMessage message : event.getMessages()) {
-			if (message.key.equals("add-nutrient-fertiliser-1")) {
-				ModuleGardening.queuedNutrientFertilisers.put(message.getItemStackValue(), 1);
-			}
-			if (message.key.equals("add-nutrient-fertiliser-2")) {
-				ModuleGardening.queuedNutrientFertilisers.put(message.getItemStackValue(), 2);
-			}
-			if (message.key.equals("add-acid-fertiliser-1")) {
-				ModuleGardening.queuedAcidFertilisers.put(message.getItemStackValue(), 1);
-			}
-			if (message.key.equals("add-acid-fertiliser-2")) {
-				ModuleGardening.queuedAcidFertilisers.put(message.getItemStackValue(), 2);
-			}
-			if (message.key.equals("add-alkaline-fertiliser-1")) {
-				ModuleGardening.queuedAlkalineFertilisers.put(message.getItemStackValue(), 1);
-			}
-			if (message.key.equals("add-alkaline-fertiliser-2")) {
-				ModuleGardening.queuedAlkalineFertilisers.put(message.getItemStackValue(), 1);
-			}
-		}
-	}
-
 	public static class PacketHandler extends BinniePacketHandler {
 		public PacketHandler() {
 			super(Botany.instance);

src/main/java/binnie/botany/CreativeTabBotany.java

@@ -1,13 +1,14 @@
 package binnie.botany;
 
-import binnie.core.util.I18N;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import binnie.core.util.I18N;
+
 public class CreativeTabBotany extends CreativeTabs {
 	public static CreativeTabs instance = new CreativeTabBotany();
 
@@ -17,12 +18,13 @@ public class CreativeTabBotany extends CreativeTabs {
 
 	@Override
 	public ItemStack getIconItemStack() {
-		return new ItemStack(Blocks.red_flower, 1, 5);
+		return new ItemStack(Blocks.RED_FLOWER, 1, 5);
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public String getTranslatedTabLabel() {
-		return getTabLabel();
+		return this.getTabLabel();
 	}
 
 	@Override
@@ -33,7 +35,7 @@ public class CreativeTabBotany extends CreativeTabs {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public Item getTabIconItem() {
-		return Item.getItemFromBlock(Blocks.yellow_flower);
+	public ItemStack getTabIconItem() {
+		return new ItemStack(Blocks.YELLOW_FLOWER);
 	}
 }

src/main/java/binnie/botany/api/EnumAcidity.java

@@ -1,11 +1,33 @@
 package binnie.botany.api;
 
-public enum EnumAcidity {
-	ACID,
-	NEUTRAL,
-	ALKALINE;
+import javax.annotation.Nullable;
 
-	public String getID() {
-		return name().toLowerCase();
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
+
+public enum EnumAcidity implements IStringSerializable {
+	ACID(TextFormatting.RED),
+	NEUTRAL(null),
+	ALKALINE(TextFormatting.AQUA);
+
+	@Nullable
+	TextFormatting color;
+
+	EnumAcidity(@Nullable TextFormatting color) {
+		this.color = color;
+	}
+
+	@Override
+	public String getName() {
+		return this.name().toLowerCase();
+	}
+
+	public String getLocalisedName(boolean withColor) {
+		String localisedName = I18n.translateToLocal("botany.ph." + getName());
+		if(withColor && color != null){
+			localisedName +=color;
+		}
+		return localisedName;
 	}
 }

src/main/java/binnie/botany/api/EnumFlowerChromosome.java

@@ -1,5 +1,7 @@
 package binnie.botany.api;
 
+import java.util.Locale;
+
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IAlleleArea;
@@ -25,18 +27,18 @@ public enum EnumFlowerChromosome implements IChromosomeType {
 
 	private Class<? extends IAllele> cls;
 
-	EnumFlowerChromosome(Class<? extends IAllele> cls) {
+	EnumFlowerChromosome(final Class<? extends IAllele> cls) {
 		this.cls = cls;
 	}
 
 	@Override
 	public Class<? extends IAllele> getAlleleClass() {
-		return cls;
+		return this.cls;
 	}
 
 	@Override
 	public String getName() {
-		return toString().toLowerCase();
+		return this.toString().toLowerCase(Locale.ENGLISH);
 	}
 
 	@Override

src/main/java/binnie/botany/api/EnumFlowerStage.java

@@ -1,18 +1,31 @@
 package binnie.botany.api;
 
-public enum EnumFlowerStage {
+import forestry.api.genetics.ISpeciesType;
+
+public enum EnumFlowerStage implements ISpeciesType {
 	FLOWER("Flower"),
 	SEED("Seed"),
-	POLLEN("Pollen"),
-	NONE("NONE");
+	POLLEN("Pollen");
 
-	protected String name;
+	public static final EnumFlowerStage[] VALUES = values();
+	String name;
 
-	EnumFlowerStage(String name) {
+	EnumFlowerStage(final String name) {
 		this.name = name;
 	}
 
-	public String getName() {
-		return name;
+	public static EnumFlowerStage getStage(IFlower flower) {
+		return getStage(flower.getAge());
 	}
+
+	public static EnumFlowerStage getStage(int age) {
+		return age == 0
+			? EnumFlowerStage.SEED
+			: EnumFlowerStage.FLOWER;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
 }

src/main/java/binnie/botany/api/EnumMoisture.java

@@ -1,11 +1,33 @@
 package binnie.botany.api;
 
-public enum EnumMoisture {
-	DRY,
-	NORMAL,
-	DAMP;
+import javax.annotation.Nullable;
 
-	public String getID() {
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
+
+public enum EnumMoisture implements IStringSerializable {
+	DRY(TextFormatting.YELLOW),
+	NORMAL(null),
+	DAMP(TextFormatting.DARK_BLUE);
+
+	@Nullable
+	final TextFormatting color;
+
+	EnumMoisture(@Nullable TextFormatting color) {
+		this.color = color;
+	}
+
+	@Override
+	public String getName() {
 		return name().toLowerCase();
 	}
+
+	public String getLocalisedName(boolean withColor) {
+		String localisedName = I18n.translateToLocal("botany.moisture." + getName());
+		if(withColor && color != null){
+			localisedName +=color;
+		}
+		return localisedName;
+	}
 }

src/main/java/binnie/botany/api/EnumSoilType.java

@@ -1,11 +1,30 @@
 package binnie.botany.api;
 
-public enum EnumSoilType {
-	SOIL,
-	LOAM,
-	FLOWERBED;
+import javax.annotation.Nullable;
+import java.util.Locale;
 
-	public String getID() {
-		return name().toLowerCase();
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
+
+public enum EnumSoilType implements IStringSerializable {
+	SOIL(TextFormatting.DARK_GRAY),
+	LOAM(TextFormatting.GOLD),
+	FLOWERBED(TextFormatting.LIGHT_PURPLE);
+
+	@Nullable
+	final TextFormatting color;
+
+	EnumSoilType(@Nullable TextFormatting color) {
+		this.color = color;
+	}
+
+	@Override
+	public String getName() {
+		return this.name().toLowerCase(Locale.ENGLISH);
+	}
+
+	public String getTranslated(boolean withColor) {
+		return (withColor && color != null ? color : "") + I18n.translateToLocal("botany.soil." + getName());
 	}
 }

src/main/java/binnie/botany/api/FlowerManager.java

@@ -0,0 +1,18 @@
+package binnie.botany.api;
+
+public class FlowerManager {
+	/**
+	 * Convenient access to AlleleManager.alleleRegistry.getSpeciesRoot("rootFlowers")
+	 */
+	public static IFlowerRoot flowerRoot;
+
+	/**
+	 * Used to create new flowers.
+	 */
+	public static IFlowerFactory flowerFactory;
+	
+	/**
+	 * Used to manager soil.
+	 */
+	public static IGardeningManager gardening;
+}

src/main/java/binnie/botany/api/IAlleleFlowerEffect.java

@@ -1,9 +1,10 @@
 package binnie.botany.api;
 
+import net.minecraft.world.World;
+
 import forestry.api.genetics.IAlleleEffect;
 import forestry.api.genetics.IEffectData;
-import net.minecraft.world.World;
 
 public interface IAlleleFlowerEffect extends IAlleleEffect {
-	IEffectData doEffect(IFlowerGenome genome, IEffectData storedData, World world, int x, int y, int z);
+	IEffectData doEffect(final IFlowerGenome p0, final IEffectData p1, final World p2, final int p3, final int p4, final int p5);
 }

src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java

@@ -1,11 +1,28 @@
 package binnie.botany.api;
 
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.core.IModelManager;
+import forestry.api.genetics.IAlleleProperty;
 import forestry.api.genetics.IAlleleSpecies;
 
-public interface IAlleleFlowerSpecies extends IAlleleSpecies {
+public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty<IAlleleFlowerSpecies> {
 	IFlowerType getType();
 
 	EnumAcidity getPH();
 
 	EnumMoisture getMoisture();
+
+	@SideOnly(Side.CLIENT)
+	int getFlowerColour(EnumFlowerStage type, int renderPass);
+
+	@SideOnly(Side.CLIENT)
+	ModelResourceLocation getFlowerModel(EnumFlowerStage type, boolean flowered);
+
+	@SideOnly(Side.CLIENT)
+	void registerModels(Item item, IModelManager manager, EnumFlowerStage type);
 }

src/main/java/binnie/botany/api/IAlleleFlowerSpeciesBuilder.java

@@ -0,0 +1,12 @@
+package binnie.botany.api;
+
+import forestry.api.genetics.IAlleleSpeciesBuilder;
+
+public interface IAlleleFlowerSpeciesBuilder extends IAlleleSpeciesBuilder {
+	@Override
+	IAlleleFlowerSpecies build();
+
+	IAlleleFlowerSpeciesBuilder setPH(EnumAcidity acidity);
+
+	IAlleleFlowerSpeciesBuilder setMoisture(EnumMoisture moisture);
+}

src/main/java/binnie/botany/api/IBlockSoil.java

@@ -0,0 +1,22 @@
+package binnie.botany.api;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public interface IBlockSoil {
+	EnumAcidity getPH(World world, BlockPos pos);
+
+	EnumMoisture getMoisture(World world, BlockPos pos);
+
+	EnumSoilType getType(World world, BlockPos pos);
+
+	boolean fertilise(World world, BlockPos pos, EnumSoilType soilType);
+
+	boolean degrade(World world, BlockPos pos, EnumSoilType soilType);
+
+	boolean setPH(World world, BlockPos pos, EnumAcidity acidity);
+
+	boolean setMoisture(World world, BlockPos pos, EnumMoisture moisture);
+
+	boolean resistsWeeds(World world, BlockPos pos);
+}

src/main/java/binnie/botany/api/IColourMix.java

@@ -1,13 +1,13 @@
 package binnie.botany.api;
 
 public interface IColourMix {
-	IFlowerColor getColor1();
+	IFlowerColour getColourFirst();
 
-	IFlowerColor getColor2();
+	IFlowerColour getColourSecond();
 
-	boolean isMutation(IFlowerColor color1, IFlowerColor color2);
+	boolean isMutation(IFlowerColour colourFirst, IFlowerColour colourSecond);
 
 	int getChance();
 
-	IFlowerColor getResult();
+	IFlowerColour getResult();
 }

src/main/java/binnie/botany/api/IFlower.java

@@ -1,33 +1,38 @@
 package binnie.botany.api;
 
-import forestry.api.genetics.IIndividual;
+import javax.annotation.Nullable;
+
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import forestry.api.genetics.IIndividual;
+
 public interface IFlower extends IIndividual {
 	@Override
 	IFlowerGenome getGenome();
 
+	@Nullable
 	IFlowerGenome getMate();
 
-	void mate(IFlower other);
+	void mate(final IFlower flower);
 
 	int getAge();
 
-	void setAge(int age);
+	void setAge(final int age);
 
 	void age();
 
-	IFlower getOffspring(World world);
+	IFlower getOffspring(final World world, final BlockPos pos);
 
 	int getMaxAge();
 
 	boolean isWilted();
 
-	void setWilted(boolean value);
+	void setWilted(final boolean p0);
 
 	boolean hasFlowered();
 
-	void setFlowered(boolean value);
+	void setFlowered(final boolean p0);
 
 	void removeMate();
 }

src/main/java/binnie/botany/api/IFlowerColour.java

@@ -2,12 +2,12 @@ package binnie.botany.api;
 
 import forestry.api.genetics.IAlleleInteger;
 
-public interface IFlowerColor {
-	int getColor(boolean dis);
+public interface IFlowerColour {
+	int getColor(final boolean p0);
 
 	IAlleleInteger getAllele();
 
 	int getID();
 
-	String getName();
+	String getColourName();
 }

src/main/java/binnie/botany/api/IFlowerDefinition.java

@@ -0,0 +1,15 @@
+package binnie.botany.api;
+
+import net.minecraft.item.ItemStack;
+
+import forestry.core.genetics.IGeneticDefinition;
+
+public interface IFlowerDefinition extends IGeneticDefinition {
+	@Override
+	IFlowerGenome getGenome();
+
+	@Override
+	IFlower getIndividual();
+
+	ItemStack getMemberStack(EnumFlowerStage flowerStage);
+}

src/main/java/binnie/botany/api/IFlowerFactory.java

@@ -0,0 +1,10 @@
+package binnie.botany.api;
+
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IClassification;
+
+public interface IFlowerFactory {
+	IAlleleFlowerSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean isDominant, IClassification branch, String binomial, IFlowerType flowerType);
+
+	IFlowerMutationBuilder createMutation(IAlleleFlowerSpecies parentFlower0, IAlleleFlowerSpecies parentFlower1, IAllele[] result, int chance);
+}

src/main/java/binnie/botany/api/IFlowerGenome.java

@@ -11,11 +11,11 @@ public interface IFlowerGenome extends IGenome {
 	@Override
 	IAlleleFlowerSpecies getSecondary();
 
-	IFlowerColor getPrimaryColor();
+	IFlowerColour getPrimaryColor();
 
-	IFlowerColor getSecondaryColor();
+	IFlowerColour getSecondaryColor();
 
-	IFlowerColor getStemColor();
+	IFlowerColour getStemColor();
 
 	int getFertility();
 
@@ -33,9 +33,9 @@ public interface IFlowerGenome extends IGenome {
 
 	float getSappiness();
 
-	boolean canTolerate(EnumAcidity pH);
+	boolean canTolerate(final EnumAcidity p0);
 
-	boolean canTolerate(EnumMoisture moisture);
+	boolean canTolerate(final EnumMoisture p0);
 
-	boolean canTolerate(EnumTemperature temp);
+	boolean canTolerate(final EnumTemperature p0);
 }

src/main/java/binnie/botany/api/IFlowerMutation.java

@@ -1,9 +1,13 @@
 package binnie.botany.api;
 
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IGenome;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
 import forestry.api.genetics.IMutation;
 
 public interface IFlowerMutation extends IMutation {
-	float getChance(IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1);
+	@Override
+	IFlowerRoot getRoot();
+
+	float getChance(final World world, final BlockPos pos, final IAlleleFlowerSpecies p0, final IAlleleFlowerSpecies p1, final IFlowerGenome p2, final IFlowerGenome p3);
 }

src/main/java/binnie/botany/api/IFlowerMutationBuilder.java

@@ -0,0 +1,6 @@
+package binnie.botany.api;
+
+import forestry.api.genetics.IMutationBuilder;
+
+public interface IFlowerMutationBuilder extends IMutationBuilder {
+}

src/main/java/binnie/botany/api/IFlowerRoot.java

@@ -1,44 +1,59 @@
 package binnie.botany.api;
 
-import com.mojang.authlib.GameProfile;
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.ISpeciesRoot;
+import javax.annotation.Nullable;
+import java.util.Collection;
+import java.util.List;
+
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import java.util.Collection;
+import com.mojang.authlib.GameProfile;
+
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.ISpeciesRoot;
 
 public interface IFlowerRoot extends ISpeciesRoot {
 	@Override
-	IFlower getMember(ItemStack stack);
+	@Nullable
+	IFlower getMember(ItemStack memberStack);
 
 	@Override
 	IFlower templateAsIndividual(IAllele[] template);
 
 	@Override
-	IFlower templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive);
+	IFlower templateAsIndividual(IAllele[] templateFirst, IAllele[] templateSecond);
 
 	@Override
 	IFlowerGenome templateAsGenome(IAllele[] template);
 
 	@Override
-	IFlowerGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
+	IFlowerGenome templateAsGenome(IAllele[] templateFrist, IAllele[] templateSecond);
 
 	@Override
-	IBotanistTracker getBreedingTracker(World world, GameProfile player);
+	IBotanistTracker getBreedingTracker(World world, @Nullable GameProfile profile);
 
 	@Override
-	Collection<IFlowerMutation> getMutations(boolean shuffle);
+	List<? extends IFlowerMutation> getMutations(boolean shuffle);
 
-	EnumFlowerStage getStageType(ItemStack stack);
+	@Override
+	@Nullable
+	EnumFlowerStage getType(ItemStack itemStack);
 
-	IFlower getFlower(World world, IFlowerGenome genome);
+	IFlower getFlower(IFlowerGenome genome);
 
-	void addConversion(ItemStack stack, IAllele[] template);
+	void addConversion(ItemStack memberStack, IAllele[] template);
 
-	IFlower getConversion(ItemStack stack);
+	@Nullable
+	IFlower getConversion(ItemStack memberStack);
 
-	Collection<IColourMix> getColourMixes(boolean shuffle);
+	Collection<IColourMix> getColourMixes(boolean p0);
 
-	void registerColourMix(IColourMix colorMix);
+	void registerColourMix(IColourMix colourMix);
+	
+	boolean plant(World world, BlockPos pos, IFlower flower, GameProfile owner);
+	
+	void tryGrowSection(World world, BlockPos pos);
+	
+	void onGrowFromSeed(World world, BlockPos pos);
 }

src/main/java/binnie/botany/api/IFlowerType.java

@@ -1,13 +1,21 @@
 package binnie.botany.api;
 
-import net.minecraft.util.IIcon;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
 
-public interface IFlowerType {
-	IIcon getStem(EnumFlowerStage stage, boolean flowered, int section);
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
-	IIcon getPetalIcon(EnumFlowerStage stage, boolean flowered, int section);
+import forestry.api.core.IModelManager;
 
-	IIcon getVariantIcon(EnumFlowerStage stage, boolean flowered, int section);
+public interface IFlowerType<I extends IFlowerType<I>> extends Comparable<I> {
+	@SideOnly(Side.CLIENT)
+	void registerModels(Item item, IModelManager manager, EnumFlowerStage type);
+
+	@SideOnly(Side.CLIENT)
+	ModelResourceLocation getModel(EnumFlowerStage type, boolean flowered);
+
+	String getName();
 
 	int getID();
 

src/main/java/binnie/botany/api/IGardeningManager.java

@@ -0,0 +1,68 @@
+package binnie.botany.api;
+
+import javax.annotation.Nullable;
+import java.util.Collection;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import forestry.api.core.EnumTemperature;
+
+public interface IGardeningManager {
+	default boolean isSoil(final Block block) {
+		return block instanceof IBlockSoil;
+	}
+	
+	boolean isSoil(Item item);
+	
+	boolean isSoil(ItemStack item);
+	
+	EnumMoisture getNaturalMoisture(World world, BlockPos pos);
+	
+	EnumAcidity getNaturalPH(World world, BlockPos pos);
+	
+	float getBiomeMoisture(World world, BlockPos pos);
+	
+	float getBiomePH(World world, BlockPos pos);
+	
+	void plantSoil(World world, BlockPos pos, EnumSoilType soil, EnumMoisture moisture, EnumAcidity acidity);
+	
+	Collection<ItemStack> getAcidFertilisers();
+	
+	Collection<ItemStack> getAlkalineFertilisers();
+	
+	Collection<ItemStack> getNutrientFertilisers();
+	
+	void registerAcidFertiliser(ItemStack stack, int strength);
+	
+	void registerAlkalineFertiliser(ItemStack stack, int strength);
+	
+	void registerNutrientFertiliser(ItemStack stack, int strength);
+	
+	boolean isAcidFertiliser(ItemStack stack);
+	
+	boolean isAlkalineFertiliser(ItemStack stack);
+	
+	boolean isNutrientFertiliser(ItemStack stack);
+	
+	int getFertiliserStrength(ItemStack stack);
+	
+	boolean canTolerate(@Nullable IFlower flower, World world, BlockPos pos);
+	
+	EnumSoilType getSoilType(World world, BlockPos pos);
+	
+	default Block getSoilBlock(EnumSoilType type) {
+		return getSoilBlock(type, false);
+	}
+	
+	Block getSoilBlock(EnumSoilType type, boolean weedkill);
+	
+	boolean canTolerate(IFlower flower, EnumAcidity ePH, EnumMoisture eMoisture, EnumTemperature eTemp);
+	
+	boolean isWeedkiller(ItemStack heldItem);
+	
+	boolean addWeedKiller(World world, BlockPos pos);
+}

src/main/java/binnie/botany/api/gardening/IBlockSoil.java

@@ -1,24 +0,0 @@
-package binnie.botany.api.gardening;
-
-import binnie.botany.api.EnumAcidity;
-import binnie.botany.api.EnumMoisture;
-import binnie.botany.api.EnumSoilType;
-import net.minecraft.world.World;
-
-public interface IBlockSoil {
-	EnumAcidity getPH(World world, int x, int y, int z);
-
-	EnumMoisture getMoisture(World world, int x, int y, int z);
-
-	EnumSoilType getType(World world, int x, int y, int z);
-
-	boolean fertilise(World world, int x, int y, int z, EnumSoilType maxLevel);
-
-	boolean degrade(World world, int x, int y, int z, EnumSoilType minLevel);
-
-	boolean setPH(World world, int x, int y, int z, EnumAcidity pH);
-
-	boolean setMoisture(World world, int x, int y, int z, EnumMoisture p4);
-
-	boolean resistsWeeds(World world, int x, int y, int z);
-}

src/main/java/binnie/botany/api/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package binnie.botany.api;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import mcp.MethodsReturnNonnullByDefault;

src/main/java/binnie/botany/ceramic/BlockCeramic.java

@@ -1,146 +1,119 @@
 package binnie.botany.ceramic;
 
-import binnie.botany.Botany;
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.genetics.EnumFlowerColor;
-import binnie.core.block.BlockMetadata;
-import binnie.core.block.IBlockMetadata;
-import binnie.core.block.TileEntityMetadata;
-import binnie.core.util.I18N;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
-import java.util.ArrayList;
-import java.util.List;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
-public class BlockCeramic extends Block implements IBlockMetadata {
+import forestry.api.core.IItemModelRegister;
+import forestry.api.core.IModelManager;
+import forestry.core.blocks.IColoredBlock;
+
+import binnie.botany.CreativeTabBotany;
+import binnie.botany.genetics.EnumFlowerColor;
+import binnie.core.BinnieCore;
+import binnie.core.util.TileUtil;
+
+public class BlockCeramic extends Block implements IColoredBlock, IItemModelRegister {
 	public BlockCeramic() {
-		super(Material.rock);
-		setHardness(1.0f);
-		setResistance(5.0f);
-		setBlockName("ceramic");
-		setCreativeTab(CreativeTabBotany.instance);
+		super(Material.ROCK);
+		this.setHardness(1.0f);
+		this.setResistance(5.0f);
+		this.setRegistryName("ceramic");
+		this.setCreativeTab(CreativeTabBotany.instance);
 	}
 
 	@Override
-	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int blockMeta, int fortune) {
-		return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta);
+	@SideOnly(Side.CLIENT)
+	public void registerModel(Item item, IModelManager manager) {
+		for (final EnumFlowerColor c : EnumFlowerColor.values()) {
+			manager.registerItemModel(item, c.ordinal());
+		}
 	}
 
 	@Override
-	public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
-		return BlockMetadata.breakBlock(this, player, world, x, y, z);
+	public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
+		return Collections.emptyList();
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World var1, int i) {
-		return new TileEntityMetadata();
+	public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, @Nullable EntityPlayer player, boolean willHarvest) {
+		List<ItemStack> drops = new ArrayList<>();
+		TileCeramic ceramic = TileUtil.getTile(world, pos, TileCeramic.class);
+		if (ceramic != null) {
+			drops = Collections.singletonList(ceramic.getStack());
+		}
+		boolean hasBeenBroken = world.setBlockToAir(pos);
+		if (hasBeenBroken && BinnieCore.getBinnieProxy().isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) {
+			for (ItemStack drop : drops) {
+				spawnAsEntity(world, pos, drop);
+			}
+		}
+		return hasBeenBroken;
 	}
 
 	@Override
-	public boolean hasTileEntity(int meta) {
+	public TileEntity createTileEntity(World world, IBlockState state) {
+		return new TileCeramic();
+	}
+
+	@Override
+	public boolean hasTileEntity(IBlockState state) {
 		return true;
 	}
 
 	@Override
-	public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) {
-		super.onBlockEventReceived(world, x, y, z, eventId, eventType);
-		TileEntity tileentity = world.getTileEntity(x, y, z);
-		return tileentity != null && tileentity.receiveClientEvent(eventId, eventType);
+	public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {
+		TileCeramic ceramic = TileUtil.getTile(worldIn, pos, TileCeramic.class);
+		if (ceramic != null) {
+			ceramic.setColor(EnumFlowerColor.VALUES[stack.getItemDamage()]);
+		}
 	}
 
 	@Override
-	public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
-		return TileEntityMetadata.getItemDamage(itemStack);
-	}
-
-	@Override
-	public int getDroppedMeta(int blockMeta, int tileMeta) {
-		return tileMeta;
-	}
-
-	@Override
-	public String getBlockName(ItemStack itemStack) {
-		return I18N.localise("botany.ceramicBlock");
-	}
-
-	@Override
-	public void addBlockTooltip(ItemStack stack, List tooltip) {
-		int meta = TileEntityMetadata.getItemDamage(stack);
-		tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName());
-	}
-
-	@Override
-	public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) {
-		dropBlockAsItem(world, x, y, z, itemStack);
-	}
-
-	@Override
-	public void getSubBlocks(Item item, CreativeTabs tabs, List itemList) {
+	@SideOnly(Side.CLIENT)
+	public void getSubBlocks(final Item item, final CreativeTabs tab, final NonNullList<ItemStack> itemList) {
 		for (EnumFlowerColor c : EnumFlowerColor.values()) {
-			itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
+			itemList.add(new ItemStack(item, 1, c.getFlowerColorAllele().getID()));
 		}
 	}
 
 	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
-		TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
-		if (tile != null) {
-			return getIcon(side, tile.getTileMetadata());
+	public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
+		TileCeramic ceramic = TileUtil.getTile(world, pos, TileCeramic.class);
+		if (ceramic != null) {
+			return ceramic.getStack();
 		}
-		return super.getIcon(world, x, y, z, side);
+		return super.getPickBlock(state, target, world, pos, player);
 	}
 
-	@Override
-	public IIcon getIcon(int side, int meta) {
-		return blockIcon;
-	}
-
-	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister register) {
-		blockIcon = Botany.proxy.getIcon(register, "ceramic");
-	}
-
 	@Override
-	@SideOnly(Side.CLIENT)
-	public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
-		TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
-		if (tile != null) {
-			return getRenderColor(tile.getTileMetadata());
+	public int colorMultiplier(IBlockState state, @Nullable IBlockAccess world, @Nullable BlockPos pos, int tintIndex) {
+		if (world != null && pos != null) {
+			TileCeramic ceramic = TileUtil.getTile(world, pos, TileCeramic.class);
+			if (ceramic != null) {
+				return ceramic.getColor().getFlowerColorAllele().getColor(false);
+			}
 		}
-		return 0xffffff;
-	}
-
-	@Override
-	public void breakBlock(World world, int x, int y, int z, Block block, int side) {
-		super.breakBlock(world, x, y, z, block, side);
-		world.removeTileEntity(x, y, z);
-	}
-
-	@Override
-	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
-		return BlockMetadata.getPickBlock(world, x, y, z);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getRenderColor(int meta) {
-		return EnumFlowerColor.get(meta).getColor(false);
+		return EnumFlowerColor.get(0).getFlowerColorAllele().getColor(false);
 	}
 }

src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java

@@ -1,553 +0,0 @@
-package binnie.botany.ceramic;
-
-import binnie.botany.Botany;
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.genetics.EnumFlowerColor;
-import binnie.botany.items.BotanyItems;
-import binnie.core.BinnieCore;
-import binnie.core.block.BlockMetadata;
-import binnie.core.block.IBlockMetadata;
-import binnie.core.block.IMultipassBlock;
-import binnie.core.block.MultipassBlockRenderer;
-import binnie.core.block.TileEntityMetadata;
-import binnie.core.util.I18N;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipassBlock {
-	public BlockCeramicBrick() {
-		super(Material.rock);
-		setHardness(1.0f);
-		setResistance(5.0f);
-		setBlockName("ceramicBrick");
-		setCreativeTab(CreativeTabBotany.instance);
-	}
-
-	private static BlockType getType(int meta) {
-		return new BlockType(meta);
-	}
-
-	@Override
-	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int blockMeta, int fortune) {
-		return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta);
-	}
-
-	@Override
-	public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) {
-		return BlockMetadata.breakBlock(this, player, world, x, y, z);
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World var1, int i) {
-		return new TileEntityMetadata();
-	}
-
-	@Override
-	public boolean hasTileEntity(int meta) {
-		return true;
-	}
-
-	@Override
-	public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) {
-		super.onBlockEventReceived(world, x, y, z, eventId, eventType);
-		TileEntity tileentity = world.getTileEntity(x, y, z);
-		return tileentity != null && tileentity.receiveClientEvent(eventId, eventType);
-	}
-
-	@Override
-	public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
-		return TileEntityMetadata.getItemDamage(itemStack);
-	}
-
-	@Override
-	public int getDroppedMeta(int blockMeta, int tileMeta) {
-		return tileMeta;
-	}
-
-	@Override
-	public String getBlockName(ItemStack itemStack) {
-		int meta = TileEntityMetadata.getItemDamage(itemStack);
-		return getType(meta).getName();
-	}
-
-	@Override
-	public void addBlockTooltip(ItemStack itemStack, List tooltip) {
-		int meta = TileEntityMetadata.getItemDamage(itemStack);
-		getType(meta).addTooltip(tooltip);
-	}
-
-	@Override
-	public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) {
-		dropBlockAsItem(world, x, y, z, itemStack);
-	}
-
-	@Override
-	public void getSubBlocks(Item item, CreativeTabs tab, List itemList) {
-		for (EnumFlowerColor c : EnumFlowerColor.values()) {
-			BlockType type = new BlockType(c, c, TileType.Tile);
-			itemList.add(TileEntityMetadata.getItemStack(this, type.ordinal()));
-		}
-
-		for (TileType type2 : TileType.values()) {
-			if (type2.canDouble()) {
-				itemList.add(new BlockType(EnumFlowerColor.BROWN, EnumFlowerColor.GOLD, type2).getStack(1));
-			}
-		}
-
-		itemList.add(new BlockType(EnumFlowerColor.GOLD, EnumFlowerColor.GOLD, TileType.Split).getStack(1));
-		itemList.add(new BlockType(EnumFlowerColor.BROWN, EnumFlowerColor.BROWN, TileType.Chequered).getStack(1));
-		itemList.add(new BlockType(EnumFlowerColor.GOLD, EnumFlowerColor.BROWN, TileType.LargeBrick).getStack(1));
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
-		TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
-		if (tile != null) {
-			return getIcon(side, tile.getTileMetadata());
-		}
-		return super.getIcon(world, x, y, z, side);
-	}
-
-	@Override
-	public IIcon getIcon(int side, int meta) {
-		return getType(meta).getIcon(MultipassBlockRenderer.getLayer());
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister register) {
-		for (TileType type : TileType.values()) {
-			for (int i = 0; i < 3; ++i) {
-				type.icons[i] = Botany.proxy.getIcon(register, "ceramic." + type.id + "." + i);
-			}
-		}
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
-		TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
-		if (tile != null) {
-			return getRenderColor(tile.getTileMetadata());
-		}
-		return 0xffffff;
-	}
-
-	@Override
-	public void breakBlock(World world, int x, int y, int z, Block block, int side) {
-		super.breakBlock(world, x, y, z, block, side);
-		world.removeTileEntity(x, y, z);
-	}
-
-	@Override
-	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
-		return BlockMetadata.getPickBlock(world, x, y, z);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getRenderColor(int meta) {
-		return colorMultiplier(meta);
-	}
-
-	@Override
-	public int getNumberOfPasses() {
-		return 3;
-	}
-
-	@Override
-	public int colorMultiplier(int meta) {
-		BlockType type = getType(meta);
-		if (MultipassBlockRenderer.getLayer() == 0) {
-			return 0xffffff;
-		}
-		if (MultipassBlockRenderer.getLayer() == 1) {
-			return type.color1.getColor(false);
-		}
-		return type.color2.getColor(false);
-	}
-
-	@Override
-	public int getRenderType() {
-		return BinnieCore.multipassRenderID;
-	}
-
-	public enum TileType {
-		Tile("tile", "ceramicTile"),
-		Brick("brick", "ceramicBricks"),
-		StripeBrick("brickstripe", "strippedCeramicBricks"),
-		LargeBrick("bricklarge", "largeCeramicBricks"),
-		Split("split", "splitCeramicTile"),
-		Chequered("cheque", "chequeredCeramicTile"),
-		Mixed("mixed", "mixedCeramicTile"),
-		VerticalBrick("verticalbrick", "verticalCeramicBricks"),
-		VerticalStripeBrick("verticalbrickstripe", "verticalStripedCeramicBricks"),
-		VerticalLargeBrick("verticalbricklarge", "largeVerticalCeramicBricks");
-
-		protected String id;
-		protected String name;
-		protected IIcon[] icons;
-
-		TileType(String id, String name) {
-			icons = new IIcon[3];
-			this.id = id;
-			this.name = name;
-		}
-
-		public static TileType get(int id) {
-			return values()[id % values().length];
-		}
-
-		public boolean canDouble() {
-			return this != TileType.Tile;
-		}
-
-		public ItemStack getRecipe(List<ItemStack> stacks) {
-			switch (this) {
-				case Tile:
-					return getTileRecipe(stacks);
-
-				case Split:
-					return getSplitRecipe(stacks);
-
-				case Chequered:
-					return getChequeredRecipe(stacks);
-
-				case Mixed:
-					return getMixedRecipe(stacks);
-
-				case LargeBrick:
-					return getLargeBrickRecipe(stacks);
-
-				case Brick:
-				case StripeBrick:
-					return getBrickRecipe(stacks);
-
-				case VerticalLargeBrick:
-				case VerticalBrick:
-				case VerticalStripeBrick:
-					return getVerticalBrickRecipe(stacks);
-			}
-			return null;
-		}
-
-		private ItemStack getTileRecipe(List<ItemStack> stacks) {
-			if (stacks.size() != 4) {
-				return null;
-			}
-
-			int mortars = 0;
-			int blockColor = -1;
-			for (ItemStack stack : stacks) {
-				if (isMortar(stack)) {
-					mortars++;
-				} else {
-					if (stack.getItem() != Item.getItemFromBlock(Botany.ceramic)) {
-						return null;
-					}
-
-					int color = TileEntityMetadata.getItemDamage(stack);
-					if (blockColor == -1) {
-						blockColor = color;
-					} else if (blockColor != color) {
-						return null;
-					}
-				}
-			}
-
-			if (mortars != 1) {
-				return null;
-			}
-			EnumFlowerColor c = EnumFlowerColor.get(blockColor);
-			return new BlockType(c, c, TileType.Tile).getStack(3);
-		}
-
-		private ItemStack getSplitRecipe(List<ItemStack> stacks) {
-			if (stacks.size() != 4) {
-				return null;
-			}
-
-			int[] colors = {-1, -1};
-			int altCounter = 0;
-			for (ItemStack stack : stacks) {
-				int alt = (altCounter != 0 && altCounter != 3) ? 1 : 0;
-				if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
-					return null;
-				}
-
-				BlockType type = new BlockType(stack);
-				if (type.type != TileType.Tile) {
-					return null;
-				}
-
-				int color2 = type.color1.ordinal();
-				if (colors[alt] == -1) {
-					colors[alt] = color2;
-				} else if (colors[alt] != color2) {
-					return null;
-				}
-				altCounter++;
-			}
-			return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), TileType.Split).getStack(4);
-		}
-
-		private ItemStack getChequeredRecipe(List<ItemStack> stacks) {
-			if (stacks.size() != 4) {
-				return null;
-			}
-
-			int[] colors = {-1, -1};
-			for (ItemStack stack : stacks) {
-				if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
-					return null;
-				}
-
-				BlockType type2 = new BlockType(stack);
-				if (type2.type != TileType.Split) {
-					return null;
-				}
-
-				int color1 = type2.color1.ordinal();
-				int color2 = type2.color2.ordinal();
-				if (colors[0] == -1) {
-					colors[0] = color1;
-					colors[1] = color2;
-				} else if (colors[0] != color1 || colors[1] != color2) {
-					return null;
-				}
-			}
-			return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), TileType.Chequered).getStack(4);
-		}
-
-		private ItemStack getMixedRecipe(List<ItemStack> stacks) {
-			if (stacks.size() != 4) {
-				return null;
-			}
-
-			int[] colors = {-1, -1};
-			for (ItemStack stack : stacks) {
-				if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
-					return null;
-				}
-
-				BlockType type2 = new BlockType(stack);
-				if (type2.isTwoColors()) {
-					return null;
-				}
-
-				int color3 = type2.color1.ordinal();
-				if (type2.type == TileType.Split) {
-					if (colors[1] != -1) {
-						return null;
-					}
-					colors[1] = color3;
-				} else {
-					if (type2.type != TileType.Chequered) {
-						return null;
-					}
-
-					if (colors[0] == -1) {
-						colors[0] = color3;
-					} else if (colors[0] != color3) {
-						return null;
-					}
-				}
-			}
-
-			if (colors[0] == -1 || colors[1] == -1) {
-				return null;
-			}
-			return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), TileType.Mixed).getStack(4);
-		}
-
-		private ItemStack getLargeBrickRecipe(List<ItemStack> stacks) {
-			if (stacks.size() == 1) {
-				ItemStack stack3 = stacks.get(0);
-				BlockType type3 = new BlockType(stack3);
-				if (type3.type == TileType.VerticalLargeBrick) {
-					type3.type = this;
-					return type3.getStack(1);
-				}
-				return null;
-			}
-
-			if (stacks.size() != 3) {
-				return null;
-			}
-
-			int[] colors = {-1, -1};
-			for (ItemStack stack4 : stacks) {
-				if (stack4.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
-					return null;
-				}
-
-				BlockType type4 = new BlockType(stack4);
-				if (type4.type != TileType.Tile) {
-					return null;
-				}
-
-				int color5 = type4.color1.ordinal();
-				if (colors[0] == -1) {
-					colors[0] = color5;
-				} else if (colors[1] == -1) {
-					colors[1] = color5;
-				} else if (colors[1] != color5) {
-					return null;
-				}
-			}
-
-			if (colors[1] == -1) {
-				colors[1] = colors[0];
-			}
-			return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), TileType.LargeBrick).getStack(3);
-		}
-
-		private ItemStack getBrickRecipe(List<ItemStack> stacks) {
-			if (stacks.size() == 1) {
-				ItemStack stack = stacks.get(0);
-				BlockType type = new BlockType(stack);
-				if (type.type == TileType.VerticalBrick) {
-					type.type = this;
-					return type.getStack(1);
-				}
-
-				if (type.type == TileType.StripeBrick) {
-					type.type = this;
-					return type.getStack(1);
-				}
-				return null;
-			}
-
-			if (stacks.size() != 4) {
-				return null;
-			}
-
-			int[] colors = {-1, -1};
-			for (int index2 = 0; index2 < stacks.size(); ++index2) {
-				ItemStack stack = stacks.get(index2);
-				if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
-					return null;
-				}
-
-				BlockType type = new BlockType(stack);
-				if (type.type != TileType.LargeBrick) {
-					return null;
-				}
-
-				int color5 = type.color1.ordinal();
-				int color6 = type.color2.ordinal();
-				int alt2 = (index2 != 0 && index2 != 3) ? 1 : 0;
-				if (this == TileType.StripeBrick) {
-					alt2 = 0;
-				}
-
-				if (colors[alt2] == -1) {
-					colors[alt2] = color5;
-					colors[1 - alt2] = color6;
-				} else if (colors[alt2] != color5 || colors[1 - alt2] != color6) {
-					return null;
-				}
-			}
-			return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), this).getStack(4);
-		}
-
-		private ItemStack getVerticalBrickRecipe(List<ItemStack> stacks) {
-			if (stacks.size() != 1) {
-				return null;
-			}
-
-			ItemStack stack5 = stacks.get(0);
-			BlockType type = new BlockType(stack5);
-			if (type.type == TileType.LargeBrick) {
-				type.type = TileType.VerticalLargeBrick;
-				return type.getStack(1);
-			}
-
-			if (type.type == TileType.Brick) {
-				type.type = TileType.VerticalBrick;
-				return type.getStack(1);
-			}
-
-			if (type.type == TileType.StripeBrick) {
-				type.type = TileType.VerticalStripeBrick;
-				return type.getStack(1);
-			}
-			return null;
-		}
-
-		private boolean isMortar(ItemStack stack) {
-			return stack.getItem() == Botany.misc
-				&& stack.getItemDamage() == BotanyItems.Mortar.ordinal();
-		}
-	}
-
-	public static class BlockType {
-		protected EnumFlowerColor color1;
-		protected EnumFlowerColor color2;
-		protected TileType type;
-
-		private BlockType(EnumFlowerColor color1, EnumFlowerColor color2, TileType type) {
-			this.color1 = color1;
-			this.color2 = color2;
-			this.type = type;
-		}
-
-		public boolean isTwoColors() {
-			return type.canDouble() && color2 != color1;
-		}
-
-		public BlockType(ItemStack stack) {
-			this(TileEntityMetadata.getItemDamage(stack));
-		}
-
-		public ItemStack getStack(int stackSize) {
-			ItemStack stack = TileEntityMetadata.getItemStack(Botany.ceramicBrick, ordinal());
-			stack.stackSize = stackSize;
-			return stack;
-		}
-
-		public BlockType(int id) {
-			color1 = EnumFlowerColor.get(id & 0xFF);
-			color2 = EnumFlowerColor.get(id >> 8 & 0xFF);
-			type = TileType.get(id >> 16 & 0xFF);
-		}
-
-		public String getName() {
-			return I18N.localise("botany." + type.name);
-		}
-
-		public void addTooltip(List tooltip) {
-			String name = color1.getName();
-			if (type.canDouble() && color2 != color1) {
-				name = I18N.localise("botany.colour.double", name, color2.getName());
-			}
-			tooltip.add(EnumChatFormatting.GRAY + name);
-		}
-
-		public int ordinal() {
-			return color1.ordinal() + color2.ordinal() * 256 + type.ordinal() * 65536;
-		}
-
-		public IIcon getIcon(int layer) {
-			return type.icons[layer];
-		}
-	}
-}

src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java

@@ -1,42 +1,31 @@
 package binnie.botany.ceramic;
 
+import net.minecraft.block.material.Material;
+import net.minecraft.item.ItemStack;
+
 import binnie.botany.CreativeTabBotany;
 import binnie.botany.genetics.EnumFlowerColor;
-import binnie.core.block.TileEntityMetadata;
-import binnie.core.util.I18N;
 import binnie.extratrees.api.IDesign;
 import binnie.extratrees.carpentry.BlockDesign;
 import binnie.extratrees.carpentry.DesignBlock;
 import binnie.extratrees.carpentry.ModuleCarpentry;
-import net.minecraft.block.material.Material;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-
-import java.util.List;
 
 public class BlockCeramicPatterned extends BlockDesign {
 	public BlockCeramicPatterned() {
-		super(CeramicDesignSystem.instance, Material.rock);
-		setHardness(1.0f);
-		setResistance(5.0f);
-		setCreativeTab(CreativeTabBotany.instance);
-		setBlockName("ceramicPattern");
+		super(CeramicDesignSystem.instance, Material.ROCK);
+		this.setHardness(1.0f);
+		this.setResistance(5.0f);
+		this.setCreativeTab(CreativeTabBotany.instance);
+		this.setRegistryName("ceramicPattern");
 	}
 
 	@Override
-	public ItemStack getCreativeStack(IDesign design) {
-		return ModuleCarpentry.getItemStack(this, CeramicColor.get(EnumFlowerColor.WHITE), CeramicColor.get(EnumFlowerColor.BLACK), design);
+	public ItemStack getCreativeStack(final IDesign design) {
+		return ModuleCarpentry.getItemStack(this, CeramicColor.get(EnumFlowerColor.White), CeramicColor.get(EnumFlowerColor.Black), design);
 	}
 
 	@Override
-	public String getBlockName(DesignBlock design) {
-		return I18N.localise("botany.ceramicBlock");
-	}
-
-	@Override
-	public void addBlockTooltip(ItemStack stack, List tooltip) {
-		super.addBlockTooltip(stack, tooltip);
-		DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
-		tooltip.add(EnumChatFormatting.GRAY + block.getDesign().getName());
+	public String getBlockName(final DesignBlock design) {
+		return design.getDesign().getName() + " Ceramic Block";
 	}
 }

src/main/java/binnie/botany/ceramic/BlockStained.java

@@ -1,197 +0,0 @@
-package binnie.botany.ceramic;
-
-import binnie.botany.Botany;
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.genetics.EnumFlowerColor;
-import binnie.core.block.BlockMetadata;
-import binnie.core.block.IBlockMetadata;
-import binnie.core.block.TileEntityMetadata;
-import binnie.core.util.I18N;
-import binnie.extratrees.ExtraTrees;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-public class BlockStained extends Block implements IBlockMetadata {
-	public BlockStained() {
-		super(Material.glass);
-		setCreativeTab(CreativeTabBotany.instance);
-		setBlockName("stained");
-	}
-
-	@Override
-	public int quantityDropped(Random rand) {
-		return 0;
-	}
-
-	@Override
-	public boolean isOpaqueCube() {
-		return false;
-	}
-
-	@Override
-	public boolean renderAsNormalBlock() {
-		return false;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getRenderBlockPass() {
-		return 1;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) {
-//		Block block2 = world.getBlock(x - Facing.offsetsXForSide[side], y - Facing.offsetsYForSide[side], z - Facing.offsetsZForSide[side]);
-		Block block = world.getBlock(x, y, z);
-		return block != this
-			&& block != ExtraTrees.blockStained
-			&& super.shouldSideBeRendered(world, x, y, z, side);
-	}
-
-	@Override
-	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int blockMeta, int fortune) {
-		return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta);
-	}
-
-	@Override
-	public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
-		return BlockMetadata.breakBlock(this, player, world, x, y, z);
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World var1, int i) {
-		return new TileEntityMetadata();
-	}
-
-	@Override
-	public boolean hasTileEntity(int meta) {
-		return true;
-	}
-
-	@Override
-	public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) {
-		super.onBlockEventReceived(world, x, y, z, eventId, eventType);
-		TileEntity tileentity = world.getTileEntity(x, y, z);
-		return tileentity != null && tileentity.receiveClientEvent(eventId, eventType);
-	}
-
-	@Override
-	public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
-		return TileEntityMetadata.getItemDamage(itemStack);
-	}
-
-	@Override
-	public int getDroppedMeta(int blockMeta, int tileMeta) {
-		return tileMeta;
-	}
-
-	@Override
-	public String getBlockName(ItemStack itemStack) {
-		return I18N.localise("botany.pigmentedGlass");
-	}
-
-	@Override
-	public void addBlockTooltip(ItemStack itemStack, List tooltip) {
-		int meta = TileEntityMetadata.getItemDamage(itemStack);
-		tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName());
-	}
-
-	@Override
-	public void dropAsStack(World world, int x, int y, int z, ItemStack stack) {
-		dropBlockAsItem(world, x, y, z, stack);
-	}
-
-	@Override
-	public void getSubBlocks(Item item, CreativeTabs tab, List itemList) {
-		for (EnumFlowerColor c : EnumFlowerColor.values()) {
-			itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
-		}
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
-		TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
-		if (tile != null) {
-			return getIcon(side, tile.getTileMetadata());
-		}
-		return super.getIcon(world, x, y, z, side);
-	}
-
-	@Override
-	public IIcon getIcon(int side, int meta) {
-		return blockIcon;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister register) {
-		blockIcon = Botany.proxy.getIcon(register, "stained");
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
-		TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
-		if (tile != null) {
-			return getRenderColor(tile.getTileMetadata());
-		}
-		return 0xffffff;
-	}
-
-	@Override
-	public void breakBlock(World world, int x, int y, int z, Block block, int side) {
-		super.breakBlock(world, x, y, z, block, side);
-		world.removeTileEntity(x, y, z);
-	}
-
-	@Override
-	public boolean isWood(IBlockAccess world, int x, int y, int z) {
-		return true;
-	}
-
-	@Override
-	public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
-		return 20;
-	}
-
-	@Override
-	public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
-		return true;
-	}
-
-	@Override
-	public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
-		return 5;
-	}
-
-	@Override
-	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
-		return BlockMetadata.getPickBlock(world, x, y, z);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getRenderColor(int meta) {
-		return EnumFlowerColor.get(meta).getColor(false);
-	}
-}

src/main/java/binnie/botany/ceramic/BlockStainedGlass.java

@@ -0,0 +1,183 @@
+package binnie.botany.ceramic;
+
+import javax.annotation.Nullable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Enchantments;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.stats.StatList;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockRenderLayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+import net.minecraftforge.event.ForgeEventFactory;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.core.IItemModelRegister;
+import forestry.api.core.IModelManager;
+import forestry.core.blocks.IColoredBlock;
+
+import binnie.botany.CreativeTabBotany;
+import binnie.botany.genetics.EnumFlowerColor;
+import binnie.core.block.BlockMetadata;
+import binnie.core.block.IBlockMetadata;
+import binnie.core.block.TileEntityMetadata;
+import binnie.core.util.I18N;
+
+public class BlockStainedGlass extends Block implements IBlockMetadata, IColoredBlock, IItemModelRegister {
+	public BlockStainedGlass() {
+		super(Material.GLASS);
+		this.setCreativeTab(CreativeTabBotany.instance);
+		this.setRegistryName("stained");
+		this.setSoundType(SoundType.GLASS);
+		this.setHardness(0.3F);
+	}
+
+	@Override
+	public int quantityDropped(final Random rand) {
+		return 0;
+	}
+	
+	@Override
+	public boolean isOpaqueCube(IBlockState state) {
+		return false;
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public BlockRenderLayer getBlockLayer() {
+		return BlockRenderLayer.TRANSLUCENT;
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void registerModel(Item item, IModelManager manager) {
+		for (EnumFlowerColor color : EnumFlowerColor.values()) {
+			manager.registerItemModel(item, color.getFlowerColorAllele().getID());
+		}
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) {
+		IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side));
+		Block block = iblockstate.getBlock();
+		return block != this;
+	}
+	
+	@Override
+	public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, @Nullable TileEntity te, ItemStack stack) {
+		player.addStat(StatList.getBlockStats(this));
+		player.addExhaustion(0.005F);
+		
+		if (EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0 && te instanceof TileEntityMetadata) {
+			java.util.List<ItemStack> items = new java.util.ArrayList<ItemStack>();
+			TileEntityMetadata tile = (TileEntityMetadata) te;
+			int damage = getDroppedMeta(state, tile.getTileMetadata());
+			ItemStack itemstack = TileEntityMetadata.getItemStack(this, damage);
+			
+			if (!itemstack.isEmpty()) {
+				items.add(itemstack);
+			}
+			
+			ForgeEventFactory.fireBlockHarvesting(items, worldIn, pos, state, 0, 1.0f, true, player);
+			for (ItemStack item : items) {
+				spawnAsEntity(worldIn, pos, item);
+			}
+		}
+	}
+
+	@Override
+	public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
+		return Collections.emptyList();
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(final World var1, final int i) {
+		return new TileEntityMetadata();
+	}
+
+	@Override
+	public boolean hasTileEntity(IBlockState state) {
+		return true;
+	}
+
+	@Override
+	public boolean eventReceived(IBlockState state, World worldIn, BlockPos pos, int id, int param) {
+		TileEntity tileentity = worldIn.getTileEntity(pos);
+		return tileentity != null && tileentity.receiveClientEvent(id, param);
+	}
+
+	@Override
+	public int getPlacedMeta(final ItemStack stack, final World world, final BlockPos pos, final EnumFacing clickedBlock) {
+		return TileEntityMetadata.getItemDamage(stack);
+	}
+
+	@Override
+	public int getDroppedMeta(IBlockState state, int tileMetadata) {
+		return tileMetadata;
+	}
+
+	@Override
+	public String getDisplayName(final ItemStack itemStack) {
+		final int meta = TileEntityMetadata.getItemDamage(itemStack);
+		return EnumFlowerColor.get(meta).getFlowerColorAllele().getColourName() + " " + I18N.localise("tile.botany.pigmented.glass.name");
+	}
+
+	@Override
+	public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> itemList) {
+		for (final EnumFlowerColor c : EnumFlowerColor.values()) {
+			itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
+		}
+	}
+
+	@Override
+	public boolean isWood(IBlockAccess world, BlockPos pos) {
+		return true;
+	}
+
+	@Override
+	public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) {
+		return 20;
+	}
+
+	@Override
+	public boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) {
+		return true;
+	}
+
+	@Override
+	public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) {
+		return 5;
+	}
+
+	@Override
+	public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
+		return BlockMetadata.getPickBlock(world, pos);
+	}
+
+	@Override
+	public int colorMultiplier(IBlockState state, @Nullable IBlockAccess worldIn, @Nullable BlockPos pos, int tintIndex) {
+		if (worldIn == null || pos == null) {
+			return 0;
+		}
+		return EnumFlowerColor.get(TileEntityMetadata.getTileMetadata(worldIn, pos)).getFlowerColorAllele().getColor(false);
+	}
+}

src/main/java/binnie/botany/ceramic/CeramicColor.java

@@ -1,46 +1,51 @@
 package binnie.botany.ceramic;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import net.minecraft.item.ItemStack;
+
 import binnie.botany.Botany;
 import binnie.botany.genetics.EnumFlowerColor;
 import binnie.core.block.TileEntityMetadata;
 import binnie.extratrees.api.IDesignMaterial;
-import net.minecraft.item.ItemStack;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
 
 public class CeramicColor implements IDesignMaterial {
-	private static Map<EnumFlowerColor, CeramicColor> map;
+	private final static Map<EnumFlowerColor, CeramicColor> map = new LinkedHashMap<>();
 
 	static {
-		CeramicColor.map = new LinkedHashMap<>();
-		for (EnumFlowerColor c : EnumFlowerColor.values()) {
+		for (final EnumFlowerColor c : EnumFlowerColor.values()) {
 			CeramicColor.map.put(c, new CeramicColor(c));
 		}
 	}
 
-	protected EnumFlowerColor color;
+	EnumFlowerColor color;
 
-	CeramicColor(EnumFlowerColor color) {
+	CeramicColor(final EnumFlowerColor color) {
 		this.color = color;
 	}
 
-	public static CeramicColor get(EnumFlowerColor c) {
+	public static CeramicColor get(final EnumFlowerColor c) {
 		return CeramicColor.map.get(c);
 	}
 
 	@Override
 	public ItemStack getStack() {
-		return TileEntityMetadata.getItemStack(Botany.ceramic, color.ordinal());
+		return TileEntityMetadata.getItemStack(Botany.ceramic, this.color.ordinal());
 	}
 
 	@Override
-	public String getName() {
-		return color.getName();
+	public ItemStack getStack(boolean fireproof) {
+		return getStack();
 	}
 
 	@Override
-	public int getColor() {
-		return color.getColor(false);
+	public String getDesignMaterialName() {
+		return this.color.getName();
+	}
+
+	@Override
+	public int getColour() {
+		return this.color.getFlowerColorAllele().getColor(false);
 	}
 }

src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java

@@ -1,80 +1,93 @@
 package binnie.botany.ceramic;
 
+import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
 import binnie.botany.Botany;
 import binnie.botany.genetics.EnumFlowerColor;
 import binnie.botany.items.BotanyItems;
 import binnie.core.AbstractMod;
-import binnie.core.BinnieCore;
 import binnie.extratrees.api.IDesignMaterial;
 import binnie.extratrees.api.IDesignSystem;
 import binnie.extratrees.api.IPattern;
 import binnie.extratrees.carpentry.DesignerManager;
 import binnie.extratrees.carpentry.EnumPattern;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-import java.util.HashMap;
-import java.util.Map;
 
 public class CeramicDesignSystem implements IDesignSystem {
 	public static CeramicDesignSystem instance = new CeramicDesignSystem();
-
-	protected Map<Integer, IIcon> primary;
-	protected Map<Integer, IIcon> secondary;
+	Map<Integer, TextureAtlasSprite> primary;
+	Map<Integer, TextureAtlasSprite> secondary;
 
 	CeramicDesignSystem() {
-		primary = new HashMap<>();
-		secondary = new HashMap<>();
+		this.primary = new HashMap<>();
+		this.secondary = new HashMap<>();
 		DesignerManager.instance.registerDesignSystem(this);
 	}
 
 	@Override
 	public IDesignMaterial getDefaultMaterial() {
-		return CeramicColor.get(EnumFlowerColor.WHITE);
+		return CeramicColor.get(EnumFlowerColor.White);
 	}
 
 	@Override
 	public IDesignMaterial getDefaultMaterial2() {
-		return CeramicColor.get(EnumFlowerColor.BLACK);
+		return CeramicColor.get(EnumFlowerColor.Black);
 	}
 
 	@Override
-	public IDesignMaterial getMaterial(int id) {
+	public IDesignMaterial getMaterial(final int id) {
 		return CeramicColor.get(EnumFlowerColor.get(id));
 	}
 
 	@Override
-	public int getMaterialIndex(IDesignMaterial id) {
+	public int getMaterialIndex(final IDesignMaterial id) {
 		return ((CeramicColor) id).color.ordinal();
 	}
 
 	public String getTexturePath() {
-		return "ceramic";
+		return "blocks/ceramic";
 	}
 
 	@Override
-	public IIcon getPrimaryIcon(IPattern pattern) {
+	@Nullable
+	@SideOnly(Side.CLIENT)
+	public TextureAtlasSprite getPrimarySprite(IPattern pattern) {
 		if (pattern instanceof EnumPattern) {
-			return primary.get(((EnumPattern) pattern).ordinal());
+			return this.primary.get(((EnumPattern) pattern).ordinal());
 		}
 		return null;
 	}
 
 	@Override
-	public IIcon getSecondaryIcon(IPattern pattern) {
+	@Nullable
+	@SideOnly(Side.CLIENT)
+	public TextureAtlasSprite getSecondarySprite(IPattern pattern) {
 		if (pattern instanceof EnumPattern) {
-			return secondary.get(((EnumPattern) pattern).ordinal());
+			return this.secondary.get(((EnumPattern) pattern).ordinal());
 		}
 		return null;
 	}
 
 	@Override
-	public void registerIcons(IIconRegister register) {
+	@SideOnly(Side.CLIENT)
+	public void registerSprites() {
+		TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks();
 		for (EnumPattern pattern : EnumPattern.values()) {
-			primary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"));
-			secondary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"));
+			ResourceLocation primaryLocation = new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0");
+			ResourceLocation secondaryLocation = new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1");
+			this.primary.put(pattern.ordinal(), textureMap.registerSprite(primaryLocation));
+			this.secondary.put(pattern.ordinal(), textureMap.registerSprite(secondaryLocation));
 		}
 	}
 
@@ -88,7 +101,8 @@ public class CeramicDesignSystem implements IDesignSystem {
 	}
 
 	@Override
-	public IDesignMaterial getMaterial(ItemStack stack) {
-		return (stack.getItem() == Item.getItemFromBlock(Botany.ceramic)) ? getMaterial(stack.getItemDamage()) : null;
+	@Nullable
+	public IDesignMaterial getMaterial(final ItemStack itemStack) {
+		return (itemStack.getItem() == Item.getItemFromBlock(Botany.ceramic)) ? this.getMaterial(itemStack.getItemDamage()) : null;
 	}
 }

src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java

@@ -1,62 +1,63 @@
 package binnie.botany.ceramic;
 
-import binnie.botany.Botany;
-import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.world.World;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.util.NonNullList;
+import net.minecraft.world.World;
+
+import net.minecraftforge.common.ForgeHooks;
+
+import binnie.botany.Botany;
+import binnie.botany.ceramic.brick.CeramicBrickType;
+
 public class CeramicTileRecipe implements IRecipe {
-	protected ItemStack cached;
+	private ItemStack cached = ItemStack.EMPTY;
 
 	@Override
-	public boolean matches(InventoryCrafting crafting, World world) {
-		cached = getCraftingResult(crafting);
-		return cached != null;
+	public boolean matches(final InventoryCrafting inv, final World world) {
+		this.cached = this.getCraftingResult(inv);
+		return !this.cached.isEmpty();
 	}
 
 	@Override
-	public ItemStack getCraftingResult(InventoryCrafting inv) {
-		Item ceramicBlock = Item.getItemFromBlock(Botany.ceramic);
-		Item ceramicTile = Item.getItemFromBlock(Botany.ceramicTile);
-		Item ceramicBrick = Item.getItemFromBlock(Botany.ceramicBrick);
-		Item mortar = Botany.misc;
-		List<ItemStack> stacks = new ArrayList<>();
+	public ItemStack getCraftingResult(final InventoryCrafting inv) {
+		final Item ceramicBlock = Item.getItemFromBlock(Botany.ceramic);
+		final Item ceramicTile = Item.getItemFromBlock(Botany.ceramicTile);
+		final Item ceramicBrick = Item.getItemFromBlock(Botany.ceramicBrick);
+		final Item mortar = Botany.misc;
+		final List<ItemStack> stacks = new ArrayList<>();
 		int ix = -1;
 		int iy = -1;
-
 		for (int i = 0; i < inv.getSizeInventory(); ++i) {
-			ItemStack stack = inv.getStackInSlot(i);
-			if (stack != null) {
-				int x = i / 3;
-				int y = i % 3;
+			final ItemStack stack = inv.getStackInSlot(i);
+			if (!stack.isEmpty()) {
+				final int x = i / 3;
+				final int y = i % 3;
 				if (ix == -1) {
 					ix = x;
 					iy = y;
 				}
 				if (x - ix >= 2 || y - iy >= 2 || y < iy || x < ix) {
-					return null;
+					return ItemStack.EMPTY;
 				}
-				
-				Item item = stack.getItem();
-				if (item != ceramicBlock && item != ceramicTile && item != ceramicBrick && item != mortar) {
-					return null;
+				if (stack.getItem() != ceramicBlock && stack.getItem() != ceramicTile && stack.getItem() != ceramicBrick && stack.getItem() != mortar) {
+					return ItemStack.EMPTY;
 				}
 				stacks.add(stack);
 			}
 		}
-
-		for (BlockCeramicBrick.TileType type : BlockCeramicBrick.TileType.values()) {
-			ItemStack stack2 = type.getRecipe(stacks);
-			if (stack2 != null) {
-				return stack2;
+		for (CeramicBrickType type : CeramicBrickType.VALUES) {
+			ItemStack result = type.getRecipe(stacks);
+			if (!result.isEmpty()) {
+				return result;
 			}
 		}
-		return null;
+		return ItemStack.EMPTY;
 	}
 
 	@Override
@@ -66,6 +67,11 @@ public class CeramicTileRecipe implements IRecipe {
 
 	@Override
 	public ItemStack getRecipeOutput() {
-		return cached;
+		return this.cached;
+	}
+
+	@Override
+	public NonNullList<ItemStack> getRemainingItems(InventoryCrafting inv) {
+		return ForgeHooks.defaultRecipeGetRemainingItems(inv);
 	}
 }

src/main/java/binnie/botany/ceramic/ItemCeramic.java

@@ -0,0 +1,35 @@
+package binnie.botany.ceramic;
+
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.text.translation.I18n;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.core.items.IColoredItem;
+
+import binnie.botany.genetics.EnumFlowerColor;
+
+public class ItemCeramic extends ItemBlock implements IColoredItem {
+	public ItemCeramic(BlockCeramic block) {
+		super(block);
+	}
+
+	@Override
+	public int getMetadata(final int metadata) {
+		return metadata;
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public int getColorFromItemstack(ItemStack stack, int tintIndex) {
+		return EnumFlowerColor.get(stack.getMetadata()).getFlowerColorAllele().getColor(false);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public String getItemStackDisplayName(ItemStack itemStack) {
+		return EnumFlowerColor.get(itemStack.getItemDamage()).getFlowerColorAllele().getColourName() + " " + I18n.translateToLocal("tile.botany.ceramic.name").trim();
+	}
+}

src/main/java/binnie/botany/ceramic/ItemStainedGlass.java

@@ -0,0 +1,25 @@
+package binnie.botany.ceramic;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.core.items.IColoredItem;
+
+import binnie.botany.genetics.EnumFlowerColor;
+import binnie.core.block.ItemMetadata;
+import binnie.core.block.TileEntityMetadata;
+
+public class ItemStainedGlass extends ItemMetadata implements IColoredItem {
+	public ItemStainedGlass(Block block) {
+		super(block);
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public int getColorFromItemstack(ItemStack stack, int tintIndex) {
+		return EnumFlowerColor.get(TileEntityMetadata.getItemDamage(stack)).getFlowerColorAllele().getColor(false);
+	}
+}

src/main/java/binnie/botany/ceramic/PigmentRecipe.java

@@ -1,51 +1,43 @@
 package binnie.botany.ceramic;
 
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.util.NonNullList;
+import net.minecraft.world.World;
+
+import net.minecraftforge.common.ForgeHooks;
+
 import binnie.Binnie;
 import binnie.botany.Botany;
 import binnie.botany.api.IFlower;
-import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.world.World;
 
 public class PigmentRecipe implements IRecipe {
-	protected ItemStack cached;
-
-	private ItemStack unknown;
-
-	public PigmentRecipe() {
-		unknown = null;
-	}
-
 	@Override
-	public boolean matches(InventoryCrafting crafting, World world) {
-		return getCraftingResult(crafting) != null;
+	public boolean matches(final InventoryCrafting crafting, final World world) {
+		return !this.getCraftingResult(crafting).isEmpty();
 	}
 
 	@Override
 	public ItemStack getRecipeOutput() {
-		if (cached != null) {
-			return cached;
-		}
-		return unknown;
+		return ItemStack.EMPTY;
 	}
 
 	@Override
-	public ItemStack getCraftingResult(InventoryCrafting crafting) {
+	public ItemStack getCraftingResult(final InventoryCrafting crafting) {
 		int n = 0;
-		ItemStack stack = null;
+		ItemStack stack = ItemStack.EMPTY;
 		for (int i = 0; i < crafting.getSizeInventory(); ++i) {
-			if (crafting.getStackInSlot(i) != null) {
+			ItemStack stackInSlot = crafting.getStackInSlot(i);
+			if (!stackInSlot.isEmpty()) {
 				if (++n > 1) {
-					return null;
+					return ItemStack.EMPTY;
 				}
-				if (!Binnie.Genetics.getFlowerRoot().isMember(crafting.getStackInSlot(i))) {
-					continue;
-				}
-
-				IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(crafting.getStackInSlot(i));
-				if (flower.getAge() >= 1) {
-					stack = new ItemStack(Botany.pigment, 1, flower.getGenome().getPrimaryColor().getID());
+				if (Binnie.GENETICS.getFlowerRoot().isMember(stackInSlot)) {
+					final IFlower flower = Binnie.GENETICS.getFlowerRoot().getMember(stackInSlot);
+					if (flower != null && flower.getAge() >= 1) {
+						stack = new ItemStack(Botany.pigment, 1, flower.getGenome().getPrimaryColor().getID());
+					}
 				}
 			}
 		}
@@ -56,4 +48,9 @@ public class PigmentRecipe implements IRecipe {
 	public int getRecipeSize() {
 		return 1;
 	}
+
+	@Override
+	public NonNullList<ItemStack> getRemainingItems(InventoryCrafting inv) {
+		return ForgeHooks.defaultRecipeGetRemainingItems(inv);
+	}
 }

src/main/java/binnie/botany/ceramic/TileCeramic.java

@@ -0,0 +1,44 @@
+package binnie.botany.ceramic;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+
+import binnie.botany.Botany;
+import binnie.botany.genetics.EnumFlowerColor;
+
+public class TileCeramic extends TileEntity {
+	protected EnumFlowerColor color = EnumFlowerColor.Black;
+
+	public EnumFlowerColor getColor() {
+		return color;
+	}
+
+	public void setColor(EnumFlowerColor color) {
+		this.color = color;
+	}
+
+	@Override
+	public NBTTagCompound writeToNBT(NBTTagCompound compound) {
+		compound.setInteger("Color", color.getFlowerColorAllele().getID());
+		return super.writeToNBT(compound);
+	}
+
+	@Override
+	public void readFromNBT(NBTTagCompound compound) {
+		super.readFromNBT(compound);
+		color = EnumFlowerColor.VALUES[compound.getInteger("Color")];
+	}
+
+	public ItemStack getStack() {
+		return getStack(1);
+	}
+
+	public ItemStack getStack(int amount) {
+		int ID = 0;
+		if (color != null) {
+			ID = color.getFlowerColorAllele().getID();
+		}
+		return new ItemStack(Botany.ceramic, amount, ID);
+	}
+}

src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java

@@ -0,0 +1,254 @@
+package binnie.botany.ceramic.brick;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockStateContainer;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.ItemMeshDefinition;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockRenderLayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.common.property.ExtendedBlockState;
+import net.minecraftforge.common.property.IExtendedBlockState;
+import net.minecraftforge.common.property.IUnlistedProperty;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.core.IItemModelRegister;
+import forestry.api.core.IModelManager;
+import forestry.api.core.ISpriteRegister;
+import forestry.api.core.IStateMapperRegister;
+import forestry.api.core.ITextureManager;
+import forestry.core.blocks.IColoredBlock;
+import forestry.core.blocks.properties.UnlistedBlockAccess;
+import forestry.core.blocks.properties.UnlistedBlockPos;
+import forestry.core.models.BlockModelEntry;
+
+import binnie.Constants;
+import binnie.botany.CreativeTabBotany;
+import binnie.botany.ceramic.TileCeramic;
+import binnie.botany.genetics.EnumFlowerColor;
+import binnie.core.BinnieCore;
+import binnie.core.block.IMultipassBlock;
+import binnie.core.models.DefaultStateMapper;
+import binnie.core.models.ModelManager;
+import binnie.core.models.ModelMutlipass;
+import binnie.core.util.TileUtil;
+
+public class BlockCeramicBrick extends Block implements IMultipassBlock<CeramicBrickPair>, IColoredBlock, ISpriteRegister, IStateMapperRegister, IItemModelRegister {
+	private static final PropertyEnum<CeramicBrickType> TYPE = PropertyEnum.create("type", CeramicBrickType.class);
+
+	public BlockCeramicBrick() {
+		super(Material.ROCK);
+		this.setHardness(1.0f);
+		this.setResistance(5.0f);
+		this.setRegistryName("ceramicBrick");
+		this.setCreativeTab(CreativeTabBotany.instance);
+	}
+
+	@Override
+	public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
+		return Collections.emptyList();
+	}
+
+	@Override
+	public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, @Nullable EntityPlayer player, boolean willHarvest) {
+		List<ItemStack> drops = new ArrayList<>();
+		TileCeramic ceramic = TileUtil.getTile(world, pos, TileCeramic.class);
+		if (ceramic != null) {
+			drops = Collections.singletonList(ceramic.getStack());
+		}
+		boolean hasBeenBroken = world.setBlockToAir(pos);
+		if (hasBeenBroken && BinnieCore.getBinnieProxy().isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) {
+			for (ItemStack drop : drops) {
+				spawnAsEntity(world, pos, drop);
+			}
+		}
+		return hasBeenBroken;
+	}
+
+	@Override
+	public TileEntity createTileEntity(World world, IBlockState state) {
+		return new TileCeramicBrick();
+	}
+
+	@Override
+	public boolean hasTileEntity(IBlockState state) {
+		return true;
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void getSubBlocks(Item item, final CreativeTabs tab, final NonNullList<ItemStack> itemList) {
+		for (final EnumFlowerColor color : EnumFlowerColor.values()) {
+			itemList.add(new CeramicBrickPair(color, color, CeramicBrickType.Tile).getStack(1));
+		}
+		for (CeramicBrickType type : CeramicBrickType.VALUES) {
+			if (type.canDouble()) {
+				itemList.add(new CeramicBrickPair(EnumFlowerColor.Brown, EnumFlowerColor.Gold, type).getStack(1));
+			}
+		}
+		itemList.add(new CeramicBrickPair(EnumFlowerColor.Gold, EnumFlowerColor.Gold, CeramicBrickType.Split).getStack(1));
+		itemList.add(new CeramicBrickPair(EnumFlowerColor.Brown, EnumFlowerColor.Brown, CeramicBrickType.Chequered).getStack(1));
+		itemList.add(new CeramicBrickPair(EnumFlowerColor.Gold, EnumFlowerColor.Brown, CeramicBrickType.LargeBrick).getStack(1));
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void registerStateMapper() {
+		ResourceLocation resourceLocation = new ResourceLocation(Constants.BOTANY_MOD_ID, "ceramicBrick");
+		ModelLoader.setCustomStateMapper(this, new DefaultStateMapper(resourceLocation));
+		ModelManager.registerCustomBlockModel(new BlockModelEntry(
+			new ModelResourceLocation(resourceLocation, "normal"),
+			new ModelResourceLocation(resourceLocation, "inventory"),
+			new ModelMutlipass<>(BlockCeramicBrick.class), this
+		));
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void registerModel(Item item, IModelManager manager) {
+		manager.registerItemModel(item, new CeramicBrickMeshDefinition());
+	}
+
+	@Override
+	protected BlockStateContainer createBlockState() {
+		return new ExtendedBlockState(this, new IProperty[]{TYPE}, new IUnlistedProperty[]{UnlistedBlockPos.POS, UnlistedBlockAccess.BLOCKACCESS});
+	}
+
+	@Override
+	public IBlockState getStateFromMeta(int meta) {
+		return getDefaultState().withProperty(TYPE, CeramicBrickType.VALUES[meta]);
+	}
+
+	@Override
+	public int getMetaFromState(IBlockState state) {
+		return state.getValue(TYPE).ordinal();
+	}
+
+	@Override
+	public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) {
+		return ((IExtendedBlockState) super.getExtendedState(state, world, pos)).withProperty(UnlistedBlockPos.POS, pos).withProperty(UnlistedBlockAccess.BLOCKACCESS, world);
+	}
+
+	@Override
+	public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) {
+		return getDefaultState().withProperty(TYPE, CeramicBrickType.get(meta >> 16 & 0xFF));
+	}
+
+	@Override
+	public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {
+		TileCeramicBrick ceramic = TileUtil.getTile(worldIn, pos, TileCeramicBrick.class);
+		if (ceramic != null) {
+			int damage = stack.getItemDamage();
+			ceramic.setColors(EnumFlowerColor.get(damage & 0xFF), EnumFlowerColor.get(damage >> 8 & 0xFF));
+		}
+	}
+
+	@Override
+	public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
+		TileCeramicBrick ceramic = TileUtil.getTile(world, pos, TileCeramicBrick.class);
+		if (ceramic != null) {
+			return ceramic.pair().getStack(0);
+		}
+		return super.getPickBlock(state, target, world, pos, player);
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public int colorMultiplier(IBlockState state, @Nullable IBlockAccess world, @Nullable BlockPos pos, int tintIndex) {
+		if (world != null && pos != null) {
+			TileCeramicBrick ceramic = TileUtil.getTile(world, pos, TileCeramicBrick.class);
+			if (ceramic != null) {
+				if (tintIndex == 1) {
+					return ceramic.getColorFirst().getFlowerColorAllele().getColor(false);
+				} else if (tintIndex == 2) {
+					return ceramic.getColorSecond().getFlowerColorAllele().getColor(false);
+				}
+			}
+		}
+		return 16777215;
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public BlockRenderLayer getBlockLayer() {
+		return BlockRenderLayer.CUTOUT;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public int getRenderPasses() {
+		return 3;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public CeramicBrickPair getInventoryKey(ItemStack stack) {
+		return new CeramicBrickPair(stack);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public CeramicBrickPair getWorldKey(IBlockState state) {
+		IExtendedBlockState extendedState = (IExtendedBlockState) state;
+		IBlockAccess world = extendedState.getValue(UnlistedBlockAccess.BLOCKACCESS);
+		BlockPos pos = extendedState.getValue(UnlistedBlockPos.POS);
+		TileCeramicBrick ceramic = TileUtil.getTile(world, pos, TileCeramicBrick.class);
+		if (ceramic != null) {
+			return ceramic.pair();
+		}
+		return null;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public TextureAtlasSprite getSprite(CeramicBrickPair type, @Nullable EnumFacing facing, int pass) {
+		return type.getSprite(pass);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerSprites(ITextureManager manager) {
+		TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks();
+		for (CeramicBrickType type : CeramicBrickType.VALUES) {
+			type.sprites = new TextureAtlasSprite[3];
+			for (int i = 0; i < 3; ++i) {
+				type.sprites[i] = textureMap.registerSprite(new ResourceLocation(Constants.BOTANY_MOD_ID + ":blocks/ceramic." + type.id + "." + i));
+			}
+		}
+	}
+
+	private class CeramicBrickMeshDefinition implements ItemMeshDefinition {
+		@Override
+		public ModelResourceLocation getModelLocation(ItemStack stack) {
+			return new ModelResourceLocation(Constants.BOTANY_MOD_ID + ":ceramicBrick", "inventory");
+		}
+	}
+}

src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java

@@ -0,0 +1,75 @@
+package binnie.botany.ceramic.brick;
+
+import com.google.common.base.Preconditions;
+
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.item.ItemStack;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import binnie.botany.Botany;
+import binnie.botany.genetics.EnumFlowerColor;
+import binnie.core.block.TileEntityMetadata;
+
+public class CeramicBrickPair {
+	EnumFlowerColor colorFirst;
+	EnumFlowerColor colorSecond;
+	CeramicBrickType type;
+	int ordinal;
+
+	CeramicBrickPair(final EnumFlowerColor colorFirst, final EnumFlowerColor colorSecond, CeramicBrickType type) {
+		this.colorFirst = colorFirst;
+		this.colorSecond = colorSecond;
+		this.type = type;
+		this.ordinal = colorFirst.ordinal() + colorSecond.ordinal() * 256 + type.ordinal() * 256 * 256;
+	}
+
+	public CeramicBrickPair(ItemStack stack) {
+		this(TileEntityMetadata.getItemDamage(stack));
+	}
+
+	public CeramicBrickPair(int id) {
+		this.colorFirst = EnumFlowerColor.get(id & 0xFF);
+		this.colorSecond = EnumFlowerColor.get(id >> 8 & 0xFF);
+		this.type = CeramicBrickType.get(id >> 16 & 0xFF);
+	}
+
+	public boolean isTwoColors() {
+		return this.type.canDouble() && this.colorSecond != this.colorFirst;
+	}
+
+	public ItemStack getStack(int i) {
+		return new ItemStack(Botany.ceramicBrick, i, this.ordinal());
+	}
+
+	public String getName() {
+		String name = this.colorFirst.getFlowerColorAllele().getColourName();
+		if (this.type.canDouble() && this.colorSecond != this.colorFirst) {
+			name = name + " & " + this.colorSecond.getFlowerColorAllele().getColourName();
+		}
+		return name + " " + this.type.name;
+	}
+
+	public int ordinal() {
+		return ordinal;
+	}
+
+	@SideOnly(Side.CLIENT)
+	public TextureAtlasSprite getSprite(int pass) {
+		TextureAtlasSprite[] sprites = this.type.sprites;
+		Preconditions.checkState(sprites != null, "Sprites have not been registered.");
+		return sprites[pass];
+	}
+
+	@Override
+	public int hashCode() {
+		return Integer.hashCode(ordinal());
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		return obj instanceof CeramicBrickPair
+			&& ((CeramicBrickPair) obj).ordinal() == ordinal();
+	}
+}

src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java

@@ -0,0 +1,327 @@
+package binnie.botany.ceramic.brick;
+
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Locale;
+
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IStringSerializable;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import binnie.botany.Botany;
+import binnie.botany.genetics.EnumFlowerColor;
+import binnie.botany.items.BotanyItems;
+import binnie.core.block.TileEntityMetadata;
+
+public enum CeramicBrickType implements IStringSerializable {
+	Tile("tile", "Ceramic Tile") {
+		@Override
+		public ItemStack getRecipe(List<ItemStack> stacks) {
+			if (stacks.size() != 4) {
+				return ItemStack.EMPTY;
+			}
+			int mortars = 0;
+			int blocks = 0;
+			int blockColor = -1;
+			for (final ItemStack stack : stacks) {
+				if (this.isMortar(stack)) {
+					++mortars;
+				} else {
+					if (stack.getItem() != Item.getItemFromBlock(Botany.ceramic)) {
+						return ItemStack.EMPTY;
+					}
+					++blocks;
+					final int color = TileEntityMetadata.getItemDamage(stack);
+					if (blockColor == -1) {
+						blockColor = color;
+					} else {
+						if (blockColor != color) {
+							return ItemStack.EMPTY;
+						}
+					}
+				}
+			}
+			if (mortars != 1) {
+				return ItemStack.EMPTY;
+			}
+			final EnumFlowerColor c = EnumFlowerColor.get(blockColor);
+			return new CeramicBrickPair(c, c, CeramicBrickType.Tile).getStack(3);
+		}
+	},
+	Brick("brick", "Ceramic Bricks") {
+		@Override
+		public ItemStack getRecipe(List<ItemStack> stacks) {
+			return getBrickRecipe(this, stacks);
+		}
+	},
+	StripeBrick("brickstripe", "Striped Ceramic Bricks") {
+		@Override
+		public ItemStack getRecipe(List<ItemStack> stacks) {
+			return getBrickRecipe(this, stacks);
+		}
+	},
+	LargeBrick("bricklarge", "Large Ceramic Bricks") {
+		@Override
+		public ItemStack getRecipe(List<ItemStack> stacks) {
+			if (stacks.size() == 1) {
+				final ItemStack stack3 = stacks.get(0);
+				final CeramicBrickPair type3 = new CeramicBrickPair(stack3);
+				if (type3.type == CeramicBrickType.VerticalLargeBrick) {
+					type3.type = this;
+					return type3.getStack(1);
+				}
+				return ItemStack.EMPTY;
+			} else {
+				if (stacks.size() != 3) {
+					return ItemStack.EMPTY;
+				}
+				final int[] colors = {-1, -1};
+				int a = 0;
+				int b = 0;
+				for (final ItemStack stack4 : stacks) {
+					if (stack4.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
+						return ItemStack.EMPTY;
+					}
+					final CeramicBrickPair type4 = new CeramicBrickPair(stack4);
+					if (type4.type != CeramicBrickType.Tile) {
+						return ItemStack.EMPTY;
+					}
+					final int color5 = type4.colorFirst.ordinal();
+					if (colors[0] == -1) {
+						colors[0] = color5;
+						++a;
+					} else if (colors[0] == color5) {
+						++a;
+					} else if (colors[1] == -1) {
+						colors[1] = color5;
+						++b;
+					} else {
+						if (colors[1] != color5) {
+							return ItemStack.EMPTY;
+						}
+						++b;
+					}
+				}
+				if (colors[1] == -1) {
+					colors[1] = colors[0];
+				}
+				return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), CeramicBrickType.LargeBrick).getStack(3);
+			}
+		}
+	},
+	Split("split", "Split Ceramic Tile") {
+		@Override
+		public ItemStack getRecipe(List<ItemStack> stacks) {
+			if (stacks.size() != 4) {
+				return ItemStack.EMPTY;
+			}
+			final int[] colors = {-1, -1};
+			int altCounter = 0;
+			for (final ItemStack stack2 : stacks) {
+				final int alt = (altCounter != 0 && altCounter != 3) ? 1 : 0;
+				if (stack2.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
+					return ItemStack.EMPTY;
+				}
+				final CeramicBrickPair type = new CeramicBrickPair(stack2);
+				if (type.type != CeramicBrickType.Tile) {
+					return ItemStack.EMPTY;
+				}
+				final int color2 = type.colorFirst.ordinal();
+				if (colors[alt] == -1) {
+					colors[alt] = color2;
+				} else if (colors[alt] != color2) {
+					return ItemStack.EMPTY;
+				}
+				++altCounter;
+			}
+			return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), CeramicBrickType.Split).getStack(4);
+		}
+	},
+	Chequered("cheque", "Chequered Ceramic Tile") {
+		@Override
+		public ItemStack getRecipe(List<ItemStack> stacks) {
+			if (stacks.size() != 4) {
+				return ItemStack.EMPTY;
+			}
+			final int[] colors = {-1, -1};
+			for (final ItemStack stack2 : stacks) {
+				if (stack2.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
+					return ItemStack.EMPTY;
+				}
+				final CeramicBrickPair type2 = new CeramicBrickPair(stack2);
+				if (type2.type != CeramicBrickType.Split) {
+					return ItemStack.EMPTY;
+				}
+				final int color3 = type2.colorFirst.ordinal();
+				final int color4 = type2.colorSecond.ordinal();
+				if (colors[0] == -1) {
+					colors[0] = color3;
+					colors[1] = color4;
+				} else {
+					if (colors[0] != color3 || colors[1] != color4) {
+						return ItemStack.EMPTY;
+					}
+				}
+			}
+			return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), CeramicBrickType.Chequered).getStack(4);
+		}
+	},
+	Mixed("mixed", "Mixed Ceramic Tile") {
+		@Override
+		public ItemStack getRecipe(List<ItemStack> stacks) {
+			if (stacks.size() != 4) {
+				return ItemStack.EMPTY;
+			}
+			final int[] colors = {-1, -1};
+			for (final ItemStack stack2 : stacks) {
+				if (stack2.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
+					return ItemStack.EMPTY;
+				}
+				final CeramicBrickPair type2 = new CeramicBrickPair(stack2);
+				if (type2.isTwoColors()) {
+					return ItemStack.EMPTY;
+				}
+				final int color3 = type2.colorFirst.ordinal();
+				if (type2.type == CeramicBrickType.Split) {
+					if (colors[1] != -1) {
+						return ItemStack.EMPTY;
+					}
+					colors[1] = color3;
+				} else {
+					if (type2.type != CeramicBrickType.Chequered) {
+						return ItemStack.EMPTY;
+					}
+					if (colors[0] == -1) {
+						colors[0] = color3;
+					} else if (colors[0] != color3) {
+						return ItemStack.EMPTY;
+					}
+				}
+				final int color4 = type2.colorSecond.ordinal();
+			}
+			if (colors[0] == -1 || colors[1] == -1) {
+				return ItemStack.EMPTY;
+			}
+			return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), CeramicBrickType.Mixed).getStack(4);
+		}
+	},
+	VerticalBrick("verticalbrick", "Vertical Ceramic Bricks") {
+		@Override
+		public ItemStack getRecipe(List<ItemStack> stacks) {
+			return getVerticalBrickRecipe(stacks);
+		}
+	},
+	VerticalStripeBrick("verticalbrickstripe", "Vertical Striped Ceramic Bricks") {
+		@Override
+		public ItemStack getRecipe(List<ItemStack> stacks) {
+			return getVerticalBrickRecipe(stacks);
+		}
+	},
+	VerticalLargeBrick("verticalbricklarge", "Large Vertical Ceramic Bricks") {
+		@Override
+		public ItemStack getRecipe(List<ItemStack> stacks) {
+			return getVerticalBrickRecipe(stacks);
+		}
+	};
+
+	public static final CeramicBrickType[] VALUES = values();
+
+	String id;
+	String name;
+
+	@SideOnly(Side.CLIENT)
+	@Nullable
+	TextureAtlasSprite[] sprites;
+
+	CeramicBrickType(final String id, final String name) {
+		this.id = id;
+		this.name = name;
+	}
+
+	public static CeramicBrickType get(final int id) {
+		return VALUES[id % VALUES.length];
+	}
+
+	public boolean canDouble() {
+		return this != CeramicBrickType.Tile;
+	}
+
+	public abstract ItemStack getRecipe(List<ItemStack> stacks);
+
+	protected ItemStack getVerticalBrickRecipe(List<ItemStack> stacks) {
+		if (stacks.size() != 1) {
+			return ItemStack.EMPTY;
+		}
+		final ItemStack stack5 = stacks.get(0);
+		final CeramicBrickPair type = new CeramicBrickPair(stack5);
+		if (type.type == CeramicBrickType.LargeBrick) {
+			type.type = CeramicBrickType.VerticalLargeBrick;
+			return type.getStack(1);
+		}
+		if (type.type == CeramicBrickType.Brick) {
+			type.type = CeramicBrickType.VerticalBrick;
+			return type.getStack(1);
+		}
+		if (type.type == CeramicBrickType.StripeBrick) {
+			type.type = CeramicBrickType.VerticalStripeBrick;
+			return type.getStack(1);
+		}
+		return ItemStack.EMPTY;
+	}
+
+	protected ItemStack getBrickRecipe(CeramicBrickType ceramicType, List<ItemStack> stacks) {
+		if (stacks.size() == 1) {
+			final ItemStack stack5 = stacks.get(0);
+			final CeramicBrickPair type = new CeramicBrickPair(stack5);
+			if (type.type == CeramicBrickType.VerticalBrick) {
+				type.type = ceramicType;
+				return type.getStack(1);
+			}
+			if (type.type == CeramicBrickType.StripeBrick) {
+				type.type = ceramicType;
+				return type.getStack(1);
+			}
+			return ItemStack.EMPTY;
+		} else if (stacks.size() == 4) {
+			final int[] colors = {-1, -1};
+			for (int index2 = 0; index2 < stacks.size(); ++index2) {
+				final ItemStack stack4 = stacks.get(index2);
+				if (stack4.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
+					return ItemStack.EMPTY;
+				}
+				final CeramicBrickPair type4 = new CeramicBrickPair(stack4);
+				if (type4.type != CeramicBrickType.LargeBrick) {
+					return ItemStack.EMPTY;
+				}
+				final int color5 = type4.colorFirst.ordinal();
+				final int color6 = type4.colorSecond.ordinal();
+				int alt2 = (index2 != 0 && index2 != 3) ? 1 : 0;
+				if (ceramicType == CeramicBrickType.StripeBrick) {
+					alt2 = 0;
+				}
+				if (colors[alt2] == -1) {
+					colors[alt2] = color5;
+					colors[1 - alt2] = color6;
+				} else if (colors[alt2] != color5 || colors[1 - alt2] != color6) {
+					return ItemStack.EMPTY;
+				}
+			}
+			return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), ceramicType).getStack(4);
+		} else {
+			return ItemStack.EMPTY;
+		}
+	}
+
+	protected boolean isMortar(final ItemStack stack) {
+		return stack.getItem() == Botany.misc && stack.getItemDamage() == BotanyItems.Mortar.ordinal();
+	}
+
+	@Override
+	public String getName() {
+		return name().toLowerCase(Locale.ENGLISH);
+	}
+}

src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java

@@ -0,0 +1,38 @@
+package binnie.botany.ceramic.brick;
+
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.core.items.IColoredItem;
+
+public class ItemCeramicBrick extends ItemBlock implements IColoredItem {
+	public ItemCeramicBrick(BlockCeramicBrick block) {
+		super(block);
+	}
+
+	@Override
+	public int getMetadata(final int metadata) {
+		return metadata;
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public int getColorFromItemstack(ItemStack stack, int tintIndex) {
+		CeramicBrickPair ceramic = new CeramicBrickPair(stack.getItemDamage());
+		if (tintIndex == 1) {
+			return ceramic.colorFirst.getFlowerColorAllele().getColor(false);
+		} else if (tintIndex == 2) {
+			return ceramic.colorSecond.getFlowerColorAllele().getColor(false);
+		}
+		return 0xffffff;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public String getItemStackDisplayName(ItemStack itemStack) {
+		return new CeramicBrickPair(itemStack.getItemDamage()).getName();
+	}
+}

src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java

@@ -0,0 +1,77 @@
+package binnie.botany.ceramic.brick;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+
+import binnie.botany.Botany;
+import binnie.botany.genetics.EnumFlowerColor;
+import binnie.core.block.TileEntityMetadata;
+
+public class TileCeramicBrick extends TileEntity {
+	private EnumFlowerColor colorFirst = EnumFlowerColor.Black;
+	private EnumFlowerColor colorSecond = EnumFlowerColor.White;
+
+	public void setColors(EnumFlowerColor colorFirst, EnumFlowerColor colorSecond) {
+		this.colorFirst = colorFirst;
+		this.colorSecond = colorSecond;
+	}
+
+	public boolean hasTwoColors() {
+		return CeramicBrickType.VALUES[getBlockMetadata()].canDouble() && this.colorSecond != this.colorFirst;
+	}
+
+	public ItemStack getStack(final int i) {
+		final ItemStack s = TileEntityMetadata.getItemStack(Botany.ceramicBrick, this.ordinal());
+		s.setCount(i);
+		return s;
+	}
+
+	public String getName() {
+		CeramicBrickType type = CeramicBrickType.VALUES[getBlockMetadata()];
+		String name = this.colorFirst.getFlowerColorAllele().getColourName();
+		if (type.canDouble() && this.colorSecond != this.colorFirst) {
+			name = name + " & " + this.colorSecond.getFlowerColorAllele().getColourName();
+		}
+		return name + " " + type.name;
+	}
+
+	public int ordinal() {
+		return this.colorFirst.ordinal() + this.colorSecond.ordinal() * 256 + getBlockMetadata() * 256 * 256;
+	}
+
+	public CeramicBrickPair pair() {
+		return new CeramicBrickPair(colorFirst, colorSecond, CeramicBrickType.VALUES[getBlockMetadata()]);
+	}
+
+	public EnumFlowerColor getColorFirst() {
+		return colorFirst;
+	}
+
+	public EnumFlowerColor getColorSecond() {
+		return colorSecond;
+	}
+
+	@Override
+	public NBTTagCompound writeToNBT(NBTTagCompound compound) {
+		compound.setInteger("First", colorFirst.ordinal());
+		compound.setInteger("Second", colorSecond.ordinal());
+		return super.writeToNBT(compound);
+	}
+
+	@Override
+	public NBTTagCompound getUpdateTag() {
+		return writeToNBT(new NBTTagCompound());
+	}
+
+	@Override
+	public void readFromNBT(NBTTagCompound compound) {
+		super.readFromNBT(compound);
+		if (compound.hasKey("First")) {
+			colorFirst = EnumFlowerColor.VALUES[compound.getInteger("First")];
+		}
+		if (compound.hasKey("Second")) {
+			colorSecond = EnumFlowerColor.VALUES[compound.getInteger("Second")];
+		}
+	}
+}

src/main/java/binnie/botany/ceramic/brick/package-info.java

@@ -0,0 +1,9 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+@FieldsAreNonnullByDefault
+package binnie.botany.ceramic.brick;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import binnie.core.util.FieldsAreNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/main/java/binnie/botany/ceramic/package-info.java

@@ -0,0 +1,9 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+@FieldsAreNonnullByDefault
+package binnie.botany.ceramic;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import binnie.core.util.FieldsAreNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/main/java/binnie/botany/core/BotanyCore.java

@@ -1,12 +1,25 @@
 package binnie.botany.core;
 
+import binnie.botany.api.FlowerManager;
 import binnie.botany.api.IFlowerRoot;
-import binnie.botany.genetics.FlowerHelper;
+import binnie.botany.api.IGardeningManager;
+import binnie.botany.gardening.Gardening;
+import binnie.botany.genetics.FlowerRoot;
 
 public class BotanyCore {
-	public static IFlowerRoot speciesRoot = new FlowerHelper();
+	public static final int CHANCE_INTERPOLLINATION = 20;
 
 	public static IFlowerRoot getFlowerRoot() {
-		return BotanyCore.speciesRoot;
+		if (FlowerManager.flowerRoot == null) {
+			FlowerManager.flowerRoot = new FlowerRoot();
+		}
+		return FlowerManager.flowerRoot;
+	}
+	
+	public static IGardeningManager getGardening(){
+		if (FlowerManager.gardening == null) {
+			FlowerManager.gardening = new Gardening();
+		}
+		return FlowerManager.gardening;
 	}
 }

src/main/java/binnie/botany/core/BotanyGUI.java

@@ -1,19 +1,29 @@
 package binnie.botany.core;
 
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import net.minecraftforge.fml.relauncher.Side;
+
 import binnie.botany.craftgui.WindowBotanistDatabase;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.gui.IBinnieGUID;
-import cpw.mods.fml.relauncher.Side;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
 
 public enum BotanyGUI implements IBinnieGUID {
 	Database,
 	DatabaseNEI;
 
 	@Override
-	public Window getWindow(EntityPlayer player, World world, int x, int y, int z, Side side) {
+	public Window getWindow(final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) {
 		Window window = null;
+		final TileEntity tileEntity = world.getTileEntity(new BlockPos(x, y, z));
+		IInventory object = null;
+		if (tileEntity instanceof IInventory) {
+			object = (IInventory) tileEntity;
+		}
 		switch (this) {
 			case Database:
 			case DatabaseNEI: {

src/main/java/binnie/botany/core/BotanyTexture.java

@@ -0,0 +1,36 @@
+package binnie.botany.core;
+
+import javax.annotation.Nullable;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import binnie.Binnie;
+import binnie.botany.Botany;
+import binnie.core.resource.BinnieResource;
+import binnie.core.resource.IBinnieTexture;
+import binnie.core.resource.ResourceType;
+
+public enum BotanyTexture implements IBinnieTexture {
+	;
+	String texture;
+	ResourceType type;
+
+	@SideOnly(Side.CLIENT)
+	@Nullable
+	private BinnieResource resource;
+
+	BotanyTexture(final ResourceType base, final String texture) {
+		this.texture = texture;
+		this.type = base;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public BinnieResource getTexture() {
+		if (resource == null) {
+			resource = Binnie.RESOURCE.getPNG(Botany.instance, this.type, this.texture);
+		}
+		return resource;
+	}
+}

src/main/java/binnie/botany/core/ModuleCore.java

@@ -5,16 +5,13 @@ import binnie.core.IInitializable;
 public class ModuleCore implements IInitializable {
 	@Override
 	public void preInit() {
-		// ignored
 	}
 
 	@Override
 	public void init() {
-		// ignored
 	}
 
 	@Override
 	public void postInit() {
-		// ignored
 	}
 }

src/main/java/binnie/botany/core/package-info.java

@@ -0,0 +1,9 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+@FieldsAreNonnullByDefault
+package binnie.botany.core;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import binnie.core.util.FieldsAreNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/main/java/binnie/botany/craftgui/ControlColorDisplay.java

@@ -1,43 +0,0 @@
-package binnie.botany.craftgui;
-
-import binnie.botany.api.IFlowerColor;
-import binnie.core.craftgui.CraftGUI;
-import binnie.core.craftgui.ITooltip;
-import binnie.core.craftgui.IWidget;
-import binnie.core.craftgui.Tooltip;
-import binnie.core.craftgui.WidgetAttribute;
-import binnie.core.craftgui.controls.core.Control;
-import binnie.core.craftgui.controls.core.IControlValue;
-import binnie.core.craftgui.geometry.IArea;
-
-public class ControlColorDisplay extends Control implements IControlValue<IFlowerColor>, ITooltip {
-	private IFlowerColor value;
-
-	public ControlColorDisplay(IWidget parent, float x, float y) {
-		super(parent, x, y, 16.0f, 16.0f);
-		addAttribute(WidgetAttribute.MOUSE_OVER);
-	}
-
-	@Override
-	public IFlowerColor getValue() {
-		return value;
-	}
-
-	@Override
-	public void setValue(IFlowerColor value) {
-		this.value = value;
-	}
-
-	@Override
-	public void onRenderBackground() {
-		IArea area = getArea();
-		CraftGUI.render.solid(area, -1);
-		CraftGUI.render.solid(area.inset(1), 0xff000000 + getValue().getColor(false));
-	}
-
-	@Override
-	public void getTooltip(Tooltip tooltip) {
-		super.getTooltip(tooltip);
-		tooltip.add(value.getName());
-	}
-}

src/main/java/binnie/botany/craftgui/ControlColorMixBox.java

@@ -1,24 +0,0 @@
-package binnie.botany.craftgui;
-
-import binnie.botany.api.IColourMix;
-import binnie.core.craftgui.IWidget;
-import binnie.core.craftgui.controls.listbox.ControlListBox;
-
-public class ControlColorMixBox extends ControlListBox<IColourMix> {
-	private Type type;
-
-	public ControlColorMixBox(IWidget parent, int x, int y, int width, int height, Type type) {
-		super(parent, x, y, width, height, 12.0f);
-		this.type = type;
-	}
-
-	@Override
-	public IWidget createOption(IColourMix value, int y) {
-		return new ControlColorMixItem(getContent(), value, y);
-	}
-
-	enum Type {
-		Resultant,
-		Further
-	}
-}

src/main/java/binnie/botany/craftgui/ControlColorMixItem.java

@@ -1,30 +0,0 @@
-package binnie.botany.craftgui;
-
-import binnie.botany.api.IColourMix;
-import binnie.core.craftgui.controls.listbox.ControlList;
-import binnie.core.craftgui.controls.listbox.ControlOption;
-
-public class ControlColorMixItem extends ControlOption<IColourMix> {
-	protected ControlColorDisplay itemWidget1;
-	protected ControlColorDisplay itemWidget2;
-	protected ControlColorDisplay itemWidget3;
-	protected ControlColourMixSymbol addSymbol;
-	protected ControlColourMixSymbol arrowSymbol;
-
-	public ControlColorMixItem(ControlList<IColourMix> controlList, IColourMix option, int y) {
-		super(controlList, option, y);
-		itemWidget1 = new ControlColorDisplay(this, 4.0f, 4.0f);
-		itemWidget2 = new ControlColorDisplay(this, 44.0f, 4.0f);
-		itemWidget3 = new ControlColorDisplay(this, 104.0f, 4.0f);
-		addSymbol = new ControlColourMixSymbol(this, 24, 4, 0);
-		arrowSymbol = new ControlColourMixSymbol(this, 64, 4, 1);
-
-		if (getValue() != null) {
-			itemWidget1.setValue(getValue().getColor1());
-			itemWidget2.setValue(getValue().getColor2());
-			itemWidget3.setValue(getValue().getResult());
-			addSymbol.setValue(getValue());
-			arrowSymbol.setValue(getValue());
-		}
-	}
-}

src/main/java/binnie/botany/craftgui/ControlColorOption.java

@@ -1,28 +0,0 @@
-package binnie.botany.craftgui;
-
-import binnie.botany.api.IFlowerColor;
-import binnie.core.craftgui.CraftGUI;
-import binnie.core.craftgui.WidgetAttribute;
-import binnie.core.craftgui.controls.listbox.ControlList;
-import binnie.core.craftgui.controls.listbox.ControlTextOption;
-import binnie.core.craftgui.geometry.CraftGUIUtil;
-import binnie.core.craftgui.geometry.IPoint;
-
-public class ControlColorOption extends ControlTextOption<IFlowerColor> {
-	protected ControlColorDisplay controlBee;
-	protected IPoint boxPosition;
-
-	public ControlColorOption(ControlList<IFlowerColor> controlList, IFlowerColor option, int y) {
-		super(controlList, option, option.getName(), y);
-		setSize(new IPoint(getSize().x(), 20.0f));
-		(controlBee = new ControlColorDisplay(this, 2.0f, 2.0f)).setValue(option);
-		addAttribute(WidgetAttribute.MOUSE_OVER);
-		CraftGUIUtil.moveWidget(textWidget, new IPoint(22.0f, 0.0f));
-		textWidget.setSize(textWidget.getSize().sub(new IPoint(24.0f, 0.0f)));
-		int th = (int) CraftGUI.render.textHeight(textWidget.getValue(), textWidget.getSize().x());
-		int height = Math.max(20, th + 6);
-		setSize(new IPoint(size().x(), height));
-		textWidget.setSize(new IPoint(textWidget.getSize().x(), height));
-		boxPosition = new IPoint(2.0f, (height - 18) / 2);
-	}
-}

src/main/java/binnie/botany/craftgui/ControlColourDisplay.java

@@ -0,0 +1,46 @@
+package binnie.botany.craftgui;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import binnie.botany.api.IFlowerColour;
+import binnie.core.craftgui.Attribute;
+import binnie.core.craftgui.ITooltip;
+import binnie.core.craftgui.IWidget;
+import binnie.core.craftgui.Tooltip;
+import binnie.core.craftgui.controls.core.Control;
+import binnie.core.craftgui.controls.core.IControlValue;
+import binnie.core.craftgui.renderer.RenderUtil;
+
+public class ControlColourDisplay extends Control implements IControlValue<IFlowerColour>, ITooltip {
+	private IFlowerColour value;
+
+	public ControlColourDisplay(final IWidget parent, final int x, final int y, final IFlowerColour value) {
+		super(parent, x, y, 16, 16);
+		this.value = value;
+		this.addAttribute(Attribute.MouseOver);
+	}
+
+	@Override
+	public IFlowerColour getValue() {
+		return this.value;
+	}
+
+	@Override
+	public void setValue(final IFlowerColour value) {
+		this.value = value;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void onRenderBackground(int guiWidth, int guiHeight) {
+		RenderUtil.drawSolidRect(this.getArea(), -1);
+		RenderUtil.drawSolidRect(this.getArea().inset(1), -16777216 + this.getValue().getColor(false));
+	}
+
+	@Override
+	public void getTooltip(final Tooltip tooltip) {
+		super.getTooltip(tooltip);
+		tooltip.add(this.value.getColourName());
+	}
+}

src/main/java/binnie/botany/craftgui/ControlColourMixBox.java

@@ -0,0 +1,25 @@
+package binnie.botany.craftgui;
+
+import binnie.botany.api.IColourMix;
+import binnie.core.craftgui.IWidget;
+import binnie.core.craftgui.controls.listbox.ControlListBox;
+
+public class ControlColourMixBox extends ControlListBox<IColourMix> {
+	private int index;
+	private Type type;
+
+	public ControlColourMixBox(final IWidget parent, final int x, final int y, final int width, final int height, final Type type) {
+		super(parent, x, y, width, height, 12);
+		this.type = type;
+	}
+
+	@Override
+	public IWidget createOption(final IColourMix value, final int y) {
+		return new ControlColourMixItem(this.getContent(), value, y);
+	}
+
+	enum Type {
+		Resultant,
+		Further,
+	}
+}

src/main/java/binnie/botany/craftgui/ControlColourMixItem.java

@@ -0,0 +1,23 @@
+package binnie.botany.craftgui;
+
+import binnie.botany.api.IColourMix;
+import binnie.core.craftgui.controls.listbox.ControlList;
+import binnie.core.craftgui.controls.listbox.ControlOption;
+
+public class ControlColourMixItem extends ControlOption<IColourMix> {
+	private final ControlColourDisplay itemWidget1;
+	private final ControlColourDisplay itemWidget2;
+	private final ControlColourDisplay itemWidget3;
+	private final ControlColourMixSymbol addSymbol;
+	private final ControlColourMixSymbol arrowSymbol;
+
+	public ControlColourMixItem(final ControlList<IColourMix> controlList, final IColourMix option, final int y) {
+		super(controlList, option, y);
+		IColourMix value = this.getValue();
+		this.itemWidget1 = new ControlColourDisplay(this, 4, 4, value.getColourFirst());
+		this.itemWidget2 = new ControlColourDisplay(this, 44, 4, value.getColourSecond());
+		this.itemWidget3 = new ControlColourDisplay(this, 104, 4, value.getResult());
+		this.addSymbol = new ControlColourMixSymbol(this, 24, 4, 0, value);
+		this.arrowSymbol = new ControlColourMixSymbol(this, 64, 4, 1, value);
+	}
+}

src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java

@@ -1,52 +1,54 @@
 package binnie.botany.craftgui;
 
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
 import binnie.botany.api.IColourMix;
+import binnie.core.craftgui.Attribute;
 import binnie.core.craftgui.CraftGUI;
 import binnie.core.craftgui.ITooltip;
 import binnie.core.craftgui.IWidget;
 import binnie.core.craftgui.Tooltip;
-import binnie.core.craftgui.WidgetAttribute;
 import binnie.core.craftgui.controls.core.Control;
-import binnie.core.craftgui.geometry.IPoint;
+import binnie.core.craftgui.geometry.Point;
 import binnie.core.craftgui.resource.Texture;
 import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet;
 import binnie.core.craftgui.resource.minecraft.StandardTexture;
-import binnie.core.util.I18N;
 
 public class ControlColourMixSymbol extends Control implements ITooltip {
-	protected static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2);
-	protected static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2);
+	static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2);
+	static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2);
+	IColourMix value;
+	int type;
 
-	protected IColourMix value;
-	protected int type;
-
-	protected ControlColourMixSymbol(IWidget parent, int x, int y, int type) {
-		super(parent, x, y, 16 + type * 16, 16.0f);
+	protected ControlColourMixSymbol(final IWidget parent, final int x, final int y, final int type, final IColourMix value) {
+		super(parent, x, y, 16 + type * 16, 16);
+		this.value = value;
 		this.type = type;
-		value = null;
-		addAttribute(WidgetAttribute.MOUSE_OVER);
+		this.addAttribute(Attribute.MouseOver);
 	}
 
 	@Override
-	public void onRenderBackground() {
-		super.onRenderBackground();
-		if (type == 0) {
-			CraftGUI.render.texture(ControlColourMixSymbol.MutationPlus, IPoint.ZERO);
+	@SideOnly(Side.CLIENT)
+	public void onRenderBackground(int guiWidth, int guiHeight) {
+		super.onRenderBackground(guiWidth, guiHeight);
+		if (this.type == 0) {
+			CraftGUI.render.texture(ControlColourMixSymbol.MutationPlus, Point.ZERO);
 		} else {
-			CraftGUI.render.texture(ControlColourMixSymbol.MutationArrow, IPoint.ZERO);
+			CraftGUI.render.texture(ControlColourMixSymbol.MutationArrow, Point.ZERO);
 		}
 	}
 
-	public void setValue(IColourMix value) {
+	public void setValue(final IColourMix value) {
 		this.value = value;
-		setColor(0xffffff);
+		this.setColour(0xffffff);
 	}
 
 	@Override
-	public void getTooltip(Tooltip tooltip) {
-		if (type == 1) {
-			float chance = value.getChance();
-			tooltip.add(I18N.localise("botany.gui.controls.colorMixSymbol.chance", chance));
+	public void getTooltip(final Tooltip tooltip) {
+		if (this.type == 1) {
+			final float chance = this.value.getChance();
+			tooltip.add("Current Chance - " + chance + "%");
 		}
 	}
 }

src/main/java/binnie/botany/craftgui/ControlColourOption.java

@@ -0,0 +1,32 @@
+package binnie.botany.craftgui;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import binnie.botany.api.IFlowerColour;
+import binnie.core.craftgui.Attribute;
+import binnie.core.craftgui.CraftGUI;
+import binnie.core.craftgui.controls.listbox.ControlList;
+import binnie.core.craftgui.controls.listbox.ControlTextOption;
+import binnie.core.craftgui.geometry.CraftGUIUtil;
+import binnie.core.craftgui.geometry.Point;
+
+@SideOnly(Side.CLIENT)
+public class ControlColourOption extends ControlTextOption<IFlowerColour> {
+	ControlColourDisplay controlBee;
+	Point boxPosition;
+
+	public ControlColourOption(final ControlList<IFlowerColour> controlList, final IFlowerColour option, final int y) {
+		super(controlList, option, option.getColourName(), y);
+		this.setSize(new Point(this.getSize().x(), 20));
+		this.controlBee = new ControlColourDisplay(this, 2, 2, option);
+		this.addAttribute(Attribute.MouseOver);
+		CraftGUIUtil.moveWidget(this.textWidget, new Point(22, 0));
+		this.textWidget.setSize(this.textWidget.getSize().sub(new Point(24, 0)));
+		final int th = CraftGUI.render.textHeight(this.textWidget.getValue(), this.textWidget.getSize().x());
+		final int height = Math.max(20, th + 6);
+		this.setSize(new Point(this.size().x(), height));
+		this.textWidget.setSize(new Point(this.textWidget.getSize().x(), height));
+		this.boxPosition = new Point(2, (height - 18) / 2);
+	}
+}

src/main/java/binnie/botany/craftgui/PageColorMix.java

@@ -1,36 +0,0 @@
-package binnie.botany.craftgui;
-
-import binnie.botany.api.IColourMix;
-import binnie.botany.api.IFlowerColor;
-import binnie.botany.core.BotanyCore;
-import binnie.core.craftgui.IWidget;
-import binnie.core.craftgui.controls.ControlText;
-import binnie.core.craftgui.controls.ControlTextCentered;
-import binnie.core.craftgui.database.DatabaseTab;
-import binnie.core.craftgui.database.PageAbstract;
-import binnie.core.util.I18N;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PageColorMix extends PageAbstract<IFlowerColor> {
-	ControlText title;
-	ControlColorMixBox list;
-
-	public PageColorMix(IWidget parent, DatabaseTab tab) {
-		super(parent, tab);
-		title = new ControlTextCentered(this, 8.0f, I18N.localise("botany.gui.controls.pageColorFurtherTitle"));
-		list = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Further);
-	}
-
-	@Override
-	public void onValueChanged(IFlowerColor colour) {
-		List<IColourMix> mixes = new ArrayList<>();
-		for (IColourMix mix : BotanyCore.getFlowerRoot().getColourMixes(false)) {
-			if (mix.getColor1() == colour || mix.getColor2() == colour) {
-				mixes.add(mix);
-			}
-		}
-		list.setOptions(mixes);
-	}
-}

src/main/java/binnie/botany/craftgui/PageColorMixResultant.java

@@ -1,36 +0,0 @@
-package binnie.botany.craftgui;
-
-import binnie.botany.api.IColourMix;
-import binnie.botany.api.IFlowerColor;
-import binnie.botany.core.BotanyCore;
-import binnie.core.craftgui.IWidget;
-import binnie.core.craftgui.controls.ControlText;
-import binnie.core.craftgui.controls.ControlTextCentered;
-import binnie.core.craftgui.database.DatabaseTab;
-import binnie.core.craftgui.database.PageAbstract;
-import binnie.core.util.I18N;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PageColorMixResultant extends PageAbstract<IFlowerColor> {
-	protected ControlText title;
-	protected ControlColorMixBox list;
-
-	public PageColorMixResultant(IWidget parent, DatabaseTab tab) {
-		super(parent, tab);
-		title = new ControlTextCentered(this, 8.0f, I18N.localise("botany.gui.controls.pageSpeciesFurtherTitle"));
-		list = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Resultant);
-	}
-
-	@Override
-	public void onValueChanged(IFlowerColor color) {
-		List<IColourMix> mixes = new ArrayList<>();
-		for (IColourMix mix : BotanyCore.getFlowerRoot().getColourMixes(false)) {
-			if (mix.getResult() == color) {
-				mixes.add(mix);
-			}
-		}
-		list.setOptions(mixes);
-	}
-}

src/main/java/binnie/botany/craftgui/PageColourMix.java

@@ -0,0 +1,35 @@
+package binnie.botany.craftgui;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import binnie.botany.api.IColourMix;
+import binnie.botany.api.IFlowerColour;
+import binnie.botany.core.BotanyCore;
+import binnie.core.craftgui.IWidget;
+import binnie.core.craftgui.controls.ControlText;
+import binnie.core.craftgui.controls.ControlTextCentered;
+import binnie.core.craftgui.database.DatabaseTab;
+import binnie.core.craftgui.database.PageAbstract;
+
+public class PageColourMix extends PageAbstract<IFlowerColour> {
+	ControlText pageSpeciesFurther_Title;
+	ControlColourMixBox pageSpeciesFurther_List;
+
+	public PageColourMix(final IWidget parent, final DatabaseTab tab) {
+		super(parent, tab);
+		this.pageSpeciesFurther_Title = new ControlTextCentered(this, 8, "Further Mixes");
+		this.pageSpeciesFurther_List = new ControlColourMixBox(this, 4, 20, 136, 152, ControlColourMixBox.Type.Further);
+	}
+
+	@Override
+	public void onValueChanged(final IFlowerColour colour) {
+		final List<IColourMix> mixes = new ArrayList<>();
+		for (final IColourMix mix : BotanyCore.getFlowerRoot().getColourMixes(false)) {
+			if (mix.getColourFirst() == colour || mix.getColourSecond() == colour) {
+				mixes.add(mix);
+			}
+		}
+		this.pageSpeciesFurther_List.setOptions(mixes);
+	}
+}

src/main/java/binnie/botany/craftgui/PageColourMixResultant.java

@@ -0,0 +1,35 @@
+package binnie.botany.craftgui;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import binnie.botany.api.IColourMix;
+import binnie.botany.api.IFlowerColour;
+import binnie.botany.core.BotanyCore;
+import binnie.core.craftgui.IWidget;
+import binnie.core.craftgui.controls.ControlText;
+import binnie.core.craftgui.controls.ControlTextCentered;
+import binnie.core.craftgui.database.DatabaseTab;
+import binnie.core.craftgui.database.PageAbstract;
+
+public class PageColourMixResultant extends PageAbstract<IFlowerColour> {
+	ControlText pageSpeciesFurther_Title;
+	ControlColourMixBox pageSpeciesFurther_List;
+
+	public PageColourMixResultant(final IWidget parent, final DatabaseTab tab) {
+		super(parent, tab);
+		this.pageSpeciesFurther_Title = new ControlTextCentered(this, 8, "Resultant Mixes");
+		this.pageSpeciesFurther_List = new ControlColourMixBox(this, 4, 20, 136, 152, ControlColourMixBox.Type.Resultant);
+	}
+
+	@Override
+	public void onValueChanged(final IFlowerColour colour) {
+		final List<IColourMix> mixes = new ArrayList<>();
+		for (final IColourMix mix : BotanyCore.getFlowerRoot().getColourMixes(false)) {
+			if (mix.getResult() == colour) {
+				mixes.add(mix);
+			}
+		}
+		this.pageSpeciesFurther_List.setOptions(mixes);
+	}
+}

src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java

@@ -1,5 +1,11 @@
 package binnie.botany.craftgui;
 
+import net.minecraft.item.ItemStack;
+
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IAlleleSpecies;
+import forestry.api.genetics.IIndividual;
+
 import binnie.Binnie;
 import binnie.botany.api.EnumFlowerChromosome;
 import binnie.botany.api.EnumFlowerStage;
@@ -13,96 +19,85 @@ import binnie.core.craftgui.controls.core.Control;
 import binnie.core.craftgui.controls.scroll.ControlScrollableContent;
 import binnie.core.craftgui.database.DatabaseTab;
 import binnie.core.craftgui.database.PageSpecies;
-import binnie.core.craftgui.geometry.IArea;
-import binnie.core.craftgui.geometry.IPoint;
+import binnie.core.craftgui.geometry.Area;
+import binnie.core.craftgui.geometry.Point;
 import binnie.core.craftgui.geometry.TextJustification;
 import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
-import binnie.core.util.I18N;
-import binnie.genetics.genetics.AlleleHelper;
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IAlleleSpecies;
-import forestry.api.genetics.IIndividual;
-import net.minecraft.item.ItemStack;
 
 public class PageSpeciesFlowerGenome extends PageSpecies {
-	public PageSpeciesFlowerGenome(IWidget parent, DatabaseTab tab) {
+	public PageSpeciesFlowerGenome(final IWidget parent, final DatabaseTab tab) {
 		super(parent, tab);
 	}
 
+	public static String tolerated(final boolean t) {
+		if (t) {
+			return "Tolerated";
+		}
+		return "Not Tolerated";
+	}
+
 	@Override
-	public void onValueChanged(IAlleleSpecies species) {
-		deleteAllChildren();
-		IAllele[] template = Binnie.Genetics.getFlowerRoot().getTemplate(species.getUID());
+	public void onValueChanged(final IAlleleSpecies species) {
+		this.deleteAllChildren();
+		final IAllele[] template = Binnie.GENETICS.getFlowerRoot().getTemplate(species.getUID());
 		if (template == null) {
 			return;
 		}
-
-		IFlower tree = Binnie.Genetics.getFlowerRoot().templateAsIndividual(template);
+		final IFlower tree = Binnie.GENETICS.getFlowerRoot().templateAsIndividual(template);
 		if (tree == null) {
 			return;
 		}
-
-		IFlowerGenome genome = tree.getGenome();
-		IAlleleFlowerSpecies treeSpecies = genome.getPrimary();
-		int w = 144;
-		int h = 176;
-
-		new ControlText(this, new IArea(0.0f, 4.0f, w, 16.0f), I18N.localise("botany.gui.database.tab.genome"), TextJustification.MIDDLE_CENTER);
-		ControlScrollableContent scrollable = new ControlScrollableContent(this, 4.0f, 20.0f, w - 8, h - 8 - 16, 12.0f);
-		Control contents = new Control(scrollable, 0.0f, 0.0f, w - 8 - 12, h - 8 - 16);
-
-		int tw = w - 8 - 12;
-		int w2 = 55;
-		int w3 = tw - 50;
+		final IFlowerGenome genome = tree.getGenome();
+		final IAlleleFlowerSpecies treeSpecies = genome.getPrimary();
+		final int w = 144;
+		final int h = 176;
+		new ControlText(this, new Area(0, 4, w, 16), "Genome", TextJustification.MiddleCenter);
+		final ControlScrollableContent scrollable = new ControlScrollableContent(this, 4, 20, w - 8, h - 8 - 16, 12);
+		final Control contents = new Control(scrollable, 0, 0, w - 8 - 12, h - 8 - 16);
+		final int tw = w - 8 - 12;
+		final int w2 = 55;
+		final int w3 = tw - 50;
 		int y = 0;
-		int th = 14;
-		int valueX = w2 + 4;
-		new ControlText(contents, new IArea(0.0f, y, w2, th),  I18N.localise("botany.gui.database.tab.genome.temp"), TextJustification.MIDDLE_RIGHT);
-		new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getTemperature()), TextJustification.MIDDLE_LEFT);
+		final int th = 14;
+		final int th2 = 18;
+		new ControlText(contents, new Area(0, y, w2, th), "Temp. : ", TextJustification.MiddleRight);
+		new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MIDDLE_LEFTt);
 		y += th;
-
-		new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.moist"), TextJustification.MIDDLE_RIGHT);
-		new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getMoisture()), TextJustification.MIDDLE_LEFT);
+		new ControlText(contents, new Area(0, y, w2, th), "Moist. : ", TextJustification.MiddleRight);
+		new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getMoisture().getLocalisedName(false), TextJustification.MIDDLE_LEFTt);
 		y += th;
-
-		new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.ph"), TextJustification.MIDDLE_RIGHT);
-		new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getPH()), TextJustification.MIDDLE_LEFT);
+		new ControlText(contents, new Area(0, y, w2, th), "pH. : ", TextJustification.MiddleRight);
+		new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getPH().getLocalisedName(false), TextJustification.MIDDLE_LEFTt);
 		y += th;
-
-		new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.fertility"), TextJustification.MIDDLE_RIGHT);
-		new ControlText(contents, new IArea(valueX, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFT);
+		new ControlText(contents, new Area(0, y, w2, th), "Fertility : ", TextJustification.MiddleRight);
+		new ControlText(contents, new Area(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFTt);
 		y += th;
-
-		float lifespan = genome.getLifespan() * 68.27f / genome.getAgeChance() / 24000.0f;
-		String lifespanValue = String.format("%.2f", lifespan);
-		new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.lifespan"), TextJustification.MIDDLE_RIGHT);
-		new ControlText(contents, new IArea(valueX, y, w3, th), I18N.localise("botany.gui.database.tab.genome.lifespan.value", lifespanValue), TextJustification.MIDDLE_LEFT);
+		final float lifespan = genome.getLifespan() * 68.27f / genome.getAgeChance() / 24000.0f;
+		new ControlText(contents, new Area(0, y, w2, th), "Lifespan : ", TextJustification.MiddleRight);
+		new ControlText(contents, new Area(w2, y, w3, th), "" + String.format("%.2f", lifespan) + " days", TextJustification.MIDDLE_LEFTt);
 		y += th;
-
-		new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.nectar"), TextJustification.MIDDLE_RIGHT);
-		new ControlText(contents, new IArea(valueX, y, w3, th), genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getName(), TextJustification.MIDDLE_LEFT);
+		new ControlText(contents, new Area(0, y, w2, th), "Nectar : ", TextJustification.MiddleRight);
+		new ControlText(contents, new Area(w2, y, w3, th), genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getName(), TextJustification.MIDDLE_LEFTt);
 		y += th;
-
 		int x = w2;
 		int tot = 0;
-		for (IIndividual vid : BotanyCore.getFlowerRoot().getIndividualTemplates()) {
+		for (final IIndividual vid : BotanyCore.getFlowerRoot().getIndividualTemplates()) {
 			if (vid.getGenome().getPrimary() == treeSpecies) {
 				if (tot > 0 && tot % 3 == 0) {
 					x -= 54;
 					y += 18;
 				}
-				ItemStack stack = BotanyCore.getFlowerRoot().getMemberStack(vid, EnumFlowerStage.FLOWER.ordinal());
-				ControlItemDisplay display = new ControlItemDisplay(contents, x, y);
+				final ItemStack stack = BotanyCore.getFlowerRoot().getMemberStack(vid, EnumFlowerStage.FLOWER);
+				final ControlItemDisplay display = new ControlItemDisplay(contents, x, y);
 				display.setItemStack(stack);
-				tot++;
+				++tot;
 				x += 18;
 			}
 		}
-
-		int numOfLines = 1 + (tot - 1) / 3;
-		new ControlText(contents, new IArea(0.0f, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), I18N.localise("botany.gui.database.tab.genome.varieties"), TextJustification.MIDDLE_RIGHT);
+		final int numOfLines = 1 + (tot - 1) / 3;
+		new ControlText(contents, new Area(0, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), "Varieties : ", TextJustification.MiddleRight);
 		y += th;
-		contents.setSize(new IPoint(contents.size().x(), y));
+		contents.setSize(new Point(contents.size().x(), y));
 		scrollable.setScrollableContent(contents);
 	}
 }

src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java

@@ -1,8 +1,17 @@
 package binnie.botany.craftgui;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import net.minecraft.entity.player.EntityPlayer;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
 import binnie.Binnie;
 import binnie.botany.Botany;
-import binnie.botany.api.IFlowerColor;
+import binnie.botany.api.IFlowerColour;
 import binnie.botany.genetics.EnumFlowerColor;
 import binnie.core.AbstractMod;
 import binnie.core.craftgui.IWidget;
@@ -17,38 +26,35 @@ import binnie.core.craftgui.database.PageSpeciesMutations;
 import binnie.core.craftgui.database.PageSpeciesOverview;
 import binnie.core.craftgui.database.PageSpeciesResultant;
 import binnie.core.craftgui.database.WindowAbstractDatabase;
-import binnie.core.craftgui.geometry.IArea;
+import binnie.core.craftgui.geometry.Area;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.util.I18N;
-import cpw.mods.fml.relauncher.Side;
-import net.minecraft.entity.player.EntityPlayer;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 
 public class WindowBotanistDatabase extends WindowAbstractDatabase {
-	public WindowBotanistDatabase(EntityPlayer player, Side side, boolean nei) {
-		super(player, side, nei, Binnie.Genetics.flowerBreedingSystem, 130.0f);
+	ControlListBox<EnumFlowerColor> selectionBoxColors;
+
+	public WindowBotanistDatabase(final EntityPlayer player, final Side side, final boolean nei) {
+		super(player, side, nei, Binnie.GENETICS.flowerBreedingSystem, 130);
 	}
 
-	public static Window create(EntityPlayer player, Side side, boolean nei) {
+	public static Window create(final EntityPlayer player, final Side side, final boolean nei) {
 		return new WindowBotanistDatabase(player, side, nei);
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	protected void addTabs() {
-		new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.overview"));
-		new PageSpeciesFlowerGenome(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "genome"));
-		new PageSpeciesClassification(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.classification"));
-		new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.resultant"));
-		new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.further"));
-		new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(Botany.instance, "branches.overview"));
-		new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(Botany.instance, "branches.species"));
-		createMode(FlowerMode.COLOR, new ColorModeWidget());
-		new PageColorMixResultant(getInfoPages(FlowerMode.COLOR), new DatabaseTab(Botany.instance, "colour.resultant"));
-		new PageColorMix(getInfoPages(FlowerMode.COLOR), new DatabaseTab(Botany.instance, "colour.further"));
-		new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(Botany.instance, "breeder"));
+		new PageSpeciesOverview(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.overview", 0));
+		new PageSpeciesFlowerGenome(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.genome", 0));
+		new PageSpeciesClassification(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.classification", 0));
+		new PageSpeciesResultant(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.resultant", 0));
+		new PageSpeciesMutations(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.further", 0));
+		new PageBranchOverview(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(Botany.instance, "branches.overview", 0));
+		new PageBranchSpecies(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(Botany.instance, "branches.species", 0));
+		this.createMode(FlowerMode.Colour, new FlowerColourModeWidgets());
+		new PageColourMixResultant(this.getInfoPages(FlowerMode.Colour), new DatabaseTab(Botany.instance, "colour.resultant", 0));
+		new PageColourMix(this.getInfoPages(FlowerMode.Colour), new DatabaseTab(Botany.instance, "colour.further", 0));
+		new PageBreeder(this.getInfoPages(Mode.BREEDER), this.getUsername(), new DatabaseTab(Botany.instance, "breeder", 0));
 	}
 
 	@Override
@@ -57,35 +63,35 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
 	}
 
 	@Override
-	protected String getName() {
-		return I18N.localise("botany.gui.database.name");
+	protected String getBackgroundTextureName() {
+		return "FlowerDatabase";
 	}
 
 	enum FlowerMode implements IDatabaseMode {
-		COLOR;
+		Colour;
 
 		@Override
 		public String getName() {
-			return I18N.localise("botany.gui.database.tab." + name().toLowerCase());
+			return I18N.localise("botany.gui.database.mode." + this.name().toLowerCase());
 		}
 	}
 
-	private class ColorModeWidget extends ModeWidgets {
-		public ColorModeWidget() {
-			super(FlowerMode.COLOR, WindowBotanistDatabase.this);
+	@SideOnly(Side.CLIENT)
+	private class FlowerColourModeWidgets extends ModeWidgets {
+		public FlowerColourModeWidgets() {
+			super(FlowerMode.Colour, WindowBotanistDatabase.this);
 		}
 
 		@Override
-		public void createListBox(IArea area) {
-			listBox = new ControlListBox<IFlowerColor>(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) {
+		public void createListBox(final Area area) {
+			this.listBox = new ControlListBox<IFlowerColour>(this.modePage, area.xPos(), area.yPos(), area.width(), area.height(), 12) {
 				@Override
-				public IWidget createOption(IFlowerColor value, int y) {
-					return new ControlColorOption(getContent(), value, y);
+				public IWidget createOption(final IFlowerColour value, final int y) {
+					return new ControlColourOption(this.getContent(), value, y);
 				}
 			};
-			List<IFlowerColor> colors = new ArrayList<>();
-			Collections.addAll(colors, EnumFlowerColor.values());
-			listBox.setOptions(colors);
+			final List<IFlowerColour> colors = Arrays.stream(EnumFlowerColor.values()).map( c -> c.getFlowerColorAllele()).collect(Collectors.toList());
+			this.listBox.setOptions(colors);
 		}
 	}
 }

src/main/java/binnie/botany/craftgui/package-info.java

@@ -0,0 +1,9 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+@FieldsAreNonnullByDefault
+package binnie.botany.craftgui;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import binnie.core.util.FieldsAreNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/main/java/binnie/botany/farm/CircuitGarden.java

@@ -1,74 +1,75 @@
 package binnie.botany.farm;
 
+import com.google.common.base.Preconditions;
+
+import javax.annotation.Nullable;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.text.TextFormatting;
+
+import forestry.api.circuits.ChipsetManager;
+import forestry.api.circuits.ICircuitLayout;
+import forestry.api.farming.FarmDirection;
+import forestry.api.farming.IFarmHousing;
+
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumMoisture;
 import binnie.core.circuits.BinnieCircuit;
 import binnie.core.util.I18N;
-import forestry.api.circuits.ChipsetManager;
-import forestry.api.farming.FarmDirection;
-import forestry.api.farming.IFarmHousing;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
 
 public class CircuitGarden extends BinnieCircuit {
 	private boolean isManual;
-	private boolean isFertilised;
-	private ItemStack icon;
-	private EnumMoisture moisture;
-	private EnumAcidity acidity;
+	private GardenLogic logic;
 
-	public CircuitGarden(EnumMoisture moisture, EnumAcidity ph, boolean manual, boolean fertilised, ItemStack recipe, ItemStack icon) {
-		super("garden." + moisture.getID() + ((ph != null) ? ("." + ph.getID()) : "") + (manual ? ".manual" : "") + (fertilised ? ".fert" : ""), 4, manual ? ChipsetManager.circuitRegistry.getLayout("forestry.farms.manual") : ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed"), recipe);
-		this.moisture = moisture;
-		this.icon = icon;
-		isManual = manual;
-		isFertilised = fertilised;
-		acidity = ph;
-		String info = "";
+	public CircuitGarden(EnumMoisture moisture, @Nullable EnumAcidity ph, boolean manual, boolean fertilised, ItemStack recipe, ItemStack icon) {
+		super(getName(moisture, ph, manual, fertilised), 4, getLayout(manual), recipe);
+		this.isManual = manual;
+		this.logic = new GardenLogic(moisture, ph, this.isManual, fertilised, icon, I18N.localise(this.getUnlocalizedName()));
+		StringBuilder info = new StringBuilder("Flowers (")
+			.append(TextFormatting.GRAY.toString())
+			.append(I18N.localise("botany.moisture"))
+			.append(": ")
+			.append(moisture.getLocalisedName(true));
 
-		if (moisture == EnumMoisture.DRY) {
-			info += EnumChatFormatting.YELLOW
-				+ I18N.localise("botany.moisture.dry")
-				+ EnumChatFormatting.RESET;
+		if (ph != null) {
+			info.append(TextFormatting.GRAY.toString())
+				.append(", ")
+				.append(I18N.localise("botany.ph"))
+				.append(": ")
+				.append(ph.getLocalisedName(true));
 		}
+		String fertilizedKey = fertilised ? "for.binnie.circuit.garden.fertilized" : "for.binnie.circuit.garden.unfertilized";
+		info.append(TextFormatting.RESET.toString())
+			.append(" ")
+			.append(I18N.localise(fertilizedKey))
+			.append(")");
+		this.addTooltipString(info.toString());
+	}
 
-		if (moisture == EnumMoisture.DAMP) {
-			info += EnumChatFormatting.YELLOW
-				+ I18N.localise("botany.moisture.damp")
-				+ EnumChatFormatting.RESET;
-		}
+	private static ICircuitLayout getLayout(boolean manual) {
+		String layoutUid = manual ? "forestry.farms.manual" : "forestry.farms.managed";
+		ICircuitLayout layout = ChipsetManager.circuitRegistry.getLayout(layoutUid);
+		Preconditions.checkState(layout != null, "Couldn't find Forestry circuit layout %s.", layoutUid);
+		return layout;
+	}
 
-		if (acidity == EnumAcidity.ACID) {
-			if (info.length() > 0) {
-				info += ", ";
-			}
-			info += EnumChatFormatting.RED
-				+ I18N.localise("botany.ph.acid")
-				+ EnumChatFormatting.RESET;
+	private static String getName(EnumMoisture moisture, @Nullable EnumAcidity ph, boolean manual, boolean fertilised) {
+		String name = "garden." + moisture.getName();
+		if (ph != null) {
+			name += "." + ph.getName();
 		}
+		if (manual) {
+			name += ".manual";
+		}
+		if (fertilised) {
+			name += ".fert";
+		}
+		return name;
+	}
 
-		if (acidity == EnumAcidity.NEUTRAL) {
-			if (info.length() > 0) {
-				info += ", ";
-			}
-			info += EnumChatFormatting.GREEN
-				+ I18N.localise("botany.ph.neutral")
-				+ EnumChatFormatting.RESET;
-		}
-
-		if (acidity == EnumAcidity.ALKALINE) {
-			if (info.length() > 0) {
-				info += ", ";
-			}
-			info += EnumChatFormatting.AQUA
-				+ I18N.localise("botany.ph.alkaline")
-				+ EnumChatFormatting.RESET;
-		}
-
-		if (info.length() > 0) {
-			info = " (" + info + EnumChatFormatting.RESET + ")";
-		}
-		addTooltipString(I18N.localise("botany.circuit.flowers") + info);
+	public CircuitGarden setManual() {
+		isManual = true;
+		return this;
 	}
 
 	@Override
@@ -76,15 +77,24 @@ public class CircuitGarden extends BinnieCircuit {
 		return tile instanceof IFarmHousing;
 	}
 
+	@Nullable
+	private IFarmHousing getCircuitable(Object tile) {
+		if (!isCircuitable(tile)) {
+			return null;
+		}
+		return (IFarmHousing) tile;
+	}
+
 	@Override
 	public void onInsertion(int slot, Object tile) {
-		if (!isCircuitable(tile)) {
+		IFarmHousing housing = getCircuitable(tile);
+		if (housing == null) {
 			return;
 		}
 
-		GardenLogic logic = new GardenLogic((IFarmHousing) tile);
-		logic.setData(moisture, acidity, isManual, isFertilised, icon, I18N.localise(getName()));
-		((IFarmHousing) tile).setFarmLogic(FarmDirection.values()[slot], logic);
+		logic.setManual(isManual);
+
+		housing.setFarmLogic(FarmDirection.values()[slot], logic);
 	}
 
 	@Override
@@ -94,14 +104,15 @@ public class CircuitGarden extends BinnieCircuit {
 
 	@Override
 	public void onRemoval(int slot, Object tile) {
-		if (!isCircuitable(tile)) {
+		IFarmHousing farmHousing = getCircuitable(tile);
+		if (farmHousing == null) {
 			return;
 		}
-		((IFarmHousing) tile).resetFarmLogic(FarmDirection.values()[slot]);
+
+		farmHousing.resetFarmLogic(FarmDirection.values()[slot]);
 	}
 
 	@Override
-	public void onTick(int arg0, Object arg1) {
-		// ignored
+	public void onTick(int slot, Object tile) {
 	}
 }

src/main/java/binnie/botany/farm/FarmLogic.java

@@ -1,58 +1,49 @@
 package binnie.botany.farm;
 
-import forestry.api.farming.FarmDirection;
-import forestry.api.farming.IFarmHousing;
-import forestry.api.farming.IFarmLogic;
-import forestry.core.utils.vect.Vect;
 import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-public abstract class FarmLogic implements IFarmLogic {
-	protected World world;
-	protected IFarmHousing housing;
-	protected boolean isManual;
+import forestry.api.farming.IFarmLogic;
 
-	public FarmLogic(IFarmHousing housing) {
-		this.housing = housing;
-	}
+public abstract class FarmLogic implements IFarmLogic {
+	boolean isManual;
 
 	@Override
-	public IFarmLogic setManual(boolean flag) {
-		isManual = flag;
+	public IFarmLogic setManual(final boolean flag) {
+		this.isManual = flag;
 		return this;
 	}
 
-	protected boolean isAirBlock(Vect position) {
-		return world.isAirBlock(position.x, position.y, position.z);
+	protected final boolean isAirBlock(World world, BlockPos pos) {
+		return world.isAirBlock(pos);
 	}
 
-	protected boolean isWaterBlock(Vect position) {
-		return world.getBlock(position.x, position.y, position.z) == Blocks.water;
+	protected final IBlockState getBlockState(World world, BlockPos pos) {
+		return world.getBlockState(pos);
 	}
 
-	protected Block getBlock(Vect position) {
-		return world.getBlock(position.x, position.y, position.z);
+	protected final Block getBlock(World world, BlockPos pos) {
+		return getBlockState(world, pos).getBlock();
 	}
 
-	protected int getBlockMeta(Vect position) {
-		return world.getBlockMetadata(position.x, position.y, position.z);
+	protected final int getBlockMeta(World world, BlockPos pos) {
+		IBlockState blockState = world.getBlockState(pos);
+		return blockState.getBlock().getMetaFromState(blockState);
 	}
 
-	protected ItemStack getAsItemStack(Vect position) {
-		return new ItemStack(getBlock(position), 1, getBlockMeta(position));
+	protected final ItemStack getAsItemStack(World world, BlockPos position) {
+		return new ItemStack(getBlock(world, position), 1, getBlockMeta(world, position));
 	}
 
-	protected Vect translateWithOffset(int x, int y, int z, FarmDirection direction, int step) {
-		return new Vect(
-			x + direction.getForgeDirection().offsetX * step,
-			y + direction.getForgeDirection().offsetY * step,
-			z + direction.getForgeDirection().offsetZ * step
-		);
+	protected final boolean isWaterBlock(World world, BlockPos pos) {
+		return getBlock(world, pos) == Blocks.WATER;
 	}
 
-	protected void setBlock(Vect position, Block block, int meta) {
-		world.setBlock(position.x, position.y, position.z, block, meta, 2);
+	protected final void setBlock(World world, BlockPos pos, final Block block, final int meta) {
+		world.setBlockState(pos, block.getStateFromMeta(meta), 2);
 	}
 }

src/main/java/binnie/botany/farm/FarmableFlower.java

@@ -1,42 +1,67 @@
 package binnie.botany.farm;
 
+import javax.annotation.Nullable;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import forestry.api.farming.ICrop;
+import forestry.api.farming.IFarmable;
+
 import binnie.botany.Botany;
 import binnie.botany.api.EnumFlowerStage;
 import binnie.botany.api.IFlower;
+import binnie.botany.api.IFlowerRoot;
 import binnie.botany.core.BotanyCore;
-import binnie.botany.gardening.Gardening;
-import forestry.api.farming.ICrop;
-import forestry.api.farming.IFarmable;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
+import binnie.botany.flower.TileEntityFlower;
 
 public class FarmableFlower implements IFarmable {
 	@Override
-	public boolean isSaplingAt(World world, int x, int y, int z) {
-		return world.getBlock(x, y, z) == Botany.flower;
+	public boolean isSaplingAt(final World world, final BlockPos pos) {
+		return world.getBlockState(pos) == Botany.flower;
 	}
 
+	@Nullable
 	@Override
-	public ICrop getCropAt(World world, int x, int y, int z) {
+	public ICrop getCropAt(World world, BlockPos pos, IBlockState blockState) {
+		IFlower flower = null;
+		if (world.getTileEntity(pos) instanceof TileEntityFlower) {
+			flower = ((TileEntityFlower) world.getTileEntity(pos)).getFlower();
+		}
+		// Look at TileEntityFlower::onShear logic
+		if (flower != null && flower.getAge() > 1) {
+			IFlowerRoot flowerRoot = BotanyCore.getFlowerRoot();
+			ItemStack mature = flowerRoot.getMemberStack(flower, EnumFlowerStage.FLOWER);
+			ItemStack seed = flowerRoot.getMemberStack(flower, EnumFlowerStage.SEED);
+			if (mature != null && seed != null) {
+				world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
+				return new FlowerCrop(pos, mature, seed);
+			}
+		}
+
 		return null;
 	}
 
 	@Override
-	public boolean isGermling(ItemStack itemstack) {
-		EnumFlowerStage stage = BotanyCore.speciesRoot.getStageType(itemstack);
+	public boolean isGermling(final ItemStack itemstack) {
+		final EnumFlowerStage stage = BotanyCore.getFlowerRoot().getType(itemstack);
 		return stage == EnumFlowerStage.FLOWER || stage == EnumFlowerStage.SEED;
 	}
 
 	@Override
-	public boolean isWindfall(ItemStack itemstack) {
+	public boolean isWindfall(final ItemStack itemstack) {
 		return false;
 	}
 
 	@Override
-	public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) {
-		IFlower flower = BotanyCore.getFlowerRoot().getMember(germling);
-		Gardening.plant(world, x, y, z, flower, player.getGameProfile());
+	public boolean plantSaplingAt(final EntityPlayer player, final ItemStack germling, final World world, final BlockPos pos) {
+		IFlowerRoot flowerRoot = BotanyCore.getFlowerRoot();
+		IFlower flower = flowerRoot.getMember(germling);
+		flowerRoot.plant(world, pos, flower, player.getGameProfile());
 		return true;
 	}
 }

src/main/java/binnie/botany/farm/FarmableVanillaFlower.java

@@ -1,21 +1,24 @@
 package binnie.botany.farm;
 
-import binnie.botany.api.IFlower;
-import binnie.botany.core.BotanyCore;
-import binnie.botany.gardening.Gardening;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import binnie.botany.api.IFlower;
+import binnie.botany.api.IFlowerRoot;
+import binnie.botany.core.BotanyCore;
+
 public class FarmableVanillaFlower extends FarmableFlower {
 	@Override
-	public boolean isGermling(ItemStack itemstack) {
+	public boolean isGermling(final ItemStack itemstack) {
 		return BotanyCore.getFlowerRoot().getConversion(itemstack) != null;
 	}
 
 	@Override
-	public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) {
-		IFlower flower = BotanyCore.getFlowerRoot().getConversion(germling);
-		return Gardening.plant(world, x, y, z, flower, player.getGameProfile());
+	public boolean plantSaplingAt(final EntityPlayer player, final ItemStack germling, final World world, final BlockPos pos) {
+		IFlowerRoot flowerRoot = BotanyCore.getFlowerRoot();
+		IFlower flower = flowerRoot.getConversion(germling);
+		return flowerRoot.plant(world, pos, flower, player.getGameProfile());
 	}
 }

src/main/java/binnie/botany/farm/FlowerCrop.java

@@ -0,0 +1,31 @@
+package binnie.botany.farm;
+
+import javax.annotation.Nullable;
+import java.util.Arrays;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.math.BlockPos;
+
+import forestry.api.farming.ICrop;
+
+public class FlowerCrop implements ICrop {
+	NonNullList<ItemStack> drops = NonNullList.create();
+	BlockPos position;
+
+	public FlowerCrop(BlockPos pos, ItemStack... drops) {
+		Arrays.stream(drops).forEach(drop -> this.drops.add(drop));
+		position = pos;
+	}
+
+	@Nullable
+	@Override
+	public NonNullList<ItemStack> harvest() {
+		return drops;
+	}
+
+	@Override
+	public BlockPos getPosition() {
+		return position;
+	}
+}

src/main/java/binnie/botany/farm/GardenLogic.java

@@ -1,22 +1,13 @@
 package binnie.botany.farm;
 
-import binnie.Binnie;
-import binnie.botany.Botany;
-import binnie.botany.api.EnumAcidity;
-import binnie.botany.api.EnumMoisture;
-import binnie.botany.api.EnumSoilType;
-import binnie.botany.api.gardening.IBlockSoil;
-import binnie.botany.flower.TileEntityFlower;
-import binnie.botany.gardening.Gardening;
-import com.mojang.authlib.GameProfile;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.farming.FarmDirection;
-import forestry.api.farming.ICrop;
-import forestry.api.farming.IFarmHousing;
-import forestry.api.farming.IFarmable;
-import forestry.core.access.IOwnable;
-import forestry.core.utils.vect.Vect;
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.init.Blocks;
@@ -24,151 +15,152 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
+import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
 import net.minecraftforge.fluids.FluidStack;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import forestry.api.farming.FarmDirection;
+import forestry.api.farming.ICrop;
+import forestry.api.farming.IFarmHousing;
+import forestry.api.farming.IFarmable;
+import forestry.core.owner.IOwnedTile;
+import forestry.core.utils.BlockUtil;
+
+import binnie.Binnie;
+import binnie.botany.Botany;
+import binnie.botany.api.EnumAcidity;
+import binnie.botany.api.EnumMoisture;
+import binnie.botany.api.EnumSoilType;
+import binnie.botany.api.IBlockSoil;
+import binnie.botany.api.IGardeningManager;
+import binnie.botany.core.BotanyCore;
+import binnie.botany.flower.TileEntityFlower;
+import binnie.core.liquid.ManagerLiquid;
 
 public class GardenLogic extends FarmLogic {
-	protected EnumMoisture moisture;
-	protected EnumAcidity acidity;
-	protected boolean fertilised;
-	protected String name;
-	protected ArrayList<ItemStack> produce;
-	protected List<IFarmable> farmables;
-
+	List<IFarmable> farmables;
+	private EnumMoisture moisture;
+	@Nullable
+	private EnumAcidity acidity;
+	private boolean fertilised;
+	private String name;
+	private NonNullList<ItemStack> produce;
 	private ItemStack icon;
 
-	public GardenLogic(IFarmHousing housing) {
-		super(housing);
-		produce = new ArrayList<>();
-		farmables = new ArrayList<>();
-		farmables.add(new FarmableFlower());
-		farmables.add(new FarmableVanillaFlower());
+	public GardenLogic(EnumMoisture moisture2, @Nullable EnumAcidity acidity2, boolean isManual, boolean isFertilised, ItemStack icon2, String name2) {
+		this.produce = NonNullList.create();
+		(this.farmables = new ArrayList<>()).add(new FarmableFlower());
+		this.farmables.add(new FarmableVanillaFlower());
+		this.moisture = moisture2;
+		this.acidity = acidity2;
+		this.isManual = isManual;
+		this.fertilised = isFertilised;
+		this.icon = icon2;
+		this.name = name2;
 	}
 
 	@Override
 	public int getFertilizerConsumption() {
-		return fertilised ? 8 : 2;
+		return this.fertilised ? 8 : 2;
 	}
 
 	@Override
-	public int getWaterConsumption(float hydrationModifier) {
-		return (int) (moisture.ordinal() * 40 * hydrationModifier);
+	public int getWaterConsumption(final float hydrationModifier) {
+		return (int) (this.moisture.ordinal() * 40 * hydrationModifier);
 	}
 
 	@Override
-	public boolean isAcceptedResource(ItemStack stack) {
-		Item item = stack.getItem();
-		return Gardening.isSoil(item)
-			|| item == Item.getItemFromBlock(Blocks.sand)
-			|| item == Item.getItemFromBlock(Blocks.dirt)
-			|| Gardening.isAcidFertiliser(stack)
-			|| Gardening.isAlkalineFertiliser(stack);
+	public boolean isAcceptedResource(final ItemStack itemstack) {
+		IGardeningManager gardening = BotanyCore.getGardening();
+		return gardening.isSoil(itemstack.getItem()) ||
+				itemstack.getItem() == Item.getItemFromBlock(Blocks.SAND) ||
+				itemstack.getItem() == Item.getItemFromBlock(Blocks.DIRT) ||
+				gardening.isAcidFertiliser(itemstack) ||
+				gardening.isAlkalineFertiliser(itemstack);
 	}
 
 	@Override
-	public Collection<ItemStack> collect() {
-		Collection<ItemStack> products = produce;
-		produce = new ArrayList<>();
+	public NonNullList<ItemStack> collect(World world, IFarmHousing farmHousing) {
+		final NonNullList<ItemStack> products = this.produce;
+		this.produce = NonNullList.create();
 		return products;
 	}
 
 	@Override
-	public boolean cultivate(int x, int y, int z, FarmDirection direction, int extent) {
-		world = housing.getWorld();
-		return maintainSoil(x, y, z, direction, extent)
-			|| !isManual && maintainWater(x, y, z, direction, extent)
-			|| maintainCrops(x, y + 1, z, direction, extent);
+	public boolean cultivate(World world, IFarmHousing farmHousing, BlockPos pos, FarmDirection direction, int extent) {
+		return this.maintainSoil(world, pos, direction, extent, farmHousing) ||
+				(!this.isManual && this.maintainWater(world, pos, direction, extent, farmHousing)) ||
+				this.maintainCrops(world, pos.up(), direction, extent, farmHousing);
 	}
 
-	private boolean isWaste(ItemStack stack) {
-		return stack.getItem() == Item.getItemFromBlock(Blocks.dirt);
+	private boolean isWaste(final ItemStack stack) {
+		return stack.getItem() == Item.getItemFromBlock(Blocks.DIRT);
 	}
 
-	private boolean maintainSoil(int x, int y, int z, FarmDirection direction, int extent) {
+	private boolean maintainSoil(World world, BlockPos pos, FarmDirection direction, int extent, IFarmHousing housing) {
+		IGardeningManager gardening = BotanyCore.getGardening();
 		for (int i = 0; i < extent; ++i) {
-			Vect position = translateWithOffset(x, y, z, direction, i);
-			boolean isSoil = Gardening.isSoil(world.getBlock(position.x, position.y, position.z));
-			
-			// remove unnecessary blocks
-			if (!isManual && !isSoil && !isAirBlock(position)) {
-				Block block = world.getBlock(position.x, position.y, position.z);
-				if (moisture == EnumMoisture.DAMP) {
-					if (block != Blocks.water) {
-						dropBlockAsProduction(position);
-					}
-				} else if (moisture == EnumMoisture.DRY) {
-					if (block != Blocks.sand) {
-						dropBlockAsProduction(position);
-					}
-				} else {
-					dropBlockAsProduction(position);
-				}
-			}
-
-			if (fertilised && isSoil) {
-				IBlockSoil soil = (IBlockSoil) world.getBlock(position.x, position.y, position.z);
-				if (soil.fertilise(world, position.x, position.y, position.z, EnumSoilType.FLOWERBED)) {
+			BlockPos position = pos.offset(direction.getFacing(), i);
+			if (this.fertilised && gardening.isSoil(getBlock(world, position))) {
+				IBlockSoil soil = (IBlockSoil) getBlock(world, position);
+				if (soil.fertilise(world, position, EnumSoilType.FLOWERBED)) {
 					continue;
 				}
 			}
-
-			if (world.getBlock(position.x, position.y + 1, position.z) == Botany.plant) {
-				world.setBlockToAir(position.x, position.y + 1, position.z);
-				continue;
-			}
-
-			if (acidity != null && isSoil) {
-				IBlockSoil soil = (IBlockSoil) world.getBlock(position.x, position.y, position.z);
-				EnumAcidity pH = soil.getPH(world, position.x, position.y, position.z);
-				if (pH.ordinal() < acidity.ordinal()) {
-					ItemStack stack = getAvailableAlkaline();
-					if (stack != null && soil.setPH(world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() + 1])) {
-						housing.getFarmInventory().removeResources(new ItemStack[]{stack});
-						continue;
+			if (getBlock(world, position.up()) == Botany.plant) {
+				world.setBlockToAir(position.up());
+			} else {
+				if (this.acidity != null && gardening.isSoil(getBlock(world, position))) {
+					IBlockSoil soil = (IBlockSoil) getBlock(world, position);
+					EnumAcidity pH = soil.getPH(world, position);
+					if (pH.ordinal() < this.acidity.ordinal()) {
+						ItemStack stack = this.getAvailableAlkaline(housing);
+						if (!stack.isEmpty() && soil.setPH(world, position, EnumAcidity.values()[pH.ordinal() + 1])) {
+							NonNullList<ItemStack> resources = NonNullList.create();
+							resources.add(stack);
+							housing.getFarmInventory().removeResources(resources);
+							continue;
+						}
+					}
+					if (pH.ordinal() > this.acidity.ordinal()) {
+						final ItemStack stack = this.getAvailableAcid(housing);
+						if (!stack.isEmpty() && soil.setPH(world, position, EnumAcidity.values()[pH.ordinal() - 1])) {
+							NonNullList<ItemStack> resources = NonNullList.create();
+							resources.add(stack);
+							housing.getFarmInventory().removeResources(resources);
+							continue;
+						}
 					}
 				}
-
-				if (pH.ordinal() > acidity.ordinal()) {
-					ItemStack stack = getAvailableAcid();
-					if (stack != null && soil.setPH(world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() - 1])) {
-						housing.getFarmInventory().removeResources(new ItemStack[]{stack});
-						continue;
+				if (!this.isAirBlock(world, position) && !BlockUtil.isReplaceableBlock(getBlockState(world, position), world, position)) {
+					ItemStack block = this.getAsItemStack(world, position);
+					ItemStack loam = this.getAvailableLoam(housing);
+					if (this.isWaste(block) && !loam.isEmpty()) {
+						this.produce.addAll(Blocks.DIRT.getDrops(world, position, Block.getBlockFromItem(block.getItem()).getStateFromMeta(block.getItemDamage()), 0));
+						this.setBlock(world, position, Blocks.AIR, 0);
+						return trySetSoil(world, position, loam, housing);
 					}
-				}
-			}
-
-			if (!isAirBlock(position) && !world.getBlock(position.x, position.y, position.z).isReplaceable(world, position.x, position.y, position.z)) {
-				ItemStack block = getAsItemStack(position);
-				ItemStack loam = getAvailableLoam();
-				if (isWaste(block) && loam != null) {
-					produce.addAll(Blocks.dirt.getDrops(world, position.x, position.y, position.z, block.getItemDamage(), 0));
-					setBlock(position, Blocks.air, 0);
-					return trySetSoil(position, loam);
-				}
-			} else if (!isManual) {
-				if (!isWaterBlock(position)) {
-					if (i % 2 == 0) {
-						return trySetSoil(position);
-					}
-
-					FarmDirection cclock = FarmDirection.EAST;
-					if (direction == FarmDirection.EAST) {
-						cclock = FarmDirection.SOUTH;
-					} else if (direction == FarmDirection.SOUTH) {
-						cclock = FarmDirection.EAST;
-					} else if (direction == FarmDirection.WEST) {
-						cclock = FarmDirection.SOUTH;
-					}
-
-					Vect previous = translateWithOffset(position.x, position.y, position.z, cclock, 1);
-					ItemStack soil2 = getAsItemStack(previous);
-					if (!Gardening.isSoil(soil2.getItem())) {
-						trySetSoil(position);
+				} else if (!this.isManual) {
+					if (!this.isWaterBlock(world, position)) {
+						if (i % 2 == 0) {
+							return trySetSoil(world, position, housing);
+						}
+						FarmDirection cclock = FarmDirection.EAST;
+						if (direction == FarmDirection.EAST) {
+							cclock = FarmDirection.SOUTH;
+						} else if (direction == FarmDirection.SOUTH) {
+							cclock = FarmDirection.EAST;
+						} else if (direction == FarmDirection.WEST) {
+							cclock = FarmDirection.SOUTH;
+						}
+						BlockPos previous = position.offset(cclock.getFacing());
+						final ItemStack soil2 = this.getAsItemStack(world, previous);
+						if (!gardening.isSoil(soil2.getItem())) {
+							this.trySetSoil(world, position, housing);
+						}
 					}
 				}
 			}
@@ -176,140 +168,115 @@ public class GardenLogic extends FarmLogic {
 		return false;
 	}
 
-	private boolean maintainWater(int x, int y, int z, FarmDirection direction, int extent) {
+	private boolean maintainWater(World world, BlockPos pos, FarmDirection direction, int extent, IFarmHousing housing) {
 		for (int i = 0; i < extent; ++i) {
-			Vect position = translateWithOffset(x, y, z, direction, i);
-			if (!isAirBlock(position) && !world.getBlock(x, y, z).isReplaceable(world, position.x, position.y, position.z)) {
-				continue;
-			}
-
-			if (isWaterBlock(position)) {
-				continue;
-			}
-
-			boolean isEnclosed = true;
-			if (world.isAirBlock(position.x + 1, position.y, position.z)) {
-				isEnclosed = false;
-			} else if (world.isAirBlock(position.x - 1, position.y, position.z)) {
-				isEnclosed = false;
-			} else if (world.isAirBlock(position.x, position.y, position.z + 1)) {
-				isEnclosed = false;
-			} else if (world.isAirBlock(position.x, position.y, position.z - 1)) {
-				isEnclosed = false;
-			}
-
-			isEnclosed = (isEnclosed || moisture != EnumMoisture.DAMP);
-			if (isEnclosed) {
-				return trySetWater(position);
+			BlockPos position = pos.offset(direction.getFacing(), i);
+			if (this.isAirBlock(world, position) || BlockUtil.isReplaceableBlock(getBlockState(world, position), world, position)) {
+				if (!this.isWaterBlock(world, position)) {
+					boolean isEnclosed = true;
+					if (world.isAirBlock(position.east())) {
+						isEnclosed = false;
+					} else if (world.isAirBlock(position.west())) {
+						isEnclosed = false;
+					} else if (world.isAirBlock(position.south())) {
+						isEnclosed = false;
+					} else if (world.isAirBlock(position.north())) {
+						isEnclosed = false;
+					}
+					isEnclosed = (isEnclosed || this.moisture != EnumMoisture.DAMP);
+					if (isEnclosed) {
+						return this.trySetWater(world, position, housing);
+					}
+				}
 			}
 		}
 		return false;
 	}
 
-	private ItemStack getAvailableLoam() {
+	private ItemStack getAvailableLoam(IFarmHousing housing) {
 		EnumMoisture[] moistures;
-		if (moisture == EnumMoisture.DAMP) {
-			moistures = new EnumMoisture[]{
-				EnumMoisture.DAMP,
-				EnumMoisture.NORMAL,
-				EnumMoisture.DRY
-			};
-		} else if (moisture == EnumMoisture.DRY) {
-			moistures = new EnumMoisture[]{
-				EnumMoisture.DRY,
-				EnumMoisture.DAMP,
-				EnumMoisture.DRY
-			};
+		if (this.moisture == EnumMoisture.DAMP) {
+			moistures = new EnumMoisture[]{EnumMoisture.DAMP, EnumMoisture.NORMAL, EnumMoisture.DRY};
+		} else if (this.moisture == EnumMoisture.DRY) {
+			moistures = new EnumMoisture[]{EnumMoisture.DRY, EnumMoisture.DAMP, EnumMoisture.DRY};
 		} else {
-			moistures = new EnumMoisture[]{
-				EnumMoisture.DRY,
-				EnumMoisture.NORMAL,
-				EnumMoisture.DAMP
-			};
+			moistures = new EnumMoisture[]{EnumMoisture.DRY, EnumMoisture.NORMAL, EnumMoisture.DAMP};
 		}
-
-		EnumAcidity[] acidities = {
-			EnumAcidity.NEUTRAL,
-			EnumAcidity.ACID,
-			EnumAcidity.ALKALINE
-		};
-
-		for (EnumMoisture moist : moistures) {
-			for (EnumAcidity acid : acidities) {
-				for (Block type : new Block[]{Botany.flowerbed, Botany.loam, Botany.soil}) {
-					int meta = acid.ordinal() * 3 + moist.ordinal();
-					ItemStack[] resource = {new ItemStack(type, 1, meta)};
-					if (housing.getFarmInventory().hasResources(resource)) {
-						return resource[0];
+		final EnumAcidity[] acidities = {EnumAcidity.NEUTRAL, EnumAcidity.ACID, EnumAcidity.ALKALINE};
+		for (final EnumMoisture moist : moistures) {
+			for (final EnumAcidity acid : acidities) {
+				for (final Block type : new Block[]{Botany.flowerbed, Botany.loam, Botany.soil}) {
+					final int meta = acid.ordinal() * 3 + moist.ordinal();
+					final NonNullList<ItemStack> resources = NonNullList.create();
+					ItemStack resourceStack = new ItemStack(type, 1, meta);
+					resources.add(resourceStack);
+					if (housing.getFarmInventory().hasResources(resources)) {
+						return resourceStack;
 					}
 				}
 			}
 		}
-
-		if (housing.getFarmInventory().hasResources(new ItemStack[]{new ItemStack(Blocks.dirt)})) {
-			return new ItemStack(Blocks.dirt);
+		final NonNullList<ItemStack> resources = NonNullList.create();
+		ItemStack resourceStack = new ItemStack(Blocks.DIRT);
+		resources.add(resourceStack);
+		if (housing.getFarmInventory().hasResources(resources)) {
+			return new ItemStack(Blocks.DIRT);
 		}
-		return null;
+		return ItemStack.EMPTY;
 	}
 
-	private boolean trySetSoil(Vect position) {
-		return trySetSoil(position, getAvailableLoam());
+	private boolean trySetSoil(World world, BlockPos position, IFarmHousing housing) {
+		return this.trySetSoil(world, position, this.getAvailableLoam(housing), housing);
 	}
 
-	private boolean trySetSoil(Vect position, ItemStack loam) {
+	private boolean trySetSoil(World world, BlockPos position, ItemStack loam, IFarmHousing housing) {
 		ItemStack copy = loam;
-		if (loam == null) {
-			return false;
-		}
-
-		if (loam.getItem() == Item.getItemFromBlock(Blocks.dirt)) {
-			loam = new ItemStack(Botany.soil, 0, 4);
-		}
-
-		setBlock(position, ((ItemBlock) loam.getItem()).field_150939_a, loam.getItemDamage());
-		housing.getFarmInventory().removeResources(new ItemStack[]{copy});
-		return true;
-	}
-
-	private boolean trySetWater(Vect position) {
-		FluidStack water = Binnie.Liquid.getLiquidStack("water", 1000);
-		if (moisture == EnumMoisture.DAMP) {
-			if (!housing.hasLiquid(water)) {
-				return false;
+		if (!loam.isEmpty()) {
+			if (loam.getItem() == Item.getItemFromBlock(Blocks.DIRT)) {
+				loam = new ItemStack(Botany.soil, 1, 4);
 			}
-
-			setBlock(position, Blocks.water, 0);
-			housing.removeLiquid(water);
+			setBlock(world, position, ((ItemBlock) loam.getItem()).getBlock(), loam.getItemDamage());
+			final NonNullList<ItemStack> resources = NonNullList.create();
+			resources.add(copy);
+			housing.getFarmInventory().removeResources(resources);
 			return true;
 		}
-
-		if (moisture != EnumMoisture.DRY) {
-			return trySetSoil(position);
-		}
-
-		ItemStack[] sand = {new ItemStack(Blocks.sand, 1)};
-		if (!housing.getFarmInventory().hasResources(sand)) {
-			return false;
-		}
-
-		setBlock(position, Blocks.sand, 0);
-		housing.getFarmInventory().removeResources(sand);
-		return true;
+		return false;
 	}
 
-	private void dropBlockAsProduction(Vect position) {
-		ItemStack stack = new ItemStack(world.getBlock(position.x, position.y, position.z));
-		if (stack.getItem() == null) {
-			return;
+	private boolean trySetWater(World world, BlockPos position, IFarmHousing housing) {
+		final FluidStack water = Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 1000);
+		if (this.moisture == EnumMoisture.DAMP) {
+			if (water == null || !housing.hasLiquid(water)) {
+				return false;
+			}
+			this.setBlock(world, position, Blocks.WATER, 0);
+			housing.removeLiquid(water);
+			return true;
+		} else {
+			if (this.moisture != EnumMoisture.DRY) {
+				return trySetSoil(world, position, housing);
+			}
+			final ItemStack sand = new ItemStack(Blocks.SAND, 1);
+			final NonNullList<ItemStack> resources = NonNullList.create();
+			resources.add(sand);
+			if (!housing.getFarmInventory().hasResources(resources)) {
+				return false;
+			}
+			this.setBlock(world, position, Blocks.SAND, 0);
+			housing.getFarmInventory().removeResources(resources);
+			return true;
 		}
-		produce.add(stack);
-		world.setBlockToAir(position.x, position.y, position.z);
+	}
+
+	public void setIcon(final ItemStack icon) {
+		this.icon = icon;
 	}
 
 	@Override
-	public boolean isAcceptedGermling(ItemStack stack) {
-		for (IFarmable farmable : farmables) {
-			if (farmable.isGermling(stack)) {
+	public boolean isAcceptedGermling(final ItemStack itemstack) {
+		for (final IFarmable farmable : this.farmables) {
+			if (farmable.isGermling(itemstack)) {
 				return true;
 			}
 		}
@@ -317,91 +284,85 @@ public class GardenLogic extends FarmLogic {
 	}
 
 	@Override
-	public Collection<ICrop> harvest(int x, int y, int z, FarmDirection direction, int extent) {
-		return null;
+	public Collection<ICrop> harvest(World world, BlockPos pos, FarmDirection direction, int extent) {
+		if (isManual) {
+			return Collections.emptyList();
+		} else {
+			return farmables.stream().map(farmable -> farmable.getCropAt(world, pos.up(), world.getBlockState(pos.up())))
+					.filter(Objects::nonNull).collect(Collectors.toList());
+		}
 	}
 
 	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return icon.getIconIndex();
-	}
-
-	public void setIcon(ItemStack icon) {
-		this.icon = icon;
-	}
-
-	@Override
-	public ResourceLocation getSpriteSheet() {
-		return TextureMap.locationBlocksTexture;
+	public ResourceLocation getTextureMap() {
+		return TextureMap.LOCATION_BLOCKS_TEXTURE;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
-	protected boolean maintainCrops(int x, int y, int z, FarmDirection direction, int extent) {
+	@Override
+	public ItemStack getIconItemStack() {
+		return icon;
+	}
+
+	protected boolean maintainCrops(World world, BlockPos pos, FarmDirection direction, int extent, IFarmHousing housing) {
+		IGardeningManager gardening = BotanyCore.getGardening();
 		for (int i = 0; i < extent; ++i) {
-			Vect position = translateWithOffset(x, y, z, direction, i);
-			if (isAirBlock(position) || world.getBlock(x, y, z).isReplaceable(world, position.x, position.y, position.z)) {
-				ItemStack below = getAsItemStack(position.add(new Vect(0, -1, 0)));
-				if (Gardening.isSoil(below.getItem())) {
-					return trySetCrop(position);
+			BlockPos position = pos.offset(direction.getFacing(), i);
+			if (this.isAirBlock(world, position) || BlockUtil.isReplaceableBlock(getBlockState(world, position), world, position)) {
+				ItemStack below = this.getAsItemStack(world, position.down());
+				if (gardening.isSoil(below.getItem())) {
+					return trySetCrop(world, position, housing);
 				}
 			}
 		}
 		return false;
 	}
 
-	private boolean trySetCrop(Vect position) {
-		for (IFarmable farmable : farmables) {
-			boolean success = housing.plantGermling(farmable, world, position.x, position.y, position.z);
-			if (!success || !(housing instanceof IOwnable)) {
-				continue;
-			}
+	private boolean trySetCrop(World world, BlockPos position, IFarmHousing housing) {
+		for (IFarmable farmable : this.farmables) {
+			if (housing.plantGermling(farmable, world, position)) {
+				if (housing instanceof IOwnedTile) {
+					TileEntity tile = world.getTileEntity(position);
+					if (tile instanceof TileEntityFlower) {
+						TileEntityFlower flower = (TileEntityFlower) tile;
+						IOwnedTile owned = (IOwnedTile) housing;
 
-			TileEntity tile = housing.getWorld().getTileEntity(position.x, position.y, position.z);
-			if (!(tile instanceof TileEntityFlower)) {
+						flower.setOwner(owned.getOwnerHandler().getOwner());
+					}
+				}
 				return true;
 			}
-
-			try {
-				IOwnable housing2 = (IOwnable) housing;
-				GameProfile prof = (GameProfile) IOwnable.class.getMethod("getOwnerProfile", new Class[0]).invoke(housing2);
-				((TileEntityFlower) tile).setOwner(prof);
-			} catch (Exception ex) {
-				// ignored
-			}
-			return true;
 		}
 		return false;
 	}
 
-	public ItemStack getAvailableAcid() {
-		for (ItemStack stack : Gardening.getAcidFertilisers()) {
-			if (stack != null && stack.getItem() != null && housing.getFarmInventory().hasResources(new ItemStack[]{stack})) {
-				return stack;
+	public ItemStack getAvailableAcid(IFarmHousing housing) {
+		for (final ItemStack stack : BotanyCore.getGardening().getAcidFertilisers()) {
+			if (!stack.isEmpty()) {
+				final NonNullList<ItemStack> resources = NonNullList.create();
+				resources.add(stack);
+				if (housing.getFarmInventory().hasResources(resources)) {
+					return stack;
+				}
 			}
 		}
-		return null;
+		return ItemStack.EMPTY;
 	}
 
-	public ItemStack getAvailableAlkaline() {
-		for (ItemStack stack : Gardening.getAlkalineFertilisers()) {
-			if (stack != null && stack.getItem() != null && housing.getFarmInventory().hasResources(new ItemStack[]{stack})) {
-				return stack;
+	public ItemStack getAvailableAlkaline(IFarmHousing housing) {
+		for (final ItemStack stack : BotanyCore.getGardening().getAlkalineFertilisers()) {
+			if (!stack.isEmpty()) {
+				final NonNullList<ItemStack> resources = NonNullList.create();
+				resources.add(stack);
+				if (housing.getFarmInventory().hasResources(resources)) {
+					return stack;
+				}
 			}
 		}
-		return null;
-	}
-
-	public void setData(EnumMoisture moisture, EnumAcidity acidity, boolean isManual, boolean fertilised, ItemStack icon, String name) {
-		this.moisture = moisture;
-		this.acidity = acidity;
-		this.isManual = isManual;
-		this.fertilised = fertilised;
-		this.icon = icon;
-		this.name = name;
+		return ItemStack.EMPTY;
 	}
 }

src/main/java/binnie/botany/farm/package-info.java

@@ -0,0 +1,9 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+@FieldsAreNonnullByDefault
+package binnie.botany.farm;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import binnie.core.util.FieldsAreNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/main/java/binnie/botany/flower/BlockFlower.java

@@ -1,232 +1,313 @@
-package binnie.botany.flower;
-
-import binnie.botany.Botany;
-import binnie.botany.api.EnumFlowerStage;
-import binnie.botany.api.IFlower;
-import binnie.botany.api.IFlowerType;
-import binnie.botany.core.BotanyCore;
-import binnie.botany.gardening.Gardening;
-import binnie.botany.genetics.EnumFlowerType;
-import binnie.core.BinnieCore;
-import com.mojang.authlib.GameProfile;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-public class BlockFlower extends BlockContainer {
-	public BlockFlower() {
-		super(Material.plants);
-		float f = 0.2f;
-		setBlockBounds(0.5f - f, 0.0f, 0.5f - f, 0.5f + f, f * 3.0f, 0.5f + f);
-		setTickRandomly(true);
-		setBlockName("flower");
-		setStepSound(Block.soundTypeGrass);
-	}
-
-	@Override
-	public String getUnlocalizedName() {
-		return "botany.flower";
-	}
-
-	@Override
-	public int getRenderType() {
-		return RendererBotany.renderID;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister register) {
-		for (EnumFlowerType type : EnumFlowerType.values()) {
-			type.registerIcons(register);
-		}
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World world, int meta) {
-		return new TileEntityFlower();
-	}
-
-	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
-		return null;
-	}
-
-	@Override
-	public boolean isOpaqueCube() {
-		return false;
-	}
-
-	@Override
-	public boolean renderAsNormalBlock() {
-		return false;
-	}
-
-	@Override
-	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) {
-		super.onBlockPlacedBy(world, x, y, z, entity, stack);
-		TileEntity flower = world.getTileEntity(x, y, z);
-		if (!BinnieCore.proxy.isSimulating(world)) {
-			if (flower != null && flower instanceof TileEntityFlower) {
-				IFlower f = BotanyCore.getFlowerRoot().getMember(stack);
-				((TileEntityFlower) flower).setRender(new TileEntityFlower.RenderInfo(f, (TileEntityFlower) flower));
-			}
-			return;
-		}
-
-		TileEntity below = world.getTileEntity(x, y - 1, z);
-		if (flower != null && flower instanceof TileEntityFlower) {
-			if (below instanceof TileEntityFlower) {
-				((TileEntityFlower) flower).setSection(((TileEntityFlower) below).getSection());
-			} else {
-				GameProfile owner = (entity instanceof EntityPlayer) ? ((EntityPlayer) entity).getGameProfile() : null;
-				((TileEntityFlower) flower).create(stack, owner);
-			}
-		}
-		Gardening.tryGrowSection(world, x, y, z);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
-		TileEntity tile = world.getTileEntity(x, y, z);
-		if (!(tile instanceof TileEntityFlower)) {
-			return super.getIcon(world, x, y, z, side);
-		}
-
-		TileEntityFlower f = (TileEntityFlower) tile;
-		EnumFlowerStage stage = (f.getAge() == 0) ? EnumFlowerStage.SEED : EnumFlowerStage.FLOWER;
-		IFlowerType flower = f.getType();
-		int section = f.getRenderSection();
-		boolean flowered = f.isFlowered();
-		if (RendererBotany.pass == 0) {
-			return flower.getStem(stage, flowered, section);
-		}
-
-		return (RendererBotany.pass == 1) ?
-			flower.getPetalIcon(stage, flowered, section) :
-			flower.getVariantIcon(stage, flowered, section);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
-		TileEntity tile = world.getTileEntity(x, y, z);
-		if (tile instanceof TileEntityFlower) {
-			TileEntityFlower f = (TileEntityFlower) tile;
-			if (RendererBotany.pass == 0) {
-				return f.getStemColour();
-			}
-			return (RendererBotany.pass == 1) ?
-				f.getPrimaryColor() :
-				f.getSecondaryColor();
-		}
-		return 0xffffff;
-	}
-
-	@Override
-	public boolean canPlaceBlockAt(World world, int x, int y, int z) {
-		return super.canPlaceBlockAt(world, x, y, z)
-			&& canBlockStay(world, x, y, z);
-	}
-
-	protected boolean canPlaceBlockOn(Block block) {
-		return block == Blocks.grass
-			|| block == Blocks.dirt
-			|| block == Blocks.farmland
-			|| Gardening.isSoil(block);
-	}
-
-	@Override
-	public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
-		super.onNeighborBlockChange(world, x, y, z, block);
-		checkAndDropBlock(world, x, y, z);
-		TileEntity tile = world.getTileEntity(x, y, z);
-		if (!(tile instanceof TileEntityFlower)) {
-			return;
-		}
-
-		TileEntityFlower flower = (TileEntityFlower) tile;
-		if (flower.getSection() == 0
-			&& flower.getFlower() != null
-			&& flower.getFlower().getAge() > 0
-			&& flower.getFlower().getGenome().getPrimary().getType().getSections() > 1
-			&& world.getBlock(x, y + 1, z) != Botany.flower) {
-			dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
-			world.setBlockToAir(x, y, z);
-		}
-	}
-
-	@Override
-	public void updateTick(World world, int x, int y, int z, Random rand) {
-		TileEntity tile = world.getTileEntity(x, y, z);
-		if (tile instanceof TileEntityFlower) {
-			((TileEntityFlower) tile).randomUpdate(rand);
-			checkAndDropBlock(world, x, y, z);
-			return;
-		}
-		world.setBlockToAir(x, y, z);
-	}
-
-	protected void checkAndDropBlock(World world, int x, int y, int z) {
-		if (!canBlockStay(world, x, y, z)) {
-			dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
-			world.setBlockToAir(x, y, z);
-		}
-	}
-
-	@Override
-	public boolean canBlockStay(World world, int x, int y, int z) {
-		TileEntity tile = world.getTileEntity(x, y, z);
-		if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).getSection() > 0) {
-			return world.getBlock(x, y - 1, z) == Botany.flower;
-		}
-		return canPlaceBlockOn(world.getBlock(x, y - 1, z));
-	}
-
-	@Override
-	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int blockMeta, int fortune) {
-		ArrayList<ItemStack> drops = new ArrayList<>();
-		TileEntity tile = world.getTileEntity(x, y, z);
-		if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).getSection() == 0) {
-			ItemStack flower = ((TileEntityFlower) tile).getItemStack();
-			if (flower != null) {
-				drops.add(flower);
-			}
-		}
-		return drops;
-	}
-
-	@Override
-	public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
-		List<ItemStack> drops = getDrops(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
-		boolean hasBeenBroken = world.setBlockToAir(x, y, z);
-		if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) {
-			for (ItemStack drop : drops) {
-				dropBlockAsItem(world, x, y, z, drop);
-			}
-		}
-		return hasBeenBroken;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int meta, int side) {
-		return Blocks.yellow_flower.getIcon(0, 0);
-	}
-}
+package binnie.botany.flower;
+
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.SoundType;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockStateContainer;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockRenderLayer;
+import net.minecraft.util.EnumBlockRenderType;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+import com.mojang.authlib.GameProfile;
+
+import net.minecraftforge.client.model.ModelLoader;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.core.IStateMapperRegister;
+import forestry.core.blocks.IColoredBlock;
+
+import binnie.botany.Botany;
+import binnie.botany.api.IFlower;
+import binnie.botany.api.IFlowerGenome;
+import binnie.botany.api.IFlowerRoot;
+import binnie.botany.api.IFlowerType;
+import binnie.botany.core.BotanyCore;
+import binnie.botany.genetics.EnumFlowerType;
+import binnie.botany.genetics.FlowerDefinition;
+import binnie.botany.network.PacketID;
+import binnie.core.BinnieCore;
+import binnie.core.network.packet.MessageNBT;
+import binnie.core.util.TileUtil;
+
+public class BlockFlower extends BlockContainer implements IColoredBlock, IStateMapperRegister {
+	public static final AxisAlignedBB FLOWER_BLOCK_AABB = new AxisAlignedBB(0.3D, 0.0D, 0.3D, 0.7D, 0.6D, 0.7D);
+	/* PROPERTYS */
+	public static final PropertyFlower FLOWER = new PropertyFlower("flower", IFlowerType.class);
+	public static final PropertyInteger SECTION = PropertyInteger.create("section", 0, EnumFlowerType.highestSection - 1);
+	public static final PropertyBool FLOWERED = PropertyBool.create("flowered");
+	public static final PropertyBool SEED = PropertyBool.create("seed");
+
+	public BlockFlower() {
+		super(Material.PLANTS);
+		final float f = 0.2f;
+		this.setTickRandomly(true);
+		this.setRegistryName("flower");
+		this.setSoundType(SoundType.PLANT);
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(final World var1, final int i) {
+		return new TileEntityFlower();
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerStateMapper() {
+		ModelLoader.setCustomStateMapper(this, new StateMapperFlower());
+	}
+
+	@Override
+	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
+		ItemStack heldItem = player.getHeldItemMainhand();
+		if (!heldItem.isEmpty() && heldItem.getItem() == BinnieCore.getFieldKit() && player.isSneaking()) {
+			if (world.isRemote) {
+				return true;
+			}
+			TileEntity tile = world.getTileEntity(pos);
+			if (tile instanceof TileEntityFlower) {
+				TileEntityFlower tileFlower = (TileEntityFlower) tile;
+				IFlower flower = tileFlower.getFlower();
+				if (flower != null) {
+					IFlowerGenome flowerGenome = flower.getGenome();
+					NBTTagCompound info = new NBTTagCompound();
+					info.setString("Species", flowerGenome.getPrimary().getUID());
+					info.setString("Species2", flowerGenome.getSecondary().getUID());
+					info.setFloat("Age", flower.getAge() / flowerGenome.getLifespan());
+					info.setShort("Colour", (short) flowerGenome.getPrimaryColor().getID());
+					info.setShort("Colour2", (short) flowerGenome.getSecondaryColor().getID());
+					info.setBoolean("Wilting", flower.isWilted());
+					info.setBoolean("Flowered", flower.hasFlowered());
+					Botany.proxy.sendToPlayer(new MessageNBT(PacketID.FIELDKIT.ordinal(), info), player);
+					heldItem.damageItem(1, player);
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	@Nullable
+	public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
+		return null;
+	}
+
+	@Override
+	public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
+		TileEntity tile = source.getTileEntity(pos);
+		if (tile instanceof TileEntityFlower) {
+			TileEntityFlower flower = (TileEntityFlower) tile;
+			if (flower.getType().getSections() > 1) {
+				return FULL_BLOCK_AABB;
+			}
+		}
+		return FLOWER_BLOCK_AABB;
+	}
+
+	@Override
+	public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World world, BlockPos pos) {
+		TileEntity tile = world.getTileEntity(pos);
+		if (tile instanceof TileEntityFlower) {
+			TileEntityFlower flower = (TileEntityFlower) tile;
+			if (flower.getType().getSections() > 1) {
+				return FULL_BLOCK_AABB.offset(pos);
+			}
+		}
+		return FLOWER_BLOCK_AABB.offset(pos);
+	}
+
+	@Override
+	public boolean isOpaqueCube(IBlockState state) {
+		return false;
+	}
+
+	@Override
+	public boolean isFullCube(IBlockState state) {
+		return false;
+	}
+
+	@Override
+	public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {
+		super.onBlockPlacedBy(world, pos, state, placer, stack);
+		IFlowerRoot flowerRoot = BotanyCore.getFlowerRoot();
+		final TileEntity flower = world.getTileEntity(pos);
+		if (!BinnieCore.getBinnieProxy().isSimulating(world)) {
+			if (flower != null && flower instanceof TileEntityFlower) {
+				final IFlower f = flowerRoot.getMember(stack);
+				if (f != null) {
+					((TileEntityFlower) flower).setRender(new TileEntityFlower.RenderInfo(f, (TileEntityFlower) flower));
+				}
+			}
+			return;
+		}
+		final TileEntity below = world.getTileEntity(pos.down());
+		if (flower != null && flower instanceof TileEntityFlower) {
+			if (below instanceof TileEntityFlower) {
+				((TileEntityFlower) flower).setSection(((TileEntityFlower) below).getSection());
+			} else {
+				final GameProfile owner = (placer instanceof EntityPlayer) ? ((EntityPlayer) placer).getGameProfile() : null;
+				((TileEntityFlower) flower).create(stack, owner);
+			}
+		}
+		flowerRoot.tryGrowSection(world, pos);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public int colorMultiplier(IBlockState state, @Nullable IBlockAccess world, @Nullable BlockPos pos, int tintIndex) {
+		if (world != null && pos != null) {
+			TileEntity tile = world.getTileEntity(pos);
+			if (tile instanceof TileEntityFlower) {
+				TileEntityFlower flower = (TileEntityFlower) tile;
+				if (tintIndex == 0) {
+					return flower.getStemColour();
+				} else if (tintIndex == 1) {
+					return flower.getPrimaryColour();
+				} else {
+					return flower.getSecondaryColour();
+				}
+			}
+		}
+		return 0xffffff;
+	}
+
+	@Override
+	public boolean canPlaceBlockAt(World world, BlockPos pos) {
+		return super.canPlaceBlockAt(world, pos) && canBlockStay(world, pos);
+	}
+
+	public boolean canBlockStay(World world, BlockPos pos) {
+		TileEntity tile = world.getTileEntity(pos);
+		IBlockState downState = world.getBlockState(pos.down());
+		if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).getSection() > 0) {
+			return downState.getBlock() == Botany.flower;
+		}
+		return this.canPlaceBlockOn(downState.getBlock());
+	}
+
+	protected boolean canPlaceBlockOn(final Block block) {
+		return block == Blocks.GRASS || block == Blocks.DIRT || block == Blocks.FARMLAND || BotanyCore.getGardening().isSoil(block);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public EnumBlockRenderType getRenderType(IBlockState state) {
+		return EnumBlockRenderType.MODEL;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public EnumOffsetType getOffsetType() {
+		return EnumOffsetType.XZ;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) {
+		TileEntityFlower flower = TileUtil.getTile(world, pos, TileEntityFlower.class);
+		if (flower != null && flower.getType() != null) {
+			state = state.withProperty(FLOWER, flower.getType());
+			state = state.withProperty(FLOWERED, flower.isFlowered());
+			state = state.withProperty(SECTION, flower.getRenderSection());
+			state = state.withProperty(SEED, flower.getAge() == 0);
+		} else {
+			state = state.withProperty(FLOWER, FlowerDefinition.Dandelion.getSpecies().getType());
+			state = state.withProperty(FLOWERED, false);
+			state = state.withProperty(SEED, false);
+		}
+		return state;
+	}
+
+	@Override
+	protected BlockStateContainer createBlockState() {
+		return new BlockStateContainer(this, FLOWER, FLOWERED, SECTION, SEED);
+	}
+
+	@Override
+	public int getMetaFromState(IBlockState state) {
+		return 0;
+	}
+
+	@Override
+	public BlockRenderLayer getBlockLayer() {
+		return BlockRenderLayer.CUTOUT;
+	}
+
+	@Override
+	public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) {
+		this.checkAndDropBlock(worldIn, pos);
+		final TileEntity tile = worldIn.getTileEntity(pos);
+		if (tile instanceof TileEntityFlower) {
+			final TileEntityFlower flower = (TileEntityFlower) tile;
+			if (flower.getSection() == 0 && flower.getFlower() != null && flower.getFlower().getAge() > 0 && flower.getFlower().getGenome().getPrimary().getType().getSections() > 1 && worldIn.getBlockState(pos.up()).getBlock() != Botany.flower) {
+				this.dropBlockAsItem(worldIn, pos, worldIn.getBlockState(pos), 0);
+				worldIn.setBlockToAir(pos);
+			}
+		}
+	}
+
+	@Override
+	public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) {
+		final TileEntity tile = world.getTileEntity(pos);
+		if (tile instanceof TileEntityFlower) {
+			((TileEntityFlower) tile).randomUpdate(rand);
+			this.checkAndDropBlock(world, pos);
+			return;
+		}
+		world.setBlockToAir(pos);
+	}
+
+	protected void checkAndDropBlock(final World world, final BlockPos pos) {
+		if (!this.canBlockStay(world, pos)) {
+			this.dropBlockAsItem(world, pos, world.getBlockState(pos), 0);
+			world.setBlockToAir(pos);
+		}
+	}
+
+	@Override
+	public NonNullList<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
+		NonNullList<ItemStack> drops = NonNullList.create();
+		TileEntity tile = world.getTileEntity(pos);
+		if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).getSection() == 0) {
+			ItemStack flower = ((TileEntityFlower) tile).getItemStack();
+			if (!flower.isEmpty()) {
+				drops.add(flower);
+			}
+		}
+		return drops;
+	}
+
+	@Override
+	public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) {
+		final List<ItemStack> drops = this.getDrops(world, pos, world.getBlockState(pos), 0);
+		final boolean hasBeenBroken = world.setBlockToAir(pos);
+		if (hasBeenBroken && BinnieCore.getBinnieProxy().isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) {
+			for (final ItemStack drop : drops) {
+				spawnAsEntity(world, pos, drop);
+			}
+		}
+		return hasBeenBroken;
+	}
+}

src/main/java/binnie/botany/flower/EnumTubeInsulate.java

@@ -0,0 +1,59 @@
+package binnie.botany.flower;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+
+enum EnumTubeInsulate {
+	Clay(0xa1aacc, "Clay"),
+	Cobble(0x7b7b7b, "Cobblestone"),
+	Sand(0xefeab5, "Sand"),
+	HardenedClay(0x935c43, "Hardened Clay"),
+	Stone(0x6d6d6d, "Smooth Stone"),
+	Sandstone(0xc1b989, "Sandstone");
+
+	int color;
+	String name;
+
+	EnumTubeInsulate(final int color, final String name) {
+		this.color = color;
+		this.name = name;
+	}
+
+	public static EnumTubeInsulate get(final int i) {
+		return values()[i / 128 % values().length];
+	}
+
+	public int getColor() {
+		return this.color;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public ItemStack getStack() {
+		switch (this) {
+			case Clay: {
+				return new ItemStack(Blocks.CLAY);
+			}
+			case Cobble: {
+				return new ItemStack(Blocks.COBBLESTONE);
+			}
+			case HardenedClay: {
+				return new ItemStack(Blocks.HARDENED_CLAY);
+			}
+			case Sand: {
+				return new ItemStack(Blocks.SAND);
+			}
+			case Sandstone: {
+				return new ItemStack(Blocks.SANDSTONE);
+			}
+			case Stone: {
+				return new ItemStack(Blocks.STONE);
+			}
+			default: {
+				throw new IllegalStateException("Unknown insulated tube type: " + this);
+			}
+		}
+	}
+}

src/main/java/binnie/botany/flower/EnumTubeMaterial.java

@@ -0,0 +1,28 @@
+package binnie.botany.flower;
+
+enum EnumTubeMaterial {
+	Copper(0xe3b78e, "Copper"),
+	Tin(0xe1eef4, "Tin"),
+	Bronze(0xddc276, "Bronze"),
+	Iron(0xd8d8d8, "Iron");
+
+	int color;
+	String name;
+
+	EnumTubeMaterial(final int color, final String name) {
+		this.color = color;
+		this.name = name;
+	}
+
+	public static EnumTubeMaterial get(final int i) {
+		return values()[i % values().length];
+	}
+
+	public int getColor() {
+		return this.color;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+}

src/main/java/binnie/botany/flower/FlowerSpriteManager.java

@@ -0,0 +1,96 @@
+package binnie.botany.flower;
+
+import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import binnie.Binnie;
+import binnie.botany.Botany;
+import binnie.botany.api.IFlowerType;
+import binnie.core.resource.BinnieSprite;
+
+public class FlowerSpriteManager {
+	private static final Map<IFlowerType, FlowerSprites> flowerSprites = new HashMap<>();
+
+	public static void initSprites(IFlowerType type) {
+		if (flowerSprites.containsKey(type)) {
+			return;
+		}
+		flowerSprites.put(type, new FlowerSprites(type));
+	}
+
+	@Nullable
+	@SideOnly(Side.CLIENT)
+	public static TextureAtlasSprite getStem(IFlowerType type, int section, boolean flowered) {
+		FlowerSprites flower = flowerSprites.get(type);
+		if (flower == null) {
+			return null;
+		}
+		return flower.getStem(type, section, flowered);
+	}
+
+	@Nullable
+	@SideOnly(Side.CLIENT)
+	public static TextureAtlasSprite getPetal(IFlowerType type, int section, boolean flowered) {
+		FlowerSprites flower = flowerSprites.get(type);
+		if (flower == null) {
+			return null;
+		}
+		return flower.getPetal(type, section, flowered);
+	}
+
+	@Nullable
+	@SideOnly(Side.CLIENT)
+	public static TextureAtlasSprite getVariant(IFlowerType type, int section, boolean flowered) {
+		FlowerSprites flower = flowerSprites.get(type);
+		if (flower == null) {
+			return null;
+		}
+		return flower.getVariant(type, section, flowered);
+	}
+
+	private static class FlowerSprites {
+		private BinnieSprite[] stem;
+		private BinnieSprite[] variant;
+		private BinnieSprite[] petal;
+		private BinnieSprite[] unflowered;
+		private int sections;
+
+		public FlowerSprites(IFlowerType type) {
+			this.sections = type.getSections();
+			this.stem = new BinnieSprite[sections];
+			this.petal = new BinnieSprite[sections];
+			this.variant = new BinnieSprite[sections];
+			this.unflowered = new BinnieSprite[sections];
+			for (int section = 0; section < sections; ++section) {
+				final String suf = (section == 0) ? "" : ("" + (section + 1));
+				final String pre = (sections == 1) ? "" : "double/";
+				this.stem[section] = Binnie.RESOURCE.getBlockSprite(Botany.instance, "flowers/" + pre + type.toString().toLowerCase() + suf + ".0");
+				this.petal[section] = Binnie.RESOURCE.getBlockSprite(Botany.instance, "flowers/" + pre + type.toString().toLowerCase() + suf + ".1");
+				this.variant[section] = Binnie.RESOURCE.getBlockSprite(Botany.instance, "flowers/" + pre + type.toString().toLowerCase() + suf + ".2");
+				this.unflowered[section] = Binnie.RESOURCE.getBlockSprite(Botany.instance, "flowers/" + pre + type.toString().toLowerCase() + suf + ".3");
+			}
+		}
+
+		@SideOnly(Side.CLIENT)
+		public TextureAtlasSprite getStem(IFlowerType type, int section, boolean flowered) {
+			return stem[section % sections].getSprite();
+		}
+
+		@SideOnly(Side.CLIENT)
+		public TextureAtlasSprite getPetal(IFlowerType type, int section, boolean flowered) {
+			return (flowered ? petal[section % this.sections] : this.unflowered[section % this.sections]).getSprite();
+		}
+
+		@Nullable
+		@SideOnly(Side.CLIENT)
+		public TextureAtlasSprite getVariant(IFlowerType type, int section, boolean flowered) {
+			return flowered ? variant[section % this.sections].getSprite() : null;
+		}
+	}
+}

src/main/java/binnie/botany/flower/ItemBotany.java

@@ -1,48 +1,66 @@
 package binnie.botany.flower;
 
+import com.google.common.base.Preconditions;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.ItemMeshDefinition;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.SoundCategory;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.world.World;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.core.IItemModelRegister;
+import forestry.api.core.IModelManager;
+import forestry.api.genetics.IIndividual;
+import forestry.api.genetics.IPollinatable;
+import forestry.core.config.Config;
+import forestry.core.items.IColoredItem;
+
 import binnie.Binnie;
 import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
+import binnie.botany.api.EnumFlowerChromosome;
 import binnie.botany.api.EnumFlowerStage;
+import binnie.botany.api.IAlleleFlowerSpecies;
 import binnie.botany.api.IFlower;
-import binnie.botany.api.IFlowerColor;
 import binnie.botany.api.IFlowerGenome;
 import binnie.botany.api.IFlowerType;
 import binnie.botany.core.BotanyCore;
-import binnie.botany.genetics.EnumFlowerType;
 import binnie.botany.genetics.Flower;
-import binnie.core.BinnieCore;
 import binnie.core.util.I18N;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.genetics.IIndividual;
-import forestry.api.genetics.IPollinatable;
-import forestry.core.config.Config;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
 
-import java.util.List;
+public class ItemBotany extends Item implements IColoredItem, IItemModelRegister {
+	private EnumFlowerStage type;
+	private String tag;
 
-public abstract class ItemBotany extends Item {
-	public ItemBotany(String name) {
-		setCreativeTab(CreativeTabBotany.instance);
-		setUnlocalizedName(name);
-		hasSubtypes = true;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getSpriteNumber() {
-		return 0;
+	public ItemBotany(final String name, EnumFlowerStage type, String tag) {
+		this.setCreativeTab(CreativeTabBotany.instance);
+		this.setUnlocalizedName(name);
+		setRegistryName(name);
+		this.hasSubtypes = true;
+		this.type = type;
+		this.tag = tag;
 	}
 
 	@Override
@@ -61,229 +79,176 @@ public abstract class ItemBotany extends Item {
 	}
 
 	@Override
-	public boolean hasEffect(ItemStack stack, int pass) {
-		if (!stack.hasTagCompound()) {
+	public boolean hasEffect(final ItemStack itemstack) {
+		if (!itemstack.hasTagCompound()) {
 			return false;
 		}
-
-		IIndividual individual = getIndividual(stack);
-		return individual != null
-			&& individual.getGenome() != null
-			&& individual.hasEffect();
-	}
-
-	@Override
-	public void addInformation(ItemStack itemstack, EntityPlayer player, List tooltip, boolean flag) {
-		if (!itemstack.hasTagCompound()) {
-			return;
-		}
-		IFlower individual = (IFlower) getIndividual(itemstack);
-		if (individual == null) {
-			tooltip.add(I18N.localise("botany.item.tooltip.bugged"));
-			return;
-		}
-
-		IFlowerGenome genome = individual.getGenome();
-		IFlowerColor primaryColor = genome.getPrimaryColor();
-		IFlowerColor secondColor = genome.getSecondaryColor();
-		IFlowerColor stemColor = genome.getStemColor();
-
-		if (primaryColor == secondColor) {
-			tooltip.add(EnumChatFormatting.YELLOW + I18N.localise("botany.item.tooltip.flowerColor1", primaryColor.getName(), stemColor.getName()));
-		} else {
-			tooltip.add(EnumChatFormatting.YELLOW + I18N.localise("botany.item.tooltip.flowerColor2", primaryColor.getName(), secondColor.getName(), stemColor.getName()));
-		}
-
-		if (individual.isAnalyzed()) {
-			if (BinnieCore.proxy.isShiftDown()) {
-				individual.addTooltip(tooltip);
-			} else {
-				tooltip.add(EnumChatFormatting.GRAY + I18N.localise("botany.item.tooltip.holdMore"));
-			}
-		} else {
-			tooltip.add(I18N.localise("botany.item.tooltip.unknownGenome"));
-		}
+		final IIndividual individual = this.getIndividual(itemstack);
+		return individual != null && individual.hasEffect();
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-	}
-
-	protected IIndividual getIndividual(ItemStack itemstack) {
-		return new Flower(itemstack.getTagCompound());
-	}
-
-	@Override
-	public String getItemStackDisplayName(ItemStack itemstack) {
-		if (!itemstack.hasTagCompound()) {
-			return I18N.localise("botany.item.tooltip.unknown");
+	public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List<String> list, final boolean flag) {
+		if (!itemStack.hasTagCompound()) {
+			return;
 		}
+		IFlower individual = (IFlower) this.getIndividual(itemStack);
+		if (individual == null) {
+			list.add(TextFormatting.DARK_RED + I18N.localise("botany.flower.destroy"));
+			return;
+		}
+		IFlowerGenome genome = individual.getGenome();
+		//Colors
+		String primaryColor = genome.getPrimaryColor().getColourName();
+		String secondaryColor = genome.getSecondaryColor().getColourName();
+		String stemColor = genome.getStemColor().getColourName();
+		String colorInfo;
+		if (!primaryColor.equals(secondaryColor)) {
+			colorInfo = I18N.localise("botany.grammar.flower.secondary");
+		} else {
+			colorInfo = I18N.localise("botany.grammar.flower");
+		}
+		list.add(TextFormatting.YELLOW + colorInfo.replaceAll("%PRIMARY", primaryColor).replaceAll("%SECONDARY", secondaryColor).replaceAll("%STEM", stemColor));
 
-		IIndividual individual = getIndividual(itemstack);
-		if (individual != null && individual.getGenome() != null) {
-			String tag = getTag();
-			if (tag == null || tag.isEmpty()) {
-				return individual.getDisplayName();
+		if (individual.isAnalyzed()) {
+			if (GuiScreen.isShiftKeyDown()) {
+				individual.addTooltip(list);
+			} else {
+				list.add(TextFormatting.ITALIC + "<" + I18N.localise("for.gui.tooltip.tmi") + ">");
 			}
-			return I18N.localise("botany.item.botany.name", individual.getDisplayName(), tag);
+		} else {
+			list.add("<" + I18N.localise("for.gui.unknown") + ">");
 		}
-		return I18N.localise("botany.item.flowerCorrupted.name");
+	}
+
+	@Nullable
+	protected IIndividual getIndividual(final ItemStack itemstack) {
+		NBTTagCompound tagCompound = itemstack.getTagCompound();
+		if (tagCompound == null) {
+			return null;
+		}
+		return new Flower(tagCompound);
+	}
+
+	private IAlleleFlowerSpecies getPrimarySpecies(final ItemStack itemstack) {
+		final IFlower tree = BotanyCore.getFlowerRoot().getMember(itemstack);
+		if (tree == null) {
+			return (IAlleleFlowerSpecies) BotanyCore.getFlowerRoot().getDefaultTemplate()[EnumFlowerChromosome.SPECIES.ordinal()];
+		}
+		return tree.getGenome().getPrimary();
 	}
 
 	@Override
-	public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
-		addCreativeItems(itemList, true);
+	public String getItemStackDisplayName(final ItemStack itemstack) {
+		if (!itemstack.hasTagCompound()) {
+			return I18N.localise("item.botany.flower.corrupted.name");
+		}
+		IIndividual individual = this.getIndividual(itemstack);
+		if (individual != null) {
+			return individual.getDisplayName() + (!tag.isEmpty() ? " " + I18N.localise("item.botany." + tag + ".name") : "");
+		}
+		return I18N.localise("item.botany.flower.corrupted.name");
 	}
 
-	public void addCreativeItems(List itemList, boolean hideSecrets) {
-		for (IIndividual individual : BotanyCore.speciesRoot.getIndividualTemplates()) {
+	@Override
+	public void getSubItems(final Item item, final CreativeTabs tab, final NonNullList<ItemStack> itemList) {
+		this.addCreativeItems(itemList, true);
+	}
+
+	public void addCreativeItems(final NonNullList<ItemStack> itemList, final boolean hideSecrets) {
+		for (final IIndividual individual : BotanyCore.getFlowerRoot().getIndividualTemplates()) {
 			if (hideSecrets && individual.isSecret() && !Config.isDebug) {
 				continue;
 			}
-			itemList.add(BotanyCore.speciesRoot.getMemberStack(individual.copy(), getStage().ordinal()));
+			itemList.add(BotanyCore.getFlowerRoot().getMemberStack(individual.copy(), type));
 		}
 	}
 
 	@Override
-	public int getColorFromItemStack(ItemStack itemstack, int renderPass) {
-		IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
-		if (flower == null || flower.getGenome() == null) {
-			return 0xffffff;
+	public int getColorFromItemstack(ItemStack stack, int tintIndex) {
+		IFlower flower = BotanyCore.getFlowerRoot().getMember(stack);
+		if (flower == null) {
+			return 16777215;
 		}
-
-		if (renderPass == 0) {
-			return flower.getGenome().getStemColor().getColor(flower.isWilted());
-		}
-		return (renderPass == 1) ?
-			flower.getGenome().getPrimaryColor().getColor(flower.isWilted()) :
-			flower.getGenome().getSecondaryColor().getColor(flower.isWilted());
-	}
-
-	@Override
-	public boolean requiresMultipleRenderPasses() {
-		return true;
-	}
-
-	@Override
-	public int getRenderPasses(int metadata) {
-		return 3;
+		return (tintIndex == 0) ? flower.getGenome().getStemColor().getColor(flower.isWilted()) : ((tintIndex == 1) ? flower.getGenome().getPrimaryColor().getColor(flower.isWilted()) : flower.getGenome().getSecondaryColor().getColor(flower.isWilted()));
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(ItemStack itemstack, int renderPass) {
-		IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
-		if (flower == null || flower.getGenome() == null || flower.getGenome().getPrimary() == null) {
-			return EnumFlowerType.ALLIUM.getBlank();
+	public void registerModel(Item item, IModelManager manager) {
+		for (IFlowerType flowerType : (List<IFlowerType>) BlockFlower.FLOWER.getAllowedValues()) {
+			flowerType.registerModels(item, manager, type);
 		}
-
-		IFlowerType type = flower.getGenome().getPrimary().getType();
-		if (renderPass == 0) {
-			return type.getStem(getStage(), flower.hasFlowered(), type.getSections() - 1);
-		}
-		if (renderPass == 1) {
-			return type.getPetalIcon(getStage(), flower.hasFlowered(), type.getSections() - 1);
-		}
-		return type.getVariantIcon(getStage(), flower.hasFlowered(), type.getSections() - 1);
+		manager.registerItemModel(item, new BotanyMeshDefinition());
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float px, float py, float pz) {
-		if (getStage() == EnumFlowerStage.POLLEN) {
-			IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(itemstack);
-			TileEntity target = world.getTileEntity(x, y, z);
+	public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
+		ItemStack stack = player.getHeldItem(hand);
+		if (type == EnumFlowerStage.POLLEN) {
+			final IFlower flower = Binnie.GENETICS.getFlowerRoot().getMember(stack);
+			final TileEntity target = world.getTileEntity(pos);
 			if (!(target instanceof IPollinatable)) {
-				return false;
+				return EnumActionResult.PASS;
 			}
-			IPollinatable pollinatable = (IPollinatable) target;
+			final IPollinatable pollinatable = (IPollinatable) target;
 			if (!pollinatable.canMateWith(flower)) {
-				return false;
+				return EnumActionResult.FAIL;
 			}
 			pollinatable.mateWith(flower);
 			if (!player.capabilities.isCreativeMode) {
-				itemstack.stackSize--;
+				stack.shrink(1);
 			}
-			return true;
-		}
+			return EnumActionResult.SUCCESS;
+		} else {
+			IBlockState iblockstate = world.getBlockState(pos);
+			Block block = iblockstate.getBlock();
 
-		Block blockFlower = Botany.flower;
-		Block blockAlreadyThere = world.getBlock(x, y, z);
-		if (blockAlreadyThere == Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 0x7) < 1) {
-			side = 1;
-		} else if (blockAlreadyThere != Blocks.vine && blockAlreadyThere != Blocks.tallgrass && blockAlreadyThere != Blocks.deadbush && !blockAlreadyThere.isReplaceable(world, x, y, z)) {
-			if (side == 0) {
-				y--;
-			} else if (side == 1) {
-				y++;
-			} else if (side == 2) {
-				z--;
-			} else if (side == 3) {
-				z++;
-			} else if (side == 4) {
-				x--;
-			} else if (side == 5) {
-				x++;
+			if (!block.isReplaceable(world, pos)) {
+				pos = pos.offset(facing);
+			}
+
+			if (stack.getCount() != 0 && player.canPlayerEdit(pos, facing, stack) && world.mayPlace(Botany.flower, pos, false, facing, null)) {
+				int i = this.getMetadata(stack.getMetadata());
+				IBlockState iblockstate1 = Botany.flower.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, i, player, hand);
+
+				if (placeBlockAt(stack, player, world, pos, facing, hitX, hitY, hitZ, iblockstate1)) {
+					SoundType soundtype = world.getBlockState(pos).getBlock().getSoundType(world.getBlockState(pos), world, pos, player);
+					world.playSound(player, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F);
+					stack.shrink(1);
+				}
+
+				return EnumActionResult.SUCCESS;
+			} else {
+				return EnumActionResult.FAIL;
 			}
 		}
-
-		if (itemstack.stackSize == 0 || !player.canPlayerEdit(x, y, z, side, itemstack)) {
-			return false;
-		}
-		if (y == 255 && blockFlower.getMaterial().isSolid()) {
-			return false;
-		}
-
-		if (world.canPlaceEntityOnSide(blockFlower, x, y, z, false, side, player, itemstack)) {
-			int i1 = getMetadata(itemstack.getItemDamage());
-			int j1 = blockFlower.onBlockPlaced(world, x, y, z, side, px, py, pz, i1);
-			if (placeBlockAt(itemstack, player, world, x, y, z, side, px, py, pz, j1)) {
-				world.playSoundEffect(x + 0.5f, y + 0.5f, z + 0.5f, blockFlower.stepSound.func_150496_b(), (blockFlower.stepSound.getVolume() + 1.0f) / 2.0f, blockFlower.stepSound.getPitch() * 0.8f);
-				itemstack.stackSize--;
-			}
-			return true;
-		}
-		return false;
 	}
 
-	@SideOnly(Side.CLIENT)
-	public boolean func_150936_a(World world, int x, int y, int z, int side, EntityPlayer player, ItemStack stack) {
-		Block field_150939_a = Botany.flower;
-		Block block = world.getBlock(x, y, z);
-		if (block == Blocks.snow_layer) {
-			side = 1;
-		} else if (block != Blocks.vine && block != Blocks.tallgrass && block != Blocks.deadbush && !block.isReplaceable(world, x, y, z)) {
-			if (side == 0) {
-				y--;
-			} else if (side == 1) {
-				y++;
-			} else if (side == 2) {
-				z--;
-			} else if (side == 3) {
-				z++;
-			} else if (side == 4) {
-				x--;
-			} else if (side == 5) {
-				x++;
-			}
-		}
-		return world.canPlaceEntityOnSide(field_150939_a, x, y, z, false, side, null, stack);
-	}
-
-	public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) {
-		Block block = Botany.flower;
-		if (!world.setBlock(x, y, z, block, metadata, 3)) {
+	public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) {
+		if (!world.setBlockState(pos, newState, 3)) {
 			return false;
 		}
 
-		if (world.getBlock(x, y, z) == block) {
-			block.onBlockPlacedBy(world, x, y, z, player, stack);
-			block.onPostBlockPlaced(world, x, y, z, metadata);
+		IBlockState state = world.getBlockState(pos);
+		if (state.getBlock() == Botany.flower) {
+			ItemBlock.setTileEntityNBT(world, player, pos, stack);
+			Botany.flower.onBlockPlacedBy(world, pos, state, player, stack);
 		}
+
 		return true;
 	}
 
-	public abstract EnumFlowerStage getStage();
-
-	public abstract String getTag();
+	@SideOnly(Side.CLIENT)
+	private class BotanyMeshDefinition implements ItemMeshDefinition {
+		@Override
+		public ModelResourceLocation getModelLocation(ItemStack stack) {
+			IFlower flower = BotanyCore.getFlowerRoot().getMember(stack);
+			Preconditions.checkNotNull(flower);
+			IAlleleFlowerSpecies flowerSpecies = flower.getGenome().getPrimary();
+			IFlowerType flowerType = flowerSpecies.getType();
+			return flowerSpecies.getFlowerModel(type, flower.hasFlowered());
+		}
+	}
 }

src/main/java/binnie/botany/flower/ItemFlower.java

@@ -1,19 +0,0 @@
-package binnie.botany.flower;
-
-import binnie.botany.api.EnumFlowerStage;
-
-public class ItemFlower extends ItemBotany {
-	public ItemFlower() {
-		super("itemFlower");
-	}
-
-	@Override
-	public EnumFlowerStage getStage() {
-		return EnumFlowerStage.FLOWER;
-	}
-
-	@Override
-	public String getTag() {
-		return "";
-	}
-}

src/main/java/binnie/botany/flower/ItemInsulatedTube.java

@@ -1,167 +1,116 @@
 package binnie.botany.flower;
 
-import binnie.botany.Botany;
-import binnie.botany.CreativeTabBotany;
-import binnie.core.util.I18N;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
 
+import java.util.Collection;
 import java.util.List;
 
-public class ItemInsulatedTube extends Item {
-	IIcon[] icons;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.text.TextFormatting;
 
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.circuits.ChipsetManager;
+import forestry.api.circuits.ICircuit;
+import forestry.api.circuits.ICircuitLayout;
+import forestry.api.core.IModelManager;
+import forestry.core.circuits.SolderManager;
+import forestry.core.items.IColoredItem;
+import forestry.core.utils.Translator;
+
+import binnie.botany.CreativeTabBotany;
+import binnie.core.item.ItemCore;
+
+public class ItemInsulatedTube extends ItemCore implements IColoredItem {
 	public ItemInsulatedTube() {
-		icons = new IIcon[3];
-		setUnlocalizedName("insulatedTube");
+		super("insulated_tube");
+		setUnlocalizedName("insulated_tube");
 		setCreativeTab(CreativeTabBotany.instance);
 		setHasSubtypes(true);
 	}
 
+	private static Multimap<ICircuitLayout, ICircuit> getCircuits(ItemStack itemStack) {
+		Multimap<ICircuitLayout, ICircuit> circuits = ArrayListMultimap.create();
+		Collection<ICircuitLayout> allLayouts = ChipsetManager.circuitRegistry.getRegisteredLayouts().values();
+		for (ICircuitLayout circuitLayout : allLayouts) {
+			ICircuit circuit = SolderManager.getCircuit(circuitLayout, itemStack);
+			if (circuit != null) {
+				circuits.put(circuitLayout, circuit);
+			}
+		}
+		return circuits;
+	}
+
+	public static String getInsulate(ItemStack stack) {
+		return EnumTubeInsulate.get(stack.getItemDamage()).getName();
+	}
+
 	public static ItemStack getInsulateStack(ItemStack stack) {
-		return Insulate.get(stack.getItemDamage()).getStack();
+		return EnumTubeInsulate.get(stack.getItemDamage()).getStack();
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void getSubItems(Item item, CreativeTabs tab, List list) {
-		for (Material mat : Material.values()) {
-			for (Insulate ins : Insulate.values()) {
-				list.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128));
+	public void getSubItems(Item item, CreativeTabs tab, NonNullList<ItemStack> subItems) {
+		for (EnumTubeMaterial mat : EnumTubeMaterial.values()) {
+			for (EnumTubeInsulate ins : EnumTubeInsulate.values()) {
+				subItems.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128));
+			}
+		}
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void registerModel(Item item, IModelManager manager) {
+		for (EnumTubeMaterial mat : EnumTubeMaterial.values()) {
+			for (EnumTubeInsulate ins : EnumTubeInsulate.values()) {
+				manager.registerItemModel(item, mat.ordinal() + ins.ordinal() * 128);
 			}
 		}
 	}
 
 	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister register) {
-		for (int i = 0; i < 3; ++i) {
-			icons[i] = Botany.proxy.getIcon(register, "insulatedTube." + i);
-		}
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getColorFromItemStack(ItemStack stack, int pass) {
-		if (pass == 0) {
+	public int getColorFromItemstack(ItemStack stack, int tintIndex) {
+		if (tintIndex == 0) {
 			return 0xffffff;
+		} else if (tintIndex == 1) {
+			return EnumTubeMaterial.get(stack.getItemDamage()).getColor();
 		}
-		return (pass == 1)
-			? Material.get(stack.getItemDamage()).getColor()
-			: Insulate.get(stack.getItemDamage()).getColor();
+		return EnumTubeInsulate.get(stack.getItemDamage()).getColor();
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
-		super.addInformation(stack, player, tooltip, advanced);
-		tooltip.add(Insulate.get(stack.getItemDamage()).getName());
-	}
-
-	@Override
-	public String getItemStackDisplayName(ItemStack stack) {
-		return Material.get(stack.getItemDamage()).getName() + " "
-			+ I18N.localise("botany.tube.name");
-	}
-
-	@Override
-	public int getRenderPasses(int metadata) {
-		return 3;
-	}
-
-	@Override
-	public IIcon getIcon(ItemStack stack, int pass) {
-		return icons[pass % 3];
-	}
-
-	@Override
-	public boolean requiresMultipleRenderPasses() {
-		return true;
-	}
-
-	enum Material {
-		Copper(0xe3b78e, "cooper"),
-		Tin(0xe1eef4, "tin"),
-		Bronze(0xddc276, "bronze"),
-		Iron(0xd8d8d8, "iron");
-
-		protected int color;
-		protected String name;
-
-		Material(int color, String name) {
-			this.color = color;
-			this.name = name;
-		}
-
-		public static Material get(int i) {
-			return values()[i % values().length];
-		}
-
-		public int getColor() {
-			return color;
-		}
-
-		public String getName() {
-			return I18N.localise("botany.tube." + name);
-		}
-	}
-
-	enum Insulate {
-		Clay(0xa1aacc, "clay"),
-		Cobble(0x7b7b7b, "cobblestone"),
-		Sand(0xefeab5, "sand"),
-		HardenedClay(0x935c43, "hardenedClay"),
-		Stone(0x6d6d6d, "smoothStone"),
-		Sandstone(0xc1b989, "sandstone");
-
-		protected int color;
-		protected String name;
-
-		Insulate(int color, String name) {
-			this.color = color;
-			this.name = name;
-		}
-
-		public static Insulate get(int i) {
-			return values()[i / 128 % values().length];
-		}
-
-		public int getColor() {
-			return color;
-		}
-
-		public String getName() {
-			return I18N.localise("botany.tube.insulate." + name);
-		}
-
-		public ItemStack getStack() {
-			switch (this) {
-				case Clay:
-					return new ItemStack(Blocks.clay);
-
-				case Cobble:
-					return new ItemStack(Blocks.cobblestone);
-
-				case HardenedClay:
-					return new ItemStack(Blocks.hardened_clay);
-
-				case Sand:
-					return new ItemStack(Blocks.sand);
-
-				case Sandstone:
-					return new ItemStack(Blocks.sandstone);
-
-				case Stone:
-					return new ItemStack(Blocks.stone);
+	public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> list, boolean flag) {
+		super.addInformation(itemstack, player, list, flag);
+		Multimap<ICircuitLayout, ICircuit> circuits = getCircuits(itemstack);
+		if (!circuits.isEmpty()) {
+			if (GuiScreen.isShiftKeyDown()) {
+				for (ICircuitLayout circuitLayout : circuits.keys()) {
+					String circuitLayoutName = circuitLayout.getUsage();
+					list.add(TextFormatting.WHITE.toString() + TextFormatting.UNDERLINE + circuitLayoutName);
+					for (ICircuit circuit : circuits.get(circuitLayout)) {
+						circuit.addTooltip(list);
+					}
+				}
+			} else {
+				list.add(TextFormatting.ITALIC + "<" + Translator.translateToLocal("for.gui.tooltip.tmi") + ">");
 			}
-			return null;
+		} else {
+			list.add("<" + Translator.translateToLocal("for.gui.noeffect") + ">");
 		}
 	}
+
+	@Override
+	public String getItemStackDisplayName(ItemStack itemStack) {
+		int meta = itemStack.getMetadata();
+		return EnumTubeMaterial.get(meta).getName() + " " + EnumTubeInsulate.get(meta).getName() + " " + super.getItemStackDisplayName(itemStack);
+	}
 }

src/main/java/binnie/botany/flower/ItemPollen.java

@@ -1,20 +0,0 @@
-package binnie.botany.flower;
-
-import binnie.botany.api.EnumFlowerStage;
-import binnie.core.util.I18N;
-
-public class ItemPollen extends ItemBotany {
-	public ItemPollen() {
-		super("pollen");
-	}
-
-	@Override
-	public EnumFlowerStage getStage() {
-		return EnumFlowerStage.POLLEN;
-	}
-
-	@Override
-	public String getTag() {
-		return I18N.localise("botany.item.pollen.tag.name");
-	}
-}

src/main/java/binnie/botany/flower/ItemSeed.java

@@ -1,20 +0,0 @@
-package binnie.botany.flower;
-
-import binnie.botany.api.EnumFlowerStage;
-import binnie.core.util.I18N;
-
-public class ItemSeed extends ItemBotany {
-	public ItemSeed() {
-		super("seed");
-	}
-
-	@Override
-	public EnumFlowerStage getStage() {
-		return EnumFlowerStage.SEED;
-	}
-
-	@Override
-	public String getTag() {
-		return I18N.localise("botany.item.germling.tag.name");
-	}
-}

src/main/java/binnie/botany/flower/PropertyFlower.java

@@ -0,0 +1,53 @@
+package binnie.botany.flower;
+
+import com.google.common.base.Optional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import net.minecraft.block.properties.PropertyHelper;
+
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IAllele;
+
+import binnie.botany.api.IAlleleFlowerSpecies;
+import binnie.botany.api.IFlowerType;
+
+public class PropertyFlower<I extends IFlowerType<I>> extends PropertyHelper<I> {
+	public PropertyFlower(String name, Class<I> flowerTypeClass) {
+		super(name, flowerTypeClass);
+	}
+
+	@Override
+	public List<I> getAllowedValues() {
+		List<I> flowerTypes = new ArrayList<>();
+		for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
+			if (allele instanceof IAlleleFlowerSpecies) {
+				IFlowerType flowerType = ((IAlleleFlowerSpecies) allele).getType();
+				if (!flowerTypes.contains(flowerType)) {
+					flowerTypes.add((I) flowerType);
+				}
+			}
+		}
+		return flowerTypes;
+	}
+
+	/**
+	 * Get the name for the given value.
+	 */
+	@Override
+	public String getName(IFlowerType value) {
+		return value.getName().toLowerCase(Locale.ENGLISH);
+	}
+
+	@Override
+	public Optional<I> parseValue(String value) {
+		IAllele allele = AlleleManager.alleleRegistry.getAllele(value);
+		if (IAlleleFlowerSpecies.class.isInstance(allele)) {
+			IAlleleFlowerSpecies alleleValue = IAlleleFlowerSpecies.class.cast(allele);
+			return Optional.of((I) alleleValue.getType());
+		}
+		return Optional.absent();
+	}
+}

src/main/java/binnie/botany/flower/RendererBotany.java

@@ -1,60 +0,0 @@
-package binnie.botany.flower;
-
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.EntityRenderer;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-
-public class RendererBotany implements ISimpleBlockRenderingHandler {
-	public static int renderID;
-	public static int pass;
-
-	@Override
-	public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {
-		// ignored
-	}
-
-	@Override
-	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
-		Tessellator tessellator = Tessellator.instance;
-		tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z));
-		double d1 = x;
-		double d2 = y;
-		double d3 = z;
-		long i1 = x * 3129871 ^ z * 116129781L;
-		i1 = i1 * i1 * 42317861L + i1 * 11L;
-		d1 += ((i1 >> 16 & 0xFL) / 15.0f - 0.5) * 0.3;
-		d3 += ((i1 >> 24 & 0xFL) / 15.0f - 0.5) * 0.3;
-
-		for (int j = 0; j < 3; ++j) {
-			RendererBotany.pass = j;
-			int l = block.colorMultiplier(renderer.blockAccess, x, y, z);
-			float f = (l >> 16 & 0xFF) / 255.0f;
-			float f2 = (l >> 8 & 0xFF) / 255.0f;
-			float f3 = (l & 0xFF) / 255.0f;
-
-			if (EntityRenderer.anaglyphEnable) {
-				f = (f * 30.0f + f2 * 59.0f + f3 * 11.0f) / 100.0f;
-				f2 = (f * 30.0f + f2 * 70.0f) / 100.0f;
-				f3 = (f * 30.0f + f3 * 70.0f) / 100.0f;
-			}
-			tessellator.setColorOpaque_F(f, f2, f3);
-			IIcon iicon = block.getIcon(world, x, y, z, 0);
-			renderer.drawCrossedSquares(iicon, d1, d2, d3, 1.0f);
-		}
-		return false;
-	}
-
-	@Override
-	public boolean shouldRender3DInInventory(int i) {
-		return false;
-	}
-
-	@Override
-	public int getRenderId() {
-		return RendererBotany.renderID;
-	}
-}

src/main/java/binnie/botany/flower/StateMapperFlower.java

@@ -0,0 +1,39 @@
+package binnie.botany.flower;
+
+import com.google.common.collect.Maps;
+
+import java.util.Map;
+
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.block.statemap.StateMapperBase;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import binnie.Constants;
+import binnie.botany.api.IFlowerType;
+
+@SideOnly(Side.CLIENT)
+public class StateMapperFlower extends StateMapperBase {
+	@Override
+	protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
+		final Map<IProperty<?>, Comparable<?>> properties = Maps.newLinkedHashMap(state.getProperties());
+		IFlowerType flowerType = (IFlowerType) state.getValue(BlockFlower.FLOWER);
+		if (flowerType.getSections() < 2) {
+			properties.remove(BlockFlower.SECTION);
+		} else if (flowerType.getSections() <= state.getValue(BlockFlower.SECTION)) {
+			properties.put(BlockFlower.SECTION, flowerType.getSections() - 1);
+		}
+		if (state.getValue(BlockFlower.SEED)) {
+			properties.remove(BlockFlower.SECTION);
+			properties.remove(BlockFlower.FLOWER);
+			properties.remove(BlockFlower.FLOWERED);
+		} else {
+			properties.remove(BlockFlower.SEED);
+		}
+
+		return new ModelResourceLocation(Constants.BOTANY_MOD_ID + ":flower", getPropertyString(properties));
+	}
+}

src/main/java/binnie/botany/flower/package-info.java

@@ -0,0 +1,9 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+@FieldsAreNonnullByDefault
+package binnie.botany.flower;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import binnie.core.util.FieldsAreNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;