fix isolator consumption chance config source (#87 )

Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: UltraProdigy <[email protected]>
Fix concurrent modification exception (#92 )
2026-11-14 17:24:53 +00:00 · 2026-05-04 01:00:00 +00:00 · 2026-05-03 20:43:05 -04:00 · 2026-04-30 19:02:55 +02:00 · 2026-04-09 20:29:55 +00:00 · 2026-04-07 18:54:15 +02:00
2302 changed files with 3267 additions and 5647 deletions
@@ -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
@@ -1,12 +1,12 @@
 // Add your dependencies here

 dependencies {
-	api('com.github.GTNewHorizons:ForestryMC:4.7.0:dev')
-	implementation('com.github.GTNewHorizons:GTNHLib:0.0.13:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.11.12:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.9.48:dev')

-	devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.4.12-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.88-GTNH:dev')

-	compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.36:api')
-	compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
-	compileOnly("curse.maven:extrabiomesxl-60041:2273301")
+    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")
 }
@@ -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
+
@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/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/faa12903720d410b387cc69ccafb1a74/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/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
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.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
@@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright © 2015-2021 the original 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,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#

 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       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/.
@@ -83,7 +85,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
@@ -111,7 +114,6 @@ case "$( uname )" in                #(
  NONSTOP* )        nonstop=true ;;
 esac

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


 # Determine the Java command to use to start the JVM.
@@ -130,10 +132,13 @@ 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.
+    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.
@@ -141,7 +146,7 @@ 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=SC3045
+        # shellcheck disable=SC2039,SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
@@ -149,7 +154,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
      '' | soft) :;; #(
      *)
        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -166,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

    JAVACMD=$( cygpath --unix "$JAVACMD" )

@@ -198,16 +202,15 @@ 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 $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# 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" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
        "$@"

 # Stop when "xargs" is not available.
@@ -13,6 +13,8 @@
@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
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 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

@@ -57,22 +59,21 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 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

 :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 %*
+"%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
@@ -4,10 +4,10 @@ pluginManagement {
        maven {
            // RetroFuturaGradle
            name "GTNH Maven"
-            url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-            allowInsecureProtocol = true
+            url "https://nexus.gtnewhorizons.com/repository/public/"
            mavenContent {
-                includeGroup("com.gtnewhorizons.retrofuturagradle")
+                includeGroup("com.gtnewhorizons")
+                includeGroupByRegex("com\\.gtnewhorizons\\..+")
            }
        }
        gradlePluginPortal()
@@ -17,12 +17,5 @@ pluginManagement {
 }

 plugins {
-    id 'com.diffplug.blowdryerSetup' version '1.6.0'
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains
-}
-
-blowdryerSetup {
-    repoSubfolder 'gtnhShared'
-    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.0')
-    //devLocal '.' // Use this when testing config updates locally
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24'
 }
@@ -5,19 +5,15 @@ import java.util.List;

 import binnie.core.ManagerBase;
 import binnie.core.genetics.ManagerGenetics;
-import binnie.core.item.ManagerItem;
 import binnie.core.liquid.ManagerLiquid;
 import binnie.core.machines.ManagerMachine;
-import binnie.core.mod.config.ManagerConfig;
 import binnie.core.resource.ManagerResource;

 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();
 }
@@ -6,6 +6,7 @@ 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;
@@ -39,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;
@@ -53,12 +55,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.eventhandler.Event;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;

-@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")
@@ -67,35 +64,41 @@ public class Botany extends AbstractMod {
    @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
@@ -121,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();
@@ -151,120 +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)
@@ -298,27 +182,6 @@ public class Botany extends AbstractMod {
        }
    }

-    @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()) {
@@ -349,4 +212,138 @@ public class Botany extends AbstractMod {
            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);
+            }
+        }
+    }
 }
@@ -6,6 +6,11 @@ public enum EnumAcidity {
    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();
    }
@@ -24,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;
@@ -7,7 +7,7 @@ public enum EnumFlowerStage {
    POLLEN("Pollen"),
    NONE("NONE");

-    protected String name;
+    private final String name;

    EnumFlowerStage(String name) {
        this.name = name;
@@ -6,6 +6,11 @@ public enum EnumMoisture {
    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();
    }
@@ -6,6 +6,11 @@ public enum EnumSoilType {
    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();
    }
@@ -81,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());
    }
@@ -92,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()));
        }
    }
@@ -90,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);
    }
@@ -101,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));
            }
@@ -130,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);
            }
@@ -167,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);
    }

@@ -177,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
@@ -205,9 +208,13 @@ 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];
@@ -216,7 +223,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() {
@@ -224,32 +231,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) {
@@ -541,7 +531,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());
@@ -40,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());
@@ -34,6 +34,7 @@ public class BlockStained extends Block implements IBlockMetadata {

    public BlockStained() {
        super(Material.glass);
+        setHardness(0.3f);
        setCreativeTab(CreativeTabBotany.instance);
        setBlockName("stained");
    }
@@ -111,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());
    }
@@ -122,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()));
        }
    }
@@ -16,7 +16,7 @@ public class CeramicColor implements IDesignMaterial {

    static {
        CeramicColor.map = new LinkedHashMap<>();
-        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
            CeramicColor.map.put(c, new CeramicColor(c));
        }
    }
@@ -74,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(
@@ -52,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;
@@ -13,7 +13,7 @@ public class PigmentRecipe implements IRecipe {

    protected ItemStack cached;

-    private ItemStack unknown;
+    private final ItemStack unknown;

    public PigmentRecipe() {
        unknown = null;
@@ -6,7 +6,7 @@ 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);
@@ -18,7 +18,7 @@ public class ControlColorMixBox extends ControlListBox<IColourMix> {
        return new ControlColorMixItem(getContent(), value, y);
    }

-    enum Type {
+    public enum Type {
        Resultant,
        Further
    }
@@ -91,7 +91,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
                }
            };
            List<IFlowerColor> colors = new ArrayList<>();
-            Collections.addAll(colors, EnumFlowerColor.values());
+            Collections.addAll(colors, EnumFlowerColor.VALUES);
            listBox.setOptions(colors);
        }
    }
@@ -13,11 +13,11 @@ import forestry.api.farming.IFarmHousing;

 public class CircuitGarden extends BinnieCircuit {

-    private boolean isManual;
-    private boolean isFertilised;
-    private ItemStack icon;
-    private EnumMoisture moisture;
-    private EnumAcidity acidity;
+    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) {
@@ -46,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);
@@ -101,8 +101,4 @@ public class CircuitGarden extends BinnieCircuit {
        ((IFarmHousing) tile).resetFarmLogic(FarmDirection.values()[slot]);
    }

-    @Override
-    public void onTick(int arg0, Object arg1) {
-        // ignored
-    }
 }
@@ -129,7 +129,7 @@ public class GardenLogic extends FarmLogic {
                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])) {
+                            .setPH(world, position.x, position.y, position.z, EnumAcidity.VALUES[pH.ordinal() + 1])) {
                        housing.getFarmInventory().removeResources(new ItemStack[] { stack });
                        continue;
                    }
@@ -138,7 +138,7 @@ public class GardenLogic extends FarmLogic {
                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])) {
+                            .setPH(world, position.x, position.y, position.z, EnumAcidity.VALUES[pH.ordinal() - 1])) {
                        housing.getFarmInventory().removeResources(new ItemStack[] { stack });
                        continue;
                    }
@@ -359,8 +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
@@ -55,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);
        }
    }
