update

dependencies.gradle

@@ -1,10 +1,10 @@
 // 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.10.14:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.6.38:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.90-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.64-GTNH:dev')
 
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

settings.gradle

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

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

@@ -92,6 +92,7 @@ public class Botany extends AbstractMod {
     public static BlockCeramicBrick ceramicBrick;
 
     public Botany() {
+        super();
         Botany.instance = this;
         MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
@@ -208,7 +209,7 @@ public class Botany extends AbstractMod {
         }
     }
 
-    public static class EventHandler {
+    public class EventHandler {
 
         @SubscribeEvent
         public void onShearFlower(PlayerInteractEvent event) {

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

@@ -6,6 +6,8 @@ import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 
+import net.minecraftforge.common.MinecraftForge;
+
 import binnie.core.gui.IBinnieGUID;
 import binnie.core.mod.parser.FieldParser;
 import binnie.core.network.BinniePacketHandler;
@@ -128,6 +130,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
 
     protected void addModule(IInitializable init) {
         modules.add(init);
-        init.registerEventHandler();
+        MinecraftForge.EVENT_BUS.register(init);
     }
 }

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

@@ -5,6 +5,7 @@ import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.MinecraftForge;
@@ -60,6 +61,11 @@ public class BinnieCore extends AbstractMod {
     @Mod.Instance("BinnieCore")
     public static BinnieCore instance;
 
+    public BinnieCore() {
+        super();
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
+    }
+
     @SidedProxy(clientSide = "binnie.core.proxy.BinnieProxyClient", serverSide = "binnie.core.proxy.BinnieProxyServer")
     public static BinnieProxy proxy;
 
@@ -69,10 +75,6 @@ public class BinnieCore extends AbstractMod {
     public static ItemGenesis genesis;
     public static ItemFieldKit fieldKit;
 
-    public BinnieCore() {
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
-    }
-
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         for (ManagerBase baseManager : Binnie.Managers) {
@@ -202,7 +204,7 @@ public class BinnieCore extends AbstractMod {
         }
     }
 
-    public static class EventHandler {
+    public class EventHandler {
 
         @SubscribeEvent
         @SideOnly(Side.CLIENT)
@@ -214,6 +216,8 @@ public class BinnieCore extends AbstractMod {
                     return;
                 }
                 event.tracker.synchToPlayer(player);
+                NBTTagCompound nbt = new NBTTagCompound();
+                nbt.setString("species", event.species.getUID());
             } catch (Exception ex) {
                 // ignored
             }

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

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

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

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

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

@@ -235,11 +235,11 @@ public class Widget implements IWidget {
 
     @Override
     public void callEvent(Event event) {
-        getSuperParent().receiveEvent(event);
+        getSuperParent().recieveEvent(event);
     }
 
     @Override
-    public void receiveEvent(Event event) {
+    public void recieveEvent(Event event) {
         for (EventHandler handler : globalEventHandlers) {
             if (handler.handles(event)) {
                 handler.onEvent(event);
@@ -248,7 +248,7 @@ public class Widget implements IWidget {
 
         try {
             for (IWidget child : getWidgets()) {
-                child.receiveEvent(event);
+                child.recieveEvent(event);
             }
         } catch (ConcurrentModificationException e) {
             // ignored

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

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

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

@@ -175,8 +175,8 @@ public class WindowGenesis extends Window {
     }
 
     @Override
-    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
-        super.receiveGuiNBT(side, player, name, nbt);
+    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+        super.recieveGuiNBT(side, player, name, nbt);
         if (side == Side.SERVER && name.equals("genesis")) {
             ItemStack stack = ItemStack.loadItemStackFromNBT(nbt);
             InventoryPlayer playerInv = player.inventory;

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

@@ -7,7 +7,6 @@ import java.util.Map;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.IInventory;
@@ -38,34 +37,42 @@ import cpw.mods.fml.relauncher.Side;
 public class ContainerCraftGUI extends Container {
 
     private final Window window;
-    private final Map<String, NBTTagCompound> syncedNBT = new HashMap<>();
-    private final Map<String, NBTTagCompound> sentNBT = new HashMap<>();
-    private final Map<Integer, TankInfo> syncedTanks = new HashMap<>();
-    private PowerInfo syncedPower = new PowerInfo();
-    private ProcessInfo syncedProcess = new ProcessInfo();
-    private int errorType = 0;
-    private ErrorState error = null;
-    private int mousedOverSlotNumber = -1;
+    private final Map<String, NBTTagCompound> syncedNBT;
+    private final Map<String, NBTTagCompound> sentNBT;
+    private final Map<Integer, TankInfo> syncedTanks;
+    private PowerInfo syncedPower;
+    private ProcessInfo syncedProcess;
+    private int errorType;
+    private ErrorState error;
+    private int mousedOverSlotNumber;
 
     public ContainerCraftGUI(Window window) {
         this.window = window;
+        syncedNBT = new HashMap<>();
+        sentNBT = new HashMap<>();
+        syncedTanks = new HashMap<>();
+        syncedPower = new PowerInfo();
+        syncedProcess = new ProcessInfo();
+        errorType = 0;
+        error = null;
+        mousedOverSlotNumber = -1;
+        IMachine machine = Machine.getMachine(window.getInventory());
+        if (getSide() != Side.SERVER) {
+            return;
+        }
 
-        if (!window.isServer()) return;
-
-        // WARNING: The client side expects `ArrayList` and the server expects `ListMap`
         inventoryItemStacks = new ListMap<>();
         inventorySlots = new ListMap<>();
-
-        IInventory entityInventory = window.getInventory();
-        IMachine machine = Machine.getMachine(entityInventory);
-        if (machine == null) return;
+        if (machine == null) {
+            return;
+        }
 
         GameProfile user = machine.getOwner();
-        if (user == null) return;
-
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setString("username", user.getName());
-        sendNBTToClient("username", nbt);
+        if (user != null) {
+            NBTTagCompound nbt = new NBTTagCompound();
+            nbt.setString("username", user.getName());
+            sendNBTToClient("username", nbt);
+        }
     }
 
     @Override
@@ -79,7 +86,10 @@ public class ContainerCraftGUI extends Container {
 
     @Override
     public Slot getSlot(int index) {
-        return index < 0 || index >= inventorySlots.size() ? null : inventorySlots.get(index);
+        if (index < 0 || index >= inventorySlots.size()) {
+            return null;
+        }
+        return inventorySlots.get(index);
     }
 
     @Override
@@ -101,27 +111,29 @@ public class ContainerCraftGUI extends Container {
     @Override
     public void onContainerClosed(EntityPlayer player) {
         super.onContainerClosed(player);
-        WindowInventory windowInventory = window.getWindowInventory();
-        InventoryPlayer playerInventory = player.inventory;
+        WindowInventory inventory = window.getWindowInventory();
+        for (int i = 0; i < inventory.getSizeInventory(); ++i) {
+            if (!inventory.dispenseOnClose(i)) {
+                continue;
+            }
 
-        for (int i = 0; i < windowInventory.getSizeInventory(); ++i) {
-            if (!windowInventory.dispenseOnClose(i)) continue;
+            ItemStack stack = inventory.getStackInSlot(i);
+            if (stack == null) {
+                continue;
+            }
 
-            final ItemStack stack = windowInventory.getStackInSlot(i);
-            if (stack == null) continue;
-
-            final ItemStack newStack = new TransferRequest(stack, playerInventory).transfer(true);
-            if (newStack == null) continue;
-
-            player.dropPlayerItemWithRandomChoice(newStack, false);
+            stack = new TransferRequest(stack, player.inventory).transfer(true);
+            if (stack != null) {
+                player.dropPlayerItemWithRandomChoice(stack, false);
+            }
         }
     }
 
     @Override
     public ItemStack slotClick(int slotNum, int mouseButton, int modifier, EntityPlayer player) {
         Slot slot = getSlot(slotNum);
-        if (slot instanceof CustomSlot customSlot && customSlot.handleClick()) {
-            customSlot.onSlotClick(this, mouseButton, modifier, player);
+        if (slot instanceof CustomSlot && ((CustomSlot) slot).handleClick()) {
+            ((CustomSlot) slot).onSlotClick(this, mouseButton, modifier, player);
             return player.inventory.getItemStack();
         }
         return super.slotClick(slotNum, mouseButton, modifier, player);
@@ -139,8 +151,8 @@ public class ContainerCraftGUI extends Container {
             }
             sentNBT.clear();
         }
-        IInventory entityInventory = window.getInventory();
-        return entityInventory == null || entityInventory.isUseableByPlayer(player);
+        IInventory inventory = window.getInventory();
+        return inventory == null || inventory.isUseableByPlayer(player);
     }
 
     @Override
@@ -162,20 +174,22 @@ public class ContainerCraftGUI extends Container {
     }
 
     private TransferRequest getShiftClickRequest(EntityPlayer player, int index) {
-        if (index < 0) return null;
+        if (index < 0) {
+            return null;
+        }
 
-        Slot shiftClickedSlot = inventorySlots.get(index);
+        Slot shiftClickedSlot = (Slot) inventorySlots.get(index);
         ItemStack itemstack = null;
         if (shiftClickedSlot.getHasStack()) {
             itemstack = shiftClickedSlot.getStack().copy();
         }
 
         IInventory playerInventory = player.inventory;
-        IInventory entityInventory = window.getInventory();
+        IInventory containerInventory = window.getInventory();
         IInventory windowInventory = window.getWindowInventory();
-        IInventory fromPlayer = (entityInventory == null) ? windowInventory : entityInventory;
+        IInventory fromPlayer = (containerInventory == null) ? windowInventory : containerInventory;
         int[] target = new int[36];
-        for (int i = 0; i < target.length; ++i) {
+        for (int i = 0; i < 36; ++i) {
             target[i] = i;
         }
 
@@ -187,107 +201,109 @@ public class ContainerCraftGUI extends Container {
                     .setTargetSlots(target);
         }
 
-        if (window instanceof IWindowAffectsShiftClick iWindowAffectsShiftClick) {
-            iWindowAffectsShiftClick.alterRequest(request);
+        if (window instanceof IWindowAffectsShiftClick) {
+            ((IWindowAffectsShiftClick) window).alterRequest(request);
         }
         return request;
     }
 
-    @SuppressWarnings("UnusedReturnValue")
     public ItemStack tankClick(EntityPlayer player, int slotID) {
-        if (player.inventory.getItemStack() == null) return null;
-
-        ItemStack heldItem = player.inventory.getItemStack().copy();
-        IInventory entityInventory = window.getInventory();
-        heldItem = new TransferRequest(heldItem, entityInventory).setOrigin(player.inventory).setTargetSlots(new int[0])
-                .setTargetTanks(new int[] { slotID }).transfer(true);
-
-        player.inventory.setItemStack(heldItem);
-
-        if (player instanceof EntityPlayerMP entityPlayerMP) {
-            entityPlayerMP.updateHeldItem();
+        if (player.inventory.getItemStack() == null) {
+            return null;
         }
 
+        ItemStack heldItem = player.inventory.getItemStack().copy();
+        heldItem = new TransferRequest(heldItem, window.getInventory()).setOrigin(player.inventory)
+                .setTargetSlots(new int[0]).setTargetTanks(new int[] { slotID }).transfer(true);
+        player.inventory.setItemStack(heldItem);
+        if (player instanceof EntityPlayerMP) {
+            ((EntityPlayerMP) player).updateHeldItem();
+        }
         return heldItem;
     }
 
-    public void handleNBT(Side side, EntityPlayer player, String name, NBTTagCompound action) {
+    public boolean handleNBT(Side side, EntityPlayer player, String name, NBTTagCompound action) {
         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);
+            if (name.equals("tank-click")) {
+                tankClick(player, action.getByte("id"));
+            }
+            if (name.equals("slot-reg")) {
+                int type = action.getByte("t");
+                int index = action.getShort("i");
+                int slotNumber = action.getShort("n");
+                getOrCreateSlot(InventoryType.values()[type % 4], index, slotNumber);
 
-                    for (ICrafting crafterObject : crafters) {
-                        crafterObject.sendContainerAndContentsToPlayer(this, getInventory());
-                    }
+                for (ICrafting crafterObject : crafters) {
+                    crafterObject.sendContainerAndContentsToPlayer(this, getInventory());
                 }
             }
         }
 
-        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);
-            default -> {
-                if (name.contains("tank-update")) onTankUpdate(action);
-            }
+        if (name.contains("tank-update")) {
+            onTankUpdate(action);
+        } else if (name.equals("power-update")) {
+            onPowerUpdate(action);
+        } else if (name.equals("process-update")) {
+            onProcessUpdate(action);
+        } else if (name.equals("error-update")) {
+            onErrorUpdate(action);
+        } else if (name.equals("mouse-over-slot")) {
+            onMouseOverSlot(player, action);
+        } else if (name.equals("shift-click-info")) {
+            onRecieveShiftClickHighlights(player, action);
         }
+        return false;
     }
 
     @Override
     public void detectAndSendChanges() {
         super.detectAndSendChanges();
-
-        IInventory entityInventory = window.getInventory();
-        ITankMachine tanks = Machine.getInterface(ITankMachine.class, entityInventory);
-        IPoweredMachine powered = Machine.getInterface(IPoweredMachine.class, entityInventory);
-        IErrorStateSource error = Machine.getInterface(IErrorStateSource.class, entityInventory);
-        IProcess process = Machine.getInterface(IProcess.class, entityInventory);
-
-        if (window.isServer() && tanks != null) {
-            final TankInfo[] tankInfos = tanks.getTankInfos();
-            for (int i = 0; i < tankInfos.length; ++i) {
-                final TankInfo tank = tankInfos[i];
-                if (this.getTankInfo(i).equals(tank)) continue;
-                syncedNBT.put("tank-update-" + i, createTankNBT(i, tank));
-                syncedTanks.put(i, tank);
+        ITankMachine tanks = Machine.getInterface(ITankMachine.class, window.getInventory());
+        IPoweredMachine powered = Machine.getInterface(IPoweredMachine.class, window.getInventory());
+        IErrorStateSource error = Machine.getInterface(IErrorStateSource.class, window.getInventory());
+        IProcess process = Machine.getInterface(IProcess.class, window.getInventory());
+        if (tanks != null && window.isServer()) {
+            for (int i = 0; i < tanks.getTankInfos().length; ++i) {
+                TankInfo tank = tanks.getTankInfos()[i];
+                if (!getTankInfo(i).equals(tank)) {
+                    syncedNBT.put("tank-update-" + i, createTankNBT(i, tank));
+                    syncedTanks.put(i, tank);
+                }
             }
         }
 
-        if (window.isServer()) {
-            if (powered != null) syncedNBT.put("power-update", createPowerNBT(powered.getPowerInfo()));
-            if (process != null) syncedNBT.put("process-update", createProcessNBT(process.getInfo()));
-            if (error != null) syncedNBT.put("error-update", createErrorNBT(error));
+        if (powered != null && window.isServer()) {
+            syncedNBT.put("power-update", createPowerNBT(powered.getPowerInfo()));
+        }
+        if (process != null && window.isServer()) {
+            syncedNBT.put("process-update", createProcessNBT(process.getInfo()));
+        }
+        if (error != null && window.isServer()) {
+            syncedNBT.put("error-update", createErrorNBT(error));
         }
 
-        INetwork.SendGuiNBT machineSync = Machine.getInterface(INetwork.SendGuiNBT.class, entityInventory);
-
-        if (machineSync != null) machineSync.sendGuiNBT(syncedNBT);
+        INetwork.SendGuiNBT machineSync = Machine.getInterface(INetwork.SendGuiNBT.class, window.getInventory());
+        if (machineSync != null) {
+            machineSync.sendGuiNBT(syncedNBT);
+        }
 
         Map<String, NBTTagCompound> sentThisTime = new HashMap<>();
         for (Map.Entry<String, NBTTagCompound> nbt : syncedNBT.entrySet()) {
-            final NBTTagCompound nbtValue = nbt.getValue();
-            final String nbtKey = nbt.getKey();
-            final NBTTagCompound nbtValuePrev = sentNBT.get(nbtKey);
-
-            nbtValue.setString("type", nbtKey);
-
-            if (nbtValue.equals(nbtValuePrev)) continue;
-
-            for (ICrafting crafter : crafters) {
-                if (crafter instanceof EntityPlayerMP playerMP) {
-                    final MessageContainerUpdate packet = new MessageContainerUpdate(nbtValue);
-                    BinnieCore.proxy.sendToPlayer(packet, playerMP);
-                }
+            nbt.getValue().setString("type", nbt.getKey());
+            boolean shouldSend = true;
+            NBTTagCompound lastSent = sentNBT.get(nbt.getKey());
+            if (lastSent != null) {
+                shouldSend = !lastSent.equals(nbt.getValue());
             }
 
-            sentThisTime.put(nbtKey, nbtValue);
+            if (shouldSend) {
+                for (Object crafter : crafters) {
+                    if (crafter instanceof EntityPlayerMP playerMP) {
+                        BinnieCore.proxy.sendToPlayer(new MessageContainerUpdate(nbt.getValue()), playerMP);
+                    }
+                }
+                sentThisTime.put(nbt.getKey(), nbt.getValue());
+            }
         }
 
         sentNBT.putAll(sentThisTime);
@@ -338,8 +354,7 @@ public class ContainerCraftGUI extends Container {
     }
 
     public void onProcessUpdate(NBTTagCompound nbt) {
-        syncedProcess = new ProcessInfo();
-        syncedProcess.readFromNBT(nbt);
+        (syncedProcess = new ProcessInfo()).readFromNBT(nbt);
     }
 
     public void onPowerUpdate(NBTTagCompound nbt) {
@@ -388,7 +403,9 @@ public class ContainerCraftGUI extends Container {
     }
 
     public void setMouseOverSlot(Slot slot) {
-        if (slot.slotNumber == mousedOverSlotNumber) return;
+        if (slot.slotNumber == mousedOverSlotNumber) {
+            return;
+        }
 
         mousedOverSlotNumber = slot.slotNumber;
         ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).clear();
@@ -424,10 +441,10 @@ public class ContainerCraftGUI extends Container {
         syncedNBT.put("shift-click-info", nbt);
     }
 
-    private void onReceiveShiftClickHighlights(EntityPlayer player, NBTTagCompound data) {
+    private void onRecieveShiftClickHighlights(EntityPlayer player, NBTTagCompound data) {
         ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).clear();
-        for (int slotIndex : data.getIntArray("slots")) {
-            ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).add(slotIndex);
+        for (int slotnumber : data.getIntArray("slots")) {
+            ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).add(slotnumber);
         }
     }
 
@@ -441,13 +458,17 @@ public class ContainerCraftGUI extends Container {
         return null;
     }
 
-    public void receiveNBT(Side side, EntityPlayer player, NBTTagCompound action) {
+    public void recieveNBT(Side side, EntityPlayer player, NBTTagCompound action) {
         String name = action.getString("type");
-        handleNBT(side, player, name, action);
-        window.receiveGuiNBT(getSide(), player, name, action);
-        INetwork.ReceiveGuiNBT machine = Machine.getInterface(INetwork.ReceiveGuiNBT.class, window.getInventory());
-        if (machine == null) return;
-        machine.receiveGuiNBT(getSide(), player, name, action);
+        if (handleNBT(side, player, name, action)) {
+            return;
+        }
+
+        window.recieveGuiNBT(getSide(), player, name, action);
+        INetwork.RecieveGuiNBT machine = Machine.getInterface(INetwork.RecieveGuiNBT.class, window.getInventory());
+        if (machine != null) {
+            machine.recieveGuiNBT(getSide(), player, name, action);
+        }
     }
 
     public Slot getOrCreateSlot(InventoryType type, int index) {
@@ -467,21 +488,28 @@ public class ContainerCraftGUI extends Container {
     }
 
     protected IInventory getInventory(InventoryType type) {
-        return switch (type) {
-            case Machine -> window.getInventory();
-            case Player -> window.getPlayer().inventory;
-            case Window -> window.getWindowInventory();
-            default -> null;
-        };
+        if (type == InventoryType.Machine) {
+            return window.getInventory();
+        }
+        if (type == InventoryType.Player) {
+            return window.getPlayer().inventory;
+        }
+        if (type == InventoryType.Window) {
+            return window.getWindowInventory();
+        }
+        return null;
     }
 
-    private void createSlot(InventoryType type, int index, int slotNumber) {
-        if (inventorySlots.get(slotNumber) != null) return;
-
+    private Slot getOrCreateSlot(InventoryType type, int index, int slotNumber) {
         IInventory inventory = getInventory(type);
+        if (inventorySlots.get(slotNumber) != null) {
+            return null;
+        }
+
         Slot slot = new CustomSlot(inventory, index);
         slot.slotNumber = slotNumber;
         inventorySlots.add(slotNumber, slot);
         inventoryItemStacks.add(slotNumber, null);
+        return slot;
     }
 }

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

@@ -48,7 +48,7 @@ import binnie.core.resource.ResourceType;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public abstract class Window extends TopLevelWidget implements INetwork.ReceiveGuiNBT {
+public abstract class Window extends TopLevelWidget implements INetwork.RecieveGuiNBT {
 
     protected float titleButtonLeft;
     protected float titleButtonRight;
@@ -291,7 +291,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
     }
 
     @Override
-    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
         if (side == Side.CLIENT && name.equals("username")) {
             float w = w();
             float titleButtonRight = this.titleButtonRight + 16.0f;

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

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

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

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

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

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

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

@@ -277,16 +277,16 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack
     }
 
     @Override
-    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
-        for (INetwork.ReceiveGuiNBT receive : getInterfaces(INetwork.ReceiveGuiNBT.class)) {
-            receive.receiveGuiNBT(side, player, name, nbt);
+    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+        for (INetwork.RecieveGuiNBT recieve : getInterfaces(INetwork.RecieveGuiNBT.class)) {
+            recieve.recieveGuiNBT(side, player, name, nbt);
         }
     }
 
     @Override
     public void sendGuiNBT(Map<String, NBTTagCompound> nbts) {
-        for (INetwork.SendGuiNBT receive : getInterfaces(INetwork.SendGuiNBT.class)) {
-            receive.sendGuiNBT(nbts);
+        for (INetwork.SendGuiNBT recieve : getInterfaces(INetwork.SendGuiNBT.class)) {
+            recieve.sendGuiNBT(nbts);
         }
     }
 }

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

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

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

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

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

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

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

@@ -69,7 +69,7 @@ class ComponentCompartmentInventory extends ComponentInventorySlots implements I
     }
 
     @Override
-    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
         if (name.equals("comp-tabs")) {
             NBTTagList tags = nbt.getTagList("tabs", 10);
             for (int i = 0; i < tags.tagCount(); ++i) {

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

@@ -496,8 +496,8 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
     }
 
     @Override
-    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
-        super.receiveGuiNBT(side, player, name, nbt);
+    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+        super.recieveGuiNBT(side, player, name, nbt);
         if (name.equals("tab-change")) {
             currentTab = nbt.getByte("i");
         }

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

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

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

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

src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionModifierComponent.java

@@ -48,8 +48,8 @@ public class TransmissionModifierComponent extends ComponentBeeModifier implemen
         }
 
         for (IEnergyHandler handler : handlers) {
-            int received = handler.receiveEnergy(ForgeDirection.NORTH, output, false);
-            getUtil().getPoweredMachine().receiveEnergy(ForgeDirection.NORTH, -received, false);
+            int recieved = handler.receiveEnergy(ForgeDirection.NORTH, output, false);
+            getUtil().getPoweredMachine().receiveEnergy(ForgeDirection.NORTH, -recieved, false);
             energy = getUtil().getPoweredMachine().getEnergyStored(ForgeDirection.NORTH);
             if (energy <= 0) {
                 return;

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

@@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack;
 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.Window;
 import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
@@ -49,7 +48,7 @@ public class WindowAlvearyMutator extends Window {
                 I18N.localise("extrabees.machine.alveay.mutator.mutagens"),
                 TextJustification.MIDDLE_CENTER).setColor(0x555555);
         int size = AlvearyMutator.getMutagens().size();
-        int w = size * 17;
+        int w = size * 18;
 
         if (size <= 0) {
             return;
@@ -59,9 +58,8 @@ public class WindowAlvearyMutator extends Window {
         for (ItemStack stack : AlvearyMutator.getMutagens()) {
             ControlItemDisplay display = new ControlItemDisplay(this, x, 66.0f);
             display.setItemStack(stack);
-            display.setSize(new IPoint(14, 14));
             display.hastooltip = true;
-            x += 17.0f;
+            x += 18.0f;
         }
     }
 

src/main/java/binnie/extratrees/carpentry/BlockDesign.java

@@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 
@@ -41,14 +40,38 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
         designSystem = system;
     }
 
-    public void registerHandler() {
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
-    }
-
     public static int getMetadata(int plank1, int plank2, int design) {
         return plank1 + (plank2 << 9) + (design << 18);
     }
 
+    @SubscribeEvent
+    public void onClick(PlayerInteractEvent event) {
+        if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
+            return;
+        }
+
+        World world = event.entityPlayer.worldObj;
+        EntityPlayer player = event.entityPlayer;
+        int x = event.x;
+        int y = event.y;
+        int z = event.z;
+        if (!(world.getBlock(x, y, z) instanceof BlockDesign blockDesign)) {
+            return;
+        }
+
+        ItemStack item = player.getHeldItem();
+        if (item == null || !(item.getItem() instanceof IToolHammer)
+                || !((IToolHammer) item.getItem()).isActive(item)) {
+            return;
+        }
+
+        DesignBlock carpentryBlock = blockDesign.getCarpentryBlock(world, x, y, z);
+        TileEntityMetadata tile = (TileEntityMetadata) world.getTileEntity(x, y, z);
+        carpentryBlock.rotate(event.face, item, player, world, x, y, z);
+        int meta = carpentryBlock.getBlockMetadata(blockDesign.getDesignSystem());
+        tile.setTileMetadata(meta, true);
+    }
+
     public abstract ItemStack getCreativeStack(IDesign design);
 
     @Override
@@ -137,35 +160,4 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
     public int getNumberOfPasses() {
         return 2;
     }
-
-    public static class EventHandler {
-
-        @SubscribeEvent
-        public void onClick(PlayerInteractEvent event) {
-            if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
-                return;
-            }
-
-            World world = event.entityPlayer.worldObj;
-            EntityPlayer player = event.entityPlayer;
-            int x = event.x;
-            int y = event.y;
-            int z = event.z;
-            if (!(world.getBlock(x, y, z) instanceof BlockDesign blockDesign)) {
-                return;
-            }
-
-            ItemStack item = player.getHeldItem();
-            if (item == null || !(item.getItem() instanceof IToolHammer)
-                    || !((IToolHammer) item.getItem()).isActive(item)) {
-                return;
-            }
-
-            DesignBlock carpentryBlock = blockDesign.getCarpentryBlock(world, x, y, z);
-            TileEntityMetadata tile = (TileEntityMetadata) world.getTileEntity(x, y, z);
-            carpentryBlock.rotate(event.face, item, player, world, x, y, z);
-            int meta = carpentryBlock.getBlockMetadata(blockDesign.getDesignSystem());
-            tile.setTileMetadata(meta, true);
-        }
-    }
 }

src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java

@@ -2,6 +2,7 @@ package binnie.extratrees.carpentry;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import binnie.core.BinnieCore;
@@ -80,18 +81,21 @@ public class ModuleCarpentry implements IInitializable {
 
     @Override
     public void preInit() {
-        // spotless:off
         ExtraTrees.blockCarpentry = new BlockCarpentry();
         ExtraTrees.blockPanel = new BlockCarpentryPanel();
         ExtraTrees.blockStained = new BlockStainedDesign();
         GameRegistry.registerBlock(ExtraTrees.blockCarpentry, ItemMetadata.class, "carpentry");
         GameRegistry.registerBlock(ExtraTrees.blockPanel, ItemMetadata.class, "panel");
         GameRegistry.registerBlock(ExtraTrees.blockStained, ItemMetadata.class, "stainedglass");
-        BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockCarpentry), new MultipassItemRenderer());
-        BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockStained), new MultipassItemRenderer());
-        ExtraTrees.blockCarpentry.registerHandler();
-        BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer());
-        // spotless:on
+        BinnieCore.proxy.registerCustomItemRenderer(
+                Item.getItemFromBlock(ExtraTrees.blockCarpentry),
+                new MultipassItemRenderer());
+        BinnieCore.proxy.registerCustomItemRenderer(
+                Item.getItemFromBlock(ExtraTrees.blockStained),
+                new MultipassItemRenderer());
+        MinecraftForge.EVENT_BUS.register(ExtraTrees.blockCarpentry);
+        BinnieCore.proxy
+                .registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer());
     }
 
     @Override

src/main/java/binnie/extratrees/machines/designer/WoodworkerRecipeComponent.java

@@ -93,7 +93,7 @@ public class WoodworkerRecipeComponent extends ComponentRecipe
     }
 
     @Override
-    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
         if (name.equals("recipe")) {
             InventoryPlayer playerInv = player.inventory;
             ItemStack recipe = doRecipe(false);

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

@@ -55,8 +55,8 @@ public class WindowGeneBank extends WindowMachine {
     }
 
     @Override
-    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
-        super.receiveGuiNBT(side, player, name, nbt);
+    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+        super.recieveGuiNBT(side, player, name, nbt);
         if (side != Side.SERVER || !name.equals("gene-select")) {
             return;
         }

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

@@ -49,13 +49,13 @@ public class WindowSequencer extends WindowMachine {
     }
 
     @Override
-    public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
+    public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
         if (side == Side.CLIENT && name.equals("username")) {
             slotText.setValue(
                     EnumChatFormatting.DARK_GRAY
                             + I18N.localise("genetics.machine.sequencer.gui.sequensedBy", nbt.getString("username")));
         }
-        super.receiveGuiNBT(side, player, name, nbt);
+        super.recieveGuiNBT(side, player, name, nbt);
     }
 
     @Override