fix

Co-authored-by: Caedis <[email protected]>

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Ignore spotlessApply reformat
+91bf137a94d1207f943929e0881750a1b8c4f3bf

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

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-RUNDIR="run"
-CRASH="crash-reports"
-SERVERLOG="server.log"
-
-if [[ -d $RUNDIR/$CRASH ]]; then
-  echo "Crash reports detected:"
-  cat $RUNDIR/$CRASH/crash*.txt
-  exit 1
-fi
-
-if grep --quiet "Fatal errors were detected" $SERVERLOG; then
-  echo "Fatal errors detected:"
-  cat server.log
-  exit 1
-fi
-
-if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" $SERVERLOG; then
-  echo "Server force stopped:"
-  cat server.log
-  exit 1
-fi
-
-if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then
-  echo "Server didn't finish startup:"
-  cat server.log
-  exit 1
-fi
-
-echo "No crash reports detected"
-exit 0
-

.github/workflows/optimize-images.yml

@@ -0,0 +1,17 @@
+name: Optimize images
+
+on:
+  pull_request:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+  push:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+jobs:
+  optimize-images:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
+    secrets: inherit

.gitignore

@@ -26,7 +26,13 @@ whitelist.json
 *.iml
 *.ipr
 *.iws
-src/main/resources/mixins.*.json
+src/main/resources/mixins.*([!.]).json
 *.bat
 *.DS_Store
 !gradlew.bat
+.factorypath
+addon.local.gradle
+addon.local.gradle.kts
+addon.late.local.gradle
+addon.late.local.gradle.kts
+layout.json

dependencies.gradle

@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-	implementation('com.github.GTNewHorizons:GTNHLib:0.0.10:dev')
-	compile('com.github.GTNewHorizons:ForestryMC:4.5.6:dev')
-	compile('com.github.GTNewHorizons:NotEnoughItems:2.3.21-GTNH:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.11.11:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.9.44:dev')
 
-	compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.28:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.78-GTNH:dev')
 
-	compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
-	compileOnly('curse.maven:cofh-lib-220333:2388748')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.57:api')
+    compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
+    compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

gradle.properties

@@ -1,65 +1,135 @@
+# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable.
+# LOCAL to test local config updates.
+gtnh.settings.blowdryerTag = 0.2.0
+
+# Human-readable mod name, available for mcmod.info population.
 modName = Binnie Core
 
-# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
+# Conventionally lowercase.
 modId = BinnieCore
 
+# Root package of the mod, used to find various classes in other properties,
+# mcmod.info substitution, enabling assertions in run tasks, etc.
 modGroup = binnie
 
-# WHY is there no version field?
-# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
-# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
+# Whether to use modGroup as the maven publishing group.
+# When false, com.github.GTNewHorizons is used.
+useModGroupForPublishing = false
 
-# Will update your build.gradle automatically whenever an update is available
+# Updates your build.gradle and settings.gradle automatically whenever an update is available.
 autoUpdateBuildScript = false
 
+# Version of Minecraft to target
 minecraftVersion = 1.7.10
+
+# Version of Minecraft Forge to target
 forgeVersion = 10.13.4.1614
 
-# Specify a MCP channel and mappings version for dependency deobfuscation and the deobfParams task.
+# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
 channel = stable
+
+# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
 mappingsVersion = 12
 
-# Define other MCP mappings for dependency deobfuscation
-remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
+# Defines other MCP mappings for dependency deobfuscation.
+remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
 
-# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
-# restart Minecraft in development. Choose this dependent on your mod:
-# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
-# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
+# Select a default username for testing your mod. You can always override this per-run by running
+# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer
 
-# Define a source file of your project with:
+# Enables modern Java syntax support. Valid values:
+# - false: No modern syntax, Java 8 only
+# - jabel: Jabel syntax-only support, compiles to J8 bytecode
+# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
+# - modern: Native modern Java bytecode, no downgrading
+enableModernJavaSyntax = jabel
+
+# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
+# and should *not* be used in most situations. -1 disables this.
+# forceToolchainVersion = -1
+
+# Target JVM version for JVM Downgrader bytecode downgrading.
+# Only used when enableModernJavaSyntax = jvmDowngrader
+# downgradeTargetVersion = 8
+
+# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
+# Classes will be available in META-INF/versions/N/ for each version N in this list.
+# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
+# jvmDowngraderMultiReleaseVersions = 21,25
+
+# Specifies how JVM Downgrader API stubs are provided. Options:
+# - shade: Shade minimized stubs into the jar
+# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
+# - external: Another dependency provides stubs (no constraint, no warning)
+# - (empty): Warning reminding you to configure stubs
+# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
+# jvmDowngraderStubsProvider =
+
+# Enables injecting missing generics into the decompiled source code for a better coding experience.
+# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
+enableGenericInjection = true
+
+# Generate a class with a String field for the mod version named as defined below.
+# If generateGradleTokenClass is empty or not missing, no such class will be generated.
+# If gradleTokenVersion is empty or missing, the field will not be present in the class.
+generateGradleTokenClass = binnie.core.Tags
+
+# Name of the token containing the project's current version to generate/replace.
+gradleTokenVersion = VERSION
+
+# [DEPRECATED] Mod ID replacement token.
+gradleTokenModId =
+
+# [DEPRECATED] Mod name replacement token.
+gradleTokenModName =
+
+# [DEPRECATED] Mod Group replacement token.
+gradleTokenGroupName =
+
+# [DEPRECATED]
+# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
 # public static final String VERSION = "GRADLETOKEN_VERSION";
 # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
-# version in @Mod([...], version = VERSION, [...])
-# Leave these properties empty to skip individual token replacements
-replaceGradleTokenInFile = BinnieCore.java
-gradleTokenModId =
-gradleTokenModName =
-gradleTokenVersion = GRADLETOKEN_VERSION
-gradleTokenGroupName =
+# version in @Mod([...], version = VERSION, [...]).
+# Leave these properties empty to skip individual token replacements.
+replaceGradleTokenInFile =
 
 # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
 # leave this property empty.
-# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
+# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api
 apiPackage =
 
 # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
-# Example value: mymodid_at.cfg
+# There can be multiple files in a space-separated list.
+# Example value: mymodid_at.cfg nei_at.cfg
 accessTransformersFile =
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
-# Adds some debug arguments like verbose output and export
+
+# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
+# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
+# Mixin classes will have access to "main" classes, but not the other way around.
+separateMixinSourceSet =
+
+# Adds some debug arguments like verbose output and class export.
 usesMixinDebug = false
+
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage =
+
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
 # This parameter is for legacy compatibility only
-# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
+# Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin
 coreModClass =
+
 # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
 # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
 containsMixinsAndOrCoreModOnly = false
@@ -67,15 +137,38 @@ containsMixinsAndOrCoreModOnly = false
 # Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
 forceEnableMixins = false
 
-# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated in your jar. It is your
-# responsibility check the licence and request permission for distribution, if required.
+# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your
+# responsibility to check the license and request permission for distribution if required.
 usesShadowedDependencies = false
 
+# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access
+# their own classes, making the minimization unreliable.
+minimizeShadowedDependencies = true
 
-# Publishing to modrinth requires you to set the MODRINTH_TOKEN environment variable to your current modrinth API token.
+# If disabled, won't rename the shadowed classes.
+relocateShadowedDependencies = true
 
+# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+includeWellKnownRepositories = true
+
+# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
+# list of strings, with the acceptable keys being(case does not matter):
+# cursemaven
+# modrinth
+excludeWellKnownRepositories =
+
+# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
+# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
+# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
+usesMavenPublishing = true
+
+# Maven repository to publish the mod to.
+# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
+
+# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
+#
 # The project's ID on Modrinth. Can be either the slug or the ID.
-# Leave this empty if you don't want to publish on Modrinth.
+# Leave this empty if you don't want to publish to Modrinth.
 modrinthProjectId =
 
 # The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
@@ -84,12 +177,11 @@ modrinthProjectId =
 #       type can be one of [project, version],
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
 modrinthRelations =
 
-
 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
-
+#
 # The project's numeric ID on CurseForge. You can find this in the About Project box.
 # Leave this empty if you don't want to publish on CurseForge.
 curseForgeProjectId =
@@ -99,18 +191,45 @@ curseForgeProjectId =
 # Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
 #       and the name is the CurseForge project slug of the other mod.
 # Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
 curseForgeRelations =
 
-
-# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
+# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
 # projects. New projects should not use this parameter.
 customArchiveBaseName = binnie-mods
 
-# Optional parameter to prevent the source code from being published
-# noPublishedSources =
+# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
+# runClientWorkingDirectory = run/client
 
-# Uncomment this to disable spotless checks
+# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
+# runServerWorkingDirectory = run/server
+
+# Optional parameter to have the build automatically fail if an illegal version is used.
+# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
+# The check is ONLY performed if the version is a git tag.
+# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+
+# versionPattern =
+
+# Uncomment to prevent the source code from being published.
+# noPublishedSources = true
+
+# Uncomment this to disable Spotless checks.
 # This should only be uncommented to keep it easier to sync with upstream/other forks.
 # That is, if there is no other active fork/upstream, NEVER change this.
-# disableSpotless = true
+# disableSpotless = true
+
+# Uncomment this to disable Checkstyle checks (currently wildcard import check).
+# disableCheckstyle = true
+
+# Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
+# (force use delegated build).
+# This is meant to be set in $HOME/.gradle/gradle.properties.
+# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be native build.
+# WARNING: If you do use this option, it will overwrite whatever you have in your existing projects. This might not be what you want!
+# Usually there is no need to uncomment this here as other developers do not necessarily use the same build type as you.
+# ideaOverrideBuildType = idea
+
+# Whether IDEA should run spotless checks when pressing the Build button.
+# This is meant to be set in $HOME/.gradle/gradle.properties.
+# ideaCheckSpotlessOnBuild = true
+

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d4fd992c9557644e637ebe98263e0ae7/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/59a9771cad43219260d9aac9a8ec4d6a/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a4c09dd2e2d7079373d30e524bbc2829/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
+toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,80 +15,114 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,92 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# 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"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
 
-# 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")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,10 +27,14 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
-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.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -51,48 +57,35 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
-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.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 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%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 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
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

repositories.gradle

@@ -1,26 +1,4 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
-	maven {
-		name 'GTNH Maven'
-		url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
-		allowInsecureProtocol
-	}
-	maven {
-		name 'ic2'
-		url 'http://maven.ic2.player.to/'
-		metadataSources {
-			mavenPom()
-			artifact()
-		}
-	}
-	maven {
-		url 'https://cursemaven.com'
-		content {
-			includeGroup 'curse.maven'
-		}
-	}
-	maven {
-		url 'https://jitpack.io'
-	}
 }

settings.gradle

@@ -1,10 +1,21 @@
+
+pluginManagement {
+    repositories {
+        maven {
+            // RetroFuturaGradle
+            name "GTNH Maven"
+            url "https://nexus.gtnewhorizons.com/repository/public/"
+            mavenContent {
+                includeGroup("com.gtnewhorizons")
+                includeGroupByRegex("com\\.gtnewhorizons\\..+")
+            }
+        }
+        gradlePluginPortal()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+
 plugins {
-    id 'com.diffplug.blowdryerSetup' version '1.6.0'
-}
-
-apply plugin: 'com.diffplug.blowdryerSetup'
-
-blowdryerSetup {
-    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.5')
-    //devLocal '.' // Use this when testing config updates locally
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24'
 }

src/main/java/binnie/Binnie.java

@@ -1,21 +1,19 @@
 package binnie;
 
-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;
 
+import binnie.core.ManagerBase;
+import binnie.core.genetics.ManagerGenetics;
+import binnie.core.liquid.ManagerLiquid;
+import binnie.core.machines.ManagerMachine;
+import binnie.core.resource.ManagerResource;
+
 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();
 }

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

@@ -1,5 +1,16 @@
 package binnie.botany;
 
+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.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.BonemealEvent;
+import net.minecraftforge.event.entity.player.PlayerInteractEvent;
+import net.minecraftforge.event.world.BlockEvent;
+
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumSoilType;
 import binnie.botany.api.IFlower;
@@ -29,6 +40,7 @@ import binnie.botany.network.PacketID;
 import binnie.botany.proxy.Proxy;
 import binnie.core.AbstractMod;
 import binnie.core.BinnieCore;
+import binnie.core.Tags;
 import binnie.core.gui.IBinnieGUID;
 import binnie.core.item.ItemMisc;
 import binnie.core.network.BinniePacketHandler;
@@ -42,58 +54,51 @@ 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",
-        version = BinnieCore.VERSION,
-        useMetadata = true,
-        dependencies = "after:BinnieCore")
+@Mod(modid = "Botany", name = "Botany", version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore")
 public class Botany extends AbstractMod {
+
     @Mod.Instance("Botany")
     public static Botany instance;
 
     @SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer")
     public static Proxy proxy;
 
+    // Genetics module
     public static BlockFlower flower;
-    public static Item seed;
+
+    public static ItemFlower flowerItem;
     public static Item pollen;
+    public static Item seed;
     public static ItemDictionary database;
+
+    // Gardening module
     public static BlockPlant plant;
-    public static ItemTrowel trowelWood;
-    public static ItemTrowel trowelStone;
-    public static ItemTrowel trowelIron;
-    public static ItemTrowel trowelDiamond;
-    public static ItemTrowel trowelGold;
     public static BlockSoil soil;
     public static BlockSoil loam;
     public static BlockSoil flowerbed;
     public static BlockSoil soilNoWeed;
     public static BlockSoil loamNoWeed;
     public static BlockSoil flowerbedNoWeed;
-    public static ItemInsulatedTube insulatedTube;
+    public static BlockCeramic ceramic;
+    public static BlockStained stained;
+    public static BlockCeramicPatterned ceramicTile;
+    public static BlockCeramicBrick ceramicBrick;
+
     public static ItemSoilMeter soilMeter;
+    public static ItemInsulatedTube insulatedTube;
+    public static ItemTrowel trowelWood;
+    public static ItemTrowel trowelStone;
+    public static ItemTrowel trowelIron;
+    public static ItemTrowel trowelDiamond;
+    public static ItemTrowel trowelGold;
     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 BlockCeramicBrick ceramicBrick;
 
     public Botany() {
         Botany.instance = this;
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Mod.EventHandler
@@ -119,11 +124,6 @@ public class Botany extends AbstractMod {
         return BotanyGUI.values();
     }
 
-    @Override
-    public Class<?>[] getConfigs() {
-        return new Class[0];
-    }
-
     @Override
     public IPacketID[] getPacketIDs() {
         return PacketID.values();
@@ -149,122 +149,6 @@ public class Botany extends AbstractMod {
         return PacketHandler.class;
     }
 
-    @SubscribeEvent
-    public void onShearFlower(PlayerInteractEvent event) {
-        if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
-            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);
-            }
-        }
-
-        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--;
-                    }
-                }
-            }
-        }
-    }
-
-    @SubscribeEvent
-    public void onFertiliseSoil(PlayerInteractEvent event) {
-        if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK || event.world == null) {
-            return;
-        }
-
-        if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == 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);
-        }
-        if (block == null || !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--;
-                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--;
-                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--;
-                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--;
-        }
-    }
-
-    @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)) {
-            return;
-        }
-
-        IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.itemInHand);
-        if (flower != null) {
-            Gardening.plant(world, x, y, z, flower, event.player.getGameProfile());
-        }
-    }
-
     @Deprecated
     public void onPlantVanilla(PlayerInteractEvent event) {
         if (!BinnieCore.proxy.isSimulating(event.world)
@@ -291,35 +175,13 @@ public class Botany extends AbstractMod {
         }
 
         IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.entityPlayer.getHeldItem());
-        if (flower != null
-                && Gardening.plant(world, x, y + py, z, flower, event.entityPlayer.getGameProfile())
+        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--;
         }
     }
 
-    @SubscribeEvent
-    public void onBonemeal(BonemealEvent event) {
-        Block block = event.world.getBlock(event.x, event.y, event.z);
-        if (Gardening.isSoil(block)) {
-            IBlockSoil soil = (IBlockSoil) block;
-            if (soil.fertilise(event.world, event.x, event.y, event.z, EnumSoilType.LOAM)) {
-                event.setResult(Event.Result.ALLOW);
-            }
-        }
-
-        TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
-        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()) {
@@ -345,8 +207,143 @@ public class Botany extends AbstractMod {
     }
 
     public static class PacketHandler extends BinniePacketHandler {
+
         public PacketHandler() {
             super(Botany.instance);
         }
     }
+
+    public static class EventHandler {
+
+        @SubscribeEvent
+        public void onShearFlower(PlayerInteractEvent event) {
+            if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
+                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 tileFlower) {
+                    tileFlower.onShear();
+                    event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
+                }
+            }
+
+            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 tileFlower) {
+                    IFlower pollen = BotanyCore.getFlowerRoot().getMember(event.entityPlayer.getHeldItem());
+                    if (pollen != null && tileFlower.canMateWith(pollen)) {
+                        tileFlower.mateWith(pollen);
+                        if (!event.entityPlayer.capabilities.isCreativeMode) {
+                            ItemStack heldItem = event.entityPlayer.getHeldItem();
+                            heldItem.stackSize--;
+                        }
+                    }
+                }
+            }
+        }
+
+        @SubscribeEvent
+        public void onFertiliseSoil(PlayerInteractEvent event) {
+            if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK || event.world == null) {
+                return;
+            }
+
+            if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == null) {
+                return;
+            }
+
+            int y = event.y;
+            Block block = event.world.getBlock(event.x, y, event.z);
+            if (!Gardening.isSoil(block)) {
+                block = event.world.getBlock(event.x, --y, event.z);
+            }
+            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--;
+                    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--;
+                    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--;
+                    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--;
+            }
+        }
+
+        @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)) {
+                return;
+            }
+
+            IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.itemInHand);
+            if (flower != null) {
+                Gardening.plant(world, x, y, z, flower, event.player.getGameProfile());
+            }
+        }
+
+        @SubscribeEvent
+        public void onBonemeal(BonemealEvent event) {
+            Block block = event.world.getBlock(event.x, event.y, event.z);
+            if (Gardening.isSoil(block)) {
+                IBlockSoil soil = (IBlockSoil) block;
+                if (soil.fertilise(event.world, event.x, event.y, event.z, EnumSoilType.LOAM)) {
+                    event.setResult(Event.Result.ALLOW);
+                }
+            }
+
+            TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
+            if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).onBonemeal()) {
+                event.setResult(Event.Result.ALLOW);
+            }
+        }
+    }
 }

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

