Try to fix energy overflow

2026-11-14 17:14:50 +00:00 · 2023-03-26 18:09:42 -06:00
1361 changed files with 9889 additions and 7877 deletions
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+RUNDIR="run"
+CRASH="crash-reports"
+SERVERLOG="server.log"
+
+if [[ -d $RUNDIR/$CRASH ]]; then
+  echo "Crash reports detected:"
+  cat $RUNDIR/$CRASH/crash*.txt
+  exit 1
+fi
+
+if grep --quiet "Fatal errors were detected" $SERVERLOG; then
+  echo "Fatal errors detected:"
+  cat server.log
+  exit 1
+fi
+
+if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" $SERVERLOG; then
+  echo "Server force stopped:"
+  cat server.log
+  exit 1
+fi
+
+if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then
+  echo "Server didn't finish startup:"
+  cat server.log
+  exit 1
+fi
+
+echo "No crash reports detected"
+exit 0
+
@@ -3,9 +3,9 @@ name: Build and test

 on:
  pull_request:
-    branches: [ master, main, release/** ]
+    branches: [ master, main ]
  push:
-    branches: [ master, main, release/** ]
+    branches: [ master, main ]

 jobs:
  build-and-test:
@@ -1,17 +0,0 @@
-name: Optimize images
-
-on:
-  pull_request:
-    branches: [ master, main, release/** ]
-    paths:
-      - "**/*.png"
-
-  push:
-    branches: [ master, main, release/** ]
-    paths:
-      - "**/*.png"
-
-jobs:
-  optimize-images:
-    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
-    secrets: inherit
@@ -27,5 +27,3 @@ whitelist.json
 *.iws
 src/main/resources/mixins.*.json
 *.bat
-layout.json
-.DS_Store
@@ -1,35 +1,24 @@
 // Add your dependencies here

 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.5.15:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:ForestryMC:4.11.37:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.130-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.11.45:dev")
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.63:dev')
+    api('com.github.GTNewHorizons:EnderCore:0.2.13:dev')
+    implementation('com.github.GTNewHorizons:ForestryMC:4.5.8:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.35-GTNH:dev')
+    api('com.github.GTNewHorizons:BuildCraft:7.1.27: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.14.107-GTNH:dev")

-    devOnlyNonPublishable('com.github.GTNewHorizons:waila:1.19.34:dev') {transitive = false}
-    compileOnly('ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.48-GTNH:dev') {transitive = false}
-    runtimeOnlyNonPublishable('com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:Backhand:1.8.14:dev") { transitive = false }
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-999-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.22-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.129:dev') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:ModularUI2:2.3.88-1.7.10:dev") {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.17.31:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.29-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.17.32-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.61-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.5.23:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-168-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.13.6:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.11.13-GTNH:api') {transitive = false}
+    implementation('com.github.GTNewHorizons:Chisel:2.10.8-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.8.0.13-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
-    compileOnly(rfg.deobf('curse.maven:computercraft-67504:2269339')) // https://www.curseforge.com/minecraft/mc-mods/computercraft/files/2269339
-    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
-    compileOnly('com.github.GTNewHorizons:BetterBuildersWands:0.13.12-GTNH:dev@jar')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:2.2.10:api') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.196:dev")
-    compileOnly('curse.maven:automagy-222153:2285272')
+    compileOnly(deobf('https://media.forgecdn.net/files/2269/339/ComputerCraft1.75.jar')) // https://www.curseforge.com/minecraft/mc-mods/computercraft/files/2269339
+    compileOnly(deobf('https://media.forgecdn.net/files/2426/270/Mekanism-1.7.10-9.1.0.281.jar')) // https://aidancbrady.com/mekanism/download/
+    compileOnly(deobf('https://immibis.com/mcmoddl/files/immibis-microblocks-59.1.2.jar'))
 }
@@ -1,135 +1,63 @@
-# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable.
-# LOCAL to test local config updates.
-gtnh.settings.blowdryerTag = 0.2.0
-
-# Human-readable mod name, available for mcmod.info population.
 modName = Ender IO

-# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
-# Conventionally lowercase.
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
 modId = EnderIO

-# Root package of the mod, used to find various classes in other properties,
-# mcmod.info substitution, enabling assertions in run tasks, etc.
 modGroup = crazypants.enderio

-# Whether to use modGroup as the maven publishing group.
-# When false, com.github.GTNewHorizons is used.
-useModGroupForPublishing = false
+# WHY is there no version field?
+# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
+# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/

-# Updates your build.gradle and settings.gradle automatically whenever an update is available.
+# Will update your build.gradle automatically whenever an update is available
 autoUpdateBuildScript = false

-# Version of Minecraft to target
 minecraftVersion = 1.7.10
-
-# Version of Minecraft Forge to target
 forgeVersion = 10.13.4.1614

-# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
+# Specify a MCP channel and mappings version for dependency deobfuscation and the deobfParams task.
 channel = stable
-
-# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
 mappingsVersion = 12

-# Defines other MCP mappings for dependency deobfuscation.
-remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
+# Define other MCP mappings for dependency deobfuscation
+remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/

-# Select a default username for testing your mod. You can always override this per-run by running
-# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
+# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you
+# restart Minecraft in development. Choose this dependent on your mod:
+# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
+# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
 developmentEnvironmentUserName = Developer

-# Enables modern Java syntax support. Valid values:
-# - false: No modern syntax, Java 8 only
-# - jabel: Jabel syntax-only support, compiles to J8 bytecode
-# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
-# - modern: Native modern Java bytecode, no downgrading
-enableModernJavaSyntax = jabel
-
-# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
-# and should *not* be used in most situations. -1 disables this.
-# forceToolchainVersion = -1
-
-# Target JVM version for JVM Downgrader bytecode downgrading.
-# Only used when enableModernJavaSyntax = jvmDowngrader
-# downgradeTargetVersion = 8
-
-# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
-# Classes will be available in META-INF/versions/N/ for each version N in this list.
-# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
-# jvmDowngraderMultiReleaseVersions = 21,25
-
-# Specifies how JVM Downgrader API stubs are provided. Options:
-# - shade: Shade minimized stubs into the jar
-# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
-# - external: Another dependency provides stubs (no constraint, no warning)
-# - (empty): Warning reminding you to configure stubs
-# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
-# jvmDowngraderStubsProvider =
-
-# Enables 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.
-enableGenericInjection = true
-
-# Generate a class with a String field for the mod version named as defined below.
-# If generateGradleTokenClass is empty or not missing, no such class will be generated.
-# If gradleTokenVersion is empty or missing, the field will not be present in the class.
-generateGradleTokenClass = crazypants.enderio.Tags
-
-# Name of the token containing the project's current version to generate/replace.
-gradleTokenVersion = VERSION
-
-# [DEPRECATED] Mod ID replacement token.
+# Define a source file of your project with:
+# public static final String VERSION = "GRADLETOKEN_VERSION";
+# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's
+# version in @Mod([...], version = VERSION, [...])
+# Leave these properties empty to skip individual token replacements
+replaceGradleTokenInFile = EnderIO.java
 gradleTokenModId =
-
-# [DEPRECATED] Mod name replacement token.
 gradleTokenModName =
-
-# [DEPRECATED] Mod Group replacement token.
+gradleTokenVersion = GRADLETOKEN_VERSION
 gradleTokenGroupName =

-# [DEPRECATED]
-# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
-# public static final String VERSION = "GRADLETOKEN_VERSION";
-# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
-# version in @Mod([...], version = VERSION, [...]).
-# Leave these properties empty to skip individual token replacements.
-replaceGradleTokenInFile =
-
-# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
+# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can
 # leave this property empty.
-# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api
+# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
 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 = enderio_at.cfg
+# Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/
+# Example value: mymodid_at.cfg
+accessTransformersFile =

 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
-
-# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
-# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
-# Mixin classes will have access to "main" classes, but not the other way around.
-separateMixinSourceSet =
-
-# Adds some debug arguments like verbose output and class export.
-usesMixinDebug = false
-
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
-
-# Specify the package that contains all of your Mixins. The package must exist or
-# the build will fail. If you have a package property defined in your mixins.<modid>.json,
-# it must match with this or the build will fail.
+# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
 mixinsPackage =
-
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
-# This parameter is for legacy compatibility only
-# Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin
+# This parameter is for legacy compatability only
+# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
 coreModClass =
-
 # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
 # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
 containsMixinsAndOrCoreModOnly = false
@@ -137,102 +65,6 @@ containsMixinsAndOrCoreModOnly = false
 # Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
 forceEnableMixins = false

-# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your
-# responsibility to check the license and request permission for distribution if required.
+# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
+# responsibility check the licence and request permission for distribution, if required.
 usesShadowedDependencies = true
-
-# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access
-# their own classes, making the minimization unreliable.
-minimizeShadowedDependencies = true
-
-# If disabled, won't rename the shadowed classes.
-relocateShadowedDependencies = true
-
-# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
-includeWellKnownRepositories = true
-
-# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
-# list of strings, with the acceptable keys being(case does not matter):
-# cursemaven
-# modrinth
-excludeWellKnownRepositories =
-
-# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
-# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
-# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
-usesMavenPublishing = true
-
-# Maven repository to publish the mod to.
-# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
-
-# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
-#
-# The project's ID on Modrinth. Can be either the slug or the ID.
-# Leave this empty if you don't want to publish to Modrinth.
-modrinthProjectId =
-
-# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
-# Syntax: scope1-type1:name1;scope2-type2:name2;...
-# Where scope can be one of [required, optional, incompatible, embedded],
-#       type can be one of [project, version],
-#       and the name is the Modrinth project or version slug/id of the other mod.
-# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
-modrinthRelations =
-
-# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
-#
-# The project's numeric ID on CurseForge. You can find this in the About Project box.
-# Leave this empty if you don't want to publish on CurseForge.
-curseForgeProjectId =
-
-# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
-# Syntax: type1:name1;type2:name2;...
-# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
-#       and the name is the CurseForge project slug of the other mod.
-# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
-# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
-curseForgeRelations =
-
-# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
-# 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.
-# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+
-# versionPattern =
-
-# Uncomment to prevent the source code from being published.
-# noPublishedSources = true
-
-# Uncomment this to disable Spotless checks.
-# This should only be uncommented to keep it easier to sync with upstream/other forks.
-# That is, if there is no other active fork/upstream, NEVER change this.
-# disableSpotless = true
-
-# Uncomment this to disable Checkstyle checks (currently wildcard import check).
-# disableCheckstyle = true
-
-# Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
-# (force use delegated build).
-# This is meant to be set in $HOME/.gradle/gradle.properties.
-# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be native build.
-# WARNING: If you do use this option, it will overwrite whatever you have in your existing projects. This might not be what you want!
-# Usually there is no need to uncomment this here as other developers do not necessarily use the same build type as you.
-# ideaOverrideBuildType = idea
-
-# Whether IDEA should run spotless checks when pressing the Build button.
-# 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
@@ -1,12 +0,0 @@
-#This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9064f22734b42ac03e85df04b632e167/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/4d0277c49991306ac78048580fe34bcf/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a9fa3b809e484a1e1ac4308a5dda661a/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/aa99913fa6d767d899ffc96082da01ca/redirect
-toolchainVersion=25
@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
 networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#

 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -85,8 +83,10 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,6 +114,7 @@ case "$( uname )" in                #(
  NONSTOP* )        nonstop=true ;;
 esac

+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


 # Determine the Java command to use to start the JVM.
@@ -132,13 +133,10 @@ location of your Java installation."
    fi
 else
    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi

 # Increase the maximum file descriptors if we can.
@@ -146,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045 
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
@@ -154,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
      '' | soft) :;; #(
      *)
        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045 
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -171,6 +169,7 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

    JAVACMD=$( cygpath --unix "$JAVACMD" )

@@ -198,19 +197,16 @@ if "$cygwin" || "$msys" ; then
    done
 fi

-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
        "$@"

 # Stop when "xargs" is not available.
@@ -13,8 +13,6 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute

-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.

 goto fail

@@ -59,21 +57,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 if exist "%JAVA_EXE%" goto execute

-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.

 goto fail

 :execute
@rem Setup the command line

+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

 :end
@rem End local scope for the variables with windows NT shell
@@ -4,10 +4,10 @@ pluginManagement {
        maven {
            // RetroFuturaGradle
            name "GTNH Maven"
-            url "https://nexus.gtnewhorizons.com/repository/public/"
+            url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+            allowInsecureProtocol = true
            mavenContent {
-                includeGroup("com.gtnewhorizons")
-                includeGroupByRegex("com\\.gtnewhorizons\\..+")
+                includeGroup("com.gtnewhorizons.retrofuturagradle")
            }
        }
        gradlePluginPortal()
@@ -17,7 +17,12 @@ pluginManagement {
 }

 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.29'
+    id 'com.diffplug.blowdryerSetup' version '1.6.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains
 }

-
+blowdryerSetup {
+    repoSubfolder 'gtnhShared'
+    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.0')
+    //devLocal '.' // Use this when testing config updates locally
+}
@@ -1,5 +1,8 @@
 package crazypants.enderio;

+import java.util.ArrayList;
+import java.util.List;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -27,29 +30,39 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.conduit.BlockConduitBundle;
 import crazypants.enderio.conduit.IConduit;
+import crazypants.enderio.conduit.TileConduitBundle;
 import crazypants.enderio.conduit.facade.FacadeRenderer;
 import crazypants.enderio.conduit.gas.GasConduit;
+import crazypants.enderio.conduit.gas.GasConduitRenderer;
 import crazypants.enderio.conduit.gas.GasUtil;
 import crazypants.enderio.conduit.item.ItemConduit;
 import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.AdvancedLiquidConduit;
+import crazypants.enderio.conduit.liquid.AdvancedLiquidConduitRenderer;
 import crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.CrystallinePinkSlimeEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.EnderLiquidConduit;
+import crazypants.enderio.conduit.liquid.EnderLiquidConduitRenderer;
 import crazypants.enderio.conduit.liquid.LiquidConduit;
+import crazypants.enderio.conduit.liquid.LiquidConduitRenderer;
 import crazypants.enderio.conduit.liquid.MelodicEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.StellarEnderLiquidConduit;
 import crazypants.enderio.conduit.me.MEConduit;
 import crazypants.enderio.conduit.me.MEUtil;
 import crazypants.enderio.conduit.oc.OCConduit;
+import crazypants.enderio.conduit.oc.OCConduitRenderer;
 import crazypants.enderio.conduit.oc.OCUtil;
 import crazypants.enderio.conduit.power.PowerConduit;
+import crazypants.enderio.conduit.power.PowerConduitRenderer;
 import crazypants.enderio.conduit.power.endergy.PowerConduitEndergy;
 import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit;
+import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduitRenderer;
 import crazypants.enderio.conduit.redstone.RedstoneConduit;
 import crazypants.enderio.conduit.redstone.RedstoneSwitch;
+import crazypants.enderio.conduit.redstone.RedstoneSwitchRenderer;
 import crazypants.enderio.conduit.render.ConduitBundleRenderer;
 import crazypants.enderio.conduit.render.ConduitRenderer;
+import crazypants.enderio.conduit.render.DefaultConduitRenderer;
 import crazypants.enderio.conduit.render.ItemConduitRenderer;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.enderface.EnderIoRenderer;
@@ -103,8 +116,11 @@ 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.ranged.RangeRenerer;
 import crazypants.enderio.machine.reservoir.ReservoirRenderer;
 import crazypants.enderio.machine.reservoir.TileReservoir;
 import crazypants.enderio.machine.solar.BlockSolarPanel;
@@ -150,6 +166,10 @@ public class ClientProxy extends CommonProxy {
    };
    // @formatter:on

+    private final List<ConduitRenderer> conduitRenderers = new ArrayList<ConduitRenderer>();
+
+    private final DefaultConduitRenderer dcr = new DefaultConduitRenderer();
+
    private ConduitBundleRenderer cbr;

    private boolean checkedNei = false;
@@ -238,8 +258,6 @@ public class ClientProxy extends CommonProxy {
        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPainter), machRen);
        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCrafter), machRen);
        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockBuffer), machRen);
-        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPoweredSpawner), machRen);
-        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockSliceAndSplice), machRen);

        MinecraftForgeClient.registerItemRenderer(EnderIO.itemBrokenSpawner, new BrokenSpawnerRenderer());

@@ -258,15 +276,13 @@ public class ClientProxy extends CommonProxy {
        ClientRegistry.bindTileEntitySpecialRenderer(TileFarmStation.class, new FarmingStationSpecialRenderer());

        BlockSoulBinder.renderId = RenderingRegistry.getNextAvailableRenderId();
-        SoulBinderRenderer soulBinderRenderer = new SoulBinderRenderer();
-        RenderingRegistry.registerBlockHandler(soulBinderRenderer);
-        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockSoulFuser), soulBinderRenderer);
+        RenderingRegistry.registerBlockHandler(new SoulBinderRenderer());

        ObeliskRenderer defaultObeliskRenderer = new ObeliskRenderer();
        BlockObeliskAbstract.defaultObeliskRenderId = RenderingRegistry.getNextAvailableRenderId();
        RenderingRegistry.registerBlockHandler(defaultObeliskRenderer);

-        ObeliskSpecialRenderer<TileAttractor> attRen = new ObeliskSpecialRenderer<>(
+        ObeliskSpecialRenderer<TileAttractor> attRen = new ObeliskSpecialRenderer<TileAttractor>(
                new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()),
                defaultObeliskRenderer);
        ClientRegistry.bindTileEntitySpecialRenderer(TileAttractor.class, attRen);
@@ -276,7 +292,7 @@ public class ClientProxy extends CommonProxy {
        ClientRegistry.bindTileEntitySpecialRenderer(TileAversionObelisk.class, sgr);
        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockSpawnGuard), sgr);

-        ObeliskSpecialRenderer<TileExperienceObelisk> eor = new ObeliskSpecialRenderer<>(
+        ObeliskSpecialRenderer<TileExperienceObelisk> eor = new ObeliskSpecialRenderer<TileExperienceObelisk>(
                new ItemStack(EnderIO.itemXpTransfer),
                defaultObeliskRenderer);
        ClientRegistry.bindTileEntitySpecialRenderer(TileExperienceObelisk.class, eor);
@@ -289,7 +305,7 @@ public class ClientProxy extends CommonProxy {
        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockWeatherObelisk), twr);

        BlockCombustionGenerator.renderId = RenderingRegistry.getNextAvailableRenderId();
-        TechneMachineRenderer<TileCombustionGenerator> cr = new TechneMachineRenderer<>(
+        TechneMachineRenderer<TileCombustionGenerator> cr = new TechneMachineRenderer<TileCombustionGenerator>(
                EnderIO.blockCombustionGenerator,
                "models/combustionGen");
        RenderingRegistry.registerBlockHandler(cr);
@@ -305,7 +321,7 @@ public class ClientProxy extends CommonProxy {
        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockKillerJoe), kjr);

        BlockVat.renderId = RenderingRegistry.getNextAvailableRenderId();
-        TechneMachineRenderer<TileVat> vr = new TechneMachineRenderer<>(EnderIO.blockVat, "models/vat");
+        TechneMachineRenderer<TileVat> vr = new TechneMachineRenderer<TileVat>(EnderIO.blockVat, "models/vat");
        RenderingRegistry.registerBlockHandler(vr);

        FusedQuartzFrameRenderer fqfr = new FusedQuartzFrameRenderer();
@@ -322,6 +338,13 @@ 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);
@@ -364,7 +387,6 @@ public class ClientProxy extends CommonProxy {
        TelePadRenderer telePadRenderer = new TelePadRenderer();
        RenderingRegistry.registerBlockHandler(telePadRenderer);
        ClientRegistry.bindTileEntitySpecialRenderer(TileTelePad.class, new TelePadSpecialRenderer(telePadRenderer));
-        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockTelePad), telePadRenderer);

        MinecraftForgeClient.registerItemRenderer(EnderIO.itemMachinePart, new MachinePartRenderer());
        MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade, new FacadeRenderer());
@@ -372,6 +394,7 @@ public class ClientProxy extends CommonProxy {
        cbr = new ConduitBundleRenderer((float) Config.conduitScale);
        BlockConduitBundle.rendererId = RenderingRegistry.getNextAvailableRenderId();
        RenderingRegistry.registerBlockHandler(cbr);
+        ClientRegistry.bindTileEntitySpecialRenderer(TileConduitBundle.class, cbr);

        ClientRegistry.bindTileEntitySpecialRenderer(TileTravelAnchor.class, new TravelEntitySpecialRenderer());

@@ -380,6 +403,20 @@ public class ClientProxy extends CommonProxy {
        RenderingRegistry.registerBlockHandler(esk);
        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEndermanSkull), esk);

