Optimize Images & Workflow (#225)

Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: Ruling-0 <[email protected]>

.github/workflows/optimize-images.yml

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

.gitignore

@@ -28,3 +28,4 @@ whitelist.json
 src/main/resources/mixins.*.json
 *.bat
 layout.json
+.DS_Store

dependencies.gradle

@@ -1,24 +1,25 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.4.8:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.8:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.44-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.6.22:dev")
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:dev')
+    api('com.github.GTNewHorizons:EnderCore:0.5.7:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:ForestryMC:4.11.4:dev')
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.60-GTNH:dev')
+    api("com.github.GTNewHorizons:GTNHLib:0.9.10:dev")
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.55:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
-    api("com.github.GTNewHorizons:TinkersConstruct:1.13.28-GTNH:dev")
+    api("com.github.GTNewHorizons:TinkersConstruct:1.14.27-GTNH:dev")
 
-    compileOnly('com.github.GTNewHorizons:waila:1.8.4:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-608-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.291:dev') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.11-1.7.10:dev") {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.16.28:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.0-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.16.4-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.13-GTNH:api') {transitive = false}
+    devOnlyNonPublishable('com.github.GTNewHorizons:waila:1.19.22:dev') {transitive = false}
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-812-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.261:dev') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:ModularUI2:2.3.37-1.7.10:dev") {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.17.17:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.9-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.17.14-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.16-GTNH:api') {transitive = false}
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
@@ -26,5 +27,6 @@ dependencies {
     compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
     compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2
 
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta42:api') {transitive = false}
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta66a:api') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.58:dev")
 }

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.
@@ -80,7 +104,7 @@ apiPackage = api
 # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
 # There can be multiple files in a space-separated list.
 # Example value: mymodid_at.cfg nei_at.cfg
-accessTransformersFile =
+accessTransformersFile = enderio_at.cfg
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
@@ -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!
@@ -151,7 +177,7 @@ modrinthProjectId =
 #       type can be one of [project, version],
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
 modrinthRelations =
 
 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
@@ -172,6 +198,12 @@ curseForgeRelations =
 # projects. New projects should not use this parameter.
 # customArchiveBaseName =
 
+# 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.
@@ -201,3 +233,6 @@ curseForgeRelations =
 # This is meant to be set in $HOME/.gradle/gradle.properties.
 # ideaCheckSpotlessOnBuild = true
 
+# Non-GTNH properties
+org.gradle.configuration-cache = true
+org.gradle.parallel = true

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/df211d3c3eefdc408b462041881bc575/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/46949723aaa20c7b64d7ecfed7207034/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d6690dfd71c4c91e08577437b5b2beb0/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/552c7bffe0370c66410a51c55985b511/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.2.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,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.19'
 }
 
 

src/main/java/crazypants/enderio/ClientProxy.java

@@ -103,9 +103,6 @@ import crazypants.enderio.machine.painter.BlockPaintedFenceGateRenderer;
 import crazypants.enderio.machine.painter.BlockPaintedGlowstone;
 import crazypants.enderio.machine.painter.PaintedBlockRenderer;
 import crazypants.enderio.machine.painter.PaintedItemRenderer;
-import crazypants.enderio.machine.power.BlockCapacitorBank;
-import crazypants.enderio.machine.power.CapBankRenderer2;
-import crazypants.enderio.machine.power.CapacitorBankRenderer;
 import crazypants.enderio.machine.ranged.RangeEntity;
 import crazypants.enderio.machine.ranged.RangeRenderer;
 import crazypants.enderio.machine.reservoir.ReservoirRenderer;
@@ -321,13 +318,6 @@ public class ClientProxy extends CommonProxy {
             ClientRegistry.bindTileEntitySpecialRenderer(TileCapBank.class, newCbr);
         }
 
-        CapacitorBankRenderer capr = new CapacitorBankRenderer();
-        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCapacitorBank), capr);
-
-        BlockCapacitorBank.renderId = RenderingRegistry.getNextAvailableRenderId();
-        CapBankRenderer2 cbr2 = new CapBankRenderer2();
-        RenderingRegistry.registerBlockHandler(cbr2);
-
         BlockVacuumChest.renderId = RenderingRegistry.getNextAvailableRenderId();
         VacuumChestRenderer vcr = new VacuumChestRenderer();
         RenderingRegistry.registerBlockHandler(vcr);

src/main/java/crazypants/enderio/CommonProxy.java

@@ -1,7 +1,5 @@
 package crazypants.enderio;
 
