update +sa

Fix missing pixels in ceramic tiles

Fix rendering of ceramic tiles

Fix crashes of rendering ceramic tiles and breaking ceramic tiles

Add config option to disable compartments

dependencies.gradle

@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.6.39:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.11.4:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.9.20:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.90-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.68-GTNH:dev')
 
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.55:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

gradle.properties

@@ -39,9 +39,33 @@ 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 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 modern Java syntax support. Valid values:
+# - false: No modern syntax, Java 8 only
+# - jabel: Jabel syntax-only support, compiles to J8 bytecode
+# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
+# - modern: Native modern Java bytecode, no downgrading
+enableModernJavaSyntax = jabel
+
+# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
+# and should *not* be used in most situations. -1 disables this.
+# forceToolchainVersion = -1
+
+# Target JVM version for JVM Downgrader bytecode downgrading.
+# Only used when enableModernJavaSyntax = jvmDowngrader
+# downgradeTargetVersion = 8
+
+# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
+# Classes will be available in META-INF/versions/N/ for each version N in this list.
+# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
+# jvmDowngraderMultiReleaseVersions = 21,25
+
+# Specifies how JVM Downgrader API stubs are provided. Options:
+# - shade: Shade minimized stubs into the jar
+# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
+# - external: Another dependency provides stubs (no constraint, no warning)
+# - (empty): Warning reminding you to configure stubs
+# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
+# jvmDowngraderStubsProvider =
 
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
@@ -96,7 +120,9 @@ usesMixinDebug = false
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
 
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage =
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
@@ -172,6 +198,12 @@ 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

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e1118b4c7c2858d28154d086dbff010e/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/59a9771cad43219260d9aac9a8ec4d6a/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/832229f0f6f0be60ed817c5a5e5848eb/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/b96cb7670c095245220e7d01d5927b58/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-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

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

settings.gradle

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

src/main/java/binnie/Binnie.java

@@ -5,7 +5,6 @@ import java.util.List;
 
 import binnie.core.ManagerBase;
 import binnie.core.genetics.ManagerGenetics;
-import binnie.core.item.ManagerItem;
 import binnie.core.liquid.ManagerLiquid;
 import binnie.core.machines.ManagerMachine;
 import binnie.core.resource.ManagerResource;
@@ -16,6 +15,5 @@ public final class Binnie {
     public static ManagerGenetics Genetics = new ManagerGenetics();
     public static ManagerLiquid Liquid = new ManagerLiquid();
     public static ManagerMachine Machine = new ManagerMachine();
-    public static ManagerItem Item = new ManagerItem();
     public static ManagerResource Resource = new ManagerResource();
 }

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

