update

.gitattributes

@@ -32,7 +32,6 @@
 *.[dD][lL][lL]          binary
 *.[dD][yY][lL][iI][bB]  binary
 *.[pP][sS][dD]          binary
-*.[pP][dD][nN]          binary
 *.[tT][tT][fF]          binary
 *.[oO][tT][fF]          binary
 

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

@@ -3,9 +3,9 @@ name: Build and test
 
 on:
   pull_request:
-    branches: [ master, main, release/** ]
+    branches: [ master, main ]
   push:
-    branches: [ master, main, release/** ]
+    branches: [ master, main ]
 
 jobs:
   build-and-test:

.github/workflows/optimize-images.yml

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

.gitignore

@@ -28,7 +28,6 @@ whitelist.json
 *.iws
 src/main/resources/mixins.*([!.]).json
 *.bat
-*.sh
 *.DS_Store
 !gradlew.bat
 .factorypath
@@ -36,4 +35,4 @@ addon.local.gradle
 addon.local.gradle.kts
 addon.late.local.gradle
 addon.late.local.gradle.kts
-layout.json
+layout.json

dependencies.gradle

@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.11.39:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.11.54:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.10.13:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.6.36:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.162-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.60-GTNH:dev')
 
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.64:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

gradle.properties

@@ -39,33 +39,9 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
 # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer
 
-# 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 using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
+# See https://github.com/bsideup/jabel for details on how this works.
+enableModernJavaSyntax = true
 
 # 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.
@@ -120,9 +96,7 @@ usesMixinDebug = false
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
 
-# 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.
+# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
 mixinsPackage =
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
@@ -177,7 +151,7 @@ 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: UniMixins is automatically set as a required dependency if usesMixins = true.
+# Note: GTNH Mixins 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.
@@ -186,11 +160,6 @@ modrinthRelations =
 # Leave this empty if you don't want to publish on CurseForge.
 curseForgeProjectId =
 
-# Comma-separated supported CurseForge environments: client, server (case-insensitive).
-# Use client or server for mods that only support one environment. Defaults to client,server.
-# These tags describe where the mod can run, not whether installation is required on both sides.
-curseForgeEnvironments = client,server
-
 # The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
 # Syntax: type1:name1;type2:name2;...
 # Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
@@ -203,12 +172,6 @@ curseForgeRelations =
 # projects. New projects should not use this parameter.
 customArchiveBaseName = binnie-mods
 
-# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
-# runClientWorkingDirectory = run/client
-
-# 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.

gradle/gradle-daemon-jvm.properties

@@ -1,12 +0,0 @@
-#This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9064f22734b42ac03e85df04b632e167/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/4d0277c49991306ac78048580fe34bcf/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a9fa3b809e484a1e1ac4308a5dda661a/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/aa99913fa6d767d899ffc96082da01ca/redirect
-toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,9 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
-retries=0
-retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 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.
@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   gradlew start up script for POSIX generated by Gradle.
+#   Gradle start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh gradlew
+#           ksh Gradle
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/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/.
@@ -114,6 +114,7 @@ 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.
@@ -171,6 +172,7 @@ 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" )
 
@@ -210,7 +212,8 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -19,12 +19,12 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  gradlew startup script for Windows
+@rem  Gradle startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables, and ensure extensions are enabled
-setlocal EnableExtensions
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ 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
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,18 +65,30 @@ 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
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :execute
 @rem Setup the command line
 
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
-@rem Execute gradlew
-@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
-@rem which allows us to clear the local environment before executing the java command
-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
-:exitWithErrorLevel
-@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
-"%COMSPEC%" /c exit %ERRORLEVEL%
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

settings.gradle

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.34'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
 }

src/main/java/binnie/Binnie.java

@@ -5,6 +5,7 @@ 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.resource.ManagerResource;
@@ -15,5 +16,6 @@ public final class Binnie {
     public static ManagerGenetics Genetics = new ManagerGenetics();
     public static ManagerLiquid Liquid = new ManagerLiquid();
     public static ManagerMachine Machine = new ManagerMachine();
+    public static ManagerItem Item = new ManagerItem();
     public static ManagerResource Resource = new ManagerResource();
 }

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

@@ -6,7 +6,6 @@ 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;
@@ -64,41 +63,35 @@ 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 ItemFlower flowerItem;
-    public static Item pollen;
     public static Item seed;
+    public static Item pollen;
     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 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 ItemSoilMeter soilMeter;
     public static ItemMisc misc;
+    public static ItemFlower flowerItem;
     public static ItemPigment pigment;
     public static ItemClay clay;
+    public static BlockCeramic ceramic;
+    public static BlockCeramicPatterned ceramicTile;
+    public static BlockStained stained;
+    public static BlockCeramicBrick ceramicBrick;
 
     public Botany() {
         Botany.instance = this;
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Mod.EventHandler
@@ -149,6 +142,118 @@ 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 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());
+        }
+    }
+
     @Deprecated
     public void onPlantVanilla(PlayerInteractEvent event) {
         if (!BinnieCore.proxy.isSimulating(event.world)
@@ -182,6 +287,22 @@ 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);
+        }
+    }
+
     @Mod.EventHandler
     public void onIMC(FMLInterModComms.IMCEvent event) {
         for (FMLInterModComms.IMCMessage message : event.getMessages()) {
@@ -212,138 +333,4 @@ 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);
-            }
-        }
-    }
 }

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

@@ -6,11 +6,6 @@ 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();
     }

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

@@ -24,10 +24,6 @@ public enum EnumFlowerChromosome implements IChromosomeType {
     SAPPINESS(IAlleleFloat.class),
     STEM(IAlleleInteger.class);
 
-    /**
-     * 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) {

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

@@ -6,11 +6,6 @@ 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();
     }

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

@@ -6,11 +6,6 @@ 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();
     }

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

@@ -93,7 +93,7 @@ public class BlockCeramic extends Block implements IBlockMetadata {
 
     @Override
     public void getSubBlocks(Item item, CreativeTabs tabs, List<ItemStack> itemList) {
-        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
             itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
         }
     }

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

@@ -102,12 +102,12 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
 
     @Override
     public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> itemList) {
-        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
+        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 TileType.get(meta >>> 16 & 0xFF).icons[MultipassBlockRenderer.getLayer()];
+        return getType(meta).getIcon(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,9 +167,6 @@ 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);
     }
 
@@ -180,14 +177,14 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
 
     @Override
     public int colorMultiplier(int meta) {
-        int layer = MultipassBlockRenderer.getLayer();
-        if (layer == 0) {
+        BlockType type = getType(meta);
+        if (MultipassBlockRenderer.getLayer() == 0) {
             return 0xffffff;
         }
-        if (layer == 1) {
-            return EnumFlowerColor.get(meta & 0xFF).getColor(false);
+        if (MultipassBlockRenderer.getLayer() == 1) {
+            return type.color1.getColor(false);
         }
-        return EnumFlowerColor.get(meta >>> 8 & 0xFF).getColor(false);
+        return type.color2.getColor(false);
     }
 
     @Override
@@ -208,10 +205,6 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
         VerticalStripeBrick("verticalbrickstripe", "verticalStripedCeramicBricks"),
         VerticalLargeBrick("verticalbricklarge", "largeVerticalCeramicBricks");
 
-        /**
-         * 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;
@@ -223,7 +216,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() {

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

@@ -124,7 +124,7 @@ public class BlockStained extends Block implements IBlockMetadata {
 
     @Override
     public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> itemList) {
-        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
             itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
         }
     }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,5 @@
 package binnie.botany.flower;
 
-import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
-
 import java.util.List;
 
 import net.minecraft.block.Block;
@@ -11,8 +9,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
@@ -21,25 +17,18 @@ import net.minecraft.world.World;
 import binnie.Binnie;
 import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
-import binnie.botany.api.EnumFlowerChromosome;
 import binnie.botany.api.EnumFlowerStage;
-import binnie.botany.api.IAlleleFlowerSpecies;
 import binnie.botany.api.IFlower;
 import binnie.botany.api.IFlowerColor;
 import binnie.botany.api.IFlowerGenome;
 import binnie.botany.api.IFlowerType;
 import binnie.botany.core.BotanyCore;
-import binnie.botany.genetics.AlleleColor;
-import binnie.botany.genetics.EnumFlowerColor;
 import binnie.botany.genetics.EnumFlowerType;
 import binnie.botany.genetics.Flower;
-import binnie.botany.genetics.FlowerSpecies;
 import binnie.core.BinnieCore;
 import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.genetics.AlleleManager;
-import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IPollinatable;
 import forestry.core.config.Config;
@@ -50,8 +39,6 @@ public abstract class ItemBotany extends Item {
         setCreativeTab(CreativeTabBotany.instance);
         setUnlocalizedName(name);
         hasSubtypes = true;
-
-        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override
@@ -70,44 +57,12 @@ public abstract class ItemBotany extends Item {
         return false;
     }
 
-    static IAllele getRenderAllele(ItemStack stack, EnumFlowerChromosome chromosome, boolean active) {
-        if (stack == null || !stack.hasTagCompound()) return null;
-
-        NBTTagCompound genome = stack.getTagCompound().getCompoundTag("Genome");
-        NBTTagList chromosomes = genome.getTagList("Chromosomes", 10);
-        int slot = chromosome.ordinal();
-        NBTTagCompound chromosomeTag = null;
-        for (int index = chromosomes.tagCount() - 1; index >= 0; index--) {
-            NBTTagCompound candidate = chromosomes.getCompoundTagAt(index);
-            if (candidate.getByte("Slot") == slot) {
-                chromosomeTag = candidate;
-                break;
-            }
-        }
-        if (chromosomeTag == null) return null;
-
-        Class<? extends IAllele> alleleClass = chromosome.getAlleleClass();
-        IAllele primary = AlleleManager.alleleRegistry.getAllele(chromosomeTag.getString("UID0"));
-        if (!alleleClass.isInstance(primary)) return null;
-        IAllele secondary = AlleleManager.alleleRegistry.getAllele(chromosomeTag.getString("UID1"));
-        if (!alleleClass.isInstance(secondary)) return null;
-        if (!active) return primary;
-
-        if (primary.isDominant()) return primary;
-        return secondary.isDominant() ? secondary : primary;
-    }
-
     @Override
     public boolean hasEffect(ItemStack stack, int pass) {
         if (!stack.hasTagCompound()) {
             return false;
         }
 
-        IAllele allele = getRenderAllele(stack, EnumFlowerChromosome.SPECIES, false);
-        if (allele instanceof IAlleleFlowerSpecies species) {
-            return species.hasEffect();
-        }
-
         IIndividual individual = getIndividual(stack);
         return individual != null && individual.getGenome() != null && individual.hasEffect();
     }
@@ -193,17 +148,6 @@ public abstract class ItemBotany extends Item {
 
     @Override
     public int getColorFromItemStack(ItemStack itemstack, int renderPass) {
-        if (!itemstack.hasTagCompound()) {
-            return (renderPass == 0 ? EnumFlowerColor.GREEN : EnumFlowerColor.RED).getColor(false);
-        }
-
-        EnumFlowerChromosome chromosome = renderPass == 0 ? EnumFlowerChromosome.STEM
-                : renderPass == 1 ? EnumFlowerChromosome.PRIMARY : EnumFlowerChromosome.SECONDARY;
-        IAllele allele = getRenderAllele(itemstack, chromosome, true);
-        if (allele instanceof AlleleColor color) {
-            return color.getColor().getColor(itemstack.getTagCompound().getBoolean("Wilt"));
-        }
-
         IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
         if (flower == null || flower.getGenome() == null) {
             return 0xffffff;
@@ -229,32 +173,19 @@ public abstract class ItemBotany extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(ItemStack itemstack, int renderPass) {
-        IAlleleFlowerSpecies species = FlowerSpecies.POPPY;
-        boolean flowered = false;
-
-        if (itemstack.hasTagCompound()) {
-            IAllele allele = getRenderAllele(itemstack, EnumFlowerChromosome.SPECIES, false);
-            if (allele instanceof IAlleleFlowerSpecies flowerSpecies) {
-                species = flowerSpecies;
-                flowered = itemstack.getTagCompound().getBoolean("Flowered");
-            } else {
-                IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
-                if (flower == null || flower.getGenome() == null || flower.getGenome().getPrimary() == null) {
-                    return EnumFlowerType.ALLIUM.getBlank();
-                }
-                species = flower.getGenome().getPrimary();
-                flowered = flower.hasFlowered();
-            }
+        IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
+        if (flower == null || flower.getGenome() == null || flower.getGenome().getPrimary() == null) {
+            return EnumFlowerType.ALLIUM.getBlank();
         }
 
-        IFlowerType type = species.getType();
+        IFlowerType type = flower.getGenome().getPrimary().getType();
         if (renderPass == 0) {
-            return type.getStem(getStage(), flowered, type.getSections() - 1);
+            return type.getStem(getStage(), flower.hasFlowered(), type.getSections() - 1);
         }
         if (renderPass == 1) {
-            return type.getPetalIcon(getStage(), flowered, type.getSections() - 1);
+            return type.getPetalIcon(getStage(), flower.hasFlowered(), type.getSections() - 1);
         }
-        return type.getVariantIcon(getStage(), flowered, type.getSections() - 1);
+        return type.getVariantIcon(getStage(), flower.hasFlowered(), type.getSections() - 1);
     }
 
     @Override

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

@@ -1,7 +1,5 @@
 package binnie.botany.flower;
 
-import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
-
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -27,8 +25,6 @@ public class ItemInsulatedTube extends Item {
         setUnlocalizedName("insulatedTube");
         setCreativeTab(CreativeTabBotany.instance);
         setHasSubtypes(true);
-
-        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     public static ItemStack getInsulateStack(ItemStack stack) {
@@ -38,8 +34,8 @@ public class ItemInsulatedTube extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
-        for (Material mat : Material.VALUES) {
-            for (Insulate ins : Insulate.VALUES) {
+        for (Material mat : Material.values()) {
+            for (Insulate ins : Insulate.values()) {
                 list.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128));
             }
         }
@@ -97,8 +93,6 @@ public class ItemInsulatedTube extends Item {
         Bronze(0xddc276, "bronze"),
         Iron(0xd8d8d8, "iron");
 
-        public static final Material[] VALUES = values();
-
         private final int color;
         private final String name;
 
@@ -108,7 +102,7 @@ public class ItemInsulatedTube extends Item {
         }
 
         public static Material get(int i) {
-            return VALUES[i % VALUES.length];
+            return values()[i % values().length];
         }
 
         public int getColor() {
@@ -129,8 +123,6 @@ public class ItemInsulatedTube extends Item {
         Stone(0x6d6d6d, "smoothStone"),
         Sandstone(0xc1b989, "sandstone");
 
-        public static final Insulate[] VALUES = values();
-
         private final int color;
         private final String name;
 
@@ -140,7 +132,7 @@ public class ItemInsulatedTube extends Item {
         }
 
         public static Insulate get(int i) {
-            return VALUES[i / 128 % VALUES.length];
+            return values()[i / 128 % values().length];
         }
 
         public int getColor() {

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

@@ -48,7 +48,7 @@ public class BlockPlant extends BlockBush {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister register) {
-        for (Type t : Type.VALUES) {
+        for (Type t : Type.values()) {
             t.icon = Botany.proxy.getIcon(register, t.name().toLowerCase());
         }
     }
@@ -61,7 +61,7 @@ public class BlockPlant extends BlockBush {
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(int side, int meta) {
-        return Type.VALUES[meta % Type.VALUES.length].icon;
+        return Type.values()[meta % Type.values().length].icon;
     }
 
     @Override
@@ -72,7 +72,7 @@ public class BlockPlant extends BlockBush {
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
-        for (Type type : Type.VALUES) {
+        for (Type type : Type.values()) {
             list.add(type.get());
         }
     }
@@ -135,7 +135,6 @@ public class BlockPlant extends BlockBush {
         DeadFlower("deadFlower"),
         DecayingFlower("decayingFlower");
 
-        public static final Type[] VALUES = values();
         public IIcon icon;
 
         private final String name;
@@ -145,7 +144,7 @@ public class BlockPlant extends BlockBush {
         }
 
         public static Type get(int id) {
-            return VALUES[id % VALUES.length];
+            return values()[id % values().length];
         }
 
         public ItemStack get() {

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

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

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

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

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

@@ -33,8 +33,8 @@ public class ItemSoil extends ItemBlock {
     @SideOnly(Side.CLIENT)
     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) {

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

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

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

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

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

@@ -18,7 +18,7 @@ public class ItemWeed extends ItemBlock {
 
     @Override
     public String getItemStackDisplayName(ItemStack stack) {
-        return BlockPlant.Type.VALUES[stack.getItemDamage()].getName();
+        return BlockPlant.Type.values()[stack.getItemDamage()].getName();
     }
 
     @Override

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

@@ -12,6 +12,7 @@ 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;
@@ -36,7 +37,6 @@ 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 = new ItemMisc(CreativeTabBotany.instance, BotanyItems.values());
+        Botany.misc = Binnie.Item.registerMiscItems(BotanyItems.values(), CreativeTabBotany.instance);
         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) {

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

@@ -92,10 +92,7 @@ public enum EnumFlowerColor implements IFlowerColor {
     YELLOW("yellow", 0xffff00),
     YELLOW_GREEN("yellowGreen", 0x9acd32);
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumFlowerColor[] VALUES = values();
+    private static final EnumFlowerColor[] ALL_VALUES = values();
     private final int color;
     private final int colorDis;
     private final String name;
@@ -2967,7 +2964,7 @@ public enum EnumFlowerColor implements IFlowerColor {
     }
 
     public static EnumFlowerColor get(int i) {
-        return VALUES[Math.max(0, i) % VALUES.length];
+        return ALL_VALUES[Math.max(0, i) % ALL_VALUES.length];
     }
 
     @Override

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

@@ -57,10 +57,6 @@ public enum EnumFlowerType implements IFlowerType {
     DELPHINIUM(2),
     HOLLYHOCK(2);
 
-    /**
-     * 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;

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

@@ -232,7 +232,7 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
 
     @Override
     public IChromosomeType[] getKaryotype() {
-        return EnumFlowerChromosome.VALUES;
+        return EnumFlowerChromosome.values();
     }
 
     @Override

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

@@ -496,7 +496,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
 
     @Override
     public EnumHumidity getHumidity() {
-        return EnumHumidity.VALUES[getMoisture().ordinal()];
+        return EnumHumidity.values()[getMoisture().ordinal()];
     }
 
     @Override

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

@@ -8,14 +8,8 @@ import forestry.core.genetics.alleles.EnumAllele;
 
 public class FlowerTemplates {
 
-    private static IAllele[] defaultTemplate;
-
     public static IAllele[] getDefaultTemplate() {
-        if (defaultTemplate != null) {
-            return defaultTemplate.clone();
-        }
-
-        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);
@@ -28,13 +22,6 @@ public class FlowerTemplates {
         alleles[EnumFlowerChromosome.PH_TOLERANCE.ordinal()] = AlleleHelper.getAllele(EnumTolerance.NONE);
         alleles[EnumFlowerChromosome.SAPPINESS.ordinal()] = AlleleHelper.getAllele(EnumAllele.Sappiness.AVERAGE);
         alleles[EnumFlowerChromosome.STEM.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.GREEN);
-
-        for (IAllele allele : alleles) {
-            // Do not cache a partial template during registry initialization.
-            if (allele == null) return alleles;
-        }
-
-        defaultTemplate = alleles;
-        return defaultTemplate.clone();
+        return alleles;
     }
 }

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

@@ -1,7 +1,5 @@
 package binnie.botany.genetics;
 
-import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
-
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -27,8 +25,6 @@ public class ItemDictionary extends Item {
         setCreativeTab(CreativeTabBotany.instance);
         setUnlocalizedName("database");
         setMaxStackSize(1);
-
-        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

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

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

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

@@ -1,7 +1,5 @@
 package binnie.botany.items;
 
-import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
-
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -24,8 +22,6 @@ public class ItemClay extends Item {
         setUnlocalizedName("clay");
         setHasSubtypes(true);
         setCreativeTab(CreativeTabBotany.instance);
-
-        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override
@@ -49,7 +45,7 @@ public class ItemClay extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
-        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
             list.add(new ItemStack(this, 1, c.ordinal()));
         }
     }

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

@@ -1,7 +1,5 @@
 package binnie.botany.items;
 
-import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
-
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -24,8 +22,6 @@ public class ItemPigment extends Item {
         setUnlocalizedName("pigment");
         setHasSubtypes(true);
         setCreativeTab(CreativeTabBotany.instance);
-
-        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override
@@ -49,7 +45,7 @@ public class ItemPigment extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
-        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
             list.add(new ItemStack(this, 1, c.ordinal()));
         }
     }

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

@@ -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.get(data.readByte());
-        render.secondary = EnumFlowerColor.get(data.readByte());
-        render.stem = EnumFlowerColor.get(data.readByte());
-        render.type = EnumFlowerType.VALUES[data.readByte()];
+        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.age = data.readByte();
         render.section = data.readByte();
         render.wilted = data.readBoolean();

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

@@ -1,9 +1,15 @@
 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.core.gui.IBinnieGUID;
+import binnie.core.mod.parser.FieldParser;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
 import binnie.core.network.IPacketProvider;
@@ -16,11 +22,14 @@ 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 boolean isActive() {
@@ -59,6 +68,22 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
         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
@@ -74,6 +99,14 @@ 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
@@ -86,10 +119,18 @@ 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);
-        init.registerEventHandler();
+        MinecraftForge.EVENT_BUS.register(init);
     }
 }

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

@@ -5,14 +5,13 @@ 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;
@@ -23,6 +22,8 @@ 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.parser.FieldParser;
+import binnie.core.mod.parser.ItemParser;
 import binnie.core.network.BinnieCorePacketID;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
@@ -68,10 +69,6 @@ public class BinnieCore extends AbstractMod {
     public static ItemGenesis genesis;
     public static ItemFieldKit fieldKit;
 
-    public BinnieCore() {
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
-    }
-
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         for (ManagerBase baseManager : Binnie.Managers) {
@@ -79,9 +76,7 @@ public class BinnieCore extends AbstractMod {
         }
 
         addModule(new ModuleCraftGUI());
-        if (!BCConfig.disableCompartments) {
-            addModule(new ModuleStorage());
-        }
+        addModule(new ModuleStorage());
         addModule(new ModuleItems());
         if (Loader.isModLoaded("BuildCraft|Silicon")) {
             addModule(new ModuleTrigger());
@@ -111,6 +106,7 @@ public class BinnieCore extends AbstractMod {
             Item item = new ItemFluidContainer(container);
             GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
         }
+        FieldParser.parsers.add(new ItemParser());
         super.preInit();
     }
 
@@ -165,6 +161,23 @@ 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";
@@ -185,6 +198,15 @@ 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
     protected Class<? extends BinniePacketHandler> getPacketHandler() {
         return PacketHandler.class;
@@ -201,31 +223,4 @@ 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());
-        }
-    }
 }

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

@@ -7,6 +7,4 @@ public interface IInitializable {
     void init();
 
     void postInit();
-
-    default void registerEventHandler() {}
 }

src/main/java/binnie/core/block/ItemMetadata.java

@@ -17,8 +17,6 @@ public class ItemMetadata extends ItemBlock {
 
     public ItemMetadata(Block block) {
         super(block);
-        setMaxDamage(0);
-        setHasSubtypes(true);
     }
 
     @Override

src/main/java/binnie/core/block/MultipassBlockRenderer.java

@@ -14,7 +14,6 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
 
     public static MultipassBlockRenderer instance;
     private static int layer = 0;
-    private static boolean rendering = false;
 
     public MultipassBlockRenderer() {
         MultipassBlockRenderer.instance = this;
@@ -24,49 +23,31 @@ 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.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;
+        while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) {
+            renderItem(block, renderer, meta);
+            MultipassBlockRenderer.layer++;
         }
+        MultipassBlockRenderer.layer = 0;
     }
 
     @Override
     public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
             RenderBlocks renderer) {
-        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;
+        boolean r = true;
+        MultipassBlockRenderer.layer = 0;
+        while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) {
+            r = renderer.renderStandardBlock(block, x, y, z);
+            MultipassBlockRenderer.layer++;
         }
+        MultipassBlockRenderer.layer = 0;
+        return r;
     }
 
     @Override
@@ -79,8 +60,8 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
         return BinnieCore.multipassRenderID;
     }
 
-    private void renderItem(Block block, IMultipassBlock multipassBlock, RenderBlocks renderer, int meta) {
-        setColor(multipassBlock.colorMultiplier(meta));
+    public void renderItem(Block block, RenderBlocks renderer, int meta) {
+        setColor(((IMultipassBlock) block).colorMultiplier(meta));
         Tessellator tessellator = Tessellator.instance;
         tessellator.startDrawingQuads();
         tessellator.setNormal(0.0f, -1.0f, 0.0f);

src/main/java/binnie/core/block/TileEntityMetadata.java

@@ -76,14 +76,12 @@ 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);
-        if (0 <= damage && damage < Short.MAX_VALUE) {
-            item.setItemDamage(damage);
-        } else {
-            NBTTagCompound tag = new NBTTagCompound();
-            tag.setInteger("meta", damage);
-            item.setTagCompound(tag);
-        }
+        item.setItemDamage(Math.min(damage, 16387));
+        item.setTagCompound(tag);
         return item;
     }
 

src/main/java/binnie/core/config/BCConfig.java

@@ -1,14 +0,0 @@
-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;
-}

src/main/java/binnie/core/craftgui/IWidget.java

@@ -91,7 +91,7 @@ public interface IWidget {
 
     void callEvent(Event event);
 
-    void receiveEvent(Event event);
+    void recieveEvent(Event event);
 
     void onUpdateClient();
 

src/main/java/binnie/core/craftgui/TopLevelWidget.java

@@ -1,7 +1,10 @@
 package binnie.core.craftgui;
 
 import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Deque;
+import java.util.List;
 import java.util.ListIterator;
 
 import org.lwjgl.input.Mouse;
@@ -165,14 +168,17 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget {
     }
 
     public Deque<IWidget> calculateMousedOverWidgets() {
-        Deque<IWidget> widgets = new ArrayDeque<>();
-        addMousedOverWidgets(this, widgets);
-        return widgets;
+        Deque<IWidget> list = new ArrayDeque<>();
+        for (IWidget widget : getQueuedWidgets(this)) {
+            if (widget.calculateIsMouseOver()) {
+                list.addLast(widget);
+            }
+        }
+        return list;
     }
 
-    private void addMousedOverWidgets(IWidget widget, Deque<IWidget> widgets) {
-        if (!widget.isVisible()) return;
-
+    private Collection<IWidget> getQueuedWidgets(IWidget widget) {
+        List<IWidget> widgets = new ArrayList<>();
         boolean addChildren = true;
         if (widget.isCroppedWidget()) {
             addChildren = widget.getCroppedZone().contains(widget.getCropWidget().getRelativeMousePosition());
@@ -182,12 +188,11 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget {
             ListIterator<IWidget> li = widget.getWidgets().listIterator(widget.getWidgets().size());
             while (li.hasPrevious()) {
                 IWidget child = li.previous();
-                addMousedOverWidgets(child, widgets);
+                widgets.addAll(getQueuedWidgets(child));
             }
         }
-        if (widget.calculateIsMouseOver()) {
-            widgets.addLast(widget);
-        }
+        widgets.add(widget);
+        return widgets;
     }
 
     @Override

src/main/java/binnie/core/craftgui/Widget.java

@@ -194,7 +194,7 @@ public class Widget implements IWidget {
 
     @Override
     public void setOffset(IPoint offset) {
-        if (!offset.equals(this.offset)) {
+        if (offset != this.offset) {
             this.offset = new IPoint(offset);
             callEvent(new EventWidget.ChangeOffset(this));
         }
@@ -235,11 +235,11 @@ public class Widget implements IWidget {
 
     @Override
     public void callEvent(Event event) {
-        getSuperParent().receiveEvent(event);
+        getSuperParent().recieveEvent(event);
     }
 
     @Override
-    public void receiveEvent(Event event) {
+    public void recieveEvent(Event event) {
         for (EventHandler handler : globalEventHandlers) {
             if (handler.handles(event)) {
                 handler.onEvent(event);
@@ -248,7 +248,7 @@ public class Widget implements IWidget {
 
         try {
             for (IWidget child : getWidgets()) {
-                child.receiveEvent(event);
+                child.recieveEvent(event);
             }
         } catch (ConcurrentModificationException e) {
             // ignored
@@ -285,10 +285,6 @@ public class Widget implements IWidget {
         onRender(RenderStage.PreChildren);
 
         for (IWidget widget : getWidgets()) {
-            if (!widget.isVisible()) {
-                continue;
-            }
-
             widget.render();
             CraftGUI.render.preRender(widget);
             widget.onRender(RenderStage.PostSiblings);
@@ -310,22 +306,17 @@ public class Widget implements IWidget {
         }
 
         onUpdateClient();
-        List<IWidget> deletedWidgets = null;
+        List<IWidget> deletedWidgets = new ArrayList<>();
         for (IWidget widget : getWidgets()) {
             if (widget.hasAttribute(WidgetAttribute.NEEDS_DELETION)) {
-                if (deletedWidgets == null) {
-                    deletedWidgets = new ArrayList<>();
-                }
                 deletedWidgets.add(widget);
             } else {
                 widget.updateClient();
             }
         }
 
-        if (deletedWidgets != null) {
-            for (IWidget widget : deletedWidgets) {
-                deleteChild(widget);
-            }
+        for (IWidget widget : deletedWidgets) {
+            deleteChild(widget);
         }
     }
 
@@ -347,7 +338,7 @@ public class Widget implements IWidget {
 
     @Override
     public boolean isMouseOverWidget(IPoint relativeMouse) {
-        return contains(relativeMouse);
+        return getArea().contains(relativeMouse);
     }
 
     @Override
@@ -475,8 +466,7 @@ public class Widget implements IWidget {
 
     @Override
     public boolean contains(IPoint position) {
-        IPoint size = size();
-        return position.x() >= 0.0f && position.y() >= 0.0f && position.x() <= size.x() && position.y() <= size.y();
+        return getArea().contains(position);
     }
 
     @Override

src/main/java/binnie/core/craftgui/WindowFieldKit.java

@@ -12,7 +12,6 @@ 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;
@@ -34,7 +33,6 @@ 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;
@@ -115,26 +113,20 @@ 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).create(actions);
+        new ControlPlayerInventory(this);
         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(actions, InventoryType.Window, 0);
-        new ControlSlot(this, 208.0f, 8.0f).assign(actions, InventoryType.Window, 1);
-
-        MessageCraftGUI.sendToServer(actions);
-
+        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);
         (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))
@@ -188,9 +180,7 @@ public class WindowFieldKit extends Window {
         glassOffsetX *= 1.0f - analyseProgress;
         glassOffsetY += glassVY;
         glassOffsetY *= 1.0f - analyseProgress;
-        if (GlassControl != null) {
-            GlassControl.setOffset(new IPoint(glassOffsetX, glassOffsetY));
-        }
+        GlassControl.setOffset(new IPoint(glassOffsetX, glassOffsetY));
     }
 
     private void refreshSpecies() {
@@ -295,8 +285,8 @@ public class WindowFieldKit extends Window {
     }
 
     @Override
-    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
-        super.receiveGuiNBT(side, player, name, nbt);
+    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+        super.recieveGuiNBT(side, player, name, nbt);
         if (side != Side.SERVER || !name.equals("analyse")) {
             return;
         }

src/main/java/binnie/core/craftgui/WindowGenesis.java

@@ -63,7 +63,7 @@ public class WindowGenesis extends Window {
 
     @Override
     public void initialiseClient() {
-        new ControlPlayerInventory(this).createAndRegister();
+        new ControlPlayerInventory(this);
         setTitle(getName());
 
         ControlTabBar<BreedingSystem> tabSystems = new BreedingSystemControlTabBar();
@@ -175,8 +175,8 @@ public class WindowGenesis extends Window {
     }
 
     @Override
-    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
-        super.receiveGuiNBT(side, player, name, nbt);
+    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+        super.recieveGuiNBT(side, player, name, nbt);
         if (side == Side.SERVER && name.equals("genesis")) {
             ItemStack stack = ItemStack.loadItemStackFromNBT(nbt);
             InventoryPlayer playerInv = player.inventory;

src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java

@@ -1,8 +1,5 @@
 package binnie.core.craftgui.controls.tab;
 
-import java.util.IdentityHashMap;
-import java.util.Map;
-
 import binnie.core.craftgui.CraftGUI;
 import binnie.core.craftgui.ITooltip;
 import binnie.core.craftgui.Tooltip;
@@ -24,7 +21,6 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
     protected T value;
 
     private final ControlTabBar<T> tabBar;
-    private final Map<Texture, Texture> croppedTextures = new IdentityHashMap<>();
 
     public ControlTab(ControlTabBar<T> parent, float x, float y, float w, float h, T value) {
         super(parent, x, y, w, h);
@@ -49,8 +45,9 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
             texture = CraftGUITexture.Tab;
         }
 
+        Texture lTexture = CraftGUI.render.getTexture(texture);
         Position position = getTabPosition();
-        Texture iTexture = getCroppedTexture(texture);
+        Texture iTexture = lTexture.crop(position, 8.0f);
         IArea area = getArea();
         if (texture == CraftGUITexture.TabDisabled) {
             if (position == Position.TOP || position == Position.LEFT) {
@@ -71,23 +68,14 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
             }
 
             if (icon.hasOutline()) {
-                iTexture = getCroppedTexture(CraftGUITexture.TabOutline);
+                iTexture = CraftGUI.render.getTexture(CraftGUITexture.TabOutline);
+                iTexture = iTexture.crop(position, 8.0f);
                 CraftGUI.render.color(icon.getOutlineColor());
                 CraftGUI.render.texture(iTexture, area.inset(2));
             }
         }
     }
 
-    private Texture getCroppedTexture(Object key) {
-        Texture source = CraftGUI.render.getTexture(key);
-        Texture cropped = croppedTextures.get(source);
-        if (cropped == null) {
-            cropped = source.crop(getTabPosition(), 8.0f);
-            croppedTextures.put(source, cropped);
-        }
-        return cropped;
-    }
-
     @Override
     public void getTooltip(Tooltip tooltip) {
         String name = getName();

src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java

@@ -1,23 +1,18 @@
 package binnie.core.craftgui.minecraft;
 
-import static net.minecraftforge.common.util.Constants.NBT.TAG_COMPOUND;
-
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
 
 import com.mojang.authlib.GameProfile;
 
@@ -38,139 +33,107 @@ import binnie.core.machines.power.TankInfo;
 import binnie.core.machines.transfer.TransferRequest;
 import binnie.core.network.packet.MessageContainerUpdate;
 import cpw.mods.fml.relauncher.Side;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public class ContainerCraftGUI extends Container {
 
-    // Action type is one of the action constants below
-    public final static String ACTION_TYPE = "type";
-
-    // Action constants
-    public final static String ACTION_BATCH = "batch";
-    public final static String SLOT_REG = "slot-reg";
-    public final static String TANK_CLICK = "tank-click";
-    public final static String TANK_UPDATE = "tank-update-";
-    public final static String POWER_UPDATE = "power-update";
-    public final static String PROCESS_UPDATE = "process-update";
-    public final static String ERROR_UPDATE = "error-update";
-    public final static String MOUSE_OVER_SLOT = "mouse-over-slot";
-    public final static String SHIFT_CLICK_INFO = "shift-click-info";
-
-    // Error type is one of the error constants below
-    public final static String ERROR_TYPE = "type";
-
-    // Error constants
-    public static final byte CANNOT_WORK = (byte) 0;
-    public static final byte CANNOT_PROGRESS = (byte) 1;
-
-    // Slot constants
-    public static final String SLOT_TYPE = "t";
-    public static final String SLOT_INDEX = "i";
-    public static final String SLOT_NUMBER = "n";
-
-    // Uncategorized constants
-    public static final String ACTIONS = "actions";
-    private static final String USERNAME = "username";
-    private static final String SLOT_ID = "id";
-    private static final String SLOT = "slot";
-    private static final String SLOTS = "slots";
-    private static final String TANK = "tank";
-    private static final String ORIGIN = "origin";
-    private static final String NAME = "name";
-
     private final Window window;
-    private final Map<String, NBTTagCompound> syncedNBT = new HashMap<>();
-    private final Map<String, NBTTagCompound> sentNBT = new HashMap<>();
-    private final Map<Integer, TankInfo> syncedTanks = new HashMap<>();
-    private final Map<IInventory, Int2ObjectMap<CustomSlot>> slotsByInventory = new IdentityHashMap<>();
-    private PowerInfo syncedPower = new PowerInfo();
-    private ProcessInfo syncedProcess = new ProcessInfo();
-    private int errorType = 0;
-    private ErrorState error = null;
-    private int mousedOverSlotNumber = -1;
+    private final Map<String, NBTTagCompound> syncedNBT;
+    private final Map<String, NBTTagCompound> sentNBT;
+    private final Map<Integer, TankInfo> syncedTanks;
+    private PowerInfo syncedPower;
+    private ProcessInfo syncedProcess;
+    private int errorType;
+    private ErrorState error;
+    private int mousedOverSlotNumber;
 
     public ContainerCraftGUI(Window window) {
         this.window = window;
+        syncedNBT = new HashMap<>();
+        sentNBT = new HashMap<>();
+        syncedTanks = new HashMap<>();
+        syncedPower = new PowerInfo();
+        syncedProcess = new ProcessInfo();
+        errorType = 0;
+        error = null;
+        mousedOverSlotNumber = -1;
+        IMachine machine = Machine.getMachine(window.getInventory());
+        if (getSide() != Side.SERVER) {
+            return;
+        }
 
-        if (!window.isServer()) return;
-
-        // WARNING: The client side expects `ArrayList` and the server expects `ListMap`
         inventoryItemStacks = new ListMap<>();
         inventorySlots = new ListMap<>();
-
-        IInventory entityInventory = window.getInventory();
-        IMachine machine = Machine.getMachine(entityInventory);
-        if (machine == null) return;
+        if (machine == null) {
+            return;
+        }
 
         GameProfile user = machine.getOwner();
-        if (user == null) return;
-
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setString(USERNAME, user.getName());
-        sendNBTToClient(USERNAME, nbt);
+        if (user != null) {
+            NBTTagCompound nbt = new NBTTagCompound();
+            nbt.setString("username", user.getName());
+            sendNBTToClient("username", nbt);
+        }
     }
 
     @Override
     protected Slot addSlotToContainer(Slot slot) {
-        indexSlot(slot);
         return super.addSlotToContainer(slot);
     }
 
-    private void indexSlot(Slot slot) {
-        if (slot instanceof CustomSlot customSlot) {
-            slotsByInventory.computeIfAbsent(customSlot.inventory, key -> new Int2ObjectOpenHashMap<>())
-                    .putIfAbsent(customSlot.getSlotIndex(), customSlot);
-        }
-    }
-
     private Side getSide() {
         return window.isServer() ? Side.SERVER : Side.CLIENT;
     }
 
     @Override
     public Slot getSlot(int index) {
-        return index < 0 || index >= inventorySlots.size() ? null : inventorySlots.get(index);
+        if (index < 0 || index >= inventorySlots.size()) {
+            return null;
+        }
+        return inventorySlots.get(index);
     }
 
     @Override
     public void putStackInSlot(int index, ItemStack stack) {
-        final Slot slot = getSlot(index);
-        if (slot != null) slot.putStack(stack);
+        if (getSlot(index) != null) {
+            getSlot(index).putStack(stack);
+        }
     }
 
     @Override
     public void putStacksInSlots(ItemStack[] par1ArrayOfItemStack) {
         for (int i = 0; i < par1ArrayOfItemStack.length; ++i) {
-            final Slot slot = getSlot(i);
-            if (slot != null) slot.putStack(par1ArrayOfItemStack[i]);
+            if (getSlot(i) != null) {
+                getSlot(i).putStack(par1ArrayOfItemStack[i]);
+            }
         }
     }
 
     @Override
     public void onContainerClosed(EntityPlayer player) {
         super.onContainerClosed(player);
-        WindowInventory windowInventory = window.getWindowInventory();
-        InventoryPlayer playerInventory = player.inventory;
+        WindowInventory inventory = window.getWindowInventory();
+        for (int i = 0; i < inventory.getSizeInventory(); ++i) {
+            if (!inventory.dispenseOnClose(i)) {
+                continue;
+            }
 
-        for (int i = 0; i < windowInventory.getSizeInventory(); ++i) {
-            if (!windowInventory.dispenseOnClose(i)) continue;
+            ItemStack stack = inventory.getStackInSlot(i);
+            if (stack == null) {
+                continue;
+            }
 
-            final ItemStack stack = windowInventory.getStackInSlot(i);
-            if (stack == null) continue;
-
-            final ItemStack newStack = new TransferRequest(stack, playerInventory).transfer(true);
-            if (newStack == null) continue;
-
-            player.dropPlayerItemWithRandomChoice(newStack, false);
+            stack = new TransferRequest(stack, player.inventory).transfer(true);
+            if (stack != null) {
+                player.dropPlayerItemWithRandomChoice(stack, false);
+            }
         }
     }
 
     @Override
     public ItemStack slotClick(int slotNum, int mouseButton, int modifier, EntityPlayer player) {
         Slot slot = getSlot(slotNum);
-        if (slot instanceof CustomSlot customSlot && customSlot.handleClick()) {
-            customSlot.onSlotClick(this, mouseButton, modifier, player);
+        if (slot instanceof CustomSlot && ((CustomSlot) slot).handleClick()) {
+            ((CustomSlot) slot).onSlotClick(this, mouseButton, modifier, player);
             return player.inventory.getItemStack();
         }
         return super.slotClick(slotNum, mouseButton, modifier, player);
@@ -188,182 +151,173 @@ public class ContainerCraftGUI extends Container {
             }
             sentNBT.clear();
         }
-        IInventory entityInventory = window.getInventory();
-        return entityInventory == null || entityInventory.isUseableByPlayer(player);
+        IInventory inventory = window.getInventory();
+        return inventory == null || inventory.isUseableByPlayer(player);
     }
 
     @Override
     public ItemStack transferStackInSlot(EntityPlayer player, int slotID) {
-        shiftClick(player, slotID);
-        return null;
+        return shiftClick(player, slotID);
     }
 
-    private void shiftClick(EntityPlayer player, int index) {
+    private ItemStack shiftClick(EntityPlayer player, int index) {
         TransferRequest request = getShiftClickRequest(player, index);
-        if (request == null) return;
+        if (request == null) {
+            return null;
+        }
+
         ItemStack stack = request.transfer(true);
         Slot shiftClickedSlot = inventorySlots.get(index);
         shiftClickedSlot.putStack(stack);
         shiftClickedSlot.onSlotChanged();
+        return null;
     }
 
     private TransferRequest getShiftClickRequest(EntityPlayer player, int index) {
-        if (index < 0) return null;
+        if (index < 0) {
+            return null;
+        }
 
-        Slot shiftClickedSlot = inventorySlots.get(index);
+        Slot shiftClickedSlot = (Slot) inventorySlots.get(index);
         ItemStack itemstack = null;
         if (shiftClickedSlot.getHasStack()) {
-            itemstack = shiftClickedSlot.getStack();
+            itemstack = shiftClickedSlot.getStack().copy();
         }
 
         IInventory playerInventory = player.inventory;
-        IInventory entityInventory = window.getInventory();
+        IInventory containerInventory = window.getInventory();
         IInventory windowInventory = window.getWindowInventory();
-        IInventory fromPlayer = (entityInventory == null) ? windowInventory : entityInventory;
+        IInventory fromPlayer = (containerInventory == null) ? windowInventory : containerInventory;
+        int[] target = new int[36];
+        for (int i = 0; i < 36; ++i) {
+            target[i] = i;
+        }
 
         TransferRequest request;
         if (shiftClickedSlot.inventory == playerInventory) {
             request = new TransferRequest(itemstack, fromPlayer).setOrigin(shiftClickedSlot.inventory);
         } else {
-            int[] target = new int[36];
-            for (int i = 0; i < target.length; ++i) {
-                target[i] = i;
-            }
             request = new TransferRequest(itemstack, playerInventory).setOrigin(shiftClickedSlot.inventory)
                     .setTargetSlots(target);
         }
 
-        if (window instanceof IWindowAffectsShiftClick iWindowAffectsShiftClick) {
-            iWindowAffectsShiftClick.alterRequest(request);
+        if (window instanceof IWindowAffectsShiftClick) {
+            ((IWindowAffectsShiftClick) window).alterRequest(request);
         }
         return request;
     }
 
-    @SuppressWarnings("UnusedReturnValue")
     public ItemStack tankClick(EntityPlayer player, int slotID) {
-        if (player.inventory.getItemStack() == null) return null;
-
-        ItemStack heldItem = player.inventory.getItemStack().copy();
-        IInventory entityInventory = window.getInventory();
-        heldItem = new TransferRequest(heldItem, entityInventory).setOrigin(player.inventory).setTargetSlots(new int[0])
-                .setTargetTanks(new int[] { slotID }).dropOverflow(player).transfer(true);
-
-        player.inventory.setItemStack(heldItem);
-
-        if (player instanceof EntityPlayerMP entityPlayerMP) {
-            entityPlayerMP.updateHeldItem();
+        if (player.inventory.getItemStack() == null) {
+            return null;
         }
 
+        ItemStack heldItem = player.inventory.getItemStack().copy();
+        heldItem = new TransferRequest(heldItem, window.getInventory()).setOrigin(player.inventory)
+                .setTargetSlots(new int[0]).setTargetTanks(new int[] { slotID }).transfer(true);
+        player.inventory.setItemStack(heldItem);
+        if (player instanceof EntityPlayerMP) {
+            ((EntityPlayerMP) player).updateHeldItem();
+        }
         return heldItem;
     }
 
-    public void handleNBT(Side side, EntityPlayer player, NBTTagCompound action) {
-        if (handleNBTAction(side, player, action)) {
-            sendContainerContents();
-        }
-    }
-
-    private boolean handleNBTAction(Side side, EntityPlayer player, NBTTagCompound action) {
-        final String actionType = action.getString(ACTION_TYPE);
-        boolean slotRegistered = false;
-
+    public boolean handleNBT(Side side, EntityPlayer player, String name, NBTTagCompound action) {
         if (side == Side.SERVER) {
-            switch (actionType) {
-                case TANK_CLICK -> tankClick(player, action.getByte(SLOT_ID));
-                case SLOT_REG -> {
-                    final int slotType = action.getByte(SLOT_TYPE);
-                    final int slotIndex = action.getShort(SLOT_INDEX);
-                    final int slotNumber = action.getShort(SLOT_NUMBER);
+            if (name.equals("tank-click")) {
+                tankClick(player, action.getByte("id"));
+            }
+            if (name.equals("slot-reg")) {
+                int type = action.getByte("t");
+                int index = action.getShort("i");
+                int slotNumber = action.getShort("n");
+                getOrCreateSlot(InventoryType.values()[type % 4], index, slotNumber);
 
-                    slotRegistered = createSlot(InventoryType.values()[slotType % 4], slotIndex, slotNumber);
+                for (ICrafting crafterObject : crafters) {
+                    crafterObject.sendContainerAndContentsToPlayer(this, getInventory());
                 }
             }
         }
 
-        switch (actionType) {
-            case POWER_UPDATE -> onPowerUpdate(action);
-            case PROCESS_UPDATE -> onProcessUpdate(action);
-            case ERROR_UPDATE -> onErrorUpdate(action);
-            case MOUSE_OVER_SLOT -> onMouseOverSlot(player, action);
-            case SHIFT_CLICK_INFO -> onReceiveShiftClickHighlights(action);
-            default -> {
-                if (actionType.contains(TANK_UPDATE)) onTankUpdate(action);
-            }
+        if (name.contains("tank-update")) {
+            onTankUpdate(action);
+        } else if (name.equals("power-update")) {
+            onPowerUpdate(action);
+        } else if (name.equals("process-update")) {
+            onProcessUpdate(action);
+        } else if (name.equals("error-update")) {
+            onErrorUpdate(action);
+        } else if (name.equals("mouse-over-slot")) {
+            onMouseOverSlot(player, action);
+        } else if (name.equals("shift-click-info")) {
+            onRecieveShiftClickHighlights(player, action);
         }
-        return slotRegistered;
+        return false;
     }
 
     @Override
     public void detectAndSendChanges() {
         super.detectAndSendChanges();
-
-        IInventory entityInventory = window.getInventory();
-        ITankMachine tanks = Machine.getInterface(ITankMachine.class, entityInventory);
-        IPoweredMachine powered = Machine.getInterface(IPoweredMachine.class, entityInventory);
-        IErrorStateSource error = Machine.getInterface(IErrorStateSource.class, entityInventory);
-        IProcess process = Machine.getInterface(IProcess.class, entityInventory);
-
-        if (window.isServer() && tanks != null) {
-            final TankInfo[] tankInfos = tanks.getTankInfos();
-            for (int i = 0; i < tankInfos.length; ++i) {
-                final TankInfo tank = tankInfos[i];
-                if (this.getTankInfo(i).equals(tank)) continue;
-                syncedNBT.put(TANK_UPDATE + i, createTankNBT(i, tank));
-                syncedTanks.put(i, tank);
+        ITankMachine tanks = Machine.getInterface(ITankMachine.class, window.getInventory());
+        IPoweredMachine powered = Machine.getInterface(IPoweredMachine.class, window.getInventory());
+        IErrorStateSource error = Machine.getInterface(IErrorStateSource.class, window.getInventory());
+        IProcess process = Machine.getInterface(IProcess.class, window.getInventory());
+        if (tanks != null && window.isServer()) {
+            for (int i = 0; i < tanks.getTankInfos().length; ++i) {
+                TankInfo tank = tanks.getTankInfos()[i];
+                if (!getTankInfo(i).equals(tank)) {
+                    syncedNBT.put("tank-update-" + i, createTankNBT(i, tank));
+                    syncedTanks.put(i, tank);
+                }
             }
         }
 
-        if (window.isServer()) {
-            if (powered != null) syncedNBT.put(POWER_UPDATE, createPowerNBT(powered.getPowerInfo()));
-            if (process != null) syncedNBT.put(PROCESS_UPDATE, createProcessNBT(process.getInfo()));
-            if (error != null) syncedNBT.put(ERROR_UPDATE, createErrorNBT(error));
+        if (powered != null && window.isServer()) {
+            syncedNBT.put("power-update", createPowerNBT(powered.getPowerInfo()));
+        }
+        if (process != null && window.isServer()) {
+            syncedNBT.put("process-update", createProcessNBT(process.getInfo()));
+        }
+        if (error != null && window.isServer()) {
+            syncedNBT.put("error-update", createErrorNBT(error));
         }
 
-        INetwork.SendGuiNBT machineSync = Machine.getInterface(INetwork.SendGuiNBT.class, entityInventory);
+        INetwork.SendGuiNBT machineSync = Machine.getInterface(INetwork.SendGuiNBT.class, window.getInventory());
+        if (machineSync != null) {
+            machineSync.sendGuiNBT(syncedNBT);
+        }
 
-        if (machineSync != null) machineSync.sendGuiNBT(syncedNBT);
-
-        NBTTagList actions = null;
-
-        for (Map.Entry<String, NBTTagCompound> entry : syncedNBT.entrySet()) {
-            final String actionType = entry.getKey();
-            final NBTTagCompound action = entry.getValue();
-            final NBTTagCompound actionPrev = sentNBT.get(actionType);
-
-            action.setString(ACTION_TYPE, actionType);
-
-            if (action == actionPrev || action.equals(actionPrev)) continue;
-
-            if (actions == null) {
-                actions = new NBTTagList();
+        Map<String, NBTTagCompound> sentThisTime = new HashMap<>();
+        for (Map.Entry<String, NBTTagCompound> nbt : syncedNBT.entrySet()) {
+            nbt.getValue().setString("type", nbt.getKey());
+            boolean shouldSend = true;
+            NBTTagCompound lastSent = sentNBT.get(nbt.getKey());
+            if (lastSent != null) {
+                shouldSend = !lastSent.equals(nbt.getValue());
+            }
+
+            if (shouldSend) {
+                for (Object crafter : crafters) {
+                    if (crafter instanceof EntityPlayerMP playerMP) {
+                        BinnieCore.proxy.sendToPlayer(new MessageContainerUpdate(nbt.getValue()), playerMP);
+                    }
+                }
+                sentThisTime.put(nbt.getKey(), nbt.getValue());
             }
-            actions.appendTag(action);
-            sentNBT.put(actionType, action);
         }
 
+        sentNBT.putAll(sentThisTime);
         syncedNBT.clear();
-        if (actions == null) return;
-
-        NBTTagCompound actionsBatch = new NBTTagCompound();
-        actionsBatch.setString(ACTION_TYPE, ACTION_BATCH);
-        actionsBatch.setTag(ACTIONS, actions);
-
-        for (ICrafting crafter : crafters) {
-            if (crafter instanceof EntityPlayerMP playerMP) {
-                final MessageContainerUpdate packet = new MessageContainerUpdate(actionsBatch);
-                BinnieCore.proxy.sendToPlayer(packet, playerMP);
-            }
-        }
     }
 
     private NBTTagCompound createErrorNBT(IErrorStateSource error) {
         NBTTagCompound nbt = new NBTTagCompound();
         ErrorState state = null;
         if (error.canWork() != null) {
-            nbt.setByte(ERROR_TYPE, CANNOT_WORK);
+            nbt.setByte("type", (byte) 0);
             state = error.canWork();
         } else if (error.canProgress() != null) {
-            nbt.setByte(ERROR_TYPE, CANNOT_PROGRESS);
+            nbt.setByte("type", (byte) 1);
             state = error.canProgress();
         }
 
@@ -388,20 +342,19 @@ public class ContainerCraftGUI extends Container {
     public NBTTagCompound createTankNBT(int tank, TankInfo tankInfo) {
         NBTTagCompound nbt = new NBTTagCompound();
         tankInfo.writeToNBT(nbt);
-        nbt.setByte(TANK, (byte) tank);
+        nbt.setByte("tank", (byte) tank);
         return nbt;
     }
 
     public void onTankUpdate(NBTTagCompound nbt) {
-        int tankID = nbt.getByte(TANK);
+        int tankID = nbt.getByte("tank");
         TankInfo tank = new TankInfo();
         tank.readFromNBT(nbt);
         syncedTanks.put(tankID, tank);
     }
 
     public void onProcessUpdate(NBTTagCompound nbt) {
-        syncedProcess = new ProcessInfo();
-        syncedProcess.readFromNBT(nbt);
+        (syncedProcess = new ProcessInfo()).readFromNBT(nbt);
     }
 
     public void onPowerUpdate(NBTTagCompound nbt) {
@@ -422,8 +375,8 @@ public class ContainerCraftGUI extends Container {
     }
 
     public void onErrorUpdate(NBTTagCompound nbt) {
-        errorType = nbt.getByte(ERROR_TYPE);
-        if (nbt.hasKey(NAME)) {
+        errorType = nbt.getByte("type");
+        if (nbt.hasKey("name")) {
             error = new ErrorState("", "");
             error.readFromNBT(nbt);
         } else {
@@ -450,18 +403,20 @@ public class ContainerCraftGUI extends Container {
     }
 
     public void setMouseOverSlot(Slot slot) {
-        if (slot.slotNumber == mousedOverSlotNumber) return;
+        if (slot.slotNumber == mousedOverSlotNumber) {
+            return;
+        }
 
         mousedOverSlotNumber = slot.slotNumber;
         ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).clear();
         NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setShort(SLOT, (short) slot.slotNumber);
-        window.sendClientAction(MOUSE_OVER_SLOT, nbt);
+        nbt.setShort("slot", (short) slot.slotNumber);
+        window.sendClientAction("mouse-over-slot", nbt);
     }
 
     private void onMouseOverSlot(EntityPlayer player, NBTTagCompound data) {
-        int slotNumber = data.getShort(SLOT);
-        TransferRequest request = getShiftClickRequest(player, slotNumber);
+        int slotnumber = data.getShort("slot");
+        TransferRequest request = getShiftClickRequest(player, slotnumber);
         if (request == null) {
             return;
         }
@@ -469,8 +424,8 @@ public class ContainerCraftGUI extends Container {
         request.transfer(false);
         NBTTagCompound nbt = new NBTTagCompound();
         List<Integer> slots = new ArrayList<>();
-        for (TransferRequest.TransferSlot transferSlot : request.getInsertedSlots()) {
-            Slot slot = getSlot(transferSlot.inventory, transferSlot.id);
+        for (TransferRequest.TransferSlot tslot : request.getInsertedSlots()) {
+            Slot slot = getSlot(tslot.inventory, tslot.id);
             if (slot != null) {
                 slots.add(slot.slotNumber);
             }
@@ -481,85 +436,80 @@ public class ContainerCraftGUI extends Container {
             array[i] = slots.get(i);
         }
 
-        nbt.setIntArray(SLOTS, array);
-        nbt.setShort(ORIGIN, (short) slotNumber);
-        syncedNBT.put(SHIFT_CLICK_INFO, nbt);
+        nbt.setIntArray("slots", array);
+        nbt.setShort("origin", (short) slotnumber);
+        syncedNBT.put("shift-click-info", nbt);
     }
 
-    private void onReceiveShiftClickHighlights(NBTTagCompound data) {
+    private void onRecieveShiftClickHighlights(EntityPlayer player, NBTTagCompound data) {
         ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).clear();
-        for (int slotIndex : data.getIntArray(SLOTS)) {
-            ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).add(slotIndex);
+        for (int slotnumber : data.getIntArray("slots")) {
+            ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).add(slotnumber);
         }
     }
 
     private CustomSlot getSlot(IInventory inventory, int id) {
-        Int2ObjectMap<CustomSlot> slots = slotsByInventory.get(inventory);
-        return (slots == null) ? null : slots.get(id);
-    }
-
-    public void receiveNBT(Side side, EntityPlayer player, NBTTagCompound action) {
-        if (receiveNBTAction(side, player, action)) {
-            sendContainerContents();
-        }
-    }
-
-    private boolean receiveNBTAction(Side side, EntityPlayer player, NBTTagCompound action) {
-        String actionType = action.getString(ACTION_TYPE);
-        if (actionType.equals(ACTION_BATCH)) {
-            boolean slotRegistered = false;
-            NBTTagList actionsBatch = action.getTagList(ACTIONS, TAG_COMPOUND);
-            for (int i = 0; i < actionsBatch.tagCount(); i++) {
-                slotRegistered |= receiveNBTAction(side, player, actionsBatch.getCompoundTagAt(i));
+        for (Object o : inventorySlots) {
+            CustomSlot slot = (CustomSlot) o;
+            if (slot.inventory == inventory && slot.getSlotIndex() == id) {
+                return slot;
             }
-            return slotRegistered;
         }
-        boolean slotRegistered = handleNBTAction(side, player, action);
-        window.receiveGuiNBT(getSide(), player, actionType, action);
-        INetwork.ReceiveGuiNBT machine = Machine.getInterface(INetwork.ReceiveGuiNBT.class, window.getInventory());
+        return null;
+    }
+
+    public void recieveNBT(Side side, EntityPlayer player, NBTTagCompound action) {
+        String name = action.getString("type");
+        if (handleNBT(side, player, name, action)) {
+            return;
+        }
+
+        window.recieveGuiNBT(getSide(), player, name, action);
+        INetwork.RecieveGuiNBT machine = Machine.getInterface(INetwork.RecieveGuiNBT.class, window.getInventory());
         if (machine != null) {
-            machine.receiveGuiNBT(getSide(), player, actionType, action);
-        }
-        return slotRegistered;
-    }
-
-    private void sendContainerContents() {
-        for (ICrafting crafter : crafters) {
-            crafter.sendContainerAndContentsToPlayer(this, getInventory());
+            machine.recieveGuiNBT(getSide(), player, name, action);
         }
     }
 
-    public Slot getOrCreateSlot(InventoryType inventoryType, int slotIndex) {
-        final IInventory inventory = getInventory(inventoryType);
-        Slot slot = getSlot(inventory, slotIndex);
-
+    public Slot getOrCreateSlot(InventoryType type, int index) {
+        IInventory inventory = getInventory(type);
+        Slot slot = getSlot(inventory, index);
         if (slot == null) {
-            slot = new CustomSlot(inventory, slotIndex);
+            slot = new CustomSlot(inventory, index);
             addSlotToContainer(slot);
         }
 
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setByte("t", (byte) type.ordinal());
+        nbt.setShort("i", (short) index);
+        nbt.setShort("n", (short) slot.slotNumber);
+        window.sendClientAction("slot-reg", nbt);
         return slot;
     }
 
     protected IInventory getInventory(InventoryType type) {
-        return switch (type) {
-            case Machine -> window.getInventory();
-            case Player -> window.getPlayer().inventory;
-            case Window -> window.getWindowInventory();
-            default -> null;
-        };
+        if (type == InventoryType.Machine) {
+            return window.getInventory();
+        }
+        if (type == InventoryType.Player) {
+            return window.getPlayer().inventory;
+        }
+        if (type == InventoryType.Window) {
+            return window.getWindowInventory();
+        }
+        return null;
     }
 
-    private boolean createSlot(InventoryType type, int index, int slotNumber) {
-        if (inventorySlots.get(slotNumber) != null) return false;
-
+    private Slot getOrCreateSlot(InventoryType type, int index, int slotNumber) {
         IInventory inventory = getInventory(type);
+        if (inventorySlots.get(slotNumber) != null) {
+            return null;
+        }
+
         Slot slot = new CustomSlot(inventory, index);
         slot.slotNumber = slotNumber;
-        indexSlot(slot);
         inventorySlots.add(slotNumber, slot);
-        ItemStack stack = slot.getStack();
-        inventoryItemStacks.add(slotNumber, stack == null ? null : stack.copy());
-        return true;
+        inventoryItemStacks.add(slotNumber, null);
+        return slot;
     }
 }

src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java

@@ -11,9 +11,6 @@ import binnie.core.machines.inventory.InventorySlot;
 
 public class CustomSlot extends Slot {
 
-    private InventorySlot inventorySlot;
-    private boolean inventorySlotResolved;
-
     public CustomSlot(IInventory inventory, int index) {
         super(inventory, index, 0, 0);
     }
@@ -24,12 +21,11 @@ public class CustomSlot extends Slot {
     }
 
     public InventorySlot getInventorySlot() {
-        if (!inventorySlotResolved) {
-            IInventorySlots slots = Machine.getInterface(IInventorySlots.class, inventory);
-            inventorySlot = (slots == null) ? null : slots.getSlot(getSlotIndex());
-            inventorySlotResolved = true;
+        IInventorySlots slots = Machine.getInterface(IInventorySlots.class, inventory);
+        if (slots != null) {
+            return slots.getSlot(getSlotIndex());
         }
-        return inventorySlot;
+        return null;
     }
 
     public boolean handleClick() {

src/main/java/binnie/core/craftgui/minecraft/EnumColor.java

@@ -20,10 +20,6 @@ public enum EnumColor {
     Yellow("Yellow", 16777045, 'e'),
     White("White", 16777215, 'f');
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumColor[] VALUES = values();
     private final int colour;
     private final String name;
     private final char code;

src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java

@@ -21,7 +21,6 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 import binnie.core.BinnieCore;
 import binnie.core.craftgui.IWidget;
@@ -84,31 +83,29 @@ public class GuiCraftGUI extends GuiContainer {
         window.setMousePosition(mouseX - (int) window.getPosition().x(), mouseY - (int) window.getPosition().y());
         drawDefaultBackground();
 
-        GL11.glDisable(GL12.GL_RESCALE_NORMAL);
+        GL11.glDisable(32826); // GL_RESCALE_NORMAL_EXT
         RenderHelper.disableStandardItemLighting();
         GL11.glDisable(GL11.GL_LIGHTING);
         GL11.glDisable(GL11.GL_DEPTH_TEST);
         zLevel = 10.0f;
         GuiScreen.itemRender.zLevel = zLevel;
 
-        GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT);
         window.render();
 
-        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
         RenderHelper.enableGUIStandardItemLighting();
 
         NEIHook.renderObjects(window, mouseX, mouseY);
 
         GL11.glPushMatrix();
-        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
+        GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
         OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f);
         InventoryPlayer playerInventory = mc.thePlayer.inventory;
         draggedItem = playerInventory.getItemStack();
         if (draggedItem != null) {
-            GL11.glTranslatef(0.0f, 0.0f, 200.0f);
+            renderItem(new IPoint(mouseX - 8, mouseY - 8), draggedItem, false);
             renderItem(new IPoint(mouseX - 8, mouseY - 8), draggedItem, false);
         }
-        GL11.glDisable(GL12.GL_RESCALE_NORMAL);
+        GL11.glDisable(32826); // GL_RESCALE_NORMAL_EXT
         GL11.glPopMatrix();
         GL11.glDisable(GL11.GL_LIGHTING);
         GL11.glDisable(GL11.GL_DEPTH_TEST);
@@ -119,6 +116,7 @@ public class GuiCraftGUI extends GuiContainer {
         } else {
             tooltip.setType(Tooltip.Type.STANDARD);
             window.getTooltip(tooltip);
+            NEIHook.renderToolTips(mouseX, mouseY);
         }
 
         if (tooltip.exists()) {
@@ -135,7 +133,7 @@ public class GuiCraftGUI extends GuiContainer {
         int mouseX = (int) mousePosition.x();
         int mouseY = (int) mousePosition.y();
         FontRenderer font = getFontRenderer();
-        GL11.glDisable(GL12.GL_RESCALE_NORMAL);
+        GL11.glDisable(32826); // GL_RESCALE_NORMAL_EXT
         RenderHelper.disableStandardItemLighting();
         GL11.glDisable(GL11.GL_LIGHTING);
         GL11.glDisable(GL11.GL_DEPTH_TEST);
@@ -226,7 +224,7 @@ public class GuiCraftGUI extends GuiContainer {
         GL11.glEnable(GL11.GL_LIGHTING);
         GL11.glEnable(GL11.GL_DEPTH_TEST);
         RenderHelper.enableStandardItemLighting();
-        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
+        GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
     }
 
     @Override
@@ -242,16 +240,12 @@ public class GuiCraftGUI extends GuiContainer {
 
     @Override
     protected void keyTyped(char c, int key) {
-        boolean noFocusedWidget = window.getFocusedWidget() == null;
+        NEIHook.lastKeyTyped(key, c);
 
-        if (noFocusedWidget) {
-            NEIHook.lastKeyTyped(key, c);
-        }
-
-        if (key == 1 || (key == mc.gameSettings.keyBindInventory.getKeyCode() && noFocusedWidget)) {
+        if (key == 1 || (key == mc.gameSettings.keyBindInventory.getKeyCode() && window.getFocusedWidget() == null)) {
             mc.thePlayer.closeScreen();
         }
-        IWidget origin = noFocusedWidget ? window : window.getFocusedWidget();
+        IWidget origin = (window.getFocusedWidget() == null) ? window : window.getFocusedWidget();
         window.callEvent(new EventKey.Down(origin, c, key));
     }
 
@@ -426,9 +420,8 @@ public class GuiCraftGUI extends GuiContainer {
 
     public void renderItem(IPoint pos, ItemStack item, boolean rotating) {
         OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f);
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT);
+        GL11.glPushAttrib(8256);
         RenderHelper.enableGUIStandardItemLighting();
-        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
         GL11.glEnable(GL11.GL_DEPTH_TEST);
         FontRenderer font = item.getItem().getFontRenderer(item);
         if (font == null) {
@@ -451,7 +444,7 @@ public class GuiCraftGUI extends GuiContainer {
         }
 
         GuiScreen.itemRender.renderItemOverlayIntoGUI(font, mc.renderEngine, item, (int) pos.x(), (int) pos.y(), null);
-        GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT);
+        GL11.glClear(256);
         RenderHelper.disableStandardItemLighting();
         GL11.glPopAttrib();
     }
@@ -462,11 +455,11 @@ public class GuiCraftGUI extends GuiContainer {
         }
 
         GL11.glPushMatrix();
-        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
+        GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
         BinnieCore.proxy.bindTexture(map);
         GuiScreen.itemRender.zLevel = zLevel;
         GuiScreen.itemRender.renderIcon((int) pos.x(), (int) pos.y(), icon, 16, 16);
-        GL11.glDisable(GL12.GL_RESCALE_NORMAL);
+        GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
         GL11.glPopMatrix();
     }
 

src/main/java/binnie/core/craftgui/minecraft/ListMap.java

@@ -10,7 +10,6 @@ import java.util.Map;
 class ListMap<T> implements List<T> {
 
     private final LinkedHashMap<Integer, T> map;
-    private int size;
 
     ListMap() {
         map = new LinkedHashMap<>();
@@ -18,7 +17,13 @@ class ListMap<T> implements List<T> {
 
     @Override
     public int size() {
-        return size;
+        int i = -1;
+        for (int k : map.keySet()) {
+            if (k > i) {
+                i = k;
+            }
+        }
+        return i + 1;
     }
 
     @Override
@@ -88,7 +93,6 @@ class ListMap<T> implements List<T> {
     @Override
     public void clear() {
         map.clear();
-        size = 0;
     }
 
     @Override
@@ -99,14 +103,12 @@ class ListMap<T> implements List<T> {
     @Override
     public T set(int index, T element) {
         map.put(index, element);
-        size = Math.max(size, index + 1);
         return element;
     }
 
     @Override
     public void add(int index, T element) {
         map.put(index, element);
-        size = Math.max(size, index + 1);
     }
 
     @Override
@@ -121,7 +123,7 @@ class ListMap<T> implements List<T> {
                 return entry.getKey();
             }
         }
-        return -1;
+        return 0;
     }
 
     @Override

src/main/java/binnie/core/craftgui/minecraft/Window.java

@@ -1,5 +1,6 @@
 package binnie.core.craftgui.minecraft;
 
+import java.util.ArrayList;
 import java.util.Deque;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -46,14 +47,12 @@ import binnie.core.resource.BinnieResource;
 import binnie.core.resource.ResourceType;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 
-public abstract class Window extends TopLevelWidget implements INetwork.ReceiveGuiNBT {
+public abstract class Window extends TopLevelWidget implements INetwork.RecieveGuiNBT {
 
     protected float titleButtonLeft;
     protected float titleButtonRight;
     private GuiCraftGUI gui;
-    private Renderer renderer;
     private final ContainerCraftGUI container;
     private final WindowInventory windowInventory;
     private ControlText title;
@@ -81,11 +80,11 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
         setSize(new IPoint(width, height));
         gui = new GuiCraftGUI(this);
         for (EnumHighlighting h : EnumHighlighting.values()) {
-            ControlSlot.highlighting.put(h, new IntOpenHashSet());
+            ControlSlot.highlighting.put(h, new ArrayList<>());
         }
 
-        renderer = new Renderer(gui);
-        renderer.stylesheet(StyleSheetManager.getDefault());
+        CraftGUI.render = new Renderer(gui);
+        CraftGUI.render.stylesheet(StyleSheetManager.getDefault());
         titleButtonLeft = -14.0f;
 
         if (showHelpButton()) {
@@ -196,9 +195,6 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
     }
 
     public void initGui() {
-
-        CraftGUI.render = renderer;
-
         if (hasBeenInitialised) {
             return;
         }
@@ -271,9 +267,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
         entityInventory = inventory;
     }
 
-    public void onClose() {
-        CraftGUI.render = null;
-    }
+    public void onClose() {}
 
     public boolean isServer() {
         return !isClient();
@@ -297,7 +291,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
     }
 
     @Override
-    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
         if (side == Side.CLIENT && name.equals("username")) {
             float w = w();
             float titleButtonRight = this.titleButtonRight + 16.0f;

src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java

@@ -57,10 +57,9 @@ public class ControlErrorState extends Control implements ITooltip {
 
         ControlEnergyBar.isError = errorState.isPowerError();
         if (errorState.isItemError()) {
-            CustomSlot[] customSlots = Window.get(this).getContainer().getCustomSlots();
             for (int slot : errorState.getData()) {
                 int id = -1;
-                for (CustomSlot cslot : customSlots) {
+                for (CustomSlot cslot : Window.get(this).getContainer().getCustomSlots()) {
                     if (!(cslot.inventory instanceof InventoryPlayer) && cslot.getSlotIndex() == slot) {
                         id = cslot.slotNumber;
                     }

src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java

@@ -47,16 +47,16 @@ public class ControlItemDisplay extends Control implements ITooltip {
 
     @Override
     public void onRenderBackground() {
-        if (itemStack == null) {
-            return;
-        }
-
         IPoint relativeToWindow = getAbsolutePosition().sub(getSuperParent().getPosition());
         if (relativeToWindow.x() > Window.get(this).getSize().x() + 100.0f
                 || relativeToWindow.y() > Window.get(this).getSize().y() + 100.0f) {
             return;
         }
 
+        if (itemStack == null) {
+            return;
+        }
+
         if (getSize().x() != 16.0f) {
             GL11.glPushMatrix();
             float scale = getSize().x() / 16.0f;

src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java

@@ -3,13 +3,9 @@ package binnie.core.craftgui.minecraft.control;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraft.nbt.NBTTagList;
-
 import binnie.core.craftgui.IWidget;
 import binnie.core.craftgui.controls.core.Control;
 import binnie.core.craftgui.minecraft.InventoryType;
-import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
-import binnie.core.network.packet.MessageCraftGUI;
 
 public class ControlPlayerInventory extends Control {
 
@@ -25,24 +21,23 @@ public class ControlPlayerInventory extends Control {
         slots = new ArrayList<>();
         for (int row = 0; row < 3; ++row) {
             for (int column = 0; column < 9; ++column) {
-                ControlSlot slot = new ControlSlot(this, (wide ? 58 : 0) + column * 18, row * 18)
-                        .setSlotTexture(CraftGUITexture.SlotInventory);
+                ControlSlot slot = new ControlSlot(this, (wide ? 58 : 0) + column * 18, row * 18);
                 slots.add(slot);
             }
         }
 
         if (wide) {
             for (int i1 = 0; i1 < 9; ++i1) {
-                ControlSlot slot2 = new ControlSlot(this, i1 % 3 * 18, i1 / 3 * 18)
-                        .setSlotTexture(CraftGUITexture.SlotInventory);
+                ControlSlot slot2 = new ControlSlot(this, i1 % 3 * 18, i1 / 3 * 18);
                 slots.add(slot2);
             }
         } else {
             for (int i1 = 0; i1 < 9; ++i1) {
-                ControlSlot slot2 = new ControlSlot(this, i1 * 18, 58.0f).setSlotTexture(CraftGUITexture.SlotInventory);
+                ControlSlot slot2 = new ControlSlot(this, i1 * 18, 58.0f);
                 slots.add(slot2);
             }
         }
+        create();
     }
 
     public ControlPlayerInventory(IWidget parent) {
@@ -54,33 +49,32 @@ public class ControlPlayerInventory extends Control {
         slots = new ArrayList<>();
         for (int row = 0; row < 6; ++row) {
             for (int column = 0; column < 6; ++column) {
-                ControlSlot slot = new ControlSlot(this, column * 18, row * 18)
-                        .setSlotTexture(CraftGUITexture.SlotInventory);
+                ControlSlot slot = new ControlSlot(this, column * 18, row * 18);
                 slots.add(slot);
             }
         }
+        create();
     }
 
-    public ControlPlayerInventory create(NBTTagList actions) {
+    public void create() {
         for (int row = 0; row < 3; ++row) {
             for (int column = 0; column < 9; ++column) {
                 ControlSlot slot = slots.get(column + row * 9);
-                slot.assign(actions, InventoryType.Player, 9 + column + row * 9);
+                slot.assign(InventoryType.Player, 9 + column + row * 9);
             }
         }
 
         for (int i1 = 0; i1 < 9; ++i1) {
             ControlSlot slot2 = slots.get(27 + i1);
-            slot2.assign(actions, InventoryType.Player, i1);
+            slot2.assign(InventoryType.Player, i1);
         }
-
-        return this;
     }
 
-    public ControlPlayerInventory createAndRegister() {
-        final NBTTagList actions = new NBTTagList();
-        create(actions);
-        MessageCraftGUI.sendToServer(actions);
-        return this;
+    public ControlSlot getSlot(int i) {
+        if (i < 0 || i >= slots.size()) {
+            return null;
+        }
+        return slots.get(i);
     }
+
 }

src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java

@@ -1,13 +1,7 @@
 package binnie.core.craftgui.minecraft.control;
 
-import static binnie.core.craftgui.minecraft.ContainerCraftGUI.ACTION_TYPE;
-import static binnie.core.craftgui.minecraft.ContainerCraftGUI.SLOT_INDEX;
-import static binnie.core.craftgui.minecraft.ContainerCraftGUI.SLOT_NUMBER;
-import static binnie.core.craftgui.minecraft.ContainerCraftGUI.SLOT_REG;
-import static binnie.core.craftgui.minecraft.ContainerCraftGUI.SLOT_TYPE;
-
 import java.util.ArrayList;
-import java.util.EnumMap;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -16,17 +10,12 @@ import net.minecraft.client.multiplayer.PlayerControllerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.IIcon;
 
-import org.lwjgl.input.Mouse;
-
 import binnie.core.craftgui.CraftGUI;
 import binnie.core.craftgui.IWidget;
 import binnie.core.craftgui.Tooltip;
 import binnie.core.craftgui.events.EventMouse;
-import binnie.core.craftgui.events.EventWidget;
 import binnie.core.craftgui.geometry.IArea;
 import binnie.core.craftgui.geometry.IPoint;
 import binnie.core.craftgui.minecraft.CustomSlot;
@@ -37,44 +26,44 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
 import binnie.core.machines.inventory.InventorySlot;
 import binnie.core.machines.inventory.MachineSide;
 import binnie.core.machines.inventory.SlotValidator;
-import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
 
 public class ControlSlot extends ControlSlotBase {
 
-    public static Map<EnumHighlighting, IntSet> highlighting = new EnumMap<>(EnumHighlighting.class);
+    public static Map<EnumHighlighting, List<Integer>> highlighting = new HashMap<>();
     public static boolean shiftClickActive = false;
 
     static {
         for (EnumHighlighting h : EnumHighlighting.values()) {
-            ControlSlot.highlighting.put(h, new IntOpenHashSet());
+            ControlSlot.highlighting.put(h, new ArrayList<>());
         }
     }
 
     public Slot slot;
-    private CraftGUITexture slotTexture;
 
     public ControlSlot(IWidget parent, float x, float y) {
         super(parent, x, y);
         slot = null;
-        slotTexture = CraftGUITexture.Slot;
         addSelfEventHandler(new EventMouse.Down.Handler() {
 
             @Override
             public void onEvent(EventMouse.Down event) {
-                clickSlot(event.getButton());
-            }
-        });
-        addSelfEventHandler(new EventWidget.StartMouseOver.Handler() {
-
-            @Override
-            public void onEvent(EventWidget.StartMouseOver event) {
-                if (GuiScreen.isShiftKeyDown() && Mouse.isButtonDown(0)
-                        && Window.get(ControlSlot.this).getDraggedWidget() instanceof ControlSlot) {
-                    clickSlot(0);
+                if (slot == null) {
+                    return;
                 }
+
+                PlayerControllerMP playerController = ((Window) getSuperParent()).getGui()
+                        .getMinecraft().playerController;
+                int windowId = ((Window) getSuperParent()).getContainer().windowId;
+                int slotNumber = slot.slotNumber;
+                int button = event.getButton();
+                Window.get(getWidget()).getGui();
+                playerController.windowClick(
+                        windowId,
+                        slotNumber,
+                        button,
+                        GuiScreen.isShiftKeyDown() ? 1 : 0,
+                        ((Window) getSuperParent()).getGui().getMinecraft().thePlayer);
             }
         });
     }
@@ -82,30 +71,11 @@ public class ControlSlot extends ControlSlotBase {
     public ControlSlot(IWidget parent, int x, int y, Slot slot) {
         super(parent, x, y);
         this.slot = slot;
-        slotTexture = CraftGUITexture.Slot;
-    }
-
-    public ControlSlot setSlotTexture(CraftGUITexture texture) {
-        slotTexture = texture == null ? CraftGUITexture.Slot : texture;
-        return this;
-    }
-
-    private void clickSlot(int button) {
-        if (slot == null) return;
-
-        Window window = (Window) getSuperParent();
-        PlayerControllerMP playerController = window.getGui().getMinecraft().playerController;
-        playerController.windowClick(
-                window.getContainer().windowId,
-                slot.slotNumber,
-                button,
-                GuiScreen.isShiftKeyDown() ? 1 : 0,
-                window.getGui().getMinecraft().thePlayer);
     }
 
     @Override
     public void onRenderBackground() {
-        CraftGUI.render.texture(slotTexture, IPoint.ZERO);
+        CraftGUI.render.texture(CraftGUITexture.Slot, IPoint.ZERO);
         if (slot == null) {
             return;
         }
@@ -119,7 +89,7 @@ public class ControlSlot extends ControlSlotBase {
         }
 
         boolean highlighted = false;
-        for (Map.Entry<EnumHighlighting, IntSet> highlight : ControlSlot.highlighting.entrySet()) {
+        for (Map.Entry<EnumHighlighting, List<Integer>> highlight : ControlSlot.highlighting.entrySet()) {
             if (highlight.getKey() == EnumHighlighting.SHIFT_CLICK && !ControlSlot.shiftClickActive) {
                 continue;
             }
@@ -148,7 +118,7 @@ public class ControlSlot extends ControlSlotBase {
         }
 
         boolean highlighted = false;
-        for (Map.Entry<EnumHighlighting, IntSet> highlight : ControlSlot.highlighting.entrySet()) {
+        for (Map.Entry<EnumHighlighting, List<Integer>> highlight : ControlSlot.highlighting.entrySet()) {
             if (highlight.getKey() == EnumHighlighting.SHIFT_CLICK && !ControlSlot.shiftClickActive) {
                 continue;
             }
@@ -209,28 +179,14 @@ public class ControlSlot extends ControlSlotBase {
         return null;
     }
 
-    /// Assign a slot and register it immediately. Should be used when no other actions need to be sent.
-    @SuppressWarnings("UnusedReturnValue")
-    public ControlSlot assignAndRegister(InventoryType inventoryType, int slotIndex) {
-        final NBTTagList actions = new NBTTagList();
-        assign(actions, inventoryType, slotIndex);
-        MessageCraftGUI.sendToServer(actions);
-        return this;
+    public ControlSlot assign(int index) {
+        return assign(InventoryType.Machine, index);
     }
 
-    /// Assign a slot and defer registration using an `NBTTagList`.
-    /// Use in combination with {@link MessageCraftGUI#sendToServer(NBTTagList)}.
-    public ControlSlot assign(NBTTagList actions, InventoryType inventoryType, int slotIndex) {
-        if (slot == null) slot = ((Window) getSuperParent()).getContainer().getOrCreateSlot(inventoryType, slotIndex);
-
-        NBTTagCompound slotReg = new NBTTagCompound();
-        slotReg.setString(ACTION_TYPE, SLOT_REG);
-        slotReg.setByte(SLOT_TYPE, (byte) inventoryType.ordinal());
-        slotReg.setShort(SLOT_INDEX, (short) slotIndex);
-        slotReg.setShort(SLOT_NUMBER, (short) slot.slotNumber);
-
-        actions.appendTag(slotReg);
-
+    public ControlSlot assign(InventoryType inventory, int index) {
+        if (slot == null) {
+            slot = ((Window) getSuperParent()).getContainer().getOrCreateSlot(inventory, index);
+        }
         return this;
     }
 

src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java

@@ -4,8 +4,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import net.minecraft.nbt.NBTTagList;
-
 import binnie.core.craftgui.IWidget;
 import binnie.core.craftgui.controls.core.Control;
 import binnie.core.craftgui.minecraft.InventoryType;
@@ -28,14 +26,15 @@ public class ControlSlotArray extends Control implements Iterable<ControlSlot> {
         return new ControlSlot(this, x, y);
     }
 
-    public ControlSlotArray create(NBTTagList actions, InventoryType inventoryType, int[] index) {
-        int i = 0;
-        for (ControlSlot controlSlot : slots) {
-            final int slotIndex = index[i];
-            controlSlot.assign(actions, inventoryType, slotIndex);
-            i++;
-        }
+    public ControlSlotArray create(int[] index) {
+        return create(InventoryType.Machine, index);
+    }
 
+    public ControlSlotArray create(InventoryType type, int[] index) {
+        int i = 0;
+        for (ControlSlot slot : slots) {
+            slot.assign(type, index[i++]);
+        }
         return this;
     }
 

src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java

@@ -52,9 +52,9 @@ public abstract class ControlSlotBase extends Control implements ITooltip {
     }
 
     @Override
-    public void render() {
+    public void onUpdateClient() {
+        super.onUpdateClient();
         itemDisplay.setItemStack(getItemStack());
-        super.render();
     }
 
     @Override

src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java

@@ -10,7 +10,6 @@ public enum CraftGUITexture {
     Button("button"),
     ButtonHighlighted("button.highlighted"),
     Slot("slot"),
-    SlotInventory("slot.inventory"),
     SlotBorder("slot.border"),
     SlotOverlay("slot.overlay"),
     SlotCharge("slot.charge"),

src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java

@@ -9,17 +9,15 @@ class ParsedTextureSheet implements IBinnieTexture {
     private final String name;
     private final String modid;
     private final String path;
-    private final BinnieResource texture;
 
     public ParsedTextureSheet(String name, String modid, String path) {
         this.name = name;
         this.modid = modid;
         this.path = path;
-        texture = new BinnieResource(modid, ResourceType.GUI, path);
     }
 
     @Override
     public BinnieResource getTexture() {
-        return texture;
+        return new BinnieResource(modid, ResourceType.GUI, path);
     }
 }

src/main/java/binnie/core/genetics/BreedingSystem.java

@@ -57,7 +57,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
 
     public BreedingSystem() {
         Binnie.Genetics.registerBreedingSystem(this);
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
+        MinecraftForge.EVENT_BUS.register(this);
     }
 
     public String getChromosomeName(IChromosomeType chromo) {
@@ -294,16 +294,13 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
 
     public abstract Class<? extends IBreedingTracker> getTrackerClass();
 
-    public class EventHandler {
-
-        @SubscribeEvent
-        public void onSyncBreedingTracker(ForestryEvent.SyncedBreedingTracker event) {
-            IBreedingTracker tracker = event.tracker;
-            if (!getTrackerClass().isInstance(tracker)) {
-                return;
-            }
-            syncTracker(tracker);
+    @SubscribeEvent
+    public void onSyncBreedingTracker(ForestryEvent.SyncedBreedingTracker event) {
+        IBreedingTracker tracker = event.tracker;
+        if (!getTrackerClass().isInstance(tracker)) {
+            return;
         }
+        syncTracker(tracker);
     }
 
     public void syncTracker(IBreedingTracker tracker) {

src/main/java/binnie/core/genetics/FlowerBreedingSystem.java

@@ -113,7 +113,7 @@ class FlowerBreedingSystem extends BreedingSystem {
             case PRIMARY:
             case SECONDARY:
             case STEM:
-                for (EnumFlowerColor color : EnumFlowerColor.VALUES) {
+                for (EnumFlowerColor color : EnumFlowerColor.values()) {
                     alleles.add(color.getAllele());
                 }
                 break;

src/main/java/binnie/core/genetics/ManagerGenetics.java

@@ -9,7 +9,6 @@ import java.util.Map;
 import java.util.TreeSet;
 
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.world.WorldEvent;
 
 import binnie.Binnie;
@@ -68,11 +67,6 @@ public class ManagerGenetics extends ManagerBase {
         refreshData();
     }
 
-    @Override
-    public void registerEventHandler() {
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
-    }
-
     public ITreeRoot getTreeRoot() {
         return (ITreeRoot) AlleleManager.alleleRegistry.getSpeciesRoot("rootTrees");
     }
@@ -146,6 +140,11 @@ public class ManagerGenetics extends ManagerBase {
         return (system == null) ? null : system.getConversion(stack);
     }
 
+    @SubscribeEvent
+    public void onWorldLoad(WorldEvent.Load event) {
+        refreshData();
+    }
+
     private void refreshData() {
         loadAlleles();
         for (BreedingSystem system : Binnie.Genetics.getActiveSystems()) {
@@ -220,12 +219,4 @@ public class ManagerGenetics extends ManagerBase {
             return o1.getUID().compareTo(o2.getUID());
         }
     }
-
-    public class EventHandler {
-
-        @SubscribeEvent
-        public void onWorldLoad(WorldEvent.Load event) {
-            refreshData();
-        }
-    }
 }

src/main/java/binnie/core/item/ItemGenesis.java

@@ -1,7 +1,5 @@
 package binnie.core.item;
 
-import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
-
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -27,8 +25,6 @@ public class ItemGenesis extends Item {
         setCreativeTab(Tabs.tabApiculture);
         setUnlocalizedName("genesis");
         setMaxStackSize(1);
-
-        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/core/item/ItemMisc.java

@@ -1,7 +1,5 @@
 package binnie.core.item;
 
-import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
-
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -18,13 +16,11 @@ public class ItemMisc extends Item {
 
     private final IItemMisc[] items;
 
-    public ItemMisc(CreativeTabs tab, IItemMisc[] items) {
+    protected ItemMisc(CreativeTabs tab, IItemMisc[] items2) {
         setCreativeTab(tab);
         setHasSubtypes(true);
         setUnlocalizedName("misc");
-        this.items = items;
-
-        registerItem(this, getUnlocalizedName().substring(5));
+        items = items2;
     }
 
     @Override

src/main/java/binnie/core/item/ManagerItem.java

@@ -0,0 +1,10 @@
+package binnie.core.item;
+
+import net.minecraft.creativetab.CreativeTabs;
+
+public class ManagerItem {
+
+    public ItemMisc registerMiscItems(IItemMisc[] items, CreativeTabs tab) {
+        return new ItemMisc(tab, items);
+    }
+}

src/main/java/binnie/core/item/ModuleItems.java

@@ -6,7 +6,6 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 
 import binnie.botany.Botany;
@@ -50,44 +49,36 @@ public class ModuleItems implements IInitializable {
                 new ItemStack(Items.dye, 1));
     }
 
-    @Override
-    public void registerEventHandler() {
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
-    }
+    @SubscribeEvent
+    public void onUseFieldKit(PlayerInteractEvent event) {
+        if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
+            return;
+        }
 
-    public static class EventHandler {
-
-        @SubscribeEvent
-        public void onUseFieldKit(PlayerInteractEvent event) {
-            if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
+        EntityPlayer player = event.entityPlayer;
+        if (player != null && player.getHeldItem() != null
+                && player.getHeldItem().getItem() == BinnieCore.fieldKit
+                && player.isSneaking()) {
+            TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
+            if (!(tile instanceof TileEntityFlower tileFlower)) {
                 return;
             }
 
-            EntityPlayer player = event.entityPlayer;
-            if (player != null && player.getHeldItem() != null
-                    && player.getHeldItem().getItem() == BinnieCore.fieldKit
-                    && player.isSneaking()) {
-                TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
-                if (!(tile instanceof TileEntityFlower tileFlower)) {
-                    return;
-                }
-
-                IFlower flower = tileFlower.getFlower();
-                if (flower == null) {
-                    return;
-                }
-
-                NBTTagCompound info = new NBTTagCompound();
-                info.setString("Species", flower.getGenome().getPrimary().getUID());
-                info.setString("Species2", flower.getGenome().getSecondary().getUID());
-                info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan());
-                info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID());
-                info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID());
-                info.setBoolean("Wilting", flower.isWilted());
-                info.setBoolean("Flowered", flower.hasFlowered());
-                Botany.proxy.sendToPlayer(new MessageNBT(PacketID.FieldKit.ordinal(), info), event.entityPlayer);
-                event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
+            IFlower flower = tileFlower.getFlower();
+            if (flower == null) {
+                return;
             }
+
+            NBTTagCompound info = new NBTTagCompound();
+            info.setString("Species", flower.getGenome().getPrimary().getUID());
+            info.setString("Species2", flower.getGenome().getSecondary().getUID());
+            info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan());
+            info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID());
+            info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID());
+            info.setBoolean("Wilting", flower.isWilted());
+            info.setBoolean("Flowered", flower.hasFlowered());
+            Botany.proxy.sendToPlayer(new MessageNBT(PacketID.FieldKit.ordinal(), info), event.entityPlayer);
+            event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
         }
     }
 }

src/main/java/binnie/core/liquid/ManagerLiquid.java

@@ -1,9 +1,7 @@
 package binnie.core.liquid;
 
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Set;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraftforge.fluids.Fluid;
@@ -11,62 +9,32 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 import binnie.core.ManagerBase;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class ManagerLiquid extends ManagerBase {
 
-    private static final Set<String> EXTERNAL_FLUIDS = new HashSet<>();
-
-    static {
-        EXTERNAL_FLUIDS.add("liquidnitrogen");
-    }
-
-    private static boolean isExternalFluid(String identifier) {
-        return EXTERNAL_FLUIDS.contains(identifier) && Loader.isModLoaded("gregtech_nh");
-    }
-
     public Map<String, IFluidType> fluids;
-    private final Set<String> ownedFluids;
 
     public ManagerLiquid() {
         fluids = new LinkedHashMap<>();
-        ownedFluids = new HashSet<>();
     }
 
     public void createLiquids(IFluidType[] liquids, int startID) {
         for (IFluidType liquid : liquids) {
-            String identifier = liquid.getIdentifier().toLowerCase();
-            Fluid fluid = createOrGetLiquid(liquid, startID++);
-            if (fluid == null && !isExternalFluid(identifier)) {
+            BinnieFluid fluid = createLiquid(liquid, startID++);
+            if (fluid == null) {
                 throw new RuntimeException("Liquid registered incorrectly - " + liquid.getIdentifier());
             }
         }
     }
 
     public BinnieFluid createLiquid(IFluidType fluid, int id) {
-        Fluid registeredFluid = createOrGetLiquid(fluid, id);
-        return (registeredFluid instanceof BinnieFluid) ? (BinnieFluid) registeredFluid : null;
-    }
-
-    private Fluid createOrGetLiquid(IFluidType fluid, int id) {
-        String identifier = fluid.getIdentifier().toLowerCase();
-        fluids.put(identifier, fluid);
-        Fluid registeredFluid = FluidRegistry.getFluid(identifier);
-        if (registeredFluid == null && !isExternalFluid(identifier)) {
-            BinnieFluid binnieFluid = new BinnieFluid(fluid);
-            FluidRegistry.registerFluid(binnieFluid);
-            registeredFluid = FluidRegistry.getFluid(identifier);
-            ownedFluids.add(identifier);
-        } else if (registeredFluid == null) {
-            FMLLog.warning(
-                    "[Binnie] External liquid %s is not registered yet. Waiting for the owning mod to register it before postInit.",
-                    identifier);
-        }
+        fluids.put(fluid.getIdentifier().toLowerCase(), fluid);
+        BinnieFluid binnieFluid = new BinnieFluid(fluid);
+        FluidRegistry.registerFluid(binnieFluid);
         ItemFluidContainer.registerFluid(fluid, id);
-        return registeredFluid;
+        return binnieFluid;
     }
 
     public FluidStack getLiquidStack(String name, int amount) {
@@ -76,26 +44,18 @@ public class ManagerLiquid extends ManagerBase {
     @SideOnly(Side.CLIENT)
     public void reloadIcons(IIconRegister register) {
         for (IFluidType type : fluids.values()) {
-            String identifier = type.getIdentifier().toLowerCase();
-            FluidStack stack = getLiquidStack(identifier, 1);
-            Fluid fluid = stack == null ? null : stack.getFluid();
+            Fluid fluid = getLiquidStack(type.getIdentifier(), 1).getFluid();
             type.registerIcon(register);
             if (fluid == null) {
                 throw new RuntimeException("[Binnie] Liquid not registered properly - " + type.getIdentifier());
             }
-            if (ownedFluids.contains(identifier)) {
-                fluid.setIcons(type.getIcon());
-            }
+            fluid.setIcons(type.getIcon());
         }
     }
 
     @Override
     public void postInit() {
         for (IFluidType fluid : fluids.values()) {
-            String identifier = fluid.getIdentifier().toLowerCase();
-            if (isExternalFluid(identifier) && FluidRegistry.getFluid(identifier) == null) {
-                throw new RuntimeException("[Binnie] External liquid not registered - " + identifier);
-            }
             for (FluidContainer container : FluidContainer.values()) {
                 if (container.isActive() && fluid.canPlaceIn(container)) {
                     container.registerContainerData(fluid);

src/main/java/binnie/core/machines/Machine.java

@@ -2,7 +2,6 @@ package binnie.core.machines;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -72,9 +71,8 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack
 
     @Override
     public <T> T getInterface(Class<T> cls) {
-        List<MachineComponent> components = componentInterfaceMap.get(cls);
-        if (components != null && !components.isEmpty()) {
-            return cls.cast(components.get(0));
+        if (hasInterface(cls)) {
+            return getInterfaces(cls).get(0);
         }
         if (cls.isInstance(getPackage())) {
             return cls.cast(getPackage());
@@ -90,13 +88,11 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack
 
     @Override
     public <T> List<T> getInterfaces(Class<T> cls) {
-        List<MachineComponent> components = componentInterfaceMap.get(cls);
-        if (components == null) {
-            return Collections.emptyList();
+        ArrayList<T> interfaces = new ArrayList<>();
+        if (!hasInterface(cls)) {
+            return interfaces;
         }
-
-        List<T> interfaces = new ArrayList<>(components.size());
-        for (MachineComponent component : components) {
+        for (MachineComponent component : componentInterfaceMap.get(cls)) {
             interfaces.add(cls.cast(component));
         }
         return interfaces;
@@ -281,16 +277,16 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack
     }
 
     @Override
-    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
-        for (INetwork.ReceiveGuiNBT receive : getInterfaces(INetwork.ReceiveGuiNBT.class)) {
-            receive.receiveGuiNBT(side, player, name, nbt);
+    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+        for (INetwork.RecieveGuiNBT recieve : getInterfaces(INetwork.RecieveGuiNBT.class)) {
+            recieve.recieveGuiNBT(side, player, name, nbt);
         }
     }
 
     @Override
     public void sendGuiNBT(Map<String, NBTTagCompound> nbts) {
-        for (INetwork.SendGuiNBT receive : getInterfaces(INetwork.SendGuiNBT.class)) {
-            receive.sendGuiNBT(nbts);
+        for (INetwork.SendGuiNBT recieve : getInterfaces(INetwork.SendGuiNBT.class)) {
+            recieve.sendGuiNBT(nbts);
         }
     }
 }

src/main/java/binnie/core/machines/MachineComponent.java

@@ -50,7 +50,7 @@ public class MachineComponent implements INBTTagable {
         return new MachinePayload(Binnie.Machine.getNetworkID(getClass()));
     }
 
-    public void receiveData(MachinePayload payload) {}
+    public void recieveData(MachinePayload payload) {}
 
     public MachineUtil getUtil() {
         return getMachine().getMachineUtil();

src/main/java/binnie/core/machines/MachinePackage.java

@@ -1,5 +1,6 @@
 package binnie.core.machines;
 
+import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.tileentity.TileEntity;
 
 import binnie.core.util.I18N;
@@ -27,21 +28,10 @@ public abstract class MachinePackage {
 
     public abstract TileEntity createTileEntity();
 
-    /// Whether this machine's tile entity needs {@link net.minecraft.tileentity.TileEntity#updateEntity()}.
-    /// Override to false only when no component implements onUpdate, onInventoryUpdate or a client display tick.
-    public boolean isTickable() {
-        return true;
-    }
-
     public String getDisplayName() {
         return I18N.localise(group.getMod().getModID() + ".machine." + group.getShortUID() + "." + getUID());
     }
 
-    public String getGuiDisplayName() {
-        String guiKey = group.getMod().getModID() + ".machine." + group.getShortUID() + "." + getUID() + ".title";
-        return I18N.canLocalise(guiKey) ? I18N.localise(guiKey) : getDisplayName();
-    }
-
     public Integer getMetadata() {
         return metadata;
     }
@@ -58,7 +48,8 @@ public abstract class MachinePackage {
         this.group = group;
     }
 
-    public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTick);
+    public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTick,
+            RenderBlocks renderer);
 
     public boolean isActive() {
         return active;

src/main/java/binnie/core/machines/RendererMachine.java

@@ -1,13 +1,11 @@
 package binnie.core.machines;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
 
 import binnie.Binnie;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@@ -15,41 +13,30 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 // Hmm. It's used class
 public class RendererMachine extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler {
 
-    private final Map<Block, Map<Integer, TileEntityMachine>> inventoryTiles = new HashMap<>();
+    RenderBlocks blockRenderer;
 
     @Override
     public void renderTileEntityAt(TileEntity entity, double x, double y, double z, float partialTick) {
-        renderTileEntity((TileEntityMachine) entity, x, y, z, partialTick);
+        renderTileEntity((TileEntityMachine) entity, x, y, z, partialTick, blockRenderer);
     }
 
-    private void renderTileEntity(TileEntityMachine entity, double x, double y, double z, float partialTick) {
+    public void renderTileEntity(TileEntityMachine entity, double x, double y, double z, float partialTick,
+            RenderBlocks renderer) {
         if (entity != null && entity.getMachine() != null) {
             MachinePackage machinePackage = entity.getMachine().getPackage();
-            machinePackage.renderMachine(entity.getMachine(), x, y, z, partialTick);
+            machinePackage.renderMachine(entity.getMachine(), x, y, z, partialTick, renderer);
         }
     }
 
-    private void renderInvBlock(Block block, int i, int j) {
-        renderTileEntity(getInventoryTile(block, i), 0.0, -0.1, 0.0, 0.0625f);
-    }
-
-    private TileEntityMachine getInventoryTile(Block block, int metadata) {
-        Map<Integer, TileEntityMachine> tiles = inventoryTiles.computeIfAbsent(block, key -> new HashMap<>());
-        TileEntityMachine tile = tiles.get(metadata);
-        if (tile == null) {
-            if (!(block.createTileEntity(null, metadata) instanceof TileEntityMachine created)) {
-                return null;
-            }
-            tile = created;
-            tiles.put(metadata, tile);
-        }
-        return tile;
+    public void renderInvBlock(RenderBlocks renderblocks, Block block, int i, int j) {
+        TileEntity entity = block.createTileEntity(null, i);
+        renderTileEntity((TileEntityMachine) entity, 0.0, -0.1, 0.0, 0.0625f, renderblocks);
     }
 
     @Override
     public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {
         if (modelID == Binnie.Machine.getMachineRenderID()) {
-            renderInvBlock(block, metadata, modelID);
+            renderInvBlock(renderer, block, metadata, modelID);
         }
     }
 
@@ -61,7 +48,7 @@ public class RendererMachine extends TileEntitySpecialRenderer implements ISimpl
                 && tile.getMachine().getPackage() != null
                 && tile.getMachine().getPackage().getGroup() != null
                 && !tile.getMachine().getPackage().getGroup().customRenderer) {
-            renderTileEntity(tile, x, y, z, 1.0f);
+            renderTileEntity(tile, x, y, z, 1.0f, renderer);
         }
         return true;
     }
@@ -75,4 +62,9 @@ public class RendererMachine extends TileEntitySpecialRenderer implements ISimpl
     public int getRenderId() {
         return Binnie.Machine.getMachineRenderID();
     }
+
+    @Override
+    public void func_147496_a(World par1World) {
+        blockRenderer = new RenderBlocks(par1World);
+    }
 }

src/main/java/binnie/core/machines/TileEntityMachine.java

@@ -21,11 +21,6 @@ public class TileEntityMachine extends TileEntityMachineBase implements INetwork
         }
     }
 
-    @Override
-    public boolean canUpdate() {
-        return machine == null || machine.getPackage() == null || machine.getPackage().isTickable();
-    }
-
     public TileEntityMachine(MachinePackage pack) {
         setMachine(pack);
     }

src/main/java/binnie/core/machines/base/TileEntityMachineBase.java

@@ -21,23 +21,19 @@ import cpw.mods.fml.common.Optional;
 
 public class TileEntityMachineBase extends TileEntity implements IInventoryMachine, ITankMachine, IPoweredMachine {
 
-    private static final DefaultInventory DEFAULT_INVENTORY = new DefaultInventory();
-    private static final DefaultTankContainer DEFAULT_TANK_CONTAINER = new DefaultTankContainer();
-    private static final DefaultPower DEFAULT_POWER = new DefaultPower();
-
     public IInventoryMachine getInventory() {
         IInventoryMachine inv = Machine.getInterface(IInventoryMachine.class, this);
-        return (inv == null || inv == this) ? DEFAULT_INVENTORY : inv;
+        return (inv == null || inv == this) ? new DefaultInventory() : inv;
     }
 
     public ITankMachine getTankContainer() {
         ITankMachine inv = Machine.getInterface(ITankMachine.class, this);
-        return (inv == null || inv == this) ? DEFAULT_TANK_CONTAINER : inv;
+        return (inv == null || inv == this) ? new DefaultTankContainer() : inv;
     }
 
     public IPoweredMachine getPower() {
         IPoweredMachine inv = Machine.getInterface(IPoweredMachine.class, this);
-        return (inv == null || inv == this) ? DEFAULT_POWER : inv;
+        return (inv == null || inv == this) ? new DefaultPower() : inv;
     }
 
     @Override

src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java

@@ -49,7 +49,7 @@ public class ComponentChargedSlots extends MachineComponent implements INetwork.
     }
 
     @Override
-    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
         if (!name.equals("slot-charges")) {
             return;
         }

src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java

@@ -1,6 +1,7 @@
 package binnie.core.machines.inventory;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -15,13 +16,10 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import binnie.core.machines.IMachine;
-import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
 
 public class ComponentInventorySlots extends ComponentInventory implements IInventoryMachine, IInventorySlots {
 
-    private final Int2ObjectLinkedOpenHashMap<InventorySlot> inventory = new Int2ObjectLinkedOpenHashMap<>();
-    private int cachedSize = 0;
-    private int[] cachedAccessibleSlots = null;
+    private final Map<Integer, InventorySlot> inventory = new LinkedHashMap<>();
 
     public ComponentInventorySlots(IMachine machine) {
         super(machine);
@@ -29,20 +27,25 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public int getSizeInventory() {
-        return cachedSize;
+        int size = 0;
+        for (Integer index : inventory.keySet()) {
+            size = Math.max(size, index + 1);
+        }
+        return size;
     }
 
     @Override
     public ItemStack getStackInSlot(int index) {
-        InventorySlot slot = inventory.get(index);
-        return slot != null ? slot.getContent() : null;
+        if (inventory.containsKey(index)) {
+            return inventory.get(index).getContent();
+        }
+        return null;
     }
 
     @Override
     public ItemStack decrStackSize(int index, int amount) {
-        InventorySlot slot = inventory.get(index);
-        if (slot != null) {
-            ItemStack stack = slot.decrStackSize(amount);
+        if (inventory.containsKey(index)) {
+            ItemStack stack = inventory.get(index).decrStackSize(amount);
             markDirty();
             return stack;
         }
@@ -56,9 +59,8 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public void setInventorySlotContents(int index, ItemStack itemStack) {
-        InventorySlot slot = inventory.get(index);
-        if (slot != null && (itemStack == null || slot.isValid(itemStack))) {
-            slot.setContent(itemStack);
+        if (inventory.containsKey(index) && (itemStack == null || inventory.get(index).isValid(itemStack))) {
+            inventory.get(index).setContent(itemStack);
         }
         markDirty();
     }
@@ -111,7 +113,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
     public void writeToNBT(NBTTagCompound nbttagcompound) {
         super.writeToNBT(nbttagcompound);
         NBTTagList inventoryNBT = new NBTTagList();
-        for (Map.Entry<Integer, InventorySlot> entry : inventory.int2ObjectEntrySet()) {
+        for (Map.Entry<Integer, InventorySlot> entry : inventory.entrySet()) {
             NBTTagCompound slotNBT = new NBTTagCompound();
             slotNBT.setInteger("id", entry.getKey());
             entry.getValue().writeToNBT(slotNBT);
@@ -123,8 +125,6 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
     @Override
     public InventorySlot addSlot(int index, String unlocalizedName) {
         inventory.put(index, new InventorySlot(index, unlocalizedName));
-        cachedSize = Math.max(cachedSize, index + 1);
-        cachedAccessibleSlots = null;
         return getSlot(index);
     }
 
@@ -138,7 +138,10 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public InventorySlot getSlot(int index) {
-        return inventory.get(index);
+        if (inventory.containsKey(index)) {
+            return inventory.get(index);
+        }
+        return null;
     }
 
     @Override
@@ -148,7 +151,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public InventorySlot[] getSlots(int[] indexes) {
-        List<InventorySlot> list = new ArrayList<>(indexes.length);
+        List<InventorySlot> list = new ArrayList<>();
         for (int i : indexes) {
             if (getSlot(i) != null) {
                 list.add(getSlot(i));
@@ -210,20 +213,18 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public int[] getAccessibleSlotsFromSide(int var1) {
-        if (cachedAccessibleSlots == null) {
-            List<Integer> slots = new ArrayList<>();
-            for (InventorySlot slot : inventory.values()) {
-                if (slot.canInsert() || slot.canExtract()) {
-                    slots.add(slot.getIndex());
-                }
-            }
-
-            cachedAccessibleSlots = new int[slots.size()];
-            for (int i = 0; i < slots.size(); ++i) {
-                cachedAccessibleSlots[i] = slots.get(i);
+        List<Integer> slots = new ArrayList<>();
+        for (InventorySlot slot : inventory.values()) {
+            if (slot.canInsert() || slot.canExtract()) {
+                slots.add(slot.getIndex());
             }
         }
-        return cachedAccessibleSlots;
+
+        int[] ids = new int[slots.size()];
+        for (int i = 0; i < slots.size(); ++i) {
+            ids[i] = slots.get(i);
+        }
+        return ids;
     }
 
     @Override
@@ -233,7 +234,6 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public boolean canExtractItem(int slot, ItemStack itemstack, int direction) {
-        InventorySlot iSlot = getSlot(slot);
-        return iSlot != null && iSlot.canExtract(ForgeDirection.getOrientation(direction));
+        return getSlot(slot).canExtract(ForgeDirection.getOrientation(direction));
     }
 }

src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java

@@ -164,7 +164,7 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
 
     @Override
     public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
-        int index = getTankIndexToDrain(from, resource);
+        int index = getTankIndexToDrain(from, null);
         if (!tanks.containsKey(index)) {
             return null;
         }

src/main/java/binnie/core/machines/network/INetwork.java

@@ -21,11 +21,11 @@ public interface INetwork {
         void syncFromNBT(NBTTagCompound nbt);
     }
 
-    interface ReceiveGuiNBT {
+    interface RecieveGuiNBT {
 
-        void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt);
+        void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt);
     }
 
-    interface GuiNBT extends ReceiveGuiNBT, SendGuiNBT {
+    interface GuiNBT extends RecieveGuiNBT, SendGuiNBT {
     }
 }

src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java

@@ -5,7 +5,6 @@ import java.util.List;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
 
@@ -153,8 +152,7 @@ public class ComponentPowerReceptor extends MachineComponent
     }
 
     private void addToEnergyNet() {
-        World world = getMachine().getWorld();
-        if (world == null || world.isRemote) {
+        if (getMachine().getWorld() == null) {
             return;
         }
         if (Mods.ic2.active()) {
@@ -163,8 +161,7 @@ public class ComponentPowerReceptor extends MachineComponent
     }
 
     private void removeFromEnergyNet() {
-        World world = getMachine().getWorld();
-        if (world == null || world.isRemote) {
+        if (getMachine().getWorld() == null) {
             return;
         }
         if (Mods.ic2.active()) {