+        conduitRenderers.add(RedstoneSwitchRenderer.getInstance());
+        conduitRenderers.add(new AdvancedLiquidConduitRenderer());
+        conduitRenderers.add(LiquidConduitRenderer.create());
+        conduitRenderers.add(new PowerConduitRenderer());
+        conduitRenderers.add(new InsulatedRedstoneConduitRenderer());
+        conduitRenderers.add(new EnderLiquidConduitRenderer());
+        conduitRenderers.add(new crazypants.enderio.conduit.item.ItemConduitRenderer());
+        if (GasUtil.isGasConduitEnabled()) {
+            conduitRenderers.add(new GasConduitRenderer());
+        }
+        if (OCUtil.isOCEnabled()) {
+            conduitRenderers.add(new OCConduitRenderer());
+        }
+
        EnderIoRenderer eior = new EnderIoRenderer();
        ClientRegistry.bindTileEntitySpecialRenderer(TileEnderIO.class, eior);
        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEnderIo), eior);
@@ -414,7 +451,7 @@ public class ClientProxy extends CommonProxy {
        FMLCommonHandler.instance().bus().register(KeyTracker.instance);

        RenderingRegistry.registerEntityRenderingHandler(SoundEntity.class, new SoundRenderer());
-        RenderingRegistry.registerEntityRenderingHandler(RangeEntity.class, new RangeRenderer());
+        RenderingRegistry.registerEntityRenderingHandler(RangeEntity.class, new RangeRenerer());

        MinecraftForge.EVENT_BUS.register(SoundDetector.instance);
        FMLCommonHandler.instance().bus().register(SoundDetector.instance);
@@ -443,7 +480,12 @@ public class ClientProxy extends CommonProxy {

    @Override
    public ConduitRenderer getRendererForConduit(IConduit conduit) {
-        return conduit.getRenderer();
+        for (ConduitRenderer renderer : conduitRenderers) {
+            if (renderer.isRendererForConduit(conduit)) {
+                return renderer;
+            }
+        }
+        return dcr;
    }

    @Override
@@ -1,5 +1,7 @@
 package crazypants.enderio;

+import java.text.DecimalFormat;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
@@ -7,27 +9,20 @@ 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() {}

@@ -39,7 +34,6 @@ public class CommonProxy {
        return null;
    }

-    @Deprecated
    public ConduitRenderer getRendererForConduit(IConduit conduit) {
        return null;
    }
@@ -49,7 +43,7 @@ public class CommonProxy {
    }

    public void loadIcons() {
-
+        ;
    }

    public void load() {
@@ -81,26 +75,6 @@ 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
@@ -38,7 +38,6 @@ 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;
@@ -47,7 +46,6 @@ import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import crazypants.enderio.api.IMC;
-import crazypants.enderio.betterbuilderswands.PaintedCustomMapping;
 import crazypants.enderio.block.BlockDarkSteelAnvil;
 import crazypants.enderio.block.BlockDarkSteelLadder;
 import crazypants.enderio.block.BlockDarkSteelPressurePlate;
@@ -64,7 +62,6 @@ import crazypants.enderio.conduit.item.ItemItemConduit;
 import crazypants.enderio.conduit.item.filter.ItemBasicItemFilter;
 import crazypants.enderio.conduit.item.filter.ItemBigItemFilter;
 import crazypants.enderio.conduit.item.filter.ItemExistingItemFilter;
-import crazypants.enderio.conduit.item.filter.ItemLimitedItemFilter;
 import crazypants.enderio.conduit.item.filter.ItemModItemFilter;
 import crazypants.enderio.conduit.item.filter.ItemPowerItemFilter;
 import crazypants.enderio.conduit.liquid.ItemLiquidConduit;
@@ -113,6 +110,7 @@ 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;
@@ -133,6 +131,7 @@ 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;
@@ -182,24 +181,18 @@ import crazypants.enderio.thaumcraft.ThaumcraftCompat;
 import crazypants.enderio.tool.EnderIOCrashCallable;
 import crazypants.util.EE3Util;

-@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = """
-        required-after:CoFHLib@[1.7.10R1.0.3B3,);\
-        required-after:endercore;\
-        required-after:gtnhlib@[0.9.47,);\
-        after:MineFactoryReloaded;\
-        after:Forestry;\
-        after:Waila@[1.5.8,);\
-        after:Thaumcraft;\
-        after:appliedenergistics2@[rv2-beta-8,);\
-        after:Railcraft@[9.16.7,);\
-        after:betterbuilderswands@[0.13.12,)\
-        """, guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
+@Mod(
+        modid = MODID,
+        name = MOD_NAME,
+        version = VERSION,
+        dependencies = "after:endercore;after:MineFactoryReloaded;after:Forestry;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,);after:chisel",
+        guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
 public class EnderIO {

    public static final String MODID = "EnderIO";
    public static final String DOMAIN = MODID.toLowerCase(Locale.US);
    public static final String MOD_NAME = "Ender IO";
-    public static final String VERSION = Tags.VERSION;
+    public static final String VERSION = "GRADLETOKEN_VERSION";

    @Instance(MODID)
    public static EnderIO instance;
@@ -214,11 +207,6 @@ public class EnderIO {
    public static final Lang lang = new Lang("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 hasEtFuturum = Loader.isModLoaded("etfuturum");
-    public static final boolean hasWailaPlugins = Loader.isModLoaded("wailaplugins");
-    public static final boolean hasAutomagy = Loader.isModLoaded("Automagy");

    // Materials
    public static ItemCapacitor itemBasicCapacitor;
@@ -275,7 +263,6 @@ public class EnderIO {
    public static ItemBasicItemFilter itemBasicFilterUpgrade;
    public static ItemBigItemFilter itemBigFilterUpgrade;
    public static ItemExistingItemFilter itemExistingItemFilter;
-    public static ItemLimitedItemFilter itemLimitedItemFilter;
    public static ItemModItemFilter itemModItemFilter;
    public static ItemPowerItemFilter itemPowerItemFilter;
    public static ItemExtractSpeedUpgrade itemExtractSpeedUpgrade;
@@ -290,6 +277,7 @@ 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;
@@ -399,6 +387,7 @@ public class EnderIO {

        blockCrusher = BlockCrusher.create();
        blockAlloySmelter = BlockAlloySmelter.create();
+        blockCapacitorBank = BlockCapacitorBank.create();
        blockCapBank = BlockCapBank.create();

        blockPainter = BlockPainter.create();
@@ -479,7 +468,6 @@ public class EnderIO {
        itemBasicFilterUpgrade = ItemBasicItemFilter.create();
        itemBigFilterUpgrade = ItemBigItemFilter.create();
        itemExistingItemFilter = ItemExistingItemFilter.create();
-        itemLimitedItemFilter = ItemLimitedItemFilter.create();
        itemModItemFilter = ItemModItemFilter.create();
        itemPowerItemFilter = ItemPowerItemFilter.create();
        itemExtractSpeedUpgrade = ItemExtractSpeedUpgrade.create();
@@ -492,9 +480,7 @@ public class EnderIO {
        itemGrindingBall = ItemGrindingBall.create();
        itemAlloyEndergy = ItemAlloyEndergy.create();
        itemGrindingBallEndergy = ItemGrindingBallEndergy.create();
-        if (!hasGT5) {
-            itemPowderIngot = ItemPowderIngot.create();
-        }
+        itemPowderIngot = ItemPowderIngot.create();

        registerFluids();

@@ -734,9 +720,7 @@ public class EnderIO {
            SkeletonHandler.registerSkeleton(this);
        }

-        if (!hasGT5) {
-            MaterialRecipes.registerDependantOresInDictionary();
-        }
+        MaterialRecipes.registerDependantOresInDictionary();

        EnderfaceRecipes.addRecipes();
        MaterialRecipes.addRecipes();
@@ -803,7 +787,7 @@ public class EnderIO {
    @EventHandler
    public void loadComplete(FMLLoadCompleteEvent event) {
        processImc(FMLInterModComms.fetchRuntimeMessages(this)); // Some mods send IMCs during PostInit, so we catch
-        // them here.
+                                                                 // them here.
    }

    private static String getXPJuiceName() {
@@ -822,6 +806,7 @@ public class EnderIO {
        return Config.xpJuiceName;
    }

+    @SuppressWarnings("unchecked")
    private void addModIntegration() {

        if (Loader.isModLoaded("TConstruct")) {
@@ -832,7 +817,6 @@ public class EnderIO {

                Class<?> modFluxClass = Class.forName("tconstruct.modifiers.tools.ModFlux");
                Field batteriesField = modFluxClass.getField("batteries");
-                @SuppressWarnings("unchecked")
                List<ItemStack> batteries = (List<ItemStack>) batteriesField.get(modFluxInst);
                batteries.add(new ItemStack(blockCapBank));
                Log.info("Registered Capacitor Banks as Tinkers Construct Flux Upgrades");
@@ -841,9 +825,6 @@ public class EnderIO {
                Log.info("Failed to registered Capacitor Banks as Tinkers Construct Flux Upgrades");
            }
        }
-        if (Loader.isModLoaded("betterbuilderswands")) {
-            PaintedCustomMapping.registerMappings();
-        }

        ThaumcraftCompat.load();
    }
@@ -902,18 +883,22 @@ public class EnderIO {
    }

    @EventHandler
-    public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
-        proxy.onServerAboutToStart(event);
+    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();
+        }
    }

    @EventHandler
-    public void onServerStarted(FMLServerStartedEvent event) {
-        proxy.onServerStarted(event);
-    }
-
-    @EventHandler
-    public void onServerStopped(FMLServerStoppedEvent event) {
-        proxy.onServerStopped(event);
+    public void serverStopped(FMLServerStoppedEvent event) {
+        HyperCubeRegister.unload();
    }

    @EventHandler
@@ -925,12 +910,4 @@ 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();
-        }
-    }
 }
@@ -60,7 +60,7 @@ public class GuiHandler implements IGuiHandler {

    public static final int GUI_ID_CAP_BANK = 142; // leave room for more machines

-    protected final Map<Integer, IGuiHandler> guiHandlers = new HashMap<>();
+    protected final Map<Integer, IGuiHandler> guiHandlers = new HashMap<Integer, IGuiHandler>();

    public void registerGuiHandler(int id, IGuiHandler handler) {
        guiHandlers.put(id, handler);
@@ -2,13 +2,10 @@ package crazypants.enderio;

 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.MarkerManager;

 public final class Log {

    public static final Logger LOGGER = LogManager.getLogger(EnderIO.MODID);
-    public static final Marker securityMarker = MarkerManager.getMarker("SuspiciousPackets");

    public static void warn(String msg) {
        LOGGER.warn(msg);
@@ -18,7 +18,6 @@ public enum ModObject {
    itemBasicFilterUpgrade,
    itemBigFilterUpgrade,
    itemExistingItemFilter,
-    itemLimitedItemFilter,
    itemModItemFilter,
    itemPowerItemFilter,
    itemExtractSpeedUpgrade,
@@ -55,6 +54,7 @@ public enum ModObject {
    blockReservoir,
    blockAlloySmelter,
    blockSolarPanel,
+    blockCapacitorBank,
    blockCapBank,
    blockSagMill,
    blockHyperCube,
@@ -4,20 +4,10 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

 import cofh.api.energy.IEnergyContainerItem;
-import crazypants.enderio.config.Config;

 public interface IItemOfTravel extends IEnergyContainerItem {

    boolean isActive(EntityPlayer ep, ItemStack equipped);

    void extractInternal(ItemStack equipped, int power);
-
-    /**
-     * @param equipped player who is currently holding this item. caller will ensure the item held has your Item as item
-     *                 type
-     * @return -1 if method not supported, or max(can extract, power), e.g. 0 if item is empty.
-     */
-    default int canExtractInternal(ItemStack equipped, int power) {
-        return Config.strictTPItemChecking ? 0 : -1;
-    }
 }
@@ -94,10 +94,11 @@ public interface ITelePad extends ITravelAccessable {
    /**
     * Util method to set all coords using a {@link BlockCoord} object.
     *
-     * @param coords The coords to set this telepad to.
     * @see #setX(int)
     * @see #setY(int)
     * @see #setZ(int)
+     *
+     * @param coords The coords to set this telepad to.
     */
    void setCoords(BlockCoord coords);

@@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

 import com.enderio.core.common.util.BlockCoord;
-
 import crazypants.util.UserIdent;

 public interface ITravelAccessable {
@@ -14,8 +14,9 @@ import cpw.mods.fml.common.eventhandler.Cancelable;
 * <li>Staff of travelling</li>
 * <li>Telepad</li>
 * </ul>
- * <p>
+ *
 * As well as any externally added teleports, assuming they fire this event manually.
+ *
 */
@Cancelable
 public class TeleportEntityEvent extends EntityEvent {
@@ -81,7 +81,7 @@ public enum TravelSource {
            return 0;
        }

-        TravelSource source = TravelController.instance.getTravelItemTravelSource(player, false);
+        TravelSource source = TravelController.instance.getTravelItemTravelSource(player);
        if (source == null) {
            return TravelSource.BLOCK.getMaxDistanceTravelledSq();
        } else {
@@ -1,101 +0,0 @@
-package crazypants.enderio.betterbuilderswands;
-
-import java.util.function.BiFunction;
-import java.util.function.IntFunction;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-
-import com.github.bsideup.jabel.Desugar;
-
-import crazypants.enderio.EnderIO;
-import crazypants.enderio.machine.painter.BlockPaintedCarpet;
-import crazypants.enderio.machine.painter.BlockPaintedFence;
-import crazypants.enderio.machine.painter.BlockPaintedFenceGate;
-import crazypants.enderio.machine.painter.BlockPaintedGlowstone;
-import crazypants.enderio.machine.painter.BlockPaintedSlab;
-import crazypants.enderio.machine.painter.BlockPaintedStair;
-import crazypants.enderio.machine.painter.BlockPaintedWall;
-import crazypants.enderio.machine.painter.TileEntityPaintedBlock;
-import portablejim.bbw.BetterBuildersWandsMod;
-import portablejim.bbw.basics.Point3d;
-import portablejim.bbw.core.conversion.ICustomMapping;
-import portablejim.bbw.shims.IPlayerShim;
-import portablejim.bbw.shims.IWorldShim;
-
-@Desugar
-public record PaintedCustomMapping(Block lookBlock, BiFunction<Block, Integer, ItemStack> itemStackGetter, int meta)
-        implements ICustomMapping {
-
-    @Override
-    public Block getLookBlock() {
-        return lookBlock;
-    }
-
-    @Override
-    public int getMeta() {
-        return meta;
-    }
-
-    @Override
-    public ItemStack getItems(IWorldShim world, IPlayerShim player, Point3d point) {
-        if (world.getTile(point) instanceof TileEntityPaintedBlock painted) {
-            return itemStackGetter.apply(painted.getSourceBlock(), painted.getSourceBlockMetadata());
-        }
-        return null;
-    }
-
-    @Override
-    public boolean shouldCopyTileNBT() {
-        return true;
-    }
-
-    public static void registerMappings() {
-        register(
-                i -> new PaintedCustomMapping(
-                        EnderIO.blockPaintedGlowstone,
-                        BlockPaintedGlowstone::createItemStackForSourceBlock,
-                        i));
-        register(
-                i -> new PaintedCustomMapping(
-                        EnderIO.blockPaintedStair,
-                        BlockPaintedStair::createItemStackForSourceBlock,
-                        i));
-        register(
-                i -> new PaintedCustomMapping(
-                        EnderIO.blockPaintedFence,
-                        BlockPaintedFence::createItemStackForSourceBlock,
-                        i));
-        register(
-                i -> new PaintedCustomMapping(
-                        EnderIO.blockPaintedFenceGate,
-                        BlockPaintedFenceGate::createItemStackForSourceBlock,
-                        i));
-        register(
-                i -> new PaintedCustomMapping(
-                        EnderIO.blockPaintedCarpet,
-                        BlockPaintedCarpet::createItemStackForSourceBlock,
-                        i));
-        register(
-                i -> new PaintedCustomMapping(
-                        EnderIO.blockPaintedSlab,
-                        BlockPaintedSlab::createItemStackForSourceBlock,
-                        i));
-        register(
-                i -> new PaintedCustomMapping(
-                        EnderIO.blockPaintedWall,
-                        BlockPaintedWall::createItemStackForSourceBlock,
-                        i));
-        register(
-                i -> new PaintedCustomMapping(
-                        EnderIO.blockPaintedDoubleSlab,
-                        BlockPaintedSlab::createItemStackForSourceBlock,
-                        i));
-    }
-
-    private static void register(IntFunction<ICustomMapping> mapping) {
-        for (int i = 0; i < 16; i++) {
-            BetterBuildersWandsMod.instance.mappingManager.setMapping(mapping.apply(i));
-        }
-    }
-}
@@ -148,9 +148,10 @@ public class BlockDarkSteelPressurePlate extends BlockPressurePlate
        return super.colorMultiplier(world, x, y, z);
    }

+    @SuppressWarnings({ "unchecked", "rawtypes" })
    @Override
    @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item arg0, CreativeTabs arg1, List<ItemStack> items) {
+    public void getSubBlocks(Item arg0, CreativeTabs arg1, List items) {
        items.add(new ItemStack(this, 1, 0));
        items.add(new ItemStack(this, 1, 1));
    }
@@ -16,10 +16,14 @@ import crazypants.enderio.config.Config;

 public class ContainerDarkSteelAnvil extends ContainerRepair {

-    private final int x;
-    private final int y;
-    private final int z;
+    private int x, y, z;

+    private final Field _outputSlot = ReflectionHelper.findField(ContainerRepair.class, "outputSlot", "field_82852_f");
+    private final Field _inputSlots = ReflectionHelper.findField(ContainerRepair.class, "inputSlots", "field_82853_g");
+    private final Field _materialCost = ReflectionHelper
+            .findField(ContainerRepair.class, "materialCost", "stackSizeToBeUsedInRepair", "field_82856_l");
+
+    @SuppressWarnings("unchecked")
    public ContainerDarkSteelAnvil(InventoryPlayer playerInv, final World world, final int x, final int y, final int z,
            EntityPlayer player) {
        super(playerInv, world, x, y, z, player);
@@ -28,12 +32,8 @@ public class ContainerDarkSteelAnvil extends ContainerRepair {
        final int materialCost;

        try {
-            Field _outputSlot = ReflectionHelper.findField(ContainerRepair.class, "outputSlot", "field_82852_f");
            outputSlot = (IInventory) _outputSlot.get(this);
-            Field _inputSlots = ReflectionHelper.findField(ContainerRepair.class, "inputSlots", "field_82853_g");
            inputSlots = (IInventory) _inputSlots.get(this);
-            Field _materialCost = ReflectionHelper
-                    .findField(ContainerRepair.class, "materialCost", "stackSizeToBeUsedInRepair", "field_82856_l");
            materialCost = _materialCost.getInt(this);
        } catch (Exception e) {
            throw new RuntimeException(e);
@@ -9,6 +9,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;

+import mods.immibis.microblocks.api.EnumPartClass;
+import mods.immibis.microblocks.api.EnumPosition;
+import mods.immibis.microblocks.api.IMicroblockCoverSystem;
+import mods.immibis.microblocks.api.Part;
+
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -47,11 +52,6 @@ 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;
-import mods.immibis.microblocks.api.Part;

 public abstract class AbstractConduit implements IConduit {

@@ -73,7 +73,8 @@ public abstract class AbstractConduit implements IConduit {

    protected List<CollidableComponent> collidables;

-    protected final EnumMap<ForgeDirection, ConnectionMode> conectionModes = new EnumMap<>(ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, ConnectionMode> conectionModes = new EnumMap<ForgeDirection, ConnectionMode>(
+            ForgeDirection.class);

    protected boolean collidablesDirty = true;

@@ -88,7 +89,7 @@ public abstract class AbstractConduit implements IConduit {
     * If this is true, it will trigger a reconnection on the next Tick.
     * <p>
     * Use the method needUpdateConnections() instead of setting this to true.
-     *
+     * 
     * @see needUpdateConnections()
     */
    private boolean needUpdateConnections = false;
@@ -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(ForgeDirections.DIRECTIONS[dirs[i]]);
+            conduitConnections.add(ForgeDirection.values()[dirs[i]]);
        }

        externalConnections.clear();
        dirs = nbtRoot.getIntArray("externalConnections");
        for (int i = 0; i < dirs.length; i++) {
-            externalConnections.add(ForgeDirections.DIRECTIONS[dirs[i]]);
+            externalConnections.add(ForgeDirection.values()[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++;
            }
        }
@@ -453,7 +454,7 @@ public abstract class AbstractConduit implements IConduit {
        needUpdateConnections = false;

        boolean externalConnectionsChanged = false;
-        List<ForgeDirection> copy = new ArrayList<>(externalConnections);
+        List<ForgeDirection> copy = new ArrayList<ForgeDirection>(externalConnections);
        // remove any no longer valid connections
        for (ForgeDirection dir : copy) {
            if (!canConnectToExternal(dir, false)) {
@@ -633,7 +634,7 @@ public abstract class AbstractConduit implements IConduit {
            return collidables;
        }

-        List<CollidableComponent> result = new ArrayList<>();
+        List<CollidableComponent> result = new ArrayList<CollidableComponent>();
        for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
            Collection<CollidableComponent> col = getCollidables(dir);
            if (col != null) {
@@ -7,12 +7,10 @@ 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> {

-    protected final List<I> conduits = new ArrayList<>();
+    protected final List<I> conduits = new ArrayList<I>();

    protected final Class<I> implClass;
    protected final Class<T> baseConduitClass;
@@ -66,7 +64,7 @@ public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
    public void addConduit(I con) {
        if (!conduits.contains(con)) {
            if (conduits.isEmpty()) {
-                EnderIO.proxy.conduitNetworkTickHandler.registerNetwork(this);
+                ConduitNetworkTickHandler.instance.registerNetwork(this);
            }
            conduits.add(con);
        }
@@ -77,7 +75,7 @@ public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
            con.setNetwork(null);
        }
        conduits.clear();
-        EnderIO.proxy.conduitNetworkTickHandler.unregisterNetwork(this);
+        ConduitNetworkTickHandler.instance.unregisterNetwork(this);
    }

    public List<I> getConduits() {
@@ -2,6 +2,11 @@ package crazypants.enderio.conduit;

 import java.util.List;

+import mods.immibis.microblocks.api.IMicroblockCoverSystem;
+import mods.immibis.microblocks.api.IMicroblockSupporterTile;
+import mods.immibis.microblocks.api.MicroblockAPIUtils;
+import mods.immibis.microblocks.api.Part;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -24,11 +29,6 @@ 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;
-import mods.immibis.microblocks.api.Part;

 public abstract class AbstractItemConduit extends Item implements IConduitItem {

@@ -68,6 +68,7 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
        if (MicroblocksUtil.supportMicroblocks() && tryAddToMicroblocks(stack, player, world, x, y, z, side)) {
            return true;
        }
+
        BlockCoord placeAt = Util.canPlaceItem(stack, EnderIO.blockConduitBundle, player, world, x, y, z, side);
        if (placeAt != null) {
            if (!world.isRemote) {
@@ -84,8 +85,10 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
                stack.stackSize--;
            }
            return true;
+
        } else {
-            ForgeDirection dir = ForgeDirections.DIRECTIONS[side];
+
+            ForgeDirection dir = ForgeDirection.values()[side];
            int placeX = x + dir.offsetX;
            int placeY = y + dir.offsetY;
            int placeZ = z + dir.offsetZ;
@@ -114,6 +117,7 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
                }
            }
        }
+
        return false;
    }

@@ -159,7 +163,8 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
                    System.out.println("AbstractItemConduit.onItemUse: Conduit null.");
                    return false;
                }
-                bundle.replaceConduit(existingConduit, newConduit);
+                bundle.removeConduit(existingConduit);
+                bundle.addConduit(newConduit);
                if (!player.capabilities.isCreativeMode) {
                    stack.stackSize--;
                    for (ItemStack drop : existingConduit.getDrops()) {
@@ -191,8 +196,9 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
    }

    @Override
+    @SuppressWarnings({ "rawtypes", "unchecked" })
    @SideOnly(Side.CLIENT)
-    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
        for (int j = 0; j < subtypes.length; ++j) {
            par3List.add(new ItemStack(this, 1, j));
        }
@@ -6,6 +6,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Random;

+import mods.immibis.core.api.multipart.IMultipartRenderingBlockMarker;
+import mods.immibis.core.api.multipart.IMultipartSystem;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.ISound;
@@ -28,10 +31,14 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.event.entity.PlaySoundAtEntityEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed;

+import powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode;
+import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType;
+
 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;
@@ -46,13 +53,7 @@ import crazypants.enderio.api.tool.ITool;
 import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType;
 import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.geom.ConduitConnectorType;
-import crazypants.enderio.conduit.gui.ExternalConnectionContainer;
-import crazypants.enderio.conduit.gui.GuiExternalConnection;
-import crazypants.enderio.conduit.gui.GuiExternalConnectionSelector;
-import crazypants.enderio.conduit.gui.PacketFluidChannel;
-import crazypants.enderio.conduit.gui.PacketFluidFilter;
-import crazypants.enderio.conduit.gui.PacketOpenConduitUI;
-import crazypants.enderio.conduit.gui.PacketSlotVisibility;
+import crazypants.enderio.conduit.gui.*;
 import crazypants.enderio.conduit.gui.item.PacketExistingItemFilterSnapshot;
 import crazypants.enderio.conduit.gui.item.PacketModItemFilter;
 import crazypants.enderio.conduit.liquid.PacketFluidLevel;
@@ -71,12 +72,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;
-import powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode;
-import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType;

@Optional.InterfaceList({
        @Interface(
@@ -93,6 +89,9 @@ 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
@@ -157,6 +156,7 @@ public class BlockConduitBundle extends BlockEio

        BlockConduitBundle result = new BlockConduitBundle();
        result.init();
+        MinecraftForge.EVENT_BUS.register(result);
        return result;
    }

@@ -288,6 +288,41 @@ 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();
@@ -295,7 +330,6 @@ 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
@@ -435,6 +469,24 @@ 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() {
@@ -480,7 +532,7 @@ public class BlockConduitBundle extends BlockEio
        IConduitBundle te = (IConduitBundle) rte;

        boolean breakBlock = true;
-        List<ItemStack> drop = new ArrayList<>();
+        List<ItemStack> drop = new ArrayList<ItemStack>();
        if (ConduitUtil.isSolidFacadeRendered(te, player)) {
            breakBlock = false;
            ItemStack fac = new ItemStack(EnderIO.itemConduitFacade, 1, te.getFacadeType().ordinal());
@@ -538,7 +590,7 @@ public class BlockConduitBundle extends BlockEio
        if (type == null) {
            // broke a conector so drop any conduits with no connections as there
            // is no other way to remove these
-            List<IConduit> cons = new ArrayList<>(te.getConduits());
+            List<IConduit> cons = new ArrayList<IConduit>(te.getConduits());
            boolean droppedUnconected = false;
            for (IConduit con : cons) {
                if (con.getConduitConnections().isEmpty() && con.getExternalConnections().isEmpty()
@@ -585,8 +637,8 @@ public class BlockConduitBundle extends BlockEio

    @Override
    public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player) {
-        ITool tool = ToolUtil.getEquippedTool(player);
-        if (!player.isSneaking() || tool == null || !tool.canUse(player.getCurrentEquippedItem(), player, x, y, z)) {
+        ItemStack equipped = player.getCurrentEquippedItem();
+        if (!player.isSneaking() || equipped == null || equipped.getItem() != EnderIO.itemYetaWench) {
            return;
        }
        ConduitUtil.openConduitGui(world, x, y, z, player);
@@ -771,7 +823,7 @@ public class BlockConduitBundle extends BlockEio

        bundle.setFacadeId(facadeID);
        bundle.setFacadeMetadata(facadeMeta);
-        bundle.setFacadeType(FacadeType.VALUES[facadeType]);
+        bundle.setFacadeType(FacadeType.values()[facadeType]);
        if (!world.isRemote) {
            ConduitUtil.playPlaceSound(facadeID.stepSound, world, x, y, z);
        }
@@ -820,7 +872,7 @@ public class BlockConduitBundle extends BlockEio
            return new ExternalConnectionContainer(
                    player.inventory,
                    (IConduitBundle) te,
-                    ForgeDirections.DIRECTIONS[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]);
+                    ForgeDirection.values()[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]);
        }
        return null;
    }
@@ -835,7 +887,7 @@ public class BlockConduitBundle extends BlockEio
            return new GuiExternalConnection(
                    player.inventory,
                    (IConduitBundle) te,
-                    ForgeDirections.DIRECTIONS[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]);
+                    ForgeDirection.values()[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]);
        }
        return null;
    }
@@ -867,7 +919,7 @@ public class BlockConduitBundle extends BlockEio

    @Override
    public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb,
-            List<AxisAlignedBB> arraylist, Entity par7Entity) {
+            @SuppressWarnings("rawtypes") List arraylist, Entity par7Entity) {

        if (MicroblocksUtil.supportMicroblocks()) {
            IM__addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity);
@@ -1035,7 +1087,7 @@ public class BlockConduitBundle extends BlockEio
            return null;
        }
        IConduitBundle bundle = (IConduitBundle) te;
-        List<RaytraceResult> hits = new ArrayList<>();
+        List<RaytraceResult> hits = new ArrayList<RaytraceResult>();

        if (player == null) {
            player = EnderIO.proxy.getClientPlayer();
@@ -1052,7 +1104,8 @@ public class BlockConduitBundle extends BlockEio
            }
        } else {
            ConduitDisplayMode mode = ConduitUtil.getDisplayMode(player);
-            Collection<CollidableComponent> components = new ArrayList<>(bundle.getCollidableComponents());
+            Collection<CollidableComponent> components = new ArrayList<CollidableComponent>(
+                    bundle.getCollidableComponents());
            for (CollidableComponent component : components) {
                if ((component.conduitType != null || mode == ConduitDisplayMode.ALL)
                        && ConduitUtil.renderConduit(player, component.conduitType)) {
@@ -1204,8 +1257,9 @@ public class BlockConduitBundle extends BlockEio
        return IMultipartSystem.instance.hook_collisionRayTrace(cur, world, x, y, z, src, dst);
    }

-    private void IM__addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask,
-            List<AxisAlignedBB> list, Entity entity) {
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    private void IM__addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask, List list,
+            Entity entity) {
        IMultipartSystem.instance.hook_addCollisionBoxesToList(world, x, y, z, mask, list, entity);
    }

@@ -1217,61 +1271,4 @@ 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;
-                    }
-                }
-            }
-        }
-    }
 }
@@ -1,15 +1,6 @@
 package crazypants.enderio.conduit;

-import static crazypants.enderio.gui.IconEIO.CROSS;
-import static crazypants.enderio.gui.IconEIO.TICK;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_FLUID;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_FLUID_OFF;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_ITEM;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_ITEM_OFF;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_POWER;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_POWER_OFF;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_REDSTONE;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_REDSTONE_OFF;
+import static crazypants.enderio.gui.IconEIO.*;

 import java.util.List;

@@ -64,10 +55,11 @@ public class ConduitDisplayMode {
     * Use this constructor if you have custom display logic, it will use {@code IConduit.class} as the conduitType, and
     * the passed name as the override name.
     *
+     * @see #ConduitDisplayMode(Class, IWidgetIcon, IWidgetIcon)
+     *
     * @param name             The override name.
     * @param widgetSelected   The widget to render when this type is selected.
     * @param widgetUnselected The widget to render when this type is unselected.
-     * @see #ConduitDisplayMode(Class, IWidgetIcon, IWidgetIcon)
     */
    public ConduitDisplayMode(String name, IWidgetIcon widgetSelected, IWidgetIcon widgetUnselected) {
        this(IConduit.class, widgetSelected, widgetUnselected);
@@ -196,7 +188,7 @@ public class ConduitDisplayMode {
    }

    public static Iterable<ConduitDisplayMode> getRenderableModes() {
-        return FluentIterable.from(registrar).filter(new Predicate<>() {
+        return FluentIterable.from(registrar).filter(new Predicate<ConduitDisplayMode>() {

            @Override
            public boolean apply(ConduitDisplayMode input) {
@@ -10,15 +10,18 @@ import cpw.mods.fml.common.gameevent.TickEvent.Phase;

 public class ConduitNetworkTickHandler {

-    public interface TickListener {
+    public static final ConduitNetworkTickHandler instance = new ConduitNetworkTickHandler();

-        void tickStart(TickEvent.ServerTickEvent evt);
+    public static interface TickListener {

-        void tickEnd(TickEvent.ServerTickEvent evt);
+        public void tickStart(TickEvent.ServerTickEvent evt);
+
+        public void tickEnd(TickEvent.ServerTickEvent evt);
    }

-    private final List<TickListener> listeners = new ArrayList<>();
-    private final IdentityHashMap<AbstractConduitNetwork<?, ?>, Boolean> networks = new IdentityHashMap<>();
+    private final List<TickListener> listeners = new ArrayList<TickListener>();
+
+    private final IdentityHashMap<AbstractConduitNetwork<?, ?>, Boolean> networks = new IdentityHashMap<AbstractConduitNetwork<?, ?>, Boolean>();

    public void addListener(TickListener listener) {
        listeners.add(listener);
@@ -1,20 +1,9 @@
 package crazypants.enderio.conduit;

 import static crazypants.enderio.ModObject.blockPainter;
-import static crazypants.enderio.material.Alloy.CONDUCTIVE_IRON;
-import static crazypants.enderio.material.Alloy.ELECTRICAL_STEEL;
-import static crazypants.enderio.material.Alloy.END_STEEL;
-import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY;
-import static crazypants.enderio.material.Alloy.PHASED_GOLD;
-import static crazypants.enderio.material.Alloy.REDSTONE_ALLOY;
-import static crazypants.enderio.material.Material.CONDUIT_BINDER;
-import static crazypants.enderio.material.Material.PHASED_IRON_NUGGET;
-import static crazypants.enderio.material.endergy.AlloyEndergy.CRUDE_STEEL;
-import static crazypants.enderio.material.endergy.AlloyEndergy.CRYSTALLINE_ALLOY;
-import static crazypants.enderio.material.endergy.AlloyEndergy.CRYSTALLINE_PINK_SLIME;
-import static crazypants.enderio.material.endergy.AlloyEndergy.ENERGETIC_SILVER;
-import static crazypants.enderio.material.endergy.AlloyEndergy.MELODIC_ALLOY;
-import static crazypants.enderio.material.endergy.AlloyEndergy.STELLAR_ALLOY;
+import static crazypants.enderio.material.Alloy.*;
+import static crazypants.enderio.material.Material.*;
+import static crazypants.enderio.material.endergy.AlloyEndergy.*;
 import static crazypants.util.RecipeUtil.addShaped;

 import net.minecraft.init.Blocks;
@@ -601,9 +590,6 @@ public class ConduitRecipes {
                'f',
                advFilter);

-        ItemStack limitedFilter = new ItemStack(EnderIO.itemLimitedItemFilter, 1, 0);
-        addShaped(limitedFilter, "   ", "cfc", "   ", 'c', new ItemStack(Items.comparator, 1, 0), 'f', advFilter);
-
        ItemStack powerFilt = new ItemStack(EnderIO.itemPowerItemFilter);
        addShaped(powerFilt, " p ", "pcp", " p ", 'p', Items.paper, 'c', EnderIO.itemConduitProbe);

@@ -688,7 +674,7 @@ public class ConduitRecipes {
        String fluix = "crystalFluix";
        String pureFluix = "crystalPureFluix";

-        ItemStack quartzFiber = AEApi.instance().definitions().parts().quartzFiber().maybeStack(1).get().copy();
+        ItemStack quartzFiber = AEApi.instance().parts().partQuartzFiber.stack(1).copy();
        ItemStack conduitBinder = new ItemStack(EnderIO.itemMaterial, 1, Material.CONDUIT_BINDER.ordinal());
        ItemStack res = new ItemStack(EnderIO.itemMEConduit, Config.numConduitsPerRecipe / 2);

@@ -697,6 +683,10 @@ public class ConduitRecipes {

        res.stackSize = 1;
        ItemStack resDense = new ItemStack(EnderIO.itemMEConduit, 1, 1);
+        ItemStack resUltra = new ItemStack(EnderIO.itemMEConduit, 1, 2);
        addShaped(resDense, "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', res);
+        if (Config.enableMEUltraDenseConduits) {
+            addShaped(resUltra, "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', resDense);
+        }
    }
 }
@@ -43,7 +43,7 @@ public class ConduitUtil {

    public static final Random RANDOM = new Random();

-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "rawtypes", "unchecked" })
    public static void ensureValidNetwork(IConduit conduit) {
        TileEntity te = conduit.getBundle().getEntity();
        World world = te.getWorldObj();
@@ -54,15 +54,13 @@ public class ConduitUtil {
            return;
        }

-        @SuppressWarnings("rawtypes")
        AbstractConduitNetwork res = conduit.createNetworkForType();
        res.init(conduit.getBundle(), connections, world);
        return;
    }

-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
    private static boolean reuseNetwork(IConduit con, Collection<? extends IConduit> connections, World world) {
-        @SuppressWarnings("rawtypes")
        AbstractConduitNetwork network = null;
        for (IConduit conduit : connections) {
            if (network == null) {
@@ -94,7 +92,7 @@ public class ConduitUtil {
            }
        }
        if (con.getNetwork() != null) { // this should have been destroyed when destroying the neighbours network but
-            // lets just make
+                                        // lets just make
            // sure
            con.getNetwork().destroyNetwork();
        }
@@ -160,7 +158,7 @@ public class ConduitUtil {
    }

    public static boolean isFacadeHidden(IConduitBundle bundle, EntityPlayer player) {
-        return bundle != null && bundle.getFacadeId() != null && shouldHeldItemHideFacades(player);
+        return bundle.getFacadeId() != null && shouldHeldItemHideFacades(player);
    }

    public static ConduitDisplayMode getDisplayMode(EntityPlayer player) {
@@ -250,11 +248,11 @@ public class ConduitUtil {

    public static <T extends IConduit> Collection<T> getConnectedConduits(World world, int x, int y, int z,
            Class<T> type) {
-        TileEntity te = world.blockExists(x, y, z) ? world.getTileEntity(x, y, z) : null;
+        TileEntity te = world.getTileEntity(x, y, z);
        if (!(te instanceof IConduitBundle)) {
            return Collections.emptyList();
        }
-        List<T> result = new ArrayList<>();
+        List<T> result = new ArrayList<T>();
        IConduitBundle root = (IConduitBundle) te;
        T con = root.getConduit(type);
        if (con != null) {
@@ -320,7 +318,7 @@ public class ConduitUtil {
        }

        int signalStrength = getInternalSignalForColor(bundle, col);
-        if (signalStrength < 15 && bundle != null && bundle.getEntity() != null) {
+        if (signalStrength < 15 && DyeColor.RED == col && bundle != null && bundle.getEntity() != null) {
            TileEntity te = bundle.getEntity();
            signalStrength = Math
                    .max(signalStrength, te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord));
@@ -363,7 +361,7 @@ public class ConduitUtil {
            return;
        }
        IConduitBundle cb = (IConduitBundle) te;
-        Set<ForgeDirection> cons = new HashSet<>();
+        Set<ForgeDirection> cons = new HashSet<ForgeDirection>();
        boolean hasInsulated = false;
        for (IConduit con : cb.getConduits()) {
            cons.addAll(con.getExternalConnections());
@@ -10,10 +10,6 @@ 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) {
@@ -26,19 +22,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() {
@@ -17,7 +17,6 @@ import com.enderio.core.common.util.BlockCoord;

 import crazypants.enderio.conduit.geom.CollidableCache.CacheKey;
 import crazypants.enderio.conduit.geom.CollidableComponent;
-import crazypants.enderio.conduit.render.ConduitRenderer;

 public interface IConduit {

@@ -142,6 +141,4 @@ public interface IConduit {
     * Should the texture of the conduit connectors be mirrored around the conduit node?
     */
    boolean shouldMirrorTexture();
-
-    ConduitRenderer getRenderer();
 }
@@ -4,6 +4,11 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;

+import li.cil.oc.api.network.Environment;
+import li.cil.oc.api.network.SidedEnvironment;
+import mekanism.api.gas.IGasHandler;
+import mods.immibis.microblocks.api.IMicroblockSupporterTile;
+
 import net.minecraft.block.Block;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
@@ -11,10 +16,11 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.IFluidHandler;

-import com.enderio.core.common.util.BlockCoord;
-
 import appeng.api.networking.IGridHost;
 import cofh.api.transport.IItemDuct;
+
+import com.enderio.core.common.util.BlockCoord;
+
 import cpw.mods.fml.common.Optional.Interface;
 import cpw.mods.fml.common.Optional.InterfaceList;
 import cpw.mods.fml.relauncher.Side;
@@ -23,10 +29,6 @@ import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType;
 import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.geom.Offset;
 import crazypants.enderio.power.IInternalPowerHandler;
-import li.cil.oc.api.network.Environment;
-import li.cil.oc.api.network.SidedEnvironment;
-import mekanism.api.gas.IGasHandler;
-import mods.immibis.microblocks.api.IMicroblockSupporterTile;

@InterfaceList({ @Interface(iface = "appeng.api.networking.IGridHost", modid = "appliedenergistics2"),
        @Interface(iface = "mekanism.api.gas.IGasHandler", modid = "MekanismAPI|gas"),
@@ -49,8 +51,6 @@ public interface IConduitBundle extends IInternalPowerHandler, IFluidHandler, II

    void addConduit(IConduit conduit);

-    void replaceConduit(IConduit original, IConduit replacement);
-
    void removeConduit(IConduit conduit);

    Collection<IConduit> getConduits();
@@ -3,7 +3,6 @@ package crazypants.enderio.conduit;
 import net.minecraftforge.common.util.ForgeDirection;

 import com.enderio.core.common.util.DyeColor;
-
 import crazypants.enderio.machine.RedstoneControlMode;

 public interface IExtractor extends IConduit {
@@ -1,10 +1,11 @@
 package crazypants.enderio.conduit;

+import mods.immibis.microblocks.api.EnumPosition;
+
 import net.minecraftforge.common.util.ForgeDirection;

 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Optional.Method;
-import mods.immibis.microblocks.api.EnumPosition;

 public class MicroblocksUtil {

@@ -33,7 +33,7 @@ public class RaytraceResult {
        if (origin == null || toSort == null) {
            return;
        }
-        Collections.sort(toSort, new Comparator<>() {
+        Collections.sort(toSort, new Comparator<RaytraceResult>() {

            @Override
            public int compare(RaytraceResult o1, RaytraceResult o2) {
@@ -7,6 +7,19 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

+import li.cil.oc.api.network.*;
+import li.cil.oc.api.network.Message;
+import li.cil.oc.api.network.Node;
+import mekanism.api.gas.Gas;
+import mekanism.api.gas.GasStack;
+import mods.immibis.microblocks.api.EnumPartClass;
+import mods.immibis.microblocks.api.EnumPosition;
+import mods.immibis.microblocks.api.IMicroblockCoverSystem;
+import mods.immibis.microblocks.api.IMicroblockSystem;
+import mods.immibis.microblocks.api.MicroblockAPIUtils;
+import mods.immibis.microblocks.api.Part;
+import mods.immibis.microblocks.api.PartType;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
@@ -24,11 +37,11 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;

-import com.enderio.core.client.render.BoundingBox;
-import com.gtnewhorizon.gtnhlib.concurrent.cas.CasList;
-
 import appeng.api.networking.IGridNode;
 import appeng.api.util.AECableType;
+
+import com.enderio.core.client.render.BoundingBox;
+
 import cpw.mods.fml.common.Optional.Method;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -51,24 +64,12 @@ 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;
-import mekanism.api.gas.GasStack;
-import mods.immibis.microblocks.api.EnumPartClass;
-import mods.immibis.microblocks.api.EnumPosition;
-import mods.immibis.microblocks.api.IMicroblockCoverSystem;
-import mods.immibis.microblocks.api.IMicroblockSystem;
-import mods.immibis.microblocks.api.MicroblockAPIUtils;
-import mods.immibis.microblocks.api.Part;
-import mods.immibis.microblocks.api.PartType;

 public class TileConduitBundle extends TileEntityEio implements IConduitBundle {

    public static final short NBT_VERSION = 1;

-    private final List<IConduit> conduits = new CasList<>();
+    private final List<IConduit> conduits = new ArrayList<IConduit>();

    private Block facadeId = null;
    private int facadeMeta = 0;
@@ -76,9 +77,9 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {

    private boolean facadeChanged;

-    private final List<CollidableComponent> cachedCollidables = new ArrayList<>();
+    private final List<CollidableComponent> cachedCollidables = new ArrayList<CollidableComponent>();

-    private final List<CollidableComponent> cachedConnectors = new ArrayList<>();
+    private final List<CollidableComponent> cachedConnectors = new ArrayList<CollidableComponent>();

    private boolean conduitsDirty = true;
    private boolean collidablesDirty = true;
@@ -406,29 +407,6 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
        dirty();
    }

-    @Override
-    public void replaceConduit(IConduit original, IConduit replacement) {
-        if (worldObj.isRemote) {
-            return;
-        }
-        // 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[ForgeDirections.DIRECTIONS.length];
-        for (ForgeDirection conduitConnection : original.getExternalConnections()) {
-            NBTTagCompound tag = new NBTTagCompound();
-            original.writeConnectionSettingsToNBT(conduitConnection, tag);
-            originalData[conduitConnection.ordinal()] = tag;
-        }
-        removeConduit(original);
-        addConduit(replacement);
-        for (int i = 0; i < originalData.length; i++) {
-            NBTTagCompound nbt = originalData[i];
-            if (nbt != null) {
-                replacement.readConduitSettingsFromNBT(ForgeDirections.DIRECTIONS[i], nbt);
-            }
-        }
-    }
-
    @Override
    public void removeConduit(IConduit conduit) {
        if (conduit != null) {
@@ -453,7 +431,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
        if (worldObj.isRemote) {
            return;
        }
-        List<IConduit> copy = new ArrayList<>(conduits);
+        List<IConduit> copy = new ArrayList<IConduit>(conduits);
        for (IConduit con : copy) {
            removeConduit(con, false);
        }
@@ -538,12 +516,11 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {

    @Override
    public List<CollidableComponent> getConnectors() {
-        List<CollidableComponent> result = new ArrayList<>();
+        List<CollidableComponent> result = new ArrayList<CollidableComponent>();
        addConnectors(result);
        return result;
    }

-    @SuppressWarnings("unchecked")
    private void addConnectors(List<CollidableComponent> result) {

        if (conduits.isEmpty()) {
@@ -564,7 +541,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
        cachedConnectors.clear();

        // TODO: What an unholly mess! (and it doesn't even work correctly...)
-        List<CollidableComponent> coreBounds = new ArrayList<>();
+        List<CollidableComponent> coreBounds = new ArrayList<CollidableComponent>();
        for (IConduit con : conduits) {
            addConduitCores(coreBounds, con);
        }
@@ -572,13 +549,13 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
        result.addAll(coreBounds);

        // 1st algorithm
-        List<CollidableComponent> conduitsBounds = new ArrayList<>();
+        List<CollidableComponent> conduitsBounds = new ArrayList<CollidableComponent>();
        for (IConduit con : conduits) {
            conduitsBounds.addAll(con.getCollidableComponents());
            addConduitCores(conduitsBounds, con);
        }

-        Set<Class<IConduit>> collidingTypes = new HashSet<>();
+        Set<Class<IConduit>> collidingTypes = new HashSet<Class<IConduit>>();
        for (CollidableComponent conCC : conduitsBounds) {
            for (CollidableComponent innerCC : conduitsBounds) {
                if (!InsulatedRedstoneConduit.COLOR_CONTROLLER_ID.equals(innerCC.data)
@@ -592,7 +569,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {

        // TODO: Remove the core geometries covered up by this as no point in rendering these
        if (!collidingTypes.isEmpty()) {
-            List<CollidableComponent> colCores = new ArrayList<>();
+            List<CollidableComponent> colCores = new ArrayList<CollidableComponent>();
            for (Class<IConduit> c : collidingTypes) {
                IConduit con = getConduit(c);
                if (con != null) {
@@ -624,7 +601,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
        for (IConduit con : conduits) {

            if (con.hasConnections()) {
-                List<CollidableComponent> cores = new ArrayList<>();
+                List<CollidableComponent> cores = new ArrayList<CollidableComponent>();
                addConduitCores(cores, con);
                if (cores.size() > 1) {
                    BoundingBox bb = cores.get(0).bound;
@@ -967,6 +944,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
        return (IGridNode) node;
    }

+    @SuppressWarnings("cast")
    @Override
    @Method(modid = "appliedenergistics2")
    public void setGridNode(Object node) {
@@ -16,7 +16,7 @@ import crazypants.enderio.ModObject;
 import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.machine.painter.IPaintedBlock;

-public class BlockConduitFacade extends BlockEio implements IPaintedBlock, Cloneable {
+public class BlockConduitFacade extends BlockEio implements IPaintedBlock {

    public static BlockConduitFacade create() {
        BlockConduitFacade result = new BlockConduitFacade();
@@ -24,10 +24,6 @@ public class BlockConduitFacade extends BlockEio implements IPaintedBlock, Clone
        return result;
    }

-    public BlockConduitFacade clone() throws CloneNotSupportedException {
-        return (BlockConduitFacade) super.clone();
-    }
-
    private Block blockOverride;

    private BlockConduitFacade() {
@@ -109,6 +105,7 @@ public class BlockConduitFacade extends BlockEio implements IPaintedBlock, Clone
        }

        Block block = cb.getFacadeId();
+        int meta = cb.getFacadeMetadata();
        if (block == null || block == this) {
            return;
        }
@@ -140,7 +137,7 @@ public class BlockConduitFacade extends BlockEio implements IPaintedBlock, Clone
        return new Mimic(id, meta);
    }

-    static class Mimic {
+    class Mimic {

        int meta;
        Block block;
@@ -32,17 +32,14 @@ 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 enum FacadeType {
+    public static enum FacadeType {

        BASIC,
        HARDENED;

-        public static final FacadeType[] VALUES = values();
-
        public String getUnlocName(Item me) {
            return this == BASIC ? me.getUnlocalizedName() : me.getUnlocalizedName() + ".hardened";
        }
@@ -68,17 +65,18 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
        GameRegistry.registerItem(this, ModObject.itemConduitFacade.unlocalisedName);
    }

+    @SuppressWarnings({ "unchecked", "rawtypes" })
    @Override
    @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs p_150895_2_, List<ItemStack> list) {
-        for (FacadeType t : FacadeType.VALUES) {
+    public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) {
+        for (FacadeType t : FacadeType.values()) {
            list.add(new ItemStack(item, 1, t.ordinal()));
        }
    }

    @Override
    public String getUnlocalizedName(ItemStack stack) {
-        return FacadeType.VALUES[stack.getItemDamage()].getUnlocName(this);
+        return FacadeType.values()[stack.getItemDamage()].getUnlocName(this);
    }

    @Override
@@ -89,7 +87,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
    @Override
    @SideOnly(Side.CLIENT)
    public void registerIcons(IIconRegister IIconRegister) {
-        icons = new IIcon[FacadeType.VALUES.length];
+        icons = new IIcon[FacadeType.values().length];
        icons[0] = itemIcon = IIconRegister.registerIcon("enderio:conduitFacade");
        icons[1] = IIconRegister.registerIcon("enderio:conduitFacadeHardened");
        overlayIcon = IIconRegister.registerIcon("enderio:conduitFacadeOverlay");
@@ -118,7 +116,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
            return true;
        }

-        ForgeDirection dir = ForgeDirections.DIRECTIONS[side];
+        ForgeDirection dir = ForgeDirection.values()[side];
        int placeX = x + dir.offsetX;
        int placeY = y + dir.offsetY;
        int placeZ = z + dir.offsetZ;
@@ -133,7 +131,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
                facadeMeta = PainterUtil.adjustFacadeMetadata(facadeID, facadeMeta, side);
                bundle.setFacadeId(facadeID);
                bundle.setFacadeMetadata(facadeMeta);
-                bundle.setFacadeType(FacadeType.VALUES[itemStack.getItemDamage()]);
+                bundle.setFacadeType(FacadeType.values()[itemStack.getItemDamage()]);
                ConduitUtil.playPlaceSound(facadeID.stepSound, world, x, y, z);
                if (!player.capabilities.isCreativeMode) {
                    itemStack.stackSize--;
@@ -173,9 +171,10 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
        return result;
    }

+    @SuppressWarnings("rawtypes")
    @Override
    @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List<String> list, boolean par4) {
+    public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) {
        super.addInformation(item, par2EntityPlayer, list, par4);
    }

@@ -184,13 +183,15 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
        return getUnlocalizedName();
    }

+    @SuppressWarnings("rawtypes")
    @Override
    @SideOnly(Side.CLIENT)
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}

+    @SuppressWarnings({ "unchecked", "rawtypes" })
    @Override
    @SideOnly(Side.CLIENT)
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
        if (PainterUtil.getSourceBlock(itemstack) == null) {
            list.add(EnderIO.lang.localize("item.itemConduitFacade.tooltip.notpainted"));
        } else {
@@ -198,9 +199,10 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
        }
    }

+    @SuppressWarnings({ "unchecked", "rawtypes" })
    @Override
    @SideOnly(Side.CLIENT)
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
        SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack);
        if (itemstack.getItemDamage() == FacadeType.HARDENED.ordinal()) {
            list.add("");
@@ -5,6 +5,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;

+import mekanism.api.gas.IGasHandler;
+
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -21,14 +23,15 @@ import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.machine.reservoir.TileReservoir;
-import mekanism.api.gas.IGasHandler;

 public abstract class AbstractGasConduit extends AbstractConduit implements IGasConduit {

-    protected final EnumMap<ForgeDirection, RedstoneControlMode> extractionModes = new EnumMap<>(ForgeDirection.class);
-    protected final EnumMap<ForgeDirection, DyeColor> extractionColors = new EnumMap<>(ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, RedstoneControlMode> extractionModes = new EnumMap<ForgeDirection, RedstoneControlMode>(
+            ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, DyeColor> extractionColors = new EnumMap<ForgeDirection, DyeColor>(
+            ForgeDirection.class);

-    protected final Map<ForgeDirection, Integer> externalRedstoneSignals = new HashMap<>();
+    protected final Map<ForgeDirection, Integer> externalRedstoneSignals = new HashMap<ForgeDirection, Integer>();
    protected boolean redstoneStateDirty = true;

    @Method(modid = GasUtil.API_NAME)
@@ -184,15 +187,15 @@ public abstract class AbstractGasConduit extends AbstractConduit implements IGas
            String key = "extRM." + dir.name();
            if (nbtRoot.hasKey(key)) {
                short ord = nbtRoot.getShort(key);
-                if (ord >= 0 && ord < RedstoneControlMode.VALUES.length) {
-                    extractionModes.put(dir, RedstoneControlMode.VALUES[ord]);
+                if (ord >= 0 && ord < RedstoneControlMode.values().length) {
+                    extractionModes.put(dir, RedstoneControlMode.values()[ord]);
                }
            }
            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]);
                }
            }
        }
@@ -2,6 +2,9 @@ package crazypants.enderio.conduit.gas;

 import java.util.List;

+import mekanism.api.gas.GasStack;
+import mekanism.api.gas.IGasHandler;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -14,8 +17,6 @@ import crazypants.enderio.conduit.ConduitUtil;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.RaytraceResult;
 import crazypants.enderio.tool.ToolUtil;
-import mekanism.api.gas.GasStack;
-import mekanism.api.gas.IGasHandler;

 public abstract class AbstractGasTankConduit extends AbstractGasConduit {

@@ -1,7 +1,7 @@
 package crazypants.enderio.conduit.gas;

-import crazypants.enderio.conduit.AbstractConduitNetwork;
 import mekanism.api.gas.GasStack;
+import crazypants.enderio.conduit.AbstractConduitNetwork;

 public class AbstractGasTankConduitNetwork<T extends AbstractGasTankConduit>
        extends AbstractConduitNetwork<IGasConduit, T> {
@@ -1,10 +1,11 @@
 package crazypants.enderio.conduit.gas;

+import mekanism.api.gas.GasStack;
+import mekanism.api.gas.GasTank;
+
 import net.minecraft.nbt.NBTTagCompound;

 import cpw.mods.fml.common.Optional.Method;
-import mekanism.api.gas.GasStack;
-import mekanism.api.gas.GasTank;

 public class ConduitGasTank extends GasTank {

@@ -3,6 +3,9 @@ package crazypants.enderio.conduit.gas;
 import java.util.HashMap;
 import java.util.Map;

+import mekanism.api.gas.Gas;
+import mekanism.api.gas.GasStack;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
@@ -10,6 +13,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;

 import com.enderio.core.client.render.IconUtil;
+import com.enderio.core.common.util.BlockCoord;

 import cpw.mods.fml.common.Optional.Method;
 import cpw.mods.fml.relauncher.Side;
@@ -19,10 +23,7 @@ import crazypants.enderio.conduit.AbstractConduitNetwork;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.geom.CollidableComponent;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.config.Config;
-import mekanism.api.gas.Gas;
-import mekanism.api.gas.GasStack;

 public class GasConduit extends AbstractGasTankConduit {

@@ -34,12 +35,7 @@ public class GasConduit extends AbstractGasTankConduit {
    public static final String ICON_INSERT_KEY = "enderio:gasConduitOutput";
    public static final String ICON_EMPTY_EDGE = "enderio:gasConduitEdge";

-    static final Map<String, IIcon> ICONS = new HashMap<>();
-
-    @Override
-    public ConduitRenderer getRenderer() {
-        return GasConduitRenderer.instance.get();
-    }
+    static final Map<String, IIcon> ICONS = new HashMap<String, IIcon>();

    @SideOnly(Side.CLIENT)
    public static void initIcons() {
@@ -87,6 +83,7 @@ public class GasConduit extends AbstractGasTankConduit {
    }

    private void doExtract() {
+        BlockCoord loc = getLocation();
        if (!hasConnectionMode(ConnectionMode.INPUT)) {
            return;
        }
@@ -101,6 +98,7 @@ public class GasConduit extends AbstractGasTankConduit {
            return;
        }

+        Gas f = tank.getGas() == null ? null : tank.getGas().getGas();
        for (ForgeDirection dir : externalConnections) {
            if (autoExtractForDir(dir)) {
                if (network.extractFrom(this, dir, MAX_EXTRACT_PER_TICK)) {
@@ -4,21 +4,21 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;

+import mekanism.api.gas.GasStack;
+import mekanism.api.gas.IGasHandler;
+
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;

 import com.enderio.core.common.util.BlockCoord;
-
 import crazypants.enderio.conduit.IConduit;
-import mekanism.api.gas.GasStack;
-import mekanism.api.gas.IGasHandler;

 public class GasConduitNetwork extends AbstractGasTankConduitNetwork<GasConduit> {

    private final ConduitGasTank tank = new ConduitGasTank(0);

-    private final Set<GasOutput> outputs = new HashSet<>();
+    private final Set<GasOutput> outputs = new HashSet<GasOutput>();

    private Iterator<GasOutput> outputIterator;

@@ -1,13 +1,17 @@
 package crazypants.enderio.conduit.gas;

+import static com.enderio.core.client.render.CubeRenderer.addVecWithUV;
+
 import java.util.List;

+import mekanism.api.gas.GasStack;
+
 import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.common.util.ForgeDirection;

 import com.enderio.core.client.render.BoundingBox;
-import com.enderio.core.client.render.CubeRenderer;
 import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.common.vecmath.Vector3d;
 import com.enderio.core.common.vecmath.Vertex;
@@ -20,13 +24,14 @@ import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.geom.ConnectionModeGeometry;
 import crazypants.enderio.conduit.geom.Offset;
 import crazypants.enderio.conduit.render.ConduitBundleRenderer;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.conduit.render.DefaultConduitRenderer;
-import mekanism.api.gas.GasStack;

 public class GasConduitRenderer extends DefaultConduitRenderer {

-    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal.withInitial(GasConduitRenderer::new);
+    @Override
+    public boolean isRendererForConduit(IConduit conduit) {
+        return conduit instanceof GasConduit;
+    }

    @Override
    public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x,
@@ -54,8 +59,6 @@ public class GasConduitRenderer extends DefaultConduitRenderer {
    @Override
    protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) {
        super.renderConduit(tex, conduit, component, brightness);
-        final CubeRenderer cr = CubeRenderer.get();
-        int i;

        if (isNSEWUD(component.dir)) {
            GasConduit lc = (GasConduit) conduit;
@@ -101,17 +104,15 @@ public class GasConduitRenderer extends DefaultConduitRenderer {
                    List<Vertex> corners = bb.getCornersWithUvForFace(d, minU, maxU, minV, maxV);
                    moveEdgeCorners(corners, vDir, width);
                    moveEdgeCorners(corners, component.dir.getOpposite(), sideScale);
-                    for (i = 0; i < corners.size(); i++) {
-                        final Vertex c = corners.get(i);
-                        cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                    for (Vertex c : corners) {
+                        addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                    }

                    corners = bb.getCornersWithUvForFace(d, minU, maxU, minV, maxV);
                    moveEdgeCorners(corners, vDir.getOpposite(), width);
                    moveEdgeCorners(corners, component.dir.getOpposite(), sideScale);
-                    for (i = 0; i < corners.size(); i++) {
-                        final Vertex c = corners.get(i);
-                        cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                    for (Vertex c : corners) {
+                        addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                    }
                }
            }
@@ -124,15 +125,14 @@ public class GasConduitRenderer extends DefaultConduitRenderer {
                        tex.getMaxU(),
                        tex.getMinV(),
                        tex.getMaxV());
-
-                for (i = 0; i < corners.size(); i++) {
-                    final Vertex c = corners.get(i);
-                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                Tessellator tessellator = Tessellator.instance;
+                for (Vertex c : corners) {
+                    addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                }
                // back face
-                for (i = corners.size() - 1; i >= 0; i--) {
-                    final Vertex c = corners.get(i);
-                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                for (int i = corners.size() - 1; i >= 0; i--) {
+                    Vertex c = corners.get(i);
+                    addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                }
            }
        }
@@ -1,5 +1,8 @@
 package crazypants.enderio.conduit.gas;

+import mekanism.api.gas.GasStack;
+import mekanism.api.gas.IGasHandler;
+
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;

@@ -9,8 +12,6 @@ import cpw.mods.fml.common.ModAPIManager;
 import cpw.mods.fml.common.Optional.Method;
 import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.config.Config;
-import mekanism.api.gas.GasStack;
-import mekanism.api.gas.IGasHandler;

 public final class GasUtil {

@@ -1,11 +1,12 @@
 package crazypants.enderio.conduit.gas;

+import mekanism.api.gas.IGasHandler;
+
 import net.minecraftforge.common.util.ForgeDirection;

 import cpw.mods.fml.common.Optional.Interface;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IExtractor;
-import mekanism.api.gas.IGasHandler;

@Interface(iface = "mekanism.api.gas.IGasHandler", modid = GasUtil.API_NAME)
 public interface IGasConduit extends IConduit, IGasHandler, IExtractor {
@@ -21,7 +21,7 @@ import crazypants.enderio.gui.IconEIO;

 public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTooltipProvider {

-    private static final ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] {
+    private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] {
            new ItemConduitSubtype(ModObject.itemGasConduit.name(), "enderio:itemGasConduit"), };

    public static ItemGasConduit create() {
@@ -56,15 +56,15 @@ public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTool

    @Override
    @SideOnly(Side.CLIENT)
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}

    @Override
    @SideOnly(Side.CLIENT)
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}

    @Override
    @SideOnly(Side.CLIENT)
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
        String gpt = " " + EnderIO.lang.localize("gas.gasTick");
        int extractRate = Config.gasConduitExtractRate;
        int maxIo = Config.gasConduitMaxIoRate;
@@ -12,7 +12,7 @@ public class CollidableCache {

    public static final CollidableCache instance = new CollidableCache();

-    private final Map<CacheKey, Collection<CollidableComponent>> cache = new HashMap<>();
+    private final Map<CacheKey, Collection<CollidableComponent>> cache = new HashMap<CollidableCache.CacheKey, Collection<CollidableComponent>>();

    public CacheKey createKey(Class<? extends IConduit> baseType, Offset offset, ForgeDirection dir, boolean isStub) {
        return new CacheKey(baseType, offset, dir, isStub);
@@ -3,7 +3,6 @@ package crazypants.enderio.conduit.geom;
 import net.minecraftforge.common.util.ForgeDirection;

 import com.enderio.core.client.render.BoundingBox;
-
 import crazypants.enderio.conduit.IConduit;

 public class CollidableComponent {
@@ -10,7 +10,6 @@ import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.common.util.ForgeDirectionOffsets;
 import com.enderio.core.common.vecmath.VecmathUtil;
 import com.enderio.core.common.vecmath.Vector3d;
-
 import crazypants.enderio.conduit.IConduit;

 public class ConduitGeometryUtil {
@@ -33,7 +32,7 @@ public class ConduitGeometryUtil {

    public static final float CONNECTOR_DEPTH = 0.05f;

-    private static final Map<ForgeDirection, BoundingBox[]> EXTERNAL_CONNECTOR_BOUNDS = new HashMap<>();
+    private static Map<ForgeDirection, BoundingBox[]> EXTERNAL_CONNECTOR_BOUNDS = new HashMap<ForgeDirection, BoundingBox[]>();

    static {
        setupBounds(0.5f);
@@ -106,9 +105,9 @@ public class ConduitGeometryUtil {
        return val < 0 ? 1 + val : val;
    }

-    private final Map<GeometryKey, BoundingBox> boundsCache = new HashMap<>();
+    private Map<GeometryKey, BoundingBox> boundsCache = new HashMap<GeometryKey, BoundingBox>();

-    private final EnumMap<ConduitConnectorType, BoundingBox> connectorBounds = new EnumMap<>(
+    private EnumMap<ConduitConnectorType, BoundingBox> connectorBounds = new EnumMap<ConduitConnectorType, BoundingBox>(
            ConduitConnectorType.class);

    private ConduitGeometryUtil() {}
@@ -21,7 +21,8 @@ import com.enderio.core.common.vecmath.Vertex;

 public class ConnectionModeGeometry {

-    private static final EnumMap<ForgeDirection, List<Vertex>> VERTS = new EnumMap<>(ForgeDirection.class);
+    private static final EnumMap<ForgeDirection, List<Vertex>> VERTS = new EnumMap<ForgeDirection, List<Vertex>>(
+            ForgeDirection.class);

    static {
        float scale = 0.9f;
@@ -83,7 +84,7 @@ public class ConnectionModeGeometry {
    }

    private static List<Vertex> createVerticesForDir(BoundingBox refBB, VertexTransform xform) {
-        List<Vertex> result = new ArrayList<>(24);
+        List<Vertex> result = new ArrayList<Vertex>(24);
        for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) {
            result.addAll(refBB.getCornersWithUvForFace(face));
        }
@@ -16,7 +16,7 @@ import crazypants.enderio.conduit.redstone.IRedstoneConduit;

 public class Offsets {

-    private static final Map<OffsetKey, Offset> OFFSETS = new HashMap<>();
+    private static Map<OffsetKey, Offset> OFFSETS = new HashMap<OffsetKey, Offset>();

    static {
        OFFSETS.put(key(IRedstoneConduit.class, Axis.NONE), Offset.UP);
@@ -1,7 +1,6 @@
 package crazypants.enderio.conduit.gui;

-import java.awt.Color;
-import java.awt.Rectangle;
+import java.awt.*;
 import java.util.ArrayList;

 import javax.annotation.Nonnull;
@@ -31,7 +30,7 @@ public class BaseSettingsPanel implements ITabPanel {
    static final int ID_EXTRACT_ENABLED = 328;
    protected static final int ID_INSERT_FILTER_OPTIONS = 329;
    protected static final int ID_EXTRACT_FILTER_OPTIONS = 330;
-    protected static final int ID_ENABLED = 331;
+    protected final int ID_ENABLED = 331;

    protected final @Nonnull IWidgetIcon icon;
    protected final @Nonnull GuiExternalConnection gui;
@@ -41,8 +40,8 @@ public class BaseSettingsPanel implements ITabPanel {

    protected ConnectionMode oldConnectionMode;

-    private final @Nonnull String inputHeading;
-    private final @Nonnull String outputHeading;
+    private @Nonnull String inputHeading;
+    private @Nonnull String outputHeading;

    private boolean insertEnabled = false;
    private boolean extractEnabled = false;
@@ -142,7 +141,7 @@ public class BaseSettingsPanel implements ITabPanel {
            }
        };

-        ArrayList<String> funcUpgradeTips = new ArrayList<>();
+        ArrayList<String> funcUpgradeTips = new ArrayList<String>();
        SpecialTooltipHandler.addTooltipFromResources(funcUpgradeTips, "enderio.gui.conduit.item.functionupgrade.line");
        for (FunctionUpgrade upgrade : FunctionUpgrade.values()) {
            funcUpgradeTips.add(EnderIO.lang.localizeExact(upgrade.unlocName.concat(".name")));
@@ -10,7 +10,6 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;

@@ -25,14 +24,12 @@ import crazypants.enderio.conduit.gui.item.InventoryUpgrades;
 import crazypants.enderio.conduit.item.IItemConduit;
 import crazypants.enderio.conduit.item.SpeedUpgrade;
 import crazypants.enderio.conduit.item.filter.IItemFilter;
-import crazypants.enderio.machine.gui.IContainerWithTileEntity;
 import crazypants.enderio.network.PacketHandler;

-public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrades> implements IContainerWithTileEntity {
+public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrades> {

    private final IItemConduit itemConduit;
    private final ForgeDirection direction;
-    private final TileEntity te;

    private int speedUpgradeSlotLimit = 15;

@@ -55,7 +52,6 @@ public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrade
        super(playerInv, new InventoryUpgrades(bundle.getConduit(IItemConduit.class), dir));
        this.direction = dir;
        this.itemConduit = bundle.getConduit(IItemConduit.class);
-        this.te = (TileEntity) bundle;
        slotLocations.addAll(playerSlotLocations.values());

        int x;
@@ -284,11 +280,6 @@ public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrade
        return copystack;
    }

-    @Override
-    public TileEntity getTileEntity() {
-        return te;
-    }
-
    private class FilterSlot extends Slot {

        public FilterSlot(IInventory par1iInventory, int par2, int par3, int par4) {
@@ -2,6 +2,8 @@ package crazypants.enderio.conduit.gui;

 import java.awt.Color;

+import mekanism.api.gas.Gas;
+
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.util.IIcon;

@@ -20,7 +22,6 @@ import crazypants.enderio.gui.RedstoneModeButton;
 import crazypants.enderio.machine.IRedstoneModeControlable;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.network.PacketHandler;
-import mekanism.api.gas.Gas;

 public class GasSettings extends BaseSettingsPanel {

@@ -28,13 +29,13 @@ public class GasSettings extends BaseSettingsPanel {

    private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId();

-    private final RedstoneModeButton rsB;
+    private RedstoneModeButton rsB;

-    private final ColorButton colorB;
+    private ColorButton colorB;

-    private final String autoExtractStr = EnderIO.lang.localize("gui.conduit.gas.autoExtract");
+    private String autoExtractStr = EnderIO.lang.localize("gui.conduit.gas.autoExtract");

-    private final IGasConduit conduit;
+    private IGasConduit conduit;

    protected GasSettings(final GuiExternalConnection gui, IConduit con) {
        super(IconEIO.WRENCH_OVERLAY_GAS, EnderIO.lang.localize("itemGasConduit.name"), gui, con);
@@ -72,7 +73,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()));
        }
    }
@@ -103,6 +104,8 @@ public class GasSettings extends BaseSettingsPanel {
    protected void renderCustomOptions(int top, float par1, int par2, int par3) {
        boolean isInput = isInput();
        if (isInput) {
+            int x = gui.getGuiLeft() + gap + gui.getFontRenderer().getStringWidth(autoExtractStr) + gap + 2;
+            int y = customTop;
            gui.getFontRenderer().drawString(autoExtractStr, left, top, ColorUtil.getRGB(Color.DARK_GRAY));
        }
    }
@@ -50,7 +50,7 @@ public class GuiExternalConnection extends GuiContainerBaseEIO {
        return id;
    }

-    private static final Map<Class<? extends IConduit>, Integer> TAB_ORDER = new HashMap<>();
+    private static final Map<Class<? extends IConduit>, Integer> TAB_ORDER = new HashMap<Class<? extends IConduit>, Integer>();

    static {
        TAB_ORDER.put(IItemConduit.class, 0);
@@ -66,11 +66,11 @@ public class GuiExternalConnection extends GuiContainerBaseEIO {
    final IConduitBundle bundle;
    private final ForgeDirection dir;

-    private final List<IConduit> conduits = new ArrayList<>();
-    private final List<ITabPanel> tabs = new ArrayList<>();
+    private final List<IConduit> conduits = new ArrayList<IConduit>();
+    private final List<ITabPanel> tabs = new ArrayList<ITabPanel>();
    private int activeTab = 0;

-    private static final int tabYOffset = 4;
+    private int tabYOffset = 4;

    private final ExternalConnectionContainer container;

@@ -86,8 +86,8 @@ public class GuiExternalConnection extends GuiContainerBaseEIO {

        container.setInoutSlotsVisible(false, false);

-        List<IConduit> cons = new ArrayList<>(bundle.getConduits());
-        Collections.sort(cons, new Comparator<>() {
+        List<IConduit> cons = new ArrayList<IConduit>(bundle.getConduits());
+        Collections.sort(cons, new Comparator<IConduit>() {

            @Override
            public int compare(IConduit o1, IConduit o2) {
@@ -23,7 +23,6 @@ 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 {

@@ -34,7 +33,7 @@ public class GuiExternalConnectionSelector extends GuiScreen {

    public GuiExternalConnectionSelector(IConduitBundle cb) {
        this.cb = cb;
-        cons = new HashSet<>();
+        cons = new HashSet<ForgeDirection>();
        for (IConduit con : cb.getConduits()) {
            if (con instanceof IInsulatedRedstoneConduit) {
                Set<ForgeDirection> conCons = con.getConduitConnections();
@@ -52,7 +51,7 @@ public class GuiExternalConnectionSelector extends GuiScreen {

    @Override
    protected void actionPerformed(GuiButton b) {
-        ForgeDirection dir = ForgeDirections.DIRECTIONS[b.id];
+        ForgeDirection dir = ForgeDirection.values()[b.id];
        EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
        BlockCoord loc = cb.getLocation();
        PacketHandler.INSTANCE.sendToServer(new PacketOpenConduitUI(cb.getEntity(), dir));
@@ -62,7 +62,7 @@ public class LiquidSettings extends BaseSettingsPanel {
    private final ILiquidConduit conduit;

    private AbstractEnderLiquidConduit eConduit;
-    private final boolean isEnder;
+    private boolean isEnder;
    private static final int filterIX = 4;
    private static final int filterEX = 104;
    private static final int filterY = 63;
@@ -70,7 +70,7 @@ public class LiquidSettings extends BaseSettingsPanel {
    private static final Rectangle extractFilterBounds = new Rectangle(filterEX, filterY, 90, 18);
    private GuiToolTip[] filterToolTips;

-    private static final boolean inOutShowIn = true;
+    private boolean inOutShowIn = true;
    private IconButton insertWhiteListB;
    private IconButton extractWhiteListB;

@@ -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) {
@@ -284,8 +284,6 @@ public class LiquidSettings extends BaseSettingsPanel {
        rsB.onGuiInit();
        colorB.onGuiInit();

-        gui.getContainer().setInventorySlotsVisible(true);
-
        if (!isEnder) {
            return;
        }
@@ -297,6 +295,7 @@ public class LiquidSettings extends BaseSettingsPanel {
        roundRobinB.onGuiInit();
        roundRobinB.setSelected(eConduit.isRoundRobin(gui.getDir()));

+        gui.getContainer().setInventorySlotsVisible(true);
        if (isFilterVisible()) {
            addFilterTooltips();

@@ -18,9 +18,9 @@ import crazypants.enderio.network.PacketHandler;
 public class OCSettings extends BaseSettingsPanel {

    private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId();
-    private final ColorButton cb;
+    private ColorButton cb;

-    private final String signalColorStr = EnderIO.lang.localize("gui.conduit.redstone.color");
+    private String signalColorStr = EnderIO.lang.localize("gui.conduit.redstone.color");
    private final IOCConduit occon;

    public OCSettings(GuiExternalConnection gui, IConduit con) {
@@ -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()));
        }
    }
@@ -11,7 +11,6 @@ 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>
@@ -43,14 +42,13 @@ public class PacketFluidChannel extends AbstractConduitPacket<ILiquidConduit>
    @Override
    public void fromBytes(ByteBuf buf) {
        super.fromBytes(buf);
-        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
+        dir = ForgeDirection.values()[buf.readShort()];
        isInput = buf.readBoolean();
-        channel = DyeColor.VALUES[buf.readShort()];
+        channel = DyeColor.values()[buf.readShort()];
    }

    @Override
    public IMessage onMessage(PacketFluidChannel message, MessageContext ctx) {
-        if (isInvalidPacketForGui(message, ctx)) return null;
        ILiquidConduit conduit = message.getTileCasted(ctx);
        if (!(conduit instanceof AbstractEnderLiquidConduit)) {
            return null;
@@ -12,7 +12,6 @@ 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>
@@ -45,7 +44,7 @@ public class PacketFluidFilter extends AbstractConduitPacket<ILiquidConduit>
    @Override
    public void fromBytes(ByteBuf buf) {
        super.fromBytes(buf);
-        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
+        dir = ForgeDirection.values()[buf.readShort()];
        isInput = buf.readBoolean();
        NBTTagCompound tag = ByteBufUtils.readTag(buf);
        filter = new FluidFilter();
@@ -54,7 +53,6 @@ public class PacketFluidFilter extends AbstractConduitPacket<ILiquidConduit>

    @Override
    public IMessage onMessage(PacketFluidFilter message, MessageContext ctx) {
-        if (isInvalidPacketForGui(message, ctx)) return null;
        ILiquidConduit conduit = message.getTileCasted(ctx);
        if (!(conduit instanceof AbstractEnderLiquidConduit)) {
            return null;
@@ -11,7 +11,6 @@ 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>
@@ -35,7 +34,7 @@ public class PacketOpenConduitUI extends MessageTileEntity<TileEntity>
    @Override
    public void fromBytes(ByteBuf buf) {
        super.fromBytes(buf);
-        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
+        dir = ForgeDirection.values()[buf.readShort()];
    }

    public IMessage onMessage(PacketOpenConduitUI message, MessageContext ctx) {
@@ -21,9 +21,9 @@ public class PowerSettings extends BaseSettingsPanel {

    private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId();

-    private final IPowerConduit conduit;
-    private final RedstoneModeButton rsB;
-    private final ColorButton colorB;
+    private IPowerConduit conduit;
+    private RedstoneModeButton rsB;
+    private ColorButton colorB;

    protected PowerSettings(final GuiExternalConnection gui, IConduit con) {
        super(IconEIO.WRENCH_OVERLAY_POWER, EnderIO.lang.localize("itemPowerConduit.name"), gui, con);
@@ -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()));
        }
    }
@@ -25,8 +25,8 @@ public class RedstoneSettings extends BaseSettingsPanel {

    private CheckBox strongCB;

-    private final String signalColorStr = EnderIO.lang.localize("gui.conduit.redstone.color");
-    private final String signalStringthStr = EnderIO.lang.localize("gui.conduit.redstone.signalStrengh");
+    private String signalColorStr = EnderIO.lang.localize("gui.conduit.redstone.color");
+    private String signalStringthStr = EnderIO.lang.localize("gui.conduit.redstone.signalStrengh");
    private IInsulatedRedstoneConduit insCon;

    private int stongLabelX;
@@ -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());
@@ -39,11 +39,11 @@ public class BasicItemFilterGui implements IItemFilterGui {
    private final IItemFilterContainer filterContainer;
    private final ItemFilter filter;

-    private final int buttonIdOffset;
-    private final int xOffset;
-    private final int yOffset;
+    private int buttonIdOffset;
+    private int xOffset;
+    private int yOffset;

-    private final boolean isInput;
+    private boolean isInput;

    public BasicItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer,
            boolean isStickyModeAvailable, boolean isInput) {
@@ -107,7 +107,7 @@ public class BasicItemFilterGui implements IItemFilterGui {
        useNbtB.setPaintSelectedBorder(false);

        x += 16;
-        fuzzyB = new CycleButton<>(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
+        fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
    }

    public void createFilterSlots() {
@@ -39,7 +39,7 @@ public class BigItemFilterGui implements IItemFilterGui {
    private final IItemFilterContainer filterContainer;
    private final ItemFilter filter;

-    private final int buttonIdOffset;
+    private int buttonIdOffset;
    private int xOffset;
    private int yOffset;

@@ -92,7 +92,7 @@ public class BigItemFilterGui implements IItemFilterGui {
        useNbtB.setPaintSelectedBorder(false);

        x += 16;
-        fuzzyB = new CycleButton<>(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
+        fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);

        x += 16;
        stickyB = new ToggleButton(
@@ -38,26 +38,26 @@ public class ExistingItemFilterGui implements IItemFilterGui {
    private static final int ID_SHOW = GuiExternalConnection.nextButtonId();
    private static final int ID_MERGE = GuiExternalConnection.nextButtonId();

-    private final IItemConduit itemConduit;
-    private final GuiExternalConnection gui;
+    private IItemConduit itemConduit;
+    private GuiExternalConnection gui;

-    private final ToggleButton useMetaB;
-    private final ToggleButton useNbtB;
-    private final ToggleButton useOreDictB;
-    private final ToggleButton stickyB;
+    private ToggleButton useMetaB;
+    private ToggleButton useNbtB;
+    private ToggleButton useOreDictB;
+    private ToggleButton stickyB;

    private final IconButton whiteListB;

-    private final GuiButton snapshotB;
-    private final GuiButton clearB;
-    private final GuiButton showB;
-    private final GuiButton mergeB;
-    private final SnapshotOverlay snapshotOverlay;
+    private GuiButton snapshotB;
+    private GuiButton clearB;
+    private GuiButton showB;
+    private GuiButton mergeB;
+    private SnapshotOverlay snapshotOverlay;

    boolean isInput;
    private int buttonIdOffset = 0;

-    private final ExistingItemFilter filter;
+    private ExistingItemFilter filter;

    public ExistingItemFilterGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) {
        this.gui = gui;
@@ -9,9 +9,9 @@ import crazypants.enderio.network.PacketHandler;

 public class ItemConduitFilterContainer implements IItemFilterContainer {

-    private final IItemConduit itemConduit;
-    private final ForgeDirection dir;
-    private final boolean isInput;
+    private IItemConduit itemConduit;
+    private ForgeDirection dir;
+    private boolean isInput;

    public ItemConduitFilterContainer(IItemConduit itemConduit, ForgeDirection dir, boolean isInput) {
        this.itemConduit = itemConduit;
@@ -1,6 +1,6 @@
 package crazypants.enderio.conduit.gui.item;

-import java.awt.Color;
+import java.awt.*;

 import javax.annotation.Nonnull;

@@ -31,7 +31,6 @@ import crazypants.enderio.gui.RedstoneModeButton;
 import crazypants.enderio.machine.IRedstoneModeControlable;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.network.PacketHandler;
-import crazypants.util.ColorUtils;

 public class ItemSettings extends BaseSettingsPanel {

@@ -44,7 +43,7 @@ public class ItemSettings extends BaseSettingsPanel {
    private static final int ID_INSERT_CHANNEL = 23;
    private static final int ID_EXTRACT_CHANNEL = 27;

-    private final @Nonnull IItemConduit itemConduit;
+    private @Nonnull IItemConduit itemConduit;

    private final ToggleButton loopB;
    private final ToggleButton roundRobinB;
@@ -55,11 +54,11 @@ public class ItemSettings extends BaseSettingsPanel {
    private final RedstoneModeButton rsB;
    private final @Nonnull ColorButton colorB;

-    private final ColorButton insertChannelB;
-    private final ColorButton extractChannelB;
+    private ColorButton insertChannelB;
+    private ColorButton extractChannelB;

-    private static final int priLeft = 46;
-    private static final int priWidth = 32;
+    private int priLeft = 46;
+    private int priWidth = 32;

    private IItemFilterGui insertFilterGui;
    private IItemFilterGui extractFilterGui;
@@ -175,7 +174,6 @@ public class ItemSettings extends BaseSettingsPanel {
    private void updateButtons() {
        rsB.onGuiInit();
        rsB.setMode(itemConduit.getExtractionRedstoneMode(gui.getDir()));
-        colorB.onGuiInit();

        loopB.onGuiInit();
        loopB.setSelected(itemConduit.isSelfFeedEnabled(gui.getDir()));
@@ -241,7 +239,7 @@ public class ItemSettings extends BaseSettingsPanel {

        String priority = EnderIO.lang.localize("gui.conduit.item.priority");
        fr.drawString(priority, left + 12, top1 + 25, ColorUtil.getRGB(Color.black));
-        fr.drawString(str, left + priLeft + priWidth - sw - gap, top1 + 25, ColorUtils.priorityString.getColor());
+        fr.drawString(str, left + priLeft + priWidth - sw - gap, top1 + 25, ColorUtil.getRGB(Color.black));

        if (insertFilterGui != null) insertFilterGui.renderCustomOptions(top1, par1, par2, par3);
        if (extractFilterGui != null) extractFilterGui.renderCustomOptions(top1, par1, par2, par3);
@@ -1,202 +0,0 @@
-package crazypants.enderio.conduit.gui.item;
-
-import net.minecraft.client.gui.GuiButton;
-
-import org.lwjgl.opengl.GL11;
-
-import com.enderio.core.client.gui.button.CycleButton;
-import com.enderio.core.client.gui.button.IconButton;
-import com.enderio.core.client.gui.button.ToggleButton;
-
-import crazypants.enderio.EnderIO;
-import crazypants.enderio.conduit.gui.GuiExternalConnection;
-import crazypants.enderio.conduit.item.filter.FuzzyMode;
-import crazypants.enderio.conduit.item.filter.ItemFilter;
-import crazypants.enderio.gui.GuiContainerBaseEIO;
-import crazypants.enderio.gui.IconEIO;
-
-public class LimitedItemFilterGui implements IItemFilterGui {
-
-    private static final int ID_WHITELIST = GuiExternalConnection.nextButtonId();
-    private static final int ID_NBT = GuiExternalConnection.nextButtonId();
-    private static final int ID_META = GuiExternalConnection.nextButtonId();
-    private static final int ID_ORE_DICT = GuiExternalConnection.nextButtonId();
-    private static final int ID_STICKY = GuiExternalConnection.nextButtonId();
-    private static final int ID_FUZZY = GuiExternalConnection.nextButtonId();
-
-    private final GuiContainerBaseEIO gui;
-
-    private final ToggleButton useMetaB;
-    private final ToggleButton useNbtB;
-    private final IconButton whiteListB;
-    private final ToggleButton useOreDictB;
-    private final ToggleButton stickyB;
-    private final CycleButton<FuzzyMode> fuzzyB;
-
-    private final IItemFilterContainer filterContainer;
-    private final ItemFilter filter;
-    private final int buttonIdOffset;
-    private final int xOffset;
-    private final int yOffset;
-    final boolean isStickyModeAvailable;
-    private final boolean isInput;
-
-    public LimitedItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer,
-            boolean isStickyModeAvailable, boolean isInput) {
-        this(gui, filterContainer, isStickyModeAvailable, isInput, isInput ? 104 : 6, 96, isInput ? 0 : 256);
-    }
-
-    public LimitedItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer,
-            boolean isStickyModeAvailable, boolean isInput, int xOffset, int yOffset, int buttonIdOffset) {
-        this.gui = gui;
-        this.isStickyModeAvailable = isStickyModeAvailable;
-        this.filterContainer = filterContainer;
-        this.xOffset = xOffset;
-        this.yOffset = yOffset;
-        this.buttonIdOffset = buttonIdOffset;
-        this.isInput = isInput;
-
-        filter = filterContainer.getItemFilter();
-
-        int butLeft = xOffset;
-        int x = butLeft;
-        int y = yOffset + 40;
-        whiteListB = new IconButton(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST);
-        whiteListB.setToolTip(getWhitelistTooltips(false));
-
-        x += 16;
-        useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META);
-        useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData"));
-        useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData"));
-        useMetaB.setPaintSelectedBorder(false);
-
-        x += 16;
-        stickyB = new ToggleButton(
-                gui,
-                ID_STICKY + buttonIdOffset,
-                x,
-                y,
-                IconEIO.FILTER_STICKY_OFF,
-                IconEIO.FILTER_STICKY);
-        stickyB.setSelectedToolTip(EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled"));
-        stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled"));
-        stickyB.setPaintSelectedBorder(false);
-
-        if (isStickyModeAvailable) x += 16;
-        useOreDictB = new ToggleButton(
-                gui,
-                ID_ORE_DICT + buttonIdOffset,
-                x,
-                y,
-                IconEIO.FILTER_ORE_DICT_OFF,
-                IconEIO.FILTER_ORE_DICT);
-        useOreDictB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicEnabled"));
-        useOreDictB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicDisabled"));
-        useOreDictB.setPaintSelectedBorder(false);
-
-        x += 16;
-        useNbtB = new ToggleButton(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT);
-        useNbtB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchNBT"));
-        useNbtB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreNBT"));
-        useNbtB.setPaintSelectedBorder(false);
-
-        x += 16;
-        fuzzyB = new CycleButton<>(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
-    }
-
-    public void createFilterSlots() {
-        filter.createGhostSlots(gui.getGhostSlots(), xOffset + 1, yOffset + 1, new Runnable() {
-
-            @Override
-            public void run() {
-                sendFilterChange();
-            }
-        });
-    }
-
-    @Override
-    public void mouseClicked(int x, int y, int par3) {}
-
-    @Override
-    public void updateButtons() {
-        ItemFilter activeFilter = filter;
-
-        useNbtB.onGuiInit();
-        useNbtB.setSelected(activeFilter.isMatchNBT());
-
-        useOreDictB.onGuiInit();
-        useOreDictB.setSelected(activeFilter.isUseOreDict());
-
-        if (isStickyModeAvailable) {
-            stickyB.onGuiInit();
-            stickyB.setSelected(activeFilter.isSticky());
-        }
-
-        fuzzyB.onGuiInit();
-        fuzzyB.setMode(activeFilter.getFuzzyMode());
-
-        useMetaB.onGuiInit();
-        useMetaB.setSelected(activeFilter.isMatchMeta());
-
-    }
-
-    @Override
-    public void actionPerformed(GuiButton guiButton) {
-
-        if (guiButton.id == ID_META + buttonIdOffset) {
-            filter.setMatchMeta(useMetaB.isSelected());
-            sendFilterChange();
-        } else if (guiButton.id == ID_NBT + buttonIdOffset) {
-            filter.setMatchNBT(useNbtB.isSelected());
-            sendFilterChange();
-        } else if (guiButton.id == ID_STICKY + buttonIdOffset) {
-            filter.setSticky(stickyB.isSelected());
-            sendFilterChange();
-        } else if (guiButton.id == ID_ORE_DICT + buttonIdOffset) {
-            filter.setUseOreDict(useOreDictB.isSelected());
-            sendFilterChange();
-        } else if (guiButton.id == ID_FUZZY + buttonIdOffset) {
-            filter.setFuzzyMode(fuzzyB.getMode());
-            sendFilterChange();
-        } else if (guiButton.id == ID_WHITELIST + buttonIdOffset) {
-            filter.setBlacklist(!filter.isBlacklist());
-            sendFilterChange();
-        }
-    }
-
-    private void sendFilterChange() {
-        updateButtons();
-        filterContainer.onFilterChanged();
-    }
-
-    @Override
-    public void deactivate() {
-        useNbtB.detach();
-        useMetaB.detach();
-        useOreDictB.detach();
-        whiteListB.detach();
-        stickyB.detach();
-        fuzzyB.detach();
-    }
-
-    @Override
-    public void renderCustomOptions(int top, float par1, int par2, int par3) {
-        GL11.glColor3f(1, 1, 1);
-        gui.bindGuiTexture(1);
-        gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18);
-        gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 20, 0, 238, 18 * 5, 18);
-
-    }
-
-    private String[] getWhitelistTooltips(boolean isBlacklist) {
-        if (isBlacklist) {
-            return new String[] { EnderIO.lang.localize("gui.conduit.item.blacklist"),
-                    EnderIO.lang.localize("gui.conduit.item.blacklist.tooltip.0"),
-                    EnderIO.lang.localize("gui.conduit.item.blacklist.tooltip.1") };
-        } else {
-            return new String[] { EnderIO.lang.localize("gui.conduit.item.whitelist"),
-                    EnderIO.lang.localize("gui.conduit.item.whitelist.tooltip.0"),
-                    EnderIO.lang.localize("gui.conduit.item.whitelist.tooltip.1") };
-        }
-    }
-}
@@ -37,6 +37,7 @@ public class ModItemFilterGui implements IItemFilterGui {

    private final IconButton whiteListB;

+    private final int inputOffsetX;
    private final int tfWidth;
    private final int tfTextureX;
    private final int tfTextureY;
@@ -55,12 +56,13 @@ public class ModItemFilterGui implements IItemFilterGui {
        } else {
            filter = (ModItemFilter) itemConduit.getOutputFilter(gui.getDir());
        }
+        inputOffsetX = x;
        tfWidth = 52;
        tfTextureX = 120;
        tfTextureY = 214;

-        inputBounds = new Rectangle[] { new Rectangle(x, y, 16, 16), new Rectangle(x, y + 18, 16, 16),
-                new Rectangle(x, y + 36, 16, 16) };
+        inputBounds = new Rectangle[] { new Rectangle(inputOffsetX, y, 16, 16),
+                new Rectangle(inputOffsetX, y + 18, 16, 16), new Rectangle(inputOffsetX, y + 36, 16, 16) };

        deleteButs = new IconButton[inputBounds.length];
        for (int i = 0; i < deleteButs.length; i++) {
@@ -14,25 +14,17 @@ 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 enum Opcode {
-
+    public static enum Opcode {
        CLEAR,
        SET,
        MERGE,
        SET_BLACK,
-        UNSET_BLACK;
-
-        private static final Opcode[] VALUES = values();
-
-        public static Opcode fromOrdinal(int ordinal) {
-            return VALUES[ordinal];
-        }
+        UNSET_BLACK
    }

    private ForgeDirection dir;
@@ -51,9 +43,9 @@ public class PacketExistingItemFilterSnapshot extends AbstractConduitPacket<IIte
    @Override
    public void fromBytes(ByteBuf buf) {
        super.fromBytes(buf);
-        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
+        dir = ForgeDirection.values()[buf.readShort()];
        isInput = buf.readBoolean();
-        opcode = Opcode.fromOrdinal(buf.readByte() & 255);
+        opcode = Opcode.values()[buf.readByte() & 255];
    }

    @Override
@@ -66,7 +58,6 @@ public class PacketExistingItemFilterSnapshot extends AbstractConduitPacket<IIte

    @Override
    public PacketExistingItemFilterSnapshot onMessage(PacketExistingItemFilterSnapshot message, MessageContext ctx) {
-        if (isInvalidPacketForGui(message, ctx)) return null;
        IItemConduit conduit = message.getTileCasted(ctx);
        if (conduit == null) {
            return null;
@@ -10,7 +10,6 @@ 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>
@@ -34,7 +33,7 @@ public class PacketModItemFilter extends AbstractConduitPacket<IItemConduit>
    @Override
    public void fromBytes(ByteBuf buf) {
        super.fromBytes(buf);
-        dir = ForgeDirections.DIRECTIONS[buf.readShort()];
+        dir = ForgeDirection.values()[buf.readShort()];
        isInput = buf.readBoolean();
        index = buf.readInt();
        boolean isNull = buf.readBoolean();
@@ -59,7 +58,6 @@ public class PacketModItemFilter extends AbstractConduitPacket<IItemConduit>

    @Override
    public IMessage onMessage(PacketModItemFilter message, MessageContext ctx) {
-        if (isInvalidPacketForGui(message, ctx)) return null;
        IItemConduit conduit = message.getTileCasted(ctx);
        if (conduit == null) {
            return null;
@@ -5,21 +5,16 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.common.util.ForgeDirection;

+import cofh.api.transport.IItemDuct;
+
 import com.enderio.core.common.util.DyeColor;

-import cofh.api.transport.IItemDuct;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IExtractor;
 import crazypants.enderio.conduit.item.filter.IItemFilter;
-import crazypants.enderio.conduit.render.ConduitRenderer;

 public interface IItemConduit extends IConduit, IItemDuct, IExtractor {

-    @Override
-    default ConduitRenderer getRenderer() {
-        return ItemConduitRenderer.instance.get();
-    }
-
    IIcon getTextureForInputMode();

    IIcon getTextureForOutputMode();
@@ -18,11 +18,12 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;

+import cofh.api.inventory.IInventoryConnection;
+
 import com.enderio.core.client.render.IconUtil;
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.DyeColor;

-import cofh.api.inventory.IInventoryConnection;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.AbstractConduit;
 import crazypants.enderio.conduit.AbstractConduitNetwork;
@@ -60,7 +61,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {

    public static final String ICON_KEY_ENDER = "enderio:ender_still";

-    static final Map<String, IIcon> ICONS = new HashMap<>();
+    static final Map<String, IIcon> ICONS = new HashMap<String, IIcon>();

    public static void initIcons() {
        IconUtil.addIconProvider(new IconUtil.IIconProvider() {
@@ -87,24 +88,37 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {

    ItemConduitNetwork network;

-    protected final EnumMap<ForgeDirection, RedstoneControlMode> extractionModes = new EnumMap<>(ForgeDirection.class);
-    protected final EnumMap<ForgeDirection, DyeColor> extractionColors = new EnumMap<>(ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, RedstoneControlMode> extractionModes = new EnumMap<ForgeDirection, RedstoneControlMode>(
+            ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, DyeColor> extractionColors = new EnumMap<ForgeDirection, DyeColor>(
+            ForgeDirection.class);

-    protected final EnumMap<ForgeDirection, IItemFilter> outputFilters = new EnumMap<>(ForgeDirection.class);
-    protected final EnumMap<ForgeDirection, IItemFilter> inputFilters = new EnumMap<>(ForgeDirection.class);
-    protected final EnumMap<ForgeDirection, ItemStack> outputFilterUpgrades = new EnumMap<>(ForgeDirection.class);
-    protected final EnumMap<ForgeDirection, ItemStack> inputFilterUpgrades = new EnumMap<>(ForgeDirection.class);
-    protected final EnumMap<ForgeDirection, ItemStack> speedUpgrades = new EnumMap<>(ForgeDirection.class);
-    protected final EnumMap<ForgeDirection, ItemStack> functionUpgrades = new EnumMap<>(ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, IItemFilter> outputFilters = new EnumMap<ForgeDirection, IItemFilter>(
+            ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, IItemFilter> inputFilters = new EnumMap<ForgeDirection, IItemFilter>(
+            ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, ItemStack> outputFilterUpgrades = new EnumMap<ForgeDirection, ItemStack>(
+            ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, ItemStack> inputFilterUpgrades = new EnumMap<ForgeDirection, ItemStack>(
+            ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, ItemStack> speedUpgrades = new EnumMap<ForgeDirection, ItemStack>(
+            ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, ItemStack> functionUpgrades = new EnumMap<ForgeDirection, ItemStack>(
+            ForgeDirection.class);

-    protected final EnumMap<ForgeDirection, Boolean> selfFeed = new EnumMap<>(ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, Boolean> selfFeed = new EnumMap<ForgeDirection, Boolean>(
+            ForgeDirection.class);

-    protected final EnumMap<ForgeDirection, Boolean> roundRobin = new EnumMap<>(ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, Boolean> roundRobin = new EnumMap<ForgeDirection, Boolean>(
+            ForgeDirection.class);

-    protected final EnumMap<ForgeDirection, Integer> priority = new EnumMap<>(ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, Integer> priority = new EnumMap<ForgeDirection, Integer>(
+            ForgeDirection.class);

-    protected final EnumMap<ForgeDirection, DyeColor> outputColors = new EnumMap<>(ForgeDirection.class);
-    protected final EnumMap<ForgeDirection, DyeColor> inputColors = new EnumMap<>(ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, DyeColor> outputColors = new EnumMap<ForgeDirection, DyeColor>(
+            ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, DyeColor> inputColors = new EnumMap<ForgeDirection, DyeColor>(
+            ForgeDirection.class);

    private int metaData;

@@ -133,7 +147,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
            metaData = 0;
        }

-        Map<ForgeDirection, ItemStack> converted = new HashMap<>();
+        Map<ForgeDirection, ItemStack> converted = new HashMap<ForgeDirection, ItemStack>();

        convertToItemUpgrades(filterMeta, converted, inputFilters);
        for (Entry<ForgeDirection, ItemStack> entry : converted.entrySet()) {
@@ -151,10 +165,10 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {

    @Override
    protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) {
-        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")]);
+        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")]);
        setSelfFeedEnabled(dir, dataRoot.getBoolean("selfFeed"));
        setRoundRobinEnabled(dir, dataRoot.getBoolean("roundRobin"));
        setOutputPriority(dir, dataRoot.getInteger("outputPriority"));
@@ -185,7 +199,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {

    @Override
    public List<ItemStack> getDrops() {
-        List<ItemStack> res = new ArrayList<>();
+        List<ItemStack> res = new ArrayList<ItemStack>();
        res.add(createItem());
        for (ItemStack stack : speedUpgrades.values()) {
            res.add(stack);
@@ -599,7 +613,8 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {

    @Override
    public ItemStack createItem() {
-        return new ItemStack(EnderIO.itemItemConduit, 1, metaData);
+        ItemStack result = new ItemStack(EnderIO.itemItemConduit, 1, metaData);
+        return result;
    }

    @Override
@@ -837,15 +852,15 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
            key = "extRM." + dir.name();
            if (nbtRoot.hasKey(key)) {
                short ord = nbtRoot.getShort(key);
-                if (ord >= 0 && ord < RedstoneControlMode.VALUES.length) {
-                    extractionModes.put(dir, RedstoneControlMode.VALUES[ord]);
+                if (ord >= 0 && ord < RedstoneControlMode.values().length) {
+                    extractionModes.put(dir, RedstoneControlMode.values()[ord]);
                }
            }
            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();
@@ -869,16 +884,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]);
                }
            }
        }
@@ -8,13 +8,10 @@ import java.util.Map;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ChatComponentTranslation;
-import net.minecraft.util.IChatComponent;
 import net.minecraftforge.common.util.ForgeDirection;

 import com.enderio.core.common.util.BlockCoord;

-import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.AbstractConduitNetwork;
 import crazypants.enderio.conduit.item.NetworkedInventory.Target;
 import crazypants.enderio.conduit.item.filter.IItemFilter;
@@ -22,10 +19,10 @@ import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer;

 public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IItemConduit> {

-    final List<NetworkedInventory> inventories = new ArrayList<>();
-    private final Map<BlockCoord, List<NetworkedInventory>> invMap = new HashMap<>();
+    final List<NetworkedInventory> inventories = new ArrayList<NetworkedInventory>();
+    private final Map<BlockCoord, List<NetworkedInventory>> invMap = new HashMap<BlockCoord, List<NetworkedInventory>>();

-    final Map<BlockCoord, IItemConduit> conMap = new HashMap<>();
+    final Map<BlockCoord, IItemConduit> conMap = new HashMap<BlockCoord, IItemConduit>();

    private boolean requiresSort = true;

@@ -80,7 +77,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
    }

    public List<NetworkedInventory> getInventoryPanelSources() {
-        ArrayList<NetworkedInventory> res = new ArrayList<>();
+        ArrayList<NetworkedInventory> res = new ArrayList<NetworkedInventory>();
        for (NetworkedInventory inv : inventories) {
            if (inv.con.hasInventoryPanelUpgrade(inv.conDir)) {
                res.add(inv);
@@ -92,7 +89,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
    private List<NetworkedInventory> getOrCreate(BlockCoord bc) {
        List<NetworkedInventory> res = invMap.get(bc);
        if (res == null) {
-            res = new ArrayList<>();
+            res = new ArrayList<NetworkedInventory>();
            invMap.put(bc, res);
        }
        return res;
@@ -179,8 +176,8 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
        }
    }

-    public List<IChatComponent> getTargetsForExtraction(BlockCoord extractFrom, IItemConduit con, ItemStack input) {
-        List<IChatComponent> result = new ArrayList<>();
+    public List<String> getTargetsForExtraction(BlockCoord extractFrom, IItemConduit con, ItemStack input) {
+        List<String> result = new ArrayList<String>();

        List<NetworkedInventory> invs = getOrCreate(extractFrom);
        for (NetworkedInventory source : invs) {
@@ -190,12 +187,12 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
                    for (Target t : source.sendPriority) {
                        IItemFilter f = t.inv.con.getOutputFilter(t.inv.conDir);
                        if (input == null || f == null || f.doesItemPassFilter(t.inv, input)) {
-                            result.add(
-                                    t.inv.getInventoryNameComponent()
-                                            .appendText(" " + t.inv.location.chatString() + " ").appendSibling(
-                                                    new ChatComponentTranslation(
-                                                            EnderIO.lang.addPrefix("gui.mjReader.distance"),
-                                                            t.distance)));
+                            String s = t.inv.getLocalizedInventoryName() + " "
+                                    + t.inv.location.chatString()
+                                    + " Distance ["
+                                    + t.distance
+                                    + "] ";
+                            result.add(s);
                        }
                    }
                }
@@ -205,13 +202,13 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
        return result;
    }

-    public List<IChatComponent> getInputSourcesFor(IItemConduit con, ForgeDirection dir, ItemStack input) {
-        List<IChatComponent> result = new ArrayList<>();
+    public List<String> getInputSourcesFor(IItemConduit con, ForgeDirection dir, ItemStack input) {
+        List<String> result = new ArrayList<String>();
        for (NetworkedInventory inv : inventories) {
            if (inv.hasTarget(con, dir)) {
                IItemFilter f = inv.con.getInputFilter(inv.conDir);
                if (input == null || f == null || f.doesItemPassFilter(inv, input)) {
-                    result.add(inv.getInventoryNameComponent().appendText(" " + inv.location.chatString()));
+                    result.add(inv.getLocalizedInventoryName() + " " + inv.location.chatString());
                }
            }
        }
@@ -13,12 +13,17 @@ import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.conduit.geom.ConnectionModeGeometry;
 import crazypants.enderio.conduit.geom.Offset;
 import crazypants.enderio.conduit.render.ConduitBundleRenderer;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.conduit.render.DefaultConduitRenderer;

 public class ItemConduitRenderer extends DefaultConduitRenderer {

-    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal.withInitial(ItemConduitRenderer::new);
+    @Override
+    public boolean isRendererForConduit(IConduit conduit) {
+        if (conduit instanceof IItemConduit) {
+            return true;
+        }
+        return false;
+    }

    @Override
    public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x,
@@ -64,8 +64,9 @@ public class ItemExtractSpeedUpgrade extends Item implements IResourceTooltipPro
    }

    @Override
+    @SuppressWarnings({ "rawtypes", "unchecked" })
    @SideOnly(Side.CLIENT)
-    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
        for (int j = 0; j < UPGRADES.length; ++j) {
            par3List.add(new ItemStack(par1, 1, j));
        }
@@ -64,8 +64,9 @@ public class ItemFunctionUpgrade extends Item implements IResourceTooltipProvide
    }

    @Override
+    @SuppressWarnings({ "rawtypes", "unchecked" })
    @SideOnly(Side.CLIENT)
-    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
        for (int j = 0; j < UPGRADES.length; ++j) {
            par3List.add(new ItemStack(par1, 1, j));
        }
@@ -14,7 +14,7 @@ public class ItemItemConduit extends AbstractItemConduit {
    // new ItemConduitSubtype(ModObject.itemItemConduit.name(), "enderio:itemItemConduit"),
    // new ItemConduitSubtype(ModObject.itemItemConduit.name() + "Empowered", "enderio:itemItemConduitAdvanced")
    // };
-    private static final ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] {
+    private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] {
            new ItemConduitSubtype(ModObject.itemItemConduit.name(), "enderio:itemItemConduit") };

    public static ItemItemConduit create() {
@@ -6,15 +6,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import javax.annotation.Nullable;
-
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.ChatComponentTranslation;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -26,10 +22,8 @@ import com.enderio.core.common.util.RoundRobinIterator;

 import crazypants.enderio.conduit.ConnectionMode;
 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 {

@@ -39,15 +33,15 @@ public class NetworkedInventory {
    BlockCoord location;
    int inventorySide;

-    List<Target> sendPriority = new ArrayList<>();
-    RoundRobinIterator<Target> rrIter = new RoundRobinIterator<>(sendPriority);
+    List<Target> sendPriority = new ArrayList<Target>();
+    RoundRobinIterator<Target> rrIter = new RoundRobinIterator<Target>(sendPriority);

    private int extractFromSlot = -1;

    int tickDeficit;

-    private TileEntity connectedTileEntity;
-
+    // work around for a vanilla chest changing into a double chest without doing unneeded checks all the time
+    boolean recheckInv = false;
    // Hack for TiC crafting station not working correctly when setting output slot to null
    boolean ticHack = false;

@@ -66,13 +60,19 @@ 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) {
@@ -109,13 +109,6 @@ public class NetworkedInventory {
    }

    public void onTick() {
-        if (isInvalid()) {
-            updateInventory();
-            if (isInvalid()) {
-                return;
-            }
-        }
-
        if (tickDeficit > 0 || !canExtract() || !con.isExtractionRedstoneConditionMet(conDir)) {
            // do nothing
        } else {
@@ -150,6 +143,11 @@ public class NetworkedInventory {
    }

    private boolean transferItems() {
+
+        if (recheckInv) {
+            updateInventory();
+        }
+
        int[] slotIndices = getInventory().getAccessibleSlotsFromSide(inventorySide);
        if (slotIndices == null) {
            return false;
@@ -157,7 +155,6 @@ public class NetworkedInventory {
        int numSlots = slotIndices.length;
        ItemStack extractItem = null;
        int maxExtracted = con.getMaximumExtracted(conDir);
-        final IItemFilter filter = con.getInputFilter(conDir);

        int slot = -1;
        int slotChecksPerTick = Math.min(numSlots, ItemConduitNetwork.MAX_SLOT_CHECK_PER_TICK);
@@ -165,23 +162,12 @@ public class NetworkedInventory {
            int index = nextSlot(numSlots);
            slot = slotIndices[index];
            ItemStack item = getInventory().getStackInSlot(slot);
-            if (item != null) {
-                if (filter != null && filter.isLimited()) {
-                    final int count = ((ItemFilterLimited) filter).getInsertLimitInv(getInventory(), item);
-                    if (count <= 0) {
-                        continue;
-                    } else if (count < item.stackSize) {
-                        item = item.copy();
-                        item.stackSize = count;
-                    }
-                }
-                if (canExtractItem(item)) {
-                    extractItem = item.copy();
-                    if (getInventory().canExtractItem(slot, extractItem, inventorySide)) {
-                        if (doTransfer(extractItem, slot, maxExtracted)) {
-                            setNextStartingSlot(slot);
-                            return true;
-                        }
+            if (canExtractItem(item)) {
+                extractItem = item.copy();
+                if (getInventory().canExtractItem(slot, extractItem, inventorySide)) {
+                    if (doTransfer(extractItem, slot, maxExtracted)) {
+                        setNextStartingSlot(slot);
+                        return true;
                    }
                }
            }
@@ -197,11 +183,7 @@ public class NetworkedInventory {
        if (filter == null) {
            return true;
        }
-        if (filter.isLimited()) {
-            return filter.isValid() && ((ItemFilterLimited) filter).doesItemPassFilterInv(this, itemStack);
-        } else {
-            return filter.doesItemPassFilter(this, itemStack);
-        }
+        return filter.doesItemPassFilter(this, itemStack);
    }

    private boolean doTransfer(ItemStack extractedItem, int slot, int maxExtract) {
@@ -258,6 +240,9 @@ 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;
@@ -279,61 +264,25 @@ public class NetworkedInventory {
    }

    public final void updateInventory() {
-        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;
+        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);
        }
    }

    private int insertItem(ItemStack item) {
-        if (isInvalid()) {
-            updateInventory();
-            if (isInvalid()) {
-                return 0;
-            }
-        }
-
        if (!canInsert() || item == null) {
            return 0;
        }
        IItemFilter filter = con.getOutputFilter(conDir);
        if (filter != null) {
-            if (filter.isLimited()) {
-                final int count = filter.getMaxCountThatCanPassFilter(item);
-                if (count <= 0) {
-                    return 0;
-                } else {
-                    final int maxInsert = ((ItemFilterLimited) filter).getInsertLimit(getInventory(), item);
-                    if (maxInsert <= 0) {
-                        return 0;
-                    } else if (maxInsert < item.stackSize) {
-                        item = item.copy();
-                        item.stackSize = maxInsert;
-                    }
-                }
-            } else if (!filter.doesItemPassFilter(this, item)) {
+            if (!filter.doesItemPassFilter(this, item)) {
                return 0;
            }
        }
-        return ItemUtil.doInsertItem(getInventory(), item, ForgeDirections.DIRECTIONS[inventorySide]);
+        return ItemUtil.doInsertItem(getInventory(), item, ForgeDirection.values()[inventorySide]);
    }

    void updateInsertOrder() {
@@ -341,7 +290,7 @@ public class NetworkedInventory {
        if (!canExtract()) {
            return;
        }
-        List<Target> result = new ArrayList<>();
+        List<Target> result = new ArrayList<NetworkedInventory.Target>();

        for (NetworkedInventory other : network.inventories) {
            if ((con.isSelfFeedEnabled(conDir) || (other != this)) && other.canInsert()
@@ -359,8 +308,8 @@ public class NetworkedInventory {
            Collections.sort(sendPriority);
        } else {
            if (!result.isEmpty()) {
-                Map<BlockCoord, Integer> visited = new HashMap<>();
-                List<BlockCoord> steps = new ArrayList<>();
+                Map<BlockCoord, Integer> visited = new HashMap<BlockCoord, Integer>();
+                List<BlockCoord> steps = new ArrayList<BlockCoord>();
                steps.add(con.getLocation());
                calculateDistances(result, visited, steps, 0);

@@ -377,7 +326,7 @@ public class NetworkedInventory {
            return;
        }

-        ArrayList<BlockCoord> nextSteps = new ArrayList<>();
+        ArrayList<BlockCoord> nextSteps = new ArrayList<BlockCoord>();
        for (BlockCoord bc : steps) {
            IItemConduit con = network.conMap.get(bc);
            if (con != null) {
@@ -430,8 +379,8 @@ public class NetworkedInventory {
        return inv;
    }

-    public @Nullable ISidedInventory getInventoryRecheck() {
-        if (isInvalid()) {
+    public ISidedInventory getInventoryRecheck() {
+        if (recheckInv) {
            updateInventory();
        }
        return inv;
@@ -445,10 +394,6 @@ public class NetworkedInventory {
        this.inventorySide = inventorySide;
    }

-    /**
-     * @deprecated Translates on the server. Use {@link #getInventoryNameComponent()} for chat.
-     */
-    @Deprecated
    public String getLocalizedInventoryName() {
        String inventoryName = getInventory().getInventoryName();
        if (inventoryName == null) {
@@ -460,22 +405,6 @@ public class NetworkedInventory {
        }
    }

-    public IChatComponent getInventoryNameComponent() {
-        String inventoryName = getInventory().getInventoryName();
-        if (inventoryName == null) {
-            return new ChatComponentText("null");
-        }
-        // Ask the tile entity: InventoryWrapper always reports no custom name.
-        // The client parses the translation as a format string and falls back to en_US if it fails, so a '%' in the
-        // en_US text (or in the key when untranslated) could crash it. A dedicated server translates to en_US.
-        boolean customName = connectedTileEntity instanceof IInventory
-                && ((IInventory) connectedTileEntity).hasCustomInventoryName();
-        if (customName || StatCollector.translateToLocal(inventoryName).contains("%")) {
-            return new ChatComponentText(inventoryName);
-        }
-        return new ChatComponentTranslation(inventoryName);
-    }
-
    static class Target implements Comparable<Target> {

        NetworkedInventory inv;
@@ -47,8 +47,8 @@ public class ExistingItemFilter implements IItemFilter {

    private boolean isStackInInventory(NetworkedInventory ni, ItemStack item) {
        int[] slots = ni.getInventory().getAccessibleSlotsFromSide(ni.getInventorySide());
-        for (int slot : slots) {
-            ItemStack stack = ni.getInventory().getStackInSlot(slot);
+        for (int i = 0; i < slots.length; i++) {
+            ItemStack stack = ni.getInventory().getStackInSlot(i);
            if (stackEqual(item, stack)) {
                return true;
            }
@@ -107,17 +107,17 @@ public class ExistingItemFilter implements IItemFilter {
    }

    public void setSnapshot(NetworkedInventory ni) {
-        snapshot = new ArrayList<>();
+        snapshot = new ArrayList<ItemStack>();
        mergeSnapshot(ni);
    }

    public void mergeSnapshot(NetworkedInventory ni) {
        if (snapshot == null) {
-            snapshot = new ArrayList<>();
+            snapshot = new ArrayList<ItemStack>();
        }
        int[] slots = ni.getInventory().getAccessibleSlotsFromSide(ni.getInventorySide());
-        for (int slot : slots) {
-            ItemStack stack = ni.getInventory().getStackInSlot(slot);
+        for (int i = 0; i < slots.length; i++) {
+            ItemStack stack = ni.getInventory().getStackInSlot(i);
            if (stack != null && !isStackInSnapshot(stack)) {
                snapshot.add(stack);
            }
@@ -126,7 +126,7 @@ public class ExistingItemFilter implements IItemFilter {

    public boolean mergeSnapshot(IInventory inventory) {
        if (snapshot == null) {
-            snapshot = new ArrayList<>();
+            snapshot = new ArrayList<ItemStack>();
        }
        int size = inventory.getSizeInventory();
        boolean added = false;
@@ -200,7 +200,7 @@ public class ExistingItemFilter implements IItemFilter {
        readSettingsFromNBT(nbtRoot);

        if (nbtRoot.hasKey("snapshot")) {
-            snapshot = new ArrayList<>();
+            snapshot = new ArrayList<ItemStack>();
            NBTTagList itemList = (NBTTagList) nbtRoot.getTag("snapshot");
            for (int i = 0; i < itemList.tagCount(); i++) {
                NBTTagCompound itemTag = itemList.getCompoundTagAt(i);
@@ -274,7 +274,7 @@ public class ExistingItemFilter implements IItemFilter {
            snapshot = null;
            return;
        }
-        snapshot = new ArrayList<>(numItems);
+        snapshot = new ArrayList<ItemStack>(numItems);
        for (int i = 0; i < numItems; i++) {
            NBTTagCompound itemTag = NetworkUtil.readNBTTagCompound(buf);
            ItemStack item = ItemStack.loadItemStackFromNBT(itemTag);
@@ -30,7 +30,7 @@ public interface IItemFilter {

    /**
     * Checks if the given item passes the filter or not.
-     *
+     * 
     * @param inv  the attached inventory - or null when used without an inventory (eg for a GUI)
     * @param item the item to check
     * @return true if the item is allowed to pass
@@ -41,18 +41,10 @@ public interface IItemFilter {

    boolean isValid();

-    default boolean isLimited() {
-        return false;
-    }
-
    boolean isSticky();

    void createGhostSlots(List<GhostSlot> slots, int xOffset, int yOffset, Runnable cb);

-    default int getMaxCountThatCanPassFilter(ItemStack item) {
-        return 1;
-    }
-
    int getSlotCount();

    default String getUnlocalizedName() {
@@ -82,8 +82,9 @@ public class ItemBasicItemFilter extends Item implements IItemFilterUpgrade {
    }

    @Override
+    @SuppressWarnings({ "rawtypes", "unchecked" })
    @SideOnly(Side.CLIENT)
-    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
        for (int j = 0; j < 2; ++j) {
            par3List.add(new ItemStack(this, 1, j));
        }
@@ -91,8 +92,7 @@ public class ItemBasicItemFilter extends Item implements IItemFilterUpgrade {

    @Override
    @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
-            boolean par4) {
+    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
        if (FilterRegister.isFilterSet(par1ItemStack)) {
            if (!SpecialTooltipHandler.showAdvancedTooltips()) {
                par3List.add(EnderIO.lang.localize("itemConduitFilterUpgrade"));
@@ -8,7 +8,6 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;

@@ -68,7 +67,7 @@ public class ItemExistingItemFilter extends Item implements IItemFilterUpgrade,
                ExistingItemFilter filter = (ExistingItemFilter) createFilterFromStack(item);
                String unloc = "item.itemExistingItemFilter."
                        + (filter.mergeSnapshot(inv) ? "filterUpdated" : "filterNotUpdated");
-                ChatUtil.sendNoSpam(player, new ChatComponentTranslation(EnderIO.lang.addPrefix(unloc)));
+                ChatUtil.sendNoSpamUnloc(player, EnderIO.lang, unloc);
                FilterRegister.writeFilterToStack(filter, item);
                return true;
            }
@@ -90,8 +89,7 @@ public class ItemExistingItemFilter extends Item implements IItemFilterUpgrade,

    @Override
    @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
-            boolean par4) {
+    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
        if (FilterRegister.isFilterSet(par1ItemStack)) {
            if (SpecialTooltipHandler.showAdvancedTooltips()) {
                par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured"));
@@ -75,7 +75,7 @@ public class ItemFilter implements IInventory, IItemFilter {
        this.isAdvanced = isAdvanced;
        this.numItems = numItems;
        items = new ItemStack[numItems];
-        oreIds = new ArrayList<>(numItems);
+        oreIds = new ArrayList<int[]>(numItems);
        for (int i = 0; i < numItems; i++) {
            oreIds.add(null);
        }
@@ -91,13 +91,14 @@ public class ItemFilter implements IInventory, IItemFilter {
        return doesItemPassFilter(item);
    }

+    @SuppressWarnings("SimplifiableConditionalExpression")
    public boolean doesItemPassFilter(ItemStack item) {
        boolean allow = isValid() && itemMatched(item);

-        return isBlacklist ^ allow;
+        return isBlacklist ? !allow : allow;
    }

-    protected boolean itemMatched(ItemStack item) {
+    private boolean itemMatched(ItemStack item) {
        if (item == null) {
            return false;
        }
@@ -144,7 +145,7 @@ public class ItemFilter implements IInventory, IItemFilter {
        return matched;
    }

-    protected boolean isOreDicMatch(int filterItemIndex, ItemStack item) {
+    private boolean isOreDicMatch(int filterItemIndex, ItemStack item) {
        int[] ids1 = getCachedIds(filterItemIndex);
        if (ids1 == null || ids1.length == 0) {
            return false;
@@ -163,9 +164,8 @@ public class ItemFilter implements IInventory, IItemFilter {
        return false;
    }

-    protected boolean isNBTMatch(ItemStack filter, ItemStack item) {
-        if (filter.stackTagCompound == null && (item.stackTagCompound == null || item.stackTagCompound.hasNoTags()))
-            return true;
+    private boolean isNBTMatch(ItemStack filter, ItemStack item) {
+        if (filter.stackTagCompound == null && item.stackTagCompound == null) return true;
        if (filter.stackTagCompound == null || item.stackTagCompound == null) return false;
        if (!filter.getTagCompound().hasKey("GEN")) return filter.stackTagCompound.equals(item.stackTagCompound);
        NBTTagCompound filterTag = (NBTTagCompound) filter.getTagCompound().copy();
@@ -202,7 +202,7 @@ public class ItemFilter implements IInventory, IItemFilter {
        return !isItemListEmpty();
    }

-    protected boolean isItemListEmpty() {
+    private boolean isItemListEmpty() {
        for (ItemStack item : items) {
            if (item != null) {
                return false;
@@ -1,242 +0,0 @@
-package crazypants.enderio.conduit.item.filter;
-
-import java.util.List;
-
-import net.minecraft.inventory.ISidedInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-
-import com.enderio.core.client.gui.widget.GhostSlot;
-
-import cofh.lib.util.helpers.MathHelper;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import crazypants.enderio.conduit.gui.GuiExternalConnection;
-import crazypants.enderio.conduit.gui.item.IItemFilterGui;
-import crazypants.enderio.conduit.gui.item.ItemConduitFilterContainer;
-import crazypants.enderio.conduit.gui.item.LimitedItemFilterGui;
-import crazypants.enderio.conduit.item.IItemConduit;
-import crazypants.enderio.conduit.item.NetworkedInventory;
-
-public class ItemFilterLimited extends ItemFilter {
-
-    public ItemFilterLimited() {
-        this(10, true);
-    }
-
-    public ItemFilterLimited(int numItems, boolean isAdvanced) {
-        super(numItems, isAdvanced);
-    }
-
-    @Override
-    public String getInventoryName() {
-        return "Limited Item Filter";
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) {
-        ItemConduitFilterContainer cont = new ItemConduitFilterContainer(itemConduit, gui.getDir(), isInput);
-        LimitedItemFilterGui limitedItemFilterGui = new LimitedItemFilterGui(gui, cont, !isInput, isInput);
-        limitedItemFilterGui.createFilterSlots();
-        return limitedItemFilterGui;
-    }
-
-    @Override
-    public void createGhostSlots(List<GhostSlot> slots, int xOffset, int yOffset, Runnable cb) {
-        int index = 0;
-        int numRows = (int) (double) (items.length / 5);
-        for (int row = 0; row < numRows; ++row) {
-            for (int col = 0; col < 5; ++col) {
-                int x = xOffset + col * 18;
-                int y = yOffset + row * 20;
-                slots.add(new ItemFilterGhostSlot(index, x, y, cb));
-                index++;
-            }
-        }
-    }
-
-    @Override
-    public int getMaxCountThatCanPassFilter(ItemStack item) {
-        if (item == null || item.getItem() == null) {
-            return 0;
-        }
-        int count = 0;
-        for (int i = 0; i < items.length; i++) {
-            ItemStack invStack = items[i];
-            if (invStack != null && itemStackMatched(invStack, item, i)) {
-                count += invStack.stackSize;
-            }
-        }
-        return count;
-    }
-
-    @Override
-    public boolean isLimited() {
-        return true;
-    }
-
-    public int getInsertLimit(ISidedInventory inv, ItemStack item) {
-        if (item == null || item.getItem() == null) {
-            return 0;
-        }
-        int count = 0;
-        for (int i = 0; i < inv.getSizeInventory(); i++) {
-            ItemStack invStack = inv.getStackInSlot(i);
-            if (invStack != null && itemStackMatched(invStack, item, i)) {
-                count += invStack.stackSize;
-            }
-        }
-        return getMaxCountThatCanPassFilter(item) - count;
-    }
-
-    public int getInsertLimitInv(ISidedInventory inv, ItemStack item) {
-        return -getInsertLimit(inv, item);
-    }
-
-    public boolean doesCountPassFilter(int maxCount) {
-        return maxCount > 0;
-    }
-
-    @Override
-    public boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item) {
-        return isValid() && itemMatched(item) && doesCountPassFilter(getInsertLimit(inv.getInventory(), item));
-
-    }
-
-    // Filter in extract slot
-    public boolean doesItemPassFilterInv(NetworkedInventory inv, ItemStack item) {
-        return isValid() && itemMatched(item) && doesCountPassFilter(getInsertLimitInv(inv.getInventory(), item));
-    }
-
-    protected boolean itemStackMatched(ItemStack item, ItemStack filter, int slot) {
-        if (item == null) {
-            return false;
-        }
-
-        boolean checkDamage = fuzzyMode != FuzzyMode.DISABLED;
-        boolean damageMatched = false;
-        if (checkDamage && item.getItem().isDamageable()) {
-            damageMatched = fuzzyMode.compare(item);
-        }
-
-        if (isItemListEmpty()) {
-            if (checkDamage) {
-                return damageMatched;
-            } else {
-                return false;
-            }
-        }
-
-        boolean matched = false;
-
-        if (filter != null && item.getItem() == filter.getItem()) {
-            matched = true;
-
-            if (checkDamage && !damageMatched) {
-                matched = false;
-            } else if (matchMeta && item.getItemDamage() != filter.getItemDamage()) {
-                matched = false;
-            } else if (matchNBT && !isNBTMatch(item, filter)) {
-                matched = false;
-            }
-        }
-
-        if (!matched && useOreDict && isOreDicMatch(filter, item)) {
-            matched = true;
-        }
-        return matched;
-    }
-
-    public boolean isOreDicMatch(ItemStack filter, ItemStack item) {
-        int[] id_filter = OreDictionary.getOreIDs(filter);
-        if (id_filter.length == 0) {
-            return false;
-        }
-        int[] id_item = OreDictionary.getOreIDs(item);
-        if (id_item.length == 0) {
-            return false;
-        }
-        for (int id1 : id_filter) {
-            for (int id2 : id_item) {
-                if (id1 == id2) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public ItemStack decrStackSize(int fromSlot, int amount) {
-        if ((fromSlot < 0) || (fromSlot >= items.length)) {
-            return null;
-        }
-        oreIds.set(fromSlot, null);
-        ItemStack item = items[fromSlot];
-        items[fromSlot] = null;
-        return item.splitStack(amount);
-    }
-
-    @Override
-    public String toString() {
-        return "Limited" + super.toString();
-    }
-
-    @Override
-    public String getUnlocalizedName() {
-        return "gui.limited_item_filter";
-    }
-
-    class ItemFilterGhostSlot extends GhostSlot {
-
-        private final int slot;
-        private final Runnable cb;
-
-        private final int adjustOnShift;
-
-        ItemFilterGhostSlot(int slot, int x, int y, Runnable cb) {
-            this.x = x;
-            this.y = y;
-            this.slot = slot;
-            this.cb = cb;
-            this.displayStdOverlay = true;
-            this.stackSizeLimit = 64;
-            this.adjustOnShift = 10;
-        }
-
-        @Override
-        public void putStack(ItemStack stack) {
-            if (stack != null) {
-                stack = stack.copy();
-                if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) {
-                    if (Mouse.isButtonDown(0) || Mouse.getEventDWheel() > 0) {
-                        if (stack.stackSize - 1 == 1) {
-                            stack.stackSize += adjustOnShift - 2;
-                        } else {
-                            stack.stackSize = MathHelper
-                                    .clamp(stack.stackSize + adjustOnShift - 1, 1, stack.getMaxStackSize());
-                        }
-                    } else if (Mouse.isButtonDown(1) || Mouse.getEventDWheel() < 0) {
-                        if (stack.stackSize + 1 == 1) {
-                            stack.stackSize++;
-                        } else {
-                            stack.stackSize = MathHelper
-                                    .clamp(stack.stackSize - adjustOnShift + 1, 1, stack.getMaxStackSize());
-                        }
-                    }
-                }
-            }
-            items[slot] = stack;
-            cb.run();
-        }
-
-        @Override
-        public ItemStack getStack() {
-            return items[slot];
-        }
-    }
-}
@@ -1,74 +0,0 @@
-package crazypants.enderio.conduit.item.filter;
-
-import java.util.List;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-
-import com.enderio.core.api.client.gui.IResourceTooltipProvider;
-import com.enderio.core.client.handlers.SpecialTooltipHandler;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import crazypants.enderio.EnderIO;
-import crazypants.enderio.EnderIOTab;
-import crazypants.enderio.ModObject;
-import crazypants.enderio.conduit.item.FilterRegister;
-
-public class ItemLimitedItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider {
-
-    public static ItemLimitedItemFilter create() {
-        ItemLimitedItemFilter result = new ItemLimitedItemFilter();
-        result.init();
-        return result;
-    }
-
-    protected ItemLimitedItemFilter() {
-        setCreativeTab(EnderIOTab.tabEnderIO);
-        setUnlocalizedName(ModObject.itemLimitedItemFilter.unlocalisedName);
-        setMaxDamage(0);
-        setMaxStackSize(64);
-    }
-
-    protected void init() {
-        GameRegistry.registerItem(this, ModObject.itemLimitedItemFilter.unlocalisedName);
-    }
-
-    @Override
-    public IItemFilter createFilterFromStack(ItemStack stack) {
-        IItemFilter filter = new ItemFilterLimited();
-        if (stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) {
-            filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter"));
-        }
-        return filter;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerIcons(IIconRegister IIconRegister) {
-        itemIcon = IIconRegister.registerIcon("enderio:limitedItemFilter");
-    }
-
-    @Override
-    public String getUnlocalizedNameForTooltip(ItemStack stack) {
-        return getUnlocalizedName();
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
-            boolean par4) {
-        if (FilterRegister.isFilterSet(par1ItemStack)) {
-            if (SpecialTooltipHandler.showAdvancedTooltips()) {
-                par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured"));
-                par3List.add(
-                        EnumChatFormatting.ITALIC
-                                + EnderIO.lang.localize("itemConduitFilterUpgrade.clearConfigMethod"));
-            }
-        }
-    }
-}
@@ -60,8 +60,7 @@ public class ItemModItemFilter extends Item implements IItemFilterUpgrade, IReso

    @Override
    @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
-            boolean par4) {
+    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
        if (FilterRegister.isFilterSet(par1ItemStack)) {
            if (SpecialTooltipHandler.showAdvancedTooltips()) {
                par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured"));
@@ -13,6 +13,7 @@ import crazypants.enderio.EnderIOTab;
 import crazypants.enderio.ModObject;

 /**
+ *
 * @author matthias
 */
 public class ItemPowerItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider {
@@ -5,10 +5,11 @@ import java.util.List;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

+import cofh.api.energy.IEnergyContainerItem;
+
 import com.enderio.core.client.gui.widget.GhostSlot;
 import com.enderio.core.common.network.NetworkUtil;

-import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.conduit.gui.GuiExternalConnection;
@@ -19,6 +20,7 @@ import crazypants.enderio.conduit.item.NetworkedInventory;
 import io.netty.buffer.ByteBuf;

 /**
+ *
 * @author matthias
 */
 public class PowerItemFilter implements IItemFilter {
@@ -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.IntSupplier;
+import java.util.function.Supplier;

 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -34,7 +34,6 @@ import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.RaytraceResult;
 import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.item.ItemConduit;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.tool.ToolUtil;
@@ -47,14 +46,9 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit {
    public static final String ICON_KEY_IN_OUT_OUT = ItemConduit.ICON_KEY_IN_OUT_OUT;
    public static final String ICON_KEY_IN_OUT_IN = ItemConduit.ICON_KEY_IN_OUT_IN;

-    static final Map<String, IIcon> ICONS = new HashMap<>();
+    static final Map<String, IIcon> ICONS = new HashMap<String, IIcon>();
    private final Set<BlockCoord> filledFromThisTick = new HashSet<>();

-    @Override
-    public ConduitRenderer getRenderer() {
-        return EnderLiquidConduitRenderer.instance.get();
-    }
-
    @SideOnly(Side.CLIENT)
    public static void initIcons() {
        IconUtil.addIconProvider(new IconUtil.IIconProvider() {
@@ -89,31 +83,35 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit {

        STELLAR(() -> Config.stellarEnderFluidConduitExtractRate, () -> Config.stellarEnderFluidConduitMaxIoRate);

-        private final IntSupplier getMaxExtractPerTick;
-        private final IntSupplier getMaxIoPerTick;
+        private final Supplier<Integer> getMaxExtractPerTick;
+        private final Supplier<Integer> getMaxIoPerTick;

-        Type(IntSupplier getMaxExtractPerTick, IntSupplier getMaxIoPerTick) {
+        Type(Supplier<Integer> getMaxExtractPerTick, Supplier<Integer> getMaxIoPerTick) {
            this.getMaxExtractPerTick = getMaxExtractPerTick;
            this.getMaxIoPerTick = getMaxIoPerTick;
        }

        public int getMaxExtractPerTick() {
-            return getMaxExtractPerTick.getAsInt();
+            return getMaxExtractPerTick.get();
        }

        public int getMaxIoPerTick() {
-            return getMaxIoPerTick.getAsInt();
+            return getMaxIoPerTick.get();
        }
    }

    private EnderLiquidConduitNetwork network;
    private int ticksSinceFailedExtract;

-    private final EnumMap<ForgeDirection, FluidFilter> outputFilters = new EnumMap<>(ForgeDirection.class);
-    private final EnumMap<ForgeDirection, FluidFilter> inputFilters = new EnumMap<>(ForgeDirection.class);
+    private final EnumMap<ForgeDirection, FluidFilter> outputFilters = new EnumMap<ForgeDirection, FluidFilter>(
+            ForgeDirection.class);
+    private final EnumMap<ForgeDirection, FluidFilter> inputFilters = new EnumMap<ForgeDirection, FluidFilter>(
+            ForgeDirection.class);

-    protected final EnumMap<ForgeDirection, DyeColor> outputColors = new EnumMap<>(ForgeDirection.class);
-    protected final EnumMap<ForgeDirection, DyeColor> inputColors = new EnumMap<>(ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, DyeColor> outputColors = new EnumMap<ForgeDirection, DyeColor>(
+            ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, DyeColor> inputColors = new EnumMap<ForgeDirection, DyeColor>(
+            ForgeDirection.class);

    private int roundRobin = 0;

@@ -304,6 +302,7 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit {
    }

    private void doExtract() {
+        BlockCoord loc = getLocation();
        if (!hasExtractableMode()) {
            return;
        }
@@ -420,10 +419,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")) {
@@ -538,16 +537,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]);
                }
            }
        }
@@ -16,7 +16,6 @@ import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.DyeColor;
 import com.enderio.core.common.util.FluidUtil;

-import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.AbstractConduit;
 import crazypants.enderio.conduit.ConduitUtil;
 import crazypants.enderio.conduit.ConnectionMode;
@@ -24,15 +23,15 @@ import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.machine.reservoir.TileReservoir;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 public abstract class AbstractLiquidConduit extends AbstractConduit implements ILiquidConduit {

-    protected final EnumMap<ForgeDirection, RedstoneControlMode> extractionModes = new EnumMap<>(ForgeDirection.class);
-    protected final EnumMap<ForgeDirection, DyeColor> extractionColors = new EnumMap<>(ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, RedstoneControlMode> extractionModes = new EnumMap<ForgeDirection, RedstoneControlMode>(
+            ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, DyeColor> extractionColors = new EnumMap<ForgeDirection, DyeColor>(
+            ForgeDirection.class);

-    protected final Map<ForgeDirection, Integer> externalRedstoneSignals = new HashMap<>();
+    protected final Map<ForgeDirection, Integer> externalRedstoneSignals = new HashMap<ForgeDirection, Integer>();
    protected boolean redstoneStateDirty = true;

    public static IFluidHandler getExternalFluidHandler(IBlockAccess world, BlockCoord bc) {
@@ -55,12 +54,6 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I
        if (h == null) {
            return false;
        }
-
-        if (EnderIO.hasGT5 && h instanceof IGregTechTileEntity) {
-            IMetaTileEntity mte = ((IGregTechTileEntity) h).getMetaTileEntity();
-            return mte != null && mte.getCapacity() > 0;
-        }
-
        // TODO: This check was added to work around a bug in dynamic tanks, but
        // it causes issues with not conecting to empty tanks such as dim. trans +
        // BC fluid pipes, so I am removing it for now.
@@ -155,11 +148,11 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I
        boolean res;
        if (mode == RedstoneControlMode.OFF) {
            // if checking for no signal, must be no signal from both
-            res = RedstoneControlMode.isConditionMet(mode, signal)
+            res = mode.isConditionMet(mode, signal)
                    && (col != DyeColor.RED || isConditionMetByExternalSignal(dir, mode, col));
        } else {
            // if checking for a signal, either is fine
-            res = RedstoneControlMode.isConditionMet(mode, signal)
+            res = mode.isConditionMet(mode, signal)
                    || (col == DyeColor.RED && isConditionMetByExternalSignal(dir, mode, col));
        }
        return res;
@@ -178,12 +171,7 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I
            }
        }

-        return RedstoneControlMode.isConditionMet(mode, externalSignal);
-    }
-
-    @Override
-    protected ConnectionMode getDefaultConnectionMode() {
-        return ConnectionMode.INPUT;
+        return mode.isConditionMet(mode, externalSignal);
    }

    @Override
@@ -202,8 +190,8 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I

    @Override
    protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) {
-        setExtractionSignalColor(dir, DyeColor.VALUES[dataRoot.getShort("extractionSignalColor")]);
-        setExtractionRedstoneMode(RedstoneControlMode.VALUES[dataRoot.getShort("extractionRedstoneMode")], dir);
+        setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]);
+        setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir);
    }

    @Override
@@ -239,15 +227,15 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I
            String key = "extRM." + dir.name();
            if (nbtRoot.hasKey(key)) {
                short ord = nbtRoot.getShort(key);
-                if (ord >= 0 && ord < RedstoneControlMode.VALUES.length) {
-                    extractionModes.put(dir, RedstoneControlMode.VALUES[ord]);
+                if (ord >= 0 && ord < RedstoneControlMode.values().length) {
+                    extractionModes.put(dir, RedstoneControlMode.values()[ord]);
                }
            }
            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]);
                }
            }
        }