@@ -85,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));
            }
@@ -93,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 {
@@ -108,15 +108,14 @@ 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);
        }
@@ -129,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;
    }
@@ -153,14 +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);
@@ -212,7 +209,7 @@ public class BlockFlower extends BlockContainer {
        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
+                && !drops.isEmpty()
                && (player == null || !player.capabilities.isCreativeMode)) {
            for (ItemStack drop : drops) {
                dropBlockAsItem(world, x, y, z, drop);
@@ -1,5 +1,7 @@
 package binnie.botany.flower;

+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;

 import net.minecraft.block.Block;
@@ -39,6 +41,8 @@ public abstract class ItemBotany extends Item {
        setCreativeTab(CreativeTabBotany.instance);
        setUnlocalizedName(name);
        hasSubtypes = true;
+
+        registerItem(this, getUnlocalizedName().substring(5));
    }

    @Override
@@ -57,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()) {
@@ -73,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;
        }
@@ -138,11 +137,11 @@ 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;
@@ -199,10 +198,9 @@ public abstract class ItemBotany extends Item {
        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;
            }
@@ -1,5 +1,7 @@
 package binnie.botany.flower;

+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;

 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -25,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) {
@@ -33,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));
@@ -61,7 +65,7 @@ public class ItemInsulatedTube 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);
        tooltip.add(Insulate.get(stack.getItemDamage()).getName());
    }
@@ -93,8 +97,8 @@ public class ItemInsulatedTube extends Item {
        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;
@@ -123,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;
@@ -144,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);
+            };
        }
    }
 }
@@ -25,9 +25,8 @@ public class RendererBotany implements ISimpleBlockRenderingHandler {
        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;
@@ -46,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;
    }
@@ -42,6 +42,7 @@ import forestry.api.genetics.IPollinatable;
 import forestry.api.lepidopterology.IButterfly;
 import forestry.api.lepidopterology.IButterflyNursery;
 import forestry.lepidopterology.entities.EntityButterfly;
+import forestry.plugins.PluginLepidopterology;

 public class TileEntityFlower extends TileEntity implements IPollinatable, IButterflyNursery {

@@ -212,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();
@@ -301,7 +298,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
    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);
            }
        }
@@ -456,7 +453,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
        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)) {
@@ -618,8 +615,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt

        @Override
        public boolean equals(Object obj) {
-            if (obj instanceof RenderInfo) {
-                RenderInfo o = (RenderInfo) obj;
+            if (obj instanceof RenderInfo o) {
                return o.age == age && o.wilted == wilted
                        && o.flowered == flowered
                        && o.primary == primary
@@ -71,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());
        }
@@ -137,7 +137,7 @@ public class BlockPlant extends BlockBush {

        public IIcon icon;

-        protected String name;
+        private final String name;

        Type(String name) {
            this.name = name;
@@ -56,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));
        }
@@ -81,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");
@@ -104,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);
@@ -141,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
@@ -46,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) {
@@ -118,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);
            }
        }

@@ -138,7 +138,7 @@ public class Gardening {
        }

        TileEntity flower = world.getTileEntity(x, y, z);
-        if (flower == null || !(flower instanceof TileEntityFlower)) {
+        if (!(flower instanceof TileEntityFlower)) {
            return;
        }

@@ -151,7 +151,7 @@ public class Gardening {

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

@@ -250,14 +250,11 @@ 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) {
@@ -20,7 +20,7 @@ public class ItemSoil extends ItemBlock {

    protected EnumSoilType type;

-    private boolean noWeed;
+    private final boolean noWeed;

    public ItemSoil(Block block) {
        super(block);
@@ -31,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) {
@@ -45,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);
        }

@@ -1,5 +1,7 @@
 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;
@@ -28,6 +30,8 @@ public class ItemSoilMeter extends Item {
        setCreativeTab(CreativeTabBotany.instance);
        setUnlocalizedName("soilMeter");
        setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
    }

    @Override
@@ -1,5 +1,7 @@
 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;
@@ -28,6 +30,8 @@ public class ItemTrowel extends Item {
        setCreativeTab(CreativeTabBotany.instance);
        setUnlocalizedName("trowel" + material);
        locName = "trowel" + material;
+
+        registerItem(this, getUnlocalizedName().substring(5));
    }

    @Override
@@ -12,7 +12,6 @@ import net.minecraftforge.oredict.RecipeSorter;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;

-import binnie.Binnie;
 import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
 import binnie.botany.api.EnumAcidity;
@@ -37,6 +36,7 @@ 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;

 public class ModuleGardening implements IInitializable {
@@ -75,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();

@@ -109,7 +109,7 @@ public class ModuleGardening implements IInitializable {

        for (boolean manual : new boolean[] { true, false }) {
            for (boolean fertilised : new boolean[] { true, false }) {
-                for (EnumMoisture moist : EnumMoisture.values()) {
+                for (EnumMoisture moist : EnumMoisture.VALUES) {
                    ItemStack icon = (moist == EnumMoisture.DRY) ? yellow
                            : ((moist == EnumMoisture.NORMAL) ? red : blue);
                    int insulate = 2 - moist.ordinal();
@@ -258,7 +258,7 @@ public class ModuleGardening implements IInitializable {
        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);
@@ -276,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) {
@@ -4,10 +4,9 @@ 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;
@@ -22,7 +21,7 @@ public class AlleleColor implements IAlleleInteger {

    @Override
    public boolean isDominant() {
-        return dominant;
+        return true;
    }

    @Override
@@ -92,11 +92,14 @@ public enum EnumFlowerColor implements IFlowerColor {
    YELLOW("yellow", 0xffff00),
    YELLOW_GREEN("yellowGreen", 0x9acd32);

-    private static final EnumFlowerColor[] ALL_VALUES = values();
-    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;
@@ -2964,7 +2967,7 @@ public enum EnumFlowerColor implements IFlowerColor {
    }

    public static EnumFlowerColor get(int i) {
-        return ALL_VALUES[Math.max(0, i) % ALL_VALUES.length];
+        return VALUES[Math.max(0, i) % VALUES.length];
    }

    @Override
@@ -57,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);
@@ -96,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
@@ -39,8 +39,8 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {

    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;

@@ -226,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
@@ -56,8 +56,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
    FOXGLOVE("foxglove", "digitalis", "purpurea", EnumFlowerType.FOXGLOVE, EnumFlowerColor.HOT_PINK),
    ZINNIA("zinnia", "zinnia", "elegans", EnumFlowerType.ZINNIA, EnumFlowerColor.MEDIUM_VIOLET_RED,
            EnumFlowerColor.YELLOW),
-    CHRYSANTHEMUM("chrysanthemum", "chrysanthemum", "\u00ef?? grandiflorum", EnumFlowerType.MUMS,
-            EnumFlowerColor.VIOLET),
+    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),
@@ -68,7 +67,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
            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,
@@ -96,24 +95,24 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
    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);
@@ -497,7 +496,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {

    @Override
    public EnumHumidity getHumidity() {
-        return EnumHumidity.values()[getMoisture().ordinal()];
+        return EnumHumidity.VALUES[getMoisture().ordinal()];
    }

    @Override
@@ -9,7 +9,7 @@ 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);
@@ -1,5 +1,7 @@
 package binnie.botany.genetics;

+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;

 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -25,6 +27,8 @@ public class ItemDictionary extends Item {
        setCreativeTab(CreativeTabBotany.instance);
        setUnlocalizedName("database");
        setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
    }

    @Override
@@ -42,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));
    }
@@ -42,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());
        }

@@ -21,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;
@@ -41,7 +41,7 @@ public enum BotanyItems implements IItemMisc {
    }

    @Override
-    public void addInformation(List data) {
+    public void addInformation(List<String> data) {
        // ignored
    }

@@ -1,5 +1,7 @@
 package binnie.botany.items;

+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;

 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -22,10 +24,12 @@ public class ItemClay extends Item {
        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());
    }
@@ -44,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()));
        }
    }