@@ -64,32 +64,37 @@ public class Botany extends AbstractMod {
     @SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer")
     public static Proxy proxy;
 
+    // Genetics module
     public static BlockFlower flower;
-    public static Item seed;
+
+    public static ItemFlower flowerItem;
     public static Item pollen;
+    public static Item seed;
     public static ItemDictionary database;
+
+    // Gardening module
     public static BlockPlant plant;
-    public static ItemTrowel trowelWood;
-    public static ItemTrowel trowelStone;
-    public static ItemTrowel trowelIron;
-    public static ItemTrowel trowelDiamond;
-    public static ItemTrowel trowelGold;
     public static BlockSoil soil;
     public static BlockSoil loam;
     public static BlockSoil flowerbed;
     public static BlockSoil soilNoWeed;
     public static BlockSoil loamNoWeed;
     public static BlockSoil flowerbedNoWeed;
-    public static ItemInsulatedTube insulatedTube;
+    public static BlockCeramic ceramic;
+    public static BlockStained stained;
+    public static BlockCeramicPatterned ceramicTile;
+    public static BlockCeramicBrick ceramicBrick;
+
     public static ItemSoilMeter soilMeter;
+    public static ItemInsulatedTube insulatedTube;
+    public static ItemTrowel trowelWood;
+    public static ItemTrowel trowelStone;
+    public static ItemTrowel trowelIron;
+    public static ItemTrowel trowelDiamond;
+    public static ItemTrowel trowelGold;
     public static ItemMisc misc;
-    public static ItemFlower flowerItem;
     public static ItemPigment pigment;
     public static ItemClay clay;
-    public static BlockCeramic ceramic;
-    public static BlockCeramicPatterned ceramicTile;
-    public static BlockStained stained;
-    public static BlockCeramicBrick ceramicBrick;
 
     public Botany() {
         Botany.instance = this;

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

@@ -167,7 +167,16 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
     @Override
     @SideOnly(Side.CLIENT)
     public int getRenderColor(int meta) {
-        return colorMultiplier(meta);
+        final BlockType type = this.getType(meta);
+        if (!MultipassBlockRenderer.isRendering()) {
+            return type.color1.getColor(false);
+        }
+
+        final int layer = MultipassBlockRenderer.getLayer();
+        if (layer == 0) return 0xffffff;
+        if (layer == 1) return type.color1.getColor(false);
+        if (layer == 2) return type.color2.getColor(false);
+        return 0xffffff;
     }
 
     @Override

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

@@ -1,5 +1,7 @@
 package binnie.botany.flower;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.block.Block;
@@ -39,6 +41,8 @@ public abstract class ItemBotany extends Item {
         setCreativeTab(CreativeTabBotany.instance);
         setUnlocalizedName(name);
         hasSubtypes = true;
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

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

@@ -1,5 +1,7 @@
 package binnie.botany.flower;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -25,6 +27,8 @@ public class ItemInsulatedTube extends Item {
         setUnlocalizedName("insulatedTube");
         setCreativeTab(CreativeTabBotany.instance);
         setHasSubtypes(true);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     public static ItemStack getInsulateStack(ItemStack stack) {

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

@@ -1,5 +1,7 @@
 package binnie.botany.gardening;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -28,6 +30,8 @@ public class ItemSoilMeter extends Item {
         setCreativeTab(CreativeTabBotany.instance);
         setUnlocalizedName("soilMeter");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

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

@@ -1,5 +1,7 @@
 package binnie.botany.gardening;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -28,6 +30,8 @@ public class ItemTrowel extends Item {
         setCreativeTab(CreativeTabBotany.instance);
         setUnlocalizedName("trowel" + material);
         locName = "trowel" + material;
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

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

@@ -12,7 +12,6 @@ import net.minecraftforge.oredict.RecipeSorter;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
-import binnie.Binnie;
 import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
 import binnie.botany.api.EnumAcidity;
@@ -37,6 +36,7 @@ import binnie.core.block.ItemMetadata;
 import binnie.core.block.ItemMetadataRenderer;
 import binnie.core.block.MultipassItemRenderer;
 import binnie.core.block.TileEntityMetadata;
+import binnie.core.item.ItemMisc;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class ModuleGardening implements IInitializable {
@@ -75,7 +75,7 @@ public class ModuleGardening implements IInitializable {
         Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron");
         Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.EMERALD, "Diamond");
         Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold");
-        Botany.misc = Binnie.Item.registerMiscItems(BotanyItems.values(), CreativeTabBotany.instance);
+        Botany.misc = new ItemMisc(CreativeTabBotany.instance, BotanyItems.values());
         Botany.pigment = new ItemPigment();
         Botany.clay = new ItemClay();
 

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

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

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

@@ -1,5 +1,7 @@
 package binnie.botany.items;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -22,6 +24,8 @@ public class ItemClay extends Item {
         setUnlocalizedName("clay");
         setHasSubtypes(true);
         setCreativeTab(CreativeTabBotany.instance);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

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

@@ -1,5 +1,7 @@
 package binnie.botany.items;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -22,6 +24,8 @@ public class ItemPigment extends Item {
         setUnlocalizedName("pigment");
         setHasSubtypes(true);
         setCreativeTab(CreativeTabBotany.instance);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

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

@@ -1,13 +1,9 @@
 package binnie.core;
 
-import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
 import java.util.List;
 
 import binnie.core.gui.IBinnieGUID;
-import binnie.core.mod.parser.FieldParser;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
 import binnie.core.network.IPacketProvider;
@@ -20,11 +16,9 @@ import cpw.mods.fml.relauncher.Side;
 public abstract class AbstractMod implements IPacketProvider, IInitializable {
 
     private SimpleNetworkWrapper wrapper;
-    private final LinkedHashSet<Field> fields;
     protected final List<IInitializable> modules;
 
     public AbstractMod() {
-        fields = new LinkedHashSet<>();
         modules = new ArrayList<>();
         BinnieCore.registerMod(this);
     }
@@ -65,22 +59,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
         for (IInitializable module : modules) {
             module.preInit();
         }
-
-        // TODO what does it mean?
-        Collections.addAll(fields, getClass().getFields());
-        for (Class<?> cls : getClass().getClasses()) {
-            Collections.addAll(fields, getClass().getFields());
-        }
-        for (IInitializable module : modules) {
-            Collections.addAll(fields, module.getClass().getFields());
-        }
-        for (Field field4 : fields) {
-            try {
-                FieldParser.preInitParse(field4, this);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
     }
 
     @Override
@@ -96,14 +74,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
         for (IInitializable module : modules) {
             module.init();
         }
-
-        for (Field field : fields) {
-            try {
-                FieldParser.initParse(field, this);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
     }
 
     @Override
@@ -116,14 +86,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
         for (IInitializable module : modules) {
             module.postInit();
         }
-
-        for (Field field : fields) {
-            try {
-                FieldParser.postInitParse(field, this);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
     }
 
     protected void addModule(IInitializable init) {

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

@@ -12,6 +12,7 @@ import net.minecraftforge.common.MinecraftForge;
 import binnie.Binnie;
 import binnie.core.block.MultipassBlockRenderer;
 import binnie.core.block.TileEntityMetadata;
+import binnie.core.config.BCConfig;
 import binnie.core.craftgui.minecraft.ModuleCraftGUI;
 import binnie.core.gui.BinnieCoreGUI;
 import binnie.core.gui.BinnieGUIHandler;
@@ -22,8 +23,6 @@ import binnie.core.liquid.FluidContainer;
 import binnie.core.liquid.ItemFluidContainer;
 import binnie.core.machines.MachineGroup;
 import binnie.core.machines.storage.ModuleStorage;
-import binnie.core.mod.parser.FieldParser;
-import binnie.core.mod.parser.ItemParser;
 import binnie.core.network.BinnieCorePacketID;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
@@ -80,7 +79,9 @@ public class BinnieCore extends AbstractMod {
         }
 
         addModule(new ModuleCraftGUI());
-        addModule(new ModuleStorage());
+        if (!BCConfig.disableCompartments) {
+            addModule(new ModuleStorage());
+        }
         addModule(new ModuleItems());
         if (Loader.isModLoaded("BuildCraft|Silicon")) {
             addModule(new ModuleTrigger());
@@ -110,7 +111,6 @@ public class BinnieCore extends AbstractMod {
             Item item = new ItemFluidContainer(container);
             GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
         }
-        FieldParser.parsers.add(new ItemParser());
         super.preInit();
     }
 

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

@@ -14,6 +14,7 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
 
     public static MultipassBlockRenderer instance;
     private static int layer = 0;
+    private static boolean rendering = false;
 
     public MultipassBlockRenderer() {
         MultipassBlockRenderer.instance = this;
@@ -23,30 +24,67 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
         return MultipassBlockRenderer.layer;
     }
 
+    public static boolean isRendering() {
+        return MultipassBlockRenderer.rendering;
+    }
+
+    private static int getPassesSafe(Block block) {
+        try {
+            return ((IMultipassBlock) block).getNumberOfPasses();
+        } catch (Throwable t) {
+            return 1;
+        }
+    }
+
+    private static int getColorSafe(Block block, int meta) {
+        try {
+            if (block instanceof IMultipassBlock) {
+                try {
+                    java.lang.reflect.Method m = block.getClass().getMethod("colorMultiplier", int.class);
+                    Object out = m.invoke(block, Integer.valueOf(meta));
+                    if (out instanceof Integer) {
+                        return ((Integer) out).intValue();
+                    }
+                } catch (Throwable ignored) {}
+            }
+            return block.getRenderColor(meta);
+        } catch (Throwable t) {
+            return 16777215;
+        }
+    }
+
     @Override
     public void renderInventoryBlock(Block block, int meta, int modelID, RenderBlocks renderer) {
         block.setBlockBoundsForItemRender();
         renderer.setRenderBoundsFromBlock(block);
         GL11.glTranslatef(-0.5f, -0.5f, -0.5f);
 
+        MultipassBlockRenderer.rendering = true;
         MultipassBlockRenderer.layer = 0;
-        while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) {
+        while (MultipassBlockRenderer.layer < getPassesSafe(block)) {
             renderItem(block, renderer, meta);
             MultipassBlockRenderer.layer++;
         }
         MultipassBlockRenderer.layer = 0;
+        MultipassBlockRenderer.rendering = false;
     }
 
     @Override
     public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
             RenderBlocks renderer) {
         boolean r = true;
+        MultipassBlockRenderer.rendering = true;
         MultipassBlockRenderer.layer = 0;
-        while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) {
-            r = renderer.renderStandardBlock(block, x, y, z);
+        while (MultipassBlockRenderer.layer < getPassesSafe(block)) {
+            try {
+                r = renderer.renderStandardBlock(block, x, y, z);
+            } catch (Throwable t) {
+                return false;
+            }
             MultipassBlockRenderer.layer++;
         }
         MultipassBlockRenderer.layer = 0;
+        MultipassBlockRenderer.rendering = false;
         return r;
     }
 
@@ -61,7 +99,7 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
     }
 
     public void renderItem(Block block, RenderBlocks renderer, int meta) {
-        setColor(((IMultipassBlock) block).colorMultiplier(meta));
+        setColor(getColorSafe(block, meta));
         Tessellator tessellator = Tessellator.instance;
         tessellator.startDrawingQuads();
         tessellator.setNormal(0.0f, -1.0f, 0.0f);

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

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

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

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

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

@@ -12,6 +12,7 @@ import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.Binnie;
 import binnie.core.AbstractMod;
@@ -33,6 +34,7 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
 import binnie.core.craftgui.resource.minecraft.PaddedTexture;
 import binnie.core.craftgui.resource.minecraft.StandardTexture;
 import binnie.core.machines.inventory.SlotValidator;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.extrabees.core.ExtraBeeTexture;
 import binnie.extrabees.gui.ExtraBeeGUITexture;
@@ -113,20 +115,26 @@ public class WindowFieldKit extends Window {
 
     @Override
     public void initialiseClient() {
+        final NBTTagList actions = new NBTTagList();
+
         setTitle(getName());
         CraftGUI.render.stylesheet(new StyleSheetPunnett());
         getWindowInventory().createSlot(0);
         getWindowInventory().createSlot(1);
         setupValidators();
-        new ControlPlayerInventory(this);
+        new ControlPlayerInventory(this).create(actions);
         IPoint handGlass = new IPoint(16.0f, 32.0f);
         GlassControl = new ControlImage(
                 this,
                 handGlass.x(),
                 handGlass.y(),
                 new StandardTexture(0, 160, 96, 96, ExtraBeeTexture.GUIPunnett));
-        new ControlSlot(this, handGlass.x() + 54.0f, handGlass.y() + 26.0f).assign(InventoryType.Window, 0);
-        new ControlSlot(this, 208.0f, 8.0f).assign(InventoryType.Window, 1);
+
+        new ControlSlot(this, handGlass.x() + 54.0f, handGlass.y() + 26.0f).assign(actions, InventoryType.Window, 0);
+        new ControlSlot(this, 208.0f, 8.0f).assign(actions, InventoryType.Window, 1);
+
+        MessageCraftGUI.sendToServer(actions);
+
         (text = new ControlText(this, new IPoint(232.0f, 13.0f), I18N.localise("binniecore.gui.tooltip.paper")))
                 .setColor(0x222222);
         (text = new ControlText(this, new IArea(0.0f, 120.0f, w(), 24.0f), "", TextJustification.MIDDLE_CENTER))

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

@@ -63,7 +63,7 @@ public class WindowGenesis extends Window {
 
     @Override
     public void initialiseClient() {
-        new ControlPlayerInventory(this);
+        new ControlPlayerInventory(this).createAndRegister();
         setTitle(getName());
 
         ControlTabBar<BreedingSystem> tabSystems = new BreedingSystemControlTabBar();

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

@@ -1,5 +1,7 @@
 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;
@@ -14,6 +16,7 @@ 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;
 
@@ -37,6 +40,42 @@ 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<>();
@@ -64,8 +103,8 @@ public class ContainerCraftGUI extends Container {
         if (user == null) return;
 
         NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setString("username", user.getName());
-        sendNBTToClient("username", nbt);
+        nbt.setString(USERNAME, user.getName());
+        sendNBTToClient(USERNAME, nbt);
     }
 
     @Override
@@ -84,17 +123,15 @@ public class ContainerCraftGUI extends Container {
 
     @Override
     public void putStackInSlot(int index, ItemStack stack) {
-        if (getSlot(index) != null) {
-            getSlot(index).putStack(stack);
-        }
+        final Slot slot = getSlot(index);
+        if (slot != null) slot.putStack(stack);
     }
 
     @Override
     public void putStacksInSlots(ItemStack[] par1ArrayOfItemStack) {
         for (int i = 0; i < par1ArrayOfItemStack.length; ++i) {
-            if (getSlot(i) != null) {
-                getSlot(i).putStack(par1ArrayOfItemStack[i]);
-            }
+            final Slot slot = getSlot(i);
+            if (slot != null) slot.putStack(par1ArrayOfItemStack[i]);
         }
     }
 
@@ -145,20 +182,17 @@ public class ContainerCraftGUI extends Container {
 
     @Override
     public ItemStack transferStackInSlot(EntityPlayer player, int slotID) {
-        return shiftClick(player, slotID);
+        shiftClick(player, slotID);
+        return null;
     }
 
-    private ItemStack shiftClick(EntityPlayer player, int index) {
+    private void shiftClick(EntityPlayer player, int index) {
         TransferRequest request = getShiftClickRequest(player, index);
-        if (request == null) {
-            return null;
-        }
-
+        if (request == null) return;
         ItemStack stack = request.transfer(true);
         Slot shiftClickedSlot = inventorySlots.get(index);
         shiftClickedSlot.putStack(stack);
         shiftClickedSlot.onSlotChanged();
-        return null;
     }
 
     private TransferRequest getShiftClickRequest(EntityPlayer player, int index) {
@@ -211,15 +245,18 @@ public class ContainerCraftGUI extends Container {
         return heldItem;
     }
 
-    public void handleNBT(Side side, EntityPlayer player, String name, NBTTagCompound action) {
+    public void handleNBT(Side side, EntityPlayer player, NBTTagCompound action) {
+        final String actionType = action.getString(ACTION_TYPE);
+
         if (side == Side.SERVER) {
-            switch (name) {
-                case "tank-click" -> tankClick(player, action.getByte("id"));
-                case "slot-reg" -> {
-                    int type = action.getByte("t");
-                    int index = action.getShort("i");
-                    int slotNumber = action.getShort("n");
-                    createSlot(InventoryType.values()[type % 4], index, slotNumber);
+            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);
+
+                    createSlot(InventoryType.values()[slotType % 4], slotIndex, slotNumber);
 
                     for (ICrafting crafterObject : crafters) {
                         crafterObject.sendContainerAndContentsToPlayer(this, getInventory());
@@ -228,14 +265,14 @@ public class ContainerCraftGUI extends Container {
             }
         }
 
-        switch (name) {
-            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(player, action);
+        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 (name.contains("tank-update")) onTankUpdate(action);
+                if (actionType.contains(TANK_UPDATE)) onTankUpdate(action);
             }
         }
     }
@@ -255,15 +292,15 @@ public class ContainerCraftGUI extends Container {
             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));
+                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) 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));
         }
 
         INetwork.SendGuiNBT machineSync = Machine.getInterface(INetwork.SendGuiNBT.class, entityInventory);
@@ -271,23 +308,30 @@ public class ContainerCraftGUI extends Container {
         if (machineSync != null) machineSync.sendGuiNBT(syncedNBT);
 
         Map<String, NBTTagCompound> sentThisTime = new HashMap<>();
-        for (Map.Entry<String, NBTTagCompound> nbt : syncedNBT.entrySet()) {
-            final NBTTagCompound nbtValue = nbt.getValue();
-            final String nbtKey = nbt.getKey();
-            final NBTTagCompound nbtValuePrev = sentNBT.get(nbtKey);
+        NBTTagList actions = new NBTTagList();
 
-            nbtValue.setString("type", nbtKey);
+        for (Map.Entry<String, NBTTagCompound> entry : syncedNBT.entrySet()) {
+            final String actionType = entry.getKey();
+            final NBTTagCompound action = entry.getValue();
+            final NBTTagCompound actionPrev = sentNBT.get(actionType);
 
-            if (nbtValue.equals(nbtValuePrev)) continue;
+            action.setString(ACTION_TYPE, actionType);
 
-            for (ICrafting crafter : crafters) {
-                if (crafter instanceof EntityPlayerMP playerMP) {
-                    final MessageContainerUpdate packet = new MessageContainerUpdate(nbtValue);
-                    BinnieCore.proxy.sendToPlayer(packet, playerMP);
-                }
+            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);
             }
-
-            sentThisTime.put(nbtKey, nbtValue);
         }
 
         sentNBT.putAll(sentThisTime);
@@ -298,10 +342,10 @@ public class ContainerCraftGUI extends Container {
         NBTTagCompound nbt = new NBTTagCompound();
         ErrorState state = null;
         if (error.canWork() != null) {
-            nbt.setByte("type", (byte) 0);
+            nbt.setByte(ERROR_TYPE, CANNOT_WORK);
             state = error.canWork();
         } else if (error.canProgress() != null) {
-            nbt.setByte("type", (byte) 1);
+            nbt.setByte(ERROR_TYPE, CANNOT_PROGRESS);
             state = error.canProgress();
         }
 
@@ -326,12 +370,12 @@ 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);
@@ -360,8 +404,8 @@ public class ContainerCraftGUI extends Container {
     }
 
     public void onErrorUpdate(NBTTagCompound nbt) {
-        errorType = nbt.getByte("type");
-        if (nbt.hasKey("name")) {
+        errorType = nbt.getByte(ERROR_TYPE);
+        if (nbt.hasKey(NAME)) {
             error = new ErrorState("", "");
             error.readFromNBT(nbt);
         } else {
@@ -393,13 +437,13 @@ public class ContainerCraftGUI extends Container {
         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;
         }
@@ -407,8 +451,8 @@ public class ContainerCraftGUI extends Container {
         request.transfer(false);
         NBTTagCompound nbt = new NBTTagCompound();
         List<Integer> slots = new ArrayList<>();
-        for (TransferRequest.TransferSlot tslot : request.getInsertedSlots()) {
-            Slot slot = getSlot(tslot.inventory, tslot.id);
+        for (TransferRequest.TransferSlot transferSlot : request.getInsertedSlots()) {
+            Slot slot = getSlot(transferSlot.inventory, transferSlot.id);
             if (slot != null) {
                 slots.add(slot.slotNumber);
             }
@@ -419,14 +463,14 @@ 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(EntityPlayer player, NBTTagCompound data) {
+    private void onReceiveShiftClickHighlights(NBTTagCompound data) {
         ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).clear();
-        for (int slotIndex : data.getIntArray("slots")) {
+        for (int slotIndex : data.getIntArray(SLOTS)) {
             ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).add(slotIndex);
         }
     }
@@ -442,27 +486,30 @@ public class ContainerCraftGUI extends Container {
     }
 
     public void receiveNBT(Side side, EntityPlayer player, NBTTagCompound action) {
-        String name = action.getString("type");
-        handleNBT(side, player, name, action);
-        window.receiveGuiNBT(getSide(), player, name, 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));
+            }
+            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, name, action);
+        machine.receiveGuiNBT(getSide(), player, actionType, action);
     }
 
-    public Slot getOrCreateSlot(InventoryType type, int index) {
-        IInventory inventory = getInventory(type);
-        Slot slot = getSlot(inventory, index);
+    public Slot getOrCreateSlot(InventoryType inventoryType, int slotIndex) {
+        final IInventory inventory = getInventory(inventoryType);
+        Slot slot = getSlot(inventory, slotIndex);
+
         if (slot == null) {
-            slot = new CustomSlot(inventory, index);
+            slot = new CustomSlot(inventory, slotIndex);
             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;
     }
 

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

@@ -3,9 +3,13 @@ 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 {
 
@@ -21,23 +25,24 @@ 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);
+                ControlSlot slot = new ControlSlot(this, (wide ? 58 : 0) + column * 18, row * 18)
+                        .setSlotTexture(CraftGUITexture.SlotInventory);
                 slots.add(slot);
             }
         }
 
         if (wide) {
             for (int i1 = 0; i1 < 9; ++i1) {
-                ControlSlot slot2 = new ControlSlot(this, i1 % 3 * 18, i1 / 3 * 18);
+                ControlSlot slot2 = new ControlSlot(this, i1 % 3 * 18, i1 / 3 * 18)
+                        .setSlotTexture(CraftGUITexture.SlotInventory);
                 slots.add(slot2);
             }
         } else {
             for (int i1 = 0; i1 < 9; ++i1) {
-                ControlSlot slot2 = new ControlSlot(this, i1 * 18, 58.0f);
+                ControlSlot slot2 = new ControlSlot(this, i1 * 18, 58.0f).setSlotTexture(CraftGUITexture.SlotInventory);
                 slots.add(slot2);
             }
         }
-        create();
     }
 
     public ControlPlayerInventory(IWidget parent) {
@@ -49,32 +54,33 @@ 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);
+                ControlSlot slot = new ControlSlot(this, column * 18, row * 18)
+                        .setSlotTexture(CraftGUITexture.SlotInventory);
                 slots.add(slot);
             }
         }
-        create();
     }
 
-    public void create() {
+    public ControlPlayerInventory create(NBTTagList actions) {
         for (int row = 0; row < 3; ++row) {
             for (int column = 0; column < 9; ++column) {
                 ControlSlot slot = slots.get(column + row * 9);
-                slot.assign(InventoryType.Player, 9 + column + row * 9);
+                slot.assign(actions, InventoryType.Player, 9 + column + row * 9);
             }
         }
 
         for (int i1 = 0; i1 < 9; ++i1) {
             ControlSlot slot2 = slots.get(27 + i1);
-            slot2.assign(InventoryType.Player, i1);
+            slot2.assign(actions, InventoryType.Player, i1);
         }
+
+        return this;
     }
 
-    public ControlSlot getSlot(int i) {
-        if (i < 0 || i >= slots.size()) {
-            return null;
-        }
-        return slots.get(i);
+    public ControlPlayerInventory createAndRegister() {
+        final NBTTagList actions = new NBTTagList();
+        create(actions);
+        MessageCraftGUI.sendToServer(actions);
+        return this;
     }
-
 }

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

@@ -1,5 +1,11 @@
 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;
@@ -10,6 +16,8 @@ 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;
@@ -26,6 +34,7 @@ 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 {
@@ -40,10 +49,12 @@ 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
@@ -71,11 +82,17 @@ 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(CraftGUITexture.Slot, IPoint.ZERO);
+        CraftGUI.render.texture(slotTexture, IPoint.ZERO);
         if (slot == null) {
             return;
         }
@@ -179,14 +196,28 @@ public class ControlSlot extends ControlSlotBase {
         return null;
     }
 
-    public ControlSlot assign(int index) {
-        return assign(InventoryType.Machine, index);
+    /// 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(InventoryType inventory, int index) {
-        if (slot == null) {
-            slot = ((Window) getSuperParent()).getContainer().getOrCreateSlot(inventory, 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);
+
         return this;
     }
 

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

@@ -4,6 +4,8 @@ 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;
@@ -26,15 +28,14 @@ public class ControlSlotArray extends Control implements Iterable<ControlSlot> {
         return new ControlSlot(this, x, y);
     }
 
-    public ControlSlotArray create(int[] index) {
-        return create(InventoryType.Machine, index);
-    }
-
-    public ControlSlotArray create(InventoryType type, int[] index) {
+    public ControlSlotArray create(NBTTagList actions, InventoryType inventoryType, int[] index) {
         int i = 0;
-        for (ControlSlot slot : slots) {
-            slot.assign(type, index[i++]);
+        for (ControlSlot controlSlot : slots) {
+            final int slotIndex = index[i];
+            controlSlot.assign(actions, inventoryType, slotIndex);
+            i++;
         }
+
         return this;
     }
 

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

@@ -10,6 +10,7 @@ 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/item/ItemGenesis.java

@@ -1,5 +1,7 @@
 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;
@@ -25,6 +27,8 @@ public class ItemGenesis extends Item {
         setCreativeTab(Tabs.tabApiculture);
         setUnlocalizedName("genesis");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

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

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

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

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

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

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

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

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

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

@@ -9,4 +9,11 @@ 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/WindowCompartment.java

@@ -15,6 +15,7 @@ import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
 import binnie.core.BinnieCore;
@@ -42,6 +43,7 @@ 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;
@@ -55,6 +57,7 @@ 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;
@@ -80,7 +83,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
 
     @Override
     public void initialiseClient() {
-        setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName());
+        setTitle(Machine.getMachine(getInventory()).getPackage().getGuiDisplayName());
         int x = 16;
         int y = 32;
         ComponentCompartmentInventory inv = Machine.getMachine(getInventory())
@@ -187,7 +190,11 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
             for (int k = 0; k < inv.getPageSize(); ++k) {
                 slotsIDs[k] = i++;
             }
-            new ControlSlotArray(thisPage, 8, 8, inv.getPageSize() / 5, 5).create(slotsIDs);
+
+            final NBTTagList actions = new NBTTagList();
+            new ControlSlotArray(thisPage, 8, 8, inv.getPageSize() / 5, 5)
+                    .create(actions, InventoryType.Machine, slotsIDs);
+            MessageCraftGUI.sendToServer(actions);
         }
         x += compartmentPageWidth;
         if (tabs2.length > 0) {
@@ -245,7 +252,7 @@ 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);
+        new ControlPlayerInventory(this, true).createAndRegister();
         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);
@@ -367,7 +374,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);
+                new ControlPlayerInventory(this, true).createAndRegister();
                 new ControlTextEdit(this, 16.0f, 16.0f, 100.0f, 14.0f).addEventHandler(new EventTextEdit.Handler() {
 
                     @Override
@@ -459,8 +466,10 @@ 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(k);
+                    new ControlSlot(slotGrid, x, y).assign(actions, InventoryType.Machine, k);
                     x += 18;
                     if (x >= 108) {
                         x = 0;
@@ -468,6 +477,8 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
                     }
                 }
 
+                MessageCraftGUI.sendToServer(actions);
+
                 while (y < 108 || x != 0) {
                     new ControlSlot(slotGrid, x, y);
                     x += 18;

src/main/java/binnie/core/mod/parser/FieldParser.java

@@ -1,52 +0,0 @@
-package binnie.core.mod.parser;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import binnie.core.AbstractMod;
-
-public abstract class FieldParser {
-
-    public static Collection<FieldParser> parsers = new ArrayList<>();
-
-    public abstract boolean isHandled(Field field, AbstractMod mod);
-
-    public void preInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
-        // ignored
-    }
-
-    public void init(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
-        // ignored
-    }
-
-    public void postInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
-        // ignored
-    }
-
-    public static void preInitParse(Field field, AbstractMod mod)
-            throws IllegalArgumentException, IllegalAccessException {
-        for (FieldParser parser : FieldParser.parsers) {
-            if (parser.isHandled(field, mod)) {
-                parser.preInit(field, mod);
-            }
-        }
-    }
-
-    public static void initParse(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
-        for (FieldParser parser : FieldParser.parsers) {
-            if (parser.isHandled(field, mod)) {
-                parser.init(field, mod);
-            }
-        }
-    }
-
-    public static void postInitParse(Field field, AbstractMod mod)
-            throws IllegalArgumentException, IllegalAccessException {
-        for (FieldParser parser : FieldParser.parsers) {
-            if (parser.isHandled(field, mod)) {
-                parser.postInit(field, mod);
-            }
-        }
-    }
-}

src/main/java/binnie/core/mod/parser/ItemParser.java

@@ -1,24 +0,0 @@
-package binnie.core.mod.parser;
-
-import java.lang.reflect.Field;
-
-import net.minecraft.item.Item;
-
-import binnie.core.AbstractMod;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public class ItemParser extends FieldParser {
-
-    @Override
-    public boolean isHandled(Field field, AbstractMod mod) {
-        return Item.class.isAssignableFrom(field.getType());
-    }
-
-    @Override
-    public void preInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
-        Item item = (Item) field.get(null);
-        if (item != null) {
-            GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
-        }
-    }
-}

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

@@ -1,7 +1,13 @@
 package binnie.core.network.packet;
 
-import net.minecraft.nbt.NBTTagCompound;
+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 {
@@ -13,4 +19,12 @@ 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/extrabees/ExtraBees.java

@@ -2,7 +2,6 @@ package binnie.extrabees;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.item.Item;
 
 import com.gtnewhorizon.gtnhlib.config.ConfigException;
 import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
@@ -11,6 +10,7 @@ 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,7 +18,11 @@ 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.ModuleProducts;
 import binnie.extrabees.proxy.ExtraBeesProxy;
 import binnie.extrabees.worldgen.ModuleGeneration;
@@ -58,11 +62,11 @@ public class ExtraBees extends AbstractMod {
     public static Block hive;
     public static Material materialBeehive;
     public static Block ectoplasm;
-    public static Item comb;
-    public static Item propolis;
-    public static Item honeyDrop;
-    public static Item dictionary;
-    public static Item itemMisc;
+    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;

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

@@ -6,14 +6,23 @@ 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;
@@ -21,7 +30,7 @@ import forestry.api.multiblock.IMultiblockController;
 import forestry.api.multiblock.IMultiblockLogicAlveary;
 import forestry.api.multiblock.MultiblockManager;
 
-public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyComponent.Active,
+public class TileExtraBeeAlveary extends TileEntityMachine implements IBeeHousing, IAlvearyComponent.Active,
         IAlvearyComponent.BeeModifier, IAlvearyComponent.BeeListener, IBeeListener, IBeeModifier {
 
     protected IMultiblockLogicAlveary structureLogic;
@@ -42,11 +51,51 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyCo
         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) {
@@ -226,6 +275,26 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyCo
         }
     }
 
+    @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/core/ModuleCore.java

@@ -1,7 +1,7 @@
 package binnie.extrabees.core;
 
-import binnie.Binnie;
 import binnie.core.IInitializable;
+import binnie.core.item.ItemMisc;
 import binnie.extrabees.ExtraBees;
 import forestry.api.core.Tabs;
 
@@ -9,7 +9,7 @@ public class ModuleCore implements IInitializable {
 
     @Override
     public void preInit() {
-        ExtraBees.itemMisc = Binnie.Item.registerMiscItems(ExtraBeeItems.values(), Tabs.tabApiculture);
+        ExtraBees.itemMisc = new ItemMisc(Tabs.tabApiculture, ExtraBeeItems.values());
     }
 
     @Override

src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java

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

src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java

@@ -2,14 +2,16 @@ package binnie.extrabees.gui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlPlayerInventory;
 import binnie.core.craftgui.minecraft.control.ControlSlot;
 import binnie.core.machines.Machine;
 import binnie.core.machines.TileEntityMachine;
-import binnie.core.util.I18N;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.extrabees.ExtraBees;
 import cpw.mods.fml.relauncher.Side;
 
@@ -32,10 +34,11 @@ public class WindowAlvearyFrame extends Window {
 
     @Override
     public void initialiseClient() {
-        setTitle(I18N.localise("extrabees.machine.alveay.frame"));
-        playerInventory = new ControlPlayerInventory(this);
-        ControlSlot slot = new ControlSlot(this, 79.0f, 30.0f);
-        slot.assign(0);
+        setTitle(machine.getPackage().getGuiDisplayName());
+        final NBTTagList actions = new NBTTagList();
+        playerInventory = new ControlPlayerInventory(this).create(actions);
+        new ControlSlot(this, 79.0f, 30.0f).assign(actions, InventoryType.Machine, 0);
+        MessageCraftGUI.sendToServer(actions);
     }
 
     @Override

src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java

@@ -2,14 +2,16 @@ package binnie.extrabees.gui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlPlayerInventory;
 import binnie.core.craftgui.minecraft.control.ControlSlotArray;
 import binnie.core.machines.Machine;
 import binnie.core.machines.TileEntityMachine;
-import binnie.core.util.I18N;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.extrabees.ExtraBees;
 import binnie.extrabees.apiary.machine.hatchery.AlvearyHatchery;
 import cpw.mods.fml.relauncher.Side;
@@ -33,10 +35,11 @@ public class WindowAlvearyHatchery extends Window {
 
     @Override
     public void initialiseClient() {
-        setTitle(I18N.localise("extrabees.machine.alveay.hatchery"));
-        playerInventory = new ControlPlayerInventory(this);
-        ControlSlotArray slot = new ControlSlotArray(this, 43, 30, 5, 1);
-        slot.create(AlvearyHatchery.SLOT_LARVAE);
+        final NBTTagList actions = new NBTTagList();
+        setTitle(machine.getPackage().getGuiDisplayName());
+        playerInventory = new ControlPlayerInventory(this).create(actions);
+        new ControlSlotArray(this, 43, 30, 5, 1).create(actions, InventoryType.Machine, AlvearyHatchery.SLOT_LARVAE);
+        MessageCraftGUI.sendToServer(actions);
     }
 
     @Override

src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java

@@ -3,18 +3,21 @@ package binnie.extrabees.gui;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
 import binnie.core.craftgui.controls.ControlText;
 import binnie.core.craftgui.geometry.IArea;
 import binnie.core.craftgui.geometry.IPoint;
 import binnie.core.craftgui.geometry.TextJustification;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
 import binnie.core.craftgui.minecraft.control.ControlPlayerInventory;
 import binnie.core.craftgui.minecraft.control.ControlSlot;
 import binnie.core.machines.Machine;
 import binnie.core.machines.TileEntityMachine;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.extrabees.ExtraBees;
 import binnie.extrabees.apiary.machine.mutator.AlvearyMutator;
@@ -39,10 +42,11 @@ public class WindowAlvearyMutator extends Window {
 
     @Override
     public void initialiseClient() {
-        setTitle(I18N.localise("extrabees.machine.alveay.mutator"));
-        playerInventory = new ControlPlayerInventory(this);
-        ControlSlot slot = new ControlSlot(this, 79.0f, 30.0f);
-        slot.assign(AlvearyMutator.SLOT_MUTATOR);
+        final NBTTagList actions = new NBTTagList();
+
+        setTitle(machine.getPackage().getGuiDisplayName());
+        playerInventory = new ControlPlayerInventory(this).create(actions);
+        new ControlSlot(this, 79.0f, 30.0f).assign(actions, InventoryType.Machine, AlvearyMutator.SLOT_MUTATOR);
         new ControlText(
                 this,
                 new IArea(0.0f, 52.0f, w(), 16.0f),
@@ -63,6 +67,8 @@ public class WindowAlvearyMutator extends Window {
             display.hastooltip = true;
             x += 17.0f;
         }
+
+        MessageCraftGUI.sendToServer(actions);
     }
 
     @Override

src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java

@@ -2,16 +2,18 @@ package binnie.extrabees.gui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
 import binnie.core.craftgui.geometry.Position;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlEnergyBar;
 import binnie.core.craftgui.minecraft.control.ControlPlayerInventory;
 import binnie.core.craftgui.minecraft.control.ControlSlot;
 import binnie.core.machines.Machine;
 import binnie.core.machines.TileEntityMachine;
-import binnie.core.util.I18N;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.extrabees.ExtraBees;
 import binnie.extrabees.apiary.machine.stimulator.AlvearyStimulator;
 import cpw.mods.fml.relauncher.Side;
@@ -35,11 +37,12 @@ public class WindowAlvearyStimulator extends Window {
 
     @Override
     public void initialiseClient() {
-        setTitle(I18N.localise("extrabees.machine.alveay.stimulator"));
+        final NBTTagList actions = new NBTTagList();
+        setTitle(machine.getPackage().getGuiDisplayName());
+        playerInventory = new ControlPlayerInventory(this).create(actions);
+        new ControlSlot(this, 41.0f, 28.0f).assign(actions, InventoryType.Machine, AlvearyStimulator.SLOT_CIRCUIT);
         new ControlEnergyBar(this, 75, 29, 60, 16, Position.LEFT);
-        ControlSlot slot = new ControlSlot(this, 41.0f, 28.0f);
-        slot.assign(AlvearyStimulator.SLOT_CIRCUIT);
-        playerInventory = new ControlPlayerInventory(this);
+        MessageCraftGUI.sendToServer(actions);
     }
 
     @Override

src/main/java/binnie/extrabees/products/ItemHoneyComb.java

@@ -21,9 +21,8 @@ public class ItemHoneyComb extends ItemProduct {
     protected IIcon icon2;
 
     public ItemHoneyComb() {
-        super(EnumHoneyComb.values());
+        super("honeyComb", EnumHoneyComb.values());
         setCreativeTab(Tabs.tabApiculture);
-        setUnlocalizedName("honeyComb");
     }
 
     public static void addSubtypes() {

src/main/java/binnie/extrabees/products/ItemHoneyDrop.java

@@ -15,9 +15,8 @@ public class ItemHoneyDrop extends ItemProduct {
     protected IIcon icon2;
 
     public ItemHoneyDrop() {
-        super(EnumHoneyDrop.values());
+        super("honeyDrop", EnumHoneyDrop.values());
         setCreativeTab(Tabs.tabApiculture);
-        setUnlocalizedName("honeyDrop");
     }
 
     @Override

src/main/java/binnie/extrabees/products/ItemProduct.java

@@ -1,5 +1,7 @@
 package binnie.extrabees.products;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.creativetab.CreativeTabs;
@@ -12,11 +14,14 @@ public class ItemProduct extends Item {
 
     protected IItemEnum[] types;
 
-    public ItemProduct(IItemEnum[] types) {
+    public ItemProduct(String name, IItemEnum[] types) {
         this.types = types;
         setMaxStackSize(64);
         setMaxDamage(0);
         setHasSubtypes(true);
+        setUnlocalizedName(name);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     public IItemEnum get(ItemStack stack) {

src/main/java/binnie/extrabees/products/ItemPropolis.java

@@ -11,9 +11,8 @@ import forestry.api.core.Tabs;
 public class ItemPropolis extends ItemProduct {
 
     public ItemPropolis() {
-        super(EnumPropolis.values());
+        super("propolis", EnumPropolis.values());
         setCreativeTab(Tabs.tabApiculture);
-        setUnlocalizedName("propolis");
     }
 
     @Override

src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java

@@ -97,4 +97,9 @@ public class BlockExtraBeeHive extends Block {
         }
         return ret;
     }
+
+    @Override
+    public int damageDropped(int meta) {
+        return meta;
+    }
 }

src/main/java/binnie/extratrees/ExtraTrees.java

@@ -4,7 +4,6 @@ import static binnie.extratrees.ExtraTrees.EB_MOD_NAME;
 import static binnie.extratrees.ExtraTrees.ET_MODID;
 
 import net.minecraft.block.Block;
-import net.minecraft.item.Item;
 
 import com.gtnewhorizon.gtnhlib.config.ConfigException;
 import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
@@ -13,6 +12,7 @@ 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.ExtraBees;
@@ -26,6 +26,10 @@ import binnie.extratrees.config.ETConfig;
 import binnie.extratrees.core.ExtraTreesGUID;
 import binnie.extratrees.core.ModuleCore;
 import binnie.extratrees.genetics.ModuleGenetics;
+import binnie.extratrees.item.ItemDictionary;
+import binnie.extratrees.item.ItemFood;
+import binnie.extratrees.item.ItemHammer;
+import binnie.extratrees.item.ItemMothDatabase;
 import binnie.extratrees.item.ModuleItems;
 import binnie.extratrees.machines.ModuleMachine;
 import binnie.extratrees.nei.IMCForNEI;
@@ -61,10 +65,13 @@ public class ExtraTrees extends AbstractMod {
         }
     }
 
-    public static Item itemDictionary;
-    public static Item itemDictionaryLepi;
-    public static Item itemMisc;
-    public static Item itemFood;
+    public static ItemDictionary itemDictionary;
+    public static ItemMothDatabase itemDictionaryLepi;
+    public static ItemMisc itemMisc;
+    public static ItemFood itemFood;
+    public static ItemHammer itemHammer;
+    public static ItemHammer itemDurableHammer;
+
     public static Block blockStairs;
     public static Block blockLog;
     public static BlockCarpentry blockCarpentry;
@@ -75,13 +82,12 @@ public class ExtraTrees extends AbstractMod {
     public static BlockCarpentry blockPanel;
     public static Block blockSlab;
     public static Block blockDoubleSlab;
-    public static Item itemHammer;
-    public static Item itemDurableHammer;
     public static Block blockGate;
     public static Block blockDoor;
     public static BlockMultiFence blockMultiFence;
     public static BlockHedge blockHedge;
     public static BlockStainedDesign blockStained;
+
     public static int doorRenderId;
     public static int branchRenderId;
     public static int fenceID;

src/main/java/binnie/extratrees/craftgui/WindowLumbermill.java

@@ -2,9 +2,11 @@ package binnie.extratrees.craftgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
 import binnie.core.craftgui.geometry.Position;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlEnergyBar;
 import binnie.core.craftgui.minecraft.control.ControlErrorState;
@@ -12,6 +14,7 @@ import binnie.core.craftgui.minecraft.control.ControlLiquidTank;
 import binnie.core.craftgui.minecraft.control.ControlPlayerInventory;
 import binnie.core.craftgui.minecraft.control.ControlSlot;
 import binnie.core.machines.Machine;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.extratrees.ExtraTrees;
 import binnie.extratrees.machines.lumbermill.Lumbermill;
 import cpw.mods.fml.relauncher.Side;
@@ -38,15 +41,20 @@ public class WindowLumbermill extends Window {
 
     @Override
     public void initialiseClient() {
-        setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName());
-        new ControlSlot(this, 42.0f, 43.0f).assign(Lumbermill.SLOT_WOOD);
-        new ControlSlot(this, 148.0f, 43.0f).assign(Lumbermill.SLOT_PLANKS);
-        new ControlSlot(this, 172.0f, 28.0f).assign(Lumbermill.SLOT_BARK);
-        new ControlSlot(this, 172.0f, 58.0f).assign(Lumbermill.SLOT_SAWDUST);
+        final NBTTagList actions = new NBTTagList();
+
+        setTitle(Machine.getMachine(getInventory()).getPackage().getGuiDisplayName());
+        new ControlSlot(this, 42.0f, 43.0f).assign(actions, InventoryType.Machine, Lumbermill.SLOT_WOOD);
+        new ControlSlot(this, 148.0f, 43.0f).assign(actions, InventoryType.Machine, Lumbermill.SLOT_PLANKS);
+        new ControlSlot(this, 172.0f, 28.0f).assign(actions, InventoryType.Machine, Lumbermill.SLOT_BARK);
+        new ControlSlot(this, 172.0f, 58.0f).assign(actions, InventoryType.Machine, Lumbermill.SLOT_SAWDUST);
+
         new ControlLumbermillProgress(this, 70.0f, 43.0f);
         new ControlLiquidTank(this, 16, 32);
         new ControlEnergyBar(this, 8, 112, 16, 60, Position.BOTTOM);
-        new ControlPlayerInventory(this);
+        new ControlPlayerInventory(this).create(actions);
         new ControlErrorState(this, 95.0f, 73.0f);
+
+        MessageCraftGUI.sendToServer(actions);
     }
 }

src/main/java/binnie/extratrees/craftgui/WindowWoodworker.java

@@ -2,6 +2,7 @@ package binnie.extratrees.craftgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
 import binnie.core.craftgui.controls.ControlText;
@@ -12,6 +13,7 @@ import binnie.core.craftgui.events.EventTextEdit;
 import binnie.core.craftgui.geometry.IArea;
 import binnie.core.craftgui.geometry.IPoint;
 import binnie.core.craftgui.geometry.TextJustification;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.MinecraftGUI;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlErrorState;
@@ -19,6 +21,7 @@ import binnie.core.craftgui.minecraft.control.ControlPlayerInventory;
 import binnie.core.craftgui.minecraft.control.ControlSlot;
 import binnie.core.craftgui.window.Panel;
 import binnie.core.machines.Machine;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.extratrees.ExtraTrees;
 import binnie.extratrees.machines.designer.Designer;
@@ -48,7 +51,9 @@ public class WindowWoodworker extends Window {
 
     @Override
     public void initialiseClient() {
-        setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName());
+        final NBTTagList actions = new NBTTagList();
+
+        setTitle(Machine.getMachine(getInventory()).getPackage().getGuiDisplayName());
         new ControlText(
                 this,
                 new IArea(190.0f, 36.0f, 114.0f, 10.0f),
@@ -58,18 +63,25 @@ public class WindowWoodworker extends Window {
         textEdit = new ControlTextEdit(this, 188.0f, 178.0f, 118.0f, 12.0f);
         ControlScrollableContent scroll = new ControlScrollableContent(this, 190.0f, 50.0f, 114.0f, 122.0f, 12.0f);
         scroll.setScrollableContent(tileSelect = new ControlTileSelect(scroll, 0.0f, 0.0f));
-        new ControlPlayerInventory(this).setPosition(new IPoint(14.0f, 96.0f));
+
+        ControlPlayerInventory controlPlayerInventory = new ControlPlayerInventory(this);
+        controlPlayerInventory.setPosition(new IPoint(14.0f, 96.0f));
+        controlPlayerInventory.create(actions);
+
         new ControlErrorState(this, 76.0f, 65.0f);
 
         if (getInventory() != null) {
+
             ControlSlot slotWood1 = new ControlSlot(this, 22.0f, 34.0f);
-            slotWood1.assign(Designer.DESIGN_1_SLOT);
+            slotWood1.assign(actions, InventoryType.Machine, Designer.DESIGN_1_SLOT);
             ControlSlot slotWood2 = new ControlSlot(this, 62.0f, 34.0f);
-            slotWood2.assign(Designer.DESIGN_2_SLOT);
+            slotWood2.assign(actions, InventoryType.Machine, Designer.DESIGN_2_SLOT);
             ControlSlot slotBeeswax = new ControlSlot(this, 42.0f, 64.0f);
-            slotBeeswax.assign(Designer.GLUE_SLOT);
+            slotBeeswax.assign(actions, InventoryType.Machine, Designer.GLUE_SLOT);
             new ControlRecipeSlot(this, 112, 34);
         }
+
+        MessageCraftGUI.sendToServer(actions);
     }
 
     @Override

src/main/java/binnie/extratrees/item/ItemDictionary.java

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

src/main/java/binnie/extratrees/item/ItemFood.java

@@ -1,5 +1,7 @@
 package binnie.extratrees.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -24,6 +26,8 @@ public class ItemFood extends net.minecraft.item.ItemFood {
         setCreativeTab(Tabs.tabArboriculture);
         setHasSubtypes(true);
         items = Food.values();
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/extratrees/item/ItemHammer.java

@@ -1,5 +1,7 @@
 package binnie.extratrees.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -22,6 +24,8 @@ public class ItemHammer extends Item implements IToolHammer {
         setUnlocalizedName(durable ? "durableHammer" : "hammer");
         setMaxStackSize(1);
         setMaxDamage(durable ? 1562 : 251);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/extratrees/item/ItemMothDatabase.java

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

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

@@ -28,7 +28,7 @@ public class ModuleItems implements IInitializable {
 
     @Override
     public void preInit() {
-        ExtraTrees.itemMisc = Binnie.Item.registerMiscItems(ExtraTreeItems.values(), Tabs.tabArboriculture);
+        ExtraTrees.itemMisc = new ItemMisc(Tabs.tabArboriculture, ExtraTreeItems.values());
         ExtraTrees.itemDictionary = new ItemDictionary();
         if (BinnieCore.isLepidopteryActive()) {
             ExtraTrees.itemDictionaryLepi = new ItemMothDatabase();

src/main/java/binnie/genetics/Genetics.java

@@ -1,10 +1,9 @@
 package binnie.genetics;
 
-import net.minecraft.item.Item;
-
 import binnie.core.AbstractMod;
 import binnie.core.Tags;
 import binnie.core.gui.IBinnieGUID;
+import binnie.core.item.ItemMisc;
 import binnie.core.machines.MachineGroup;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
@@ -13,6 +12,10 @@ import binnie.genetics.core.GeneticsGUI;
 import binnie.genetics.core.GeneticsPacket;
 import binnie.genetics.item.ItemAnalyst;
 import binnie.genetics.item.ItemDatabase;
+import binnie.genetics.item.ItemMasterRegistry;
+import binnie.genetics.item.ItemRegistry;
+import binnie.genetics.item.ItemSequence;
+import binnie.genetics.item.ItemSerum;
 import binnie.genetics.item.ItemSerumArray;
 import binnie.genetics.item.ModuleItem;
 import binnie.genetics.machine.ModuleMachine;
@@ -38,18 +41,20 @@ public class Genetics extends AbstractMod {
     @SidedProxy(clientSide = "binnie.genetics.proxy.ProxyClient", serverSide = "binnie.genetics.proxy.ProxyServer")
     public static Proxy proxy;
 
-    public static ItemSerumArray itemSerumArray = null;
     public static final String CHANNEL = "GEN";
-    public static Item itemGenetics;
-    public static Item itemSerum;
-    public static Item itemSequencer;
+
+    public static ItemSerumArray itemSerumArray = null;
+    public static ItemMisc itemGenetics;
+    public static ItemSerum itemSerum;
+    public static ItemSequence itemSequencer;
+    public static ItemDatabase database;
+    public static ItemAnalyst analyst;
+    public static ItemRegistry registry;
+    public static ItemMasterRegistry masterRegistry;
+
     public static MachineGroup packageGenetic;
     public static MachineGroup packageAdvGenetic;
     public static MachineGroup packageLabMachine;
-    public static ItemDatabase database;
-    public static ItemAnalyst analyst;
-    public static Item registry;
-    public static Item masterRegistry;
 
     public Genetics() {
         Genetics.instance = this;

src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java

@@ -2,9 +2,11 @@ package binnie.genetics.craftgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
 import binnie.core.craftgui.geometry.Position;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlEnergyBar;
 import binnie.core.craftgui.minecraft.control.ControlErrorState;
@@ -13,6 +15,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot;
 import binnie.core.craftgui.minecraft.control.ControlSlotArray;
 import binnie.core.craftgui.resource.Texture;
 import binnie.core.craftgui.resource.minecraft.StandardTexture;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.extrabees.core.ExtraBeeTexture;
 import binnie.genetics.Genetics;
@@ -40,22 +43,28 @@ public class WindowAcclimatiser extends WindowMachine {
     @Override
     public void initialiseClient() {
         super.initialiseClient();
+
+        final NBTTagList actions = new NBTTagList();
+
         int x = 59;
         int y = 32;
-        new ControlSlotArray(this, x, y, 2, 2).create(Acclimatiser.SLOT_RESERVE);
+        new ControlSlotArray(this, x, y, 2, 2).create(actions, InventoryType.Machine, Acclimatiser.SLOT_RESERVE);
         x += 54;
-        new ControlSlot(this, x + 18, y).assign(Acclimatiser.SLOT_TARGET);
-        new ControlSlotArray(this, x, y + 18 + 18, 3, 1).create(Acclimatiser.SLOT_ACCLIMATISER);
+        new ControlSlot(this, x + 18, y).assign(actions, InventoryType.Machine, Acclimatiser.SLOT_TARGET);
+        new ControlSlotArray(this, x, y + 18 + 18, 3, 1)
+                .create(actions, InventoryType.Machine, Acclimatiser.SLOT_ACCLIMATISER);
         x += 72;
-        new ControlSlotArray(this, x, y, 2, 2).create(Acclimatiser.SLOT_DONE);
+        new ControlSlotArray(this, x, y, 2, 2).create(actions, InventoryType.Machine, Acclimatiser.SLOT_DONE);
         new ControlEnergyBar(this, 21, 115, 16, 60, Position.BOTTOM);
         new ControlErrorState(this, 181.0f, 83.0f);
-        new ControlPlayerInventory(this);
+        new ControlPlayerInventory(this).create(actions);
+
+        MessageCraftGUI.sendToServer(actions);
     }
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.labMachine.acclimatiser");
+        return I18N.localise("gui.genetics.machine.labMachine.acclimatiser.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowAnalyser.java

@@ -2,10 +2,12 @@ package binnie.genetics.craftgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
 import binnie.core.craftgui.geometry.Position;
 import binnie.core.craftgui.minecraft.GUIIcon;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.MinecraftGUI;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlEnergyBar;
@@ -19,6 +21,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlotCharge;
 import binnie.core.craftgui.resource.Texture;
 import binnie.core.craftgui.resource.minecraft.StandardTexture;
 import binnie.core.craftgui.window.Panel;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.extrabees.core.ExtraBeeTexture;
 import binnie.genetics.Genetics;
@@ -47,13 +50,16 @@ public class WindowAnalyser extends WindowMachine {
     @Override
     public void initialiseClient() {
         super.initialiseClient();
+
+        final NBTTagList actions = new NBTTagList();
+
         WindowAnalyser.progressBase = new StandardTexture(0, 51, 66, 40, GeneticsTexture.GUIProcess.getTexture());
         WindowAnalyser.progress = new StandardTexture(66, 51, 66, 40, GeneticsTexture.GUIProcess.getTexture());
         int x = 16;
         int y = 32;
-        new ControlSlotArray(this, x, y, 2, 3).create(Analyser.SLOT_RESERVE);
+        new ControlSlotArray(this, x, y, 2, 3).create(actions, InventoryType.Machine, Analyser.SLOT_RESERVE);
         x += 28;
-        new ControlSlot(this, x, y + 54 + 8).assign(13);
+        new ControlSlot(this, x, y + 54 + 8).assign(actions, InventoryType.Machine, 13);
         new ControlSlotCharge(this, x + 20, y + 54 + 8, 13).setColor(10040319);
         new ControlEnergyBar(this, x + 24 + 16, y + 54 + 8 + 1, 60, 16, Position.LEFT);
         new ControlErrorState(this, x + 24 + 16 + 60 + 16, y + 54 + 8 + 1);
@@ -62,16 +68,18 @@ public class WindowAnalyser extends WindowMachine {
         x += 56;
         new Panel(this, x, y, 76.0f, 50.0f, MinecraftGUI.PanelType.Tinted);
         new ControlProgress(this, x + 5, y + 5, WindowAnalyser.progressBase, WindowAnalyser.progress, Position.LEFT);
-        new ControlSlot(this, x + 38 - 9, y + 25 - 9).assign(Analyser.SLOT_TARGET);
+        new ControlSlot(this, x + 38 - 9, y + 25 - 9).assign(actions, InventoryType.Machine, Analyser.SLOT_TARGET);
         new ControlIconDisplay(this, x + 76 + 2, y + 18, GUIIcon.ArrowRight.getIcon());
         x += 96;
-        new ControlSlotArray(this, x, y, 2, 3).create(Analyser.SLOT_FINISHED);
-        new ControlPlayerInventory(this);
+        new ControlSlotArray(this, x, y, 2, 3).create(actions, InventoryType.Machine, Analyser.SLOT_FINISHED);
+        new ControlPlayerInventory(this).create(actions);
+
+        MessageCraftGUI.sendToServer(actions);
     }
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.labMachine.analyser");
+        return I18N.localise("gui.genetics.machine.labMachine.analyser.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowGeneBank.java

@@ -97,7 +97,7 @@ public class WindowGeneBank extends WindowMachine {
         int boxX;
         int x = 16;
         int y = 32;
-        new ControlPlayerInventory(this, x, y);
+        new ControlPlayerInventory(this, x, y).createAndRegister();
         x += 124;
         boxX = x;
         int geneBoxWidth = 200;

src/main/java/binnie/genetics/craftgui/WindowGenepool.java

@@ -2,10 +2,12 @@ package binnie.genetics.craftgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
 import binnie.core.craftgui.geometry.Position;
 import binnie.core.craftgui.minecraft.GUIIcon;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlEnergyBar;
 import binnie.core.craftgui.minecraft.control.ControlErrorState;
@@ -18,6 +20,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlotArray;
 import binnie.core.craftgui.minecraft.control.ControlSlotCharge;
 import binnie.core.craftgui.resource.Texture;
 import binnie.core.craftgui.resource.minecraft.StandardTexture;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.extrabees.core.ExtraBeeTexture;
 import binnie.genetics.Genetics;
@@ -40,18 +43,21 @@ public class WindowGenepool extends WindowMachine {
     @Override
     public void initialiseClient() {
         super.initialiseClient();
+
+        final NBTTagList actions = new NBTTagList();
+
         int x = 16;
         int y = 32;
         new ControlLiquidTank(this, x, y).setTankID(Genepool.TANK_ETHANOL);
 
         x += 26;
-        new ControlSlotArray(this, x, y + 3, 2, 3).create(Genepool.SLOT_RESERVE);
+        new ControlSlotArray(this, x, y + 3, 2, 3).create(actions, InventoryType.Machine, Genepool.SLOT_RESERVE);
 
         x += 38;
         new ControlIconDisplay(this, x, y + 22, GUIIcon.ArrowRight.getIcon());
 
         x += 18;
-        new ControlSlot(this, x, y + 21).assign(Genepool.SLOT_BEE);
+        new ControlSlot(this, x, y + 21).assign(actions, InventoryType.Machine, Genepool.SLOT_BEE);
 
         x += 18;
         new ControlMachineProgress(this, x, y + 19, progressBase, progress, Position.LEFT);
@@ -59,15 +65,17 @@ public class WindowGenepool extends WindowMachine {
         x += 130;
         new ControlLiquidTank(this, x, y).setTankID(Genepool.TANK_DNA);
         new ControlEnergyBar(this, 21, 115, 16, 60, Position.BOTTOM);
-        new ControlSlot(this, 121.0f, 82.0f).assign(Genepool.SLOT_ENZYME);
+        new ControlSlot(this, 121.0f, 82.0f).assign(actions, InventoryType.Machine, Genepool.SLOT_ENZYME);
         new ControlSlotCharge(this, 143, 82, 7).setColor(0xefe8af);
         new ControlErrorState(this, 181.0f, 83.0f);
-        new ControlPlayerInventory(this);
+        new ControlPlayerInventory(this).create(actions);
+
+        MessageCraftGUI.sendToServer(actions);
     }
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.labMachine.genepool");
+        return I18N.localise("gui.genetics.machine.labMachine.genepool.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowIncubator.java

@@ -2,10 +2,12 @@ package binnie.genetics.craftgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
 import binnie.core.craftgui.geometry.Position;
 import binnie.core.craftgui.minecraft.GUIIcon;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlEnergyBar;
 import binnie.core.craftgui.minecraft.control.ControlErrorState;
@@ -17,6 +19,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot;
 import binnie.core.craftgui.minecraft.control.ControlSlotArray;
 import binnie.core.craftgui.resource.Texture;
 import binnie.core.craftgui.resource.minecraft.StandardTexture;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.genetics.Genetics;
 import binnie.genetics.core.GeneticsTexture;
@@ -39,11 +42,14 @@ public class WindowIncubator extends WindowMachine {
     @Override
     public void initialiseClient() {
         super.initialiseClient();
+
+        final NBTTagList actions = new NBTTagList();
+
         int x = 16;
         int y = 32;
         new ControlLiquidTank(this, x, y).setTankID(Incubator.TANK_INPUT);
         x += 26;
-        new ControlSlotArray(this, x, y + 3, 1, 3).create(Incubator.SLOT_QUEUE);
+        new ControlSlotArray(this, x, y + 3, 1, 3).create(actions, InventoryType.Machine, Incubator.SLOT_QUEUE);
         x += 20;
         new ControlIconDisplay(this, x, y + 3 + 10, GUIIcon.ArrowRight.getIcon());
         x += 18;
@@ -54,22 +60,24 @@ public class WindowIncubator extends WindowMachine {
                 WindowIncubator.progressBase,
                 WindowIncubator.progress,
                 Position.LEFT);
-        new ControlSlot(this, x + 10, y + 3 + 10).assign(Incubator.SLOT_INCUBATOR);
+        new ControlSlot(this, x + 10, y + 3 + 10).assign(actions, InventoryType.Machine, Incubator.SLOT_INCUBATOR);
         x += 40;
         new ControlIconDisplay(this, x, y + 3 + 10, GUIIcon.ArrowRight.getIcon());
         x += 18;
-        new ControlSlotArray(this, x, y + 3, 1, 3).create(Incubator.SLOT_OUTPUT);
+        new ControlSlotArray(this, x, y + 3, 1, 3).create(actions, InventoryType.Machine, Incubator.SLOT_OUTPUT);
         x += 26;
         new ControlLiquidTank(this, x, y).setTankID(Incubator.TANK_OUTPUT);
         x += 34;
         new ControlEnergyBar(this, x, y + 3, 16, 54, Position.BOTTOM);
         new ControlErrorState(this, 91.0f, 82.0f);
-        new ControlPlayerInventory(this);
+        new ControlPlayerInventory(this).create(actions);
+
+        MessageCraftGUI.sendToServer(actions);
     }
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.labMachine.incubator");
+        return I18N.localise("gui.genetics.machine.labMachine.incubator.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowInoculator.java

@@ -2,12 +2,14 @@ package binnie.genetics.craftgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
 import binnie.core.craftgui.geometry.CraftGUIUtil;
 import binnie.core.craftgui.geometry.Position;
 import binnie.core.craftgui.geometry.TextJustification;
 import binnie.core.craftgui.minecraft.GUIIcon;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlEnergyBar;
 import binnie.core.craftgui.minecraft.control.ControlErrorState;
@@ -19,6 +21,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot;
 import binnie.core.craftgui.minecraft.control.ControlSlotArray;
 import binnie.core.craftgui.resource.Texture;
 import binnie.core.craftgui.resource.minecraft.StandardTexture;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.genetics.Genetics;
 import binnie.genetics.core.GeneticsTexture;
@@ -41,17 +44,22 @@ public class WindowInoculator extends WindowMachine {
     @Override
     public void initialiseClient() {
         super.initialiseClient();
+
+        final NBTTagList actions = new NBTTagList();
+
         int x = 16;
         int y = 32;
         new ControlLiquidTank(this, x, y + 18 + 16).setTankID(0);
         CraftGUIUtil.horizontalGrid(
                 x,
                 y,
-                new ControlSlotArray(this, 0, 0, 2, 1).create(Inoculator.SLOT_SERUM_RESERVE),
+                new ControlSlotArray(this, 0, 0, 2, 1)
+                        .create(actions, InventoryType.Machine, Inoculator.SLOT_SERUM_RESERVE),
                 new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()),
-                new ControlSlot(this, 0.0f, 0.0f).assign(0),
+                new ControlSlot(this, 0.0f, 0.0f).assign(actions, InventoryType.Machine, 0),
                 new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()),
-                new ControlSlotArray(this, 0, 0, 2, 1).create(Inoculator.SLOT_SERUM_EXPENDED));
+                new ControlSlotArray(this, 0, 0, 2, 1)
+                        .create(actions, InventoryType.Machine, Inoculator.SLOT_SERUM_EXPENDED));
         x += 18;
         new ControlMachineProgress(
                 this,
@@ -68,17 +76,20 @@ public class WindowInoculator extends WindowMachine {
                 y,
                 TextJustification.MIDDLE_LEFT,
                 8.0f,
-                new ControlSlotArray(this, x, y, 4, 1).create(Inoculator.SLOT_RESERVE),
-                new ControlSlot(this, x, y + 18 + 8).assign(9),
-                new ControlSlotArray(this, x, y + 18 + 8 + 18 + 8, 4, 1).create(Inoculator.SLOT_FINISHED));
+                new ControlSlotArray(this, x, y, 4, 1).create(actions, InventoryType.Machine, Inoculator.SLOT_RESERVE),
+                new ControlSlot(this, x, y + 18 + 8).assign(actions, InventoryType.Machine, 9),
+                new ControlSlotArray(this, x, y + 18 + 8 + 18 + 8, 4, 1)
+                        .create(actions, InventoryType.Machine, Inoculator.SLOT_FINISHED));
         new ControlIconDisplay(this, x + 18, y + 18 + 2, GUIIcon.ArrowUpLeft.getIcon());
         new ControlIconDisplay(this, x + 18, y + 18 + 18, GUIIcon.ArrowLeftDown.getIcon());
-        new ControlPlayerInventory(this);
+        new ControlPlayerInventory(this).create(actions);
+
+        MessageCraftGUI.sendToServer(actions);
     }
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.machine.inoculator");
+        return I18N.localise("gui.genetics.machine.machine.inoculator.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowIsolator.java

@@ -2,10 +2,12 @@ package binnie.genetics.craftgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
 import binnie.core.craftgui.geometry.Position;
 import binnie.core.craftgui.minecraft.GUIIcon;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlEnergyBar;
 import binnie.core.craftgui.minecraft.control.ControlErrorState;
@@ -18,6 +20,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlotArray;
 import binnie.core.craftgui.minecraft.control.ControlSlotCharge;
 import binnie.core.craftgui.resource.Texture;
 import binnie.core.craftgui.resource.minecraft.StandardTexture;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.extrabees.core.ExtraBeeTexture;
 import binnie.genetics.Genetics;
@@ -40,35 +43,40 @@ public class WindowIsolator extends WindowMachine {
     @Override
     public void initialiseClient() {
         super.initialiseClient();
+
+        final NBTTagList actions = new NBTTagList();
+
         int x = 16;
         int y = 32;
         new ControlLiquidTank(this, x, y).setTankID(Isolator.TANK_ETHANOL);
         x += 26;
-        new ControlSlotArray(this, x, y + 3, 1, 3).create(Isolator.SLOT_RESERVE);
+        new ControlSlotArray(this, x, y + 3, 1, 3).create(actions, InventoryType.Machine, Isolator.SLOT_RESERVE);
         x += 20;
         new ControlIconDisplay(this, x, y + 3 + 1, GUIIcon.ArrowRight.getIcon());
         x += 18;
-        new ControlSlot(this, x, y + 3).assign(Isolator.SLOT_TARGET);
-        new ControlSlot(this, x, y + 36 + 3).assign(Isolator.SLOT_ENZYME);
+        new ControlSlot(this, x, y + 3).assign(actions, InventoryType.Machine, Isolator.SLOT_TARGET);
+        new ControlSlot(this, x, y + 36 + 3).assign(actions, InventoryType.Machine, Isolator.SLOT_ENZYME);
         new ControlSlotCharge(this, x + 18 + 2, y + 36 + 3, 0).setColor(0xefe8af);
         x += 18;
         new ControlProgress(this, x, y + 3, WindowIsolator.ProgressBase, WindowIsolator.Progress, Position.LEFT);
         x += 142;
-        new ControlSlot(this, x, y + 3).assign(Isolator.SLOT_RESULT);
-        new ControlSlot(this, x, y + 3 + 36).assign(Isolator.SLOT_SEQUENCER_VIAL);
+        new ControlSlot(this, x, y + 3).assign(actions, InventoryType.Machine, Isolator.SLOT_RESULT);
+        new ControlSlot(this, x, y + 3 + 36).assign(actions, InventoryType.Machine, Isolator.SLOT_SEQUENCER_VIAL);
         new ControlIconDisplay(this, x + 1, y + 3 + 19, GUIIcon.ArrowUp.getIcon());
         x += 20;
         new ControlIconDisplay(this, x, y + 3 + 1, GUIIcon.ArrowRight.getIcon());
         x += 18;
-        new ControlSlotArray(this, x, y + 3, 2, 3).create(Isolator.SLOT_FINISHED);
+        new ControlSlotArray(this, x, y + 3, 2, 3).create(actions, InventoryType.Machine, Isolator.SLOT_FINISHED);
         new ControlEnergyBar(this, 260, 130, 16, 60, Position.BOTTOM);
         new ControlErrorState(this, 153.0f, 81.0f);
-        new ControlPlayerInventory(this);
+        new ControlPlayerInventory(this).create(actions);
+
+        MessageCraftGUI.sendToServer(actions);
     }
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.machine.isolator");
+        return I18N.localise("gui.genetics.machine.machine.isolator.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java

@@ -2,10 +2,12 @@ package binnie.genetics.craftgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
 import binnie.core.craftgui.geometry.Position;
 import binnie.core.craftgui.minecraft.GUIIcon;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlEnergyBar;
 import binnie.core.craftgui.minecraft.control.ControlErrorState;
@@ -18,6 +20,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlotArray;
 import binnie.core.craftgui.minecraft.control.ControlSlotCharge;
 import binnie.core.craftgui.resource.Texture;
 import binnie.core.craftgui.resource.minecraft.StandardTexture;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.genetics.Genetics;
 import binnie.genetics.core.GeneticsTexture;
@@ -45,28 +48,34 @@ public class WindowPolymeriser extends WindowMachine {
     @Override
     public void initialiseClient() {
         super.initialiseClient();
+
+        final NBTTagList actions = new NBTTagList();
+
         int x = 16;
         int y = 38;
-        new ControlSlotArray(this, x, y, 1, 4).create(Polymeriser.SLOT_SERUM_RESERVE);
+        new ControlSlotArray(this, x, y, 1, 4).create(actions, InventoryType.Machine, Polymeriser.SLOT_SERUM_RESERVE);
         new ControlIconDisplay(this, x + 18, y + 1, GUIIcon.ArrowRight.getIcon());
         x += 34;
         new ControlMachineProgress(this, x + 18, y - 6, progressBase, progress, Position.LEFT);
-        new ControlSlot(this, x, y).assign(Polymeriser.SLOT_SERUM);
+        new ControlSlot(this, x, y).assign(actions, InventoryType.Machine, Polymeriser.SLOT_SERUM);
         new ControlLiquidTank(this, x, y + 18 + 16, true).setTankID(Polymeriser.TANK_BACTERIA);
         new ControlLiquidTank(this, x, y + 18 + 16 + 18 + 8, true).setTankID(Polymeriser.TANK_DNA);
         new ControlEnergyBar(this, x + 120, 96, 64, 16, Position.LEFT);
         x += 40;
-        new ControlSlot(this, x + 30, y + 18 + 8).assign(Polymeriser.SLOT_GOLD);
+        new ControlSlot(this, x + 30, y + 18 + 8).assign(actions, InventoryType.Machine, Polymeriser.SLOT_GOLD);
         new ControlSlotCharge(this, x + 30 + 20, y + 18 + 8, 1).setColor(0xffd800);
         x += 138;
-        new ControlSlotArray(this, x, y + 9, 2, 2).create(Polymeriser.SLOT_SERUM_FINISHED);
+        new ControlSlotArray(this, x, y + 9, 2, 2)
+                .create(actions, InventoryType.Machine, Polymeriser.SLOT_SERUM_FINISHED);
         new ControlErrorState(this, 244.0f, 97.0f);
-        new ControlPlayerInventory(this);
+        new ControlPlayerInventory(this).create(actions);
+
+        MessageCraftGUI.sendToServer(actions);
     }
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.machine.polymeriser");
+        return I18N.localise("gui.genetics.machine.machine.polymeriser.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowSequencer.java

@@ -3,6 +3,7 @@ package binnie.genetics.craftgui;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.EnumChatFormatting;
 
 import binnie.core.AbstractMod;
@@ -12,6 +13,7 @@ import binnie.core.craftgui.geometry.IArea;
 import binnie.core.craftgui.geometry.Position;
 import binnie.core.craftgui.geometry.TextJustification;
 import binnie.core.craftgui.minecraft.GUIIcon;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlEnergyBar;
 import binnie.core.craftgui.minecraft.control.ControlErrorState;
@@ -22,6 +24,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlotArray;
 import binnie.core.craftgui.minecraft.control.ControlSlotCharge;
 import binnie.core.craftgui.resource.Texture;
 import binnie.core.craftgui.resource.minecraft.StandardTexture;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.extrabees.core.ExtraBeeTexture;
 import binnie.genetics.Genetics;
@@ -61,6 +64,9 @@ public class WindowSequencer extends WindowMachine {
     @Override
     public void initialiseClient() {
         super.initialiseClient();
+
+        final NBTTagList actions = new NBTTagList();
+
         int x = 16;
         int y = 32;
         CraftGUIUtil.horizontalGrid(
@@ -68,13 +74,13 @@ public class WindowSequencer extends WindowMachine {
                 y,
                 TextJustification.MIDDLE_CENTER,
                 2.0f,
-                new ControlSlotArray(this, 0, 0, 2, 2).create(Sequencer.SLOT_RESERVE),
+                new ControlSlotArray(this, 0, 0, 2, 2).create(actions, InventoryType.Machine, Sequencer.SLOT_RESERVE),
                 new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()),
                 new ControlSequencerProgress(this, 0, 0),
                 new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()),
-                new ControlSlot(this, 0.0f, 0.0f).assign(6));
+                new ControlSlot(this, 0.0f, 0.0f).assign(actions, InventoryType.Machine, 6));
         ControlSlot slotTarget = new ControlSlot(this, x + 96, y + 16);
-        slotTarget.assign(5);
+        slotTarget.assign(actions, InventoryType.Machine, 5);
         x = 34;
         y = 92;
         slotText = new ControlText(
@@ -84,19 +90,21 @@ public class WindowSequencer extends WindowMachine {
                 TextJustification.MIDDLE_CENTER);
         y += 20;
         ControlSlot slotDye = new ControlSlot(this, x, y);
-        slotDye.assign(0);
+        slotDye.assign(actions, InventoryType.Machine, 0);
         x += 20;
         new ControlSlotCharge(this, x, y, 0).setColor(16750848);
         x += 32;
         new ControlEnergyBar(this, x, y, 60, 16, Position.LEFT);
         x += 92;
         new ControlErrorState(this, x, y + 1);
-        new ControlPlayerInventory(this);
+        new ControlPlayerInventory(this).create(actions);
+
+        MessageCraftGUI.sendToServer(actions);
     }
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.machine.sequencer");
+        return I18N.localise("gui.genetics.machine.machine.sequencer.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowSplicer.java

@@ -2,12 +2,14 @@ package binnie.genetics.craftgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.core.AbstractMod;
 import binnie.core.craftgui.geometry.CraftGUIUtil;
 import binnie.core.craftgui.geometry.Position;
 import binnie.core.craftgui.geometry.TextJustification;
 import binnie.core.craftgui.minecraft.GUIIcon;
+import binnie.core.craftgui.minecraft.InventoryType;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlEnergyBar;
 import binnie.core.craftgui.minecraft.control.ControlErrorState;
@@ -17,6 +19,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot;
 import binnie.core.craftgui.minecraft.control.ControlSlotArray;
 import binnie.core.craftgui.resource.Texture;
 import binnie.core.craftgui.resource.minecraft.StandardTexture;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.genetics.Genetics;
 import binnie.genetics.core.GeneticsTexture;
@@ -45,15 +48,20 @@ public class WindowSplicer extends WindowMachine {
     @Override
     public void initialiseClient() {
         super.initialiseClient();
+
+        final NBTTagList actions = new NBTTagList();
+
         int x = 16;
         new ControlSplicerProgress(this, 84.0f, 32.0f, w() - 172.0f, 102.0f);
         CraftGUIUtil.horizontalGrid(
                 x,
                 62.0f,
-                new ControlSlotArray(this, 0, 0, 2, 1).create(Splicer.SLOT_SERUM_RESERVE),
+                new ControlSlotArray(this, 0, 0, 2, 1)
+                        .create(actions, InventoryType.Machine, Splicer.SLOT_SERUM_RESERVE),
                 new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()),
-                new ControlSlot(this, 0.0f, 0.0f).assign(Splicer.SLOT_SERUM_VIAL));
-        new ControlSlotArray(this, x + 12, 84, 2, 1).create(Splicer.SLOT_SERUM_EXPENDED);
+                new ControlSlot(this, 0.0f, 0.0f).assign(actions, InventoryType.Machine, Splicer.SLOT_SERUM_VIAL));
+        new ControlSlotArray(this, x + 12, 84, 2, 1)
+                .create(actions, InventoryType.Machine, Splicer.SLOT_SERUM_EXPENDED);
         new ControlIconDisplay(this, x + 12 + 36 + 4, 86.0f, GUIIcon.ArrowUpLeft.getIcon());
         new ControlEnergyBar(this, 196, 64, 60, 16, Position.LEFT);
         new ControlErrorState(this, 218.0f, 86.0f);
@@ -62,17 +70,20 @@ public class WindowSplicer extends WindowMachine {
                 32.0f,
                 TextJustification.MIDDLE_CENTER,
                 4.0f,
-                new ControlSlotArray(this, 0, 0, 4, 1).create(Inoculator.SLOT_RESERVE),
+                new ControlSlotArray(this, 0, 0, 4, 1).create(actions, InventoryType.Machine, Inoculator.SLOT_RESERVE),
                 new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowDown.getIcon()),
-                new ControlSlot(this, 0.0f, 0.0f).assign(Splicer.SLOT_TARGET),
+                new ControlSlot(this, 0.0f, 0.0f).assign(actions, InventoryType.Machine, Splicer.SLOT_TARGET),
                 new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowDown.getIcon()),
-                new ControlSlotArray(this, 0, 0, 4, 1).create(Inoculator.SLOT_FINISHED));
-        new ControlPlayerInventory(this);
+                new ControlSlotArray(this, 0, 0, 4, 1)
+                        .create(actions, InventoryType.Machine, Inoculator.SLOT_FINISHED));
+        new ControlPlayerInventory(this).create(actions);
+
+        MessageCraftGUI.sendToServer(actions);
     }
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.advMachine.splicer");
+        return I18N.localise("gui.genetics.machine.advMachine.splicer.title");
     }
 
     @Override

src/main/java/binnie/genetics/gui/WindowAnalyst.java

@@ -6,6 +6,7 @@ import java.util.List;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagList;
 
 import binnie.Binnie;
 import binnie.botany.api.IFlower;
@@ -34,6 +35,7 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
 import binnie.core.craftgui.window.Panel;
 import binnie.core.genetics.BreedingSystem;
 import binnie.core.machines.inventory.SlotValidator;
+import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.util.I18N;
 import binnie.genetics.Genetics;
 import binnie.genetics.item.GeneticsItems;
@@ -121,12 +123,12 @@ public class WindowAnalyst extends Window {
     public void initialiseClient() {
         if (isDatabase) {
             if (isMaster) {
-                setTitle(I18N.localise("genetics.item.registry.1.name"));
+                setTitle(I18N.localise("genetics.gui.registry.1.title"));
             } else {
-                setTitle(I18N.localise("genetics.item.registry.0.name"));
+                setTitle(I18N.localise("genetics.gui.registry.title"));
             }
         } else {
-            setTitle(I18N.localise("genetics.item.analyst.name"));
+            setTitle(I18N.localise("genetics.gui.analyst.title"));
         }
 
         getWindowInventory().createSlot(0);
@@ -170,11 +172,13 @@ public class WindowAnalyst extends Window {
                 x += 22;
             }
         } else {
-            new ControlSlot(this, x, y + 1).assign(InventoryType.Window, 0);
+            final NBTTagList actions = new NBTTagList();
+            new ControlSlot(this, x, y + 1).assign(actions, InventoryType.Window, 0);
             x += 22;
-            new ControlSlot(this, x, y + 1).assign(InventoryType.Window, 1);
+            new ControlSlot(this, x, y + 1).assign(actions, InventoryType.Window, 1);
             x += 26;
             setupValidators();
+            MessageCraftGUI.sendToServer(actions);
         }
         tabBar = new Control(this, x, 28.0f, w() - 16.0f - x, 20.0f);
         analystPanel = new Panel(this, 16.0f, 54.0f, 280.0f, 164.0f, MinecraftGUI.PanelType.Outline) {
@@ -275,7 +279,7 @@ public class WindowAnalyst extends Window {
                     244.0f,
                     80.0f,
                     Position.BOTTOM);
-            new ControlPlayerInventory(slideUpInv, true);
+            new ControlPlayerInventory(slideUpInv, true).createAndRegister();
             slideUpInv.setSlide(false);
         }
         addEventHandler(new EventKey.Down.Handler() {
@@ -297,7 +301,7 @@ public class WindowAnalyst extends Window {
                 @Override
                 public void initialise() {
                     new ControlTextCentered(this, 20.0f, I18N.localise("genetics.gui.analyst.info")).setColor(0x444444);
-                    new ControlPlayerInventory(this);
+                    new ControlPlayerInventory(this).createAndRegister();
                 }
             };
         }

src/main/java/binnie/genetics/item/GeneticsItems.java

@@ -56,9 +56,6 @@ public enum GeneticsItems implements IItemMisc {
 
     @Override
     public ItemStack get(int count) {
-        if (Genetics.itemGenetics == null) {
-            return null;
-        }
         return new ItemStack(Genetics.itemGenetics, count, ordinal());
     }
 

src/main/java/binnie/genetics/item/ItemAnalyst.java

@@ -1,5 +1,7 @@
 package binnie.genetics.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;
@@ -19,6 +21,8 @@ public class ItemAnalyst extends Item {
         setCreativeTab(GeneticsCreativeTab.instance);
         setUnlocalizedName("analyst");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/genetics/item/ItemDatabase.java

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

src/main/java/binnie/genetics/item/ItemFieldKit.java

@@ -1,5 +1,7 @@
 package binnie.genetics.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -29,6 +31,8 @@ public class ItemFieldKit extends Item {
         setCreativeTab(GeneticsCreativeTab.instance);
         setMaxStackSize(1);
         setMaxDamage(64);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/genetics/item/ItemGene.java

@@ -1,5 +1,7 @@
 package binnie.genetics.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -26,6 +28,8 @@ public abstract class ItemGene extends Item {
         setMaxDamage(16);
         setUnlocalizedName(unlocName);
         setCreativeTab(GeneticsCreativeTab.instance);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/genetics/item/ItemMasterRegistry.java

@@ -1,5 +1,7 @@
 package binnie.genetics.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;
@@ -19,6 +21,8 @@ public class ItemMasterRegistry extends Item {
         setCreativeTab(GeneticsCreativeTab.instance);
         setUnlocalizedName("masterRegistry");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/genetics/item/ItemRegistry.java

@@ -1,5 +1,7 @@
 package binnie.genetics.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;
@@ -19,6 +21,8 @@ public class ItemRegistry extends Item {
         setCreativeTab(GeneticsCreativeTab.instance);
         setUnlocalizedName("registry");
         setMaxStackSize(1);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override

src/main/java/binnie/genetics/item/ItemSequence.java

@@ -1,5 +1,7 @@
 package binnie.genetics.item;
 
+import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -31,6 +33,8 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl
         setMaxDamage(5);
         setUnlocalizedName("sequence");
         setCreativeTab(GeneticsCreativeTab.instance);
+
+        registerItem(this, getUnlocalizedName().substring(5));
     }
 
     public static ItemStack create(IGene gene) {
@@ -116,4 +120,9 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl
     public int getCharges(ItemStack stack) {
         return stack.getItem().getMaxDamage() - stack.getItemDamage();
     }
+
+    @Override
+    public boolean isRepairable() {
+        return false;
+    }
 }

src/main/java/binnie/genetics/item/ModuleItem.java

@@ -12,6 +12,7 @@ import binnie.botany.Botany;
 import binnie.core.BinnieCore;
 import binnie.core.IInitializable;
 import binnie.core.Mods;
+import binnie.core.item.ItemMisc;
 import binnie.core.liquid.ItemFluidContainer;
 import binnie.core.resource.BinnieIcon;
 import binnie.extrabees.ExtraBees;
@@ -44,7 +45,7 @@ public class ModuleItem implements IInitializable {
         Genetics.itemSerum = new ItemSerum();
         Genetics.itemSerumArray = new ItemSerumArray();
         Genetics.itemSequencer = new ItemSequence();
-        Genetics.itemGenetics = Binnie.Item.registerMiscItems(GeneticsItems.values(), GeneticsCreativeTab.instance);
+        Genetics.itemGenetics = new ItemMisc(GeneticsCreativeTab.instance, GeneticsItems.values());
         Genetics.database = new ItemDatabase();
         Genetics.analyst = new ItemAnalyst();
         Genetics.registry = new ItemRegistry();

src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java

@@ -19,6 +19,10 @@ import forestry.api.genetics.IIndividual;
 
 public class SplicerComponentLogic extends ComponentProcessSetCost implements IProcess {
 
+    // Needed to keep stack. If user takes out target slot and it gets automatically refilled, this happens in the same
+    // tick
+    private ItemStack workedOnStack = null;
+
     public int nOfGenes;
 
     public SplicerComponentLogic(Machine machine) {
@@ -50,6 +54,11 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP
     public void onInventoryUpdate() {
         super.onInventoryUpdate();
         nOfGenes = getGenesToUse();
+        ItemStack newTarget = getUtil().getStack(Splicer.SLOT_TARGET);
+
+        if (newTarget == null || !ItemStack.areItemStacksEqual(workedOnStack, newTarget)) {
+            workedOnStack = null;
+        }
     }
 
     protected int getGenesToUse() {
@@ -190,5 +199,31 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP
             Splicer.setGene(gene, target, 1);
         }
         getUtil().damageItem(Splicer.SLOT_SERUM_VIAL, 1);
+        workedOnStack = getUtil().getStack(Splicer.SLOT_TARGET).copy();
+    }
+
+    @Override
+    public boolean workedOnTarget() {
+        return ItemStack.areItemStacksEqual(workedOnStack, getUtil().getStack(Splicer.SLOT_TARGET));
+    }
+
+    @Override
+    public void readFromNBT(NBTTagCompound nbt) {
+        super.readFromNBT(nbt);
+        NBTTagCompound tagWorkedOnStack = (NBTTagCompound) nbt.getTag("workedOnStack");
+        if (tagWorkedOnStack != null) {
+            workedOnStack = ItemStack.loadItemStackFromNBT(tagWorkedOnStack);
+        }
+    }
+
+    @Override
+    public void writeToNBT(NBTTagCompound nbt) {
+        super.writeToNBT(nbt);
+        if (workedOnStack != null) {
+            NBTTagCompound tagWorkedOnStack = new NBTTagCompound();
+            workedOnStack.writeToNBT(tagWorkedOnStack);
+            // Need to save, in case inventory is full it might need to get moved out way later.
+            nbt.setTag("workedOnStack", tagWorkedOnStack);
+        }
     }
 }

src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java

@@ -3,6 +3,7 @@ package binnie.genetics.machine.splicer;
 import net.minecraft.item.ItemStack;
 
 import binnie.core.craftgui.minecraft.IMachineInformation;
+import binnie.core.machines.IMachine;
 import binnie.core.machines.Machine;
 import binnie.core.machines.inventory.ComponentInventorySlots;
 import binnie.core.machines.inventory.ComponentInventoryTransfer;
@@ -79,8 +80,20 @@ public class SplicerPackage extends AdvGeneticMachine.PackageAdvGeneticBase impl
 
             @Override
             public boolean fufilled(ItemStack stack) {
-                return stack != null && transfer.getMachine().getMachineUtil().getStack(Splicer.SLOT_SERUM_VIAL) != null
-                        && transfer.getMachine().getInterface(SplicerComponentLogic.class).isValidSerum() != null;
+                if (stack == null) {
+                    return false;
+                }
+                IMachine machine = transfer.getMachine();
+                boolean hasSerum = machine.getMachineUtil().getStack(Splicer.SLOT_SERUM_VIAL) != null;
+
+                if (hasSerum) {
+                    // Move item if it can't be processed anymore with current serum.
+                    boolean validSerum = machine.getInterface(SplicerComponentLogic.class).isValidSerum() == null;
+                    return !validSerum;
+                } else {
+                    // Move item if there is no serum and item got processed already
+                    return machine.getMachineUtil().getProcess().workedOnTarget();
+                }
             }
         });
 

src/main/resources/assets/binniecore/gui/stylesheet.json

@@ -69,6 +69,12 @@
             "uv": "4 4 18 18",
             "padding": "2"
         },
+        {
+            "name": "slot.inventory",
+            "sheet": "slots",
+            "uv": "76 4 18 18",
+            "padding": "2"
+        },
         {
             "name": "slot.border",
             "sheet": "slots",

src/main/resources/assets/genetics/lang/en_US.lang

@@ -36,6 +36,10 @@ genetics.item.registry.1.name=Master Registry
 genetics.item.serum.name=%s Serum
 genetics.item.serumArray.name=%s Serum Array
 
+genetics.gui.registry.title=Registry
+genetics.gui.registry.1.title=Master Registry
+genetics.gui.analyst.title=Analyst
+
 genetics.item.sequence=DNA Sequence
 genetics.item.sequence.0=Very Faint
 genetics.item.sequence.1=Faint
@@ -59,6 +63,7 @@ genetics.sequence.partially=Partially Sequenced (%d%%)
 
 tile.machine.name=Isolator
 genetics.machine.machine.isolator=Isolator
+gui.genetics.machine.machine.isolator.title=Isolator
 genetics.machine.machine.isolator.info=The Isolator takes a random allele from a bee, tree or other individual and copies it into an empty sequence vial. This requires the use of ethanol as a solvent and an enzyme to cut up the DNA. The unsequenced serums can then be amplified in a Polymeriser and sequenced in a Sequencer. This process has a small chance to destroy the individual.
 genetics.machine.isolator.error.noIndividual=No individual to isolate
 genetics.machine.isolator.error.noRoom=No room for DNA sequences
@@ -67,6 +72,7 @@ genetics.machine.isolator.error.noLiquid=Insufficient ethanol
 genetics.machine.isolator.error.noEnzyme=No enzyme
 
 genetics.machine.machine.sequencer=Sequencer
+gui.genetics.machine.machine.sequencer.title=Sequencer
 genetics.machine.machine.sequencer.info=The Sequencer takes unsequenced serums and determines which allele is present in them. This process is slow and requires the use of fluorescent dye.
 genetics.machine.sequencer.unsequencedDNA=Unsequenced DNA
 genetics.machine.sequencer.error.noSequence=No DNA sequence
@@ -78,6 +84,7 @@ genetics.machine.sequencer.gui.sequensedBy=Genes will be sequenced by %s
 genetics.machine.sequencer.gui.willNotSave=Userless. Will not save sequences
 
 genetics.machine.machine.polymeriser=Polymeriser
+gui.genetics.machine.machine.polymeriser.title=Polymeriser
 genetics.machine.machine.polymeriser.info=The Polymeriser fills empty serums with Raw DNA and replicating bacteria. This process can be accelerated using gold nuggets. 
 genetics.machine.polymeriser.error.noItem=No item to replicate
 genetics.machine.polymeriser.error.itemFilled=Item Filled
@@ -88,6 +95,7 @@ genetics.machine.polymeriser.replicatingWithGenes=Replicating with %d genes
 genetics.machine.polymeriser.unfilledSerum=Unfilled Serum
 
 genetics.machine.machine.inoculator=Inoculator
+gui.genetics.machine.machine.inoculator.title=Inoculator
 genetics.machine.machine.inoculator.info=The Inoculator uses serums to add genes to breedable individuals. This process is very slow and requires a Bacteria Vector, but is always successful.  
 genetics.machine.inoculator.error.noIndividual=No Individual to Inoculate
 genetics.machine.inoculator.error.noSerum=No Serum
@@ -105,6 +113,7 @@ genetics.machine.inoculator.inoculableIndividual=Inoculable Individual
 genetics.machine.inoculator.serums=Serum Vials & Arrays
 
 genetics.machine.labMachine.genepool=Genepool
+gui.genetics.machine.labMachine.genepool.title=Genepool
 genetics.machine.labMachine.genepool.info=The Genepool uses enzymes and ethanol to break down living things into DNA. During this process, all genetic information is lost and the source of the DNA is destroyed.
 genetics.machine.genepool.error.noIndividual=No Individual
 genetics.machine.genepool.error.noRoom=Not enough room in Tank
@@ -115,6 +124,7 @@ tile.labMachine.name=Lab Stand
 genetics.machine.labMachine.labMachine=Lab Stand
 
 genetics.machine.labMachine.analyser=Analyzer
+gui.genetics.machine.labMachine.analyser.title=Analyzer
 genetics.machine.labMachine.analyser.info=The Analyzer takes breedable individuals and DNA sequencers and analyzes them to determine the genes present. This requires DNA Dye, created from purple dye and glowstone
 genetics.machine.analyser.dnaDye=DNA Dye
 genetics.machine.analyser.unanalysedItem=Unanalyzed Item
@@ -125,6 +135,7 @@ genetics.machine.analyser.error.insufficientDye=Not enough DNA dye to analyze
 genetics.machine.analyser.error.noItem=No item to analyze
 
 genetics.machine.labMachine.incubator=Incubator
+gui.genetics.machine.labMachine.incubator.title=Incubator
 genetics.machine.labMachine.incubator.info=The Incubator combines liquids and items and allows them to sit at an ideal temperature to encourage bacterial growth. 
 genetics.machine.incubator.error.noRecipe.title=No Recipe
 genetics.machine.incubator.error.noRecipe=There is no valid recipe
@@ -132,6 +143,7 @@ genetics.machine.incubator.error.noLiquid=Not enough incubation liquid
 genetics.machine.incubator.error.noRoom=No room for output
 
 genetics.machine.labMachine.acclimatiser=Acclimatiser
+gui.genetics.machine.labMachine.acclimatiser.title=Acclimatiser
 genetics.machine.labMachine.acclimatiser.info=The Acclimatiser uses acclimatizing items to adjust the temperature and humidity tolerance of individuals. This process has only a small chance to succeed.
 genetics.machine.acclimatiser.acclimatizingItems=Acclimatizing Items
 genetics.machine.acclimatiser.error.noIndividual=No Individual to Acclimatise
@@ -140,6 +152,7 @@ genetics.machine.acclimatiser.error.invalidAcclimatizingItems=Cannot Acclimatise
 
 tile.advMachine.name=Splicer
 genetics.machine.advMachine.splicer=Splicer
+gui.genetics.machine.advMachine.splicer.title=Splicer
 genetics.machine.advMachine.splicer.info=The Splicer is an incredibly powerful machine that is used to insert genes into individuals. This process is fast, but requires monumental amounts of power.
 genetics.machine.splicer.error.noIndividual=No Individual to Splice
 genetics.machine.splicer.error.noSerum=No Serum