Update en_US.lang

However, now textures are screwed because Binnie made doesn't have consistent capitalization.

.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

dependencies.gradle

@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.11.12:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.9.48:dev')
+	api('com.github.GTNewHorizons:ForestryMC:4.9.16:dev')
+	implementation('com.github.GTNewHorizons:GTNHLib:0.5.11:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.97-GTNH:dev')
+	devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.38-GTNH:dev')
 
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.57:api')
-    compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
-    compileOnly("curse.maven:extrabiomesxl-60041:2273301")
+	compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
+	compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
+	compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

gradle.properties

@@ -14,7 +14,7 @@ modId = BinnieCore
 modGroup = binnie
 
 # Whether to use modGroup as the maven publishing group.
-# When false, com.github.GTNewHorizons is used.
+# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.
@@ -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.
@@ -198,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/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d4fd992c9557644e637ebe98263e0ae7/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/faa12903720d410b387cc69ccafb1a74/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a4c09dd2e2d7079373d30e524bbc2829/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
-toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

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

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.
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       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/.
@@ -86,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,6 +115,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 +173,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" )
 
@@ -203,14 +206,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,10 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

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

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

@@ -1,12 +1,12 @@
 package binnie.botany;
 
+import static binnie.botany.items.BotanyItems.misc;
+
 import net.minecraft.block.Block;
 import net.minecraft.init.Items;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.BonemealEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.BlockEvent;
@@ -21,28 +21,20 @@ import binnie.botany.ceramic.BlockCeramicPatterned;
 import binnie.botany.ceramic.BlockStained;
 import binnie.botany.core.BotanyCore;
 import binnie.botany.core.BotanyGUI;
-import binnie.botany.core.ModuleCore;
 import binnie.botany.flower.BlockFlower;
-import binnie.botany.flower.ItemFlower;
-import binnie.botany.flower.ItemInsulatedTube;
 import binnie.botany.flower.TileEntityFlower;
 import binnie.botany.gardening.BlockPlant;
 import binnie.botany.gardening.BlockSoil;
 import binnie.botany.gardening.Gardening;
-import binnie.botany.gardening.ItemSoilMeter;
-import binnie.botany.gardening.ItemTrowel;
 import binnie.botany.gardening.ModuleGardening;
-import binnie.botany.genetics.ItemDictionary;
 import binnie.botany.genetics.ModuleGenetics;
-import binnie.botany.items.ItemClay;
-import binnie.botany.items.ItemPigment;
+import binnie.botany.items.BotanyItems;
 import binnie.botany.network.PacketID;
 import binnie.botany.proxy.Proxy;
 import binnie.core.AbstractMod;
 import binnie.core.BinnieCore;
 import binnie.core.Tags;
 import binnie.core.gui.IBinnieGUID;
-import binnie.core.item.ItemMisc;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
 import binnie.core.proxy.IProxyCore;
@@ -50,29 +42,31 @@ import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.eventhandler.Event;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.registry.GameRegistry;
 