@@ -1,5 +1,7 @@
 package binnie.botany.items;

+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;

 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -22,10 +24,12 @@ public class ItemPigment extends Item {
        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());
    }
@@ -44,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()));
        }
    }
@@ -39,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();
@@ -1,16 +1,9 @@
 package binnie.core;

-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;
-
-import binnie.Binnie;
 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;
@@ -23,17 +16,16 @@ import cpw.mods.fml.relauncher.Side;
 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();
@@ -47,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();
@@ -67,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
@@ -108,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
@@ -128,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();
    }
 }
@@ -5,13 +5,14 @@ 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;
+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;
@@ -22,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;
@@ -49,13 +46,16 @@ import forestry.api.core.ForestryEvent;
 import forestry.plugins.PluginManager;

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

@@ -63,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());
@@ -86,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();
    }

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

@@ -135,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
@@ -170,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";
@@ -207,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;
@@ -237,4 +201,31 @@ public class BinnieCore extends AbstractMod {
            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());
+        }
+    }
 }
@@ -7,4 +7,6 @@ public interface IInitializable {
    void init();

    void postInit();
+
+    default void registerEventHandler() {}
 }
@@ -9,14 +9,16 @@ import cpw.mods.fml.common.registry.GameRegistry;

 public class Mods {

-    public static Mod forestry;
-    public static Mod ic2;
-    public static Mod botania;
-    public static Mod extraBiomes;
+    public static final Mod forestry = new Mod("Forestry");
+    public static final Mod ic2 = new Mod("IC2");
+    public static final Mod botania = new Mod("Botania");
+    public static final Mod extraBiomes = new Mod("ExtrabiomesXL");
+    public static final Mod dreamcraft = new Mod("dreamcraft");
+    public static final Mod buildcraftCore = new Mod("BuildCraft|Core");

    private static Item findItem(String modId, String name) {
        Item stack = GameRegistry.findItem(modId, name);
-        if (stack == null && modId.equals("Forestry")) {
+        if (stack == null && forestry.matchID(modId)) {
            throw new RuntimeException("Item not found: " + modId + ":" + name);
        }
        return stack;
@@ -24,7 +26,7 @@ public class Mods {

    private static ItemStack findItemStack(String modId, String name, int stackSize) {
        ItemStack stack = GameRegistry.findItemStack(modId, name, stackSize);
-        if (stack == null && modId.equals("Forestry")) {
+        if (stack == null && forestry.matchID(modId)) {
            throw new RuntimeException("Stack not found: " + modId + ":" + name);
        }
        return stack;
@@ -32,37 +34,32 @@ public class Mods {

    private static Block findBlock(String modId, String name) {
        Block stack = GameRegistry.findBlock(modId, name);
-        if (stack == null && modId.equals("Forestry")) {
+        if (stack == null && forestry.matchID(modId)) {
            throw new RuntimeException("Block not found: " + modId + ":" + name);
        }
        return stack;
    }

-    static {
-        Mods.forestry = new Mod("Forestry");
-        Mods.ic2 = new Mod("IC2");
-        Mods.botania = new Mod("Botania");
-        Mods.extraBiomes = new Mod("ExtrabiomesXL");
-    }
-
    public static class Mod {

-        private String id;
+        private final String modid;
+        private final boolean isLoaded;

        private Mod(String id) {
-            this.id = id;
+            modid = id;
+            isLoaded = Loader.isModLoaded(id);
        }

        public Item item(String name) {
-            return findItem(id, name);
+            return findItem(modid, name);
        }

        public Block block(String name) {
-            return findBlock(id, name);
+            return findBlock(modid, name);
        }

        public ItemStack stack(String name, int stackSize) {
-            return findItemStack(id, name, stackSize);
+            return findItemStack(modid, name, stackSize);
        }

        public ItemStack stack(String name) {
@@ -74,7 +71,11 @@ public class Mods {
        }

        public boolean active() {
-            return Loader.isModLoaded(id);
+            return isLoaded;
+        }
+
+        public boolean matchID(final String id) {
+            return modid.equals(id);
        }
    }
 }
@@ -62,7 +62,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata {
    }

    @Override
-    public void addBlockTooltip(ItemStack itemStack, List tooltip) {
+    public void addBlockTooltip(ItemStack itemStack, List<String> tooltip) {
        // ignored
    }

@@ -97,7 +97,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata {

        boolean hasBeenBroken = world.setBlockToAir(i, j, k);
        if (hasBeenBroken && BinnieCore.proxy.isSimulating(world)
-                && drops.size() > 0
+                && !drops.isEmpty()
                && (player == null || !player.capabilities.isCreativeMode)) {
            for (ItemStack drop : drops) {
                block.dropAsStack(world, i, j, k, drop);
@@ -15,7 +15,7 @@ public interface IBlockMetadata extends ITileEntityProvider {

    String getBlockName(ItemStack itemStack);

-    void addBlockTooltip(ItemStack itemStack, List tooltip);
+    void addBlockTooltip(ItemStack itemStack, List<String> tooltip);

    void dropAsStack(World world, int x, int y, int z, ItemStack itemStack);
 }
@@ -19,11 +19,6 @@ public class ItemMetadata extends ItemBlock {
        super(block);
    }

-    @Override
-    public int getMetadata(int damage) {
-        return 0;
-    }
-
    @Override
    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) {
@@ -56,7 +51,7 @@ public class ItemMetadata extends ItemBlock {

    @Override
    @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) {
+    public void addInformation(ItemStack itemStack, EntityPlayer player, List<String> tooltip, boolean advanced) {
        ((IBlockMetadata) field_150939_a).addBlockTooltip(itemStack, tooltip);
    }

@@ -14,6 +14,7 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {

    public static MultipassBlockRenderer instance;
    private static int layer = 0;
+    private static boolean rendering = false;

    public MultipassBlockRenderer() {
        MultipassBlockRenderer.instance = this;
@@ -23,31 +24,49 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
        return MultipassBlockRenderer.layer;
    }

+    public static boolean isRendering() {
+        return MultipassBlockRenderer.rendering;
+    }
+
    @Override
    public void renderInventoryBlock(Block block, int meta, int modelID, RenderBlocks renderer) {
+        IMultipassBlock multipassBlock = (IMultipassBlock) block;
+        int passes = multipassBlock.getNumberOfPasses();
+
        block.setBlockBoundsForItemRender();
        renderer.setRenderBoundsFromBlock(block);
        GL11.glTranslatef(-0.5f, -0.5f, -0.5f);

-        MultipassBlockRenderer.layer = 0;
-        while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) {
-            renderItem(block, renderer, meta);
-            MultipassBlockRenderer.layer++;
+        MultipassBlockRenderer.rendering = true;
+        try {
+            for (int pass = 0; pass < passes; ++pass) {
+                MultipassBlockRenderer.layer = pass;
+                renderItem(block, multipassBlock, renderer, meta);
+            }
+        } finally {
+            MultipassBlockRenderer.layer = 0;
+            MultipassBlockRenderer.rendering = false;
        }
-        MultipassBlockRenderer.layer = 0;
    }

    @Override
    public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
            RenderBlocks renderer) {
-        boolean r = true;
-        MultipassBlockRenderer.layer = 0;
-        while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) {
-            r = renderer.renderStandardBlock(block, x, y, z);
-            MultipassBlockRenderer.layer++;
+        IMultipassBlock multipassBlock = (IMultipassBlock) block;
+        int passes = multipassBlock.getNumberOfPasses();
+        boolean rendered = true;
+
+        MultipassBlockRenderer.rendering = true;
+        try {
+            for (int pass = 0; pass < passes; ++pass) {
+                MultipassBlockRenderer.layer = pass;
+                rendered = renderer.renderStandardBlock(block, x, y, z);
+            }
+            return rendered;
+        } finally {
+            MultipassBlockRenderer.layer = 0;
+            MultipassBlockRenderer.rendering = false;
        }
-        MultipassBlockRenderer.layer = 0;
-        return r;
    }

    @Override
@@ -60,8 +79,8 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
        return BinnieCore.multipassRenderID;
    }

-    public void renderItem(Block block, RenderBlocks renderer, int meta) {
-        setColor(((IMultipassBlock) block).colorMultiplier(meta));
+    private void renderItem(Block block, IMultipassBlock multipassBlock, RenderBlocks renderer, int meta) {
+        setColor(multipassBlock.colorMultiplier(meta));
        Tessellator tessellator = Tessellator.instance;
        tessellator.startDrawingQuads();
        tessellator.setNormal(0.0f, -1.0f, 0.0f);
@@ -34,14 +34,10 @@ public class MultipassItemRenderer implements IItemRenderer {

    @Override
    public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) {
-        switch (type) {
-            case ENTITY:
-            case EQUIPPED:
-            case INVENTORY:
-            case EQUIPPED_FIRST_PERSON:
-                return true;
-        }
-        return false;
+        return switch (type) {
+            case ENTITY, EQUIPPED, INVENTORY, EQUIPPED_FIRST_PERSON -> true;
+            default -> false;
+        };
    }

    @Override
@@ -76,12 +76,14 @@ public class TileEntityMetadata extends TileEntity {
    }

    public static ItemStack getItemStack(Block block, int damage) {
-        NBTTagCompound tag = new NBTTagCompound();
-        tag.setInteger("meta", damage);
-
        ItemStack item = new ItemStack(block, 1, 0);
-        item.setItemDamage(Math.min(damage, 16387));
-        item.setTagCompound(tag);
+        if (0 <= damage && damage < Short.MAX_VALUE) {
+            item.setItemDamage(damage);
+        } else {
+            NBTTagCompound tag = new NBTTagCompound();
+            tag.setInteger("meta", damage);
+            item.setTagCompound(tag);
+        }
        return item;
    }

@@ -12,9 +12,9 @@ import forestry.api.circuits.ICircuitLayout;

 public class BinnieCircuit implements ICircuit {

-    private String uid;
-    private int limit;
-    private List<String> tooltips;
+    private final String uid;
+    private final int limit;
+    private final List<String> tooltips;

    public BinnieCircuit(String uid, int limit, ICircuitLayout layout, ItemStack itemStack) {
        tooltips = new ArrayList<>();
@@ -9,8 +9,8 @@ import forestry.api.circuits.ICircuitSocketType;

 public class BinnieCircuitLayout implements ICircuitLayout {

-    private String uid;
-    private AbstractMod mod;
+    private final String uid;
+    private final AbstractMod mod;

    public BinnieCircuitLayout(AbstractMod mod, String uid) {
        this.uid = uid;
@@ -0,0 +1,14 @@
+package binnie.core.config;
+
+import com.gtnewhorizon.gtnhlib.config.Config;
+
+import binnie.core.BinnieCore;
+
+@Config(modid = BinnieCore.CORE_MODID)
+public class BCConfig {
+
+    @Config.Comment("If true, disables all compartment storage machines (no blocks/recipes will be registered).")
+    @Config.DefaultBoolean(false)
+    @Config.RequiresMcRestart
+    public static boolean disableCompartments;
+}
@@ -91,7 +91,7 @@ public interface IWidget {

    void callEvent(Event event);

-    void recieveEvent(Event event);
+    void receiveEvent(Event event);

    void onUpdateClient();

@@ -39,13 +39,11 @@ public class Tooltip {
    }

    public boolean exists() {
-        return tooltip.size() > 0;
+        return !tooltip.isEmpty();
    }

-    public void add(List list) {
-        for (Object obj : list) {
-            tooltip.add((String) obj);
-        }
+    public void add(List<String> list) {
+        tooltip.addAll(list);
    }

    public List<String> getList() {
@@ -19,17 +19,16 @@ public class Widget implements IWidget {
    protected int color;

    private IWidget parent;
-    private List<IWidget> subWidgets;
-    private List<WidgetAttribute> attributes;
+    private final List<IWidget> subWidgets;
+    private final List<WidgetAttribute> attributes;
    private IPoint position;
    private IPoint size;
    private IPoint offset;
-    private Collection<EventHandler> globalEventHandlers;
+    private final Collection<EventHandler> globalEventHandlers;
    private boolean enabled;
    private boolean visible;

    public Widget(IWidget parent) {
-        this.parent = null;
        subWidgets = new ArrayList<>();
        attributes = new ArrayList<>();
        position = new IPoint(0.0f, 0.0f);
@@ -91,7 +90,7 @@ public class Widget implements IWidget {

    @Override
    public IWidget addWidget(IWidget widget) {
-        if (subWidgets.size() != 0
+        if (!subWidgets.isEmpty()
                && subWidgets.get(subWidgets.size() - 1).hasAttribute(WidgetAttribute.ALWAYS_ON_TOP)) {
            subWidgets.add(subWidgets.size() - 1, widget);
        } else {
@@ -236,11 +235,11 @@ public class Widget implements IWidget {

    @Override
    public void callEvent(Event event) {
-        getSuperParent().recieveEvent(event);
+        getSuperParent().receiveEvent(event);
    }

    @Override
-    public void recieveEvent(Event event) {
+    public void receiveEvent(Event event) {
        for (EventHandler handler : globalEventHandlers) {
            if (handler.handles(event)) {
                handler.onEvent(event);
@@ -249,7 +248,7 @@ public class Widget implements IWidget {

        try {
            for (IWidget child : getWidgets()) {
-                child.recieveEvent(event);
+                child.receiveEvent(event);
            }
        } catch (ConcurrentModificationException e) {
            // ignored
@@ -12,6 +12,7 @@ import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;

 import binnie.Binnie;
 import binnie.core.AbstractMod;
@@ -33,6 +34,7 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
 import binnie.core.craftgui.resource.minecraft.PaddedTexture;
 import binnie.core.craftgui.resource.minecraft.StandardTexture;
 import binnie.core.machines.inventory.SlotValidator;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.extrabees.core.ExtraBeeTexture;
 import binnie.extrabees.gui.ExtraBeeGUITexture;
@@ -51,13 +53,13 @@ public class WindowFieldKit extends Window {
    private float glassOffsetY;
    private float glassVX;
    private float glassVY;
-    private Random glassRand;
+    private final Random glassRand;
    private Control GlassControl;
    private ControlChromosome chromo;
    private ControlText text;
    private float analyseProgress;
    private boolean isAnalysing;
-    private Map<IChromosomeType, String> info;
+    private final Map<IChromosomeType, String> info;

    public WindowFieldKit(EntityPlayer player, IInventory inventory, Side side) {
        super(280.0f, 230.0f, player, inventory, side);
@@ -113,20 +115,26 @@ public class WindowFieldKit extends Window {

    @Override
    public void initialiseClient() {
+        final NBTTagList actions = new NBTTagList();
+
        setTitle(getName());
        CraftGUI.render.stylesheet(new StyleSheetPunnett());
        getWindowInventory().createSlot(0);
        getWindowInventory().createSlot(1);
        setupValidators();
-        new ControlPlayerInventory(this);
+        new ControlPlayerInventory(this).create(actions);
        IPoint handGlass = new IPoint(16.0f, 32.0f);
        GlassControl = new ControlImage(
                this,
                handGlass.x(),
                handGlass.y(),
                new StandardTexture(0, 160, 96, 96, ExtraBeeTexture.GUIPunnett));
-        new ControlSlot(this, handGlass.x() + 54.0f, handGlass.y() + 26.0f).assign(InventoryType.Window, 0);
-        new ControlSlot(this, 208.0f, 8.0f).assign(InventoryType.Window, 1);
+
+        new ControlSlot(this, handGlass.x() + 54.0f, handGlass.y() + 26.0f).assign(actions, InventoryType.Window, 0);
+        new ControlSlot(this, 208.0f, 8.0f).assign(actions, InventoryType.Window, 1);
+
+        MessageCraftGUI.sendToServer(actions);
+
        (text = new ControlText(this, new IPoint(232.0f, 13.0f), I18N.localise("binniecore.gui.tooltip.paper")))
                .setColor(0x222222);
        (text = new ControlText(this, new IArea(0.0f, 120.0f, w(), 24.0f), "", TextJustification.MIDDLE_CENTER))
@@ -285,8 +293,8 @@ public class WindowFieldKit extends Window {
    }

    @Override
-    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
-        super.recieveGuiNBT(side, player, name, nbt);
+    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+        super.receiveGuiNBT(side, player, name, nbt);
        if (side != Side.SERVER || !name.equals("analyse")) {
            return;
        }
@@ -63,7 +63,7 @@ public class WindowGenesis extends Window {

    @Override
    public void initialiseClient() {
-        new ControlPlayerInventory(this);
+        new ControlPlayerInventory(this).createAndRegister();
        setTitle(getName());

        ControlTabBar<BreedingSystem> tabSystems = new BreedingSystemControlTabBar();
@@ -75,7 +75,7 @@ public class WindowGenesis extends Window {
        new Panel(this, one.outset(1), MinecraftGUI.PanelType.Black);
        new Panel(this, two.outset(1), MinecraftGUI.PanelType.Black);

-        geneList = new ControlListBox<Gene>(this, one.x(), one.y(), one.w(), one.h(), 10.0f) {
+        geneList = new ControlListBox<>(this, one.x(), one.y(), one.w(), one.h(), 10.0f) {

            @Override
            public IWidget createOption(Gene value, int y) {
@@ -83,7 +83,7 @@ public class WindowGenesis extends Window {
            }
        };

-        geneOptions = new ControlListBox<Gene>(this, two.x(), two.y(), two.w(), two.h(), 10.0f) {
+        geneOptions = new ControlListBox<>(this, two.x(), two.y(), two.w(), two.h(), 10.0f) {

            @Override
            public IWidget createOption(Gene value, int y) {
@@ -175,8 +175,8 @@ public class WindowGenesis extends Window {
    }

    @Override
-    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
-        super.recieveGuiNBT(side, player, name, nbt);
+    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+        super.receiveGuiNBT(side, player, name, nbt);
        if (side == Side.SERVER && name.equals("genesis")) {
            ItemStack stack = ItemStack.loadItemStackFromNBT(nbt);
            InventoryPlayer playerInv = player.inventory;
@@ -28,7 +28,7 @@ public class ControlButton extends Control {
        textWidget = new ControlText(this, getArea(), text, TextJustification.MIDDLE_CENTER);
    }

-    private EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() {
+    private final EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() {

        @Override
        public void onEvent(EventMouse.Down event) {
@@ -23,7 +23,7 @@ public class ControlCheckbox extends Control implements IControlValue<Boolean> {
    }

    public ControlCheckbox(IWidget parent, float x, float y, float w, String text, boolean bool) {
-        super(parent, x, y, (w > 16.0f) ? w : 16.0f, 16.0f);
+        super(parent, x, y, Math.max(w, 16.0f), 16.0f);
        this.text = text;
        value = bool;
        if (w > 16.0f) {
@@ -11,7 +11,7 @@ import binnie.core.craftgui.geometry.TextJustification;
 public class ControlText extends Control implements IControlValue<String> {

    private String text;
-    private TextJustification align;
+    private final TextJustification align;

    public ControlText(IWidget parent, IPoint pos, String text) {
        this(parent, new IArea(pos, new IPoint(500.0f, 0.0f)), text, TextJustification.TOP_LEFT);
@@ -69,11 +69,6 @@ public class ControlTextEdit extends Control implements IControlValue<String> {
        }.setOrigin(EventHandler.Origin.Self, this));
    }

-    @Override
-    public void onUpdateClient() {
-        // ignored
-    }
-
    protected void onTextEdit(String value) {
        // ignored
    }
@@ -38,11 +38,6 @@ public class Control extends Widget implements ITooltipHelp, ITooltip {
        // ignored
    }

-    @Override
-    public void onUpdateClient() {
-        // ignored
-    }
-
    public void addHelp(String string) {
        helpStrings.add(string);
    }
@@ -37,7 +37,7 @@ public class ControlOption<T> extends Control implements IControlValue<T> {
        setColor(color);
    }

-    private EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() {
+    private final EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() {

        @Override
        public void onEvent(EventMouse.Down event) {
@@ -22,7 +22,7 @@ public class ControlTextOption<T> extends ControlOption<T> {
        this(controlList, option, option.toString(), y);
    }

-    private EventWidget.ChangeColour.Handler mouseHandler = new EventWidget.ChangeColour.Handler() {
+    private final EventWidget.ChangeColour.Handler mouseHandler = new EventWidget.ChangeColour.Handler() {

        @Override
        public void onEvent(EventWidget.ChangeColour event) {
@@ -15,8 +15,8 @@ public class ControlPage<T> extends Control implements IControlValue<T> {
    public ControlPage(IWidget parent, float x, float y, float w, float h, T value) {
        super(parent, x, y, w, h);
        setValue(value);
-        if (parent instanceof IControlValue && ((IControlValue) parent).getValue() == null) {
-            ((IControlValue) parent).setValue(value);
+        if (parent instanceof IControlValue cv && ((IControlValue<?>) parent).getValue() == null) {
+            cv.setValue(value);
        }
    }

@@ -41,7 +41,7 @@ public class ControlPages<T> extends Control implements IControlValues<T>, ICont
    public Collection<T> getValues() {
        List<T> list = new ArrayList<>();
        for (IWidget child : getWidgets()) {
-            list.add((T) ((IControlValue) child).getValue());
+            list.add((T) ((IControlValue<?>) child).getValue());
        }
        return list;
    }
@@ -5,7 +5,7 @@ import binnie.core.craftgui.controls.core.Control;

 public class ControlScroll extends Control {

-    private IControlScrollable scrollWidget;
+    private final IControlScrollable scrollWidget;

    public ControlScroll(IWidget parent, float x, float y, float width, float height, IControlScrollable scrollWidget) {
        super(parent, x, y, width, height);
@@ -30,7 +30,7 @@ public class ControlScrollBar extends Control {
        addSelfEventHandler(mouseDownHandler);
    }

-    private EventMouse.Down.Handler mouseDownHandler = new EventMouse.Down.Handler() {
+    private final EventMouse.Down.Handler mouseDownHandler = new EventMouse.Down.Handler() {

        @Override
        public void onEvent(EventMouse.Down event) {
@@ -50,11 +50,6 @@ public class ControlScrollBar extends Control {
        }
    };

-    @Override
-    public void onUpdateClient() {
-        // ignored
-    }
-
    @Override
    public void onRenderBackground() {
        IArea renderArea = getRenderArea();
@@ -29,7 +29,7 @@ public class ControlScrollableContent<T extends IWidget> extends Control impleme
        setPercentageIndex(getPercentageIndex());
    }

-    private EventMouse.Wheel.Handler mouseWheelHandler = new EventMouse.Wheel.Handler() {
+    private final EventMouse.Wheel.Handler mouseWheelHandler = new EventMouse.Wheel.Handler() {

        @Override
        public void onEvent(EventMouse.Wheel event) {
@@ -20,7 +20,7 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>

    protected T value;

-    private ControlTabBar<T> tabBar;
+    private final ControlTabBar<T> tabBar;

    public ControlTab(ControlTabBar<T> parent, float x, float y, float w, float h, T value) {
        super(parent, x, y, w, h);
@@ -59,8 +59,7 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
        }

        CraftGUI.render.texture(iTexture, area);
-        if (this instanceof ControlTabIcon) {
-            ControlTabIcon icon = (ControlTabIcon) this;
+        if (this instanceof ControlTabIcon icon) {
            ControlItemDisplay item = (ControlItemDisplay) getWidgets().get(0);
            if (texture == CraftGUITexture.TabDisabled) {
                item.setColor(0xaaaaaaaa);
@@ -13,9 +13,9 @@ import binnie.core.genetics.BreedingSystem;

 class ControlBreedingProgress extends Control {

-    private static Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.Controls2);
-    private float percentage;
-    private int colour;
+    private static final Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.Controls2);
+    private final float percentage;
+    private final int colour;

    public ControlBreedingProgress(IWidget parent, int x, int y, int width, int height, BreedingSystem system,
            float percentage) {
@@ -12,7 +12,7 @@ import binnie.core.craftgui.minecraft.control.ControlItemDisplay;

 public class ControlItemStackOption extends ControlTextOption<ItemStack> {

-    private ControlItemDisplay controlBee;
+    private final ControlItemDisplay controlBee;

    public ControlItemStackOption(ControlList<ItemStack> controlList, ItemStack option, int y) {
        super(controlList, option, option.getDisplayName(), y);
@@ -11,7 +11,7 @@ import forestry.api.genetics.IMutation;

 class ControlMutationBox extends ControlListBox<IMutation> {

-    private Type type;
+    private final Type type;
    private IAlleleSpecies species;

    @Override
@@ -17,11 +17,11 @@ import forestry.api.genetics.IMutation;

 class ControlMutationSymbol extends Control implements ITooltip {

-    private static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2);
-    private static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2);
+    private static final Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2);
+    private static final Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2);
    private IMutation value;
    private boolean discovered;
-    private int type;
+    private final int type;

    @Override
    public void onRenderBackground() {
@@ -11,7 +11,7 @@ import forestry.api.genetics.IAlleleSpecies;

 class ControlSpeciesBoxOption extends ControlTextOption<IAlleleSpecies> {

-    private ControlDatabaseIndividualDisplay controlBee;
+    private final ControlDatabaseIndividualDisplay controlBee;

    public ControlSpeciesBoxOption(ControlList<IAlleleSpecies> controlList, IAlleleSpecies option, int y) {
        super(controlList, option, option.getName(), y);
@@ -7,8 +7,8 @@ import binnie.core.util.I18N;

 public class DatabaseTab implements ITooltipHelp {

-    private String mod;
-    private String unloc;
+    private final String mod;
+    private final String unloc;

    public DatabaseTab(AbstractMod mod, String unloc) {
        this.mod = mod.getModID();
@@ -14,10 +14,10 @@ import forestry.api.genetics.IClassification;

 public class PageBranchOverview extends PageBranch {

-    private ControlText branchName;
-    private ControlText branchScientific;
-    private ControlText branchAuthority;
-    private List<ControlText> branchDescription;
+    private final ControlText branchName;
+    private final ControlText branchScientific;
+    private final ControlText branchAuthority;
+    private final List<ControlText> branchDescription;

    public PageBranchOverview(IWidget parent, DatabaseTab tab) {
        super(parent, tab);
@@ -10,7 +10,7 @@ import forestry.api.genetics.IClassification;

 public class PageBranchSpecies extends PageBranch {

-    private ControlSpeciesBox speciesList;
+    private final ControlSpeciesBox speciesList;

    @Mod.EventHandler
    public void onHandleEvent(EventValueChanged<IAlleleSpecies> event) {
@@ -13,7 +13,7 @@ import binnie.core.util.I18N;

 public class PageBreeder extends ControlPage<DatabaseTab> {

-    private GameProfile player;
+    private final GameProfile player;

    public PageBreeder(IWidget parent, GameProfile player, DatabaseTab tab) {
        super(parent, 0.0f, 0.0f, parent.getSize().x(), parent.getSize().y(), tab);
@@ -22,7 +22,7 @@ public class PageBreeder extends ControlPage<DatabaseTab> {
    }

    public void onPageRefresh() {
-        while (getWidgets().size() > 0) {
+        while (!getWidgets().isEmpty()) {
            deleteChild(getWidgets().get(0));
        }

@@ -11,8 +11,8 @@ import forestry.api.genetics.IClassification;

 public class PageSpeciesClassification extends PageSpecies {

-    private Map<IClassification.EnumClassLevel, ControlText> levels;
-    private ControlText genus;
+    private final Map<IClassification.EnumClassLevel, ControlText> levels;
+    private final ControlText genus;

    public PageSpeciesClassification(IWidget parent, DatabaseTab tab) {
        super(parent, tab);
@@ -7,7 +7,7 @@ import forestry.api.genetics.IAlleleSpecies;

 public class PageSpeciesMutations extends PageSpecies {

-    private ControlMutationBox list;
+    private final ControlMutationBox list;

    public PageSpeciesMutations(IWidget parent, DatabaseTab tab) {
        super(parent, tab);
@@ -14,14 +14,14 @@ import forestry.api.genetics.IAlleleSpecies;

 public class PageSpeciesOverview extends PageSpecies {

-    private ControlText controlName;
-    private ControlText controlScientific;
-    private ControlText controlAuthority;
-    private ControlText controlComplexity;
-    private ControlText controlDescription;
-    private ControlText controlSignature;
-    private ControlDatabaseIndividualDisplay controlInd1;
-    private ControlDatabaseIndividualDisplay controlInd2;
+    private final ControlText controlName;
+    private final ControlText controlScientific;
+    private final ControlText controlAuthority;
+    private final ControlText controlComplexity;
+    private final ControlText controlDescription;
+    private final ControlText controlSignature;
+    private final ControlDatabaseIndividualDisplay controlInd1;
+    private final ControlDatabaseIndividualDisplay controlInd2;

    public PageSpeciesOverview(IWidget parent, DatabaseTab tab) {
        super(parent, tab);
@@ -58,23 +58,23 @@ public class PageSpeciesOverview extends PageSpecies {
                        + EnumChatFormatting.RESET);
        controlComplexity.setValue(I18N.localise("extratrees.genetics.complexity", species.getComplexity()));
        String desc = species.getDescription();
-        String descBody = EnumChatFormatting.ITALIC.toString();
+        StringBuilder descBody = new StringBuilder(EnumChatFormatting.ITALIC.toString());
        String descSig = "";

        if (desc == null || desc.isEmpty() || desc.matches("(\\w+\\.?)+")) {
-            descBody += I18N.localise("binniecore.gui.database.species.noDesc");
+            descBody.append(I18N.localise("binniecore.gui.database.species.noDesc"));
        } else {
            String[] descStrings = desc.split("\\|");
-            descBody += descStrings[0];
+            descBody.append(descStrings[0]);
            for (int i = 1; i < descStrings.length - 1; ++i) {
-                descBody = descBody + " " + descStrings[i];
+                descBody.append(" ").append(descStrings[i]);
            }
            if (descStrings.length > 1) {
                descSig += descStrings[descStrings.length - 1];
            }
        }

-        controlDescription.setValue(descBody + EnumChatFormatting.RESET);
+        controlDescription.setValue(descBody.toString() + EnumChatFormatting.RESET);
        controlSignature.setValue(descSig + EnumChatFormatting.RESET);
        float descHeight = CraftGUI.render.textHeight(controlDescription.getValue(), controlDescription.getSize().x());
        controlSignature.setPosition(
@@ -7,7 +7,7 @@ import forestry.api.genetics.IAlleleSpecies;

 public class PageSpeciesResultant extends PageSpecies {

-    private ControlMutationBox list;
+    private final ControlMutationBox list;

    public PageSpeciesResultant(IWidget parent, DatabaseTab tab) {
        super(parent, tab);
@@ -40,8 +40,8 @@ public abstract class WindowAbstractDatabase extends Window {
    protected boolean isNEI;

    private float selectionBoxWidth;
-    private Map<IDatabaseMode, ModeWidgets> modes;
-    private BreedingSystem system;
+    private final Map<IDatabaseMode, ModeWidgets> modes;
+    private final BreedingSystem system;
    private Panel panelInformation;
    private Panel panelSearch;
    private ControlPages<IDatabaseMode> modePages;
@@ -88,13 +88,12 @@ public abstract class WindowAbstractDatabase extends Window {

            @Override
            public void onEvent(EventValueChanged event) {
-                if (!(event.getOrigin().getParent() instanceof ControlPage)) {
+                if (!(event.getOrigin().getParent() instanceof ControlPage parent)) {
                    return;
                } else if ((event.getValue() instanceof DatabaseTab)) {
                    return;
                }

-                ControlPage parent = (ControlPage) event.getOrigin().getParent();
                if (!(parent.getValue() instanceof IDatabaseMode)) {
                    return;
                }
@@ -185,7 +184,7 @@ public abstract class WindowAbstractDatabase extends Window {

            @Override
            public ControlTab<IDatabaseMode> createTab(float x, float y, float w, float h, IDatabaseMode value) {
-                return new ControlTab<IDatabaseMode>(this, x, y, w, h, value) {
+                return new ControlTab<>(this, x, y, w, h, value) {

                    @Override
                    public String getName() {
@@ -199,7 +198,7 @@ public abstract class WindowAbstractDatabase extends Window {
        CraftGUIUtil.linkWidgets(tab, modePages);
        changeMode(Mode.Species);
        for (IDatabaseMode mode : modes.keySet()) {
-            modes.get(mode).infoTabs = new ControlTabBar(
+            modes.get(mode).infoTabs = new ControlTabBar<>(
                    modes.get(mode).modePage,
                    8.0f,
                    24.0f,
@@ -266,7 +265,7 @@ public abstract class WindowAbstractDatabase extends Window {
        public ControlPage<IDatabaseMode> modePage;
        public ControlListBox listBox;

-        private ControlPages<DatabaseTab> infoPages;
+        private final ControlPages<DatabaseTab> infoPages;
        private ControlTabBar<DatabaseTab> infoTabs;

        public ModeWidgets(IDatabaseMode mode, WindowAbstractDatabase database) {
@@ -33,20 +33,12 @@ public abstract class EventHandler<E extends Event> {
        DirectChild;

        public boolean isOrigin(IWidget origin, IWidget test) {
-            switch (this) {
-                case Any:
-                    return true;
-
-                case DirectChild:
-                    return test.getWidgets().contains(origin);
-
-                case Parent:
-                    return test.getParent() == origin;
-
-                case Self:
-                    return test == origin;
-            }
-            return false;
+            return switch (this) {
+                case Any -> true;
+                case DirectChild -> test.getWidgets().contains(origin);
+                case Parent -> test.getParent() == origin;
+                case Self -> test == origin;
+            };
        }
    }
 }
Author	SHA1	Message	Date
Smile Yik Martin Robertz UltraProdigy	77c47e9071	fix isolator consumption chance config source (#87 ) Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: UltraProdigy <[email protected]>	2026-05-04 01:00:00 +00:00
Max Shen	f27b66c53f	Fix concurrent modification exception (#92 )	2026-05-03 20:43:05 -04:00
brandynandMartin Robertz	ad16588e3b	Fix ceramic tiles + Add config option to disable compartments (#83 ) Co-authored-by: Martin Robertz <[email protected]>	2026-04-30 19:02:55 +02:00
Alexdoru	5acbd0b977	fix world client leak in RendererMachine (#90 )	2026-04-09 20:29:55 +00:00
Martin Robertz	7e22128279	update+gradle+deps+bs	2026-04-07 18:54:15 +02:00
TweksTYandUltraProdigy	65e11fa564	Fix Genetics machines' VFX incorrectly appearing at 0;0;0 coordinates (#89 ) Co-authored-by: UltraProdigy <[email protected]>	2026-03-20 23:56:15 -04:00
DarkShadow44andMartin Robertz	355c85598e	Move out larvae from splicer even when no serum is present anymore (#76 ) Co-authored-by: Martin Robertz <[email protected]>	2026-03-20 23:33:14 -04:00
UltraProdigy	63232799bc	Optimize Images & Workflow (#88 )	2026-03-08 09:28:38 +01:00
Alexdoru	a48f59e0ed	Cache frequent Enum#values() calls (#86 )	2026-03-04 16:15:04 +01:00
Guillaume MercierandCaedis	84d462d8d5	CropsNH Integration/IC2 Depreciation (#82 ) Co-authored-by: Caedis <[email protected]>	2026-02-28 20:55:58 +01:00
Casey Primozic	b32f2a210c	Fix incorrect integer division in `getRipeningStage` (#85 )	2026-02-18 02:20:41 -06:00
Caedis	c988aa9870	Cache inventory size in compartments (#84 )	2026-02-09 14:29:52 +03:00
ah-OOG-ah	6ba66123eb	Yeet reflective item parsing (#75 )	2026-01-27 22:29:12 -05:00
Ranzu	1d0568388a	Added title localization and inventory slot texture (#81 )	2026-01-07 18:37:36 +01:00
TweksTY	3968cc320e	Fix the inability to mutate a bee that requires a certain block as a base using alveary if the bottom center block of your alveary is any alveary block from Extra Bees (#80 )	2026-01-07 12:29:12 +01:00
DarkShadow44	ed1daa1e96	Mark sequence as not repairable (#79 )	2025-12-13 20:58:30 +01:00
Alexdoru	ffcc5f7102	[Memory-opti:runtime allocations] Reduce amount of NBTTagCompound created in TileEntityMetadata#getItemStack (#77 )	2025-12-01 23:35:01 +01:00
Martin Robertz	4c619fd3b2	update	2025-10-01 18:48:17 +02:00
Glease	341fea50ba	fix batched updates does not call window and machine packet listeners (#74 )	2025-09-28 10:52:47 +02:00
Julia	e6c67df077	Fix Slot Registration Crash (#73 )	2025-09-25 15:46:12 +02:00
Zhehe Wilhelm Schuster boubou19	d24088ea4b	Fix metadata error when using Scooporator MX200 Turbo (#69 ) Co-authored-by: Wilhelm Schuster <[email protected]> Co-authored-by: boubou19 <[email protected]>	2025-09-24 23:44:33 +02:00
Julia	a2a57d1656	Batch Actions and Defer Registration of Slots (#72 )	2025-09-24 23:25:39 +02:00
Julia	2e36fbcfcc	Extract Magic String Constants in `ContainerCraftGUI` (#70 )	2025-09-24 17:46:47 +02:00
Martin Robertz	bd5bd5c153	update	2025-09-24 17:37:45 +02:00
Julia	f324cb53db	Fix Inventory List Crash (#71 )	2025-09-24 17:29:33 +02:00
Julia	c6815bebdf	Cleanup `ContainerCraftGUI` (#68 )	2025-09-23 17:46:40 -07:00
Julia	7ffa516892	Change `recieve` -> `receive` (#67 )	2025-09-23 14:26:33 -07:00
Julia	311d618d53	Cleanup `BinnieCorePacketID.java` (#66 )	2025-09-23 12:54:21 -07:00
Dream Master	9795aad66f	update	2025-09-05 16:05:56 +02:00
Matthew Bentham	ea7e2d7de4	Fix mutator not accepting items listed on the wiki (#65 )	2025-09-05 09:44:41 +02:00
boubou19andAlexdoru	39f86c8b0c	Speed up forge event registration (#64 ) Co-authored-by: Alexdoru <[email protected]>	2025-07-18 22:22:10 +00:00
TotallyNotOndre	5b551eb8ec	"fix" compartment tab name input field (#63 )	2025-07-15 19:39:33 +02:00
Martin Robertz	f497114579	update	2025-07-08 12:11:02 +02:00
Alexdoru	ea547df4d0	Properly apply hunger effect (#62 )	2025-07-07 21:42:49 +02:00
Ruling-0	39c9f1f6c6	Remove mutator mutation chance cap (#61 )	2025-05-25 17:30:06 +02:00
Maya	4000763323	update	2025-05-07 10:39:29 -05:00
czerwonogrodzki	59e98dd290	Extend Lab Stand GUI width by 80 units (#60 )	2025-05-07 10:38:14 -05:00
Maya	c1ec3e5c8e	Fix stained block hardness (#59 )	2025-04-09 01:22:18 -05:00
Maya	ac4b21b05e	update	2025-04-08 14:24:47 -05:00
Niclas Klugmann	0e0ded5cc0	Revert 5x multiplier removal (#58 )	2025-04-08 14:23:05 -05:00
Martin Robertz	a1f54e7500	update	2025-01-16 21:59:06 +01:00
Astatine5985andMaya	5f1b5daa24	Isolator crash fix revision (#56 ) Co-authored-by: Maya <[email protected]>	2025-01-16 16:50:35 +00:00
Martin Robertz	8d0fa2ebb5	update	2024-12-30 21:12:54 +01:00
glowredman	0db05cb60c	Add Localization, Fix Carpentry Hammer / Master Carpentry Hammer Names being reverse (#57 )	2024-12-30 21:11:13 +01:00
ah-OOG-ah Martin Robertz Maya	0265d70a53	Yeet custom config in favor of NHLib (#53 ) Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: Maya <[email protected]>	2024-12-29 12:37:43 -06:00
Martin Robertz	32b7efcd15	update	2024-12-22 01:17:03 +01:00
Guillaume Mercier	7059206cb0	prevent npe and log bad requests (#55 )	2024-12-21 10:35:14 -06:00
Martin Robertz	54c702e935	update	2024-11-13 07:12:13 +01:00
Ryan Nasers	a3aa358627	Fixing Waila showing incorrect blocks for logs (#54 )	2024-11-12 22:04:26 +01:00
ah-OOG-ah	f0f14bb278	Minor cleanups (#50 ) * Finalize, minor alloc reduction Also enable Jabel and generic injection * Update dependencies.gradle * Clean up Machine a bit * spotless more enhanced instanceof * Update ModuleMachine.java * More clen * WARN: Removed exception catching * Many, many tiny patches + birthday fix * Spotless * Spotless again * Fix getLow and clamp tolerance value * Revert event -> ignored on unused event parameters * Rename instanceof variables * Update Machine.java * Use StringBuilder * Cache getStack() * Oops, Jabel can't handle that * Spotless * Spotless again My IDE was fighting with it * Remove unused elements + scream test success	2024-09-26 16:59:20 +02:00
Martin Robertz	6b4f3eb1c7	update	2024-09-15 14:30:24 +02:00
Ryan Nasers	f74f9e4967	Should be fixed (#49 )	2024-09-15 11:07:23 +02:00
Dream Master	12643d1b98	update	2024-08-09 20:41:23 +07:00
Ethryan	5bf4224f03	don't let players eat fluids anymore (#48 )	2024-08-09 19:54:49 +07:00
Martin Robertz	5a1030bde4	update	2024-05-31 19:00:50 +02:00
Martin Robertz	948876ffcd	Dev (#47 ) * Update settings.gradle * Update gradle-wrapper.properties * Update dependencies.gradle	2024-05-31 11:23:46 +02:00
chochem	83142abde9	fix division by zero (#46 )	2024-05-31 10:38:45 +02:00
Martin Robertz	79cda2e4fd	update	2024-03-29 23:42:27 +01:00
DrParadox7	5409309b36	Flower Butterfly Spawns inherits Forestry's configs constraints (#45 )	2024-03-29 23:41:24 +01:00
Martin Robertz	1a6e6b3c2c	update	2024-02-18 10:54:02 +01:00
Jason Mitchell	e5dfcc7942	No more restriction by player name (#44 ) * Remove the ability to lock a bee to a specific person, and instead give them acknowledgement. * Restrict to feb 29th - effectively not allowed unless you're a real chad :trollface: and still gives mentions to the people	2024-02-17 16:27:57 -08:00
Raven Szewczyk	ea78ca8069	[ci skip] upgraded build system	2024-02-04 19:57:04 +00:00
Martin Robertz	29814550bb	update deps+bs	2024-01-25 10:42:36 +01:00
ghostflyby	15769b9ee9	fix no tooltip in some Gui (#42 )	2024-01-24 21:44:37 +01:00
Martin Robertz	1253271111	update bs+deps	2024-01-11 22:55:32 +01:00
Raven Szewczyk	d18be7848d	[ci skip] upgraded build system	2024-01-08 21:24:08 +00:00
Martin Robertz	ef4dd3710a	update gradle+bs+deps	2023-12-11 11:41:14 +01:00
ghostflyby	190693ad68	Fix double layers tooltip with NEI (#41 ) * Fix double layers tooltip with nei * Remove wildcard imports	2023-12-11 08:43:58 +01:00