-import java.text.DecimalFormat;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
@@ -9,20 +7,27 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
+import cpw.mods.fml.common.event.FMLServerStartedEvent;
+import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
+import crazypants.enderio.conduit.ConduitNetworkTickHandler;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.render.ConduitRenderer;
+import crazypants.enderio.machine.hypercube.HyperCubeRegister;
+import crazypants.enderio.machine.transceiver.ServerChannelRegister;
+import crazypants.enderio.machine.wireless.WirelessChargerController;
 
 public class CommonProxy {
 
-    private static final DecimalFormat FORMAT = new DecimalFormat("########0.000");
-
     protected long serverTickCount = 0;
     protected long clientTickCount = 0;
     protected final TickTimer tickTimer = new TickTimer();
+    public ConduitNetworkTickHandler conduitNetworkTickHandler = null;
+    public WirelessChargerController wirelessChargerController = null;
 
     public CommonProxy() {}
 
@@ -44,7 +49,7 @@ public class CommonProxy {
     }
 
     public void loadIcons() {
-        ;
+
     }
 
     public void load() {
@@ -76,6 +81,26 @@ public class CommonProxy {
         return new ResourceLocation(EnderIO.DOMAIN + TEXTURE_PATH + name + TEXTURE_EXT);
     }
 
+    public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
+        conduitNetworkTickHandler = new ConduitNetworkTickHandler();
+        FMLCommonHandler.instance().bus().register(conduitNetworkTickHandler);
+        wirelessChargerController = new WirelessChargerController();
+        FMLCommonHandler.instance().bus().register(wirelessChargerController);
+    }
+
+    public void onServerStarted(FMLServerStartedEvent event) {
+        HyperCubeRegister.load();
+        ServerChannelRegister.load();
+    }
+
+    public void onServerStopped(FMLServerStoppedEvent event) {
+        HyperCubeRegister.unload();
+        FMLCommonHandler.instance().bus().unregister(conduitNetworkTickHandler);
+        conduitNetworkTickHandler = null;
+        FMLCommonHandler.instance().bus().unregister(wirelessChargerController);
+        wirelessChargerController = null;
+    }
+
     public final class TickTimer {
 
         @SubscribeEvent

src/main/java/crazypants/enderio/EnderIO.java

@@ -38,6 +38,7 @@ import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
 import cpw.mods.fml.common.event.FMLServerStartedEvent;
 import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -111,7 +112,6 @@ import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockEnd
 import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockFrankenZombieGenerator;
 import crazypants.enderio.machine.generator.zombie.PacketNutrientTank;
 import crazypants.enderio.machine.hypercube.BlockHyperCube;
-import crazypants.enderio.machine.hypercube.HyperCubeRegister;
 import crazypants.enderio.machine.invpanel.BlockInventoryPanel;
 import crazypants.enderio.machine.killera.BlockKillerJoe;
 import crazypants.enderio.machine.light.BlockElectricLight;
@@ -132,7 +132,6 @@ import crazypants.enderio.machine.painter.BlockPaintedStair;
 import crazypants.enderio.machine.painter.BlockPaintedWall;
 import crazypants.enderio.machine.painter.BlockPainter;
 import crazypants.enderio.machine.painter.PaintSourceValidator;
-import crazypants.enderio.machine.power.BlockCapacitorBank;
 import crazypants.enderio.machine.ranged.RangeEntity;
 import crazypants.enderio.machine.reservoir.BlockReservoir;
 import crazypants.enderio.machine.slicensplice.BlockSliceAndSplice;
@@ -191,7 +190,6 @@ import crazypants.util.EE3Util;
         after:Waila@[1.5.8,);\
         after:Thaumcraft;\
         after:appliedenergistics2@[rv2-beta-8,);\
-        after:chisel;\
         after:Railcraft@[9.16.7,)\
         """, guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
 public class EnderIO {
@@ -215,6 +213,8 @@ public class EnderIO {
 
     public static final boolean hasLwjgl3 = Loader.isModLoaded("lwjgl3ify");
     public static final boolean hasGT5 = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi");
+    public static final boolean hasHP = Loader.isModLoaded("hodgepodge");
+    public static final boolean hasWailaPlugins = Loader.isModLoaded("wailaplugins");
 
     // Materials
     public static ItemCapacitor itemBasicCapacitor;
@@ -286,7 +286,6 @@ public class EnderIO {
     public static BlockSolarPanel blockSolarPanel;
     public static BlockReservoir blockReservoir;
     public static BlockAlloySmelter blockAlloySmelter;
-    public static BlockCapacitorBank blockCapacitorBank;
     public static BlockCapBank blockCapBank;
     public static BlockWirelessCharger blockWirelessCharger;
     public static BlockCrusher blockCrusher;
@@ -396,7 +395,6 @@ public class EnderIO {
 
         blockCrusher = BlockCrusher.create();
         blockAlloySmelter = BlockAlloySmelter.create();
-        blockCapacitorBank = BlockCapacitorBank.create();
         blockCapBank = BlockCapBank.create();
 
         blockPainter = BlockPainter.create();
@@ -490,7 +488,9 @@ public class EnderIO {
         itemGrindingBall = ItemGrindingBall.create();
         itemAlloyEndergy = ItemAlloyEndergy.create();
         itemGrindingBallEndergy = ItemGrindingBallEndergy.create();
-        itemPowderIngot = ItemPowderIngot.create();
+        if (!hasGT5) {
+            itemPowderIngot = ItemPowderIngot.create();
+        }
 
         registerFluids();
 
@@ -730,7 +730,9 @@ public class EnderIO {
             SkeletonHandler.registerSkeleton(this);
         }
 
-        MaterialRecipes.registerDependantOresInDictionary();
+        if (!hasGT5) {
+            MaterialRecipes.registerDependantOresInDictionary();
+        }
 
         EnderfaceRecipes.addRecipes();
         MaterialRecipes.addRecipes();
@@ -893,22 +895,18 @@ public class EnderIO {
     }
 
     @EventHandler
-    public void serverStarted(FMLServerStartedEvent event) {
-        HyperCubeRegister.load();
-        ServerChannelRegister.load();
-    }
-
-    @SubscribeEvent
-    public void worldSaved(WorldEvent.Save event) {
-        // Only save together with the overworld, because this gets called for every dimension separately
-        if (event.world.provider != null && event.world.provider.dimensionId == 0) {
-            ServerChannelRegister.store();
-        }
+    public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
+        proxy.onServerAboutToStart(event);
     }
 
     @EventHandler
-    public void serverStopped(FMLServerStoppedEvent event) {
-        HyperCubeRegister.unload();
+    public void onServerStarted(FMLServerStartedEvent event) {
+        proxy.onServerStarted(event);
+    }
+
+    @EventHandler
+    public void onServerStopped(FMLServerStoppedEvent event) {
+        proxy.onServerStopped(event);
     }
 
     @EventHandler
@@ -920,4 +918,12 @@ public class EnderIO {
             }
         }
     }
+
+    @SubscribeEvent
+    public void worldSaved(WorldEvent.Save event) {
+        // Only save together with the overworld, because this gets called for every dimension separately
+        if (event.world.provider != null && event.world.provider.dimensionId == 0) {
+            ServerChannelRegister.store();
+        }
+    }
 }

src/main/java/crazypants/enderio/ModObject.java

@@ -55,7 +55,6 @@ public enum ModObject {
     blockReservoir,
     blockAlloySmelter,
     blockSolarPanel,
-    blockCapacitorBank,
     blockCapBank,
     blockSagMill,
     blockHyperCube,

src/main/java/crazypants/enderio/conduit/AbstractConduit.java

@@ -47,6 +47,7 @@ import crazypants.enderio.conduit.power.IPowerConduit;
 import crazypants.enderio.conduit.power.PowerConduitNetwork;
 import crazypants.enderio.conduit.redstone.IRedstoneConduit;
 import crazypants.enderio.conduit.redstone.RedstoneConduitNetwork;
+import crazypants.util.ForgeDirections;
 import mods.immibis.microblocks.api.EnumPartClass;
 import mods.immibis.microblocks.api.EnumPosition;
 import mods.immibis.microblocks.api.IMicroblockCoverSystem;
@@ -118,7 +119,7 @@ public abstract class AbstractConduit implements IConduit {
             return false;
         }
         if (dataRoot.hasKey("connectionMode")) {
-            ConnectionMode mode = ConnectionMode.values()[dataRoot.getShort("connectionMode")];
+            ConnectionMode mode = ConnectionMode.VALUES[dataRoot.getShort("connectionMode")];
             setConnectionMode(dir, mode);
         }
         readTypeSettings(dir, dataRoot);
@@ -382,13 +383,13 @@ public abstract class AbstractConduit implements IConduit {
         conduitConnections.clear();
         int[] dirs = nbtRoot.getIntArray("connections");
         for (int i = 0; i < dirs.length; i++) {
-            conduitConnections.add(ForgeDirection.values()[dirs[i]]);
+            conduitConnections.add(ForgeDirections.DIRECTIONS[dirs[i]]);
         }
 
         externalConnections.clear();
         dirs = nbtRoot.getIntArray("externalConnections");
         for (int i = 0; i < dirs.length; i++) {
-            externalConnections.add(ForgeDirection.values()[dirs[i]]);
+            externalConnections.add(ForgeDirections.DIRECTIONS[dirs[i]]);
         }
         active = nbtRoot.getBoolean("signalActive");
 
@@ -397,7 +398,7 @@ public abstract class AbstractConduit implements IConduit {
         if (modes != null && modes.length == 6) {
             int i = 0;
             for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
-                conectionModes.put(dir, ConnectionMode.values()[modes[i]]);
+                conectionModes.put(dir, ConnectionMode.VALUES[modes[i]]);
                 i++;
             }
         }

src/main/java/crazypants/enderio/conduit/AbstractConduitNetwork.java

@@ -7,6 +7,8 @@ import java.util.List;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import crazypants.enderio.EnderIO;
+
 // I=base type, I is the base class of the implementations accepted by the network
 public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
 
@@ -64,7 +66,7 @@ public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
     public void addConduit(I con) {
         if (!conduits.contains(con)) {
             if (conduits.isEmpty()) {
-                ConduitNetworkTickHandler.instance.registerNetwork(this);
+                EnderIO.proxy.conduitNetworkTickHandler.registerNetwork(this);
             }
             conduits.add(con);
         }
@@ -75,7 +77,7 @@ public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
             con.setNetwork(null);
         }
         conduits.clear();
-        ConduitNetworkTickHandler.instance.unregisterNetwork(this);
+        EnderIO.proxy.conduitNetworkTickHandler.unregisterNetwork(this);
     }
 
     public List<I> getConduits() {

src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java

@@ -24,6 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.EnderIOTab;
 import crazypants.enderio.ModObject;
+import crazypants.util.ForgeDirections;
 import mods.immibis.microblocks.api.IMicroblockCoverSystem;
 import mods.immibis.microblocks.api.IMicroblockSupporterTile;
 import mods.immibis.microblocks.api.MicroblockAPIUtils;
@@ -84,7 +85,7 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
             }
             return true;
         } else {
-            ForgeDirection dir = ForgeDirection.values()[side];
+            ForgeDirection dir = ForgeDirections.DIRECTIONS[side];
             int placeX = x + dir.offsetX;
             int placeY = y + dir.offsetY;
             int placeZ = z + dir.offsetZ;

src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java

@@ -32,7 +32,6 @@ import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.Util;
 
-import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.Optional.Interface;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -72,6 +71,7 @@ import crazypants.enderio.item.ItemConduitProbe;
 import crazypants.enderio.machine.painter.PainterUtil;
 import crazypants.enderio.network.PacketHandler;
 import crazypants.enderio.tool.ToolUtil;
+import crazypants.util.ForgeDirections;
 import crazypants.util.IFacade;
 import mods.immibis.core.api.multipart.IMultipartRenderingBlockMarker;
 import mods.immibis.core.api.multipart.IMultipartSystem;
@@ -93,9 +93,6 @@ public class BlockConduitBundle extends BlockEio
 
     public static BlockConduitBundle create() {
 
-        MinecraftForge.EVENT_BUS.register(ConduitNetworkTickHandler.instance);
-        FMLCommonHandler.instance().bus().register(ConduitNetworkTickHandler.instance);
-
         PacketHandler.INSTANCE
                 .registerMessage(PacketFluidLevel.class, PacketFluidLevel.class, PacketHandler.nextID(), Side.CLIENT);
         PacketHandler.INSTANCE
@@ -160,7 +157,6 @@ public class BlockConduitBundle extends BlockEio
 
         BlockConduitBundle result = new BlockConduitBundle();
         result.init();
-        MinecraftForge.EVENT_BUS.register(result);
         return result;
     }
 
@@ -292,41 +288,6 @@ public class BlockConduitBundle extends BlockEio
         effectRenderer.addEffect(digFX);
     }
 
-    @SideOnly(Side.CLIENT)
-    @SubscribeEvent
-    public void onPlaySound(PlaySoundSourceEvent event) {
-        String path = event.sound.getPositionedSoundLocation().getResourcePath();
-        if ("silence.step".equals(path)) {
-            ISound snd = event.sound;
-            World world = EnderIO.proxy.getClientWorld();
-            BlockCoord bc = new BlockCoord(snd.getXPosF(), snd.getYPosF(), snd.getZPosF());
-            TileEntity te = bc.getTileEntity(world);
-            if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
-                Block facade = getFacade(world, bc.x, bc.y, bc.z, -1);
-                ConduitUtil.playHitSound(facade.stepSound, world, bc.x, bc.y, bc.z);
-            } else {
-                ConduitUtil.playHitSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z);
-            }
-        }
-    }
-
-    @SideOnly(Side.CLIENT)
-    @SubscribeEvent
-    public void onPlaySoundAtEntity(PlaySoundAtEntityEvent event) {
-        String path = event.name;
-        World world = event.entity.worldObj;
-        if ("EnderIO:silence.step".equals(path) && world.isRemote) {
-            BlockCoord bc = new BlockCoord(event.entity.posX, event.entity.posY - 2, event.entity.posZ);
-            TileEntity te = bc.getTileEntity(world);
-            if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
-                Block facade = getFacade(world, bc.x, bc.y, bc.z, -1);
-                ConduitUtil.playStepSound(facade.stepSound, world, bc.x, bc.y, bc.z);
-            } else {
-                ConduitUtil.playStepSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z);
-            }
-        }
-    }
-
     @Override
     protected void init() {
         super.init();
@@ -334,6 +295,7 @@ public class BlockConduitBundle extends BlockEio
             EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), this);
         }
         EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_EXTERNAL_CONNECTION_SELECTOR, this);
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override
@@ -473,24 +435,6 @@ public class BlockConduitBundle extends BlockEio
                 : resist;
     }
 
-    @SubscribeEvent
-    public void onBreakSpeed(BreakSpeed event) {
-        if (event.block == this) {
-            ItemStack held = event.entityPlayer.getCurrentEquippedItem();
-            if (held == null || held.getItem().getHarvestLevel(held, "pickaxe") == -1) {
-                event.newSpeed += 2;
-            }
-            IConduitBundle te = (IConduitBundle) event.entity.worldObj.getTileEntity(event.x, event.y, event.z);
-            if (te != null && te.getFacadeType() == FacadeType.HARDENED) {
-                if (!ConduitUtil.isSolidFacadeRendered(te, event.entityPlayer)) {
-                    event.newSpeed *= 6;
-                } else {
-                    event.newSpeed *= 2;
-                }
-            }
-        }
-    }
-
     @Override
     @SideOnly(Side.CLIENT)
     public int getRenderBlockPass() {
@@ -876,7 +820,7 @@ public class BlockConduitBundle extends BlockEio
             return new ExternalConnectionContainer(
                     player.inventory,
                     (IConduitBundle) te,
-                    ForgeDirection.values()[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]);
+                    ForgeDirections.DIRECTIONS[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]);
         }
         return null;
     }
@@ -891,7 +835,7 @@ public class BlockConduitBundle extends BlockEio
             return new GuiExternalConnection(
                     player.inventory,
                     (IConduitBundle) te,
-                    ForgeDirection.values()[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]);
+                    ForgeDirections.DIRECTIONS[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]);
         }
         return null;
     }
@@ -1274,4 +1218,61 @@ public class BlockConduitBundle extends BlockEio
     private boolean hasMicroblocks(IConduitBundle bundle) {
         return !bundle.getCoverSystem().getAllParts().isEmpty();
     }
+
+    public class EventHandler {
+
+        @SideOnly(Side.CLIENT)
+        @SubscribeEvent
+        public void onPlaySound(PlaySoundSourceEvent event) {
+            String path = event.sound.getPositionedSoundLocation().getResourcePath();
+            if ("silence.step".equals(path)) {
+                ISound snd = event.sound;
+                World world = EnderIO.proxy.getClientWorld();
+                if (world == null) return;
+                BlockCoord bc = new BlockCoord(snd.getXPosF(), snd.getYPosF(), snd.getZPosF());
+                TileEntity te = bc.getTileEntity(world);
+                if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
+                    Block facade = getFacade(world, bc.x, bc.y, bc.z, -1);
+                    ConduitUtil.playHitSound(facade.stepSound, world, bc.x, bc.y, bc.z);
+                } else {
+                    ConduitUtil.playHitSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z);
+                }
+            }
+        }
+
+        @SideOnly(Side.CLIENT)
+        @SubscribeEvent
+        public void onPlaySoundAtEntity(PlaySoundAtEntityEvent event) {
+            String path = event.name;
+            World world = event.entity.worldObj;
+            if ("EnderIO:silence.step".equals(path) && world.isRemote) {
+                BlockCoord bc = new BlockCoord(event.entity.posX, event.entity.posY - 2, event.entity.posZ);
+                TileEntity te = bc.getTileEntity(world);
+                if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
+                    Block facade = getFacade(world, bc.x, bc.y, bc.z, -1);
+                    ConduitUtil.playStepSound(facade.stepSound, world, bc.x, bc.y, bc.z);
+                } else {
+                    ConduitUtil.playStepSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z);
+                }
+            }
+        }
+
+        @SubscribeEvent
+        public void onBreakSpeed(BreakSpeed event) {
+            if (event.block == BlockConduitBundle.this) {
+                ItemStack held = event.entityPlayer.getCurrentEquippedItem();
+                if (held == null || held.getItem().getHarvestLevel(held, "pickaxe") == -1) {
+                    event.newSpeed += 2;
+                }
+                IConduitBundle te = (IConduitBundle) event.entity.worldObj.getTileEntity(event.x, event.y, event.z);
+                if (te != null && te.getFacadeType() == FacadeType.HARDENED) {
+                    if (!ConduitUtil.isSolidFacadeRendered(te, event.entityPlayer)) {
+                        event.newSpeed *= 6;
+                    } else {
+                        event.newSpeed *= 2;
+                    }
+                }
+            }
+        }
+    }
 }

src/main/java/crazypants/enderio/conduit/ConduitNetworkTickHandler.java

@@ -10,18 +10,15 @@ import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 
 public class ConduitNetworkTickHandler {
 
-    public static final ConduitNetworkTickHandler instance = new ConduitNetworkTickHandler();
+    public interface TickListener {
 
-    public static interface TickListener {
+        void tickStart(TickEvent.ServerTickEvent evt);
 
-        public void tickStart(TickEvent.ServerTickEvent evt);
-
-        public void tickEnd(TickEvent.ServerTickEvent evt);
+        void tickEnd(TickEvent.ServerTickEvent evt);
     }
 
-    private final List<TickListener> listeners = new ArrayList<TickListener>();
-
-    private final IdentityHashMap<AbstractConduitNetwork<?, ?>, Boolean> networks = new IdentityHashMap<AbstractConduitNetwork<?, ?>, Boolean>();
+    private final List<TickListener> listeners = new ArrayList<>();
+    private final IdentityHashMap<AbstractConduitNetwork<?, ?>, Boolean> networks = new IdentityHashMap<>();
 
     public void addListener(TickListener listener) {
         listeners.add(listener);

src/main/java/crazypants/enderio/conduit/ConnectionMode.java

@@ -10,6 +10,10 @@ public enum ConnectionMode {
     DISABLED("gui.conduit.ioMode.disabled"),
     NOT_SET("gui.conduit.ioMode.notSet");
 
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final ConnectionMode[] VALUES = values();
     private final String unlocalisedName;
 
     ConnectionMode(String unlocalisedName) {
@@ -22,19 +26,19 @@ public enum ConnectionMode {
 
     public static ConnectionMode getNext(ConnectionMode mode) {
         int ord = mode.ordinal() + 1;
-        if (ord >= ConnectionMode.values().length) {
+        if (ord >= ConnectionMode.VALUES.length) {
             ord = 0;
         }
-        return ConnectionMode.values()[ord];
+        return ConnectionMode.VALUES[ord];
     }
 
     public static ConnectionMode getPrevious(ConnectionMode mode) {
 
         int ord = mode.ordinal() - 1;
         if (ord < 0) {
-            ord = ConnectionMode.values().length - 1;
+            ord = ConnectionMode.VALUES.length - 1;
         }
-        return ConnectionMode.values()[ord];
+        return ConnectionMode.VALUES[ord];
     }
 
     public boolean acceptsInput() {

src/main/java/crazypants/enderio/conduit/TileConduitBundle.java

@@ -51,6 +51,7 @@ import crazypants.enderio.conduit.power.IPowerConduit;
 import crazypants.enderio.conduit.redstone.IRedstoneConduit;
 import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit;
 import crazypants.enderio.config.Config;
+import crazypants.util.ForgeDirections;
 import li.cil.oc.api.network.Message;
 import li.cil.oc.api.network.Node;
 import mekanism.api.gas.Gas;
@@ -412,7 +413,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
         }
         // If you're wondering why I am not using conduit.writeToNBT, it is because there is some data that should not
         // persist, some of which causes crashes with energy conduits.
-        NBTTagCompound[] originalData = new NBTTagCompound[ForgeDirection.values().length];
+        NBTTagCompound[] originalData = new NBTTagCompound[ForgeDirections.DIRECTIONS.length];
         for (ForgeDirection conduitConnection : original.getExternalConnections()) {
             NBTTagCompound tag = new NBTTagCompound();
             original.writeConnectionSettingsToNBT(conduitConnection, tag);
@@ -423,7 +424,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
         for (int i = 0; i < originalData.length; i++) {
             NBTTagCompound nbt = originalData[i];
             if (nbt != null) {
-                replacement.readConduitSettingsFromNBT(ForgeDirection.values()[i], nbt);
+                replacement.readConduitSettingsFromNBT(ForgeDirections.DIRECTIONS[i], nbt);
             }
         }
     }

src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java

@@ -32,10 +32,11 @@ import crazypants.enderio.machine.painter.BasicPainterTemplate;
 import crazypants.enderio.machine.painter.IPaintedBlock;
 import crazypants.enderio.machine.painter.PaintSourceValidator;
 import crazypants.enderio.machine.painter.PainterUtil;
+import crazypants.util.ForgeDirections;
 
 public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider, IResourceTooltipProvider {
 
-    public static enum FacadeType {
+    public enum FacadeType {
 
         BASIC,
         HARDENED;
@@ -115,7 +116,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
             return true;
         }
 
-        ForgeDirection dir = ForgeDirection.values()[side];
+        ForgeDirection dir = ForgeDirections.DIRECTIONS[side];
         int placeX = x + dir.offsetX;
         int placeY = y + dir.offsetY;
         int placeZ = z + dir.offsetZ;

src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java

@@ -193,8 +193,8 @@ public abstract class AbstractGasConduit extends AbstractConduit implements IGas
             key = "extSC." + dir.name();
             if (nbtRoot.hasKey(key)) {
                 short ord = nbtRoot.getShort(key);
-                if (ord >= 0 && ord < DyeColor.values().length) {
-                    extractionColors.put(dir, DyeColor.values()[ord]);
+                if (ord >= 0 && ord < DyeColor.VALUES.length) {
+                    extractionColors.put(dir, DyeColor.VALUES[ord]);
                 }
             }
         }

src/main/java/crazypants/enderio/conduit/gui/GasSettings.java

@@ -72,7 +72,7 @@ public class GasSettings extends BaseSettingsPanel {
     public void actionPerformed(GuiButton guiButton) {
         super.actionPerformed(guiButton);
         if (guiButton.id == ID_COLOR_BUTTON) {
-            conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]);
+            conduit.setExtractionSignalColor(gui.getDir(), DyeColor.VALUES[colorB.getColorIndex()]);
             PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir()));
         }
     }

src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java

@@ -23,6 +23,7 @@ import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit;
 import crazypants.enderio.network.PacketHandler;
+import crazypants.util.ForgeDirections;
 
 public class GuiExternalConnectionSelector extends GuiScreen {
 
@@ -51,7 +52,7 @@ public class GuiExternalConnectionSelector extends GuiScreen {
 
     @Override
     protected void actionPerformed(GuiButton b) {
-        ForgeDirection dir = ForgeDirection.values()[b.id];
+        ForgeDirection dir = ForgeDirections.DIRECTIONS[b.id];
         EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
         BlockCoord loc = cb.getLocation();
         PacketHandler.INSTANCE.sendToServer(new PacketOpenConduitUI(cb.getEntity(), dir));

src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java

@@ -172,7 +172,7 @@ public class LiquidSettings extends BaseSettingsPanel {
     public void actionPerformed(GuiButton guiButton) {
         super.actionPerformed(guiButton);
         if (guiButton.id == ID_COLOR_BUTTON) {
-            conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]);
+            conduit.setExtractionSignalColor(gui.getDir(), DyeColor.VALUES[colorB.getColorIndex()]);
             PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir()));
         } else if (guiButton.id == ID_INSERT_WHITELIST || guiButton.id == ID_EXTRACT_WHITELIST) {
             toggleBlacklist(guiButton.id == ID_EXTRACT_WHITELIST);
@@ -180,7 +180,7 @@ public class LiquidSettings extends BaseSettingsPanel {
             ColorButton btn = (ColorButton) guiButton;
             if (isEnder) {
 
-                DyeColor col = DyeColor.values()[btn.getColorIndex()];
+                DyeColor col = DyeColor.VALUES[btn.getColorIndex()];
                 boolean isInput = guiButton.id == ID_EXTRACT_CHANNEL;
 
                 if (isInput) {

src/main/java/crazypants/enderio/conduit/gui/OCSettings.java

@@ -42,7 +42,7 @@ public class OCSettings extends BaseSettingsPanel {
     public void actionPerformed(GuiButton guiButton) {
         super.actionPerformed(guiButton);
         if (guiButton.id == ID_COLOR_BUTTON && cb != null) {
-            occon.setSignalColor(gui.getDir(), DyeColor.values()[cb.getColorIndex()]);
+            occon.setSignalColor(gui.getDir(), DyeColor.VALUES[cb.getColorIndex()]);
             PacketHandler.INSTANCE.sendToServer(new PacketOCConduitSignalColor(occon, gui.getDir()));
         }
     }

src/main/java/crazypants/enderio/conduit/gui/PacketFluidChannel.java

@@ -11,6 +11,7 @@ import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.ILiquidConduit;
 import crazypants.enderio.conduit.packet.AbstractConduitPacket;
 import crazypants.enderio.conduit.packet.ConTypeEnum;
+import crazypants.util.ForgeDirections;
 import io.netty.buffer.ByteBuf;
 
 public class PacketFluidChannel extends AbstractConduitPacket<ILiquidConduit>
@@ -42,9 +43,9 @@ public class PacketFluidChannel extends AbstractConduitPacket<ILiquidConduit>
     @Override
     public void fromBytes(ByteBuf buf) {
         super.fromBytes(buf);
-        dir = ForgeDirection.values()[buf.readShort()];
+        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
         isInput = buf.readBoolean();
-        channel = DyeColor.values()[buf.readShort()];
+        channel = DyeColor.VALUES[buf.readShort()];
     }
 
     @Override

src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java

@@ -12,6 +12,7 @@ import crazypants.enderio.conduit.liquid.FluidFilter;
 import crazypants.enderio.conduit.liquid.ILiquidConduit;
 import crazypants.enderio.conduit.packet.AbstractConduitPacket;
 import crazypants.enderio.conduit.packet.ConTypeEnum;
+import crazypants.util.ForgeDirections;
 import io.netty.buffer.ByteBuf;
 
 public class PacketFluidFilter extends AbstractConduitPacket<ILiquidConduit>
@@ -44,7 +45,7 @@ public class PacketFluidFilter extends AbstractConduitPacket<ILiquidConduit>
     @Override
     public void fromBytes(ByteBuf buf) {
         super.fromBytes(buf);
-        dir = ForgeDirection.values()[buf.readShort()];
+        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
         isInput = buf.readBoolean();
         NBTTagCompound tag = ByteBufUtils.readTag(buf);
         filter = new FluidFilter();

src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java

@@ -11,6 +11,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.GuiHandler;
+import crazypants.util.ForgeDirections;
 import io.netty.buffer.ByteBuf;
 
 public class PacketOpenConduitUI extends MessageTileEntity<TileEntity>
@@ -34,7 +35,7 @@ public class PacketOpenConduitUI extends MessageTileEntity<TileEntity>
     @Override
     public void fromBytes(ByteBuf buf) {
         super.fromBytes(buf);
-        dir = ForgeDirection.values()[buf.readShort()];
+        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
     }
 
     public IMessage onMessage(PacketOpenConduitUI message, MessageContext ctx) {

src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java

@@ -59,7 +59,7 @@ public class PowerSettings extends BaseSettingsPanel {
     public void actionPerformed(GuiButton guiButton) {
         super.actionPerformed(guiButton);
         if (guiButton.id == ID_COLOR_BUTTON) {
-            conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]);
+            conduit.setExtractionSignalColor(gui.getDir(), DyeColor.VALUES[colorB.getColorIndex()]);
             PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir()));
         }
     }

src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java

@@ -61,7 +61,7 @@ public class RedstoneSettings extends BaseSettingsPanel {
     public void actionPerformed(GuiButton guiButton) {
         super.actionPerformed(guiButton);
         if (guiButton.id == ID_COLOR_BUTTON && cb != null) {
-            insCon.setSignalColor(gui.getDir(), DyeColor.values()[cb.getColorIndex()]);
+            insCon.setSignalColor(gui.getDir(), DyeColor.VALUES[cb.getColorIndex()]);
             PacketHandler.INSTANCE.sendToServer(new PacketRedstoneConduitSignalColor(insCon, gui.getDir()));
         } else if (guiButton.id == ID_STRONG_BUTTON && strongCB != null) {
             insCon.setOutputStrength(gui.getDir(), strongCB.isSelected());

src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java

@@ -14,17 +14,25 @@ import crazypants.enderio.conduit.item.NetworkedInventory;
 import crazypants.enderio.conduit.item.filter.ExistingItemFilter;
 import crazypants.enderio.conduit.packet.AbstractConduitPacket;
 import crazypants.enderio.conduit.packet.ConTypeEnum;
+import crazypants.util.ForgeDirections;
 import io.netty.buffer.ByteBuf;
 
 public class PacketExistingItemFilterSnapshot extends AbstractConduitPacket<IItemConduit>
         implements IMessageHandler<PacketExistingItemFilterSnapshot, IMessage> {
 
-    public static enum Opcode {
+    public enum Opcode {
+
         CLEAR,
         SET,
         MERGE,
         SET_BLACK,
-        UNSET_BLACK
+        UNSET_BLACK;
+
+        private static final Opcode[] VALUES = values();
+
+        public static Opcode fromOrdinal(int ordinal) {
+            return VALUES[ordinal];
+        }
     }
 
     private ForgeDirection dir;
@@ -43,9 +51,9 @@ public class PacketExistingItemFilterSnapshot extends AbstractConduitPacket<IIte
     @Override
     public void fromBytes(ByteBuf buf) {
         super.fromBytes(buf);
-        dir = ForgeDirection.values()[buf.readShort()];
+        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
         isInput = buf.readBoolean();
-        opcode = Opcode.values()[buf.readByte() & 255];
+        opcode = Opcode.fromOrdinal(buf.readByte() & 255);
     }
 
     @Override

src/main/java/crazypants/enderio/conduit/gui/item/PacketModItemFilter.java

@@ -10,6 +10,7 @@ import crazypants.enderio.conduit.item.IItemConduit;
 import crazypants.enderio.conduit.item.filter.ModItemFilter;
 import crazypants.enderio.conduit.packet.AbstractConduitPacket;
 import crazypants.enderio.conduit.packet.ConTypeEnum;
+import crazypants.util.ForgeDirections;
 import io.netty.buffer.ByteBuf;
 
 public class PacketModItemFilter extends AbstractConduitPacket<IItemConduit>
@@ -33,7 +34,7 @@ public class PacketModItemFilter extends AbstractConduitPacket<IItemConduit>
     @Override
     public void fromBytes(ByteBuf buf) {
         super.fromBytes(buf);
-        dir = ForgeDirection.values()[buf.readShort()];
+        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
         isInput = buf.readBoolean();
         index = buf.readInt();
         boolean isNull = buf.readBoolean();

src/main/java/crazypants/enderio/conduit/item/ItemConduit.java

@@ -164,10 +164,10 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
 
     @Override
     protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) {
-        setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]);
+        setExtractionSignalColor(dir, DyeColor.VALUES[dataRoot.getShort("extractionSignalColor")]);
         setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir);
-        setInputColor(dir, DyeColor.values()[dataRoot.getShort("inputColor")]);
-        setOutputColor(dir, DyeColor.values()[dataRoot.getShort("outputColor")]);
+        setInputColor(dir, DyeColor.VALUES[dataRoot.getShort("inputColor")]);
+        setOutputColor(dir, DyeColor.VALUES[dataRoot.getShort("outputColor")]);
         setSelfFeedEnabled(dir, dataRoot.getBoolean("selfFeed"));
         setRoundRobinEnabled(dir, dataRoot.getBoolean("roundRobin"));
         setOutputPriority(dir, dataRoot.getInteger("outputPriority"));
@@ -857,8 +857,8 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
             key = "extSC." + dir.name();
             if (nbtRoot.hasKey(key)) {
                 short ord = nbtRoot.getShort(key);
-                if (ord >= 0 && ord < DyeColor.values().length) {
-                    extractionColors.put(dir, DyeColor.values()[ord]);
+                if (ord >= 0 && ord < DyeColor.VALUES.length) {
+                    extractionColors.put(dir, DyeColor.VALUES[ord]);
                 }
             }
             key = "selfFeed." + dir.name();
@@ -882,16 +882,16 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
             key = "inSC." + dir.name();
             if (nbtRoot.hasKey(key)) {
                 short ord = nbtRoot.getShort(key);
-                if (ord >= 0 && ord < DyeColor.values().length) {
-                    inputColors.put(dir, DyeColor.values()[ord]);
+                if (ord >= 0 && ord < DyeColor.VALUES.length) {
+                    inputColors.put(dir, DyeColor.VALUES[ord]);
                 }
             }
 
             key = "outSC." + dir.name();
             if (nbtRoot.hasKey(key)) {
                 short ord = nbtRoot.getShort(key);
-                if (ord >= 0 && ord < DyeColor.values().length) {
-                    outputColors.put(dir, DyeColor.values()[ord]);
+                if (ord >= 0 && ord < DyeColor.VALUES.length) {
+                    outputColors.put(dir, DyeColor.VALUES[ord]);
                 }
             }
         }

src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java

@@ -10,7 +10,6 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -25,6 +24,7 @@ import crazypants.enderio.conduit.item.filter.IItemFilter;
 import crazypants.enderio.conduit.item.filter.ItemFilterLimited;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.invpanel.TileInventoryPanel;
+import crazypants.util.ForgeDirections;
 
 public class NetworkedInventory {
 
@@ -41,8 +41,8 @@ public class NetworkedInventory {
 
     int tickDeficit;
 
-    // work around for a vanilla chest changing into a double chest without doing unneeded checks all the time
-    boolean recheckInv = false;
+    private TileEntity connectedTileEntity;
+
     // Hack for TiC crafting station not working correctly when setting output slot to null
     boolean ticHack = false;
 
@@ -61,19 +61,13 @@ public class NetworkedInventory {
         this.location = location;
         world = con.getBundle().getWorld();
 
-        TileEntity te = world.getTileEntity(location.x, location.y, location.z);
-        if (te.getClass().getName().equals("tconstruct.tools.logic.CraftingStationLogic")) {
-            ticHack = true;
-        } else if (te.getClass().getName().contains("cpw.mods.ironchest")) {
-            recheckInv = true;
-        } else if (te instanceof TileEntityChest) {
-            recheckInv = true;
-        } else if (te instanceof TileInventoryPanel) {
-            inventoryPanel = true;
-        }
         updateInventory();
     }
 
+    public boolean isInvalid() {
+        return connectedTileEntity == null || connectedTileEntity.isInvalid();
+    }
+
     public boolean hasTarget(IItemConduit conduit, ForgeDirection dir) {
         for (Target t : sendPriority) {
             if (t.inv.con == conduit && t.inv.conDir == dir) {
@@ -110,6 +104,13 @@ public class NetworkedInventory {
     }
 
     public void onTick() {
+        if (isInvalid()) {
+            updateInventory();
+            if (isInvalid()) {
+                return;
+            }
+        }
+
         if (tickDeficit > 0 || !canExtract() || !con.isExtractionRedstoneConditionMet(conDir)) {
             // do nothing
         } else {
@@ -144,11 +145,6 @@ public class NetworkedInventory {
     }
 
     private boolean transferItems() {
-
-        if (recheckInv) {
-            updateInventory();
-        }
-
         int[] slotIndices = getInventory().getAccessibleSlotsFromSide(inventorySide);
         if (slotIndices == null) {
             return false;
@@ -257,9 +253,6 @@ public class NetworkedInventory {
                 matchedStickyInput = of != null && of.isValid() && of.doesItemPassFilter(this, toExtract);
             }
             if (target.stickyInput || !matchedStickyInput) {
-                if (target.inv.recheckInv) {
-                    target.inv.updateInventory();
-                }
                 int inserted = target.inv.insertItem(toExtract);
                 if (inserted > 0) {
                     toExtract.stackSize -= inserted;
@@ -281,15 +274,38 @@ public class NetworkedInventory {
     }
 
     public final void updateInventory() {
-        TileEntity te = world.getTileEntity(location.x, location.y, location.z);
-        if (te instanceof ISidedInventory) {
-            inv = (ISidedInventory) te;
-        } else if (te instanceof IInventory) {
-            inv = new InventoryWrapper((IInventory) te);
+        TileEntity newTe = world.getTileEntity(location.x, location.y, location.z);
+        if (newTe != connectedTileEntity) {
+            connectedTileEntity = newTe;
+            ticHack = false;
+            inventoryPanel = false;
+            if (connectedTileEntity != null) {
+                if (connectedTileEntity.getClass().getName().equals("tconstruct.tools.logic.CraftingStationLogic")) {
+                    ticHack = true;
+                } else if (connectedTileEntity instanceof TileInventoryPanel) {
+                    inventoryPanel = true;
+                }
+            }
+            network.routesChanged();
+        }
+
+        if (connectedTileEntity instanceof ISidedInventory) {
+            inv = (ISidedInventory) connectedTileEntity;
+        } else if (connectedTileEntity instanceof IInventory) {
+            inv = new InventoryWrapper((IInventory) connectedTileEntity);
+        } else {
+            inv = null;
         }
     }
 
     private int insertItem(ItemStack item) {
+        if (isInvalid()) {
+            updateInventory();
+            if (isInvalid()) {
+                return 0;
+            }
+        }
+
         if (!canInsert() || item == null) {
             return 0;
         }
@@ -312,7 +328,7 @@ public class NetworkedInventory {
                 return 0;
             }
         }
-        return ItemUtil.doInsertItem(getInventory(), item, ForgeDirection.values()[inventorySide]);
+        return ItemUtil.doInsertItem(getInventory(), item, ForgeDirections.DIRECTIONS[inventorySide]);
     }
 
     void updateInsertOrder() {
@@ -410,7 +426,7 @@ public class NetworkedInventory {
     }
 
     public ISidedInventory getInventoryRecheck() {
-        if (recheckInv) {
+        if (isInvalid()) {
             updateInventory();
         }
         return inv;

src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java

@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.function.Supplier;
+import java.util.function.IntSupplier;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -89,20 +89,20 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit {
 
         STELLAR(() -> Config.stellarEnderFluidConduitExtractRate, () -> Config.stellarEnderFluidConduitMaxIoRate);
 
-        private final Supplier<Integer> getMaxExtractPerTick;
-        private final Supplier<Integer> getMaxIoPerTick;
+        private final IntSupplier getMaxExtractPerTick;
+        private final IntSupplier getMaxIoPerTick;
 
-        Type(Supplier<Integer> getMaxExtractPerTick, Supplier<Integer> getMaxIoPerTick) {
+        Type(IntSupplier getMaxExtractPerTick, IntSupplier getMaxIoPerTick) {
             this.getMaxExtractPerTick = getMaxExtractPerTick;
             this.getMaxIoPerTick = getMaxIoPerTick;
         }
 
         public int getMaxExtractPerTick() {
-            return getMaxExtractPerTick.get();
+            return getMaxExtractPerTick.getAsInt();
         }
 
         public int getMaxIoPerTick() {
-            return getMaxIoPerTick.get();
+            return getMaxIoPerTick.getAsInt();
         }
     }
 
@@ -424,10 +424,10 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit {
         super.readTypeSettings(dir, dataRoot);
 
         if (dataRoot.hasKey("inputColor")) {
-            setInputColor(dir, DyeColor.values()[dataRoot.getShort("inputColor")]);
+            setInputColor(dir, DyeColor.VALUES[dataRoot.getShort("inputColor")]);
         }
         if (dataRoot.hasKey("outputColor")) {
-            setOutputColor(dir, DyeColor.values()[dataRoot.getShort("outputColor")]);
+            setOutputColor(dir, DyeColor.VALUES[dataRoot.getShort("outputColor")]);
         }
 
         if (dataRoot.hasKey("roundRobin")) {
@@ -542,16 +542,16 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit {
             key = "inSC." + dir.name();
             if (nbtRoot.hasKey(key)) {
                 short ord = nbtRoot.getShort(key);
-                if (ord >= 0 && ord < DyeColor.values().length) {
-                    inputColors.put(dir, DyeColor.values()[ord]);
+                if (ord >= 0 && ord < DyeColor.VALUES.length) {
+                    inputColors.put(dir, DyeColor.VALUES[ord]);
                 }
             }
 
             key = "outSC." + dir.name();
             if (nbtRoot.hasKey(key)) {
                 short ord = nbtRoot.getShort(key);
-                if (ord >= 0 && ord < DyeColor.values().length) {
-                    outputColors.put(dir, DyeColor.values()[ord]);
+                if (ord >= 0 && ord < DyeColor.VALUES.length) {
+                    outputColors.put(dir, DyeColor.VALUES[ord]);
                 }
             }
         }

src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java

@@ -204,7 +204,7 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I
 
     @Override
     protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) {
-        setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]);
+        setExtractionSignalColor(dir, DyeColor.VALUES[dataRoot.getShort("extractionSignalColor")]);
         setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir);
     }
 
@@ -248,8 +248,8 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I
             key = "extSC." + dir.name();
             if (nbtRoot.hasKey(key)) {
                 short ord = nbtRoot.getShort(key);
-                if (ord >= 0 && ord < DyeColor.values().length) {
-                    extractionColors.put(dir, DyeColor.values()[ord]);
+                if (ord >= 0 && ord < DyeColor.VALUES.length) {
+                    extractionColors.put(dir, DyeColor.VALUES[ord]);
                 }
             }
         }

src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java

@@ -85,11 +85,13 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidCon
             return false;
         }
 
-        if (tank.externalTank.getTankInfo(conDir.getOpposite()) != null) {
-            for (FluidTankInfo tankInfo : tank.externalTank.getTankInfo(conDir.getOpposite())) {
+        FluidTankInfo[] tankInfos = tank.externalTank.getTankInfo(conDir.getOpposite());
+        if (tankInfos != null) {
+            for (FluidTankInfo tankInfo : tankInfos) {
                 if (tankInfo == null || tankInfo.fluid == null) {
                     continue;
                 }
+
                 FluidStack tryDrain = tankInfo.fluid.copy();
                 tryDrain.amount = type.getMaxExtractPerTick();
                 FluidStack drained = tank.externalTank.drain(conDir.getOpposite(), tryDrain, false);
@@ -98,10 +100,12 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidCon
                         || !tryDrain.isFluidEqual(drained)) {
                     continue;
                 }
-                int amountAccepted = fillFrom(tank, drained.copy(), true);
+
+                int amountAccepted = fillFrom(tank, drained, true);
                 if (amountAccepted <= 0) {
                     continue;
                 }
+
                 tryDrain.amount = amountAccepted;
                 drained = tank.externalTank.drain(conDir.getOpposite(), tryDrain, true);
                 if (drained == null || drained.amount <= 0) {
@@ -115,7 +119,7 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidCon
         if (drained == null || drained.amount <= 0 || !matchedFilter(drained, con, conDir, true)) {
             return false;
         }
-        int amountAccepted = fillFrom(tank, drained.copy(), true);
+        int amountAccepted = fillFrom(tank, drained, true);
         if (amountAccepted <= 0) {
             return false;
         }
@@ -147,7 +151,6 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidCon
             resource = resource.copy();
             resource.amount = Math.min(resource.amount, type.getMaxIoPerTick());
             int filled = 0;
-            int remaining = resource.amount;
             // TODO: Only change starting pos of iterator is doFill is true so a false then true returns the same
 
             TankIterator iterator;
@@ -158,13 +161,13 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidCon
                         && target.acceptsOuput
                         && target.isValid()
                         && matchedFilter(resource, target.con, target.conDir, false)) {
-                    int vol = target.externalTank.fill(target.tankDir, resource.copy(), doFill);
-                    remaining -= vol;
+                    // Use reused FluidStack instead of copying each iteration
+                    int vol = target.externalTank.fill(target.tankDir, resource, doFill);
+                    resource.amount -= vol;
                     filled += vol;
-                    if (remaining <= 0) {
+                    if (resource.amount <= 0) {
                         break;
                     }
-                    resource.amount = remaining;
                 }
             }
             if (!tank.con.isRoundRobin(tank.conDir)) iterator.rewind();

src/main/java/crazypants/enderio/conduit/oc/OCConduit.java

@@ -86,7 +86,7 @@ public class OCConduit extends AbstractConduit implements IOCConduit {
 
     @Override
     protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) {
-        setSignalColor(dir, DyeColor.values()[dataRoot.getShort("signalColor")]);
+        setSignalColor(dir, DyeColor.VALUES[dataRoot.getShort("signalColor")]);
     }
 
     @Override
@@ -148,7 +148,7 @@ public class OCConduit extends AbstractConduit implements IOCConduit {
             int i = 0;
             for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
                 if (cols[i] >= 0) {
-                    signalColors.put(dir, DyeColor.values()[cols[i]]);
+                    signalColors.put(dir, DyeColor.VALUES[cols[i]]);
                 }
                 i++;
             }
@@ -274,7 +274,7 @@ public class OCConduit extends AbstractConduit implements IOCConduit {
                 BlockCoord bc = getLocation();
                 if (network != null) {
                     boolean noconnections = true;
-                    for (DyeColor color : DyeColor.values()) {
+                    for (DyeColor color : DyeColor.VALUES) {
                         if (node(color).neighbors().iterator().hasNext()) {
                             noconnections = false;
                             ChatComponentText coltxt = new ChatComponentText(color.getLocalisedName());
@@ -350,7 +350,7 @@ public class OCConduit extends AbstractConduit implements IOCConduit {
         if (loc != null && network != null) {
             World world = getBundle().getWorld();
             EnumSet<ForgeDirection> conns = getConnections();
-            for (DyeColor color : DyeColor.values()) {
+            for (DyeColor color : DyeColor.VALUES) {
                 Set<Node> should = new HashSet<Node>();
                 for (ForgeDirection direction : conns) {
                     if (getSignalColor(direction) == color) {

src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java

@@ -16,11 +16,11 @@ import li.cil.oc.api.network.Visibility;
 @Interface(iface = "li.cil.oc.api.network.ManagedEnvironment", modid = "OpenComputersAPI|Network")
 public class OCConduitNetwork extends AbstractConduitNetwork<IOCConduit, IOCConduit> implements ManagedEnvironment {
 
-    private Node[] node = new Node[DyeColor.values().length];
+    private final Node[] node = new Node[DyeColor.VALUES.length];
 
     public OCConduitNetwork() {
         super(IOCConduit.class, IOCConduit.class);
-        for (DyeColor dyeColor : DyeColor.values()) {
+        for (DyeColor dyeColor : DyeColor.VALUES) {
             node[dyeColor.ordinal()] = Network.newNode(this, Visibility.Network).create();
             Network.joinNewNetwork(node[dyeColor.ordinal()]);
         }
@@ -68,7 +68,7 @@ public class OCConduitNetwork extends AbstractConduitNetwork<IOCConduit, IOCCond
 
     @Override
     public void destroyNetwork() {
-        for (DyeColor dyeColor : DyeColor.values()) {
+        for (DyeColor dyeColor : DyeColor.VALUES) {
             node[dyeColor.ordinal()].remove();
         }
         super.destroyNetwork();

src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java

@@ -8,6 +8,7 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit;
+import crazypants.util.ForgeDirections;
 import io.netty.buffer.ByteBuf;
 
 public class PacketConnectionMode extends AbstractConduitPacket<IConduit>
@@ -34,8 +35,8 @@ public class PacketConnectionMode extends AbstractConduitPacket<IConduit>
     @Override
     public void fromBytes(ByteBuf buf) {
         super.fromBytes(buf);
-        dir = ForgeDirection.values()[buf.readShort()];
-        mode = ConnectionMode.values()[buf.readShort()];
+        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
+        mode = ConnectionMode.VALUES[buf.readShort()];
     }
 
     @Override

src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java

@@ -9,6 +9,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import crazypants.enderio.conduit.IExtractor;
 import crazypants.enderio.machine.RedstoneControlMode;
+import crazypants.util.ForgeDirections;
 import io.netty.buffer.ByteBuf;
 
 public class PacketExtractMode extends AbstractConduitPacket<IExtractor>
@@ -38,9 +39,9 @@ public class PacketExtractMode extends AbstractConduitPacket<IExtractor>
     @Override
     public void fromBytes(ByteBuf buf) {
         super.fromBytes(buf);
-        dir = ForgeDirection.values()[buf.readShort()];
+        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
         mode = RedstoneControlMode.values()[buf.readShort()];
-        color = DyeColor.values()[buf.readShort()];
+        color = DyeColor.VALUES[buf.readShort()];
     }
 
     @Override

src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java

@@ -10,6 +10,7 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import crazypants.enderio.conduit.item.FilterRegister;
 import crazypants.enderio.conduit.item.IItemConduit;
 import crazypants.enderio.conduit.item.filter.IItemFilter;
+import crazypants.util.ForgeDirections;
 import io.netty.buffer.ByteBuf;
 
 public class PacketItemConduitFilter extends AbstractConduitPacket<IItemConduit>
@@ -56,12 +57,12 @@ public class PacketItemConduitFilter extends AbstractConduitPacket<IItemConduit>
     @Override
     public void fromBytes(ByteBuf buf) {
         super.fromBytes(buf);
-        dir = ForgeDirection.values()[buf.readShort()];
+        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
         loopMode = buf.readBoolean();
         roundRobin = buf.readBoolean();
         priority = buf.readInt();
-        colIn = DyeColor.values()[buf.readShort()];
-        colOut = DyeColor.values()[buf.readShort()];
+        colIn = DyeColor.VALUES[buf.readShort()];
+        colOut = DyeColor.VALUES[buf.readShort()];
         inputFilter = FilterRegister.readFilter(buf);
         outputFilter = FilterRegister.readFilter(buf);
     }

src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java

@@ -8,6 +8,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import crazypants.enderio.conduit.oc.IOCConduit;
+import crazypants.util.ForgeDirections;
 import io.netty.buffer.ByteBuf;
 
 public class PacketOCConduitSignalColor extends AbstractConduitPacket<IOCConduit>
@@ -34,8 +35,8 @@ public class PacketOCConduitSignalColor extends AbstractConduitPacket<IOCConduit
     @Override
     public void fromBytes(ByteBuf buf) {
         super.fromBytes(buf);
-        dir = ForgeDirection.values()[buf.readShort()];
-        col = DyeColor.values()[buf.readShort()];
+        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
+        col = DyeColor.VALUES[buf.readShort()];
     }
 
     @Override

src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitOutputStrength.java

@@ -6,6 +6,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit;
+import crazypants.util.ForgeDirections;
 import io.netty.buffer.ByteBuf;
 
 public class PacketRedstoneConduitOutputStrength extends AbstractConduitPacket<IInsulatedRedstoneConduit>
@@ -32,7 +33,7 @@ public class PacketRedstoneConduitOutputStrength extends AbstractConduitPacket<I
     @Override
     public void fromBytes(ByteBuf buf) {
         super.fromBytes(buf);
-        dir = ForgeDirection.values()[buf.readShort()];
+        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
         isStrong = buf.readBoolean();
     }
 

src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java

@@ -8,6 +8,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit;
+import crazypants.util.ForgeDirections;
 import io.netty.buffer.ByteBuf;
 
 public class PacketRedstoneConduitSignalColor extends AbstractConduitPacket<IInsulatedRedstoneConduit>
@@ -34,8 +35,8 @@ public class PacketRedstoneConduitSignalColor extends AbstractConduitPacket<IIns
     @Override
     public void fromBytes(ByteBuf buf) {
         super.fromBytes(buf);
-        dir = ForgeDirection.values()[buf.readShort()];
-        col = DyeColor.values()[buf.readShort()];
+        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
+        col = DyeColor.VALUES[buf.readShort()];
     }
 
     @Override

src/main/java/crazypants/enderio/conduit/packet/PacketRoundRobinMode.java

@@ -7,6 +7,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.ILiquidConduit;
+import crazypants.util.ForgeDirections;
 import io.netty.buffer.ByteBuf;
 
 public class PacketRoundRobinMode extends AbstractConduitPacket<ILiquidConduit>
@@ -33,7 +34,7 @@ public class PacketRoundRobinMode extends AbstractConduitPacket<ILiquidConduit>
     @Override
     public void fromBytes(ByteBuf buf) {
         super.fromBytes(buf);
-        dir = ForgeDirection.values()[buf.readShort()];
+        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
         roundRobin = buf.readBoolean();
     }
 

src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java

@@ -12,8 +12,8 @@ import crazypants.enderio.ModObject;
 import crazypants.enderio.conduit.AbstractItemConduit;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.ItemConduitSubtype;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.power.ICapacitor;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class ItemPowerConduit extends AbstractItemConduit {
 

src/main/java/crazypants/enderio/conduit/power/PowerConduit.java

@@ -210,7 +210,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
 
     @Override
     protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) {
-        setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]);
+        setExtractionSignalColor(dir, DyeColor.VALUES[dataRoot.getShort("extractionSignalColor")]);
         setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir);
     }
 
@@ -262,8 +262,8 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
             key = "pRsCol." + dir.name();
             if (nbtRoot.hasKey(key)) {
                 short ord = nbtRoot.getShort(key);
-                if (ord >= 0 && ord < DyeColor.values().length) {
-                    rsColors.put(dir, DyeColor.values()[ord]);
+                if (ord >= 0 && ord < DyeColor.VALUES.length) {
+                    rsColors.put(dir, DyeColor.VALUES[ord]);
                 }
             }
         }

src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java

@@ -13,8 +13,8 @@ import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.ItemConduitSubtype;
 import crazypants.enderio.conduit.power.IPowerConduit;
 import crazypants.enderio.conduit.power.ItemPowerConduit;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.power.ICapacitor;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class ItemPowerConduitEndergy extends ItemPowerConduit {
 

src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java

@@ -242,7 +242,7 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula
 
     @Override
     protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) {
-        setSignalColor(dir, DyeColor.values()[dataRoot.getShort("signalColor")]);
+        setSignalColor(dir, DyeColor.VALUES[dataRoot.getShort("signalColor")]);
         setOutputStrength(dir, dataRoot.getBoolean("signalStrong"));
     }
 
@@ -583,7 +583,7 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula
             int i = 0;
             for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
                 if (modes[i] >= 0) {
-                    forcedConnections.put(dir, ConnectionMode.values()[modes[i]]);
+                    forcedConnections.put(dir, ConnectionMode.VALUES[modes[i]]);
                 }
                 i++;
             }
@@ -595,7 +595,7 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula
             int i = 0;
             for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
                 if (cols[i] >= 0) {
-                    signalColors.put(dir, DyeColor.values()[cols[i]]);
+                    signalColors.put(dir, DyeColor.VALUES[cols[i]]);
                 }
                 i++;
             }

src/main/java/crazypants/enderio/conduit/redstone/SignalSource.java

@@ -81,7 +81,7 @@ public class SignalSource {
         for (int i = 0; i < enc.length; i += 5) {
             // Signal sig = new Signal(enc[i], enc[i + 1], enc[i + 2], enc[i + 3], ForgeDirection.UNKNOWN,14,
             // SignalColor.values()[enc[i + 4]]);
-            // result.add(new SignalSource(sig, ForgeDirection.values()[enc[i + 4]]));
+            // result.add(new SignalSource(sig, ForgeDirections.DIRECTIONS[enc[i + 4]]));
         }
         return result;
     }

src/main/java/crazypants/enderio/enderface/GuiEnderface.java

@@ -214,7 +214,7 @@ public class GuiEnderface extends GuiScreen {
 
         if (hit != null) {
             Block block = world.getBlock(hit.blockX, hit.blockY, hit.blockZ);
-            if (block == EnderIO.blockHyperCube || block == EnderIO.blockCapacitorBank) {
+            if (block == EnderIO.blockHyperCube) {
                 block.onBlockActivated(world, hit.blockX, hit.blockY, hit.blockZ, player, 0, 0, 0, 0);
             } else {
                 openInterface(hit.blockX, hit.blockY, hit.blockZ, hit.sideHit, hit.hitVec);

src/main/java/crazypants/enderio/gui/TooltipHandlerBurnTime.java

@@ -14,7 +14,7 @@ import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.AbstractMachineEntity;
 import crazypants.enderio.machine.generator.stirling.StirlingGeneratorContainer;
 import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class TooltipHandlerBurnTime implements ITooltipCallback {
 

src/main/java/crazypants/enderio/gui/TooltipHandlerFluid.java

@@ -15,7 +15,7 @@ import crazypants.enderio.EnderIO;
 import crazypants.enderio.fluid.FluidFuelRegister;
 import crazypants.enderio.fluid.IFluidCoolant;
 import crazypants.enderio.fluid.IFluidFuel;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class TooltipHandlerFluid implements ITooltipCallback {
 

src/main/java/crazypants/enderio/item/ItemMagnet.java

@@ -28,7 +28,7 @@ import crazypants.enderio.EnderIOTab;
 import crazypants.enderio.ModObject;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.item.darksteel.DarkSteelItems;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.PowerDisplayUtil;
 import crazypants.util.BaublesUtil;
 
 @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles|API")

src/main/java/crazypants/enderio/item/ItemSoulVessel.java

@@ -310,7 +310,7 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider {
         if (colorIdx < 0 || colorIdx > 15) {
             return null;
         }
-        return DyeColor.values()[15 - colorIdx];
+        return DyeColor.VALUES[15 - colorIdx];
     }
 
     private float getHealthFromStack(ItemStack item) {

src/main/java/crazypants/enderio/item/KeyTracker.java

@@ -11,12 +11,14 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentTranslation;
 
 import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
 
 import com.enderio.core.common.util.ChatUtil;
 
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent;
+import cpw.mods.fml.common.gameevent.InputEvent.MouseInputEvent;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.api.teleport.IItemOfTravel;
 import crazypants.enderio.api.tool.IConduitControl;
@@ -134,6 +136,18 @@ public class KeyTracker {
 
     @SubscribeEvent
     public void onKeyInput(KeyInputEvent event) {
+        handleInput();
+    }
+
+    // mouse button presses arrive on a separate event
+    @SubscribeEvent
+    public void onMouseInput(MouseInputEvent event) {
+        if (Mouse.getEventButton() >= 0) {
+            handleInput();
+        }
+    }
+
+    private void handleInput() {
         handleGlide();
         handleSoundDetector();
         handleNightVision();

src/main/java/crazypants/enderio/item/PacketConduitProbe.java

@@ -24,10 +24,10 @@ import crazypants.enderio.conduit.power.IPowerConduit;
 import crazypants.enderio.conduit.power.NetworkPowerManager;
 import crazypants.enderio.conduit.power.PowerConduitNetwork;
 import crazypants.enderio.conduit.power.PowerTracker;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.power.EnergyHandlerPI;
 import crazypants.enderio.power.IInternalPowerReceiver;
 import crazypants.enderio.power.IInternalPoweredTile;
+import crazypants.enderio.power.PowerDisplayUtil;
 import io.netty.buffer.ByteBuf;
 
 public class PacketConduitProbe implements IMessage, IMessageHandler<PacketConduitProbe, IMessage> {

src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java

@@ -67,7 +67,6 @@ public class ItemDarkSteelAxe extends ItemAxe
 
     public static ItemDarkSteelAxe create() {
         ItemDarkSteelAxe res = new ItemDarkSteelAxe();
-        MinecraftForge.EVENT_BUS.register(res);
         res.init();
         return res;
     }
@@ -188,18 +187,6 @@ public class ItemDarkSteelAxe extends ItemAxe
         return usedPower;
     }
 
-    @SubscribeEvent
-    public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {
-        if (evt.entityPlayer.isSneaking()
-                && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest)
-                && isLog(evt.block, evt.metadata)) {
-            evt.newSpeed = evt.originalSpeed / Config.darkSteelAxeSpeedPenaltyMultiHarvest;
-        }
-        if (isEquipped(evt.entityPlayer) && evt.block.getMaterial() == Material.leaves) {
-            evt.newSpeed = 6;
-        }
-    }
-
     @Override
     public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side,
             float par8, float par9, float par10) {
@@ -258,6 +245,7 @@ public class ItemDarkSteelAxe extends ItemAxe
 
     protected void init() {
         GameRegistry.registerItem(this, getUnlocalizedName());
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override
@@ -336,4 +324,19 @@ public class ItemDarkSteelAxe extends ItemAxe
             return (x < y) ? -1 : ((x == y) ? 0 : 1);
         }
     }
+
+    public class EventHandler {
+
+        @SubscribeEvent
+        public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {
+            if (evt.entityPlayer.isSneaking()
+                    && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest)
+                    && isLog(evt.block, evt.metadata)) {
+                evt.newSpeed = evt.originalSpeed / Config.darkSteelAxeSpeedPenaltyMultiHarvest;
+            }
+            if (isEquipped(evt.entityPlayer) && evt.block.getMaterial() == Material.leaves) {
+                evt.newSpeed = 6;
+            }
+        }
+    }
 }

src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java

@@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
-import net.minecraftforge.common.MinecraftForge;
 
 import com.enderio.core.api.client.gui.IAdvancedTooltipProvider;
 import com.enderio.core.common.util.ItemUtil;
@@ -34,7 +33,7 @@ import crazypants.enderio.config.Config;
 import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.SpoonUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.PowerDisplayUtil;
 import crazypants.enderio.teleport.TravelController;
 
 public class ItemDarkSteelPickaxe extends ItemPickaxe
@@ -61,7 +60,6 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe
     public static ItemDarkSteelPickaxe create() {
         ItemDarkSteelPickaxe res = new ItemDarkSteelPickaxe();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 

src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java

@@ -62,13 +62,12 @@ public class ItemDarkSteelShears extends ItemShears
 
     public static ItemDarkSteelShears create() {
         ItemDarkSteelShears res = new ItemDarkSteelShears();
-        MinecraftForge.EVENT_BUS.register(res);
         res.init();
         return res;
     }
 
-    protected final MultiHarvestComparator harvestComparator = new MultiHarvestComparator();
-    protected final EntityComparator entityComparator = new EntityComparator();
+    private final MultiHarvestComparator harvestComparator = new MultiHarvestComparator();
+    private final EntityComparator entityComparator = new EntityComparator();
     protected String name;
 
     protected ItemDarkSteelShears(String name) {
@@ -202,14 +201,6 @@ public class ItemDarkSteelShears extends ItemShears
         return false;
     }
 
-    @SubscribeEvent
-    public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {
-        if (evt.originalSpeed > 2.0
-                && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelShearsPowerUsePerDamagePoint)) {
-            evt.newSpeed = evt.originalSpeed * Config.darkSteelShearsEffeciencyBoostWhenPowered;
-        }
-    }
-
     @Override
     public void setDamage(ItemStack stack, int newDamage) {
         int oldDamage = getDamage(stack);
@@ -231,6 +222,7 @@ public class ItemDarkSteelShears extends ItemShears
 
     protected void init() {
         GameRegistry.registerItem(this, getUnlocalizedName());
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override
@@ -330,4 +322,15 @@ public class ItemDarkSteelShears extends ItemShears
             return 0;
         }
     }
+
+    public static class EventHandler {
+
+        @SubscribeEvent
+        public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {
+            if (evt.originalSpeed > 2.0
+                    && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelShearsPowerUsePerDamagePoint)) {
+                evt.newSpeed = evt.originalSpeed * Config.darkSteelShearsEffeciencyBoostWhenPowered;
+            }
+        }
+    }
 }

src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java

@@ -72,7 +72,6 @@ public class ItemDarkSteelSword extends ItemSword
     public static ItemDarkSteelSword create() {
         ItemDarkSteelSword res = new ItemDarkSteelSword();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 
@@ -117,71 +116,6 @@ public class ItemDarkSteelSword extends ItemSword
         return false;
     }
 
-    @SubscribeEvent
-    public void onEnderTeleport(EnderTeleportEvent evt) {
-        if (evt.entityLiving.getEntityData().getBoolean("hitByDarkSteelSword")) {
-            evt.setCanceled(true);
-        }
-    }
-
-    // Set priorty to lowest in the hope any other mod adding head drops will have already added them
-    // by the time this is called to prevent multiple head drops
-    @SubscribeEvent(priority = EventPriority.LOWEST)
-    public void onEntityDrop(LivingDropsEvent evt) {
-
-        if (!(evt.source.getEntity() instanceof EntityPlayer)) {
-            return;
-        }
-
-        EntityPlayer player = (EntityPlayer) evt.source.getEntity();
-        // Handle TiC weapons with beheading differently
-        if (handleBeheadingWeapons(player, evt)) {
-            return;
-        }
-
-        double skullDropChance = getSkullDropChance(player, evt);
-        if (player instanceof FakePlayer) {
-            skullDropChance *= Config.fakePlayerSkullChance;
-        }
-        if (Math.random() <= skullDropChance) {
-            dropSkull(evt, player);
-        }
-
-        // Special handling for ender pear drops
-        if (isEquipped(player)) {
-            String name = EntityList.getEntityString(evt.entityLiving);
-            if (evt.entityLiving instanceof EntityEnderman || ENDERZOO_ENDERMINY.equals(name)) {
-                int numPearls = 0;
-                if (Math.random() <= Config.darkSteelSwordEnderPearlDropChance) {
-                    numPearls++;
-                }
-                for (int i = 0; i < evt.lootingLevel; i++) {
-                    if (Math.random() <= Config.darkSteelSwordEnderPearlDropChancePerLooting) {
-                        numPearls++;
-                    }
-                }
-
-                int existing = 0;
-                for (EntityItem stack : evt.drops) {
-                    if (stack.getEntityItem() != null && stack.getEntityItem().getItem() == Items.ender_pearl) {
-                        existing += stack.getEntityItem().stackSize;
-                    }
-                }
-                int toDrop = numPearls - existing;
-                if (toDrop > 0) {
-                    evt.drops.add(
-                            Util.createDrop(
-                                    player.worldObj,
-                                    new ItemStack(Items.ender_pearl, toDrop, 0),
-                                    evt.entityLiving.posX,
-                                    evt.entityLiving.posY,
-                                    evt.entityLiving.posZ,
-                                    false));
-                }
-            }
-        }
-    }
-
     protected void dropSkull(LivingDropsEvent evt, EntityPlayer player) {
         ItemStack skull = getSkullForEntity(evt.entityLiving);
         if (skull != null && !containsDrop(evt, skull)) {
@@ -292,6 +226,7 @@ public class ItemDarkSteelSword extends ItemSword
 
     protected void init() {
         GameRegistry.registerItem(this, getUnlocalizedName());
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override
@@ -437,4 +372,73 @@ public class ItemDarkSteelSword extends ItemSword
 
         return super.onItemRightClick(stack, world, player);
     }
+
+    public class EventHandler {
+
+        @SubscribeEvent
+        public void onEnderTeleport(EnderTeleportEvent evt) {
+            if (evt.entityLiving.getEntityData().getBoolean("hitByDarkSteelSword")) {
+                evt.setCanceled(true);
+            }
+        }
+
+        // Set priorty to lowest in the hope any other mod adding head drops will have already added them
+        // by the time this is called to prevent multiple head drops
+        @SubscribeEvent(priority = EventPriority.LOWEST)
+        public void onEntityDrop(LivingDropsEvent evt) {
+
+            if (!(evt.source.getEntity() instanceof EntityPlayer)) {
+                return;
+            }
+
+            EntityPlayer player = (EntityPlayer) evt.source.getEntity();
+            // Handle TiC weapons with beheading differently
+            if (handleBeheadingWeapons(player, evt)) {
+                return;
+            }
+
+            double skullDropChance = getSkullDropChance(player, evt);
+            if (player instanceof FakePlayer) {
+                skullDropChance *= Config.fakePlayerSkullChance;
+            }
+            if (Math.random() <= skullDropChance) {
+                dropSkull(evt, player);
+            }
+
+            // Special handling for ender pear drops
+            if (isEquipped(player)) {
+                String name = EntityList.getEntityString(evt.entityLiving);
+                if (evt.entityLiving instanceof EntityEnderman || ENDERZOO_ENDERMINY.equals(name)) {
+                    int numPearls = 0;
+                    if (Math.random() <= Config.darkSteelSwordEnderPearlDropChance) {
+                        numPearls++;
+                    }
+                    for (int i = 0; i < evt.lootingLevel; i++) {
+                        if (Math.random() <= Config.darkSteelSwordEnderPearlDropChancePerLooting) {
+                            numPearls++;
+                        }
+                    }
+
+                    int existing = 0;
+                    for (EntityItem stack : evt.drops) {
+                        if (stack.getEntityItem() != null && stack.getEntityItem().getItem() == Items.ender_pearl) {
+                            existing += stack.getEntityItem().stackSize;
+                        }
+                    }
+                    int toDrop = numPearls - existing;
+                    if (toDrop > 0) {
+                        evt.drops.add(
+                                Util.createDrop(
+                                        player.worldObj,
+                                        new ItemStack(Items.ender_pearl, toDrop, 0),
+                                        evt.entityLiving.posX,
+                                        evt.entityLiving.posY,
+                                        evt.entityLiving.posZ,
+                                        false));
+                    }
+                }
+            }
+        }
+
+    }
 }

src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelAxe.java

@@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -30,7 +29,6 @@ public class ItemEndSteelAxe extends ItemDarkSteelAxe implements IEndSteelItem {
     public static ItemEndSteelAxe create() {
         ItemEndSteelAxe res = new ItemEndSteelAxe();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 

src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelPickaxe.java

@@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -30,7 +29,6 @@ public class ItemEndSteelPickaxe extends ItemDarkSteelPickaxe implements IEndSte
     public static ItemEndSteelPickaxe create() {
         ItemEndSteelPickaxe res = new ItemEndSteelPickaxe();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 

src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelSword.java

@@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.EnumHelper;
 
 import cpw.mods.fml.relauncher.Side;
@@ -35,7 +34,6 @@ public class ItemEndSteelSword extends ItemDarkSteelSword implements IEndSteelIt
     public static ItemEndSteelSword create() {
         ItemEndSteelSword res = new ItemEndSteelSword();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 

src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java

@@ -62,7 +62,7 @@ public class ItemGliderWing extends Item implements IResourceTooltipProvider {
 
     @Override
     public String getUnlocalizedName(ItemStack par1ItemStack) {
-        int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Capacitors.values().length - 1);
+        int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Capacitors.VALUES.length - 1);
         if (i == 0) {
             return super.getUnlocalizedName();
         }

src/main/java/crazypants/enderio/item/darksteel/ItemStellarAxe.java

@@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -30,7 +29,6 @@ public class ItemStellarAxe extends ItemDarkSteelAxe implements IStellarItem {
     public static ItemStellarAxe create() {
         ItemStellarAxe res = new ItemStellarAxe();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 

src/main/java/crazypants/enderio/item/darksteel/ItemStellarPickaxe.java

@@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -30,7 +29,6 @@ public class ItemStellarPickaxe extends ItemDarkSteelPickaxe implements IStellar
     public static ItemStellarPickaxe create() {
         ItemStellarPickaxe res = new ItemStellarPickaxe();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 

src/main/java/crazypants/enderio/item/darksteel/ItemStellarSword.java

@@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.EnumHelper;
 
 import cpw.mods.fml.relauncher.Side;
@@ -35,7 +34,6 @@ public class ItemStellarSword extends ItemDarkSteelSword implements IStellarItem
     public static ItemStellarSword create() {
         ItemStellarSword res = new ItemStellarSword();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 

src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java

@@ -17,8 +17,8 @@ import crazypants.enderio.EnderIO;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.item.darksteel.IDarkSteelItem;
 import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.material.Material;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class EnergyUpgrade extends AbstractUpgrade {
 

src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java

@@ -169,7 +169,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
         if (contents == null || contents.getItem() != EnderIO.itemBasicCapacitor) {
             setCapacitor(Capacitors.BASIC_CAPACITOR);
         } else {
-            setCapacitor(Capacitors.values()[contents.getItemDamage()]);
+            setCapacitor(Capacitors.VALUES[contents.getItemDamage()]);
         }
     }
 
@@ -181,7 +181,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
     @Override
     public void readCommon(NBTTagCompound nbtRoot) {
         super.readCommon(nbtRoot);
-        setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]);
+        setCapacitor(Capacitors.VALUES[nbtRoot.getShort("capacitorType")]);
         int energy;
         if (nbtRoot.hasKey("storedEnergy")) {
             float storedEnergyMJ = nbtRoot.getFloat("storedEnergy");

src/main/java/crazypants/enderio/machine/IoMode.java

@@ -25,19 +25,19 @@ public enum IoMode {
 
     public static ConnectionMode getNext(ConnectionMode mode) {
         int ord = mode.ordinal() + 1;
-        if (ord >= ConnectionMode.values().length) {
+        if (ord >= ConnectionMode.VALUES.length) {
             ord = 0;
         }
-        return ConnectionMode.values()[ord];
+        return ConnectionMode.VALUES[ord];
     }
 
     public static ConnectionMode getPrevious(ConnectionMode mode) {
 
         int ord = mode.ordinal() - 1;
         if (ord < 0) {
-            ord = ConnectionMode.values().length - 1;
+            ord = ConnectionMode.VALUES.length - 1;
         }
-        return ConnectionMode.values()[ord];
+        return ConnectionMode.VALUES[ord];
     }
 
     public boolean pulls() {

src/main/java/crazypants/enderio/machine/MachineRecipes.java

@@ -28,7 +28,6 @@ import crazypants.enderio.item.skull.BlockEndermanSkull;
 import crazypants.enderio.machine.buffer.BlockItemBuffer.Type;
 import crazypants.enderio.machine.capbank.BlockItemCapBank;
 import crazypants.enderio.machine.capbank.CapBankType;
-import crazypants.enderio.machine.capbank.ConvertOldRecipe;
 import crazypants.enderio.machine.light.BlockItemElectricLight;
 import crazypants.enderio.material.FrankenSkull;
 import crazypants.enderio.material.MachinePart;
@@ -343,9 +342,6 @@ public class MachineRecipes {
                 .createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.VIBRANT), 0);
         RecipeUtil.addShaped(capBank3, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor3, 'm', vibCry);
 
-        ConvertOldRecipe convertRecipe = new ConvertOldRecipe();
-        GameRegistry.addRecipe(convertRecipe);
-
         GameRegistry.addRecipe(
                 new UpgradeCapBankRecipe(
                         capBank2,

src/main/java/crazypants/enderio/machine/PacketIoMode.java

@@ -10,6 +10,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import crazypants.enderio.network.PacketUtil;
+import crazypants.util.ForgeDirections;
 import io.netty.buffer.ByteBuf;
 
 public class PacketIoMode implements IMessage, IMessageHandler<PacketIoMode, IMessage> {
@@ -55,7 +56,7 @@ public class PacketIoMode implements IMessage, IMessageHandler<PacketIoMode, IMe
         y = buf.readInt();
         z = buf.readInt();
         mode = IoMode.values()[buf.readShort()];
-        face = ForgeDirection.values()[buf.readShort()];
+        face = ForgeDirections.DIRECTIONS[buf.readShort()];
     }
 
     @Override

src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java

@@ -38,7 +38,7 @@ public class GuiAlloySmelter extends GuiPoweredMachineBase<TileAlloySmelter> {
         vanillaFurnaceButton.setSize(BUTTON_SIZE, BUTTON_SIZE);
 
         vanillaFurnaceTooltip = new GuiToolTip(
-                new Rectangle(xSize - 5 - BUTTON_SIZE, 62, BUTTON_SIZE, BUTTON_SIZE),
+                new Rectangle(xSize - 5 - BUTTON_SIZE, 43, BUTTON_SIZE, BUTTON_SIZE),
                 (String[]) null);
 
         addProgressTooltip(55, 35, 14, 14);

src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java

@@ -11,8 +11,8 @@ import com.enderio.core.client.render.RenderUtil;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.machine.IoMode;
 import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.network.PacketHandler;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class GuiBuffer extends GuiPoweredMachineBase<TileBuffer> {
 
@@ -93,11 +93,6 @@ public class GuiBuffer extends GuiPoweredMachineBase<TileBuffer> {
         PacketHandler.INSTANCE.sendToServer(new PacketBufferIO(getTileEntity(), lastInput, lastOutput));
     }
 
-    @Override
-    protected boolean showRecipeButton() {
-        return false;
-    }
-
     @Override
     protected boolean renderPowerBar() {
         return getTileEntity().hasPower();

src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java

@@ -49,11 +49,12 @@ import crazypants.enderio.machine.capbank.packet.PacketNetworkIdRequest;
 import crazypants.enderio.machine.capbank.packet.PacketNetworkIdResponse;
 import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest;
 import crazypants.enderio.machine.capbank.packet.PacketNetworkStateResponse;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.network.PacketHandler;
+import crazypants.enderio.power.PowerDisplayUtil;
 import crazypants.enderio.power.PowerHandlerUtil;
 import crazypants.enderio.tool.ToolUtil;
 import crazypants.enderio.waila.IWailaInfoProvider;
+import crazypants.util.ForgeDirections;
 
 public class BlockCapBank extends BlockEio
         implements IGuiHandler, IAdvancedTooltipProvider, IWailaInfoProvider, IRedstoneConnectable {
@@ -345,7 +346,7 @@ public class BlockCapBank extends BlockEio
         // }
 
         TileCapBank cb = (TileCapBank) te;
-        ForgeDirection face = ForgeDirection.values()[side];
+        ForgeDirection face = ForgeDirections.DIRECTIONS[side];
 
         int meta = ba.getBlockMetadata(x, y, z);
         meta = MathHelper.clamp_int(meta, 0, CapBankType.types().size() - 1);
@@ -452,14 +453,14 @@ public class BlockCapBank extends BlockEio
     protected ForgeDirection getDirForHeading(int heading) {
         switch (heading) {
             case 0:
-                return ForgeDirection.values()[2];
+                return ForgeDirections.DIRECTIONS[2];
             case 1:
-                return ForgeDirection.values()[5];
+                return ForgeDirections.DIRECTIONS[5];
             case 2:
-                return ForgeDirection.values()[3];
+                return ForgeDirections.DIRECTIONS[3];
             case 3:
             default:
-                return ForgeDirection.values()[4];
+                return ForgeDirections.DIRECTIONS[4];
         }
     }
 
@@ -523,20 +524,6 @@ public class BlockCapBank extends BlockEio
         return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z);
     }
 
-    @Override
-    public boolean hasComparatorInputOverride() {
-        return true;
-    }
-
-    @Override
-    public int getComparatorInputOverride(World w, int x, int y, int z, int side) {
-        TileEntity te = w.getTileEntity(x, y, z);
-        if (te instanceof TileCapBank) {
-            return ((TileCapBank) te).getComparatorOutput();
-        }
-        return 0;
-    }
-
     @Override
     public void getWailaInfo(List<String> tooltip, EntityPlayer player, World world, int x, int y, int z) {
         TileEntity te = world.getTileEntity(x, y, z);

src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java

@@ -89,7 +89,9 @@ public class ContainerCapBank extends ContainerEnderTileEntity<TileCapBank> {
         }
 
         if (hasBaublesSlots()) {
-            for (int i = 0; i < baubles.getSizeInventory(); i++) {
+            // for (int i = 0; i < baubles.getSizeInventory(); i++) {
+            // Capped since the sprite only has 4 slots
+            for (int i = 0; i < Math.min(baubles.getSizeInventory(), 4); i++) {
                 addSlotToContainer(new Slot(baubles, i, -15 + armorOffset, 84 + i * 18) {
 
                     @Override
@@ -122,7 +124,9 @@ public class ContainerCapBank extends ContainerEnderTileEntity<TileCapBank> {
         int startHotBarSlot = endPlayerSlot + 1;
         int endHotBarSlot = startHotBarSlot + 9;
         int startBaublesSlot = endHotBarSlot + 1;
-        int endBaublesSlot = baubles == null ? 0 : startBaublesSlot + baubles.getSizeInventory();
+        // int endBaublesSlot = baubles == null ? 0 : startBaublesSlot + baubles.getSizeInventory();
+        // Capped since the sprite only has 4 slots
+        int endBaublesSlot = baubles == null ? 0 : startBaublesSlot + Math.min(baubles.getSizeInventory(), 4);
 
         ItemStack copystack = null;
         Slot slot = (Slot) inventorySlots.get(slotIndex);

src/main/java/crazypants/enderio/machine/capbank/ConvertOldRecipe.java

@@ -1,66 +0,0 @@
-package crazypants.enderio.machine.capbank;
-
-import net.minecraft.block.Block;
-import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.world.World;
-import net.minecraftforge.oredict.RecipeSorter;
-import net.minecraftforge.oredict.RecipeSorter.Category;
-
-import crazypants.enderio.EnderIO;
-import crazypants.enderio.power.PowerHandlerUtil;
-
-public class ConvertOldRecipe implements IRecipe {
-
-    static {
-        RecipeSorter.register(
-                "EnderIO:convertOldCapBankRecipe",
-                ConvertOldRecipe.class,
-                Category.SHAPELESS,
-                "after:minecraft:shapeless");
-    }
-
-    private ItemStack output;
-
-    @Override
-    public boolean matches(InventoryCrafting inv, World world) {
-        ItemStack input = null;
-        for (int i = 0; i < inv.getSizeInventory(); i++) {
-            ItemStack checkStack = inv.getStackInSlot(i);
-            if (checkStack != null) {
-                if (input != null) {
-                    return false;
-                }
-                if (Block.getBlockFromItem(checkStack.getItem()) == EnderIO.blockCapacitorBank) {
-                    input = checkStack;
-                } else {
-                    return false;
-                }
-            }
-        }
-
-        if (input == null) {
-            return false;
-        }
-
-        output = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.ACTIVATED));
-        PowerHandlerUtil.setStoredEnergyForItem(output, PowerHandlerUtil.getStoredEnergyForItem(input));
-        return true;
-    }
-
-    @Override
-    public ItemStack getCraftingResult(InventoryCrafting inv) {
-        return output.copy();
-    }
-
-    @Override
-    public int getRecipeSize() {
-        return 1;
-    }
-
-    @Override
-    public ItemStack getRecipeOutput() {
-        return output;
-    }
-}

src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java

@@ -30,8 +30,8 @@ import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest;
 import crazypants.enderio.machine.gui.GuiButtonIoConfig;
 import crazypants.enderio.machine.gui.GuiOverlayIoConfig;
 import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.network.PacketHandler;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class GuiCapBank extends GuiContainerBaseEIO {
 

src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java

@@ -18,6 +18,7 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import com.enderio.core.common.interfaces.IComparatorOutput;
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.EntityUtil;
 import com.enderio.core.common.util.Util;
@@ -46,7 +47,7 @@ import crazypants.enderio.power.IPowerStorage;
 import crazypants.enderio.power.PowerHandlerUtil;
 
 public class TileCapBank extends TileEntityEio
-        implements IInternalPowerReceiver, IInventory, IIoConfigurable, IPowerStorage {
+        implements IInternalPowerReceiver, IInventory, IIoConfigurable, IPowerStorage, IComparatorOutput {
 
     private Map<ForgeDirection, IoMode> faceModes;
     private Map<ForgeDirection, InfoDisplayType> faceDisplayTypes;
@@ -692,9 +693,10 @@ public class TileCapBank extends TileEntityEio
         return getIoMode(from) != IoMode.DISABLED;
     }
 
+    @Override
     public int getComparatorOutput() {
-        double stored = getEnergyStored();
-        return stored == 0 ? 0 : (int) (1 + stored / getMaxEnergyStored() * 14);
+        int stored = getEnergyStored();
+        return stored == 0 ? 0 : 1 + (stored * 14) / getMaxEnergyStored();
     }
 
     @Override
@@ -745,7 +747,7 @@ public class TileCapBank extends TileEntityEio
 
     @Override
     public String getInventoryName() {
-        return EnderIO.blockCapacitorBank.getUnlocalizedName() + ".name";
+        return EnderIO.blockCapBank.getUnlocalizedName() + ".name";
     }
 
     @Override

src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java

@@ -16,7 +16,7 @@ import com.enderio.core.common.util.RoundRobinIterator;
 
 import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
-import crazypants.enderio.conduit.ConduitNetworkTickHandler;
+import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.power.IPowerConduit;
@@ -212,7 +212,7 @@ public class CapBankNetwork implements ICapBankNetwork {
         long curTime = world.getTotalWorldTime();
         if (curTime != timeAtLastApply) {
             timeAtLastApply = curTime;
-            ConduitNetworkTickHandler.instance.addListener(tickListener);
+            EnderIO.proxy.conduitNetworkTickHandler.addListener(tickListener);
         }
     }
 

src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java

@@ -17,7 +17,7 @@ import com.enderio.core.client.render.RenderUtil;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.machine.capbank.TileCapBank;
 import crazypants.enderio.machine.capbank.network.CapBankClientNetwork;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class IoDisplay implements IInfoRenderer {
 

src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java

@@ -17,8 +17,8 @@ import crazypants.enderio.config.Config;
 import crazypants.enderio.gui.IconEIO;
 import crazypants.enderio.machine.PacketItemBuffer;
 import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.network.PacketHandler;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class GuiCrafter extends GuiPoweredMachineBase<TileCrafter> {
 
@@ -67,11 +67,6 @@ public class GuiCrafter extends GuiPoweredMachineBase<TileCrafter> {
         }
     }
 
-    @Override
-    protected boolean showRecipeButton() {
-        return false;
-    }
-
     @Override
     public final int getXSize() {
         return 219;

src/main/java/crazypants/enderio/machine/crusher/BlockCrusher.java

@@ -13,6 +13,7 @@ import crazypants.enderio.GuiHandler;
 import crazypants.enderio.ModObject;
 import crazypants.enderio.machine.AbstractMachineBlock;
 import crazypants.enderio.network.PacketHandler;
+import crazypants.util.ForgeDirections;
 
 public class BlockCrusher extends AbstractMachineBlock<TileCrusher> {
 
@@ -70,7 +71,7 @@ public class BlockCrusher extends AbstractMachineBlock<TileCrusher> {
     public void randomDisplayTick(World world, int x, int y, int z, Random rand) {
         TileCrusher te = (TileCrusher) world.getTileEntity(x, y, z);
         if (te != null && te.isActive()) {
-            ForgeDirection front = ForgeDirection.values()[te.facing];
+            ForgeDirection front = ForgeDirections.DIRECTIONS[te.facing];
 
             for (int i = 0; i < 3; i++) {
                 double px = x + 0.5 + front.offsetX * 0.51;

src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java

@@ -7,34 +7,23 @@ import net.minecraft.entity.player.InventoryPlayer;
 
 import org.lwjgl.opengl.GL11;
 
-import com.enderio.core.client.gui.button.IconButton;
-
-import crazypants.enderio.EnderIO;
 import crazypants.enderio.gui.GuiContainerBaseEIO;
-import crazypants.enderio.gui.IconEIO;
 
 public class GuiEnchanter extends GuiContainerBaseEIO {
 
     private TileEnchanter te;
     private ContainerEnchanter container;
-    private IconButton recipeButton;
 
     public GuiEnchanter(EntityPlayer player, InventoryPlayer inventory, TileEnchanter te) {
         super(new ContainerEnchanter(player, inventory, te), "enchanter");
         container = (ContainerEnchanter) inventorySlots;
         this.te = te;
-
-        recipeButton = new IconButton(this, 100, 154, 8, IconEIO.RECIPE);
-        recipeButton.visible = false;
-        recipeButton.setIconMargin(1, 1);
     }
 
     @Override
     public void initGui() {
         super.initGui();
-        recipeButton.onGuiInit();
-        recipeButton.visible = EnderIO.proxy.isNeiInstalled();
-        ((ContainerEnchanter) inventorySlots).createGhostSlots(getGhostSlots());
+        container.createGhostSlots(getGhostSlots());
     }
 
     @Override
@@ -45,10 +34,6 @@ public class GuiEnchanter extends GuiContainerBaseEIO {
         int sy = (height - ySize) / 2;
         drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize);
 
-        if (EnderIO.proxy.isNeiInstalled()) {
-            IconEIO.map.render(IconEIO.RECIPE, sx + 155, sy + 8, 16, 16, 0, true);
-        }
-
         int curCost = te.getCurrentEnchantmentCost();
         if (curCost > 0) {
             GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);

src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java

@@ -138,11 +138,6 @@ public class GuiFarmStation extends GuiPoweredMachineBase<TileFarmStation> {
         super.actionPerformed(b);
     }
 
-    @Override
-    protected boolean showRecipeButton() {
-        return false;
-    }
-
     @Override
     protected String getPowerOutputLabel() {
         return EnderIO.lang.localize("farm.gui.baseUse");

src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java

@@ -1,19 +1,21 @@
 package crazypants.enderio.machine.farm;
 
+import java.util.ArrayList;
 import java.util.BitSet;
+import java.util.List;
 
 import javax.annotation.Nonnull;
 
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemShears;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.EnumSkyBlock;
@@ -31,7 +33,6 @@ import crazypants.enderio.ModObject;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.AbstractPoweredTaskEntity;
 import crazypants.enderio.machine.ContinuousTask;
-import crazypants.enderio.machine.IMachineRecipe.ResultStack;
 import crazypants.enderio.machine.IPoweredTask;
 import crazypants.enderio.machine.SlotDefinition;
 import crazypants.enderio.machine.farm.farmers.FarmersCommune;
@@ -48,6 +49,8 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IRange
     private static final int TICKS_PER_WORK = 20;
     private boolean showingRange;
 
+    private final List<ItemStack> harvestBuffer = new ArrayList<>();
+
     @Override
     public World getWorld() {
         return worldObj;
@@ -424,6 +427,38 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IRange
             wasActive = isActive();
             worldObj.updateLightByType(EnumSkyBlock.Block, xCoord, yCoord, zCoord);
         }
+        tryMoveFromBuffer();
+    }
+
+    private void tryMoveFromBuffer() {
+        if (harvestBuffer.isEmpty() || worldObj.isRemote) {
+            return;
+        }
+
+        List<ItemStack> toRemove = new ArrayList<>();
+        for (ItemStack stack : harvestBuffer) {
+            if (stack == null || stack.stackSize <= 0) {
+                toRemove.add(stack);
+                continue;
+            }
+
+            ItemStack remaining = tryInsertToInputSlots(stack);
+            if (remaining != null && remaining.stackSize > 0) {
+                remaining = tryInsertToOutputSlots(remaining);
+            }
+
+            if (remaining == null || remaining.stackSize == 0) {
+                toRemove.add(stack);
+            } else {
+                stack.stackSize = remaining.stackSize;
+            }
+        }
+
+        harvestBuffer.removeAll(toRemove);
+
+        if (!toRemove.isEmpty()) {
+            markDirty();
+        }
     }
 
     @Override
@@ -445,9 +480,18 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IRange
             setNotification("noPower");
             return false;
         }
+
+        if (isBufferNotEmpty() || isOutputFull()) {
+            setNotification("outputFull");
+            return false;
+        }
         return true;
     }
 
+    private boolean isBufferNotEmpty() {
+        return !harvestBuffer.isEmpty();
+    }
+
     protected void doTick() {
 
         if (sendNotification && shouldDoWorkThisTick(TICKS_PER_WORK)) {
@@ -488,7 +532,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IRange
             block = worldObj.getBlock(bc.x, bc.y, bc.z);
         }
 
-        if (isOutputFull()) {
+        if (isOutputFull() || isBufferNotEmpty()) {
             setNotification("outputFull");
             return;
         }
@@ -507,10 +551,8 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IRange
                         new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, Config.farmParticlesMaxRange));
                 for (EntityItem ei : harvest.getDrops()) {
                     if (ei != null) {
-                        insertHarvestDrop(ei, bc);
-                        if (!ei.isDead) {
-                            worldObj.spawnEntityInWorld(ei);
-                        }
+                        addToBuffer(ei.getEntityItem().copy());
+                        ei.setDead();
                     }
                 }
                 return;
@@ -552,6 +594,99 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IRange
         }
     }
 
+    private void addToBuffer(ItemStack stack) {
+        if (stack == null || stack.stackSize <= 0) {
+            return;
+        }
+
+        for (ItemStack bufStack : harvestBuffer) {
+            if (bufStack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(bufStack, stack)) {
+                int canAdd = bufStack.stackSize;
+                if (canAdd > 0) {
+                    int addAmount = Math.min(canAdd, stack.stackSize);
+                    bufStack.stackSize += addAmount;
+                    stack.stackSize -= addAmount;
+
+                    if (stack.stackSize <= 0) {
+                        markDirty();
+                        return;
+                    }
+                }
+            }
+        }
+
+        harvestBuffer.add(stack.copy());
+        markDirty();
+    }
+
+    private ItemStack tryInsertToInputSlots(ItemStack stack) {
+        if (stack == null || stack.stackSize <= 0) {
+            return null;
+        }
+
+        for (int i = minSupSlot; i <= maxSupSlot; i++) {
+            if (stack.stackSize <= 0) {
+                break;
+            }
+
+            ItemStack slotStack = inventory[i];
+            int stackLimit = getInventoryStackLimit(i);
+
+            if (isItemValidForSlot(i, stack)) {
+                if (slotStack == null) {
+                    if (!isSlotLocked(i)) {
+                        int amount = Math.min(stack.stackSize, stackLimit);
+                        inventory[i] = stack.copy();
+                        inventory[i].stackSize = amount;
+                        stack.stackSize -= amount;
+                        markDirty();
+                    }
+                } else if (slotStack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(slotStack, stack)) {
+                    int canAdd = Math.min(stackLimit - slotStack.stackSize, stack.stackSize);
+                    if (canAdd > 0) {
+                        slotStack.stackSize += canAdd;
+                        stack.stackSize -= canAdd;
+                        markDirty();
+                    }
+                }
+            }
+        }
+
+        return stack.stackSize > 0 ? stack : null;
+    }
+
+    private ItemStack tryInsertToOutputSlots(ItemStack stack) {
+        if (stack == null || stack.stackSize <= 0) {
+            return null;
+        }
+
+        for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) {
+            if (stack.stackSize <= 0) {
+                break;
+            }
+
+            ItemStack slotStack = inventory[i];
+            int stackLimit = 64;
+
+            if (slotStack == null) {
+                int amount = Math.min(stack.stackSize, stackLimit);
+                inventory[i] = stack.copy();
+                inventory[i].stackSize = amount;
+                stack.stackSize -= amount;
+                markDirty();
+            } else if (slotStack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(slotStack, stack)) {
+                int canAdd = Math.min(stackLimit - slotStack.stackSize, stack.stackSize);
+                if (canAdd > 0) {
+                    slotStack.stackSize += canAdd;
+                    stack.stackSize -= canAdd;
+                    markDirty();
+                }
+            }
+        }
+
+        return stack.stackSize > 0 ? stack : null;
+    }
+
     private int bonemealCooldown = 5; // no need to persist this
 
     private boolean hasBonemeal() {
@@ -652,68 +787,6 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IRange
         return minSupSlot + 3;
     }
 
-    private void insertHarvestDrop(Entity entity, BlockCoord bc) {
-        if (!worldObj.isRemote) {
-            if (entity instanceof EntityItem && !entity.isDead) {
-                EntityItem item = (EntityItem) entity;
-                ItemStack stack = item.getEntityItem().copy();
-                int numInserted = insertResult(stack, bc);
-                stack.stackSize -= numInserted;
-                item.setEntityItemStack(stack);
-                if (stack.stackSize == 0) {
-                    item.setDead();
-                }
-            }
-        }
-    }
-
-    private int insertResult(ItemStack stack, BlockCoord bc) {
-
-        int slot = bc != null ? getSupplySlotForCoord(bc) : minSupSlot;
-        int[] slots = new int[NUM_SUPPLY_SLOTS];
-        int k = 0;
-        for (int j = slot; j <= maxSupSlot; j++) {
-            slots[k++] = j;
-        }
-        for (int j = minSupSlot; j < slot; j++) {
-            slots[k++] = j;
-        }
-
-        int origSize = stack.stackSize;
-        stack = stack.copy();
-
-        int inserted = 0;
-        for (int j = 0; j < slots.length && inserted < stack.stackSize; j++) {
-            int i = slots[j];
-            ItemStack curStack = inventory[i];
-            int inventoryStackLimit = getInventoryStackLimit(i);
-            if (isItemValidForSlot(i, stack) && (curStack == null || curStack.stackSize < inventoryStackLimit)) {
-                if (curStack == null) {
-                    if (stack.stackSize < inventoryStackLimit) {
-                        inventory[i] = stack.copy();
-                        inserted = stack.stackSize;
-                    } else {
-                        inventory[i] = stack.copy();
-                        inserted = inventoryStackLimit;
-                        inventory[i].stackSize = inserted;
-                    }
-                } else if (curStack.isItemEqual(stack)) {
-                    inserted = Math.min(inventoryStackLimit - curStack.stackSize, stack.stackSize);
-                    inventory[i].stackSize += inserted;
-                }
-            }
-        }
-
-        stack.stackSize -= inserted;
-        if (inserted >= origSize) {
-            return origSize;
-        }
-
-        ResultStack[] in = new ResultStack[] { new ResultStack(stack) };
-        mergeResults(in);
-        return origSize - (in[0].item == null ? 0 : in[0].item.stackSize);
-    }
-
     private @Nonnull BlockCoord getNextCoord() {
 
         int size = getFarmSize();
@@ -752,11 +825,6 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IRange
         return EnderIO.blockFarmStation.getLocalizedName();
     }
 
-    @Override
-    public boolean hasCustomInventoryName() {
-        return false;
-    }
-
     @Override
     public String getMachineName() {
         return ModObject.blockFarmStation.unlocalisedName;
@@ -811,6 +879,17 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IRange
         } else if (slotLayoutVersion == 2) {
             inventory = (new ArrayMappingTool<ItemStack>("TTTSSSSOOOOOOC", "TTTBBSSSSOOOOOOC")).map(inventory);
         }
+
+        if (nbtRoot.hasKey("HarvestBuffer")) {
+            NBTTagList bufferList = nbtRoot.getTagList("HarvestBuffer", 10);
+            for (int i = 0; i < bufferList.tagCount(); i++) {
+                NBTTagCompound itemTag = bufferList.getCompoundTagAt(i);
+                ItemStack stack = ItemStack.loadItemStackFromNBT(itemTag);
+                if (stack != null && stack.stackSize > 0) {
+                    harvestBuffer.add(stack);
+                }
+            }
+        }
     }
 
     IPoweredTask createTask() {
@@ -834,6 +913,18 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IRange
             nbtRoot.setIntArray("lockedSlots", locked);
         }
         nbtRoot.setInteger("slotLayoutVersion", 3);
+
+        if (!harvestBuffer.isEmpty()) {
+            NBTTagList bufferList = new NBTTagList();
+            for (ItemStack stack : harvestBuffer) {
+                if (stack != null && stack.stackSize > 0) {
+                    NBTTagCompound itemTag = new NBTTagCompound();
+                    stack.writeToNBT(itemTag);
+                    bufferList.appendTag(itemTag);
+                }
+            }
+            nbtRoot.setTag("HarvestBuffer", bufferList);
+        }
     }
 
     @Override

src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java

@@ -17,7 +17,9 @@ import net.minecraftforge.common.IPlantable;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.BlockCoord;
+import com.mitchej123.hodgepodge.mixins.interfaces.INetherSeed;
 
+import crazypants.enderio.EnderIO;
 import crazypants.enderio.machine.farm.TileFarmStation;
 
 public class PlantableFarmer implements IFarmerJoe {
@@ -109,7 +111,13 @@ public class PlantableFarmer implements IFarmerJoe {
 
     protected boolean plant(TileFarmStation farm, World worldObj, BlockCoord bc, IPlantable plantable) {
         worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2);
-        Block target = plantable.getPlant(null, 0, 0, 0);
+        Block target;
+        // needed for Pam's nether seeds
+        if (EnderIO.hasHP && plantable instanceof INetherSeed netherSeed) {
+            target = netherSeed.hodgepodge$getPlant(null, 0, 0, 0);
+        } else {
+            target = plantable.getPlant(null, 0, 0, 0);
+        }
         int meta = plantable.getPlantMetadata(null, 0, 0, 0);
         worldObj.setBlock(bc.x, bc.y, bc.z, target, meta, 1 | 2);
         farm.actionPerformed(false);
@@ -117,7 +125,13 @@ public class PlantableFarmer implements IFarmerJoe {
     }
 
     protected boolean canPlant(World worldObj, BlockCoord bc, IPlantable plantable) {
-        Block target = plantable.getPlant(null, 0, 0, 0);
+        Block target;
+        // needed for Pam's nether seeds
+        if (EnderIO.hasHP && plantable instanceof INetherSeed netherSeed) {
+            target = netherSeed.hodgepodge$getPlant(null, 0, 0, 0);
+        } else {
+            target = plantable.getPlant(null, 0, 0, 0);
+        }
         Block ground = worldObj.getBlock(bc.x, bc.y - 1, bc.z);
         if (target != null && target.canPlaceBlockAt(worldObj, bc.x, bc.y, bc.z)
                 && target.canBlockStay(worldObj, bc.x, bc.y, bc.z)
@@ -182,10 +196,14 @@ public class PlantableFarmer implements IFarmerJoe {
     }
 
     private boolean isPlantableForBlock(ItemStack stack, Block block) {
-        if (!(stack.getItem() instanceof IPlantable)) {
-            return false;
+        if (stack.getItem() instanceof IPlantable plantable) {
+            // needed for Pam's nether seeds
+            if (EnderIO.hasHP && plantable instanceof INetherSeed netherSeed) {
+                return netherSeed.hodgepodge$getPlant(null, 0, 0, 0) == block;
+            } else {
+                return plantable.getPlant(null, 0, 0, 0) == block;
+            }
         }
-        IPlantable plantable = (IPlantable) stack.getItem();
-        return plantable.getPlant(null, 0, 0, 0) == block;
+        return false;
     }
 }

src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java

@@ -16,7 +16,7 @@ import crazypants.enderio.EnderIO;
 import crazypants.enderio.fluid.Fluids;
 import crazypants.enderio.machine.IoMode;
 import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class GuiCombustionGenerator extends GuiPoweredMachineBase<TileCombustionGenerator> {
 
@@ -52,11 +52,6 @@ public class GuiCombustionGenerator extends GuiPoweredMachineBase<TileCombustion
         });
     }
 
-    @Override
-    protected boolean showRecipeButton() {
-        return false;
-    }
-
     @Override
     public void renderSlotHighlights(IoMode mode) {
         super.renderSlotHighlights(mode);

src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java

@@ -12,6 +12,7 @@ import crazypants.enderio.GuiHandler;
 import crazypants.enderio.ModObject;
 import crazypants.enderio.machine.AbstractMachineBlock;
 import crazypants.enderio.network.PacketHandler;
+import crazypants.util.ForgeDirections;
 
 public class BlockStirlingGenerator extends AbstractMachineBlock<TileEntityStirlingGenerator> {
 
@@ -59,7 +60,7 @@ public class BlockStirlingGenerator extends AbstractMachineBlock<TileEntityStirl
     public void randomDisplayTick(World world, int x, int y, int z, Random rand) {
         TileEntityStirlingGenerator te = (TileEntityStirlingGenerator) world.getTileEntity(x, y, z);
         if (te != null && te.isActive()) {
-            ForgeDirection front = ForgeDirection.values()[te.facing];
+            ForgeDirection front = ForgeDirections.DIRECTIONS[te.facing];
 
             for (int i = 0; i < 2; i++) {
                 double px = x + 0.5 + front.offsetX * 0.6;

src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java

@@ -19,8 +19,8 @@ import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.power.Capacitors;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 @SideOnly(Side.CLIENT)
 public class GuiStirlingGenerator extends GuiPoweredMachineBase<TileEntityStirlingGenerator> {
@@ -58,11 +58,6 @@ public class GuiStirlingGenerator extends GuiPoweredMachineBase<TileEntityStirli
         return fmt.format(args, new StringBuffer(), null).toString();
     }
 
-    @Override
-    protected boolean showRecipeButton() {
-        return false;
-    }
-
     @Override
     protected String formatProgressTooltip(int scaledProgress, float remaining) {
         int totalBurnTime = getTileEntity().totalBurnTime;

src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java

@@ -159,10 +159,13 @@ public class BlockZombieGenerator extends AbstractMachineBlock<TileZombieGenerat
 
     @Override
     public void getWailaInfo(List<String> tooltip, EntityPlayer player, World world, int x, int y, int z) {
-        TileEntity te = world.getTileEntity(x, y, z);
-        if (te != null && te instanceof TileZombieGenerator) {
+        if (EnderIO.hasWailaPlugins) {
+            return;
+        }
+
+        if (world.getTileEntity(x, y, z) instanceof TileZombieGenerator generator) {
             tooltip.add(
-                    ((TileZombieGenerator) te).getFluidStored(ForgeDirection.UNKNOWN) + " "
+                    generator.getFluidStored(ForgeDirection.UNKNOWN) + " "
                             + EnderIO.lang.localize("fluid.millibucket.abr"));
         }
     }

src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java

@@ -17,7 +17,7 @@ import crazypants.enderio.fluid.Fluids;
 import crazypants.enderio.machine.IoMode;
 import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileEnderGenerator;
 import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class GuiZombieGenerator extends GuiPoweredMachineBase<TileZombieGenerator> {
 
@@ -41,11 +41,6 @@ public class GuiZombieGenerator extends GuiPoweredMachineBase<TileZombieGenerato
         });
     }
 
-    @Override
-    protected boolean showRecipeButton() {
-        return false;
-    }
-
     @Override
     public void renderSlotHighlights(IoMode mode) {
         super.renderSlotHighlights(mode);

src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java

@@ -23,6 +23,7 @@ import com.enderio.core.common.vecmath.Vector3d;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.util.ForgeDirections;
 import crazypants.util.RenderPassHelper;
 
 @SideOnly(Side.CLIENT)
@@ -64,7 +65,7 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement
             Tessellator tes = Tessellator.instance;
             tes.startDrawingQuads();
 
-            ForgeDirection facingDir = ForgeDirection.values()[gen.facing];
+            ForgeDirection facingDir = ForgeDirections.DIRECTIONS[gen.facing];
             double facingOffset = 0.075;
 
             BoundingBox bb = BoundingBox.UNIT_CUBE.scale(0.85, 0.96, 0.85);

src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java

@@ -12,7 +12,6 @@ import net.minecraft.inventory.Slot;
 import org.lwjgl.opengl.GL11;
 
 import com.enderio.core.api.common.util.IProgressTile;
-import com.enderio.core.client.gui.button.IconButton;
 import com.enderio.core.client.gui.button.ToggleButton;
 import com.enderio.core.client.gui.widget.GuiToolTip;
 import com.enderio.core.client.render.RenderUtil;
@@ -22,7 +21,6 @@ import com.enderio.core.common.vecmath.Vector4f;
 
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.gui.GuiContainerBaseEIO;
-import crazypants.enderio.gui.IconEIO;
 import crazypants.enderio.gui.IoConfigRenderer.SelectedFace;
 import crazypants.enderio.gui.RedstoneModeButton;
 import crazypants.enderio.machine.AbstractMachineEntity;
@@ -46,8 +44,6 @@ public abstract class GuiMachineBase<T extends AbstractMachineEntity> extends Gu
 
     protected final GuiButtonIoConfig configB;
 
-    protected IconButton recipeButton;
-
     protected List<GuiToolTip> progressTooltips;
     protected int lastProgressTooltipValue = -1;
 
@@ -66,11 +62,6 @@ public abstract class GuiMachineBase<T extends AbstractMachineEntity> extends Gu
 
         y += 19;
         configB = new GuiButtonIoConfig(this, CONFIG_ID, x, y, machine, configOverlay);
-
-        y += 19;
-        recipeButton = new IconButton(this, RECIPE_ID, x, y, IconEIO.RECIPE);
-        recipeButton.visible = false;
-        recipeButton.setIconMargin(1, 1);
     }
 
     @Override
@@ -78,11 +69,6 @@ public abstract class GuiMachineBase<T extends AbstractMachineEntity> extends Gu
         super.initGui();
         redstoneButton.onGuiInit();
         configB.onGuiInit();
-        recipeButton.onGuiInit();
-    }
-
-    protected boolean showRecipeButton() {
-        return EnderIO.proxy.isNeiInstalled();
     }
 
     @Override
@@ -96,10 +82,6 @@ public abstract class GuiMachineBase<T extends AbstractMachineEntity> extends Gu
             guibutton.drawButton(mc, 0, 0);
         }
 
-        if (showRecipeButton()) {
-            recipeButton.visible = true;
-        }
-
         super.drawGuiContainerBackgroundLayer(par1, par2, par3);
 
         renderSlotHighlights();

src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java

@@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11;
 import com.enderio.core.client.gui.widget.GuiToolTip;
 
 import crazypants.enderio.machine.AbstractPoweredMachineEntity;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public abstract class GuiPoweredMachineBase<T extends AbstractPoweredMachineEntity> extends GuiMachineBase<T> {
 

src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java

@@ -27,8 +27,8 @@ import crazypants.enderio.gui.IconEIO;
 import crazypants.enderio.gui.RedstoneModeButton;
 import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode;
 import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.network.PacketHandler;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class GuiHyperCube extends GuiContainerBaseEIO {