-@Mod(modid = "Botany", name = "Botany", version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore")
+@Mod(
+        modid = Botany.BOTANY_MODID,
+        name = Botany.BOTANY_MODNAME,
+        version = Tags.VERSION,
+        useMetadata = true,
+        dependencies = "after:BinnieCore")
 public class Botany extends AbstractMod {
 
+    public static final String BOTANY_MODID = "botany";
+    public static final String BOTANY_MODNAME = "Botany";
+
     @Mod.Instance("Botany")
     public static Botany instance;
 
     @SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer")
     public static Proxy proxy;
 
-    // Genetics module
     public static BlockFlower flower;
-
-    public static ItemFlower flowerItem;
-    public static Item pollen;
-    public static Item seed;
-    public static ItemDictionary database;
-
-    // Gardening module
     public static BlockPlant plant;
     public static BlockSoil soil;
     public static BlockSoil loam;
@@ -81,29 +75,20 @@ public class Botany extends AbstractMod {
     public static BlockSoil loamNoWeed;
     public static BlockSoil flowerbedNoWeed;
     public static BlockCeramic ceramic;
-    public static BlockStained stained;
     public static BlockCeramicPatterned ceramicTile;
+    public static BlockStained stained;
     public static BlockCeramicBrick ceramicBrick;
 
-    public static ItemSoilMeter soilMeter;
-    public static ItemInsulatedTube insulatedTube;
-    public static ItemTrowel trowelWood;
-    public static ItemTrowel trowelStone;
-    public static ItemTrowel trowelIron;
-    public static ItemTrowel trowelDiamond;
-    public static ItemTrowel trowelGold;
-    public static ItemMisc misc;
-    public static ItemPigment pigment;
-    public static ItemClay clay;
-
     public Botany() {
         Botany.instance = this;
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
-        addModule(new ModuleCore());
+        // Loads BotanyItems.class, guaranteeing that items are init by this point
+        // TODO: is this needed?
+        misc.getUnlocalizedName();
+
         addModule(new ModuleGenetics());
         addModule(new ModuleGardening());
         preInit();
@@ -119,6 +104,19 @@ public class Botany extends AbstractMod {
         postInit();
     }
 
+    @Mod.EventHandler
+    public void missingMappings(FMLMissingMappingsEvent event) {
+        for (FMLMissingMappingsEvent.MissingMapping m : event.getAll()) {
+            final String[] name = m.name.split(":");
+            if (name.length < 2) continue;
+
+            if (name[0].equals("Botany")) {
+                if (m.type == GameRegistry.Type.BLOCK) m.remap(GameRegistry.findBlock(BOTANY_MODID, name[1]));
+                else m.remap(GameRegistry.findItem(BOTANY_MODID, name[1]));
+            }
+        }
+    }
+
     @Override
     public IBinnieGUID[] getGUIDs() {
         return BotanyGUI.values();
@@ -141,7 +139,7 @@ public class Botany extends AbstractMod {
 
     @Override
     public String getModID() {
-        return "botany";
+        return BOTANY_MODID;
     }
 
     @Override
@@ -149,6 +147,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() == BotanyItems.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 +292,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 +338,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

@@ -16,7 +16,6 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
@@ -65,16 +64,6 @@ public class BlockCeramic extends Block implements IBlockMetadata {
         return tileentity != null && tileentity.receiveClientEvent(eventId, eventType);
     }
 
-    @Override
-    public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
-        return TileEntityMetadata.getItemDamage(itemStack);
-    }
-
-    @Override
-    public int getDroppedMeta(int blockMeta, int tileMeta) {
-        return tileMeta;
-    }
-
     @Override
     public String getBlockName(ItemStack itemStack) {
         return I18N.localise("botany.ceramicBlock");
@@ -93,7 +82,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

@@ -1,5 +1,7 @@
 package binnie.botany.ceramic;
 
+import static binnie.botany.items.BotanyMisc.Items.Mortar;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -16,7 +18,6 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
@@ -73,16 +74,6 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
         return tileentity != null && tileentity.receiveClientEvent(eventId, eventType);
     }
 
-    @Override
-    public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
-        return TileEntityMetadata.getItemDamage(itemStack);
-    }
-
-    @Override
-    public int getDroppedMeta(int blockMeta, int tileMeta) {
-        return tileMeta;
-    }
-
     @Override
     public String getBlockName(ItemStack itemStack) {
         int meta = TileEntityMetadata.getItemDamage(itemStack);
@@ -102,12 +93,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 +121,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 +158,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 +168,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 +196,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 +207,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() {
@@ -491,7 +475,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
         }
 
         private boolean isMortar(ItemStack stack) {
-            return stack.getItem() == Botany.misc && stack.getItemDamage() == BotanyItems.Mortar.ordinal();
+            return stack.getItem() == BotanyItems.misc && stack.getItemDamage() == Mortar.ordinal();
         }
     }
 

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

@@ -34,7 +34,6 @@ public class BlockStained extends Block implements IBlockMetadata {
 
     public BlockStained() {
         super(Material.glass);
-        setHardness(0.3f);
         setCreativeTab(CreativeTabBotany.instance);
         setBlockName("stained");
     }
@@ -96,16 +95,6 @@ public class BlockStained extends Block implements IBlockMetadata {
         return tileentity != null && tileentity.receiveClientEvent(eventId, eventType);
     }
 
-    @Override
-    public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
-        return TileEntityMetadata.getItemDamage(itemStack);
-    }
-
-    @Override
-    public int getDroppedMeta(int blockMeta, int tileMeta) {
-        return tileMeta;
-    }
-
     @Override
     public String getBlockName(ItemStack itemStack) {
         return I18N.localise("botany.pigmentedGlass");
@@ -124,7 +113,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

@@ -1,5 +1,7 @@
 package binnie.botany.ceramic;
 
+import static binnie.botany.items.BotanyMisc.Items.Mortar;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -10,7 +12,6 @@ import net.minecraft.util.IIcon;
 
 import binnie.botany.Botany;
 import binnie.botany.genetics.EnumFlowerColor;
-import binnie.botany.items.BotanyItems;
 import binnie.core.AbstractMod;
 import binnie.core.BinnieCore;
 import binnie.extratrees.api.IDesignMaterial;
@@ -74,7 +75,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(
@@ -96,7 +97,7 @@ public class CeramicDesignSystem implements IDesignSystem {
 
     @Override
     public ItemStack getAdhesive() {
-        return BotanyItems.Mortar.get(1);
+        return Mortar.get(1);
     }
 
     @Override

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

@@ -10,6 +10,7 @@ import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.world.World;
 
 import binnie.botany.Botany;
+import binnie.botany.items.BotanyItems;
 
 public class CeramicTileRecipe implements IRecipe {
 
@@ -26,7 +27,7 @@ public class CeramicTileRecipe implements IRecipe {
         Item ceramicBlock = Item.getItemFromBlock(Botany.ceramic);
         Item ceramicTile = Item.getItemFromBlock(Botany.ceramicTile);
         Item ceramicBrick = Item.getItemFromBlock(Botany.ceramicBrick);
-        Item mortar = Botany.misc;
+        Item mortar = BotanyItems.misc;
         List<ItemStack> stacks = new ArrayList<>();
         int ix = -1;
         int iy = -1;
@@ -52,7 +53,7 @@ public class CeramicTileRecipe implements IRecipe {
             }
         }
 
-        for (BlockCeramicBrick.TileType type : BlockCeramicBrick.TileType.VALUES) {
+        for (BlockCeramicBrick.TileType type : BlockCeramicBrick.TileType.values()) {
             ItemStack stack2 = type.getRecipe(stacks);
             if (stack2 != null) {
                 return stack2;

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

@@ -6,8 +6,8 @@ import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.world.World;
 
 import binnie.Binnie;
-import binnie.botany.Botany;
 import binnie.botany.api.IFlower;
+import binnie.botany.items.BotanyItems;
 
 public class PigmentRecipe implements IRecipe {
 
@@ -47,7 +47,7 @@ public class PigmentRecipe implements IRecipe {
 
                 IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(crafting.getStackInSlot(i));
                 if (flower.getAge() >= 1) {
-                    stack = new ItemStack(Botany.pigment, 1, flower.getGenome().getPrimaryColor().getID());
+                    stack = new ItemStack(BotanyItems.pigment, 1, flower.getGenome().getPrimaryColor().getID());
                 }
             }
         }

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

@@ -1,21 +0,0 @@
-package binnie.botany.core;
-
-import binnie.core.IInitializable;
-
-public class ModuleCore implements IInitializable {
-
-    @Override
-    public void preInit() {
-        // ignored
-    }
-
-    @Override
-    public void init() {
-        // ignored
-    }
-
-    @Override
-    public void postInit() {
-        // ignored
-    }
-}

src/main/java/binnie/botany/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;
@@ -29,6 +27,7 @@ import binnie.botany.genetics.EnumFlowerType;
 import binnie.botany.genetics.Flower;
 import binnie.core.BinnieCore;
 import binnie.core.util.I18N;
+import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.genetics.IIndividual;
@@ -42,7 +41,7 @@ public abstract class ItemBotany extends Item {
         setUnlocalizedName(name);
         hasSubtypes = true;
 
-        registerItem(this, getUnlocalizedName().substring(5));
+        GameRegistry.registerItem(this, name);
     }
 
     @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;
@@ -15,6 +13,7 @@ import net.minecraft.util.IIcon;
 import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
 import binnie.core.util.I18N;
+import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -23,12 +22,14 @@ public class ItemInsulatedTube extends Item {
     IIcon[] icons;
 
     public ItemInsulatedTube() {
+        final String name = "insulatedTube";
+
         icons = new IIcon[3];
-        setUnlocalizedName("insulatedTube");
+        setUnlocalizedName(name);
         setCreativeTab(CreativeTabBotany.instance);
         setHasSubtypes(true);
 
-        registerItem(this, getUnlocalizedName().substring(5));
+        GameRegistry.registerItem(this, name);
     }
 
     public static ItemStack getInsulateStack(ItemStack stack) {

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

@@ -1,5 +1,7 @@
 package binnie.botany.gardening;
 
+import static binnie.botany.items.BotanyMisc.Items.Weedkiller;
+
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -22,7 +24,6 @@ import binnie.botany.api.EnumSoilType;
 import binnie.botany.api.IFlower;
 import binnie.botany.api.gardening.IBlockSoil;
 import binnie.botany.flower.TileEntityFlower;
-import binnie.botany.items.BotanyItems;
 import binnie.core.BinnieCore;
 import forestry.api.core.EnumTemperature;
 
@@ -233,8 +234,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));
     }
 
@@ -263,7 +264,7 @@ public class Gardening {
     }
 
     public static boolean isWeedkiller(ItemStack heldItem) {
-        return heldItem != null && heldItem.isItemEqual(BotanyItems.Weedkiller.get(1));
+        return heldItem != null && heldItem.isItemEqual(Weedkiller.get(1));
     }
 
     public static boolean addWeedKiller(World world, int x, int y, int z) {

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;
@@ -21,17 +19,20 @@ import binnie.botany.api.gardening.IBlockSoil;
 import binnie.core.BinnieCore;
 import binnie.core.util.I18N;
 import binnie.genetics.genetics.AlleleHelper;
+import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemSoilMeter extends Item {
 
     public ItemSoilMeter() {
+        final String name = "soilMeter";
+
         setCreativeTab(CreativeTabBotany.instance);
-        setUnlocalizedName("soilMeter");
+        setUnlocalizedName(name);
         setMaxStackSize(1);
 
-        registerItem(this, getUnlocalizedName().substring(5));
+        GameRegistry.registerItem(this, name);
     }
 
     @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;
@@ -15,23 +13,25 @@ import binnie.botany.CreativeTabBotany;
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumMoisture;
 import binnie.botany.api.EnumSoilType;
+import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemTrowel extends Item {
 
     protected Item.ToolMaterial theToolMaterial;
-    String locName;
+    final String locName;
 
     public ItemTrowel(Item.ToolMaterial toolMaterial, String material) {
+        locName = "trowel" + material;
+
         theToolMaterial = toolMaterial;
         maxStackSize = 1;
         setMaxDamage(toolMaterial.getMaxUses());
         setCreativeTab(CreativeTabBotany.instance);
-        setUnlocalizedName("trowel" + material);
-        locName = "trowel" + material;
+        setUnlocalizedName(locName);
 
-        registerItem(this, getUnlocalizedName().substring(5));
+        GameRegistry.registerItem(this, locName);
     }
 
     @Override

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

@@ -1,5 +1,14 @@
 package binnie.botany.gardening;
 
+import static binnie.botany.items.BotanyMisc.Items.AshPowder;
+import static binnie.botany.items.BotanyMisc.Items.CompostPowder;
+import static binnie.botany.items.BotanyMisc.Items.FertiliserPowder;
+import static binnie.botany.items.BotanyMisc.Items.Mortar;
+import static binnie.botany.items.BotanyMisc.Items.MulchPowder;
+import static binnie.botany.items.BotanyMisc.Items.PulpPowder;
+import static binnie.botany.items.BotanyMisc.Items.SulphurPowder;
+import static binnie.botany.items.BotanyMisc.Items.Weedkiller;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -13,7 +22,6 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
 import binnie.botany.Botany;
-import binnie.botany.CreativeTabBotany;
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumMoisture;
 import binnie.botany.api.EnumSoilType;
@@ -27,8 +35,6 @@ import binnie.botany.farm.CircuitGarden;
 import binnie.botany.flower.ItemInsulatedTube;
 import binnie.botany.genetics.EnumFlowerColor;
 import binnie.botany.items.BotanyItems;
-import binnie.botany.items.ItemClay;
-import binnie.botany.items.ItemPigment;
 import binnie.core.BinnieCore;
 import binnie.core.IInitializable;
 import binnie.core.Mods;
@@ -36,7 +42,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 {
@@ -68,17 +73,6 @@ public class ModuleGardening implements IInitializable {
         Botany.flowerbedNoWeed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbedNoWeed", true);
         GameRegistry.registerBlock(Botany.flowerbedNoWeed, ItemSoil.class, "flowerbedNoWeed");
 
-        Botany.soilMeter = new ItemSoilMeter();
-        Botany.insulatedTube = new ItemInsulatedTube();
-        Botany.trowelWood = new ItemTrowel(Item.ToolMaterial.WOOD, "Wood");
-        Botany.trowelStone = new ItemTrowel(Item.ToolMaterial.STONE, "Stone");
-        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.pigment = new ItemPigment();
-        Botany.clay = new ItemClay();
-
         Botany.ceramic = new BlockCeramic();
         GameRegistry.registerBlock(Botany.ceramic, ItemMetadata.class, "ceramic");
         BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramic), new ItemMetadataRenderer());
@@ -100,7 +94,7 @@ public class ModuleGardening implements IInitializable {
 
     @Override
     public void init() {
-        OreDictionary.registerOre("pigment", Botany.pigment);
+        OreDictionary.registerOre("pigment", BotanyItems.pigment);
         RecipeSorter.register("botany:ceramictile", CeramicTileRecipe.class, RecipeSorter.Category.SHAPED, "");
         RecipeSorter.register("botany:pigment", PigmentRecipe.class, RecipeSorter.Category.SHAPED, "");
         ItemStack yellow = new ItemStack(Blocks.yellow_flower, 1);
@@ -109,7 +103,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();
@@ -121,28 +115,28 @@ public class ModuleGardening implements IInitializable {
                             null,
                             manual,
                             fertilised,
-                            new ItemStack(Botany.insulatedTube, 1, 128 * insulate),
+                            new ItemStack(BotanyItems.insulatedTube, 1, 128 * insulate),
                             icon);
                     new CircuitGarden(
                             moist,
                             EnumAcidity.ACID,
                             manual,
                             fertilised,
-                            new ItemStack(Botany.insulatedTube, 1, 1 + 128 * insulate),
+                            new ItemStack(BotanyItems.insulatedTube, 1, 1 + 128 * insulate),
                             icon);
                     new CircuitGarden(
                             moist,
                             EnumAcidity.NEUTRAL,
                             manual,
                             fertilised,
-                            new ItemStack(Botany.insulatedTube, 1, 2 + 128 * insulate),
+                            new ItemStack(BotanyItems.insulatedTube, 1, 2 + 128 * insulate),
                             icon);
                     new CircuitGarden(
                             moist,
                             EnumAcidity.ALKALINE,
                             manual,
                             fertilised,
-                            new ItemStack(Botany.insulatedTube, 1, 3 + 128 * insulate),
+                            new ItemStack(BotanyItems.insulatedTube, 1, 3 + 128 * insulate),
                             icon);
                 }
             }
@@ -154,7 +148,7 @@ public class ModuleGardening implements IInitializable {
         GameRegistry.addRecipe(new CeramicTileRecipe());
         for (int mat = 0; mat < 4; ++mat) {
             for (int insulate = 0; insulate < 6; ++insulate) {
-                ItemStack tubes = new ItemStack(Botany.insulatedTube, 2, mat + 128 * insulate);
+                ItemStack tubes = new ItemStack(BotanyItems.insulatedTube, 2, mat + 128 * insulate);
                 ItemStack insulateStack = ItemInsulatedTube.getInsulateStack(tubes);
                 ItemStack forestryTube = new ItemStack(Mods.forestry.item("thermionicTubes"), 1, mat);
                 GameRegistry.addShapelessRecipe(tubes, forestryTube, forestryTube, insulateStack);
@@ -182,62 +176,61 @@ public class ModuleGardening implements IInitializable {
 
         GameRegistry.addRecipe(
                 new ShapedOreRecipe(
-                        Botany.trowelWood,
+                        BotanyItems.trowelWood,
                         new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "plankWood" }));
         GameRegistry.addRecipe(
                 new ShapedOreRecipe(
-                        Botany.trowelStone,
+                        BotanyItems.trowelStone,
                         new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "cobblestone" }));
         GameRegistry.addRecipe(
                 new ShapedOreRecipe(
-                        Botany.trowelIron,
+                        BotanyItems.trowelIron,
                         new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotIron" }));
         GameRegistry.addRecipe(
                 new ShapedOreRecipe(
-                        Botany.trowelGold,
+                        BotanyItems.trowelGold,
                         new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotGold" }));
         GameRegistry.addRecipe(
                 new ShapedOreRecipe(
-                        Botany.trowelDiamond,
+                        BotanyItems.trowelDiamond,
                         new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "gemDiamond" }));
         GameRegistry.addRecipe(
                 new ShapedOreRecipe(
-                        Botany.soilMeter,
+                        BotanyItems.soilMeter,
                         new Object[] { " gg", " rg", "i  ", 'g', "ingotGold", 'r', "dustRedstone", 'i', "ingotIron" }));
         GameRegistry.addShapelessRecipe(
-                BotanyItems.Weedkiller.get(4),
+                Weedkiller.get(4),
                 new ItemStack(Items.spider_eye),
                 new ItemStack(Items.wheat_seeds),
                 new ItemStack(Items.wheat_seeds),
                 new ItemStack(Items.wheat_seeds));
 
-        GameRegistry.addShapelessRecipe(BotanyItems.AshPowder.get(4), Mods.forestry.stack("ash"));
-        GameRegistry.addShapelessRecipe(BotanyItems.MulchPowder.get(4), Mods.forestry.stack("mulch"));
-        GameRegistry.addShapelessRecipe(BotanyItems.CompostPowder.get(4), Mods.forestry.stack("fertilizerBio"));
-        GameRegistry.addShapelessRecipe(BotanyItems.FertiliserPowder.get(4), Mods.forestry.stack("fertilizerCompound"));
-        GameRegistry.addShapelessRecipe(BotanyItems.PulpPowder.get(4), Mods.forestry.stack("woodPulp"));
-        GameRegistry
-                .addRecipe(new ShapelessOreRecipe(BotanyItems.SulphurPowder.get(4), new Object[] { "dustSulphur" }));
+        GameRegistry.addShapelessRecipe(AshPowder.get(4), Mods.forestry.stack("ash"));
+        GameRegistry.addShapelessRecipe(MulchPowder.get(4), Mods.forestry.stack("mulch"));
+        GameRegistry.addShapelessRecipe(CompostPowder.get(4), Mods.forestry.stack("fertilizerBio"));
+        GameRegistry.addShapelessRecipe(FertiliserPowder.get(4), Mods.forestry.stack("fertilizerCompound"));
+        GameRegistry.addShapelessRecipe(PulpPowder.get(4), Mods.forestry.stack("woodPulp"));
+        GameRegistry.addRecipe(new ShapelessOreRecipe(SulphurPowder.get(4), new Object[] { "dustSulphur" }));
 
         GameRegistry.addRecipe(
                 new ShapelessOreRecipe(
-                        new ItemStack(Botany.pigment, 2, EnumFlowerColor.BLACK.ordinal()),
+                        new ItemStack(BotanyItems.pigment, 2, EnumFlowerColor.BLACK.ordinal()),
                         new Object[] { "pigment", "pigment", "dyeBlack" }));
 
-        ModuleGardening.queuedAcidFertilisers.put(BotanyItems.SulphurPowder.get(1), 1);
-        ModuleGardening.queuedAcidFertilisers.put(BotanyItems.MulchPowder.get(1), 1);
+        ModuleGardening.queuedAcidFertilisers.put(SulphurPowder.get(1), 1);
+        ModuleGardening.queuedAcidFertilisers.put(MulchPowder.get(1), 1);
         ModuleGardening.queuedAcidFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "mulch")), 2);
 
         for (ItemStack stack : OreDictionary.getOres("dustSulfur")) {
             ModuleGardening.queuedAcidFertilisers.put(stack, 2);
         }
 
-        ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.AshPowder.get(1), 1);
-        ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.PulpPowder.get(1), 1);
+        ModuleGardening.queuedAlkalineFertilisers.put(AshPowder.get(1), 1);
+        ModuleGardening.queuedAlkalineFertilisers.put(PulpPowder.get(1), 1);
         ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "ash")), 2);
         ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "woodPulp")), 2);
-        ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.CompostPowder.get(1), 1);
-        ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.FertiliserPowder.get(1), 1);
+        ModuleGardening.queuedNutrientFertilisers.put(CompostPowder.get(1), 1);
+        ModuleGardening.queuedNutrientFertilisers.put(FertiliserPowder.get(1), 1);
         ModuleGardening.queuedNutrientFertilisers
                 .put(new ItemStack(GameRegistry.findItem("Forestry", "fertilizerBio")), 2);
         ModuleGardening.queuedNutrientFertilisers
@@ -255,12 +248,11 @@ public class ModuleGardening implements IInitializable {
             addNutrientFertiliser(entry.getKey(), entry.getValue());
         }
 
-        GameRegistry
-                .addRecipe(BotanyItems.Mortar.get(6), " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel);
+        GameRegistry.addRecipe(Mortar.get(6), " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel);
 
-        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
-            ItemStack clay = new ItemStack(Botany.clay, 1, c.ordinal());
-            ItemStack pigment = new ItemStack(Botany.pigment, 1, c.ordinal());
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+            ItemStack clay = new ItemStack(BotanyItems.clay, 1, c.ordinal());
+            ItemStack pigment = new ItemStack(BotanyItems.pigment, 1, c.ordinal());
             GameRegistry.addShapelessRecipe(clay, Items.clay_ball, Items.clay_ball, Items.clay_ball, pigment);
             GameRegistry.addSmelting(clay, TileEntityMetadata.getItemStack(Botany.ceramic, c.ordinal()), 0.0f);
             ItemStack glass = TileEntityMetadata.getItemStack(Botany.stained, c.ordinal());
@@ -276,9 +268,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

@@ -14,7 +14,6 @@ import net.minecraft.world.World;
 
 import com.mojang.authlib.GameProfile;
 
-import binnie.botany.Botany;
 import binnie.botany.api.EnumFlowerChromosome;
 import binnie.botany.api.EnumFlowerStage;
 import binnie.botany.api.IAlleleFlowerSpecies;
@@ -24,6 +23,7 @@ import binnie.botany.api.IFlower;
 import binnie.botany.api.IFlowerGenome;
 import binnie.botany.api.IFlowerMutation;
 import binnie.botany.api.IFlowerRoot;
+import binnie.botany.items.BotanyItems;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IChromosomeType;
@@ -88,16 +88,16 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
             return null;
         }
 
-        Item flowerItem = Botany.flowerItem;
+        Item flowerItem = BotanyItems.flowerItem;
         if (type == EnumFlowerStage.SEED.ordinal()) {
-            flowerItem = Botany.seed;
+            flowerItem = BotanyItems.seed;
         }
 
         if (type == EnumFlowerStage.POLLEN.ordinal()) {
-            flowerItem = Botany.pollen;
+            flowerItem = BotanyItems.pollen;
         }
 
-        if (flowerItem != Botany.flowerItem) {
+        if (flowerItem != BotanyItems.flowerItem) {
             ((IFlower) flower).setAge(0);
         }
 
@@ -113,13 +113,13 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
         if (stack == null) {
             return EnumFlowerStage.NONE;
         }
-        if (stack.getItem() == Botany.flowerItem) {
+        if (stack.getItem() == BotanyItems.flowerItem) {
             return EnumFlowerStage.FLOWER;
         }
-        if (stack.getItem() == Botany.pollen) {
+        if (stack.getItem() == BotanyItems.pollen) {
             return EnumFlowerStage.POLLEN;
         }
-        if (stack.getItem() == Botany.seed) {
+        if (stack.getItem() == BotanyItems.seed) {
             return EnumFlowerStage.SEED;
         }
         return EnumFlowerStage.NONE;
@@ -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

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

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;
@@ -16,6 +14,7 @@ import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
 import binnie.botany.core.BotanyGUI;
 import binnie.core.util.I18N;
+import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -24,11 +23,13 @@ public class ItemDictionary extends Item {
     protected IIcon iconMaster;
 
     public ItemDictionary() {
+        final String name = "database";
+
         setCreativeTab(CreativeTabBotany.instance);
-        setUnlocalizedName("database");
+        setUnlocalizedName(name);
         setMaxStackSize(1);
 
-        registerItem(this, getUnlocalizedName().substring(5));
+        GameRegistry.registerItem(this, name);
     }
 
     @Override

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

@@ -8,11 +8,9 @@ import binnie.Binnie;
 import binnie.botany.Botany;
 import binnie.botany.core.BotanyCore;
 import binnie.botany.flower.BlockFlower;
-import binnie.botany.flower.ItemFlower;
-import binnie.botany.flower.ItemPollen;
-import binnie.botany.flower.ItemSeed;
 import binnie.botany.flower.RendererBotany;
 import binnie.botany.flower.TileEntityFlower;
+import binnie.botany.items.BotanyItems;
 import binnie.core.BinnieCore;
 import binnie.core.IInitializable;
 import cpw.mods.fml.client.registry.RenderingRegistry;
@@ -30,19 +28,15 @@ public class ModuleGenetics implements IInitializable {
     public void preInit() {
         EnumFlowerColor.setupMutations();
         Botany.flower = new BlockFlower();
-        Botany.flowerItem = new ItemFlower();
-        Botany.pollen = new ItemPollen();
-        Botany.seed = new ItemSeed();
         AlleleManager.alleleRegistry.registerSpeciesRoot(BotanyCore.speciesRoot);
         AlleleManager.alleleRegistry.registerAllele(ModuleGenetics.alleleEffectNone);
         GameRegistry.registerBlock(Botany.flower, "flower");
         BinnieCore.proxy.registerTileEntity(TileEntityFlower.class, "botany.tile.flower", null);
-        Botany.database = new ItemDictionary();
     }
 
     @Override
     public void init() {
-        for (EnumFlowerColor color : EnumFlowerColor.VALUES) {
+        for (EnumFlowerColor color : EnumFlowerColor.values()) {
             AlleleManager.alleleRegistry.registerAllele(color.getAllele());
         }
 
@@ -66,7 +60,7 @@ public class ModuleGenetics implements IInitializable {
                 100,
                 Binnie.Liquid.getLiquidStack("water", 2000),
                 null,
-                new ItemStack(Botany.database),
+                new ItemStack(BotanyItems.database),
                 "X#X",
                 "YEY",
                 "RDR",

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

@@ -1,62 +1,30 @@
 package binnie.botany.items;
 
-import java.util.List;
+import net.minecraft.item.Item;
 
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
+import binnie.botany.flower.ItemFlower;
+import binnie.botany.flower.ItemInsulatedTube;
+import binnie.botany.flower.ItemPollen;
+import binnie.botany.flower.ItemSeed;
+import binnie.botany.gardening.ItemSoilMeter;
+import binnie.botany.gardening.ItemTrowel;
+import binnie.botany.genetics.ItemDictionary;
+import binnie.core.item.DamageItems;
 
-import binnie.botany.Botany;
-import binnie.core.item.IItemMisc;
-import binnie.core.util.I18N;
+public class BotanyItems {
 
-public enum BotanyItems implements IItemMisc {
-
-    AshPowder("powderAsh"),
-    PulpPowder("powderPulp"),
-    MulchPowder("powderMulch"),
-    SulphurPowder("powderSulphur"),
-    FertiliserPowder("powderFertiliser"),
-    CompostPowder("powderCompost"),
-    Mortar("mortar"),
-    Weedkiller("weedkiller");
-
-    private IIcon icon;
-    private final String name;
-    private final String iconPath;
-
-    BotanyItems(String name) {
-        this.name = name;
-        this.iconPath = name;
-    }
-
-    @Override
-    public IIcon getIcon(ItemStack itemStack) {
-        return icon;
-    }
-
-    @Override
-    public void registerIcons(IIconRegister register) {
-        icon = Botany.proxy.getIcon(register, iconPath);
-    }
-
-    @Override
-    public void addInformation(List<String> data) {
-        // ignored
-    }
-
-    @Override
-    public String getName(ItemStack itemStack) {
-        return I18N.localise("botany.item." + name + ".name");
-    }
-
-    @Override
-    public ItemStack get(int count) {
-        return new ItemStack(Botany.misc, count, ordinal());
-    }
-
-    @Override
-    public boolean isActive() {
-        return true;
-    }
+    public static final ItemInsulatedTube insulatedTube = new ItemInsulatedTube();
+    public static final ItemSoilMeter soilMeter = new ItemSoilMeter();
+    public static final DamageItems misc = new BotanyMisc();
+    public static final ItemFlower flowerItem = new ItemFlower();
+    public static final ItemPigment pigment = new ItemPigment();
+    public static final ItemClay clay = new ItemClay();
+    public static final Item seed = new ItemSeed();
+    public static final Item pollen = new ItemPollen();
+    public static final ItemDictionary database = new ItemDictionary();
+    public static final ItemTrowel trowelWood = new ItemTrowel(Item.ToolMaterial.WOOD, "Wood");
+    public static final ItemTrowel trowelStone = new ItemTrowel(Item.ToolMaterial.STONE, "Stone");
+    public static final ItemTrowel trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron");
+    public static final ItemTrowel trowelDiamond = new ItemTrowel(Item.ToolMaterial.EMERALD, "Diamond");
+    public static final ItemTrowel trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold");
 }

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

@@ -0,0 +1,44 @@
+package binnie.botany.items;
+
+import static binnie.botany.Botany.BOTANY_MODID;
+import static binnie.botany.items.BotanyItems.misc;
+
+import java.util.Arrays;
+
+import net.minecraft.item.ItemStack;
+
+import binnie.botany.CreativeTabBotany;
+import binnie.core.item.DamageItems;
+
+public class BotanyMisc extends DamageItems {
+
+    public enum Items {
+
+        AshPowder("powderAsh"),
+        PulpPowder("powderPulp"),
+        MulchPowder("powderMulch"),
+        SulphurPowder("powderSulphur"),
+        FertiliserPowder("powderFertiliser"),
+        CompostPowder("powderCompost"),
+        Mortar("mortar"),
+        Weedkiller("weedkiller");
+
+        final String name;
+        private static final Items[] VALUES = values();
+
+        Items(String name) {
+            this.name = name;
+        }
+
+        public ItemStack get(int count) {
+            return misc.getStack(count, ordinal());
+        }
+    }
+
+    public BotanyMisc() {
+        super(
+                CreativeTabBotany.instance,
+                BOTANY_MODID,
+                Arrays.stream(Items.VALUES).map(i -> i.name).toArray(String[]::new));
+    }
+}

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;
@@ -15,17 +13,20 @@ import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
 import binnie.botany.genetics.EnumFlowerColor;
 import binnie.core.util.I18N;
+import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemClay extends Item {
 
     public ItemClay() {
-        setUnlocalizedName("clay");
+        final String name = "clay";
+
+        setUnlocalizedName(name);
         setHasSubtypes(true);
         setCreativeTab(CreativeTabBotany.instance);
 
-        registerItem(this, getUnlocalizedName().substring(5));
+        GameRegistry.registerItem(this, name);
     }
 
     @Override
@@ -49,7 +50,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;
@@ -15,17 +13,20 @@ import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
 import binnie.botany.genetics.EnumFlowerColor;
 import binnie.core.util.I18N;
+import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemPigment extends Item {
 
     public ItemPigment() {
-        setUnlocalizedName("pigment");
+        final String name = "pigment";
+
+        setUnlocalizedName(name);
         setHasSubtypes(true);
         setCreativeTab(CreativeTabBotany.instance);
 
-        registerItem(this, getUnlocalizedName().substring(5));
+        GameRegistry.registerItem(this, name);
     }
 
     @Override
@@ -49,7 +50,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

@@ -3,6 +3,8 @@ package binnie.core;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.minecraftforge.common.MinecraftForge;
+
 import binnie.core.gui.IBinnieGUID;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
@@ -21,6 +23,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
     public AbstractMod() {
         modules = new ArrayList<>();
         BinnieCore.registerMod(this);
+        MinecraftForge.EVENT_BUS.register(this);
     }
 
     public boolean isActive() {
@@ -90,6 +93,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
 
     protected void addModule(IInitializable init) {
         modules.add(init);
-        init.registerEventHandler();
+        MinecraftForge.EVENT_BUS.register(init);
     }
 }

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

@@ -5,19 +5,17 @@ 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;
 import binnie.core.gui.IBinnieGUID;
-import binnie.core.item.ItemGenesis;
 import binnie.core.item.ModuleItems;
 import binnie.core.liquid.FluidContainer;
 import binnie.core.liquid.ItemFluidContainer;
@@ -29,7 +27,6 @@ import binnie.core.network.IPacketID;
 import binnie.core.proxy.BinnieProxy;
 import binnie.core.proxy.IBinnieProxy;
 import binnie.core.triggers.ModuleTrigger;
-import binnie.genetics.item.ItemFieldKit;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
@@ -65,12 +62,6 @@ public class BinnieCore extends AbstractMod {
     public static int multipassRenderID;
     private static final List<AbstractMod> modList = new ArrayList<>();
     public static MachineGroup packageCompartment;
-    public static ItemGenesis genesis;
-    public static ItemFieldKit fieldKit;
-
-    public BinnieCore() {
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
-    }
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
@@ -79,9 +70,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());
@@ -165,6 +154,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,14 +191,18 @@ public class BinnieCore extends AbstractMod {
         return BinnieCorePacketID.values();
     }
 
-    @Override
-    protected Class<? extends BinniePacketHandler> getPacketHandler() {
-        return PacketHandler.class;
+    @SubscribeEvent
+    @SideOnly(Side.CLIENT)
+    public void handleTextureRemap(TextureStitchEvent.Pre event) {
+        if (event.map.getTextureType() == 0) {
+            Binnie.Liquid.reloadIcons(event.map);
+        }
+        Binnie.Resource.registerIcons(event.map, event.map.getTextureType());
     }
 
     @Override
-    public boolean isActive() {
-        return true;
+    protected Class<? extends BinniePacketHandler> getPacketHandler() {
+        return PacketHandler.class;
     }
 
     public static class PacketHandler extends BinniePacketHandler {
@@ -201,31 +211,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

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

src/main/java/binnie/core/ManagerBase.java

@@ -7,19 +7,4 @@ public abstract class ManagerBase implements IInitializable {
     public ManagerBase() {
         Binnie.Managers.add(this);
     }
-
-    @Override
-    public void preInit() {
-        // ignored
-    }
-
-    @Override
-    public void init() {
-        // ignored
-    }
-
-    @Override
-    public void postInit() {
-        // ignored
-    }
 }

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

@@ -13,7 +13,6 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 import binnie.core.BinnieCore;
 
@@ -61,16 +60,6 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata {
         return getLocalizedName();
     }
 
-    @Override
-    public void addBlockTooltip(ItemStack itemStack, List<String> tooltip) {
-        // ignored
-    }
-
-    @Override
-    public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
-        return TileEntityMetadata.getItemDamage(itemStack);
-    }
-
     @Override
     public int getDroppedMeta(int blockMeta, int tileMeta) {
         return blockMeta;

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

@@ -9,13 +9,17 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 public interface IBlockMetadata extends ITileEntityProvider {
 
-    int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction);
+    default int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
+        return TileEntityMetadata.getItemDamage(itemStack);
+    }
 
-    int getDroppedMeta(int blockMeta, int tileMeta);
+    default int getDroppedMeta(int blockMeta, int tileMeta) {
+        return tileMeta;
+    }
 
     String getBlockName(ItemStack itemStack);
 
-    void addBlockTooltip(ItemStack itemStack, List<String> tooltip);
+    default void addBlockTooltip(ItemStack itemStack, List<String> tooltip) {}
 
     void dropAsStack(World world, int x, int y, int z, ItemStack itemStack);
 }

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/Widget.java

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

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;
@@ -33,8 +32,8 @@ import binnie.core.craftgui.resource.StyleSheet;
 import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
 import binnie.core.craftgui.resource.minecraft.PaddedTexture;
 import binnie.core.craftgui.resource.minecraft.StandardTexture;
+import binnie.core.item.BinnieItems;
 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 +114,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 +181,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() {
@@ -235,7 +226,7 @@ public class WindowFieldKit extends Window {
         super.onWindowInventoryChanged();
         if (isServer()) {
             ItemStack kit = getPlayer().getHeldItem();
-            if (kit == null || !kit.getItem().equals(BinnieCore.fieldKit)) {
+            if (kit == null || !kit.getItem().equals(BinnieItems.fieldKit)) {
                 return;
             }
 
@@ -295,8 +286,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/minecraft/ContainerCraftGUI.java

@@ -1,7 +1,5 @@
 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.List;
@@ -9,14 +7,12 @@ 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;
 
@@ -40,71 +36,43 @@ import cpw.mods.fml.relauncher.Side;
 
 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 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
@@ -118,47 +86,54 @@ public class ContainerCraftGUI extends Container {
 
     @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);
@@ -176,40 +151,45 @@ 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().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 < target.length; ++i) {
+        for (int i = 0; i < 36; ++i) {
             target[i] = i;
         }
 
@@ -221,116 +201,108 @@ public class ContainerCraftGUI extends Container {
                     .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 }).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) {
-        final String actionType = action.getString(ACTION_TYPE);
-
+    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);
 
-                    createSlot(InventoryType.values()[slotType % 4], slotIndex, slotNumber);
-
-                    for (ICrafting crafterObject : crafters) {
-                        crafterObject.sendContainerAndContentsToPlayer(this, getInventory());
-                    }
+                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 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);
-
-        if (machineSync != null) machineSync.sendGuiNBT(syncedNBT);
+        INetwork.SendGuiNBT machineSync = Machine.getInterface(INetwork.SendGuiNBT.class, window.getInventory());
+        if (machineSync != null) {
+            machineSync.sendGuiNBT(syncedNBT);
+        }
 
         Map<String, NBTTagCompound> sentThisTime = new HashMap<>();
-        NBTTagList actions = new NBTTagList();
+        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());
+            }
 
-        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.equals(actionPrev)) continue;
-
-            actions.appendTag(action);
-            sentThisTime.put(actionType, action);
-        }
-
-        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);
+            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());
             }
         }
 
@@ -342,10 +314,10 @@ public class ContainerCraftGUI extends Container {
         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();
         }
 
@@ -370,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) {
@@ -404,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 {
@@ -432,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;
         }
@@ -451,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);
             }
@@ -463,15 +436,15 @@ 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);
         }
     }
 
@@ -485,50 +458,58 @@ public class ContainerCraftGUI extends Container {
         return null;
     }
 
-    public void receiveNBT(Side side, EntityPlayer player, NBTTagCompound action) {
-        String actionType = action.getString(ACTION_TYPE);
-        if (actionType.equals(ACTION_BATCH)) {
-            NBTTagList actionsBatch = action.getTagList(ACTIONS, TAG_COMPOUND);
-            for (int i = 0; i < actionsBatch.tagCount(); i++) {
-                receiveNBT(side, player, actionsBatch.getCompoundTagAt(i));
-            }
+    public void recieveNBT(Side side, EntityPlayer player, NBTTagCompound action) {
+        String name = action.getString("type");
+        if (handleNBT(side, player, name, action)) {
             return;
         }
-        handleNBT(side, player, action);
-        window.receiveGuiNBT(getSide(), player, actionType, action);
-        INetwork.ReceiveGuiNBT machine = Machine.getInterface(INetwork.ReceiveGuiNBT.class, window.getInventory());
-        if (machine == null) return;
-        machine.receiveGuiNBT(getSide(), player, actionType, action);
+
+        window.recieveGuiNBT(getSide(), player, name, action);
+        INetwork.RecieveGuiNBT machine = Machine.getInterface(INetwork.RecieveGuiNBT.class, window.getInventory());
+        if (machine != null) {
+            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 void createSlot(InventoryType type, int index, int slotNumber) {
-        if (inventorySlots.get(slotNumber) != null) return;
-
+    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;
         inventorySlots.add(slotNumber, slot);
         inventoryItemStacks.add(slotNumber, null);
+        return slot;
     }
 }

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

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

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

@@ -4,12 +4,6 @@ import binnie.core.IInitializable;
 
 public class ModuleCraftGUI implements IInitializable {
 
-    @Override
-    public void preInit() {}
-
-    @Override
-    public void init() {}
-
     @Override
     public void postInit() {
         for (GUIIcon icon : GUIIcon.values()) {

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

@@ -48,12 +48,11 @@ import binnie.core.resource.ResourceType;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-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;
@@ -84,8 +83,8 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
             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/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,11 +1,5 @@
 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.HashMap;
 import java.util.List;
@@ -16,8 +10,6 @@ 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 binnie.core.craftgui.CraftGUI;
@@ -34,7 +26,6 @@ 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;
 
 public class ControlSlot extends ControlSlotBase {
@@ -49,12 +40,10 @@ public class ControlSlot extends ControlSlotBase {
     }
 
     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
@@ -82,17 +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;
     }
 
     @Override
     public void onRenderBackground() {
-        CraftGUI.render.texture(slotTexture, IPoint.ZERO);
+        CraftGUI.render.texture(CraftGUITexture.Slot, IPoint.ZERO);
         if (slot == null) {
             return;
         }
@@ -196,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/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/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/BinnieItems.java

@@ -0,0 +1,9 @@
+package binnie.core.item;
+
+import binnie.genetics.item.ItemFieldKit;
+
+public class BinnieItems {
+
+    public static final ItemGenesis genesis = new ItemGenesis();
+    public static final ItemFieldKit fieldKit = new ItemFieldKit();
+}

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

@@ -0,0 +1,85 @@
+package binnie.core.item;
+
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+import binnie.core.util.I18N;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public abstract class DamageItems extends Item {
+
+    private final String[] NAMES;
+    private final IIcon[] ICONS;
+    private final String modid;
+    private final boolean overrideIcons;
+
+    protected DamageItems(CreativeTabs tab, String modid, String... names) {
+        this(tab, modid, "misc", false, names);
+    }
+
+    protected DamageItems(CreativeTabs tab, String modid, String name, boolean overrideIcons, String... names) {
+        setCreativeTab(tab);
+        setHasSubtypes(true);
+        setUnlocalizedName(name);
+
+        this.overrideIcons = overrideIcons;
+        NAMES = names;
+        ICONS = overrideIcons ? null : new IIcon[names.length];
+        this.modid = modid;
+        GameRegistry.registerItem(this, name);
+    }
+
+    public ItemStack getStack(int count, int damage) {
+        return new ItemStack(this, count, damage);
+    }
+
+    /**
+     * @param name One of the names passed to the constructor
+     * @return The unlocalized name string
+     */
+    public String getUnlocalizedName(String name) {
+        return modid + ".item." + name + ".name";
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void getSubItems(Item thiz, CreativeTabs tab, List<ItemStack> list) {
+        for (int i = 0; i < NAMES.length; ++i) {
+            list.add(new ItemStack(thiz, 1, i));
+        }
+    }
+
+    @Override
+    public String getItemStackDisplayName(ItemStack stack) {
+        final int damage = stack.getItemDamage();
+        return (damage < NAMES.length) ? I18N.localise(getUnlocalizedName(NAMES[damage])) : "null";
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIconFromDamage(int damage) {
+        if (overrideIcons) return null;
+        return (damage < ICONS.length && damage >= 0) ? ICONS[damage] : null;
+    }
+
+    public String getIconName(int damage) {
+        return NAMES[damage];
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister register) {
+        if (overrideIcons) return;
+
+        for (int i = 0; i < NAMES.length; ++i) {
+            ICONS[i] = register.registerIcon(modid + ":" + getIconName(i));
+        }
+    }
+}

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

@@ -1,14 +0,0 @@
-package binnie.core.item;
-
-import net.minecraft.item.ItemStack;
-
-public interface IItemEnum {
-
-    boolean isActive();
-
-    String getName(ItemStack itemStack);
-
-    int ordinal();
-
-    ItemStack get(int count);
-}

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

@@ -1,20 +0,0 @@
-package binnie.core.item;
-
-import java.util.List;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public interface IItemMisc extends IItemEnum {
-
-    IIcon getIcon(ItemStack itemStack);
-
-    @SideOnly(Side.CLIENT)
-    void registerIcons(IIconRegister register);
-
-    void addInformation(List<String> data);
-}

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;
@@ -11,6 +9,7 @@ import net.minecraft.world.World;
 import binnie.core.BinnieCore;
 import binnie.core.gui.BinnieCoreGUI;
 import binnie.core.util.I18N;
+import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.Tabs;
@@ -24,11 +23,13 @@ public class ItemGenesis extends Item {
     }
 
     public ItemGenesis() {
+        final String name = "genesis";
+
         setCreativeTab(Tabs.tabApiculture);
-        setUnlocalizedName("genesis");
+        setUnlocalizedName(name);
         setMaxStackSize(1);
 
-        registerItem(this, getUnlocalizedName().substring(5));
+        GameRegistry.registerItem(this, name);
     }
 
     @Override

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

@@ -1,86 +0,0 @@
-package binnie.core.item;
-
-import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
-
-import java.util.List;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class ItemMisc extends Item {
-
-    private final IItemMisc[] items;
-
-    public ItemMisc(CreativeTabs tab, IItemMisc[] items) {
-        setCreativeTab(tab);
-        setHasSubtypes(true);
-        setUnlocalizedName("misc");
-        this.items = items;
-
-        registerItem(this, getUnlocalizedName().substring(5));
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void getSubItems(Item par1, CreativeTabs tab, List<ItemStack> list) {
-        for (IItemMisc item : items) {
-            if (item.isActive()) {
-                list.add(getStack(item, 1));
-            }
-        }
-    }
-
-    private IItemMisc getItem(int damage) {
-        if (damage >= items.length) {
-            return items[0];
-        }
-        return items[damage];
-    }
-
-    public ItemStack getStack(IItemMisc type, int size) {
-        return new ItemStack(this, size, type.ordinal());
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack itemStack, EntityPlayer player, List<String> tooltip, boolean advanced) {
-        super.addInformation(itemStack, player, tooltip, advanced);
-        IItemMisc item = getItem(itemStack.getItemDamage());
-        if (item != null) {
-            item.addInformation(tooltip);
-        }
-    }
-
-    @Override
-    public String getItemStackDisplayName(ItemStack stack) {
-        IItemMisc item = getItem(stack.getItemDamage());
-        return (item != null) ? item.getName(stack) : "null";
-    }
-
-    @Override
-    public IIcon getIcon(ItemStack stack, int pass) {
-        IItemMisc item = getItem(stack.getItemDamage());
-        return (item != null) ? item.getIcon(stack) : null;
-    }
-
-    @Override
-    public IIcon getIconFromDamage(int damage) {
-        IItemMisc item = getItem(damage);
-        return (item != null) ? item.getIcon(null) : null;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerIcons(IIconRegister register) {
-        for (IItemMisc item : items) {
-            item.registerIcons(register);
-        }
-    }
-}

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

@@ -1,22 +1,21 @@
 package binnie.core.item;
 
+import static binnie.core.item.BinnieItems.fieldKit;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 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;
 import binnie.botany.api.IFlower;
 import binnie.botany.flower.TileEntityFlower;
 import binnie.botany.network.PacketID;
-import binnie.core.BinnieCore;
 import binnie.core.IInitializable;
 import binnie.core.network.packet.MessageNBT;
-import binnie.genetics.item.ItemFieldKit;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
 
@@ -24,19 +23,15 @@ public class ModuleItems implements IInitializable {
 
     @Override
     public void preInit() {
-        BinnieCore.fieldKit = new ItemFieldKit();
-        BinnieCore.genesis = new ItemGenesis();
-    }
-
-    @Override
-    public void init() {
-        // ignored
+        // Loads BinnieItems.class, guaranteeing that items are init by this point
+        // TODO: is this needed?
+        fieldKit.getUnlocalizedName();
     }
 
     @Override
     public void postInit() {
         GameRegistry.addRecipe(
-                new ItemStack(BinnieCore.fieldKit, 1, 63),
+                new ItemStack(fieldKit, 1, 63),
                 "g  ",
                 " is",
                 " pi",
@@ -50,44 +45,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() == 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/FluidContainer.java

@@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import binnie.core.BinnieCore;
 import binnie.core.Mods;
 import binnie.core.util.I18N;
-import binnie.genetics.item.GeneticsItems;
+import binnie.genetics.item.GeneticsMisc;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -71,7 +71,7 @@ public enum FluidContainer {
             case Capsule -> Mods.forestry.stack("waxCapsule");
             case Glass -> new ItemStack(Items.glass_bottle, 1, 0);
             case Refractory -> Mods.forestry.stack("refractoryEmpty");
-            case Cylinder -> GeneticsItems.Cylinder.get(1);
+            case Cylinder -> GeneticsMisc.Items.Cylinder.get(1);
         };
     }
 

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

@@ -277,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;
@@ -31,11 +32,6 @@ public abstract class MachinePackage {
         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;
     }
@@ -52,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

@@ -5,6 +5,7 @@ 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;
@@ -12,27 +13,30 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 // Hmm. It's used class
 public class RendererMachine extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler {
 
+    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) {
+    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);
+        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);
         }
     }
 
@@ -44,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;
     }
@@ -58,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/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/IProcess.java

@@ -9,11 +9,4 @@ public interface IProcess extends IErrorStateSource {
     boolean isInProgress();
 
     ProcessInfo getInfo();
-
-    /***
-     * Returns true if the current target got worked on at least once.
-     */
-    default boolean workedOnTarget() {
-        return false;
-    }
 }

src/main/java/binnie/core/machines/storage/Compartment.java

@@ -1,5 +1,6 @@
 package binnie.core.machines.storage;
 
+import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
@@ -50,7 +51,8 @@ enum Compartment implements IMachineType {
         }
 
         @Override
-        public void renderMachine(Machine machine, double x, double y, double z, float partialTick) {
+        public void renderMachine(Machine machine, double x, double y, double z, float partialTick,
+                RenderBlocks renderer) {
             MachineRendererCompartment.instance.renderMachine(machine, renderTexture, x, y, z);
         }
     }

src/main/java/binnie/core/machines/storage/CompartmentTab.java

@@ -25,7 +25,7 @@ class CompartmentTab implements INBTTagable {
     public void readFromNBT(NBTTagCompound nbt) {
         name = nbt.getString("name");
         icon = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("icon"));
-        color = EnumColor.VALUES[nbt.getByte("color")];
+        color = EnumColor.values()[nbt.getByte("color")];
         id = nbt.getByte("id");
     }
 

src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java

@@ -69,7 +69,7 @@ class ComponentCompartmentInventory extends ComponentInventorySlots implements I
     }
 
     @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("comp-tabs")) {
             NBTTagList tags = nbt.getTagList("tabs", 10);
             for (int i = 0; i < tags.tagCount(); ++i) {

src/main/java/binnie/core/machines/storage/ModuleStorage.java

@@ -23,11 +23,6 @@ public class ModuleStorage implements IInitializable {
         BinnieCore.packageCompartment.setCreativeTab(CreativeTabs.tabBlock);
     }
 
-    @Override
-    public void init() {
-        // ignored
-    }
-
     @Override
     public void postInit() {
         String ironGear = OreDictionary.getOres("gearIron").isEmpty() ? "ingotIron" : "gearIron";

src/main/java/binnie/core/machines/storage/WindowCompartment.java

@@ -15,7 +15,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.core.AbstractMod;
 import binnie.core.BinnieCore;
@@ -43,7 +42,6 @@ import binnie.core.craftgui.geometry.Position;
 import binnie.core.craftgui.minecraft.Dialog;
 import binnie.core.craftgui.minecraft.EnumColor;
 import binnie.core.craftgui.minecraft.IWindowAffectsShiftClick;
-import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.MinecraftGUI;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
@@ -57,7 +55,6 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
 import binnie.core.craftgui.window.Panel;
 import binnie.core.machines.Machine;
 import binnie.core.machines.transfer.TransferRequest;
-import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.genetics.craftgui.WindowMachine;
 import cpw.mods.fml.relauncher.Side;
@@ -83,7 +80,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
 
     @Override
     public void initialiseClient() {
-        setTitle(Machine.getMachine(getInventory()).getPackage().getGuiDisplayName());
+        setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName());
         int x = 16;
         int y = 32;
         ComponentCompartmentInventory inv = Machine.getMachine(getInventory())
@@ -190,11 +187,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
             for (int k = 0; k < inv.getPageSize(); ++k) {
                 slotsIDs[k] = i++;
             }
-
-            final NBTTagList actions = new NBTTagList();
-            new ControlSlotArray(thisPage, 8, 8, inv.getPageSize() / 5, 5)
-                    .create(actions, InventoryType.Machine, slotsIDs);
-            MessageCraftGUI.sendToServer(actions);
+            new ControlSlotArray(thisPage, 8, 8, inv.getPageSize() / 5, 5).create(slotsIDs);
         }
         x += compartmentPageWidth;
         if (tabs2.length > 0) {
@@ -252,12 +245,12 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
 
         setSize(new IPoint(Math.max(32 + compartmentWidth, 252), h()));
         controlCompartment.setPosition(new IPoint((w() - controlCompartment.w()) / 2.0f, controlCompartment.y()));
-        new ControlPlayerInventory(this, true).createAndRegister();
+        new ControlPlayerInventory(this, true);
         ControlSlide slide = new ControlSlide(this, 0.0f, 134.0f, 136.0f, 92.0f, Position.LEFT);
         slide.setLabel(I18N.localise("binniecore.machine.storage.tab.properties"));
         slide.setSlide(false);
-        slide.addHelp(I18N.localise("binniecore.machine.storage.tab.properties"));
-        slide.addHelp(I18N.localise("binniecore.machine.storage.tab.properties.desc"));
+        slide.addHelp(I18N.localise("binniecore.machine.storage.tooltip.properties"));
+        slide.addHelp(I18N.localise("binniecore.machine.storage.tooltip.properties.desc"));
         Panel tabPropertyPanel = new Panel(slide, 16.0f, 8.0f, 112.0f, 76.0f, MinecraftGUI.PanelType.Gray);
         int y2 = 4;
         new ControlText(tabPropertyPanel, new IPoint(4.0f, y2), I18N.localise("binniecore.machine.storage.tab.name"));
@@ -320,7 +313,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
                     1 + cw * (cc / 8),
                     cw,
                     cw,
-                    EnumColor.VALUES[cc]);
+                    EnumColor.values()[cc]);
             color.addSelfEventHandler(new EventMouse.Down.Handler() {
 
                 @Override
@@ -374,7 +367,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
                 };
                 slotGrid = new Control(scroll, 1.0f, 1.0f, 108.0f, 18.0f);
                 scroll.setScrollableContent(slotGrid);
-                new ControlPlayerInventory(this, true).createAndRegister();
+                new ControlPlayerInventory(this, true);
                 new ControlTextEdit(this, 16.0f, 16.0f, 100.0f, 14.0f).addEventHandler(new EventTextEdit.Handler() {
 
                     @Override
@@ -466,10 +459,8 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
                 slotGrid.deleteAllChildren();
                 slotGrid.setSize(new IPoint(width, height));
 
-                final NBTTagList actions = new NBTTagList();
-
                 for (int k : slotIds.keySet()) {
-                    new ControlSlot(slotGrid, x, y).assign(actions, InventoryType.Machine, k);
+                    new ControlSlot(slotGrid, x, y).assign(k);
                     x += 18;
                     if (x >= 108) {
                         x = 0;
@@ -477,8 +468,6 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
                     }
                 }
 
-                MessageCraftGUI.sendToServer(actions);
-
                 while (y < 108 || x != 0) {
                     new ControlSlot(slotGrid, x, y);
                     x += 18;
@@ -499,16 +488,14 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
 
     public void updateTabs() {
         CompartmentTab tab = getCurrentTab();
-        if (!tabName.isFocused()) {
-            tabName.setValue(tab.getName());
-        }
+        tabName.setValue(tab.getName());
         tabIcon.setItemStack(tab.getIcon());
         tabColour.setValue(tab.getColor());
     }
 
     @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 (name.equals("tab-change")) {
             currentTab = nbt.getByte("i");
         }

src/main/java/binnie/core/network/BinnieCorePacketID.java

@@ -1,7 +1,6 @@
 package binnie.core.network;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraft.tileentity.TileEntity;
 
@@ -28,71 +27,41 @@ public enum BinnieCorePacketID implements IPacketID {
 
     @Override
     public void onMessage(MessageBinnie message, MessageContext context) {
-        switch (this) {
-            case NetworkEntityUpdate -> processNetworkEntityUpdate(message);
-            case TileMetadata -> processTileMetadata(message);
-            case CraftGUIAction -> processCraftGUIAction(message, context);
-            case TileDescriptionSync -> processTileDescriptionSync(message, context);
-        }
-    }
-
-    private static void processNetworkEntityUpdate(MessageBinnie message) {
-        final MessageUpdate packet = new MessageUpdate(message);
-        final TileEntity tile = packet.getTileEntity(BinnieCore.proxy.getWorld());
-
-        if (tile instanceof INetworkedEntity iNetworkedEntity) {
-            iNetworkedEntity.readFromPacket(packet.payload);
-        }
-    }
-
-    private static void processTileMetadata(MessageBinnie message) {
-        final MessageMetadata packet = new MessageMetadata(message);
-        final TileEntity tile = packet.getTileEntity(BinnieCore.proxy.getWorld());
-
-        if (tile instanceof TileEntityMetadata tileEntityMetadata) {
-            tileEntityMetadata.setTileMetadata(packet.meta, true);
-        }
-    }
-
-    private static void processCraftGUIAction(MessageBinnie message, MessageContext context) {
-        final MessageCraftGUI packet = new MessageCraftGUI(message);
-        final NBTTagCompound tagCompound = packet.getTagCompound();
-
-        if (tagCompound == null) return;
-
-        if (context.side == Side.CLIENT) {
-            final EntityPlayer player = BinnieCore.proxy.getPlayer();
-
-            if (player.openContainer instanceof ContainerCraftGUI gui) {
-                gui.receiveNBT(Side.CLIENT, player, tagCompound);
+        if (this == BinnieCorePacketID.NetworkEntityUpdate) {
+            MessageUpdate packet = new MessageUpdate(message);
+            TileEntity tile = packet.getTileEntity(BinnieCore.proxy.getWorld());
+            if (tile instanceof INetworkedEntity) {
+                ((INetworkedEntity) tile).readFromPacket(packet.payload);
             }
-        } else {
-            if (context.netHandler instanceof NetHandlerPlayServer server) {
-                final EntityPlayer player = server.playerEntity;
-
-                if (player.openContainer instanceof ContainerCraftGUI gui) {
-                    gui.receiveNBT(Side.SERVER, player, tagCompound);
+        } else if (this == BinnieCorePacketID.TileMetadata) {
+            MessageMetadata packet = new MessageMetadata(message);
+            TileEntity tile = packet.getTileEntity(BinnieCore.proxy.getWorld());
+            if (tile instanceof TileEntityMetadata) {
+                ((TileEntityMetadata) tile).setTileMetadata(packet.meta, true);
+            }
+        } else if (this == BinnieCorePacketID.CraftGUIAction) {
+            if (context.side == Side.CLIENT) {
+                MessageCraftGUI packet = new MessageCraftGUI(message);
+                EntityPlayer player = BinnieCore.proxy.getPlayer();
+                if (player.openContainer instanceof ContainerCraftGUI && packet.getTagCompound() != null) {
+                    ((ContainerCraftGUI) player.openContainer).recieveNBT(Side.CLIENT, player, packet.getTagCompound());
+                }
+            } else if (context.netHandler instanceof NetHandlerPlayServer) {
+                MessageCraftGUI packet = new MessageCraftGUI(message);
+                EntityPlayer player = ((NetHandlerPlayServer) context.netHandler).playerEntity;
+                if (player.openContainer instanceof ContainerCraftGUI && packet.getTagCompound() != null) {
+                    ((ContainerCraftGUI) player.openContainer).recieveNBT(Side.SERVER, player, packet.getTagCompound());
+                }
+            }
+        } else if (this == BinnieCorePacketID.TileDescriptionSync && context.side == Side.CLIENT) {
+            MessageTileNBT packet = new MessageTileNBT(message);
+            TileEntity tile = packet.getTarget(BinnieCore.proxy.getWorld());
+            if (tile != null && packet.getTagCompound() != null) {
+                IMachine machine = Machine.getMachine(tile);
+                if (machine instanceof INetwork.TilePacketSync tps) {
+                    tps.syncFromNBT(packet.getTagCompound());
                 }
             }
         }
     }
-
-    private static void processTileDescriptionSync(MessageBinnie message, MessageContext context) {
-        if (!context.side.isClient()) return;
-
-        final MessageTileNBT packet = new MessageTileNBT(message);
-        final NBTTagCompound tagCompound = packet.getTagCompound();
-
-        if (tagCompound == null) return;
-
-        final TileEntity tile = packet.getTarget(BinnieCore.proxy.getWorld());
-
-        if (tile == null) return;
-
-        final IMachine machine = Machine.getMachine(tile);
-
-        if (machine instanceof INetwork.TilePacketSync tps) {
-            tps.syncFromNBT(tagCompound);
-        }
-    }
 }

src/main/java/binnie/core/network/packet/MessageCraftGUI.java

@@ -1,13 +1,7 @@
 package binnie.core.network.packet;
 
-import static binnie.core.craftgui.minecraft.ContainerCraftGUI.ACTIONS;
-import static binnie.core.craftgui.minecraft.ContainerCraftGUI.ACTION_BATCH;
-import static binnie.core.craftgui.minecraft.ContainerCraftGUI.ACTION_TYPE;
-
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
 
-import binnie.core.BinnieCore;
 import binnie.core.network.BinnieCorePacketID;
 
 public class MessageCraftGUI extends MessageNBT {
@@ -19,12 +13,4 @@ public class MessageCraftGUI extends MessageNBT {
     public MessageCraftGUI(NBTTagCompound action) {
         super(BinnieCorePacketID.CraftGUIAction.ordinal(), action);
     }
-
-    public static void sendToServer(NBTTagList actions) {
-        NBTTagCompound actionsBatch = new NBTTagCompound();
-        actionsBatch.setString(ACTION_TYPE, ACTION_BATCH);
-        actionsBatch.setTag(ACTIONS, actions);
-        final MessageCraftGUI packet = new MessageCraftGUI(actionsBatch);
-        BinnieCore.proxy.sendToServer(packet);
-    }
 }

src/main/java/binnie/core/proxy/BinnieModProxy.java

@@ -44,19 +44,4 @@ public class BinnieModProxy implements IBinnieModProxy {
     public IIcon getIcon(IIconRegister register, String string) {
         return BinnieCore.proxy.getIcon(register, mod.getModID(), string);
     }
-
-    @Override
-    public void preInit() {
-        // ignored
-    }
-
-    @Override
-    public void init() {
-        // ignored
-    }
-
-    @Override
-    public void postInit() {
-        // ignored
-    }
 }

src/main/java/binnie/core/triggers/ModuleTrigger.java

@@ -6,11 +6,6 @@ import buildcraft.api.statements.StatementManager;
 
 public class ModuleTrigger implements IInitializable {
 
-    @Override
-    public void preInit() {
-        // ignored
-    }
-
     @Override
     public void init() {
         BinnieAction.actionPauseProcess = new BinnieAction(
@@ -80,8 +75,4 @@ public class ModuleTrigger implements IInitializable {
         StatementManager.registerTriggerProvider(new TriggerProvider());
     }
 
-    @Override
-    public void postInit() {
-        // ignored
-    }
 }

src/main/java/binnie/extrabees/ExtraBees.java

@@ -2,6 +2,8 @@ package binnie.extrabees;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+import net.minecraft.init.Items;
+import net.minecraftforge.oredict.OreDictionary;
 
 import com.gtnewhorizon.gtnhlib.config.ConfigException;
 import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
@@ -10,7 +12,6 @@ import binnie.core.AbstractMod;
 import binnie.core.BinnieCore;
 import binnie.core.Tags;
 import binnie.core.gui.IBinnieGUID;
-import binnie.core.item.ItemMisc;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.proxy.IProxyCore;
 import binnie.extrabees.apiary.ModuleApiary;
@@ -18,29 +19,29 @@ import binnie.extrabees.config.EBConfig;
 import binnie.extrabees.core.ExtraBeeGUID;
 import binnie.extrabees.core.ModuleCore;
 import binnie.extrabees.genetics.ModuleGenetics;
-import binnie.extrabees.genetics.items.ItemDictionary;
 import binnie.extrabees.liquids.ModuleLiquids;
-import binnie.extrabees.products.ItemHoneyComb;
-import binnie.extrabees.products.ItemHoneyDrop;
-import binnie.extrabees.products.ItemPropolis;
+import binnie.extrabees.products.CombItems;
 import binnie.extrabees.products.ModuleProducts;
 import binnie.extrabees.proxy.ExtraBeesProxy;
 import binnie.extrabees.worldgen.ModuleGeneration;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.registry.GameRegistry;
 
 @Mod(
         modid = ExtraBees.EB_MODID,
         name = ExtraBees.EB_MOD_NAME,
         version = Tags.VERSION,
         useMetadata = true,
-        dependencies = "after:BinnieCore")
+        dependencies = "after:BinnieCore",
+        guiFactory = "binnie.extrabees.config.EBConfigGUIFactory")
 public class ExtraBees extends AbstractMod {
 
-    public static final String EB_MODID = "ExtraBees";
+    public static final String EB_MODID = "extrabees";
     public static final String EB_MOD_NAME = "Extra Bees";
 
     @Mod.Instance("ExtraBees")
@@ -62,11 +63,6 @@ public class ExtraBees extends AbstractMod {
     public static Block hive;
     public static Material materialBeehive;
     public static Block ectoplasm;
-    public static ItemHoneyComb comb;
-    public static ItemPropolis propolis;
-    public static ItemHoneyDrop honeyDrop;
-    public static ItemDictionary dictionary;
-    public static ItemMisc itemMisc;
 
     public ExtraBees() {
         ExtraBees.instance = this;
@@ -85,6 +81,13 @@ public class ExtraBees extends AbstractMod {
 
     @Mod.EventHandler
     public void init(FMLInitializationEvent event) {
+        OreDictionary.registerOre("ingotIron", Items.iron_ingot);
+        OreDictionary.registerOre("ingotGold", Items.gold_ingot);
+        OreDictionary.registerOre("gemDiamond", Items.diamond);
+        OreDictionary.registerOre("gemEmerald", Items.emerald);
+
+        CombItems.addSubtypes();
+
         init();
     }
 
@@ -93,6 +96,19 @@ public class ExtraBees extends AbstractMod {
         postInit();
     }
 
+    @Mod.EventHandler
+    public void missingMappings(FMLMissingMappingsEvent event) {
+        for (FMLMissingMappingsEvent.MissingMapping m : event.getAll()) {
+            final String[] name = m.name.split(":");
+            if (name.length < 2) continue;
+
+            if (name[0].equals("ExtraBees")) {
+                if (m.type == GameRegistry.Type.BLOCK) m.remap(GameRegistry.findBlock(EB_MODID, name[1]));
+                else m.remap(GameRegistry.findItem(EB_MODID, name[1]));
+            }
+        }
+    }
+
     @Override
     public IBinnieGUID[] getGUIDs() {
         return ExtraBeeGUID.values();
@@ -110,7 +126,7 @@ public class ExtraBees extends AbstractMod {
 
     @Override
     public String getModID() {
-        return "extrabees";
+        return EB_MODID;
     }
 
     @Override

src/main/java/binnie/extrabees/apiary/ModuleApiary.java

@@ -34,12 +34,12 @@ public class ModuleApiary implements IInitializable {
                 BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"));
         ModuleApiary.blockComponent = machineGroup.getBlock();
         AlvearyMutator.addMutationItem(new ItemStack(Blocks.soul_sand), 1.5f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("itemUran"), 8.0f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("itemPlutonium"), 15.0f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("itemPlutoniumSmall"), 9.0f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("itemUran235"), 10.0f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("itemUran235small"), 5.5f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("itemUran238"), 2.0f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("UranFuel"), 8.0f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("Plutonium"), 15.0f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("smallPlutonium"), 9.0f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("Uran235"), 10.0f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("smallUran235"), 5.5f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("Uran238"), 2.0f);
         AlvearyMutator.addMutationItem(new ItemStack(Items.nether_star), 50.0f);
         AlvearyMutator.addMutationItem(new ItemStack(Items.ender_pearl), 2.0f);
         AlvearyMutator.addMutationItem(new ItemStack(Items.ender_eye), 4.0f);

src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java

@@ -6,23 +6,14 @@ import java.util.List;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.util.Vec3;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
 
 import com.mojang.authlib.GameProfile;
 
 import binnie.core.machines.TileEntityMachine;
 import binnie.extrabees.apiary.machine.AlvearyMachine;
 import forestry.api.apiculture.IBeeGenome;
-import forestry.api.apiculture.IBeeHousing;
-import forestry.api.apiculture.IBeeHousingInventory;
 import forestry.api.apiculture.IBeeListener;
 import forestry.api.apiculture.IBeeModifier;
-import forestry.api.apiculture.IBeekeepingLogic;
-import forestry.api.core.EnumHumidity;
-import forestry.api.core.EnumTemperature;
-import forestry.api.core.IErrorLogic;
 import forestry.api.genetics.IIndividual;
 import forestry.api.multiblock.IAlvearyComponent;
 import forestry.api.multiblock.IMultiblockComponent;
@@ -30,7 +21,7 @@ import forestry.api.multiblock.IMultiblockController;
 import forestry.api.multiblock.IMultiblockLogicAlveary;
 import forestry.api.multiblock.MultiblockManager;
 
-public class TileExtraBeeAlveary extends TileEntityMachine implements IBeeHousing, IAlvearyComponent.Active,
+public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyComponent.Active,
         IAlvearyComponent.BeeModifier, IAlvearyComponent.BeeListener, IBeeListener, IBeeModifier {
 
     protected IMultiblockLogicAlveary structureLogic;
@@ -51,51 +42,11 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IBeeHousin
         return new ChunkCoordinates(xCoord, yCoord, zCoord);
     }
 
-    @Override
-    public Iterable<IBeeModifier> getBeeModifiers() {
-        return getMultiblockLogic().getController().getBeeModifiers();
-    }
-
-    @Override
-    public Iterable<IBeeListener> getBeeListeners() {
-        return getMultiblockLogic().getController().getBeeListeners();
-    }
-
-    @Override
-    public IBeeHousingInventory getBeeInventory() {
-        return getMultiblockLogic().getController().getBeeInventory();
-    }
-
-    @Override
-    public IBeekeepingLogic getBeekeepingLogic() {
-        return getMultiblockLogic().getController().getBeekeepingLogic();
-    }
-
-    @Override
-    public int getBlockLightValue() {
-        return getMultiblockLogic().getController().getBlockLightValue();
-    }
-
-    @Override
-    public boolean canBlockSeeTheSky() {
-        return getMultiblockLogic().getController().canBlockSeeTheSky();
-    }
-
-    @Override
-    public World getWorld() {
-        return null;
-    }
-
     @Override
     public GameProfile getOwner() {
         return getMachine().getOwner();
     }
 
-    @Override
-    public Vec3 getBeeFXCoordinates() {
-        return getMultiblockLogic().getController().getBeeFXCoordinates();
-    }
-
     public List<TileEntity> getAlvearyBlocks() {
         LinkedList<TileEntity> tiles = new LinkedList<>();
         if (min == null || max == null) {
@@ -275,26 +226,6 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IBeeHousin
         }
     }
 
-    @Override
-    public BiomeGenBase getBiome() {
-        return getMultiblockLogic().getController().getBiome();
-    }
-
-    @Override
-    public EnumTemperature getTemperature() {
-        return getMultiblockLogic().getController().getTemperature();
-    }
-
-    @Override
-    public EnumHumidity getHumidity() {
-        return getMultiblockLogic().getController().getHumidity();
-    }
-
-    @Override
-    public IErrorLogic getErrorLogic() {
-        return getMultiblockLogic().getController().getErrorLogic();
-    }
-
     // TODO why its commented?
     // boolean init;
     // //IStructureLogic structureLogic;

src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java

@@ -1,5 +1,6 @@
 package binnie.extrabees.apiary.machine;
 
+import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
@@ -65,7 +66,8 @@ public enum AlvearyMachine implements IMachineType {
         }
 
         @Override
-        public void renderMachine(Machine machine, double x, double y, double z, float partialTick) {
+        public void renderMachine(Machine machine, double x, double y, double z, float partialTick,
+                RenderBlocks renderer) {
             MachineRendererBlock.instance.renderMachine(machineTexture, x, y, z, partialTick);
         }
     }