@@ -1,14 +1,16 @@
 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 binnie.core.util.I18N;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class CreativeTabBotany extends CreativeTabs {
+
     public static CreativeTabs instance = new CreativeTabBotany();
 
     public CreativeTabBotany() {

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

@@ -1,10 +1,16 @@
 package binnie.botany.api;
 
 public enum EnumAcidity {
+
     ACID,
     NEUTRAL,
     ALKALINE;
 
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final EnumAcidity[] VALUES = values();
+
     public String getID() {
         return name().toLowerCase();
     }

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

@@ -10,6 +10,7 @@ import forestry.api.genetics.IChromosomeType;
 import forestry.api.genetics.ISpeciesRoot;
 
 public enum EnumFlowerChromosome implements IChromosomeType {
+
     SPECIES(IAlleleFlowerSpecies.class),
     PRIMARY(IAlleleInteger.class),
     SECONDARY(IAlleleInteger.class),
@@ -23,7 +24,11 @@ public enum EnumFlowerChromosome implements IChromosomeType {
     SAPPINESS(IAlleleFloat.class),
     STEM(IAlleleInteger.class);
 
-    private Class<? extends IAllele> cls;
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final EnumFlowerChromosome[] VALUES = values();
+    private final Class<? extends IAllele> cls;
 
     EnumFlowerChromosome(Class<? extends IAllele> cls) {
         this.cls = cls;

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

@@ -1,12 +1,13 @@
 package binnie.botany.api;
 
 public enum EnumFlowerStage {
+
     FLOWER("Flower"),
     SEED("Seed"),
     POLLEN("Pollen"),
     NONE("NONE");
 
-    protected String name;
+    private final String name;
 
     EnumFlowerStage(String name) {
         this.name = name;

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

@@ -1,10 +1,16 @@
 package binnie.botany.api;
 
 public enum EnumMoisture {
+
     DRY,
     NORMAL,
     DAMP;
 
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final EnumMoisture[] VALUES = values();
+
     public String getID() {
         return name().toLowerCase();
     }

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

@@ -1,10 +1,16 @@
 package binnie.botany.api;
 
 public enum EnumSoilType {
+
     SOIL,
     LOAM,
     FLOWERBED;
 
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final EnumSoilType[] VALUES = values();
+
     public String getID() {
         return name().toLowerCase();
     }

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

@@ -1,9 +1,11 @@
 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);
 }

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

@@ -3,6 +3,7 @@ package binnie.botany.api;
 import forestry.api.genetics.IAlleleSpecies;
 
 public interface IAlleleFlowerSpecies extends IAlleleSpecies {
+
     IFlowerType getType();
 
     EnumAcidity getPH();

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

@@ -2,4 +2,5 @@ package binnie.botany.api;
 
 import forestry.api.genetics.IBreedingTracker;
 
-public interface IBotanistTracker extends IBreedingTracker {}
+public interface IBotanistTracker extends IBreedingTracker {
+}

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

@@ -1,6 +1,7 @@
 package binnie.botany.api;
 
 public interface IColourMix {
+
     IFlowerColor getColor1();
 
     IFlowerColor getColor2();

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

@@ -1,9 +1,11 @@
 package binnie.botany.api;
 
-import forestry.api.genetics.IIndividual;
 import net.minecraft.world.World;
 
+import forestry.api.genetics.IIndividual;
+
 public interface IFlower extends IIndividual {
+
     @Override
     IFlowerGenome getGenome();
 

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

@@ -3,6 +3,7 @@ package binnie.botany.api;
 import forestry.api.genetics.IAlleleInteger;
 
 public interface IFlowerColor {
+
     int getColor(boolean dis);
 
     IAlleleInteger getAllele();

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

@@ -5,6 +5,7 @@ import forestry.api.genetics.EnumTolerance;
 import forestry.api.genetics.IGenome;
 
 public interface IFlowerGenome extends IGenome {
+
     @Override
     IAlleleFlowerSpecies getPrimary();
 

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

@@ -5,5 +5,6 @@ import forestry.api.genetics.IGenome;
 import forestry.api.genetics.IMutation;
 
 public interface IFlowerMutation extends IMutation {
+
     float getChance(IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1);
 }

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

@@ -1,13 +1,17 @@
 package binnie.botany.api;
 
-import com.mojang.authlib.GameProfile;
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.ISpeciesRoot;
 import java.util.Collection;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
+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);
 

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

@@ -3,6 +3,7 @@ package binnie.botany.api;
 import net.minecraft.util.IIcon;
 
 public interface IFlowerType {
+
     IIcon getStem(EnumFlowerStage stage, boolean flowered, int section);
 
     IIcon getPetalIcon(EnumFlowerStage stage, boolean flowered, int section);

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

@@ -1,11 +1,13 @@
 package binnie.botany.api.gardening;
 
+import net.minecraft.world.World;
+
 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);

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

@@ -1,16 +1,8 @@
 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 java.util.ArrayList;
 import java.util.List;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -26,7 +18,18 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+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;
+
 public class BlockCeramic extends Block implements IBlockMetadata {
+
     public BlockCeramic() {
         super(Material.rock);
         setHardness(1.0f);
@@ -78,7 +81,7 @@ public class BlockCeramic extends Block implements IBlockMetadata {
     }
 
     @Override
-    public void addBlockTooltip(ItemStack stack, List tooltip) {
+    public void addBlockTooltip(ItemStack stack, List<String> tooltip) {
         int meta = TileEntityMetadata.getItemDamage(stack);
         tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName());
     }
@@ -89,8 +92,8 @@ public class BlockCeramic extends Block implements IBlockMetadata {
     }
 
     @Override
-    public void getSubBlocks(Item item, CreativeTabs tabs, List itemList) {
-        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+    public void getSubBlocks(Item item, CreativeTabs tabs, List<ItemStack> itemList) {
+        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
             itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
         }
     }

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

@@ -1,20 +1,8 @@
 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 java.util.ArrayList;
 import java.util.List;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -30,7 +18,22 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+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;
+
 public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipassBlock {
+
     public BlockCeramicBrick() {
         super(Material.rock);
         setHardness(1.0f);
@@ -87,7 +90,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
     }
 
     @Override
-    public void addBlockTooltip(ItemStack itemStack, List tooltip) {
+    public void addBlockTooltip(ItemStack itemStack, List<String> tooltip) {
         int meta = TileEntityMetadata.getItemDamage(itemStack);
         getType(meta).addTooltip(tooltip);
     }
@@ -98,13 +101,13 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
     }
 
     @Override
-    public void getSubBlocks(Item item, CreativeTabs tab, List itemList) {
-        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+    public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> 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()) {
+        for (TileType type2 : TileType.VALUES) {
             if (type2.canDouble()) {
                 itemList.add(new BlockType(EnumFlowerColor.BROWN, EnumFlowerColor.GOLD, type2).getStack(1));
             }
@@ -127,13 +130,13 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
 
     @Override
     public IIcon getIcon(int side, int meta) {
-        return getType(meta).getIcon(MultipassBlockRenderer.getLayer());
+        return TileType.get(meta >>> 16 & 0xFF).icons[MultipassBlockRenderer.getLayer()];
     }
 
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister register) {
-        for (TileType type : TileType.values()) {
+        for (TileType type : TileType.VALUES) {
             for (int i = 0; i < 3; ++i) {
                 type.icons[i] = Botany.proxy.getIcon(register, "ceramic." + type.id + "." + i);
             }
@@ -164,6 +167,9 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
     @Override
     @SideOnly(Side.CLIENT)
     public int getRenderColor(int meta) {
+        if (!MultipassBlockRenderer.isRendering()) {
+            return EnumFlowerColor.get(meta & 0xFF).getColor(false);
+        }
         return colorMultiplier(meta);
     }
 
@@ -174,14 +180,14 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
 
     @Override
     public int colorMultiplier(int meta) {
-        BlockType type = getType(meta);
-        if (MultipassBlockRenderer.getLayer() == 0) {
+        int layer = MultipassBlockRenderer.getLayer();
+        if (layer == 0) {
             return 0xffffff;
         }
-        if (MultipassBlockRenderer.getLayer() == 1) {
-            return type.color1.getColor(false);
+        if (layer == 1) {
+            return EnumFlowerColor.get(meta & 0xFF).getColor(false);
         }
-        return type.color2.getColor(false);
+        return EnumFlowerColor.get(meta >>> 8 & 0xFF).getColor(false);
     }
 
     @Override
@@ -190,6 +196,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
     }
 
     public enum TileType {
+
         Tile("tile", "ceramicTile"),
         Brick("brick", "ceramicBricks"),
         StripeBrick("brickstripe", "strippedCeramicBricks"),
@@ -201,9 +208,14 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
         VerticalStripeBrick("verticalbrickstripe", "verticalStripedCeramicBricks"),
         VerticalLargeBrick("verticalbricklarge", "largeVerticalCeramicBricks");
 
-        protected String id;
-        protected String name;
-        protected IIcon[] icons;
+        /**
+         * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+         */
+
+        public static final TileType[] VALUES = values();
+        private final String id;
+        private final String name;
+        private final IIcon[] icons;
 
         TileType(String id, String name) {
             icons = new IIcon[3];
@@ -212,7 +224,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
         }
 
         public static TileType get(int id) {
-            return values()[id % values().length];
+            return VALUES[id % VALUES.length];
         }
 
         public boolean canDouble() {
@@ -220,32 +232,15 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
         }
 
         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;
+            return switch (this) {
+                case Tile -> getTileRecipe(stacks);
+                case Split -> getSplitRecipe(stacks);
+                case Chequered -> getChequeredRecipe(stacks);
+                case Mixed -> getMixedRecipe(stacks);
+                case LargeBrick -> getLargeBrickRecipe(stacks);
+                case Brick, StripeBrick -> getBrickRecipe(stacks);
+                case VerticalLargeBrick, VerticalBrick, VerticalStripeBrick -> getVerticalBrickRecipe(stacks);
+            };
         }
 
         private ItemStack getTileRecipe(List<ItemStack> stacks) {
@@ -284,7 +279,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
                 return null;
             }
 
-            int[] colors = {-1, -1};
+            int[] colors = { -1, -1 };
             int altCounter = 0;
             for (ItemStack stack : stacks) {
                 int alt = (altCounter != 0 && altCounter != 3) ? 1 : 0;
@@ -314,7 +309,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
                 return null;
             }
 
-            int[] colors = {-1, -1};
+            int[] colors = { -1, -1 };
             for (ItemStack stack : stacks) {
                 if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
                     return null;
@@ -343,7 +338,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
                 return null;
             }
 
-            int[] colors = {-1, -1};
+            int[] colors = { -1, -1 };
             for (ItemStack stack : stacks) {
                 if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
                     return null;
@@ -395,7 +390,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
                 return null;
             }
 
-            int[] colors = {-1, -1};
+            int[] colors = { -1, -1 };
             for (ItemStack stack4 : stacks) {
                 if (stack4.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
                     return null;
@@ -443,7 +438,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
                 return null;
             }
 
-            int[] colors = {-1, -1};
+            int[] colors = { -1, -1 };
             for (int index2 = 0; index2 < stacks.size(); ++index2) {
                 ItemStack stack = stacks.get(index2);
                 if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
@@ -502,6 +497,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
     }
 
     public static class BlockType {
+
         protected EnumFlowerColor color1;
         protected EnumFlowerColor color2;
         protected TileType type;
@@ -536,7 +532,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
             return I18N.localise("botany." + type.name);
         }
 
-        public void addTooltip(List tooltip) {
+        public void addTooltip(List<String> tooltip) {
             String name = color1.getName();
             if (type.canDouble() && color2 != color1) {
                 name = I18N.localise("botany.colour.double", name, color2.getName());

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

@@ -1,5 +1,11 @@
 package binnie.botany.ceramic;
 
+import java.util.List;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
 import binnie.botany.CreativeTabBotany;
 import binnie.botany.genetics.EnumFlowerColor;
 import binnie.core.block.TileEntityMetadata;
@@ -8,12 +14,9 @@ import binnie.extratrees.api.IDesign;
 import binnie.extratrees.carpentry.BlockDesign;
 import binnie.extratrees.carpentry.DesignBlock;
 import binnie.extratrees.carpentry.ModuleCarpentry;
-import java.util.List;
-import net.minecraft.block.material.Material;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
 
 public class BlockCeramicPatterned extends BlockDesign {
+
     public BlockCeramicPatterned() {
         super(CeramicDesignSystem.instance, Material.rock);
         setHardness(1.0f);
@@ -25,7 +28,10 @@ public class BlockCeramicPatterned extends BlockDesign {
     @Override
     public ItemStack getCreativeStack(IDesign design) {
         return ModuleCarpentry.getItemStack(
-                this, CeramicColor.get(EnumFlowerColor.WHITE), CeramicColor.get(EnumFlowerColor.BLACK), design);
+                this,
+                CeramicColor.get(EnumFlowerColor.WHITE),
+                CeramicColor.get(EnumFlowerColor.BLACK),
+                design);
     }
 
     @Override
@@ -34,7 +40,7 @@ public class BlockCeramicPatterned extends BlockDesign {
     }
 
     @Override
-    public void addBlockTooltip(ItemStack stack, List tooltip) {
+    public void addBlockTooltip(ItemStack stack, List<String> tooltip) {
         super.addBlockTooltip(stack, tooltip);
         DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
         tooltip.add(EnumChatFormatting.GRAY + block.getDesign().getName());

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

@@ -1,18 +1,9 @@
 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 java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -28,9 +19,22 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+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;
+
 public class BlockStained extends Block implements IBlockMetadata {
+
     public BlockStained() {
         super(Material.glass);
+        setHardness(0.3f);
         setCreativeTab(CreativeTabBotany.instance);
         setBlockName("stained");
     }
@@ -59,7 +63,7 @@ public class BlockStained extends Block implements IBlockMetadata {
     @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 -
+        // 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);
@@ -108,7 +112,7 @@ public class BlockStained extends Block implements IBlockMetadata {
     }
 
     @Override
-    public void addBlockTooltip(ItemStack itemStack, List tooltip) {
+    public void addBlockTooltip(ItemStack itemStack, List<String> tooltip) {
         int meta = TileEntityMetadata.getItemDamage(itemStack);
         tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName());
     }
@@ -119,8 +123,8 @@ public class BlockStained extends Block implements IBlockMetadata {
     }
 
     @Override
-    public void getSubBlocks(Item item, CreativeTabs tab, List itemList) {
-        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+    public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> itemList) {
+        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
             itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
         }
     }

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

@@ -1,19 +1,22 @@
 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 java.util.LinkedHashMap;
-import java.util.Map;
-import net.minecraft.item.ItemStack;
 
 public class CeramicColor implements IDesignMaterial {
+
     private static Map<EnumFlowerColor, CeramicColor> map;
 
     static {
         CeramicColor.map = new LinkedHashMap<>();
-        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
             CeramicColor.map.put(c, new CeramicColor(c));
         }
     }

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

@@ -1,5 +1,13 @@
 package binnie.botany.ceramic;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
 import binnie.botany.Botany;
 import binnie.botany.genetics.EnumFlowerColor;
 import binnie.botany.items.BotanyItems;
@@ -10,14 +18,9 @@ import binnie.extratrees.api.IDesignSystem;
 import binnie.extratrees.api.IPattern;
 import binnie.extratrees.carpentry.DesignerManager;
 import binnie.extratrees.carpentry.EnumPattern;
-import java.util.HashMap;
-import java.util.Map;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
 
 public class CeramicDesignSystem implements IDesignSystem {
+
     public static CeramicDesignSystem instance = new CeramicDesignSystem();
 
     protected Map<Integer, IIcon> primary;
@@ -71,7 +74,7 @@ public class CeramicDesignSystem implements IDesignSystem {
 
     @Override
     public void registerIcons(IIconRegister register) {
-        for (EnumPattern pattern : EnumPattern.values()) {
+        for (EnumPattern pattern : EnumPattern.VALUES) {
             primary.put(
                     pattern.ordinal(),
                     BinnieCore.proxy.getIcon(

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

@@ -1,15 +1,18 @@
 package binnie.botany.ceramic;
 
-import binnie.botany.Botany;
 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.world.World;
 
+import binnie.botany.Botany;
+
 public class CeramicTileRecipe implements IRecipe {
+
     protected ItemStack cached;
 
     @Override
@@ -49,7 +52,7 @@ public class CeramicTileRecipe implements IRecipe {
             }
         }
 
-        for (BlockCeramicBrick.TileType type : BlockCeramicBrick.TileType.values()) {
+        for (BlockCeramicBrick.TileType type : BlockCeramicBrick.TileType.VALUES) {
             ItemStack stack2 = type.getRecipe(stacks);
             if (stack2 != null) {
                 return stack2;

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

@@ -1,17 +1,19 @@
 package binnie.botany.ceramic;
 
-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;
 
+import binnie.Binnie;
+import binnie.botany.Botany;
+import binnie.botany.api.IFlower;
+
 public class PigmentRecipe implements IRecipe {
+
     protected ItemStack cached;
 
-    private ItemStack unknown;
+    private final ItemStack unknown;
 
     public PigmentRecipe() {
         unknown = null;
@@ -45,10 +47,7 @@ public class PigmentRecipe implements IRecipe {
 
                 IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(crafting.getStackInSlot(i));
                 if (flower.getAge() >= 1) {
-                    stack = new ItemStack(
-                            Botany.pigment,
-                            1,
-                            flower.getGenome().getPrimaryColor().getID());
+                    stack = new ItemStack(Botany.pigment, 1, flower.getGenome().getPrimaryColor().getID());
                 }
             }
         }

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

@@ -4,6 +4,7 @@ import binnie.botany.api.IFlowerRoot;
 import binnie.botany.genetics.FlowerHelper;
 
 public class BotanyCore {
+
     public static IFlowerRoot speciesRoot = new FlowerHelper();
 
     public static IFlowerRoot getFlowerRoot() {

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

@@ -1,13 +1,15 @@
 package binnie.botany.core;
 
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+
 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;
 

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

@@ -3,6 +3,7 @@ package binnie.botany.core;
 import binnie.core.IInitializable;
 
 public class ModuleCore implements IInitializable {
+
     @Override
     public void preInit() {
         // ignored

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

@@ -11,6 +11,7 @@ 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) {

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

@@ -5,7 +5,8 @@ import binnie.core.craftgui.IWidget;
 import binnie.core.craftgui.controls.listbox.ControlListBox;
 
 public class ControlColorMixBox extends ControlListBox<IColourMix> {
-    private Type type;
+
+    private final Type type;
 
     public ControlColorMixBox(IWidget parent, int x, int y, int width, int height, Type type) {
         super(parent, x, y, width, height, 12.0f);
@@ -17,7 +18,7 @@ public class ControlColorMixBox extends ControlListBox<IColourMix> {
         return new ControlColorMixItem(getContent(), value, y);
     }
 
-    enum Type {
+    public enum Type {
         Resultant,
         Further
     }

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

@@ -5,6 +5,7 @@ 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;

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

@@ -9,6 +9,7 @@ import binnie.core.craftgui.geometry.CraftGUIUtil;
 import binnie.core.craftgui.geometry.IPoint;
 
 public class ControlColorOption extends ControlTextOption<IFlowerColor> {
+
     protected ControlColorDisplay controlBee;
     protected IPoint boxPosition;
 
@@ -19,8 +20,7 @@ public class ControlColorOption extends ControlTextOption<IFlowerColor> {
         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 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));

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

@@ -14,6 +14,7 @@ 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);
 

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

@@ -1,5 +1,8 @@
 package binnie.botany.craftgui;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import binnie.botany.api.IColourMix;
 import binnie.botany.api.IFlowerColor;
 import binnie.botany.core.BotanyCore;
@@ -9,10 +12,9 @@ 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;
 

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

@@ -1,5 +1,8 @@
 package binnie.botany.craftgui;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import binnie.botany.api.IColourMix;
 import binnie.botany.api.IFlowerColor;
 import binnie.botany.core.BotanyCore;
@@ -9,10 +12,9 @@ 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;
 

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

@@ -1,5 +1,7 @@
 package binnie.botany.craftgui;
 
+import net.minecraft.item.ItemStack;
+
 import binnie.Binnie;
 import binnie.botany.api.EnumFlowerChromosome;
 import binnie.botany.api.EnumFlowerStage;
@@ -22,9 +24,9 @@ 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) {
         super(parent, tab);
     }
@@ -103,7 +105,10 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
                 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);
+                contents,
+                new IArea(valueX, y, w3, th),
+                genome.getFertility() + "x",
+                TextJustification.MIDDLE_LEFT);
         y += th;
 
         float lifespan = genome.getLifespan() * 68.27f / genome.getAgeChance() / 24000.0f;

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

@@ -1,5 +1,11 @@
 package binnie.botany.craftgui;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+
 import binnie.Binnie;
 import binnie.botany.Botany;
 import binnie.botany.api.IFlowerColor;
@@ -21,12 +27,9 @@ import binnie.core.craftgui.geometry.IArea;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import net.minecraft.entity.player.EntityPlayer;
 
 public class WindowBotanistDatabase extends WindowAbstractDatabase {
+
     public WindowBotanistDatabase(EntityPlayer player, Side side, boolean nei) {
         super(player, side, nei, Binnie.Genetics.flowerBreedingSystem, 130.0f);
     }
@@ -40,7 +43,8 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
         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"));
+                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"));
@@ -62,6 +66,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
     }
 
     enum FlowerMode implements IDatabaseMode {
+
         COLOR;
 
         @Override
@@ -71,6 +76,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
     }
 
     private class ColorModeWidget extends ModeWidgets {
+
         public ColorModeWidget() {
             super(FlowerMode.COLOR, WindowBotanistDatabase.this);
         }
@@ -78,13 +84,14 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
         @Override
         public void createListBox(IArea area) {
             listBox = new ControlListBox<IFlowerColor>(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) {
+
                 @Override
                 public IWidget createOption(IFlowerColor value, int y) {
                     return new ControlColorOption(getContent(), value, y);
                 }
             };
             List<IFlowerColor> colors = new ArrayList<>();
-            Collections.addAll(colors, EnumFlowerColor.values());
+            Collections.addAll(colors, EnumFlowerColor.VALUES);
             listBox.setOptions(colors);
         }
     }

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

@@ -1,5 +1,8 @@
 package binnie.botany.farm;
 
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumMoisture;
 import binnie.core.circuits.BinnieCircuit;
@@ -7,29 +10,24 @@ 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;
 
-    public CircuitGarden(
-            EnumMoisture moisture,
-            EnumAcidity ph,
-            boolean manual,
-            boolean fertilised,
-            ItemStack recipe,
+    private final boolean isManual;
+    private final boolean isFertilised;
+    private final ItemStack icon;
+    private final EnumMoisture moisture;
+    private final EnumAcidity acidity;
+
+    public CircuitGarden(EnumMoisture moisture, EnumAcidity ph, boolean manual, boolean fertilised, ItemStack recipe,
             ItemStack icon) {
         super(
-                "garden." + moisture.getID() + ((ph != null) ? ("." + ph.getID()) : "") + (manual ? ".manual" : "")
+                "garden." + moisture.getID()
+                        + ((ph != null) ? ("." + ph.getID()) : "")
+                        + (manual ? ".manual" : "")
                         + (fertilised ? ".fert" : ""),
                 4,
-                manual
-                        ? ChipsetManager.circuitRegistry.getLayout("forestry.farms.manual")
+                manual ? ChipsetManager.circuitRegistry.getLayout("forestry.farms.manual")
                         : ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed"),
                 recipe);
         this.moisture = moisture;
@@ -48,27 +46,27 @@ public class CircuitGarden extends BinnieCircuit {
         }
 
         if (acidity == EnumAcidity.ACID) {
-            if (info.length() > 0) {
+            if (!info.isEmpty()) {
                 info += ", ";
             }
             info += EnumChatFormatting.RED + I18N.localise("botany.ph.acid") + EnumChatFormatting.RESET;
         }
 
         if (acidity == EnumAcidity.NEUTRAL) {
-            if (info.length() > 0) {
+            if (!info.isEmpty()) {
                 info += ", ";
             }
             info += EnumChatFormatting.GREEN + I18N.localise("botany.ph.neutral") + EnumChatFormatting.RESET;
         }
 
         if (acidity == EnumAcidity.ALKALINE) {
-            if (info.length() > 0) {
+            if (!info.isEmpty()) {
                 info += ", ";
             }
             info += EnumChatFormatting.AQUA + I18N.localise("botany.ph.alkaline") + EnumChatFormatting.RESET;
         }
 
-        if (info.length() > 0) {
+        if (!info.isEmpty()) {
             info = " (" + info + EnumChatFormatting.RESET + ")";
         }
         addTooltipString(I18N.localise("botany.circuit.flowers") + info);
@@ -103,8 +101,4 @@ public class CircuitGarden extends BinnieCircuit {
         ((IFarmHousing) tile).resetFarmLogic(FarmDirection.values()[slot]);
     }
 
-    @Override
-    public void onTick(int arg0, Object arg1) {
-        // ignored
-    }
 }

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

@@ -1,15 +1,17 @@
 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.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
+import forestry.api.farming.FarmDirection;
+import forestry.api.farming.IFarmHousing;
+import forestry.api.farming.IFarmLogic;
+import forestry.core.utils.vect.Vect;
+
 public abstract class FarmLogic implements IFarmLogic {
+
     protected World world;
     protected IFarmHousing housing;
     protected boolean isManual;

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

@@ -1,5 +1,9 @@
 package binnie.botany.farm;
 
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
 import binnie.botany.Botany;
 import binnie.botany.api.EnumFlowerStage;
 import binnie.botany.api.IFlower;
@@ -7,11 +11,9 @@ 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;
 
 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;

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

@@ -1,13 +1,15 @@
 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.world.World;
 
+import binnie.botany.api.IFlower;
+import binnie.botany.core.BotanyCore;
+import binnie.botany.gardening.Gardening;
+
 public class FarmableVanillaFlower extends FarmableFlower {
+
     @Override
     public boolean isGermling(ItemStack itemstack) {
         return BotanyCore.getFlowerRoot().getConversion(itemstack) != null;

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

@@ -1,25 +1,9 @@
 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 java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.init.Blocks;
@@ -31,7 +15,27 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.FluidStack;
 
+import com.mojang.authlib.GameProfile;
+
+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 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;
+
 public class GardenLogic extends FarmLogic {
+
     protected EnumMoisture moisture;
     protected EnumAcidity acidity;
     protected boolean fertilised;
@@ -62,8 +66,7 @@ public class GardenLogic extends FarmLogic {
     @Override
     public boolean isAcceptedResource(ItemStack stack) {
         Item item = stack.getItem();
-        return Gardening.isSoil(item)
-                || item == Item.getItemFromBlock(Blocks.sand)
+        return Gardening.isSoil(item) || item == Item.getItemFromBlock(Blocks.sand)
                 || item == Item.getItemFromBlock(Blocks.dirt)
                 || Gardening.isAcidFertiliser(stack)
                 || Gardening.isAlkalineFertiliser(stack);
@@ -79,8 +82,7 @@ public class GardenLogic extends FarmLogic {
     @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)
+        return maintainSoil(x, y, z, direction, extent) || !isManual && maintainWater(x, y, z, direction, extent)
                 || maintainCrops(x, y + 1, z, direction, extent);
     }
 
@@ -126,36 +128,25 @@ public class GardenLogic extends FarmLogic {
                 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});
+                    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 (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});
+                    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 (!isAirBlock(position)
-                    && !world.getBlock(position.x, position.y, position.z)
-                            .isReplaceable(world, position.x, position.y, position.z)) {
+            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) {
@@ -224,20 +215,20 @@ public class GardenLogic extends FarmLogic {
     private ItemStack getAvailableLoam() {
         EnumMoisture[] moistures;
         if (moisture == EnumMoisture.DAMP) {
-            moistures = new EnumMoisture[] {EnumMoisture.DAMP, EnumMoisture.NORMAL, EnumMoisture.DRY};
+            moistures = new EnumMoisture[] { EnumMoisture.DAMP, EnumMoisture.NORMAL, EnumMoisture.DRY };
         } else if (moisture == EnumMoisture.DRY) {
-            moistures = new EnumMoisture[] {EnumMoisture.DRY, EnumMoisture.DAMP, 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};
+        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}) {
+                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)};
+                    ItemStack[] resource = { new ItemStack(type, 1, meta) };
                     if (housing.getFarmInventory().hasResources(resource)) {
                         return resource[0];
                     }
@@ -245,7 +236,7 @@ public class GardenLogic extends FarmLogic {
             }
         }
 
-        if (housing.getFarmInventory().hasResources(new ItemStack[] {new ItemStack(Blocks.dirt)})) {
+        if (housing.getFarmInventory().hasResources(new ItemStack[] { new ItemStack(Blocks.dirt) })) {
             return new ItemStack(Blocks.dirt);
         }
         return null;
@@ -266,7 +257,7 @@ public class GardenLogic extends FarmLogic {
         }
 
         setBlock(position, ((ItemBlock) loam.getItem()).field_150939_a, loam.getItemDamage());
-        housing.getFarmInventory().removeResources(new ItemStack[] {copy});
+        housing.getFarmInventory().removeResources(new ItemStack[] { copy });
         return true;
     }
 
@@ -286,7 +277,7 @@ public class GardenLogic extends FarmLogic {
             return trySetSoil(position);
         }
 
-        ItemStack[] sand = {new ItemStack(Blocks.sand, 1)};
+        ItemStack[] sand = { new ItemStack(Blocks.sand, 1) };
         if (!housing.getFarmInventory().hasResources(sand)) {
             return false;
         }
@@ -368,9 +359,7 @@ public class GardenLogic extends FarmLogic {
 
             try {
                 IOwnable housing2 = (IOwnable) housing;
-                GameProfile prof = (GameProfile) IOwnable.class
-                        .getMethod("getOwnerProfile", new Class[0])
-                        .invoke(housing2);
+                GameProfile prof = (GameProfile) IOwnable.class.getMethod("getOwnerProfile").invoke(housing2);
                 ((TileEntityFlower) tile).setOwner(prof);
             } catch (Exception ex) {
                 // ignored
@@ -382,9 +371,8 @@ public class GardenLogic extends FarmLogic {
 
     public ItemStack getAvailableAcid() {
         for (ItemStack stack : Gardening.getAcidFertilisers()) {
-            if (stack != null
-                    && stack.getItem() != null
-                    && housing.getFarmInventory().hasResources(new ItemStack[] {stack})) {
+            if (stack != null && stack.getItem() != null
+                    && housing.getFarmInventory().hasResources(new ItemStack[] { stack })) {
                 return stack;
             }
         }
@@ -393,22 +381,16 @@ public class GardenLogic extends FarmLogic {
 
     public ItemStack getAvailableAlkaline() {
         for (ItemStack stack : Gardening.getAlkalineFertilisers()) {
-            if (stack != null
-                    && stack.getItem() != null
-                    && housing.getFarmInventory().hasResources(new ItemStack[] {stack})) {
+            if (stack != null && stack.getItem() != null
+                    && housing.getFarmInventory().hasResources(new ItemStack[] { stack })) {
                 return stack;
             }
         }
         return null;
     }
 
-    public void setData(
-            EnumMoisture moisture,
-            EnumAcidity acidity,
-            boolean isManual,
-            boolean fertilised,
-            ItemStack icon,
-            String name) {
+    public void setData(EnumMoisture moisture, EnumAcidity acidity, boolean isManual, boolean fertilised,
+            ItemStack icon, String name) {
         this.moisture = moisture;
         this.acidity = acidity;
         this.isManual = isManual;

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

@@ -1,19 +1,9 @@
 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 java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -28,7 +18,21 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import com.mojang.authlib.GameProfile;
+
+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 cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class BlockFlower extends BlockContainer {
+
     public BlockFlower() {
         super(Material.plants);
         float f = 0.2f;
@@ -51,7 +55,7 @@ public class BlockFlower extends BlockContainer {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister register) {
-        for (EnumFlowerType type : EnumFlowerType.values()) {
+        for (EnumFlowerType type : EnumFlowerType.VALUES) {
             type.registerIcons(register);
         }
     }
@@ -81,7 +85,7 @@ public class BlockFlower extends BlockContainer {
         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) {
+            if (flower instanceof TileEntityFlower) {
                 IFlower f = BotanyCore.getFlowerRoot().getMember(stack);
                 ((TileEntityFlower) flower).setRender(new TileEntityFlower.RenderInfo(f, (TileEntityFlower) flower));
             }
@@ -89,7 +93,7 @@ public class BlockFlower extends BlockContainer {
         }
 
         TileEntity below = world.getTileEntity(x, y - 1, z);
-        if (flower != null && flower instanceof TileEntityFlower) {
+        if (flower instanceof TileEntityFlower) {
             if (below instanceof TileEntityFlower) {
                 ((TileEntityFlower) flower).setSection(((TileEntityFlower) below).getSection());
             } else {
@@ -104,21 +108,19 @@ public class BlockFlower extends BlockContainer {
     @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)) {
+        if (!(tile instanceof TileEntityFlower tileFlower)) {
             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();
+        EnumFlowerStage stage = (tileFlower.getAge() == 0) ? EnumFlowerStage.SEED : EnumFlowerStage.FLOWER;
+        IFlowerType flower = tileFlower.getType();
+        int section = tileFlower.getRenderSection();
+        boolean flowered = tileFlower.isFlowered();
         if (RendererBotany.pass == 0) {
             return flower.getStem(stage, flowered, section);
         }
 
-        return (RendererBotany.pass == 1)
-                ? flower.getPetalIcon(stage, flowered, section)
+        return (RendererBotany.pass == 1) ? flower.getPetalIcon(stage, flowered, section)
                 : flower.getVariantIcon(stage, flowered, section);
     }
 
@@ -126,12 +128,11 @@ public class BlockFlower extends BlockContainer {
     @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 (tile instanceof TileEntityFlower tileFlower) {
             if (RendererBotany.pass == 0) {
-                return f.getStemColour();
+                return tileFlower.getStemColour();
             }
-            return (RendererBotany.pass == 1) ? f.getPrimaryColor() : f.getSecondaryColor();
+            return (RendererBotany.pass == 1) ? tileFlower.getPrimaryColor() : tileFlower.getSecondaryColor();
         }
         return 0xffffff;
     }
@@ -150,15 +151,13 @@ public class BlockFlower extends BlockContainer {
         super.onNeighborBlockChange(world, x, y, z, block);
         checkAndDropBlock(world, x, y, z);
         TileEntity tile = world.getTileEntity(x, y, z);
-        if (!(tile instanceof TileEntityFlower)) {
+        if (!(tile instanceof TileEntityFlower tileFlower)) {
             return;
         }
 
-        TileEntityFlower flower = (TileEntityFlower) tile;
-        if (flower.getSection() == 0
-                && flower.getFlower() != null
-                && flower.getFlower().getAge() > 0
-                && flower.getFlower().getGenome().getPrimary().getType().getSections() > 1
+        if (tileFlower.getSection() == 0 && tileFlower.getFlower() != null
+                && tileFlower.getFlower().getAge() > 0
+                && tileFlower.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);
@@ -209,9 +208,8 @@ public class BlockFlower extends BlockContainer {
     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
+        if (hasBeenBroken && BinnieCore.proxy.isSimulating(world)
+                && !drops.isEmpty()
                 && (player == null || !player.capabilities.isCreativeMode)) {
             for (ItemStack drop : drops) {
                 dropBlockAsItem(world, x, y, z, drop);

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

@@ -1,5 +1,21 @@
 package binnie.botany.flower;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
+import java.util.List;
+
+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 binnie.Binnie;
 import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
@@ -18,24 +34,15 @@ import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IPollinatable;
 import forestry.core.config.Config;
-import java.util.List;
-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;
 
 public abstract class ItemBotany extends Item {
+
     public ItemBotany(String name) {
         setCreativeTab(CreativeTabBotany.instance);
         setUnlocalizedName(name);
         hasSubtypes = true;
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override
@@ -54,11 +61,6 @@ public abstract class ItemBotany extends Item {
         return false;
     }
 
-    @Override
-    public boolean getShareTag() {
-        return true;
-    }
-
     @Override
     public boolean hasEffect(ItemStack stack, int pass) {
         if (!stack.hasTagCompound()) {
@@ -70,7 +72,7 @@ public abstract class ItemBotany extends Item {
     }
 
     @Override
-    public void addInformation(ItemStack itemstack, EntityPlayer player, List tooltip, boolean flag) {
+    public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> tooltip, boolean flag) {
         if (!itemstack.hasTagCompound()) {
             return;
         }
@@ -86,11 +88,12 @@ public abstract class ItemBotany extends Item {
         IFlowerColor stemColor = genome.getStemColor();
 
         if (primaryColor == secondColor) {
-            tooltip.add(EnumChatFormatting.YELLOW
-                    + I18N.localise("botany.item.tooltip.flowerColor1", primaryColor.getName(), stemColor.getName()));
+            tooltip.add(
+                    EnumChatFormatting.YELLOW + I18N
+                            .localise("botany.item.tooltip.flowerColor1", primaryColor.getName(), stemColor.getName()));
         } else {
-            tooltip.add(EnumChatFormatting.YELLOW
-                    + I18N.localise(
+            tooltip.add(
+                    EnumChatFormatting.YELLOW + I18N.localise(
                             "botany.item.tooltip.flowerColor2",
                             primaryColor.getName(),
                             secondColor.getName(),
@@ -134,17 +137,16 @@ public abstract class ItemBotany extends Item {
     }
 
     @Override
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> itemList) {
         addCreativeItems(itemList, true);
     }
 
-    public void addCreativeItems(List itemList, boolean hideSecrets) {
+    public void addCreativeItems(List<ItemStack> itemList, boolean hideSecrets) {
         for (IIndividual individual : BotanyCore.speciesRoot.getIndividualTemplates()) {
             if (hideSecrets && individual.isSecret() && !Config.isDebug) {
                 continue;
             }
-            itemList.add(BotanyCore.speciesRoot.getMemberStack(
-                    individual.copy(), getStage().ordinal()));
+            itemList.add(BotanyCore.speciesRoot.getMemberStack(individual.copy(), getStage().ordinal()));
         }
     }
 
@@ -158,8 +160,7 @@ public abstract class ItemBotany extends Item {
         if (renderPass == 0) {
             return flower.getGenome().getStemColor().getColor(flower.isWilted());
         }
-        return (renderPass == 1)
-                ? flower.getGenome().getPrimaryColor().getColor(flower.isWilted())
+        return (renderPass == 1) ? flower.getGenome().getPrimaryColor().getColor(flower.isWilted())
                 : flower.getGenome().getSecondaryColor().getColor(flower.isWilted());
     }
 
@@ -192,24 +193,14 @@ public abstract class ItemBotany extends Item {
     }
 
     @Override
-    public boolean onItemUse(
-            ItemStack itemstack,
-            EntityPlayer player,
-            World world,
-            int x,
-            int y,
-            int z,
-            int side,
-            float px,
-            float py,
-            float pz) {
+    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);
-            if (!(target instanceof IPollinatable)) {
+            if (!(target instanceof IPollinatable pollinatable)) {
                 return false;
             }
-            IPollinatable pollinatable = (IPollinatable) target;
             if (!pollinatable.canMateWith(flower)) {
                 return false;
             }
@@ -224,24 +215,23 @@ public abstract class ItemBotany extends Item {
         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
+        } 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 (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 (itemstack.stackSize == 0 || !player.canPlayerEdit(x, y, z, side, itemstack)) {
             return false;
@@ -274,39 +264,28 @@ public abstract class ItemBotany extends Item {
         Block block = world.getBlock(x, y, z);
         if (block == Blocks.snow_layer) {
             side = 1;
-        } else if (block != Blocks.vine
-                && block != Blocks.tallgrass
+        } 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++;
-            }
-        }
+                    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) {
+    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)) {
             return false;

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

@@ -3,6 +3,7 @@ package binnie.botany.flower;
 import binnie.botany.api.EnumFlowerStage;
 
 public class ItemFlower extends ItemBotany {
+
     public ItemFlower() {
         super("itemFlower");
     }

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

@@ -1,11 +1,9 @@
 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 static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -14,7 +12,14 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
+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;
+
 public class ItemInsulatedTube extends Item {
+
     IIcon[] icons;
 
     public ItemInsulatedTube() {
@@ -22,6 +27,8 @@ public class ItemInsulatedTube extends Item {
         setUnlocalizedName("insulatedTube");
         setCreativeTab(CreativeTabBotany.instance);
         setHasSubtypes(true);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     public static ItemStack getInsulateStack(ItemStack stack) {
@@ -30,7 +37,7 @@ public class ItemInsulatedTube extends Item {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs tab, List list) {
+    public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
         for (Material mat : Material.values()) {
             for (Insulate ins : Insulate.values()) {
                 list.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128));
@@ -52,14 +59,13 @@ public class ItemInsulatedTube extends Item {
         if (pass == 0) {
             return 0xffffff;
         }
-        return (pass == 1)
-                ? Material.get(stack.getItemDamage()).getColor()
+        return (pass == 1) ? Material.get(stack.getItemDamage()).getColor()
                 : Insulate.get(stack.getItemDamage()).getColor();
     }
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
+    public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
         super.addInformation(stack, player, tooltip, advanced);
         tooltip.add(Insulate.get(stack.getItemDamage()).getName());
     }
@@ -85,13 +91,14 @@ public class ItemInsulatedTube extends Item {
     }
 
     enum Material {
-        Copper(0xe3b78e, "cooper"),
+
+        Copper(0xe3b78e, "copper"),
         Tin(0xe1eef4, "tin"),
         Bronze(0xddc276, "bronze"),
         Iron(0xd8d8d8, "iron");
 
-        protected int color;
-        protected String name;
+        private final int color;
+        private final String name;
 
         Material(int color, String name) {
             this.color = color;
@@ -112,6 +119,7 @@ public class ItemInsulatedTube extends Item {
     }
 
     enum Insulate {
+
         Clay(0xa1aacc, "clay"),
         Cobble(0x7b7b7b, "cobblestone"),
         Sand(0xefeab5, "sand"),
@@ -119,8 +127,8 @@ public class ItemInsulatedTube extends Item {
         Stone(0x6d6d6d, "smoothStone"),
         Sandstone(0xc1b989, "sandstone");
 
-        protected int color;
-        protected String name;
+        private final int color;
+        private final String name;
 
         Insulate(int color, String name) {
             this.color = color;
@@ -140,26 +148,14 @@ public class ItemInsulatedTube extends Item {
         }
 
         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);
-            }
-            return null;
+            return switch (this) {
+                case Clay -> new ItemStack(Blocks.clay);
+                case Cobble -> new ItemStack(Blocks.cobblestone);
+                case HardenedClay -> new ItemStack(Blocks.hardened_clay);
+                case Sand -> new ItemStack(Blocks.sand);
+                case Sandstone -> new ItemStack(Blocks.sandstone);
+                case Stone -> new ItemStack(Blocks.stone);
+            };
         }
     }
 }

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

@@ -4,6 +4,7 @@ import binnie.botany.api.EnumFlowerStage;
 import binnie.core.util.I18N;
 
 public class ItemPollen extends ItemBotany {
+
     public ItemPollen() {
         super("pollen");
     }

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

@@ -4,6 +4,7 @@ import binnie.botany.api.EnumFlowerStage;
 import binnie.core.util.I18N;
 
 public class ItemSeed extends ItemBotany {
+
     public ItemSeed() {
         super("seed");
     }

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

@@ -1,6 +1,5 @@
 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;
@@ -8,7 +7,10 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+
 public class RendererBotany implements ISimpleBlockRenderingHandler {
+
     public static int renderID;
     public static int pass;
 
@@ -18,14 +20,13 @@ public class RendererBotany implements ISimpleBlockRenderingHandler {
     }
 
     @Override
-    public boolean renderWorldBlock(
-            IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
+    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;
+        long i1 = x * 3129871L ^ 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;
@@ -44,7 +45,7 @@ public class RendererBotany implements ISimpleBlockRenderingHandler {
             }
             tessellator.setColorOpaque_F(f, f2, f3);
             IIcon iicon = block.getIcon(world, x, y, z, 0);
-            renderer.drawCrossedSquares(iicon, d1, d2, d3, 1.0f);
+            renderer.drawCrossedSquares(iicon, d1, y, d3, 1.0f);
         }
         return false;
     }

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

@@ -1,5 +1,23 @@
 package binnie.botany.flower;
 
+import java.util.EnumSet;
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTUtil;
+import net.minecraft.network.Packet;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ChunkCoordinates;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraftforge.common.EnumPlantType;
+
+import com.mojang.authlib.GameProfile;
+
 import binnie.Binnie;
 import binnie.botany.Botany;
 import binnie.botany.api.EnumFlowerStage;
@@ -17,7 +35,6 @@ import binnie.botany.genetics.EnumFlowerType;
 import binnie.botany.genetics.Flower;
 import binnie.botany.network.MessageFlowerUpdate;
 import binnie.core.BinnieCore;
-import com.mojang.authlib.GameProfile;
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
 import forestry.api.genetics.IIndividual;
@@ -25,22 +42,10 @@ import forestry.api.genetics.IPollinatable;
 import forestry.api.lepidopterology.IButterfly;
 import forestry.api.lepidopterology.IButterflyNursery;
 import forestry.lepidopterology.entities.EntityButterfly;
-import java.util.EnumSet;
-import java.util.Random;
-import net.minecraft.block.Block;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTUtil;
-import net.minecraft.network.Packet;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraftforge.common.EnumPlantType;
+import forestry.plugins.PluginLepidopterology;
 
 public class TileEntityFlower extends TileEntity implements IPollinatable, IButterflyNursery {
+
     protected IFlower flower;
     protected GameProfile owner;
     protected int section;
@@ -119,8 +124,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
 
     @Override
     public boolean canMateWith(IIndividual individual) {
-        return isBreeding()
-                && individual instanceof IFlower
+        return isBreeding() && individual instanceof IFlower
                 && getFlower() != null
                 && getFlower().getMate() == null
                 && getFlower().hasFlowered()
@@ -133,8 +137,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
             return;
         }
 
-        IAlleleFlowerSpecies primary =
-                (IAlleleFlowerSpecies) individual.getGenome().getPrimary();
+        IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) individual.getGenome().getPrimary();
         IAlleleFlowerSpecies primary2 = getFlower().getGenome().getPrimary();
         if (primary == primary2 || worldObj.rand.nextInt(4) == 0) {
             getFlower().mate((IFlower) individual);
@@ -210,11 +213,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
             return;
         }
 
-        if (!canTolerate || light < 1.0f) {
-            flower.setWilted(true);
-        } else {
-            flower.setWilted(false);
-        }
+        flower.setWilted(!canTolerate || light < 1.0f);
 
         float chanceDispersal = 0.8f;
         chanceDispersal += 0.2f * flower.getGenome().getFertility();
@@ -283,9 +282,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
 
         Gardening.onGrowFromSeed(worldObj, xCoord, yCoord, zCoord);
         if (getOwner() != null && getFlower() != null) {
-            BotanyCore.getFlowerRoot()
-                    .getBreedingTracker(getWorldObj(), getOwner())
-                    .registerBirth(getFlower());
+            BotanyCore.getFlowerRoot().getBreedingTracker(getWorldObj(), getOwner()).registerBirth(getFlower());
         }
     }
 
@@ -294,17 +291,14 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
         if (renderInfo == null && getFlower() != null && getFlower().getGenome() != null) {
             renderInfo = new RenderInfo(getFlower(), this);
         }
-        return (renderInfo != null)
-                ? Botany.instance
-                        .getNetworkWrapper()
-                        .getPacketFrom(new MessageFlowerUpdate(xCoord, yCoord, zCoord, renderInfo).getMessage())
-                : null;
+        return (renderInfo != null) ? Botany.instance.getNetworkWrapper()
+                .getPacketFrom(new MessageFlowerUpdate(xCoord, yCoord, zCoord, renderInfo).getMessage()) : null;
     }
 
     public void updateRender(boolean update) {
         if (update && getFlower() != null && getFlower().getGenome() != null) {
             RenderInfo newInfo = new RenderInfo(getFlower(), this);
-            if (renderInfo == null || !newInfo.equals(renderInfo)) {
+            if (!newInfo.equals(renderInfo)) {
                 setRender(newInfo);
             }
         }
@@ -454,15 +448,12 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
             return;
         }
 
-        IButterfly spawn = Binnie.Genetics.getButterflyRoot()
-                .getIndividualTemplates()
-                .get(worldObj.rand.nextInt(Binnie.Genetics.getButterflyRoot()
-                        .getIndividualTemplates()
-                        .size()));
+        IButterfly spawn = Binnie.Genetics.getButterflyRoot().getIndividualTemplates()
+                .get(worldObj.rand.nextInt(Binnie.Genetics.getButterflyRoot().getIndividualTemplates().size()));
         if (worldObj.rand.nextFloat() >= spawn.getGenome().getPrimary().getRarity() * 0.5f) {
             return;
         }
-        if (worldObj.countEntities(EntityButterfly.class) > 100) {
+        if (worldObj.countEntities(EntityButterfly.class) > PluginLepidopterology.spawnConstraint) {
             return;
         }
         if (!spawn.canSpawn(worldObj, x, y, z)) {
@@ -528,9 +519,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
         }
 
         matureTime++;
-        if (matureTime
-                        >= caterpillar.getGenome().getLifespan()
-                                / (caterpillar.getGenome().getFertility() * 2)
+        if (matureTime >= caterpillar.getGenome().getLifespan() / (caterpillar.getGenome().getFertility() * 2)
                 && caterpillar.canTakeFlight(worldObj, xCoord, yCoord, zCoord)) {
             if (worldObj.isAirBlock(xCoord, yCoord + 1, zCoord)) {
                 attemptButterflySpawn(worldObj, caterpillar, xCoord, yCoord + 1, zCoord);
@@ -601,6 +590,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
     }
 
     public static class RenderInfo {
+
         public IFlowerColor primary;
         public IFlowerColor secondary;
         public IFlowerColor stem;
@@ -625,10 +615,8 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
 
         @Override
         public boolean equals(Object obj) {
-            if (obj instanceof RenderInfo) {
-                RenderInfo o = (RenderInfo) obj;
-                return o.age == age
-                        && o.wilted == wilted
+            if (obj instanceof RenderInfo o) {
+                return o.age == age && o.wilted == wilted
                         && o.flowered == flowered
                         && o.primary == primary
                         && o.secondary == secondary

src/main/java/binnie/botany/gardening/BlockPlant.java

@@ -1,15 +1,9 @@
 package binnie.botany.gardening;
 
-import binnie.botany.Botany;
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.api.EnumSoilType;
-import binnie.botany.api.gardening.IBlockSoil;
-import binnie.core.util.I18N;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockBush;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -20,7 +14,16 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import binnie.botany.Botany;
+import binnie.botany.CreativeTabBotany;
+import binnie.botany.api.EnumSoilType;
+import binnie.botany.api.gardening.IBlockSoil;
+import binnie.core.util.I18N;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class BlockPlant extends BlockBush {
+
     public BlockPlant() {
         setBlockName("plant");
         setCreativeTab(CreativeTabBotany.instance);
@@ -68,7 +71,7 @@ public class BlockPlant extends BlockBush {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+    public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
         for (Type type : Type.values()) {
             list.add(type.get());
         }
@@ -125,6 +128,7 @@ public class BlockPlant extends BlockBush {
     }
 
     public enum Type {
+
         Weeds("weeds"),
         WeedsLong("longWeeds"),
         WeedsVeryLong("veryLongWeeds"),
@@ -133,7 +137,7 @@ public class BlockPlant extends BlockBush {
 
         public IIcon icon;
 
-        protected String name;
+        private final String name;
 
         Type(String name) {
             this.name = name;

src/main/java/binnie/botany/gardening/BlockSoil.java

@@ -1,15 +1,8 @@
 package binnie.botany.gardening;
 
-import binnie.botany.Botany;
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.api.EnumAcidity;
-import binnie.botany.api.EnumMoisture;
-import binnie.botany.api.EnumSoilType;
-import binnie.botany.api.gardening.IBlockSoil;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import java.util.List;
 import java.util.Random;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -24,7 +17,17 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.IPlantable;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import binnie.botany.Botany;
+import binnie.botany.CreativeTabBotany;
+import binnie.botany.api.EnumAcidity;
+import binnie.botany.api.EnumMoisture;
+import binnie.botany.api.EnumSoilType;
+import binnie.botany.api.gardening.IBlockSoil;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class BlockSoil extends Block implements IBlockSoil {
+
     protected boolean weedKilled;
     protected IIcon[] iconsTop;
     protected IIcon[] iconsSide;
@@ -53,7 +56,7 @@ public class BlockSoil extends Block implements IBlockSoil {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+    public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
         for (int i = 0; i < 9; ++i) {
             list.add(new ItemStack(this, 1, i));
         }
@@ -78,8 +81,8 @@ public class BlockSoil extends Block implements IBlockSoil {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister register) {
-        for (EnumMoisture moisture : EnumMoisture.values()) {
-            for (EnumAcidity pH : EnumAcidity.values()) {
+        for (EnumMoisture moisture : EnumMoisture.VALUES) {
+            for (EnumAcidity pH : EnumAcidity.VALUES) {
                 int index = moisture.ordinal() + pH.ordinal() * 3;
                 String id = "soil/" + getType().getID() + "." + pH.getID() + "." + moisture.getID();
                 iconsTop[index] = Botany.proxy.getIcon(register, id + ".0");
@@ -101,8 +104,8 @@ public class BlockSoil extends Block implements IBlockSoil {
     @Override
     public void updateTick(World world, int x, int y, int z, Random random) {
         int meta = world.getBlockMetadata(x, y, z);
-        EnumMoisture moisture = EnumMoisture.values()[meta % 3];
-        EnumAcidity acidity = EnumAcidity.values()[meta / 3];
+        EnumMoisture moisture = EnumMoisture.VALUES[meta % 3];
+        EnumAcidity acidity = EnumAcidity.VALUES[meta / 3];
         EnumMoisture desiredMoisture = Gardening.getNaturalMoisture(world, x, y, z);
         if (desiredMoisture.ordinal() > moisture.ordinal()) {
             moisture = ((moisture == EnumMoisture.DRY) ? EnumMoisture.NORMAL : EnumMoisture.DAMP);
@@ -115,8 +118,7 @@ public class BlockSoil extends Block implements IBlockSoil {
         if (meta != meta2) {
             world.setBlockMetadataWithNotify(x, y, z, meta2, 2);
         }
-        if (!weedKilled
-                && random.nextInt(5 - getType(world, x, y, z).ordinal()) == 0
+        if (!weedKilled && random.nextInt(5 - getType(world, x, y, z).ordinal()) == 0
                 && world.getBlock(x, y + 1, z) == Blocks.air) {
             world.setBlock(x, y + 1, z, Botany.plant, BlockPlant.Type.Weeds.ordinal(), 2);
         }
@@ -139,12 +141,12 @@ public class BlockSoil extends Block implements IBlockSoil {
 
     @Override
     public EnumAcidity getPH(World world, int x, int y, int z) {
-        return EnumAcidity.values()[world.getBlockMetadata(x, y, z) / 3];
+        return EnumAcidity.VALUES[world.getBlockMetadata(x, y, z) / 3];
     }
 
     @Override
     public EnumMoisture getMoisture(World world, int x, int y, int z) {
-        return EnumMoisture.values()[world.getBlockMetadata(x, y, z) % 3];
+        return EnumMoisture.VALUES[world.getBlockMetadata(x, y, z) % 3];
     }
 
     @Override
@@ -195,8 +197,8 @@ public class BlockSoil extends Block implements IBlockSoil {
     }
 
     @Override
-    public boolean canSustainPlant(
-            IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) {
+    public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction,
+            IPlantable plantable) {
         Block plant = plantable.getPlant(world, x, y + 1, z);
         if (plant == Botany.flower) {
             return true;

src/main/java/binnie/botany/gardening/Gardening.java

@@ -1,5 +1,20 @@
 package binnie.botany.gardening;
 
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+
+import com.mojang.authlib.GameProfile;
+
 import binnie.botany.Botany;
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumMoisture;
@@ -9,21 +24,10 @@ import binnie.botany.api.gardening.IBlockSoil;
 import binnie.botany.flower.TileEntityFlower;
 import binnie.botany.items.BotanyItems;
 import binnie.core.BinnieCore;
-import com.mojang.authlib.GameProfile;
 import forestry.api.core.EnumTemperature;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
 
 public class Gardening {
+
     public static Map<ItemStack, Integer> fertiliserAcid = new LinkedHashMap<>();
     public static Map<ItemStack, Integer> fertiliserAlkaline = new LinkedHashMap<>();
     public static Map<ItemStack, Integer> fertiliserNutrient = new LinkedHashMap<>();
@@ -42,16 +46,16 @@ public class Gardening {
             for (int dz = -1; dz < 2; ++dz) {
                 if (dx != 0 || dz != 0) {
                     if (world.getBlock(x + dx, y, z + dz) == Blocks.sand) {
-                        bias -= 1.5;
+                        bias -= 1.5f;
                     } else if (world.getBlock(x + dx, y, z + dz) == Blocks.water) {
-                        bias += 1.5;
+                        bias += 1.5f;
                     }
                 }
             }
         }
 
         if (world.isRaining() && world.canBlockSeeTheSky(x, y + 1, z) && world.getPrecipitationHeight(x, z) <= y + 1) {
-            bias += 1.5;
+            bias += 1.5f;
         }
 
         for (int dx = -1; dx < 2; ++dx) {
@@ -81,8 +85,10 @@ public class Gardening {
     public static float getBiomeMoisture(BiomeGenBase biome, int H) {
         double R = biome.rainfall;
         double T = biome.temperature;
-        double m =
-                3.2 * (R - 0.5) - 0.4 * (1.0 + T + 0.5 * T * T) + 1.1 - 1.6 * (T - 0.9) * (T - 0.9) - 0.002 * (H - 64);
+        double m = 3.2 * (R - 0.5) - 0.4 * (1.0 + T + 0.5 * T * T)
+                + 1.1
+                - 1.6 * (T - 0.9) * (T - 0.9)
+                - 0.002 * (H - 64);
         if (m == 0.0) {
             return (float) m;
         }
@@ -95,14 +101,13 @@ public class Gardening {
     public static float getBiomePH(BiomeGenBase biome, int H) {
         double R = biome.rainfall;
         double T = biome.temperature;
-        return (float) (-3.0 * (R - 0.5)
-                + 0.5 * (T - 0.699999988079071) * (T - 0.699999988079071)
+        return (float) (-3.0 * (R - 0.5) + 0.5 * (T - 0.699999988079071) * (T - 0.699999988079071)
                 + 0.02f * (H - 64)
                 - 0.15000000596046448);
     }
 
-    public static void createSoil(
-            World world, int x, int y, int z, EnumSoilType soil, EnumMoisture moisture, EnumAcidity acidity) {
+    public static void createSoil(World world, int x, int y, int z, EnumSoilType soil, EnumMoisture moisture,
+            EnumAcidity acidity) {
         int meta = moisture.ordinal() + acidity.ordinal() * 3;
         world.setBlock(x, y, z, getSoilBlock(soil), meta, 2);
     }
@@ -113,13 +118,13 @@ public class Gardening {
             return false;
         }
 
-        TileEntity tileFlower = world.getTileEntity(x, y, z);
-        TileEntity below = world.getTileEntity(x, y - 1, z);
-        if (tileFlower != null && tileFlower instanceof TileEntityFlower) {
-            if (below instanceof TileEntityFlower) {
-                ((TileEntityFlower) tileFlower).setSection(((TileEntityFlower) below).getSection());
+        final TileEntity tile = world.getTileEntity(x, y, z);
+        final TileEntity below = world.getTileEntity(x, y - 1, z);
+        if (tile instanceof TileEntityFlower tileFlower) {
+            if (below instanceof TileEntityFlower lowerFlower) {
+                tileFlower.setSection(lowerFlower.getSection());
             } else {
-                ((TileEntityFlower) tileFlower).create(flower, owner);
+                tileFlower.create(flower, owner);
             }
         }
 
@@ -133,21 +138,20 @@ public class Gardening {
         }
 
         TileEntity flower = world.getTileEntity(x, y, z);
-        if (flower == null || !(flower instanceof TileEntityFlower)) {
+        if (!(flower instanceof TileEntityFlower)) {
             return;
         }
 
         IFlower iflower = ((TileEntityFlower) flower).getFlower();
         int section = ((TileEntityFlower) flower).getSection();
-        if (iflower == null
-                || section >= iflower.getGenome().getPrimary().getType().getSections() - 1
+        if (iflower == null || section >= iflower.getGenome().getPrimary().getType().getSections() - 1
                 || iflower.getAge() <= 0) {
             return;
         }
 
         world.setBlock(x, y + 1, z, Botany.flower, 0, 2);
         TileEntity tileFlower = world.getTileEntity(x, y + 1, z);
-        if (tileFlower != null && tileFlower instanceof TileEntityFlower) {
+        if (tileFlower instanceof TileEntityFlower) {
             ((TileEntityFlower) tileFlower).setSection(section + 1);
         }
     }
@@ -229,8 +233,8 @@ public class Gardening {
         BiomeGenBase biome = world.getBiomeGenForCoords(x, z);
         return canTolerate(
                 flower,
-                EnumAcidity.values()[soilMeta / 3 % 3],
-                EnumMoisture.values()[soilMeta % 3],
+                EnumAcidity.VALUES[soilMeta / 3 % 3],
+                EnumMoisture.VALUES[soilMeta % 3],
                 EnumTemperature.getFromValue(biome.temperature));
     }
 
@@ -246,19 +250,15 @@ public class Gardening {
     }
 
     public static Block getSoilBlock(EnumSoilType type, boolean weedkill) {
-        switch (type) {
-            case FLOWERBED:
-                return weedkill ? Botany.flowerbedNoWeed : Botany.flowerbed;
-
-            case LOAM:
-                return weedkill ? Botany.loamNoWeed : Botany.loam;
-        }
-        return weedkill ? Botany.soilNoWeed : Botany.soil;
+        return switch (type) {
+            case FLOWERBED -> weedkill ? Botany.flowerbedNoWeed : Botany.flowerbed;
+            case LOAM -> weedkill ? Botany.loamNoWeed : Botany.loam;
+            default -> weedkill ? Botany.soilNoWeed : Botany.soil;
+        };
     }
 
     public static boolean canTolerate(IFlower flower, EnumAcidity ePH, EnumMoisture eMoisture, EnumTemperature eTemp) {
-        return flower.getGenome().canTolerate(ePH)
-                && flower.getGenome().canTolerate(eMoisture)
+        return flower.getGenome().canTolerate(ePH) && flower.getGenome().canTolerate(eMoisture)
                 && flower.getGenome().canTolerate(eTemp);
     }
 

src/main/java/binnie/botany/gardening/ItemSoil.java

@@ -1,23 +1,26 @@
 package binnie.botany.gardening;
 
+import java.util.List;
+import java.util.Locale;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumMoisture;
 import binnie.botany.api.EnumSoilType;
 import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import java.util.List;
-import java.util.Locale;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
 
 public class ItemSoil extends ItemBlock {
+
     protected EnumSoilType type;
 
-    private boolean noWeed;
+    private final boolean noWeed;
 
     public ItemSoil(Block block) {
         super(block);
@@ -28,10 +31,10 @@ public class ItemSoil extends ItemBlock {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
+    public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
         super.addInformation(stack, player, tooltip, advanced);
-        EnumMoisture moisture = EnumMoisture.values()[stack.getItemDamage() % 3];
-        EnumAcidity acidity = EnumAcidity.values()[stack.getItemDamage() / 3];
+        EnumMoisture moisture = EnumMoisture.VALUES[stack.getItemDamage() % 3];
+        EnumAcidity acidity = EnumAcidity.VALUES[stack.getItemDamage() / 3];
         String info = "";
 
         if (moisture == EnumMoisture.DRY) {
@@ -42,20 +45,20 @@ public class ItemSoil extends ItemBlock {
         }
 
         if (acidity == EnumAcidity.ACID) {
-            if (info.length() > 0) {
+            if (!info.isEmpty()) {
                 info += ", ";
             }
             info += EnumChatFormatting.YELLOW + I18N.localise("botany.ph.acid") + EnumChatFormatting.RESET;
         }
 
         if (acidity == EnumAcidity.ALKALINE) {
-            if (info.length() > 0) {
+            if (!info.isEmpty()) {
                 info += ", ";
             }
             info += EnumChatFormatting.YELLOW + I18N.localise("botany.ph.alkaline") + EnumChatFormatting.RESET;
         }
 
-        if (info.length() > 0) {
+        if (!info.isEmpty()) {
             tooltip.add(info);
         }
 

src/main/java/binnie/botany/gardening/ItemSoilMeter.java

@@ -1,5 +1,17 @@
 package binnie.botany.gardening;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.world.World;
+
 import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
 import binnie.botany.api.EnumAcidity;
@@ -11,35 +23,20 @@ import binnie.core.util.I18N;
 import binnie.genetics.genetics.AlleleHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
-import net.minecraft.world.World;
 
 public class ItemSoilMeter extends Item {
+
     public ItemSoilMeter() {
         setCreativeTab(CreativeTabBotany.instance);
         setUnlocalizedName("soilMeter");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override
-    public boolean onItemUse(
-            ItemStack stack,
-            EntityPlayer player,
-            World world,
-            int x,
-            int y,
-            int z,
-            int side,
-            float blockX,
-            float blockY,
-            float blockZ) {
+    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
+            float blockX, float blockY, float blockZ) {
         Block block = world.getBlock(x, y, z);
         if (!Gardening.isSoil(block)) {
             y--;
@@ -52,21 +49,18 @@ public class ItemSoilMeter extends Item {
             EnumMoisture moisture = soil.getMoisture(world, x, y, z);
             EnumAcidity pH = soil.getPH(world, x, y, z);
 
-            EnumChatFormatting[] colors = new EnumChatFormatting[] {
-                EnumChatFormatting.DARK_GRAY, EnumChatFormatting.GOLD, EnumChatFormatting.LIGHT_PURPLE,
-            };
+            EnumChatFormatting[] colors = new EnumChatFormatting[] { EnumChatFormatting.DARK_GRAY,
+                    EnumChatFormatting.GOLD, EnumChatFormatting.LIGHT_PURPLE, };
             String info = I18N.localise("botany.soil.tooltip.type") + " ";
             info += colors[type.ordinal()] + AlleleHelper.toDisplay(type) + EnumChatFormatting.RESET;
 
-            colors = new EnumChatFormatting[] {
-                EnumChatFormatting.YELLOW, EnumChatFormatting.GRAY, EnumChatFormatting.BLUE,
-            };
+            colors = new EnumChatFormatting[] { EnumChatFormatting.YELLOW, EnumChatFormatting.GRAY,
+                    EnumChatFormatting.BLUE, };
             info += ", " + I18N.localise("botany.soil.tooltip.moisture") + " ";
             info += colors[moisture.ordinal()] + AlleleHelper.toDisplay(moisture) + EnumChatFormatting.RESET;
 
-            colors = new EnumChatFormatting[] {
-                EnumChatFormatting.RED, EnumChatFormatting.GREEN, EnumChatFormatting.AQUA,
-            };
+            colors = new EnumChatFormatting[] { EnumChatFormatting.RED, EnumChatFormatting.GREEN,
+                    EnumChatFormatting.AQUA, };
             info += ", " + I18N.localise("botany.soil.tooltip.pH") + " ";
             info += colors[pH.ordinal()] + AlleleHelper.toDisplay(pH) + EnumChatFormatting.RESET;
             IChatComponent chat = new ChatComponentText(info);

src/main/java/binnie/botany/gardening/ItemTrowel.java

@@ -1,12 +1,7 @@
 package binnie.botany.gardening;
 
-import binnie.botany.Botany;
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.api.EnumAcidity;
-import binnie.botany.api.EnumMoisture;
-import binnie.botany.api.EnumSoilType;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -15,7 +10,16 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
+import binnie.botany.Botany;
+import binnie.botany.CreativeTabBotany;
+import binnie.botany.api.EnumAcidity;
+import binnie.botany.api.EnumMoisture;
+import binnie.botany.api.EnumSoilType;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class ItemTrowel extends Item {
+
     protected Item.ToolMaterial theToolMaterial;
     String locName;
 
@@ -26,6 +30,8 @@ public class ItemTrowel extends Item {
         setCreativeTab(CreativeTabBotany.instance);
         setUnlocalizedName("trowel" + material);
         locName = "trowel" + material;
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override
@@ -35,17 +41,8 @@ public class ItemTrowel extends Item {
     }
 
     @Override
-    public boolean onItemUse(
-            ItemStack stack,
-            EntityPlayer player,
-            World world,
-            int x,
-            int y,
-            int z,
-            int side,
-            float blockX,
-            float blockY,
-            float blockZ) {
+    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
+            float blockX, float blockY, float blockZ) {
         if (!player.canPlayerEdit(x, y, z, side, stack)) {
             return false;
         }

src/main/java/binnie/botany/gardening/ItemWeed.java

@@ -1,13 +1,15 @@
 package binnie.botany.gardening;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class ItemWeed extends ItemBlock {
+
     public ItemWeed(Block block) {
         super(block);
         setHasSubtypes(true);

src/main/java/binnie/botany/gardening/ModuleGardening.java

@@ -1,6 +1,17 @@
 package binnie.botany.gardening;
 
-import binnie.Binnie;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+import net.minecraftforge.oredict.RecipeSorter;
+import net.minecraftforge.oredict.ShapedOreRecipe;
+import net.minecraftforge.oredict.ShapelessOreRecipe;
+
 import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
 import binnie.botany.api.EnumAcidity;
@@ -25,19 +36,11 @@ import binnie.core.block.ItemMetadata;
 import binnie.core.block.ItemMetadataRenderer;
 import binnie.core.block.MultipassItemRenderer;
 import binnie.core.block.TileEntityMetadata;
+import binnie.core.item.ItemMisc;
 import cpw.mods.fml.common.registry.GameRegistry;
-import java.util.HashMap;
-import java.util.Map;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-import net.minecraftforge.oredict.RecipeSorter;
-import net.minecraftforge.oredict.ShapedOreRecipe;
-import net.minecraftforge.oredict.ShapelessOreRecipe;
 
 public class ModuleGardening implements IInitializable {
+
     public static HashMap<ItemStack, Integer> queuedAcidFertilisers = new HashMap<>();
     public static HashMap<ItemStack, Integer> queuedAlkalineFertilisers = new HashMap<>();
     public static HashMap<ItemStack, Integer> queuedNutrientFertilisers = new HashMap<>();
@@ -72,7 +75,7 @@ public class ModuleGardening implements IInitializable {
         Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron");
         Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.EMERALD, "Diamond");
         Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold");
-        Botany.misc = Binnie.Item.registerMiscItems(BotanyItems.values(), CreativeTabBotany.instance);
+        Botany.misc = new ItemMisc(CreativeTabBotany.instance, BotanyItems.values());
         Botany.pigment = new ItemPigment();
         Botany.clay = new ItemClay();
 
@@ -86,13 +89,13 @@ public class ModuleGardening implements IInitializable {
 
         Botany.ceramicTile = new BlockCeramicPatterned();
         GameRegistry.registerBlock(Botany.ceramicTile, ItemMetadata.class, "ceramicPattern");
-        BinnieCore.proxy.registerCustomItemRenderer(
-                Item.getItemFromBlock(Botany.ceramicTile), new MultipassItemRenderer());
+        BinnieCore.proxy
+                .registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicTile), new MultipassItemRenderer());
 
         Botany.ceramicBrick = new BlockCeramicBrick();
         GameRegistry.registerBlock(Botany.ceramicBrick, ItemMetadata.class, "ceramicBrick");
-        BinnieCore.proxy.registerCustomItemRenderer(
-                Item.getItemFromBlock(Botany.ceramicBrick), new MultipassItemRenderer());
+        BinnieCore.proxy
+                .registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicBrick), new MultipassItemRenderer());
     }
 
     @Override
@@ -104,11 +107,11 @@ public class ModuleGardening implements IInitializable {
         ItemStack red = new ItemStack(Blocks.red_flower, 1);
         ItemStack blue = new ItemStack(Blocks.red_flower, 1, 7);
 
-        for (boolean manual : new boolean[] {true, false}) {
-            for (boolean fertilised : new boolean[] {true, false}) {
-                for (EnumMoisture moist : EnumMoisture.values()) {
-                    ItemStack icon =
-                            (moist == EnumMoisture.DRY) ? yellow : ((moist == EnumMoisture.NORMAL) ? red : blue);
+        for (boolean manual : new boolean[] { true, false }) {
+            for (boolean fertilised : new boolean[] { true, false }) {
+                for (EnumMoisture moist : EnumMoisture.VALUES) {
+                    ItemStack icon = (moist == EnumMoisture.DRY) ? yellow
+                            : ((moist == EnumMoisture.NORMAL) ? red : blue);
                     int insulate = 2 - moist.ordinal();
                     if (fertilised) {
                         insulate += 3;
@@ -159,36 +162,48 @@ public class ModuleGardening implements IInitializable {
         }
 
         GameRegistry.addShapelessRecipe(
-                new ItemStack(Blocks.dirt), new ItemStack(Botany.soil, 1, OreDictionary.WILDCARD_VALUE));
+                new ItemStack(Blocks.dirt),
+                new ItemStack(Botany.soil, 1, OreDictionary.WILDCARD_VALUE));
         GameRegistry.addShapelessRecipe(
-                new ItemStack(Blocks.dirt), new ItemStack(Botany.loam, 1, OreDictionary.WILDCARD_VALUE));
+                new ItemStack(Blocks.dirt),
+                new ItemStack(Botany.loam, 1, OreDictionary.WILDCARD_VALUE));
         GameRegistry.addShapelessRecipe(
-                new ItemStack(Blocks.dirt), new ItemStack(Botany.flowerbed, 1, OreDictionary.WILDCARD_VALUE));
+                new ItemStack(Blocks.dirt),
+                new ItemStack(Botany.flowerbed, 1, OreDictionary.WILDCARD_VALUE));
         GameRegistry.addShapelessRecipe(
-                new ItemStack(Blocks.dirt), new ItemStack(Botany.soilNoWeed, 1, OreDictionary.WILDCARD_VALUE));
+                new ItemStack(Blocks.dirt),
+                new ItemStack(Botany.soilNoWeed, 1, OreDictionary.WILDCARD_VALUE));
         GameRegistry.addShapelessRecipe(
-                new ItemStack(Blocks.dirt), new ItemStack(Botany.loamNoWeed, 1, OreDictionary.WILDCARD_VALUE));
+                new ItemStack(Blocks.dirt),
+                new ItemStack(Botany.loamNoWeed, 1, OreDictionary.WILDCARD_VALUE));
         GameRegistry.addShapelessRecipe(
-                new ItemStack(Blocks.dirt), new ItemStack(Botany.flowerbedNoWeed, 1, OreDictionary.WILDCARD_VALUE));
+                new ItemStack(Blocks.dirt),
+                new ItemStack(Botany.flowerbedNoWeed, 1, OreDictionary.WILDCARD_VALUE));
 
-        GameRegistry.addRecipe(new ShapedOreRecipe(
-                Botany.trowelWood,
-                new Object[] {"d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "plankWood"}));
-        GameRegistry.addRecipe(new ShapedOreRecipe(
-                Botany.trowelStone,
-                new Object[] {"d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "cobblestone"}));
-        GameRegistry.addRecipe(new ShapedOreRecipe(
-                Botany.trowelIron,
-                new Object[] {"d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotIron"}));
-        GameRegistry.addRecipe(new ShapedOreRecipe(
-                Botany.trowelGold,
-                new Object[] {"d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotGold"}));
-        GameRegistry.addRecipe(new ShapedOreRecipe(
-                Botany.trowelDiamond,
-                new Object[] {"d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "gemDiamond"}));
-        GameRegistry.addRecipe(new ShapedOreRecipe(
-                Botany.soilMeter,
-                new Object[] {" gg", " rg", "i  ", 'g', "ingotGold", 'r', "dustRedstone", 'i', "ingotIron"}));
+        GameRegistry.addRecipe(
+                new ShapedOreRecipe(
+                        Botany.trowelWood,
+                        new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "plankWood" }));
+        GameRegistry.addRecipe(
+                new ShapedOreRecipe(
+                        Botany.trowelStone,
+                        new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "cobblestone" }));
+        GameRegistry.addRecipe(
+                new ShapedOreRecipe(
+                        Botany.trowelIron,
+                        new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotIron" }));
+        GameRegistry.addRecipe(
+                new ShapedOreRecipe(
+                        Botany.trowelGold,
+                        new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotGold" }));
+        GameRegistry.addRecipe(
+                new ShapedOreRecipe(
+                        Botany.trowelDiamond,
+                        new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "gemDiamond" }));
+        GameRegistry.addRecipe(
+                new ShapedOreRecipe(
+                        Botany.soilMeter,
+                        new Object[] { " gg", " rg", "i  ", 'g', "ingotGold", 'r', "dustRedstone", 'i', "ingotIron" }));
         GameRegistry.addShapelessRecipe(
                 BotanyItems.Weedkiller.get(4),
                 new ItemStack(Items.spider_eye),
@@ -201,11 +216,13 @@ public class ModuleGardening implements IInitializable {
         GameRegistry.addShapelessRecipe(BotanyItems.CompostPowder.get(4), Mods.forestry.stack("fertilizerBio"));
         GameRegistry.addShapelessRecipe(BotanyItems.FertiliserPowder.get(4), Mods.forestry.stack("fertilizerCompound"));
         GameRegistry.addShapelessRecipe(BotanyItems.PulpPowder.get(4), Mods.forestry.stack("woodPulp"));
-        GameRegistry.addRecipe(new ShapelessOreRecipe(BotanyItems.SulphurPowder.get(4), new Object[] {"dustSulphur"}));
+        GameRegistry
+                .addRecipe(new ShapelessOreRecipe(BotanyItems.SulphurPowder.get(4), new Object[] { "dustSulphur" }));
 
-        GameRegistry.addRecipe(new ShapelessOreRecipe(
-                new ItemStack(Botany.pigment, 2, EnumFlowerColor.BLACK.ordinal()),
-                new Object[] {"pigment", "pigment", "dyeBlack"}));
+        GameRegistry.addRecipe(
+                new ShapelessOreRecipe(
+                        new ItemStack(Botany.pigment, 2, EnumFlowerColor.BLACK.ordinal()),
+                        new Object[] { "pigment", "pigment", "dyeBlack" }));
 
         ModuleGardening.queuedAcidFertilisers.put(BotanyItems.SulphurPowder.get(1), 1);
         ModuleGardening.queuedAcidFertilisers.put(BotanyItems.MulchPowder.get(1), 1);
@@ -221,10 +238,10 @@ public class ModuleGardening implements IInitializable {
         ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "woodPulp")), 2);
         ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.CompostPowder.get(1), 1);
         ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.FertiliserPowder.get(1), 1);
-        ModuleGardening.queuedNutrientFertilisers.put(
-                new ItemStack(GameRegistry.findItem("Forestry", "fertilizerBio")), 2);
-        ModuleGardening.queuedNutrientFertilisers.put(
-                new ItemStack(GameRegistry.findItem("Forestry", "fertilizerCompound")), 2);
+        ModuleGardening.queuedNutrientFertilisers
+                .put(new ItemStack(GameRegistry.findItem("Forestry", "fertilizerBio")), 2);
+        ModuleGardening.queuedNutrientFertilisers
+                .put(new ItemStack(GameRegistry.findItem("Forestry", "fertilizerCompound")), 2);
 
         for (Map.Entry<ItemStack, Integer> entry : ModuleGardening.queuedAcidFertilisers.entrySet()) {
             addAcidFertiliser(entry.getKey(), entry.getValue());
@@ -238,10 +255,10 @@ public class ModuleGardening implements IInitializable {
             addNutrientFertiliser(entry.getKey(), entry.getValue());
         }
 
-        GameRegistry.addRecipe(
-                BotanyItems.Mortar.get(6), " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel);
+        GameRegistry
+                .addRecipe(BotanyItems.Mortar.get(6), " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel);
 
-        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
             ItemStack clay = new ItemStack(Botany.clay, 1, c.ordinal());
             ItemStack pigment = new ItemStack(Botany.pigment, 1, c.ordinal());
             GameRegistry.addShapelessRecipe(clay, Items.clay_ball, Items.clay_ball, Items.clay_ball, pigment);
@@ -259,9 +276,9 @@ public class ModuleGardening implements IInitializable {
             return null;
         }
         return new ItemStack(
-                Gardening.getSoilBlock(EnumSoilType.values()[type]),
+                Gardening.getSoilBlock(EnumSoilType.VALUES[type]),
                 1,
-                BlockSoil.getMeta(EnumAcidity.values()[pH], EnumMoisture.values()[moisture]));
+                BlockSoil.getMeta(EnumAcidity.VALUES[pH], EnumMoisture.VALUES[moisture]));
     }
 
     private void addAcidFertiliser(ItemStack stack, int strengthMax) {

src/main/java/binnie/botany/genetics/AlleleColor.java

@@ -3,10 +3,10 @@ package binnie.botany.genetics;
 import forestry.api.genetics.IAlleleInteger;
 
 public class AlleleColor implements IAlleleInteger {
-    private String uid;
-    private int value;
-    private EnumFlowerColor color;
-    private boolean dominant = true;
+
+    private final String uid;
+    private final int value;
+    private final EnumFlowerColor color;
 
     public AlleleColor(EnumFlowerColor color, String uid, int value) {
         this.color = color;
@@ -21,7 +21,7 @@ public class AlleleColor implements IAlleleInteger {
 
     @Override
     public boolean isDominant() {
-        return dominant;
+        return true;
     }
 
     @Override

src/main/java/binnie/botany/genetics/AlleleEffectNone.java

@@ -1,12 +1,14 @@
 package binnie.botany.genetics;
 
+import net.minecraft.world.World;
+
 import binnie.botany.api.IAlleleFlowerEffect;
 import binnie.botany.api.IFlowerGenome;
 import binnie.core.util.I18N;
 import forestry.api.genetics.IEffectData;
-import net.minecraft.world.World;
 
 public class AlleleEffectNone implements IAlleleFlowerEffect {
+
     @Override
     public boolean isCombinable() {
         return true;

src/main/java/binnie/botany/genetics/BotanistTracker.java

@@ -1,13 +1,15 @@
 package binnie.botany.genetics;
 
+import net.minecraft.entity.player.EntityPlayer;
+
 import binnie.Binnie;
 import binnie.botany.api.IBotanistTracker;
 import forestry.api.genetics.IBreedingTracker;
 import forestry.api.genetics.IIndividual;
 import forestry.core.genetics.BreedingTracker;
-import net.minecraft.entity.player.EntityPlayer;
 
 public class BotanistTracker extends BreedingTracker implements IBotanistTracker {
+
     public BotanistTracker(String s) {
         super(s);
     }

src/main/java/binnie/botany/genetics/ColorMix.java

@@ -4,6 +4,7 @@ import binnie.botany.api.IColourMix;
 import binnie.botany.api.IFlowerColor;
 
 public class ColorMix implements IColourMix {
+
     protected IFlowerColor color1;
     protected IFlowerColor color2;
     protected IFlowerColor result;

src/main/java/binnie/botany/genetics/EnumFlowerColor.java

@@ -1,13 +1,16 @@
 package binnie.botany.genetics;
 
+import java.util.Locale;
+
+import org.apache.commons.lang3.StringUtils;
+
 import binnie.botany.api.IFlowerColor;
 import binnie.botany.core.BotanyCore;
 import binnie.core.util.I18N;
 import forestry.api.genetics.IAlleleInteger;
-import java.util.Locale;
-import org.apache.commons.lang3.StringUtils;
 
 public enum EnumFlowerColor implements IFlowerColor {
+
     AQUAMARINE("aquamarine", 0x7fffd4),
     BLACK("black", 0x282828),
     BLUE("blue", 0x0000ff),
@@ -89,10 +92,14 @@ public enum EnumFlowerColor implements IFlowerColor {
     YELLOW("yellow", 0xffff00),
     YELLOW_GREEN("yellowGreen", 0x9acd32);
 
-    private int color;
-    private int colorDis;
-    private String name;
-    private AlleleColor allele;
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final EnumFlowerColor[] VALUES = values();
+    private final int color;
+    private final int colorDis;
+    private final String name;
+    private final AlleleColor allele;
 
     EnumFlowerColor(String name, int color) {
         this.name = name;
@@ -2960,7 +2967,7 @@ public enum EnumFlowerColor implements IFlowerColor {
     }
 
     public static EnumFlowerColor get(int i) {
-        return values()[Math.max(0, i) % values().length];
+        return VALUES[Math.max(0, i) % VALUES.length];
     }
 
     @Override

src/main/java/binnie/botany/genetics/EnumFlowerType.java

@@ -1,12 +1,14 @@
 package binnie.botany.genetics;
 
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
 import binnie.botany.Botany;
 import binnie.botany.api.EnumFlowerStage;
 import binnie.botany.api.IFlowerType;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.util.IIcon;
 
 public enum EnumFlowerType implements IFlowerType {
+
     DANDELION,
     POPPY,
     ORCHID,
@@ -55,18 +57,22 @@ public enum EnumFlowerType implements IFlowerType {
     DELPHINIUM(2),
     HOLLYHOCK(2);
 
-    protected int sections;
-    protected IIcon[] stem;
-    protected IIcon[] petal;
-    protected IIcon[] variant;
-    protected IIcon[] unflowered;
-    protected IIcon seedStem;
-    protected IIcon seedPetal;
-    protected IIcon seedVariant;
-    protected IIcon pollenStem;
-    protected IIcon pollenPetal;
-    protected IIcon pollenVariant;
-    protected IIcon blank;
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final EnumFlowerType[] VALUES = values();
+    private final int sections;
+    private final IIcon[] stem;
+    private final IIcon[] petal;
+    private final IIcon[] variant;
+    private final IIcon[] unflowered;
+    private IIcon seedStem;
+    private IIcon seedPetal;
+    private IIcon seedVariant;
+    private IIcon pollenStem;
+    private IIcon pollenPetal;
+    private IIcon pollenVariant;
+    private IIcon blank;
 
     EnumFlowerType() {
         this(1);

src/main/java/binnie/botany/genetics/Flower.java

@@ -1,5 +1,11 @@
 package binnie.botany.genetics;
 
+import java.util.List;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+
 import binnie.botany.api.EnumFlowerChromosome;
 import binnie.botany.api.IAlleleFlowerSpecies;
 import binnie.botany.api.IColourMix;
@@ -15,12 +21,9 @@ import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IChromosome;
 import forestry.core.genetics.Chromosome;
 import forestry.core.genetics.Individual;
-import java.util.List;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
 
 public class Flower extends Individual implements IFlower {
+
     public IFlowerGenome genome;
     public IFlowerGenome mate;
 
@@ -56,23 +59,24 @@ public class Flower extends Individual implements IFlower {
         IAlleleFlowerSpecies primary = genome.getPrimary();
         IAlleleFlowerSpecies secondary = genome.getSecondary();
         if (!isPureBred(EnumFlowerChromosome.SPECIES)) {
-            list.add(EnumChatFormatting.BLUE
-                    + I18N.localise("botany.item.tooltip.hybrid", primary.getName(), secondary.getName()));
+            list.add(
+                    EnumChatFormatting.BLUE
+                            + I18N.localise("botany.item.tooltip.hybrid", primary.getName(), secondary.getName()));
         }
 
         list.add(EnumChatFormatting.GRAY + I18N.localise("botany.item.tooltip.age", getAge()));
-        list.add(EnumChatFormatting.GREEN
-                + I18N.localise(
+        list.add(
+                EnumChatFormatting.GREEN + I18N.localise(
                         "botany.item.tooltip.temperature",
                         AlleleHelper.toDisplay(primary.getTemperature()),
                         AlleleHelper.toDisplay(genome.getToleranceTemperature())));
-        list.add(EnumChatFormatting.GREEN
-                + I18N.localise(
+        list.add(
+                EnumChatFormatting.GREEN + I18N.localise(
                         "botany.item.tooltip.moisture",
                         AlleleHelper.toDisplay(primary.getMoisture()),
                         AlleleHelper.toDisplay(genome.getToleranceMoisture())));
-        list.add(EnumChatFormatting.GREEN
-                + I18N.localise(
+        list.add(
+                EnumChatFormatting.GREEN + I18N.localise(
                         "botany.item.tooltip.pH",
                         AlleleHelper.toDisplay(primary.getHumidity()),
                         AlleleHelper.toDisplay(genome.getTolerancePH())));
@@ -88,8 +92,7 @@ public class Flower extends Individual implements IFlower {
     public void readFromNBT(NBTTagCompound nbttagcompound) {
         super.readFromNBT(nbttagcompound);
         if (nbttagcompound == null) {
-            genome = BotanyCore.getFlowerRoot()
-                    .templateAsGenome(BotanyCore.getFlowerRoot().getDefaultTemplate());
+            genome = BotanyCore.getFlowerRoot().templateAsGenome(BotanyCore.getFlowerRoot().getDefaultTemplate());
             return;
         }
 
@@ -235,8 +238,7 @@ public class Flower extends Individual implements IFlower {
         if (colour1 != colour2) {
             for (IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) {
                 if (mutation.isMutation(colour1, colour2) && world.rand.nextFloat() * 100.0f < mutation.getChance()) {
-                    parent1[EnumFlowerChromosome.PRIMARY.ordinal()] =
-                            new Chromosome(mutation.getResult().getAllele());
+                    parent1[EnumFlowerChromosome.PRIMARY.ordinal()] = new Chromosome(mutation.getResult().getAllele());
                 }
             }
         }
@@ -246,8 +248,8 @@ public class Flower extends Individual implements IFlower {
         if (colour1 != colour2) {
             for (IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) {
                 if (mutation.isMutation(colour1, colour2) && world.rand.nextFloat() * 100.0f < mutation.getChance()) {
-                    parent1[EnumFlowerChromosome.SECONDARY.ordinal()] =
-                            new Chromosome(mutation.getResult().getAllele());
+                    parent1[EnumFlowerChromosome.SECONDARY.ordinal()] = new Chromosome(
+                            mutation.getResult().getAllele());
                 }
             }
         }
@@ -257,8 +259,7 @@ public class Flower extends Individual implements IFlower {
         if (colour1 != colour2) {
             for (IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) {
                 if (mutation.isMutation(colour1, colour2) && world.rand.nextFloat() * 100.0f < mutation.getChance()) {
-                    parent1[EnumFlowerChromosome.STEM.ordinal()] =
-                            new Chromosome(mutation.getResult().getAllele());
+                    parent1[EnumFlowerChromosome.STEM.ordinal()] = new Chromosome(mutation.getResult().getAllele());
                 }
             }
         }

src/main/java/binnie/botany/genetics/FlowerGenome.java

@@ -1,5 +1,7 @@
 package binnie.botany.genetics;
 
+import net.minecraft.nbt.NBTTagCompound;
+
 import binnie.Binnie;
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumFlowerChromosome;
@@ -16,9 +18,9 @@ import forestry.api.genetics.IAlleleTolerance;
 import forestry.api.genetics.IChromosome;
 import forestry.api.genetics.ISpeciesRoot;
 import forestry.core.genetics.Genome;
-import net.minecraft.nbt.NBTTagCompound;
 
 public class FlowerGenome extends Genome implements IFlowerGenome {
+
     public FlowerGenome(NBTTagCompound nbttagcompound) {
         super(nbttagcompound);
     }
@@ -94,7 +96,7 @@ public class FlowerGenome extends Genome implements IFlowerGenome {
 
     @Override
     public float getAgeChance() {
-        return 1.0f * (float) Math.sqrt(2.0f / getLifespan());
+        return (float) Math.sqrt(2.0f / getLifespan());
     }
 
     @Override

src/main/java/binnie/botany/genetics/FlowerHelper.java

@@ -1,5 +1,19 @@
 package binnie.botany.genetics;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
+import com.mojang.authlib.GameProfile;
+
 import binnie.botany.Botany;
 import binnie.botany.api.EnumFlowerChromosome;
 import binnie.botany.api.EnumFlowerStage;
@@ -10,7 +24,6 @@ import binnie.botany.api.IFlower;
 import binnie.botany.api.IFlowerGenome;
 import binnie.botany.api.IFlowerMutation;
 import binnie.botany.api.IFlowerRoot;
-import com.mojang.authlib.GameProfile;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IChromosomeType;
@@ -18,25 +31,16 @@ import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IMutation;
 import forestry.api.genetics.ISpeciesType;
 import forestry.core.genetics.SpeciesRoot;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
 
 public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
+
     public static int flowerSpeciesCount = -1;
     public static ArrayList<IFlower> flowerTemplates = new ArrayList<>();
 
     protected static String UID = "rootFlowers";
 
-    private static ArrayList<IFlowerMutation> flowerMutations = new ArrayList<>();
-    private static ArrayList<IColourMix> colourMixes = new ArrayList<>();
+    private static final ArrayList<IFlowerMutation> flowerMutations = new ArrayList<>();
+    private static final ArrayList<IColourMix> colourMixes = new ArrayList<>();
 
     protected Map<ItemStack, IFlower> conversions;
 
@@ -53,8 +57,7 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
     public int getSpeciesCount() {
         if (FlowerHelper.flowerSpeciesCount < 0) {
             FlowerHelper.flowerSpeciesCount = 0;
-            for (Map.Entry<String, IAllele> entry :
-                    AlleleManager.alleleRegistry.getRegisteredAlleles().entrySet()) {
+            for (Map.Entry<String, IAllele> entry : AlleleManager.alleleRegistry.getRegisteredAlleles().entrySet()) {
                 if (entry.getValue() instanceof IAlleleFlowerSpecies
                         && ((IAlleleFlowerSpecies) entry.getValue()).isCounted()) {
                     FlowerHelper.flowerSpeciesCount++;
@@ -185,9 +188,7 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
 
     @Override
     public IAllele[] getRandomTemplate(Random rand) {
-        return speciesTemplates.values()
-                .toArray(new IAllele[0][])[
-                rand.nextInt(speciesTemplates.values().size())];
+        return speciesTemplates.values().toArray(new IAllele[0][])[rand.nextInt(speciesTemplates.values().size())];
     }
 
     @Override
@@ -201,10 +202,8 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
     @Override
     public void registerMutation(IMutation mutation) {
         if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getTemplate()[0].getUID())
-                || AlleleManager.alleleRegistry.isBlacklisted(
-                        mutation.getAllele0().getUID())
-                || AlleleManager.alleleRegistry.isBlacklisted(
-                        mutation.getAllele1().getUID())) {
+                || AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele0().getUID())
+                || AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele1().getUID())) {
             return;
         }
         FlowerHelper.flowerMutations.add((IFlowerMutation) mutation);
@@ -227,13 +226,13 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
     }
 
     @Override
-    public Class getMemberClass() {
+    public Class<? extends IIndividual> getMemberClass() {
         return IFlower.class;
     }
 
     @Override
     public IChromosomeType[] getKaryotype() {
-        return EnumFlowerChromosome.values();
+        return EnumFlowerChromosome.VALUES;
     }
 
     @Override

src/main/java/binnie/botany/genetics/FlowerMutation.java

@@ -1,15 +1,17 @@
 package binnie.botany.genetics;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 import binnie.botany.api.IAlleleFlowerSpecies;
 import binnie.botany.api.IFlowerMutation;
 import binnie.botany.core.BotanyCore;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IGenome;
 import forestry.api.genetics.ISpeciesRoot;
-import java.util.ArrayList;
-import java.util.Collection;
 
 public class FlowerMutation implements IFlowerMutation {
+
     protected IAlleleFlowerSpecies allele0;
     protected IAlleleFlowerSpecies allele1;
     protected IAllele[] template;
@@ -62,12 +64,10 @@ public class FlowerMutation implements IFlowerMutation {
         if (allele0 == null || allele1 == null) {
             return 0.0f;
         }
-        if (this.allele0.getUID().equals(allele0.getUID())
-                && this.allele1.getUID().equals(allele1.getUID())) {
+        if (this.allele0.getUID().equals(allele0.getUID()) && this.allele1.getUID().equals(allele1.getUID())) {
             return getBaseChance();
         }
-        if (this.allele1.getUID().equals(allele0.getUID())
-                && this.allele0.getUID().equals(allele1.getUID())) {
+        if (this.allele1.getUID().equals(allele0.getUID()) && this.allele0.getUID().equals(allele1.getUID())) {
             return getBaseChance();
         }
         return 0.0f;

src/main/java/binnie/botany/genetics/FlowerSpecies.java

@@ -1,5 +1,14 @@
 package binnie.botany.genetics;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+import com.mojang.authlib.GameProfile;
+
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumFlowerChromosome;
 import binnie.botany.api.EnumMoisture;
@@ -9,7 +18,6 @@ import binnie.botany.api.IFlowerType;
 import binnie.botany.core.BotanyCore;
 import binnie.core.util.I18N;
 import binnie.genetics.genetics.AlleleHelper;
-import com.mojang.authlib.GameProfile;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.EnumHumidity;
@@ -22,13 +30,9 @@ import forestry.api.genetics.IClassification;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.ISpeciesRoot;
 import forestry.core.genetics.alleles.EnumAllele;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
 
 public enum FlowerSpecies implements IAlleleFlowerSpecies {
+
     DANDELION("dandelion", "taraxacum", "officinale", EnumFlowerType.DANDELION, EnumFlowerColor.YELLOW),
     POPPY("poppy", "papaver", "rhoeas", EnumFlowerType.POPPY, EnumFlowerColor.RED),
     ORCHID("orchid", "vanda", "coerulea", EnumFlowerType.ORCHID, EnumFlowerColor.DEEP_SKY_BLUE),
@@ -41,156 +45,80 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
     IRIS("iris", "iris", "germanica", EnumFlowerType.IRIS, EnumFlowerColor.LIGHT_GRAY, EnumFlowerColor.PURPLE),
     LAVENDER("lavender", "Lavandula", "angustifolia", EnumFlowerType.LAVENDER, EnumFlowerColor.MEDIUM_ORCHID),
     VIOLA("viola", "viola", "odorata", EnumFlowerType.VIOLA, EnumFlowerColor.MEDIUM_PURPLE, EnumFlowerColor.SLATE_BLUE),
-    DAFFODIL(
-            "daffodil",
-            "narcissus",
-            "pseudonarcissus",
-            EnumFlowerType.DAFFODIL,
-            EnumFlowerColor.YELLOW,
+    DAFFODIL("daffodil", "narcissus", "pseudonarcissus", EnumFlowerType.DAFFODIL, EnumFlowerColor.YELLOW,
             EnumFlowerColor.GOLD),
-    DAHLIA(
-            "dahlia",
-            "dahlia",
-            "variabilis",
-            EnumFlowerType.DAHLIA,
-            EnumFlowerColor.HOT_PINK,
+    DAHLIA("dahlia", "dahlia", "variabilis", EnumFlowerType.DAHLIA, EnumFlowerColor.HOT_PINK,
             EnumFlowerColor.DEEP_PINK),
     PEONY("peony", "paeonia", "suffruticosa", EnumFlowerType.PEONY, EnumFlowerColor.THISTLE),
     ROSE("rose", "rosa", "rubiginosa", EnumFlowerType.ROSE, EnumFlowerColor.RED),
     LILAC("lilac", "syringa", "vulgaris", EnumFlowerType.LILAC, EnumFlowerColor.PLUM),
     HYDRANGEA("hydrangea", "hydrangea", "macrophylla", EnumFlowerType.HYDRANGEA, EnumFlowerColor.DEEP_SKY_BLUE),
     FOXGLOVE("foxglove", "digitalis", "purpurea", EnumFlowerType.FOXGLOVE, EnumFlowerColor.HOT_PINK),
-    ZINNIA(
-            "zinnia",
-            "zinnia",
-            "elegans",
-            EnumFlowerType.ZINNIA,
-            EnumFlowerColor.MEDIUM_VIOLET_RED,
+    ZINNIA("zinnia", "zinnia", "elegans", EnumFlowerType.ZINNIA, EnumFlowerColor.MEDIUM_VIOLET_RED,
             EnumFlowerColor.YELLOW),
-    CHRYSANTHEMUM(
-            "chrysanthemum", "chrysanthemum", "\u00ef?? grandiflorum", EnumFlowerType.MUMS, EnumFlowerColor.VIOLET),
-    MARIGOLD(
-            "marigold",
-            "calendula",
-            "officinalis",
-            EnumFlowerType.MARIGOLD,
-            EnumFlowerColor.GOLD,
+    CHRYSANTHEMUM("chrysanthemum", "chrysanthemum", "ï?? grandiflorum", EnumFlowerType.MUMS, EnumFlowerColor.VIOLET),
+    MARIGOLD("marigold", "calendula", "officinalis", EnumFlowerType.MARIGOLD, EnumFlowerColor.GOLD,
             EnumFlowerColor.DARK_ORANGE),
     GERANIUM("geranium", "geranium", "maderense", EnumFlowerType.GERANIUM, EnumFlowerColor.DEEP_PINK),
     AZALEA("azalea", "rhododendrons", "aurigeranum", EnumFlowerType.AZALEA, EnumFlowerColor.HOT_PINK),
     PRIMROSE("primrose", "primula", "vulgaris", EnumFlowerType.PRIMROSE, EnumFlowerColor.RED, EnumFlowerColor.GOLD),
     ASTER("aster", "aster", "amellus", EnumFlowerType.ASTER, EnumFlowerColor.MEDIUM_PURPLE, EnumFlowerColor.GOLDENROD),
-    CARNATION(
-            "carnation",
-            "dianthus",
-            "caryophyllus",
-            EnumFlowerType.CARNATION,
-            EnumFlowerColor.CRIMSON,
+    CARNATION("carnation", "dianthus", "caryophyllus", EnumFlowerType.CARNATION, EnumFlowerColor.CRIMSON,
             EnumFlowerColor.WHITE),
     LILY("lily", "lilium", "auratum", EnumFlowerType.LILY, EnumFlowerColor.PINK, EnumFlowerColor.GOLD),
     YARROW("yarrow", "achillea", "millefolium", EnumFlowerType.YARROW, EnumFlowerColor.YELLOW),
-    PETUNIA(
-            "petunia",
-            "petunia",
-            "\u00ef?? atkinsiana",
-            EnumFlowerType.PETUNIA,
-            EnumFlowerColor.MEDIUM_VIOLET_RED,
+    PETUNIA("petunia", "petunia", "ï?? atkinsiana", EnumFlowerType.PETUNIA, EnumFlowerColor.MEDIUM_VIOLET_RED,
             EnumFlowerColor.THISTLE),
     AGAPANTHUS("agapanthus", "agapanthus", "praecox", EnumFlowerType.AGAPANTHUS, EnumFlowerColor.DEEP_SKY_BLUE),
-    FUCHSIA(
-            "fuchsia",
-            "fuchsia",
-            "magellanica",
-            EnumFlowerType.FUCHSIA,
-            EnumFlowerColor.DEEP_PINK,
+    FUCHSIA("fuchsia", "fuchsia", "magellanica", EnumFlowerType.FUCHSIA, EnumFlowerColor.DEEP_PINK,
             EnumFlowerColor.MEDIUM_ORCHID),
-    DIANTHUS(
-            "dianthus",
-            "dianthus",
-            "barbatus",
-            EnumFlowerType.DIANTHUS,
-            EnumFlowerColor.CRIMSON,
+    DIANTHUS("dianthus", "dianthus", "barbatus", EnumFlowerType.DIANTHUS, EnumFlowerColor.CRIMSON,
             EnumFlowerColor.HOT_PINK),
     FORGET("forget-me-nots", "myosotis", "arvensis", EnumFlowerType.FORGET, EnumFlowerColor.LIGHT_STEEL_BLUE),
     ANEMONE("anemone", "anemone", "coronaria", EnumFlowerType.ANEMONE, EnumFlowerColor.RED, EnumFlowerColor.MISTY_ROSE),
-    AQUILEGIA(
-            "aquilegia",
-            "aquilegia",
-            "vulgaris",
-            EnumFlowerType.AQUILEGIA,
-            EnumFlowerColor.SLATE_BLUE,
+    AQUILEGIA("aquilegia", "aquilegia", "vulgaris", EnumFlowerType.AQUILEGIA, EnumFlowerColor.SLATE_BLUE,
             EnumFlowerColor.THISTLE),
-    EDELWEISS(
-            "edelweiss",
-            "leontopodium",
-            "alpinum",
-            EnumFlowerType.EDELWEISS,
-            EnumFlowerColor.WHITE,
+    EDELWEISS("edelweiss", "leontopodium", "alpinum", EnumFlowerType.EDELWEISS, EnumFlowerColor.WHITE,
             EnumFlowerColor.KHAKI),
     SCABIOUS("scabious", "scabiosa", "columbaria", EnumFlowerType.SCABIOUS, EnumFlowerColor.ROYAL_BLUE),
-    CONEFLOWER(
-            "coneflower",
-            "echinacea",
-            "purpurea",
-            EnumFlowerType.CONEFLOWER,
-            EnumFlowerColor.VIOLET,
+    CONEFLOWER("coneflower", "echinacea", "purpurea", EnumFlowerType.CONEFLOWER, EnumFlowerColor.VIOLET,
             EnumFlowerColor.DARK_ORANGE),
-    GAILLARDIA(
-            "gaillardia",
-            "gaillardia",
-            "aristata",
-            EnumFlowerType.GAILLARDIA,
-            EnumFlowerColor.DARK_ORANGE,
+    GAILLARDIA("gaillardia", "gaillardia", "aristata", EnumFlowerType.GAILLARDIA, EnumFlowerColor.DARK_ORANGE,
             EnumFlowerColor.YELLOW),
     AURICULA("auricula", "primula", "auricula", EnumFlowerType.AURICULA, EnumFlowerColor.RED, EnumFlowerColor.YELLOW),
     CAMELLIA("camellia", "camellia", "japonica", EnumFlowerType.CAMELLIA, EnumFlowerColor.CRIMSON),
     GOLDENROD("goldenrod", "solidago", "canadensis", EnumFlowerType.GOLDENROD, EnumFlowerColor.GOLD),
-    ALTHEA(
-            "althea",
-            "althaea",
-            "officinalis",
-            EnumFlowerType.ALTHEA,
-            EnumFlowerColor.THISTLE,
+    ALTHEA("althea", "althaea", "officinalis", EnumFlowerType.ALTHEA, EnumFlowerColor.THISTLE,
             EnumFlowerColor.MEDIUM_ORCHID),
-    PENSTEMON(
-            "penstemon",
-            "penstemon",
-            "digitalis",
-            EnumFlowerType.PENSTEMON,
-            EnumFlowerColor.MEDIUM_ORCHID,
+    PENSTEMON("penstemon", "penstemon", "digitalis", EnumFlowerType.PENSTEMON, EnumFlowerColor.MEDIUM_ORCHID,
             EnumFlowerColor.THISTLE),
     DELPHINIUM("delphinium", "delphinium", "staphisagria", EnumFlowerType.DELPHINIUM, EnumFlowerColor.DARK_SLATE_BLUE),
     HOLLYHOCK("hollyhock", "Alcea", "rosea", EnumFlowerType.HOLLYHOCK, EnumFlowerColor.BLACK, EnumFlowerColor.GOLD);
 
-    protected EnumFlowerColor stemColor;
-    protected EnumAllele.Fertility fert;
-    protected EnumAllele.Lifespan life;
-    protected EnumAllele.Sappiness sap;
-    protected IFlowerType type;
-    protected String name;
-    protected String binomial;
-    protected String branchName;
-    protected EnumFlowerColor primaryColor;
-    protected EnumFlowerColor secondaryColor;
-    protected EnumTemperature temperature;
-    protected EnumAcidity pH;
-    protected EnumMoisture moisture;
-    protected EnumTolerance tempTolerance;
-    protected EnumTolerance pHTolerance;
-    protected EnumTolerance moistureTolerance;
-    protected List<IAllele[]> variantTemplates;
-    protected IClassification branch;
+    private EnumFlowerColor stemColor;
+    private EnumAllele.Fertility fert;
+    private EnumAllele.Lifespan life;
+    private EnumAllele.Sappiness sap;
+    private final IFlowerType type;
+    private final String name;
+    private final String binomial;
+    private final String branchName;
+    private final EnumFlowerColor primaryColor;
+    private final EnumFlowerColor secondaryColor;
+    private EnumTemperature temperature;
+    private EnumAcidity pH;
+    private EnumMoisture moisture;
+    private EnumTolerance tempTolerance;
+    private EnumTolerance pHTolerance;
+    private EnumTolerance moistureTolerance;
+    private final List<IAllele[]> variantTemplates;
+    private IClassification branch;
 
     FlowerSpecies(String name, String branch, String binomial, IFlowerType type, EnumFlowerColor colour) {
         this(name, branch, binomial, type, colour, colour);
     }
 
-    FlowerSpecies(
-            String name,
-            String branch,
-            String binomial,
-            IFlowerType type,
-            EnumFlowerColor primaryColor,
+    FlowerSpecies(String name, String branch, String binomial, IFlowerType type, EnumFlowerColor primaryColor,
             EnumFlowerColor secondaryColor) {
         this.name = name;
         this.binomial = binomial;
@@ -211,21 +139,16 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
     public static void setupVariants() {
         FlowerSpecies.DANDELION
                 .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.LOWER)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1)
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1)
                 .setStemColor(EnumFlowerColor.GREEN);
 
         FlowerSpecies.POPPY
                 .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.AVERAGE)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
-                .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2)
-                .setStemColor(EnumFlowerColor.GREEN);
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
+                .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2).setStemColor(EnumFlowerColor.GREEN);
 
-        FlowerSpecies.ORCHID
-                .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW)
-                .setPH(EnumAcidity.ACID, EnumTolerance.NONE)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1)
+        FlowerSpecies.ORCHID.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW)
+                .setPH(EnumAcidity.ACID, EnumTolerance.NONE).setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1)
                 .setStemColor(EnumFlowerColor.GREEN);
 
         FlowerSpecies.ALLIUM
@@ -233,224 +156,175 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
                 .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1)
                 .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
 
-        FlowerSpecies.BLUET
-                .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOWER)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
-                .setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE)
+        FlowerSpecies.BLUET.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOWER)
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE)
                 .setStemColor(EnumFlowerColor.OLIVE_DRAB);
 
         FlowerSpecies.TULIP
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.AVERAGE)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1)
-                .setStemColor(EnumFlowerColor.OLIVE_DRAB);
+                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.OLIVE_DRAB);
 
-        FlowerSpecies.DAISY
-                .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
-                .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2)
-                .setStemColor(EnumFlowerColor.OLIVE_DRAB);
+        FlowerSpecies.DAISY.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW)
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
+                .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2).setStemColor(EnumFlowerColor.OLIVE_DRAB);
 
         FlowerSpecies.CORNFLOWER
                 .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.LOW)
                 .setMutation(FlowerSpecies.DANDELION, FlowerSpecies.TULIP, 10)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
-                .setStemColor(EnumFlowerColor.OLIVE_DRAB);
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.OLIVE_DRAB);
 
         FlowerSpecies.PANSY
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.AVERAGE)
-                .setMutation(FlowerSpecies.TULIP, FlowerSpecies.VIOLA, 5)
-                .setPH(EnumAcidity.ACID, EnumTolerance.NONE)
-                .setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1)
-                .setStemColor(EnumFlowerColor.SEA_GREEN);
+                .setMutation(FlowerSpecies.TULIP, FlowerSpecies.VIOLA, 5).setPH(EnumAcidity.ACID, EnumTolerance.NONE)
+                .setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.SEA_GREEN);
 
         FlowerSpecies.IRIS
                 .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.AVERAGE)
-                .setMutation(FlowerSpecies.ORCHID, FlowerSpecies.VIOLA, 10)
-                .setPH(EnumAcidity.ACID, EnumTolerance.NONE)
-                .setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1)
-                .setStemColor(EnumFlowerColor.SEA_GREEN);
+                .setMutation(FlowerSpecies.ORCHID, FlowerSpecies.VIOLA, 10).setPH(EnumAcidity.ACID, EnumTolerance.NONE)
+                .setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.SEA_GREEN);
 
         FlowerSpecies.LAVENDER
                 .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW)
                 .setMutation(FlowerSpecies.ALLIUM, FlowerSpecies.VIOLA, 10)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
-                .setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1)
-                .setStemColor(EnumFlowerColor.GREEN);
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
+                .setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.GREEN);
 
         FlowerSpecies.VIOLA
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.AVERAGE)
-                .setMutation(FlowerSpecies.ORCHID, FlowerSpecies.POPPY, 15)
-                .setPH(EnumAcidity.ACID, EnumTolerance.NONE)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
-                .setStemColor(EnumFlowerColor.OLIVE_DRAB);
+                .setMutation(FlowerSpecies.ORCHID, FlowerSpecies.POPPY, 15).setPH(EnumAcidity.ACID, EnumTolerance.NONE)
+                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.OLIVE_DRAB);
 
         FlowerSpecies.DAFFODIL
                 .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.ELONGATED, EnumAllele.Sappiness.AVERAGE)
                 .setMutation(FlowerSpecies.DANDELION, FlowerSpecies.POPPY, 10)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
-                .setStemColor(EnumFlowerColor.GREEN);
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.GREEN);
 
         FlowerSpecies.ASTER
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGHER)
                 .setMutation(FlowerSpecies.DAISY, FlowerSpecies.TULIP, 10)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
-                .setStemColor(EnumFlowerColor.GREEN);
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.GREEN);
 
         FlowerSpecies.LILAC
                 .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.AVERAGE)
-                .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1)
-                .setStemColor(EnumFlowerColor.OLIVE_DRAB);
+                .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.OLIVE_DRAB);
 
-        FlowerSpecies.ROSE
-                .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.HIGH)
-                .setPH(EnumAcidity.ACID, EnumTolerance.UP_1)
-                .setStemColor(EnumFlowerColor.GREEN);
+        FlowerSpecies.ROSE.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.HIGH)
+                .setPH(EnumAcidity.ACID, EnumTolerance.UP_1).setStemColor(EnumFlowerColor.GREEN);
 
-        FlowerSpecies.PEONY
-                .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.AVERAGE)
-                .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
+        FlowerSpecies.PEONY.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.AVERAGE)
+                .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
                 .setStemColor(EnumFlowerColor.DARK_GREEN);
 
         FlowerSpecies.MARIGOLD
                 .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.AVERAGE)
                 .setMutation(FlowerSpecies.DAISY, FlowerSpecies.DANDELION, 10)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
-                .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2)
-                .setStemColor(EnumFlowerColor.GREEN);
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
+                .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2).setStemColor(EnumFlowerColor.GREEN);
 
         FlowerSpecies.HYDRANGEA
                 .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.HIGH)
                 .setMutation(FlowerSpecies.PEONY, FlowerSpecies.BLUET, 10)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
-                .setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE)
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE)
                 .setStemColor(EnumFlowerColor.DARK_GREEN);
 
         FlowerSpecies.FOXGLOVE
                 .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.LOW)
                 .setMutation(FlowerSpecies.LILAC, FlowerSpecies.ZINNIA, 5)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
                 .setStemColor(EnumFlowerColor.DARK_GREEN);
 
         FlowerSpecies.DAHLIA
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.AVERAGE)
                 .setMutation(FlowerSpecies.DAISY, FlowerSpecies.ALLIUM, 15)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
-                .setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2)
-                .setStemColor(EnumFlowerColor.OLIVE_DRAB);
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
+                .setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2).setStemColor(EnumFlowerColor.OLIVE_DRAB);
 
         FlowerSpecies.CHRYSANTHEMUM
                 .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.HIGH)
                 .setMutation(FlowerSpecies.GERANIUM, FlowerSpecies.ROSE, 10)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
                 .setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN);
 
         FlowerSpecies.CARNATION
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGH)
                 .setMutation(FlowerSpecies.DIANTHUS, FlowerSpecies.ROSE, 5)
-                .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1)
-                .setStemColor(EnumFlowerColor.SEA_GREEN);
+                .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.SEA_GREEN);
 
         FlowerSpecies.ZINNIA
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.AVERAGE)
                 .setMutation(FlowerSpecies.DAHLIA, FlowerSpecies.MARIGOLD, 5)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
                 .setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2)
                 .setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN);
 
         FlowerSpecies.PRIMROSE
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.AVERAGE)
                 .setMutation(FlowerSpecies.CHRYSANTHEMUM, FlowerSpecies.AURICULA, 5)
-                .setPH(EnumAcidity.ACID, EnumTolerance.UP_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
+                .setPH(EnumAcidity.ACID, EnumTolerance.UP_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
                 .setStemColor(EnumFlowerColor.GREEN);
 
         FlowerSpecies.AZALEA
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.AVERAGE)
                 .setMutation(FlowerSpecies.ORCHID, FlowerSpecies.GERANIUM, 5)
-                .setPH(EnumAcidity.ACID, EnumTolerance.NONE)
-                .setStemColor(EnumFlowerColor.GREEN);
+                .setPH(EnumAcidity.ACID, EnumTolerance.NONE).setStemColor(EnumFlowerColor.GREEN);
 
-        FlowerSpecies.GERANIUM
-                .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW)
+        FlowerSpecies.GERANIUM.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW)
                 .setMutation(FlowerSpecies.TULIP, FlowerSpecies.ORCHID, 15)
                 .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
                 .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1)
                 .setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN);
 
-        FlowerSpecies.LILY
-                .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW)
+        FlowerSpecies.LILY.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW)
                 .setMutation(FlowerSpecies.TULIP, FlowerSpecies.CHRYSANTHEMUM, 5)
                 .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
-                .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1)
-                .setStemColor(EnumFlowerColor.GREEN);
+                .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.GREEN);
 
-        FlowerSpecies.YARROW
-                .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW)
+        FlowerSpecies.YARROW.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW)
                 .setMutation(FlowerSpecies.DANDELION, FlowerSpecies.ORCHID, 10)
-                .setPH(EnumAcidity.ACID, EnumTolerance.UP_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
+                .setPH(EnumAcidity.ACID, EnumTolerance.UP_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
                 .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN);
 
         FlowerSpecies.PETUNIA
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.AVERAGE)
                 .setMutation(FlowerSpecies.TULIP, FlowerSpecies.DAHLIA, 5)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
-                .setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1)
-                .setStemColor(EnumFlowerColor.GREEN);
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
+                .setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1).setStemColor(EnumFlowerColor.GREEN);
 
         FlowerSpecies.AGAPANTHUS
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW)
                 .setMutation(FlowerSpecies.ALLIUM, FlowerSpecies.GERANIUM, 5)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
                 .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1)
                 .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN);
 
         FlowerSpecies.FUCHSIA
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.AVERAGE)
                 .setMutation(FlowerSpecies.FOXGLOVE, FlowerSpecies.DAHLIA, 5)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
-                .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1)
-                .setStemColor(EnumFlowerColor.SEA_GREEN);
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
+                .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.SEA_GREEN);
 
         FlowerSpecies.DIANTHUS
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORT, EnumAllele.Sappiness.HIGH)
                 .setMutation(FlowerSpecies.TULIP, FlowerSpecies.POPPY, 15)
                 .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1)
                 .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
-                .setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2)
-                .setStemColor(EnumFlowerColor.OLIVE_DRAB);
+                .setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2).setStemColor(EnumFlowerColor.OLIVE_DRAB);
 
         FlowerSpecies.FORGET
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORT, EnumAllele.Sappiness.LOWER)
-                .setMutation(FlowerSpecies.ORCHID, FlowerSpecies.BLUET, 10)
-                .setPH(EnumAcidity.ACID, EnumTolerance.NONE)
+                .setMutation(FlowerSpecies.ORCHID, FlowerSpecies.BLUET, 10).setPH(EnumAcidity.ACID, EnumTolerance.NONE)
                 .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
-                .setTemperature(EnumTemperature.NORMAL, EnumTolerance.UP_1)
-                .setStemColor(EnumFlowerColor.GREEN);
+                .setTemperature(EnumTemperature.NORMAL, EnumTolerance.UP_1).setStemColor(EnumFlowerColor.GREEN);
 
-        FlowerSpecies.ANEMONE
-                .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW)
+        FlowerSpecies.ANEMONE.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW)
                 .setMutation(FlowerSpecies.AQUILEGIA, FlowerSpecies.ROSE, 5)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
                 .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN);
 
         FlowerSpecies.AQUILEGIA
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.AVERAGE)
                 .setMutation(FlowerSpecies.IRIS, FlowerSpecies.POPPY, 5)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
-                .setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN);
+                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1).setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN);
 
         FlowerSpecies.EDELWEISS
                 .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOWEST)
@@ -464,34 +338,28 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.LOW)
                 .setMutation(FlowerSpecies.ALLIUM, FlowerSpecies.CORNFLOWER, 5)
                 .setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1)
-                .setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1)
-                .setStemColor(EnumFlowerColor.OLIVE_DRAB);
+                .setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.OLIVE_DRAB);
 
         FlowerSpecies.CONEFLOWER
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGHER)
                 .setMutation(FlowerSpecies.TULIP, FlowerSpecies.CORNFLOWER, 5)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
-                .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN);
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN);
 
         FlowerSpecies.GAILLARDIA
                 .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.HIGHER)
                 .setMutation(FlowerSpecies.DANDELION, FlowerSpecies.MARIGOLD, 5)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
-                .setMoisture(EnumMoisture.DAMP, EnumTolerance.DOWN_1)
-                .setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2)
-                .setStemColor(EnumFlowerColor.OLIVE_DRAB);
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setMoisture(EnumMoisture.DAMP, EnumTolerance.DOWN_1)
+                .setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2).setStemColor(EnumFlowerColor.OLIVE_DRAB);
 
         FlowerSpecies.AURICULA
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.ELONGATED, EnumAllele.Sappiness.HIGH)
                 .setMutation(FlowerSpecies.POPPY, FlowerSpecies.GERANIUM, 10)
-                .setPH(EnumAcidity.ACID, EnumTolerance.UP_1)
-                .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
+                .setPH(EnumAcidity.ACID, EnumTolerance.UP_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
                 .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN);
 
         FlowerSpecies.CAMELLIA
                 .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGH)
-                .setMutation(FlowerSpecies.HYDRANGEA, FlowerSpecies.ROSE, 5)
-                .setPH(EnumAcidity.ACID, EnumTolerance.NONE)
+                .setMutation(FlowerSpecies.HYDRANGEA, FlowerSpecies.ROSE, 5).setPH(EnumAcidity.ACID, EnumTolerance.NONE)
                 .setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE)
                 .setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1)
                 .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN);
@@ -499,22 +367,18 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
         FlowerSpecies.GOLDENROD
                 .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGHER)
                 .setMutation(FlowerSpecies.LILAC, FlowerSpecies.MARIGOLD, 10)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
-                .setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN);
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN);
 
         FlowerSpecies.ALTHEA
                 .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.ELONGATED, EnumAllele.Sappiness.HIGH)
                 .setMutation(FlowerSpecies.HYDRANGEA, FlowerSpecies.IRIS, 5)
                 .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
-                .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1)
-                .setStemColor(EnumFlowerColor.DARK_GREEN);
+                .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.DARK_GREEN);
 
-        FlowerSpecies.PENSTEMON
-                .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW)
+        FlowerSpecies.PENSTEMON.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW)
                 .setMutation(FlowerSpecies.PEONY, FlowerSpecies.LILAC, 5)
                 .setMoisture(EnumMoisture.DRY, EnumTolerance.UP_1)
-                .setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1)
-                .setStemColor(EnumFlowerColor.OLIVE_DRAB);
+                .setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1).setStemColor(EnumFlowerColor.OLIVE_DRAB);
 
         FlowerSpecies.DELPHINIUM
                 .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.LOW)
@@ -523,11 +387,9 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
                 .setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1)
                 .setStemColor(EnumFlowerColor.DARK_SEA_GREEN);
 
-        FlowerSpecies.HOLLYHOCK
-                .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.HIGH)
+        FlowerSpecies.HOLLYHOCK.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.HIGH)
                 .setMutation(FlowerSpecies.DELPHINIUM, FlowerSpecies.LAVENDER, 5)
-                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1)
-                .setStemColor(EnumFlowerColor.GREEN);
+                .setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1).setStemColor(EnumFlowerColor.GREEN);
 
         IFlowerRoot flowerRoot = BotanyCore.getFlowerRoot();
         flowerRoot.addConversion(new ItemStack(Blocks.yellow_flower, 1, 0), FlowerSpecies.DANDELION.getTemplate());
@@ -541,11 +403,14 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
         flowerRoot.addConversion(new ItemStack(Blocks.double_plant, 1, 4), FlowerSpecies.ROSE.getTemplate());
         flowerRoot.addConversion(new ItemStack(Blocks.double_plant, 1, 5), FlowerSpecies.PEONY.getTemplate());
         flowerRoot.addConversion(
-                new ItemStack(Blocks.red_flower, 1, 6), FlowerSpecies.TULIP.addVariant(EnumFlowerColor.WHITE));
+                new ItemStack(Blocks.red_flower, 1, 6),
+                FlowerSpecies.TULIP.addVariant(EnumFlowerColor.WHITE));
         flowerRoot.addConversion(
-                new ItemStack(Blocks.red_flower, 1, 4), FlowerSpecies.TULIP.addVariant(EnumFlowerColor.CRIMSON));
+                new ItemStack(Blocks.red_flower, 1, 4),
+                FlowerSpecies.TULIP.addVariant(EnumFlowerColor.CRIMSON));
         flowerRoot.addConversion(
-                new ItemStack(Blocks.red_flower, 1, 5), FlowerSpecies.TULIP.addVariant(EnumFlowerColor.DARK_ORANGE));
+                new ItemStack(Blocks.red_flower, 1, 5),
+                FlowerSpecies.TULIP.addVariant(EnumFlowerColor.DARK_ORANGE));
 
         for (FlowerSpecies species : values()) {
             String scientific = species.branchName.substring(0, 1).toUpperCase()
@@ -553,8 +418,8 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
             String uid = "flowers." + species.branchName.toLowerCase();
             IClassification branch = AlleleManager.alleleRegistry.getClassification("genus." + uid);
             if (branch == null) {
-                branch = AlleleManager.alleleRegistry.createAndRegisterClassification(
-                        IClassification.EnumClassLevel.GENUS, uid, scientific);
+                branch = AlleleManager.alleleRegistry
+                        .createAndRegisterClassification(IClassification.EnumClassLevel.GENUS, uid, scientific);
             }
 
             species.branch = branch;
@@ -567,8 +432,8 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
         return this;
     }
 
-    private FlowerSpecies setTraits(
-            EnumAllele.Fertility fertility, EnumAllele.Lifespan shortened, EnumAllele.Sappiness lower) {
+    private FlowerSpecies setTraits(EnumAllele.Fertility fertility, EnumAllele.Lifespan shortened,
+            EnumAllele.Sappiness lower) {
         fert = fertility;
         life = shortened;
         sap = lower;
@@ -631,7 +496,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
 
     @Override
     public EnumHumidity getHumidity() {
-        return EnumHumidity.values()[getMoisture().ordinal()];
+        return EnumHumidity.VALUES[getMoisture().ordinal()];
     }
 
     @Override

src/main/java/binnie/botany/genetics/FlowerTemplates.java

@@ -7,8 +7,9 @@ import forestry.api.genetics.IAllele;
 import forestry.core.genetics.alleles.EnumAllele;
 
 public class FlowerTemplates {
+
     public static IAllele[] getDefaultTemplate() {
-        IAllele[] alleles = new IAllele[EnumFlowerChromosome.values().length];
+        IAllele[] alleles = new IAllele[EnumFlowerChromosome.VALUES.length];
         alleles[EnumFlowerChromosome.SPECIES.ordinal()] = FlowerSpecies.POPPY;
         alleles[EnumFlowerChromosome.PRIMARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED);
         alleles[EnumFlowerChromosome.SECONDARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED);

src/main/java/binnie/botany/genetics/ItemDictionary.java

@@ -1,12 +1,9 @@
 package binnie.botany.genetics;
 
-import binnie.botany.Botany;
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.core.BotanyGUI;
-import binnie.core.util.I18N;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -15,13 +12,23 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
+import binnie.botany.Botany;
+import binnie.botany.CreativeTabBotany;
+import binnie.botany.core.BotanyGUI;
+import binnie.core.util.I18N;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class ItemDictionary extends Item {
+
     protected IIcon iconMaster;
 
     public ItemDictionary() {
         setCreativeTab(CreativeTabBotany.instance);
         setUnlocalizedName("database");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override
@@ -39,13 +46,13 @@ public class ItemDictionary extends Item {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
+    public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
         super.addInformation(stack, player, tooltip, advanced);
     }
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs tab, List list) {
+    public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
         super.getSubItems(item, tab, list);
         list.add(new ItemStack(item, 1, 1));
     }
@@ -59,8 +66,7 @@ public class ItemDictionary extends Item {
 
     @Override
     public String getItemStackDisplayName(ItemStack stack) {
-        return (stack.getItemDamage() == 0)
-                ? I18N.localise("botany.item.database.0.name")
+        return (stack.getItemDamage() == 0) ? I18N.localise("botany.item.database.0.name")
                 : I18N.localise("botany.item.database.1.name");
     }
 }

src/main/java/binnie/botany/genetics/ModuleGenetics.java

@@ -1,5 +1,9 @@
 package binnie.botany.genetics;
 
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
 import binnie.Binnie;
 import binnie.botany.Botany;
 import binnie.botany.core.BotanyCore;
@@ -17,11 +21,9 @@ import forestry.api.apiculture.FlowerManager;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
 import forestry.api.recipes.RecipeManagers;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
 
 public class ModuleGenetics implements IInitializable {
+
     static AlleleEffectNone alleleEffectNone = new AlleleEffectNone();
 
     @Override
@@ -40,7 +42,7 @@ public class ModuleGenetics implements IInitializable {
 
     @Override
     public void init() {
-        for (EnumFlowerColor color : EnumFlowerColor.values()) {
+        for (EnumFlowerColor color : EnumFlowerColor.VALUES) {
             AlleleManager.alleleRegistry.registerAllele(color.getAllele());
         }
 

src/main/java/binnie/botany/items/BotanyItems.java

@@ -1,14 +1,17 @@
 package binnie.botany.items;
 
-import binnie.botany.Botany;
-import binnie.core.item.IItemMisc;
-import binnie.core.util.I18N;
 import java.util.List;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
+import binnie.botany.Botany;
+import binnie.core.item.IItemMisc;
+import binnie.core.util.I18N;
+
 public enum BotanyItems implements IItemMisc {
+
     AshPowder("powderAsh"),
     PulpPowder("powderPulp"),
     MulchPowder("powderMulch"),
@@ -18,9 +21,9 @@ public enum BotanyItems implements IItemMisc {
     Mortar("mortar"),
     Weedkiller("weedkiller");
 
-    protected IIcon icon;
-    protected String name;
-    protected String iconPath;
+    private IIcon icon;
+    private final String name;
+    private final String iconPath;
 
     BotanyItems(String name) {
         this.name = name;
@@ -38,7 +41,7 @@ public enum BotanyItems implements IItemMisc {
     }
 
     @Override
-    public void addInformation(List data) {
+    public void addInformation(List<String> data) {
         // ignored
     }
 

src/main/java/binnie/botany/items/ItemClay.java

@@ -1,12 +1,9 @@
 package binnie.botany.items;
 
-import binnie.botany.Botany;
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.genetics.EnumFlowerColor;
-import binnie.core.util.I18N;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -14,18 +11,27 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
+import binnie.botany.Botany;
+import binnie.botany.CreativeTabBotany;
+import binnie.botany.genetics.EnumFlowerColor;
+import binnie.core.util.I18N;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class ItemClay extends Item {
+
     public ItemClay() {
         setUnlocalizedName("clay");
         setHasSubtypes(true);
         setCreativeTab(CreativeTabBotany.instance);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override
-    public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
+    public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
         super.addInformation(stack, player, tooltip, advanced);
-        tooltip.add(EnumChatFormatting.GRAY
-                + EnumFlowerColor.get(stack.getItemDamage()).getName());
+        tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(stack.getItemDamage()).getName());
     }
 
     @Override
@@ -42,8 +48,8 @@ public class ItemClay extends Item {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs tab, List list) {
-        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+    public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
+        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
             list.add(new ItemStack(this, 1, c.ordinal()));
         }
     }

src/main/java/binnie/botany/items/ItemPigment.java

@@ -1,12 +1,9 @@
 package binnie.botany.items;
 
-import binnie.botany.Botany;
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.genetics.EnumFlowerColor;
-import binnie.core.util.I18N;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -14,18 +11,27 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
+import binnie.botany.Botany;
+import binnie.botany.CreativeTabBotany;
+import binnie.botany.genetics.EnumFlowerColor;
+import binnie.core.util.I18N;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class ItemPigment extends Item {
+
     public ItemPigment() {
         setUnlocalizedName("pigment");
         setHasSubtypes(true);
         setCreativeTab(CreativeTabBotany.instance);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override
-    public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
+    public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
         super.addInformation(stack, player, tooltip, advanced);
-        tooltip.add(EnumChatFormatting.GRAY
-                + EnumFlowerColor.get(stack.getItemDamage()).getName());
+        tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(stack.getItemDamage()).getName());
     }
 
     @Override
@@ -42,8 +48,8 @@ public class ItemPigment extends Item {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs tab, List list) {
-        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+    public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
+        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
             list.add(new ItemStack(this, 1, c.ordinal()));
         }
     }

src/main/java/binnie/botany/network/MessageFlowerUpdate.java

@@ -1,14 +1,16 @@
 package binnie.botany.network;
 
+import java.io.IOException;
+
 import binnie.botany.flower.TileEntityFlower;
 import binnie.botany.genetics.EnumFlowerColor;
 import binnie.botany.genetics.EnumFlowerType;
 import binnie.core.network.packet.MessageBinnie;
 import binnie.core.network.packet.MessageCoordinates;
 import io.netty.buffer.ByteBuf;
-import java.io.IOException;
 
 public class MessageFlowerUpdate extends MessageCoordinates {
+
     public TileEntityFlower.RenderInfo render;
 
     public MessageFlowerUpdate(int posX, int posY, int posZ, TileEntityFlower.RenderInfo render) {
@@ -37,10 +39,10 @@ public class MessageFlowerUpdate extends MessageCoordinates {
     public void readData(ByteBuf data) throws IOException {
         super.readData(data);
         render = new TileEntityFlower.RenderInfo();
-        render.primary = EnumFlowerColor.values()[data.readByte()];
-        render.secondary = EnumFlowerColor.values()[data.readByte()];
-        render.stem = EnumFlowerColor.values()[data.readByte()];
-        render.type = EnumFlowerType.values()[data.readByte()];
+        render.primary = EnumFlowerColor.get(data.readByte());
+        render.secondary = EnumFlowerColor.get(data.readByte());
+        render.stem = EnumFlowerColor.get(data.readByte());
+        render.type = EnumFlowerType.VALUES[data.readByte()];
         render.age = data.readByte();
         render.section = data.readByte();
         render.wilted = data.readBoolean();

src/main/java/binnie/botany/network/PacketID.java

@@ -1,5 +1,11 @@
 package binnie.botany.network;
 
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+
 import binnie.botany.api.IAlleleFlowerSpecies;
 import binnie.botany.flower.TileEntityFlower;
 import binnie.botany.genetics.EnumFlowerColor;
@@ -10,13 +16,9 @@ import binnie.core.network.packet.MessageNBT;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import cpw.mods.fml.relauncher.Side;
 import forestry.api.genetics.AlleleManager;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.IChatComponent;
 
 public enum PacketID implements IPacketID {
+
     FieldKit,
     FlowerUpdate;
 
@@ -45,10 +47,10 @@ public enum PacketID implements IPacketID {
         if (data.hasNoTags()) {
             info += "Flower has not been discovered by you. Breed this flower yourself to discover.";
         } else {
-            IAlleleFlowerSpecies primary =
-                    (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species"));
-            IAlleleFlowerSpecies secondary =
-                    (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species2"));
+            IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry
+                    .getAllele(data.getString("Species"));
+            IAlleleFlowerSpecies secondary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry
+                    .getAllele(data.getString("Species2"));
             float age = data.getFloat("Age");
             EnumFlowerColor color1 = EnumFlowerColor.get(data.getShort("Colour"));
             EnumFlowerColor color2 = EnumFlowerColor.get(data.getShort("Colour2"));

src/main/java/binnie/botany/proxy/IBotanyProxy.java

@@ -2,4 +2,5 @@ package binnie.botany.proxy;
 
 import binnie.core.proxy.IProxyCore;
 
-public interface IBotanyProxy extends IProxyCore {}
+public interface IBotanyProxy extends IProxyCore {
+}

src/main/java/binnie/botany/proxy/Proxy.java

@@ -4,6 +4,7 @@ import binnie.botany.Botany;
 import binnie.core.proxy.BinnieModProxy;
 
 public class Proxy extends BinnieModProxy implements IBotanyProxy {
+
     public Proxy() {
         super(Botany.instance);
     }

src/main/java/binnie/botany/proxy/ProxyClient.java

@@ -1,3 +1,4 @@
 package binnie.botany.proxy;
 
-public class ProxyClient extends Proxy implements IBotanyProxy {}
+public class ProxyClient extends Proxy implements IBotanyProxy {
+}

src/main/java/binnie/botany/proxy/ProxyServer.java

@@ -1,3 +1,4 @@
 package binnie.botany.proxy;
 
-public class ProxyServer extends Proxy implements IBotanyProxy {}
+public class ProxyServer extends Proxy implements IBotanyProxy {
+}

src/main/java/binnie/core/AbstractMod.java

@@ -1,8 +1,9 @@
 package binnie.core;
 
-import binnie.Binnie;
+import java.util.ArrayList;
+import java.util.List;
+
 import binnie.core.gui.IBinnieGUID;
-import binnie.core.mod.parser.FieldParser;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
 import binnie.core.network.IPacketProvider;
@@ -11,26 +12,20 @@ import binnie.core.proxy.IProxyCore;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import cpw.mods.fml.relauncher.Side;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import net.minecraftforge.common.MinecraftForge;
 
 public abstract class AbstractMod implements IPacketProvider, IInitializable {
+
     private SimpleNetworkWrapper wrapper;
-    private final LinkedHashSet<Field> fields;
     protected final List<IInitializable> modules;
 
     public AbstractMod() {
-        fields = new LinkedHashSet<>();
         modules = new ArrayList<>();
         BinnieCore.registerMod(this);
-        MinecraftForge.EVENT_BUS.register(this);
     }
 
-    public abstract boolean isActive();
+    public boolean isActive() {
+        return true;
+    }
 
     @Override
     public abstract String getChannel();
@@ -44,10 +39,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
         return new IBinnieGUID[0];
     }
 
-    public Class[] getConfigs() {
-        return new Class[0];
-    }
-
     public abstract IProxyCore getProxy();
 
     public abstract String getModID();
@@ -64,32 +55,10 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
             return;
         }
 
-        if (getConfigs() != null) {
-            for (Class cls : getConfigs()) {
-                Binnie.Configuration.registerConfiguration(cls, this);
-            }
-        }
-
         getProxy().preInit();
         for (IInitializable module : modules) {
             module.preInit();
         }
-
-        // TODO what does it mean?
-        Collections.addAll(fields, getClass().getFields());
-        for (Class cls : getClass().getClasses()) {
-            Collections.addAll(fields, getClass().getFields());
-        }
-        for (IInitializable module : modules) {
-            Collections.addAll(fields, module.getClass().getFields());
-        }
-        for (Field field4 : fields) {
-            try {
-                FieldParser.preInitParse(field4, this);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
     }
 
     @Override
@@ -105,14 +74,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
         for (IInitializable module : modules) {
             module.init();
         }
-
-        for (Field field : fields) {
-            try {
-                FieldParser.initParse(field, this);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
     }
 
     @Override
@@ -125,18 +86,10 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
         for (IInitializable module : modules) {
             module.postInit();
         }
-
-        for (Field field : fields) {
-            try {
-                FieldParser.postInitParse(field, this);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
     }
 
     protected void addModule(IInitializable init) {
         modules.add(init);
-        MinecraftForge.EVENT_BUS.register(init);
+        init.registerEventHandler();
     }
 }

src/main/java/binnie/core/BinnieCore.java

@@ -1,8 +1,18 @@
 package binnie.core;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.Item;
+import net.minecraft.server.MinecraftServer;
+import net.minecraftforge.client.event.TextureStitchEvent;
+import net.minecraftforge.common.MinecraftForge;
+
 import binnie.Binnie;
 import binnie.core.block.MultipassBlockRenderer;
 import binnie.core.block.TileEntityMetadata;
+import binnie.core.config.BCConfig;
 import binnie.core.craftgui.minecraft.ModuleCraftGUI;
 import binnie.core.gui.BinnieCoreGUI;
 import binnie.core.gui.BinnieGUIHandler;
@@ -13,10 +23,6 @@ import binnie.core.liquid.FluidContainer;
 import binnie.core.liquid.ItemFluidContainer;
 import binnie.core.machines.MachineGroup;
 import binnie.core.machines.storage.ModuleStorage;
-import binnie.core.mod.config.ConfigurationMain;
-import binnie.core.mod.config.ConfigurationMods;
-import binnie.core.mod.parser.FieldParser;
-import binnie.core.mod.parser.ItemParser;
 import binnie.core.network.BinnieCorePacketID;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
@@ -38,21 +44,18 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.ForestryEvent;
 import forestry.plugins.PluginManager;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.Item;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.server.MinecraftServer;
-import net.minecraftforge.client.event.TextureStitchEvent;
 
 @Mod(
-        modid = "BinnieCore",
-        name = "Binnie Core",
-        version = BinnieCore.VERSION,
+        modid = BinnieCore.CORE_MODID,
+        name = BinnieCore.CORE_MOD_NAME,
+        version = Tags.VERSION,
         useMetadata = true,
         dependencies = "after:Forestry@[4.2,),required-after:gtnhlib@[0.0.10,)")
 public class BinnieCore extends AbstractMod {
+
+    public static final String CORE_MODID = "BinnieCore";
+    public static final String CORE_MOD_NAME = "Binnie Core";
+
     @Mod.Instance("BinnieCore")
     public static BinnieCore instance;
 
@@ -60,21 +63,25 @@ public class BinnieCore extends AbstractMod {
     public static BinnieProxy proxy;
 
     public static int multipassRenderID;
-    private static List<AbstractMod> modList = new ArrayList<>();
+    private static final List<AbstractMod> modList = new ArrayList<>();
     public static MachineGroup packageCompartment;
     public static ItemGenesis genesis;
     public static ItemFieldKit fieldKit;
-    public static final String VERSION = "GRADLETOKEN_VERSION";
+
+    public BinnieCore() {
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
+    }
 
     @Mod.EventHandler
-    public void preInit(FMLPreInitializationEvent evt) {
-        Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this);
+    public void preInit(FMLPreInitializationEvent event) {
         for (ManagerBase baseManager : Binnie.Managers) {
             addModule(baseManager);
         }
 
         addModule(new ModuleCraftGUI());
-        addModule(new ModuleStorage());
+        if (!BCConfig.disableCompartments) {
+            addModule(new ModuleStorage());
+        }
         addModule(new ModuleItems());
         if (Loader.isModLoaded("BuildCraft|Silicon")) {
             addModule(new ModuleTrigger());
@@ -83,12 +90,12 @@ public class BinnieCore extends AbstractMod {
     }
 
     @Mod.EventHandler
-    public void init(FMLInitializationEvent evt) {
+    public void init(FMLInitializationEvent event) {
         init();
     }
 
     @Mod.EventHandler
-    public void postInit(FMLPostInitializationEvent evt) {
+    public void postInit(FMLPostInitializationEvent event) {
         postInit();
     }
 
@@ -104,7 +111,6 @@ public class BinnieCore extends AbstractMod {
             Item item = new ItemFluidContainer(container);
             GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
         }
-        FieldParser.parsers.add(new ItemParser());
         super.preInit();
     }
 
@@ -132,20 +138,12 @@ public class BinnieCore extends AbstractMod {
         return PluginManager.Module.ARBORICULTURE.isEnabled();
     }
 
-    public static boolean isBotanyActive() {
-        return ConfigurationMods.botany;
-    }
-
-    public static boolean isGeneticsActive() {
-        return ConfigurationMods.genetics;
-    }
-
     public static boolean isExtraBeesActive() {
-        return ConfigurationMods.extraBees && isApicultureActive();
+        return isApicultureActive();
     }
 
     public static boolean isExtraTreesActive() {
-        return ConfigurationMods.extraTrees && isArboricultureActive();
+        return isArboricultureActive();
     }
 
     @Override
@@ -167,23 +165,6 @@ public class BinnieCore extends AbstractMod {
         return list;
     }
 
-    @SubscribeEvent
-    @SideOnly(Side.CLIENT)
-    public void handleSpeciesDiscovered(ForestryEvent.SpeciesDiscovered event) {
-        try {
-            EntityPlayerMP player =
-                    MinecraftServer.getServer().getConfigurationManager().func_152612_a(event.username.getName());
-            if (player == null) {
-                return;
-            }
-            event.tracker.synchToPlayer(player);
-            NBTTagCompound nbt = new NBTTagCompound();
-            nbt.setString("species", event.species.getUID());
-        } catch (Exception ex) {
-            // ignored
-        }
-    }
-
     @Override
     public String getChannel() {
         return "BIN";
@@ -204,20 +185,6 @@ public class BinnieCore extends AbstractMod {
         return BinnieCorePacketID.values();
     }
 
-    @SubscribeEvent
-    @SideOnly(Side.CLIENT)
-    public void handleTextureRemap(TextureStitchEvent.Pre event) {
-        if (event.map.getTextureType() == 0) {
-            Binnie.Liquid.reloadIcons(event.map);
-        }
-        Binnie.Resource.registerIcons(event.map, event.map.getTextureType());
-    }
-
-    @Override
-    public Class<?>[] getConfigs() {
-        return new Class[] {ConfigurationMain.class};
-    }
-
     @Override
     protected Class<? extends BinniePacketHandler> getPacketHandler() {
         return PacketHandler.class;
@@ -229,8 +196,36 @@ public class BinnieCore extends AbstractMod {
     }
 
     public static class PacketHandler extends BinniePacketHandler {
+
         public PacketHandler() {
             super(instance);
         }
     }
+
+    public static class EventHandler {
+
+        @SubscribeEvent
+        @SideOnly(Side.CLIENT)
+        public void handleSpeciesDiscovered(ForestryEvent.SpeciesDiscovered event) {
+            try {
+                EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager()
+                        .func_152612_a(event.username.getName());
+                if (player == null) {
+                    return;
+                }
+                event.tracker.synchToPlayer(player);
+            } catch (Exception ex) {
+                // ignored
+            }
+        }
+
+        @SubscribeEvent
+        @SideOnly(Side.CLIENT)
+        public void handleTextureRemap(TextureStitchEvent.Pre event) {
+            if (event.map.getTextureType() == 0) {
+                Binnie.Liquid.reloadIcons(event.map);
+            }
+            Binnie.Resource.registerIcons(event.map, event.map.getTextureType());
+        }
+    }
 }

src/main/java/binnie/core/IInitializable.java

@@ -1,9 +1,12 @@
 package binnie.core;
 
 public interface IInitializable {
+
     void preInit();
 
     void init();
 
     void postInit();
+
+    default void registerEventHandler() {}
 }