Add distance limit for out-of-range message

Also fix the check so that we only display the message for travel anchors within the angle limit.

.editorconfig

@@ -18,5 +18,9 @@ end_of_line = crlf
 [*.{dtd,json,info,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}]
 indent_size = 2
 
+[*.java]
+indent_size = 2
+ij_java_space_before_if_parentheses = false
+
 [*.lang]
 trim_trailing_whitespace = false

.git-blame-ignore-revs

@@ -1,2 +0,0 @@
-# Ignore spotlessApply reformat
-275d137ba8573454518c21bdcf4372362302ee82

.gitattributes

@@ -34,6 +34,7 @@
 *.[pP][sS][dD]          binary
 *.[tT][tT][fF]          binary
 *.[oO][tT][fF]          binary
+*.[nN][bB][tT]          binary
 
 *.[pP][aA][tT][cC][hH]  -text
 

.github/scripts/test-no-error-reports.sh

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

.github/workflows/build-and-test.yml

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

.github/workflows/optimize-images.yml

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

.gitignore

@@ -27,5 +27,3 @@ whitelist.json
 *.iws
 src/main/resources/mixins.*.json
 *.bat
-layout.json
-.DS_Store

dependencies.gradle

@@ -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('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
+    compile('com.github.GTNewHorizons:EnderCore:0.2.9:dev')
+    compile('com.github.GTNewHorizons:ForestryMC:4.4.6:dev')
+    compile('com.github.GTNewHorizons:NotEnoughItems:2.3.7-GTNH:dev')
+    compile('com.github.GTNewHorizons:BuildCraft:7.1.27:dev')
+    compile('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.19:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-85-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}
+    compile('com.github.GTNewHorizons:Chisel:2.10.8-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.7.5.25-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'))
 }

gradle.properties

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

gradle/gradle-daemon-jvm.properties

@@ -1,12 +0,0 @@
-#This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/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

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,114 +15,81 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       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
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
-# 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_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# 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
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -131,118 +98,88 @@ Please set the JAVA_HOME variable in your environment to match the
 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.
+    JAVACMD="java"
+    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.
-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
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi
 
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
 
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
 
-# 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.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -13,10 +13,8 @@
 @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
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -27,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -43,13 +40,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "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,33 +56,32 @@ 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
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

repositories.gradle

@@ -1,4 +1,26 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
+    maven {
+        name 'GTNH Maven'
+        url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
+        allowInsecureProtocol
+    }
+    maven {
+        name 'ic2'
+        url 'http://maven.ic2.player.to/'
+        metadataSources {
+            mavenPom()
+            artifact()
+        }
+    }
+    maven {
+        url 'https://cursemaven.com'
+        content {
+            includeGroup 'curse.maven'
+        }
+    }
+    maven {
+        url = 'https://jitpack.io'
+    }
 }

settings.gradle

@@ -1,23 +1,10 @@
-
-pluginManagement {
-    repositories {
-        maven {
-            // RetroFuturaGradle
-            name "GTNH Maven"
-            url "https://nexus.gtnewhorizons.com/repository/public/"
-            mavenContent {
-                includeGroup("com.gtnewhorizons")
-                includeGroupByRegex("com\\.gtnewhorizons\\..+")
-            }
-        }
-        gradlePluginPortal()
-        mavenCentral()
-        mavenLocal()
-    }
-}
-
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.29'
+    id 'com.diffplug.blowdryerSetup' version '1.6.0'
 }
 
+apply plugin: 'com.diffplug.blowdryerSetup'
 
+blowdryerSetup {
+    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.4')
+    //devLocal '.' // Use this when testing config updates locally
+}

src/main/java/crazypants/enderio/BlockEio.java

@@ -1,17 +1,15 @@
 package crazypants.enderio;
 
+import com.enderio.core.common.BlockEnder;
+import crazypants.enderio.api.tool.ITool;
+import crazypants.enderio.machine.AbstractMachineEntity;
+import crazypants.enderio.tool.ToolUtil;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import com.enderio.core.common.BlockEnder;
-
-import crazypants.enderio.api.tool.ITool;
-import crazypants.enderio.machine.AbstractMachineEntity;
-import crazypants.enderio.tool.ToolUtil;
-
 public abstract class BlockEio extends BlockEnder {
 
     protected BlockEio(String name, Class<? extends TileEntityEio> teClass) {
@@ -25,8 +23,8 @@ public abstract class BlockEio extends BlockEnder {
     }
 
     @Override
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7,
-            float par8, float par9) {
+    public boolean onBlockActivated(
+            World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) {
 
         if (shouldWrench(world, x, y, z, entityPlayer, side)
                 && ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) {
@@ -35,7 +33,8 @@ public abstract class BlockEio extends BlockEnder {
         TileEntity te = world.getTileEntity(x, y, z);
 
         ITool tool = ToolUtil.getEquippedTool(entityPlayer);
-        if (tool != null && !entityPlayer.isSneaking()
+        if (tool != null
+                && !entityPlayer.isSneaking()
                 && tool.canUse(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z)) {
             if (te instanceof AbstractMachineEntity) {
                 ((AbstractMachineEntity) te).toggleIoModeForFace(ForgeDirection.getOrientation(side));

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

@@ -1,23 +1,7 @@
 package crazypants.enderio;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-import net.minecraftforge.client.MinecraftForgeClient;
-import net.minecraftforge.common.MinecraftForge;
-
 import com.enderio.core.client.handlers.SpecialTooltipHandler;
 import com.enderio.core.client.render.IconUtil;
-
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
@@ -27,29 +11,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 +97,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;
@@ -135,6 +132,22 @@ import crazypants.enderio.teleport.telepad.TelePadRenderer;
 import crazypants.enderio.teleport.telepad.TelePadSpecialRenderer;
 import crazypants.enderio.teleport.telepad.TeleportEntityRenderHandler;
 import crazypants.enderio.teleport.telepad.TileTelePad;
+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;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import net.minecraftforge.client.MinecraftForgeClient;
+import net.minecraftforge.common.MinecraftForge;
 
 @SideOnly(Side.CLIENT)
 public class ClientProxy extends CommonProxy {
@@ -150,6 +163,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 +255,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,17 +273,14 @@ 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<>(
-                new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()),
-                defaultObeliskRenderer);
+        ObeliskSpecialRenderer<TileAttractor> attRen = new ObeliskSpecialRenderer<TileAttractor>(
+                new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()), defaultObeliskRenderer);
         ClientRegistry.bindTileEntitySpecialRenderer(TileAttractor.class, attRen);
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockAttractor), attRen);
 
@@ -276,22 +288,19 @@ public class ClientProxy extends CommonProxy {
         ClientRegistry.bindTileEntitySpecialRenderer(TileAversionObelisk.class, sgr);
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockSpawnGuard), sgr);
 
-        ObeliskSpecialRenderer<TileExperienceObelisk> eor = new ObeliskSpecialRenderer<>(
-                new ItemStack(EnderIO.itemXpTransfer),
-                defaultObeliskRenderer);
+        ObeliskSpecialRenderer<TileExperienceObelisk> eor = new ObeliskSpecialRenderer<TileExperienceObelisk>(
+                new ItemStack(EnderIO.itemXpTransfer), defaultObeliskRenderer);
         ClientRegistry.bindTileEntitySpecialRenderer(TileExperienceObelisk.class, eor);
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockExperianceOblisk), eor);
 
-        ObeliskSpecialRenderer<TileWeatherObelisk> twr = new WeatherObeliskSpecialRenderer(
-                new ItemStack(Items.fireworks),
-                defaultObeliskRenderer);
+        ObeliskSpecialRenderer<TileWeatherObelisk> twr =
+                new WeatherObeliskSpecialRenderer(new ItemStack(Items.fireworks), defaultObeliskRenderer);
         ClientRegistry.bindTileEntitySpecialRenderer(TileWeatherObelisk.class, twr);
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockWeatherObelisk), twr);
 
         BlockCombustionGenerator.renderId = RenderingRegistry.getNextAvailableRenderId();
-        TechneMachineRenderer<TileCombustionGenerator> cr = new TechneMachineRenderer<>(
-                EnderIO.blockCombustionGenerator,
-                "models/combustionGen");
+        TechneMachineRenderer<TileCombustionGenerator> cr = new TechneMachineRenderer<TileCombustionGenerator>(
+                EnderIO.blockCombustionGenerator, "models/combustionGen");
         RenderingRegistry.registerBlockHandler(cr);
 
         ZombieGeneratorRenderer zgr = new ZombieGeneratorRenderer();
@@ -305,7 +314,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 +331,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);
@@ -353,8 +369,8 @@ public class ClientProxy extends CommonProxy {
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockTravelPlatform), pir);
 
         BlockPaintedGlowstone.renderId = RenderingRegistry.getNextAvailableRenderId();
-        RenderingRegistry
-                .registerBlockHandler(new PaintedBlockRenderer(BlockPaintedGlowstone.renderId, Blocks.glowstone));
+        RenderingRegistry.registerBlockHandler(
+                new PaintedBlockRenderer(BlockPaintedGlowstone.renderId, Blocks.glowstone));
 
         BlockTravelAnchor.renderId = RenderingRegistry.getNextAvailableRenderId();
         RenderingRegistry.registerBlockHandler(
@@ -364,7 +380,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 +387,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,12 +396,26 @@ 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);
 
-        ClientRegistry
-                .bindTileEntitySpecialRenderer(TileReservoir.class, new ReservoirRenderer(EnderIO.blockReservoir));
+        ClientRegistry.bindTileEntitySpecialRenderer(
+                TileReservoir.class, new ReservoirRenderer(EnderIO.blockReservoir));
         ClientRegistry.bindTileEntitySpecialRenderer(TileTank.class, new TankFluidRenderer());
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockTank), new TankItemRenderer());
 
@@ -414,7 +444,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 +473,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

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

@@ -1,33 +1,26 @@
 package crazypants.enderio;
 
+import cpw.mods.fml.common.FMLCommonHandler;
+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.IConduit;
+import crazypants.enderio.conduit.render.ConduitRenderer;
+import java.text.DecimalFormat;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 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 +32,6 @@ public class CommonProxy {
         return null;
     }
 
-    @Deprecated
     public ConduitRenderer getRendererForConduit(IConduit conduit) {
         return null;
     }
@@ -49,7 +41,7 @@ public class CommonProxy {
     }
 
     public void loadIcons() {
-
+        ;
     }
 
     public void load() {
@@ -81,26 +73,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

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

@@ -4,27 +4,9 @@ import static crazypants.enderio.EnderIO.MODID;
 import static crazypants.enderio.EnderIO.MOD_NAME;
 import static crazypants.enderio.EnderIO.VERSION;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.Locale;
-
-import net.minecraft.block.material.Material;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.WeightedRandomChestContent;
-import net.minecraftforge.common.ChestGenHooks;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.world.WorldEvent;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
-
 import com.enderio.core.common.Lang;
 import com.enderio.core.common.util.EntityUtil;
 import com.google.common.collect.ImmutableList;
-
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
@@ -38,7 +20,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 +28,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 +44,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 +92,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 +113,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;
@@ -181,25 +162,35 @@ import crazypants.enderio.teleport.telepad.ItemCoordSelector;
 import crazypants.enderio.thaumcraft.ThaumcraftCompat;
 import crazypants.enderio.tool.EnderIOCrashCallable;
 import crazypants.util.EE3Util;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Locale;
+import net.minecraft.block.material.Material;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.WeightedRandomChestContent;
+import net.minecraftforge.common.ChestGenHooks;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.WorldEvent;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
 
-@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;
@@ -213,13 +204,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;
     public static ItemAlloy itemAlloy;
@@ -275,7 +259,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 +273,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 +383,7 @@ public class EnderIO {
 
         blockCrusher = BlockCrusher.create();
         blockAlloySmelter = BlockAlloySmelter.create();
+        blockCapacitorBank = BlockCapacitorBank.create();
         blockCapBank = BlockCapBank.create();
 
         blockPainter = BlockPainter.create();
@@ -479,7 +464,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 +476,7 @@ public class EnderIO {
         itemGrindingBall = ItemGrindingBall.create();
         itemAlloyEndergy = ItemAlloyEndergy.create();
         itemGrindingBallEndergy = ItemGrindingBallEndergy.create();
-        if (!hasGT5) {
-            itemPowderIngot = ItemPowderIngot.create();
-        }
+        itemPowderIngot = ItemPowderIngot.create();
 
         registerFluids();
 
@@ -536,14 +518,11 @@ public class EnderIO {
         Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION).setDensity(1500).setViscosity(3000);
         FluidRegistry.registerFluid(f);
         fluidNutrientDistillation = FluidRegistry.getFluid(f.getName());
-        blockNutrientDistillation = BlockFluidEio.NutrientDistillation
-                .create(fluidNutrientDistillation, Material.water);
+        blockNutrientDistillation =
+                BlockFluidEio.NutrientDistillation.create(fluidNutrientDistillation, Material.water);
 
         PacketHandler.INSTANCE.registerMessage(
-                PacketNutrientTank.class,
-                PacketNutrientTank.class,
-                PacketHandler.nextID(),
-                Side.CLIENT);
+                PacketNutrientTank.class, PacketNutrientTank.class, PacketHandler.nextID(), Side.CLIENT);
 
         f = new Fluid(Fluids.HOOTCH).setDensity(900).setViscosity(1000);
         FluidRegistry.registerFluid(f);
@@ -566,7 +545,9 @@ public class EnderIO {
                 Fluids.ROCKET_FUEL + "@"
                         + (Config.rocketFuelPowerPerCycleRF / 10 * Config.rocketFuelPowerTotalBurnTime));
 
-        f = new Fluid(Fluids.FIRE_WATER).setDensity(900).setViscosity(1000)
+        f = new Fluid(Fluids.FIRE_WATER)
+                .setDensity(900)
+                .setViscosity(1000)
                 .setTemperature(FluidRegistry.LAVA.getTemperature() * 2);
         FluidRegistry.registerFluid(f);
         fluidFireWater = FluidRegistry.getFluid(f.getName());
@@ -590,15 +571,22 @@ public class EnderIO {
         f = new Fluid(Fluids.CLOUD_SEED_CONCENTRATED).setDensity(1000).setViscosity(1200);
         FluidRegistry.registerFluid(f);
         fluidCloudSeedConcentrated = FluidRegistry.getFluid(f.getName());
-        blockCloudSeedConcentrated = BlockFluidEio.CloudSeedConcentrated
-                .create(fluidCloudSeedConcentrated, Material.water);
+        blockCloudSeedConcentrated =
+                BlockFluidEio.CloudSeedConcentrated.create(fluidCloudSeedConcentrated, Material.water);
 
-        f = new Fluid(Fluids.ENDER_DISTILLATION).setDensity(200).setViscosity(1000).setTemperature(175);
+        f = new Fluid(Fluids.ENDER_DISTILLATION)
+                .setDensity(200)
+                .setViscosity(1000)
+                .setTemperature(175);
         FluidRegistry.registerFluid(f);
         fluidEnderDistillation = FluidRegistry.getFluid(f.getName());
         blockEnderDistillation = BlockFluidEio.create(fluidEnderDistillation, Material.water);
 
-        f = new Fluid(Fluids.VAPOR_OF_LEVITY).setDensity(-10).setViscosity(100).setTemperature(5).setGaseous(true);
+        f = new Fluid(Fluids.VAPOR_OF_LEVITY)
+                .setDensity(-10)
+                .setViscosity(100)
+                .setTemperature(5)
+                .setGaseous(true);
         FluidRegistry.registerFluid(f);
         fluidVapourOfLevity = FluidRegistry.getFluid(f.getName());
         blockVapourOfLevity = BlockFluidEio.VapourOfLevity.create(fluidVapourOfLevity, Material.water);
@@ -606,7 +594,10 @@ public class EnderIO {
 
         if (!Loader.isModLoaded("OpenBlocks")) {
             Log.info("XP Juice registered by Ender IO.");
-            fluidXpJuice = new Fluid(Config.xpJuiceName).setLuminosity(10).setDensity(800).setViscosity(1500)
+            fluidXpJuice = new Fluid(Config.xpJuiceName)
+                    .setLuminosity(10)
+                    .setDensity(800)
+                    .setViscosity(1500)
                     .setUnlocalizedName("eio.xpjuice");
             FluidRegistry.registerFluid(fluidXpJuice);
             itemBucketXpJuice = ItemBucketEio.create(fluidXpJuice);
@@ -633,22 +624,16 @@ public class EnderIO {
         instance = this;
 
         PacketHandler.INSTANCE.registerMessage(
-                PacketRedstoneMode.class,
-                PacketRedstoneMode.class,
-                PacketHandler.nextID(),
-                Side.SERVER);
+                PacketRedstoneMode.class, PacketRedstoneMode.class, PacketHandler.nextID(), Side.SERVER);
 
         NetworkRegistry.INSTANCE.registerGuiHandler(this, guiHandler);
         MinecraftForge.EVENT_BUS.register(this);
 
         // Register Custom Dungeon Loot here
         if (Config.lootDarkSteel) {
-            ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(
-                    new WeightedRandomChestContent(
-                            new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()),
-                            1,
-                            3,
-                            15));
+            ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST)
+                    .addItem(new WeightedRandomChestContent(
+                            new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()), 1, 3, 15));
         }
 
         if (Config.lootItemConduitProbe) {
@@ -672,48 +657,33 @@ public class EnderIO {
         }
 
         if (Config.lootElectricSteel) {
-            ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(
-                    new WeightedRandomChestContent(
-                            new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()),
-                            2,
-                            6,
-                            20));
+            ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH)
+                    .addItem(new WeightedRandomChestContent(
+                            new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()), 2, 6, 20));
         }
 
         if (Config.lootRedstoneAlloy) {
-            ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(
-                    new WeightedRandomChestContent(
-                            new ItemStack(EnderIO.itemAlloy, 1, Alloy.REDSTONE_ALLOY.ordinal()),
-                            3,
-                            6,
-                            35));
+            ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH)
+                    .addItem(new WeightedRandomChestContent(
+                            new ItemStack(EnderIO.itemAlloy, 1, Alloy.REDSTONE_ALLOY.ordinal()), 3, 6, 35));
         }
 
         if (Config.lootDarkSteel) {
-            ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(
-                    new WeightedRandomChestContent(
-                            new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()),
-                            3,
-                            6,
-                            35));
+            ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH)
+                    .addItem(new WeightedRandomChestContent(
+                            new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()), 3, 6, 35));
         }
 
         if (Config.lootPhasedIron) {
-            ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(
-                    new WeightedRandomChestContent(
-                            new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_IRON.ordinal()),
-                            1,
-                            2,
-                            10));
+            ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH)
+                    .addItem(new WeightedRandomChestContent(
+                            new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_IRON.ordinal()), 1, 2, 10));
         }
 
         if (Config.lootPhasedGold) {
-            ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(
-                    new WeightedRandomChestContent(
-                            new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal()),
-                            1,
-                            2,
-                            5));
+            ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH)
+                    .addItem(new WeightedRandomChestContent(
+                            new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal()), 1, 2, 5));
         }
 
         if (Config.lootTravelStaff) {
@@ -734,9 +704,7 @@ public class EnderIO {
             SkeletonHandler.registerSkeleton(this);
         }
 
-        if (!hasGT5) {
-            MaterialRecipes.registerDependantOresInDictionary();
-        }
+        MaterialRecipes.registerDependantOresInDictionary();
 
         EnderfaceRecipes.addRecipes();
         MaterialRecipes.addRecipes();
@@ -802,8 +770,8 @@ public class EnderIO {
 
     @EventHandler
     public void loadComplete(FMLLoadCompleteEvent event) {
-        processImc(FMLInterModComms.fetchRuntimeMessages(this)); // Some mods send IMCs during PostInit, so we catch
-        // them here.
+        processImc(FMLInterModComms.fetchRuntimeMessages(
+                this)); // Some mods send IMCs during PostInit, so we catch them here.
     }
 
     private static String getXPJuiceName() {
@@ -812,7 +780,8 @@ public class EnderIO {
         try {
             Field getField = Class.forName("openblocks.Config").getField("xpFluidId");
             openBlocksXPJuiceName = (String) getField.get(null);
-        } catch (Exception e) {}
+        } catch (Exception e) {
+        }
 
         if (openBlocksXPJuiceName != null && !Config.xpJuiceName.equals(openBlocksXPJuiceName)) {
             Log.info("Overwriting XP Juice name with '" + openBlocksXPJuiceName + "' taken from OpenBlocks' config");
@@ -822,6 +791,7 @@ public class EnderIO {
         return Config.xpJuiceName;
     }
 
+    @SuppressWarnings("unchecked")
     private void addModIntegration() {
 
         if (Loader.isModLoaded("TConstruct")) {
@@ -832,7 +802,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 +810,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 +868,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 +895,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();
-        }
-    }
 }

src/main/java/crazypants/enderio/EnderIOTab.java

@@ -2,11 +2,10 @@ package crazypants.enderio;
 
 import static crazypants.enderio.EnderIO.MODID;
 
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
 
 public class EnderIOTab extends CreativeTabs {
 

src/main/java/crazypants/enderio/GuiHandler.java

@@ -1,14 +1,12 @@
 package crazypants.enderio;
 
+import cpw.mods.fml.common.network.IGuiHandler;
 import java.util.HashMap;
 import java.util.Map;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import cpw.mods.fml.common.network.IGuiHandler;
-
 public class GuiHandler implements IGuiHandler {
 
     public static final int GUI_ID_ENDERFACE = 1;
@@ -60,7 +58,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);

src/main/java/crazypants/enderio/Log.java

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

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

@@ -1,7 +1,6 @@
 package crazypants.enderio;
 
 public enum ModObject {
-
     // Enderface
     blockEnderIo,
     itemEnderface,
@@ -18,7 +17,6 @@ public enum ModObject {
     itemBasicFilterUpgrade,
     itemBigFilterUpgrade,
     itemExistingItemFilter,
-    itemLimitedItemFilter,
     itemModItemFilter,
     itemPowerItemFilter,
     itemExtractSpeedUpgrade,
@@ -55,6 +53,7 @@ public enum ModObject {
     blockReservoir,
     blockAlloySmelter,
     blockSolarPanel,
+    blockCapacitorBank,
     blockCapBank,
     blockSagMill,
     blockHyperCube,

src/main/java/crazypants/enderio/api/IMC.java

@@ -14,103 +14,119 @@ import crazypants.enderio.machine.vat.VatRecipeManager;
 import crazypants.enderio.teleport.TravelController;
 
 /**
- * This class provides the keys for the IMC messages supported by EIO and links the the details of how the messages are
- * processed. It is preferable not to refer to these constants directly to avoid a dependence on this class.
+ * This class provides the keys for the IMC messages supported by EIO and links
+ * the the details of how the messages are processed. It is preferable not to
+ * refer to these constants directly to avoid a dependence on this class.
  */
 public final class IMC {
 
     /**
-     * Key for a string message to add Vat recipes. Calls {@link VatRecipeManager#addCustomRecipes(String)} with the
-     * string value of the message.
+     * Key for a string message to add Vat recipes. Calls
+     * {@link VatRecipeManager#addCustomRecipes(String)} with the string value of
+     * the message.
      */
     public static final String VAT_RECIPE = "recipe:vat";
 
     /**
-     * Key for a string message to add SAGMill recipes. Calls {@link CrusherRecipeManager#addCustomRecipes(String)} with
-     * the string value of the message.
+     * Key for a string message to add SAGMill recipes. Calls
+     * {@link CrusherRecipeManager#addCustomRecipes(String)} with the string value
+     * of the message.
      */
     public static final String SAG_RECIPE = "recipe:sagmill";
 
     /**
-     * Key for a string message to add Alloy Smelter recipes. Calls {@link AlloyRecipeManager#addCustomRecipes(String)}
-     * with the string value of the message.
+     * Key for a string message to add Alloy Smelter recipes. Calls
+     * {@link AlloyRecipeManager#addCustomRecipes(String)} with the string value
+     * of the message.
      */
     public static final String ALLOY_RECIPE = "recipe:alloysmelter";
 
     /**
-     * Key for a string message to add Enchanter recipes. Calls {@link EnchanterRecipeManager#addCustomRecipes(String)}
-     * with the string value of the message. The supplied xml is treated as if it was loaded from
+     * Key for a string message to add Enchanter recipes. Calls
+     * {@link EnchanterRecipeManager#addCustomRecipes(String)} with the string
+     * value of the message. The supplied xml is treated as if it was loaded from
      * EnchanterRecipes_User.xm.
      */
     public static final String ENCHANTER_RECIPE = "recipe:enchanter";
 
     /**
      * Key for a string message to add Slice'N'Splice recipes. Calls
-     * {@link SliceAndSpliceRecipeManager#addCustomRecipes(String)} with the string value of the message.
+     * {@link SliceAndSpliceRecipeManager#addCustomRecipes(String)} with the
+     * string value of the message.
      */
     public static final String SLINE_N_SPLICE_RECIPE = "recipe:slicensplice";
 
     /**
      * Key for an NBT message to add Soul Binder recipes. Calls
-     * {@link SoulBinderRecipeManager#addRecipeFromNBT(net.minecraft.nbt.NBTTagCompound)} with the NBT value of the
-     * message.
+     * {@link SoulBinderRecipeManager#addRecipeFromNBT(net.minecraft.nbt.NBTTagCompound)}
+     * with the NBT value of the message.
      */
     public static final String SOUL_BINDER_RECIPE = "recipe:soulbinder";
 
     /**
-     * Key for an ItemStack message to add an item to the Painters paint source whitelist. Calls
+     * Key for an ItemStack message to add an item to the Painters paint source
+     * whitelist. Calls
      * {@link PaintSourceValidator#addToWhitelist(net.minecraft.item.ItemStack)}
      */
     public static final String PAINTER_WHITELIST_ADD = "painter:whitelist:add";
 
     /**
-     * Key for an ItemStack message to add an item to the Painters paint source blacklist. Calls
+     * Key for an ItemStack message to add an item to the Painters paint source
+     * blacklist. Calls
      * {@link PaintSourceValidator#addToBlacklist(net.minecraft.item.ItemStack)}
      */
     public static final String PAINTER_BLACKLIST_ADD = "painter:blacklist:add";
 
     /**
-     * Key for a string message to add an entity to the Powered Spawner blacklist. Calls
-     * {@link PoweredSpawnerConfig#addToBlacklist(String)} with the string value of the message.
+     * Key for a string message to add an entity to the Powered Spawner blacklist.
+     * Calls {@link PoweredSpawnerConfig#addToBlacklist(String)} with the string
+     * value of the message.
      */
     public static final String POWERED_SPAWNER_BLACKLIST_ADD = "poweredSpawner:blacklist:add";
 
     /**
-     * Key for an NBT message to specify a cost multiplier for spawning an entity in the Powered Spawner. Calls
-     * {@link PoweredSpawnerConfig#addEntityCostFromNBT(net.minecraft.nbt.NBTTagCompound)} with the NBT value of the
-     * message.
+     * Key for an NBT message to specify a cost multiplier for spawning an entity
+     * in the Powered Spawner. Calls
+     * {@link PoweredSpawnerConfig#addEntityCostFromNBT(net.minecraft.nbt.NBTTagCompound)}
+     * with the NBT value of the message.
      */
     public static final String POWERED_SPAWNER_COST_MULTIPLIER = "poweredSpawner:costMultiplier";
 
     /**
      * Key for a string message to add an entity to the Soul Vial blacklist. Calls
-     * {@link ItemSoulVessel#addEntityToBlackList(String)} with the string value of the message.
+     * {@link ItemSoulVessel#addEntityToBlackList(String)} with the string value
+     * of the message.
      */
     public static final String SOUL_VIAL_BLACKLIST = "soulVial:blacklist:add";
 
     /**
      * Key for an NBT message to register a fluid fuel. Calls
-     * {@link FluidFuelRegister#addFuel(net.minecraft.nbt.NBTTagCompound)} with the NBT value of the message.
+     * {@link FluidFuelRegister#addFuel(net.minecraft.nbt.NBTTagCompound)} with
+     * the NBT value of the message.
      */
     public static final String FLUID_FUEL_ADD = "fluidFuel:add";
 
     /**
      * Key for an NBT message to register a fluid coolant. Calls
-     * {@link FluidFuelRegister#addCoolant(net.minecraft.nbt.NBTTagCompound)} with the NBT value of the message.
+     * {@link FluidFuelRegister#addCoolant(net.minecraft.nbt.NBTTagCompound)} with
+     * the NBT value of the message.
      */
     public static final String FLUID_COOLANT_ADD = "fluidCoolant:add";
 
     /**
-     * Key for a string message to add a block to the list of blocks that cannot be teleported through using the Staff
-     * of Travel or Dark Steel Travel Upgrade. Value must be in the form: 'modid:blockName' Calls
-     * {@link TravelController#addBlockToBlinkBlackList(String)} with the string value of the message.
+     * Key for a string message to add a block to the list of blocks that cannot
+     * be teleported through using the Staff of Travel or Dark Steel Travel
+     * Upgrade. Value must be in the form: 'modid:blockName' Calls
+     * {@link TravelController#addBlockToBlinkBlackList(String)} with the string
+     * value of the message.
      */
     public static final String TELEPORT_BLACKLIST_ADD = "teleport:blacklist:add";
 
     /**
-     * Key for an NBT message to register a block or tile entity as connectable to insulated redstone conduits. Calls
-     * {@link InsulatedRedstoneConduit#addConnectableBlock(net.minecraft.nbt.NBTTagCompound)} with the NBT value of the
-     * message.
+     * Key for an NBT message to register a block or tile entity as connectable to
+     * insulated redstone conduits. Calls
+     * {@link InsulatedRedstoneConduit#addConnectableBlock(net.minecraft.nbt.NBTTagCompound)}
+     * with the NBT value of the message.
      */
     public static final String REDSTONE_CONNECTABLE_ADD = "redstone:connectable:add";
 

src/main/java/crazypants/enderio/api/redstone/IRedstoneConnectable.java

@@ -4,8 +4,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 /**
- * Implement this on your Block or TileEntity to control whether insulated restone conduits will automatically connect
- * to your block.
+ * Implement this on your Block or TileEntity to control whether insulated
+ * restone conduits will automatically connect to your block.
  * <p>
  * Implementing on both is not recommended and will likely not work as expected.
  */

src/main/java/crazypants/enderio/api/teleport/IItemOfTravel.java

@@ -1,27 +1,12 @@
 package crazypants.enderio.api.teleport;
 
+import cofh.api.energy.IEnergyContainerItem;
 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;
-    }
-
-    default boolean isTeleportStaff(EntityPlayer player, ItemStack stack) {
-        return false;
-    }
 }

src/main/java/crazypants/enderio/api/teleport/ITelePad.java

@@ -1,16 +1,14 @@
 package crazypants.enderio.api.teleport;
 
-import javax.annotation.Nullable;
-
-import net.minecraft.entity.Entity;
-
 import com.enderio.core.common.util.BlockCoord;
+import javax.annotation.Nullable;
+import net.minecraft.entity.Entity;
 
 public interface ITelePad extends ITravelAccessable {
 
     /**
-     * If this piece of the telepad is the master, meaning it is connected on all 4 sides. This does <i>not</i>
-     * guarantee that it is in a connected state.
+     * If this piece of the telepad is the master, meaning it is connected on all
+     * 4 sides. This does <i>not</i> guarantee that it is in a connected state.
      *
      * @return True if this TE is the master TE, false otherwise.
      */
@@ -19,74 +17,88 @@ public interface ITelePad extends ITravelAccessable {
     /**
      * Gets the master telepad that this one is connected to.
      *
-     * @return The master telepad TE. {@code null} if not in a network. Itself if it is the master.
+     * @return The master telepad TE. {@code null} if not in a network. Itself if
+     *         it is the master.
      */
     @Nullable
     ITelePad getMaster();
 
     /**
-     * If this telepad piece is in a network, meaning it is connected and in a valid configuration.
+     * If this telepad piece is in a network, meaning it is connected and in a
+     * valid configuration.
      *
      * @return True if this TE is in a network, false otherwise.
      */
     boolean inNetwork();
 
     /**
-     * The X coordinate stored in this telepad network. Always 0 if this is {@link #inNetwork()} returns false.
+     * The X coordinate stored in this telepad network. Always 0 if this is
+     * {@link #inNetwork()} returns false.
      *
      * @return The target X coordinate.
      */
     int getX();
 
     /**
-     * The Y coordinate stored in this telepad network. Always 0 if this is {@link #inNetwork()} returns false.
+     * The Y coordinate stored in this telepad network. Always 0 if this is
+     * {@link #inNetwork()} returns false.
      *
      * @return The target Y coordinate.
      */
     int getY();
 
     /**
-     * The Z coordinate stored in this telepad network. Always 0 if this is {@link #inNetwork()} returns false.
+     * The Z coordinate stored in this telepad network. Always 0 if this is
+     * {@link #inNetwork()} returns false.
      *
      * @return The target Z coordinate.
      */
     int getZ();
 
     /**
-     * The target dimension ID for the telepad. Defaults to the dimension the block is placed in.
+     * The target dimension ID for the telepad. Defaults to the dimension the
+     * block is placed in.
      *
      * @return An int dimension ID.
      */
     int getTargetDim();
 
     /**
-     * Sets the target X coordinate of the network. Has no effect if {@link #inNetwork()} returns false.
+     * Sets the target X coordinate of the network. Has no effect if
+     * {@link #inNetwork()} returns false.
      *
-     * @param x The X coord.
+     * @param x
+     *          The X coord.
      * @return The master telepad TE. DOES NOT ALWAYS return itself.
      */
     ITelePad setX(int x);
 
     /**
-     * Sets the target Y coordinate of the network. Has no effect if {@link #inNetwork()} returns false.
+     * Sets the target Y coordinate of the network. Has no effect if
+     * {@link #inNetwork()} returns false.
      *
-     * @param y The Y coord.
+     * @param y
+     *          The Y coord.
      * @return The master telepad TE. DOES NOT ALWAYS return itself.
      */
     ITelePad setY(int y);
 
     /**
-     * Sets the target Z coordinate of the network. Has no effect if {@link #inNetwork()} returns false.
+     * Sets the target Z coordinate of the network. Has no effect if
+     * {@link #inNetwork()} returns false.
      *
-     * @param z The Z coord.
+     * @param z
+     *          The Z coord.
      * @return The master telepad TE. DOES NOT ALWAYS return itself.
      */
     ITelePad setZ(int z);
 
     /**
-     * Sets the target dimension of the network. Has no effect if {@link #inNetwork()} returns false.
+     * Sets the target dimension of the network. Has no effect if
+     * {@link #inNetwork()} returns false.
      *
-     * @param dimID The dimension ID.
+     * @param dimID
+     *          The dimension ID.
      * @return The master telepad TE. DOES NOT ALWAYS return itself.
      */
     ITelePad setTargetDim(int dimID);
@@ -94,10 +106,12 @@ 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);
 
@@ -108,12 +122,14 @@ public interface ITelePad extends ITravelAccessable {
      * <li>There is sufficient power to perform the operation</li>
      * </ul>
      *
-     * @param entity The entity to teleport
+     * @param entity
+     *          The entity to teleport
      */
     void teleportSpecific(Entity entity);
 
     /**
-     * Teleports all entities in range (in no particular order) until either there are none left or the power runs out.
+     * Teleports all entities in range (in no particular order) until either there
+     * are none left or the power runs out.
      */
     void teleportAll();
 }

src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java

@@ -1,16 +1,12 @@
 package crazypants.enderio.api.teleport;
 
+import com.enderio.core.common.util.BlockCoord;
+import crazypants.util.UserIdent;
 import java.util.UUID;
-
 import javax.annotation.Nonnull;
-
 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 {
 
     enum AccessMode {

src/main/java/crazypants/enderio/api/teleport/TeleportEntityEvent.java

@@ -1,10 +1,9 @@
 package crazypants.enderio.api.teleport;
 
+import cpw.mods.fml.common.eventhandler.Cancelable;
 import net.minecraft.entity.Entity;
 import net.minecraftforge.event.entity.EntityEvent;
 
-import cpw.mods.fml.common.eventhandler.Cancelable;
-
 /**
  * An event that can be used to respond to, edit, and prevent entity teleports.
  * <p>
@@ -14,8 +13,10 @@ 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.
+ *
+ * As well as any externally added teleports, assuming they fire this event
+ * manually.
+ *
  */
 @Cancelable
 public class TeleportEntityEvent extends EntityEvent {
@@ -30,10 +31,14 @@ public class TeleportEntityEvent extends EntityEvent {
     /**
      * Fired before an entity teleports to the given location.
      *
-     * @param entity The entity teleporting
-     * @param x      The target X coord
-     * @param y      The target Y coord
-     * @param z      The target Z coord
+     * @param entity
+     *          The entity teleporting
+     * @param x
+     *          The target X coord
+     * @param y
+     *          The target Y coord
+     * @param z
+     *          The target Z coord
      */
     public TeleportEntityEvent(Entity entity, TravelSource source, int x, int y, int z) {
         super(entity);

src/main/java/crazypants/enderio/api/teleport/TravelSource.java

@@ -1,25 +1,21 @@
 package crazypants.enderio.api.teleport;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.teleport.TravelController;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
 
 public enum TravelSource {
-
     BLOCK() {
-
         @Override
         public int getMaxDistanceTravelled() {
             return Config.travelAnchorMaxDistance;
         }
     },
     STAFF() {
-
         @Override
         public int getMaxDistanceTravelled() {
             return Config.travelStaffMaxDistance;
@@ -31,7 +27,6 @@ public enum TravelSource {
         }
     },
     STAFF_BLINK() {
-
         @Override
         public int getMaxDistanceTravelled() {
             return Config.travelStaffMaxBlinkDistance;
@@ -44,7 +39,6 @@ public enum TravelSource {
     },
 
     TELEPORT_STAFF() {
-
         @Override
         public int getMaxDistanceTravelled() {
             return Config.teleportStaffMaxDistance;
@@ -56,7 +50,6 @@ public enum TravelSource {
         }
     },
     TELEPORT_STAFF_BLINK() {
-
         @Override
         public int getMaxDistanceTravelled() {
             return Config.teleportStaffMaxBlinkDistance;
@@ -81,7 +74,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 {

src/main/java/crazypants/enderio/api/tool/IConduitControl.java

@@ -9,11 +9,15 @@ import net.minecraft.item.ItemStack;
 public interface IConduitControl extends IHideFacades {
 
     /**
-     * Controls whether the overlay is shown and the player can change the display mode.
+     * Controls whether the overlay is shown and the player can change the display
+     * mode.
      *
-     * @param stack  The itemstack
-     * @param player The player holding the itemstack
-     * @return True if the overlay should be rendered and the player should be able to change modes. False otherwise.
+     * @param stack
+     *          The itemstack
+     * @param player
+     *          The player holding the itemstack
+     * @return True if the overlay should be rendered and the player should be
+     *         able to change modes. False otherwise.
      */
     boolean showOverlay(ItemStack stack, EntityPlayer player);
 }

src/main/java/crazypants/enderio/betterbuilderswands/PaintedCustomMapping.java

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

src/main/java/crazypants/enderio/block/BlockDarkSteelAnvil.java

@@ -1,5 +1,14 @@
 package crazypants.enderio.block;
 
+import com.enderio.core.api.client.gui.IResourceTooltipProvider;
+import cpw.mods.fml.common.network.IGuiHandler;
+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.GuiHandler;
+import crazypants.enderio.ModObject;
 import net.minecraft.block.BlockAnvil;
 import net.minecraft.client.gui.GuiRepair;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -10,20 +19,9 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 
-import com.enderio.core.api.client.gui.IResourceTooltipProvider;
-
-import cpw.mods.fml.common.network.IGuiHandler;
-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.GuiHandler;
-import crazypants.enderio.ModObject;
-
 public class BlockDarkSteelAnvil extends BlockAnvil implements IResourceTooltipProvider {
 
-    private static final String[] anvilIconNames = new String[] { "anvil_0", "anvil_1", "anvil_2" };
+    private static final String[] anvilIconNames = new String[] {"anvil_0", "anvil_1", "anvil_2"};
 
     @SideOnly(Side.CLIENT)
     private IIcon[] anvilIcons;
@@ -67,8 +65,8 @@ public class BlockDarkSteelAnvil extends BlockAnvil implements IResourceTooltipP
     }
 
     @Override
-    public boolean onBlockActivated(World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY,
-            float hitZ) {
+    public boolean onBlockActivated(
+            World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ) {
         p.openGui(EnderIO.instance, GuiHandler.GUI_ID_ANVIL, w, x, y, z);
         return true;
     }

src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java

@@ -1,5 +1,11 @@
 package crazypants.enderio.block;
 
+import com.enderio.core.api.client.gui.IResourceTooltipProvider;
+import cpw.mods.fml.common.registry.GameRegistry;
+import crazypants.enderio.EnderIO;
+import crazypants.enderio.EnderIOTab;
+import crazypants.enderio.ModObject;
+import crazypants.enderio.config.Config;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLadder;
 import net.minecraft.block.material.Material;
@@ -8,14 +14,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
-import com.enderio.core.api.client.gui.IResourceTooltipProvider;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import crazypants.enderio.EnderIO;
-import crazypants.enderio.EnderIOTab;
-import crazypants.enderio.ModObject;
-import crazypants.enderio.config.Config;
-
 public class BlockDarkSteelLadder extends BlockLadder implements IResourceTooltipProvider {
 
     public static BlockDarkSteelLadder create() {

src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java

@@ -1,8 +1,23 @@
 package crazypants.enderio.block;
 
+import com.enderio.core.api.client.gui.IResourceTooltipProvider;
+import com.enderio.core.common.util.Util;
+import com.google.common.collect.Lists;
+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.machine.MachineRecipeInput;
+import crazypants.enderio.machine.MachineRecipeRegistry;
+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.enderio.machine.painter.TileEntityPaintedBlock;
 import java.util.ArrayList;
 import java.util.List;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPressurePlate;
 import net.minecraft.block.ITileEntityProvider;
@@ -18,24 +33,6 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import com.enderio.core.api.client.gui.IResourceTooltipProvider;
-import com.enderio.core.common.util.Util;
-import com.google.common.collect.Lists;
-
-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.machine.MachineRecipeInput;
-import crazypants.enderio.machine.MachineRecipeRegistry;
-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.enderio.machine.painter.TileEntityPaintedBlock;
-
 public class BlockDarkSteelPressurePlate extends BlockPressurePlate
         implements IResourceTooltipProvider, ITileEntityProvider, IPaintedBlock {
 
@@ -55,14 +52,12 @@ public class BlockDarkSteelPressurePlate extends BlockPressurePlate
 
     protected void init() {
         GameRegistry.registerBlock(
-                this,
-                BlockItemDarkSteelPressurePlate.class,
-                ModObject.blockDarkSteelPressurePlate.unlocalisedName);
+                this, BlockItemDarkSteelPressurePlate.class, ModObject.blockDarkSteelPressurePlate.unlocalisedName);
         GameRegistry.registerTileEntity(
                 TileEntityDarkSteelPressurePlate.class,
                 ModObject.blockDarkSteelPressurePlate.unlocalisedName + "TileEntity");
-        MachineRecipeRegistry.instance
-                .registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate(this));
+        MachineRecipeRegistry.instance.registerRecipe(
+                ModObject.blockPainter.unlocalisedName, new PainterTemplate(this));
     }
 
     @Override
@@ -148,9 +143,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));
     }
@@ -214,10 +210,9 @@ public class BlockDarkSteelPressurePlate extends BlockPressurePlate
             }
             ItemStack target = MachineRecipeInput.getInputForSlot(0, inputs);
             ItemStack resultStack = createItemStackForSourceBlock(
-                    Block.getBlockFromItem(paintSource.getItem()),
-                    paintSource.getItemDamage());
+                    Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage());
             resultStack.setItemDamage(target.getItemDamage());
-            return new ResultStack[] { new ResultStack(resultStack) };
+            return new ResultStack[] {new ResultStack(resultStack)};
         }
 
         public static ItemStack createItemStackForSourceBlock(Block block, int damage) {

src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java

@@ -1,7 +1,11 @@
 package crazypants.enderio.block;
 
+import com.enderio.core.api.client.gui.IResourceTooltipProvider;
+import crazypants.enderio.BlockEio;
+import crazypants.enderio.ModObject;
+import crazypants.enderio.config.Config;
+import crazypants.enderio.waila.IWailaInfoProvider;
 import java.util.List;
-
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
@@ -11,13 +15,6 @@ import net.minecraft.world.Explosion;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import com.enderio.core.api.client.gui.IResourceTooltipProvider;
-
-import crazypants.enderio.BlockEio;
-import crazypants.enderio.ModObject;
-import crazypants.enderio.config.Config;
-import crazypants.enderio.waila.IWailaInfoProvider;
-
 public class BlockReinforcedObsidian extends BlockEio implements IResourceTooltipProvider, IWailaInfoProvider {
 
     public static BlockReinforcedObsidian create() {

src/main/java/crazypants/enderio/block/ContainerDarkSteelAnvil.java

@@ -1,7 +1,9 @@
 package crazypants.enderio.block;
 
+import cpw.mods.fml.relauncher.ReflectionHelper;
+import crazypants.enderio.EnderIO;
+import crazypants.enderio.config.Config;
 import java.lang.reflect.Field;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ContainerRepair;
@@ -10,30 +12,26 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-import cpw.mods.fml.relauncher.ReflectionHelper;
-import crazypants.enderio.EnderIO;
-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;
 
-    public ContainerDarkSteelAnvil(InventoryPlayer playerInv, final World world, final int x, final int y, final int z,
-            EntityPlayer player) {
+    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);
 
         final IInventory outputSlot, inputSlots;
         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);
@@ -51,7 +49,7 @@ public class ContainerDarkSteelAnvil extends ContainerRepair {
 
             public boolean canTakeStack(EntityPlayer stack) {
                 return (stack.capabilities.isCreativeMode
-                        || stack.experienceLevel >= ContainerDarkSteelAnvil.this.maximumCost)
+                                || stack.experienceLevel >= ContainerDarkSteelAnvil.this.maximumCost)
                         && ContainerDarkSteelAnvil.this.maximumCost > 0
                         && this.getHasStack();
             }
@@ -78,7 +76,8 @@ public class ContainerDarkSteelAnvil extends ContainerRepair {
 
                 ContainerDarkSteelAnvil.this.maximumCost = 0;
 
-                if (!player.capabilities.isCreativeMode && !world.isRemote
+                if (!player.capabilities.isCreativeMode
+                        && !world.isRemote
                         && world.getBlock(x, y, z) == EnderIO.blockDarkSteelAnvil
                         && player.getRNG().nextFloat() < Config.darkSteelAnvilDamageChance) {
                     int i1 = world.getBlockMetadata(x, y, z);

src/main/java/crazypants/enderio/block/TileEntityDarkSteelPressurePlate.java

@@ -1,8 +1,7 @@
 package crazypants.enderio.block;
 
-import net.minecraft.nbt.NBTTagCompound;
-
 import crazypants.enderio.machine.painter.TileEntityPaintedBlock;
+import net.minecraft.nbt.NBTTagCompound;
 
 public class TileEntityDarkSteelPressurePlate extends TileEntityPaintedBlock {
 

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

@@ -1,25 +1,6 @@
 package crazypants.enderio.conduit;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import com.enderio.core.common.util.BlockCoord;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.gas.GasConduitNetwork;
 import crazypants.enderio.conduit.gas.IGasConduit;
@@ -47,11 +28,26 @@ 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 java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.EnumSet;
+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;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public abstract class AbstractConduit implements IConduit {
 
@@ -73,7 +69,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;
 
@@ -83,18 +80,6 @@ public abstract class AbstractConduit implements IConduit {
 
     protected boolean connectionsDirty = true;
 
-    /**
-     * This shows if the currently running connection update should not finish with settings connectionsDirty to false.
-     * 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;
-
-    private boolean isUpdatingConnections = false;
-
     protected AbstractConduit() {}
 
     @Override
@@ -118,7 +103,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);
@@ -290,7 +275,8 @@ public abstract class AbstractConduit implements IConduit {
         covers = conduit.getBundle().getCoverSystem();
         for (Part part : covers.getAllParts()) {
             if (part.type.getPartClass() == EnumPartClass.Panel) {
-                return part.pos == EnumPosition.getFacePosition(direction.getOpposite().ordinal());
+                return part.pos
+                        == EnumPosition.getFacePosition(direction.getOpposite().ordinal());
             }
         }
         return false;
@@ -382,13 +368,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 +383,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++;
             }
         }
@@ -445,15 +431,12 @@ public abstract class AbstractConduit implements IConduit {
     }
 
     private void updateConnections() {
-        if (!connectionsDirty && !needUpdateConnections) {
+        if (!connectionsDirty) {
             return;
         }
 
-        isUpdatingConnections = true;
-        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)) {
@@ -476,21 +459,6 @@ public abstract class AbstractConduit implements IConduit {
         }
 
         connectionsDirty = false;
-        isUpdatingConnections = false;
-    }
-
-    /**
-     * This method prevents connection update from getting completed successfully by not settings connectionsDirty to
-     * false. This will trigger an connection update at the next Tick.
-     * <p>
-     * Only use this while executing updateConnections().
-     * <p>
-     * See this PR for more info: https://github.com/GTNewHorizons/EnderIO/pull/111
-     */
-    protected void needUpdateConnections() {
-        if (isUpdatingConnections) {
-            needUpdateConnections = true;
-        }
     }
 
     @Override
@@ -612,13 +580,11 @@ public abstract class AbstractConduit implements IConduit {
 
     @Override
     public Collection<CollidableComponent> createCollidables(CacheKey key) {
-        return Collections.singletonList(
-                new CollidableComponent(
-                        getCollidableType(),
-                        ConduitGeometryUtil.instance
-                                .getBoundingBox(getBaseConduitType(), key.dir, key.isStub, key.offset),
-                        key.dir,
-                        null));
+        return Collections.singletonList(new CollidableComponent(
+                getCollidableType(),
+                ConduitGeometryUtil.instance.getBoundingBox(getBaseConduitType(), key.dir, key.isStub, key.offset),
+                key.dir,
+                null));
     }
 
     @Override
@@ -633,7 +599,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) {
@@ -657,8 +623,7 @@ public abstract class AbstractConduit implements IConduit {
         Class<? extends IConduit> type = getCollidableType();
         if (isConnectedTo(dir) && getConnectionMode(dir) != ConnectionMode.DISABLED) {
             return cc.getCollidables(
-                    cc.createKey(type, getBundle().getOffset(getBaseConduitType(), dir), dir, renderStub(dir)),
-                    this);
+                    cc.createKey(type, getBundle().getOffset(getBaseConduitType(), dir), dir, renderStub(dir)), this);
         }
         return null;
     }

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

@@ -3,16 +3,13 @@ package crazypants.enderio.conduit;
 import java.util.ArrayList;
 import java.util.Collection;
 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;
@@ -50,8 +47,8 @@ public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
         if (conduit != null && implClass.isAssignableFrom(conduit.getClass()) && conduit.setNetwork(this)) {
             addConduit(implClass.cast(conduit));
             TileEntity te = tile.getEntity();
-            Collection<T> connections = ConduitUtil
-                    .getConnectedConduits(world, te.xCoord, te.yCoord, te.zCoord, getBaseConduitType());
+            Collection<T> connections =
+                    ConduitUtil.getConnectedConduits(world, te.xCoord, te.yCoord, te.zCoord, getBaseConduitType());
             for (T con : connections) {
                 if (con.getNetwork() == null) {
                     setNetwork(world, con.getBundle());
@@ -66,7 +63,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 +74,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() {

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

@@ -1,7 +1,19 @@
 package crazypants.enderio.conduit;
 
+import com.enderio.core.common.util.BlockCoord;
+import com.enderio.core.common.util.ItemUtil;
+import com.enderio.core.common.util.Util;
+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 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;
@@ -14,22 +26,6 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import com.enderio.core.common.util.BlockCoord;
-import com.enderio.core.common.util.ItemUtil;
-import com.enderio.core.common.util.Util;
-
-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.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 {
 
     protected ModObject modObj;
@@ -63,11 +59,21 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
     }
 
     @Override
-    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
-            float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(
+            ItemStack stack,
+            EntityPlayer player,
+            World world,
+            int x,
+            int y,
+            int z,
+            int side,
+            float hitX,
+            float hitY,
+            float hitZ) {
         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 +90,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,18 +122,19 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
                 }
             }
         }
+
         return false;
     }
 
-    private boolean tryAddToMicroblocks(ItemStack stack, EntityPlayer player, World world, int x, int y, int z,
-            int side) {
+    private boolean tryAddToMicroblocks(
+            ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side) {
         TileEntity te = world.getTileEntity(x, y, z);
         if (te != null && te.getClass().getName().equals("mods.immibis.microblocks.TileMicroblockContainer")) {
             IMicroblockCoverSystem covers = ((IMicroblockSupporterTile) te).getCoverSystem();
             world.setBlock(x, y, z, EnderIO.blockConduitBundle);
             EnderIO.blockConduitBundle.onBlockActivated(world, x, y, z, player, side, 0, 0, 0);
-            IMicroblockCoverSystem newCovers = MicroblockAPIUtils
-                    .createMicroblockCoverSystem((IMicroblockSupporterTile) world.getTileEntity(x, y, z));
+            IMicroblockCoverSystem newCovers = MicroblockAPIUtils.createMicroblockCoverSystem(
+                    (IMicroblockSupporterTile) world.getTileEntity(x, y, z));
             for (Part p : covers.getAllParts()) {
                 newCovers.addPart(p);
             }
@@ -136,8 +145,17 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
     }
 
     @Override
-    public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
-            float hitX, float hitY, float hitZ) {
+    public boolean onItemUseFirst(
+            ItemStack stack,
+            EntityPlayer player,
+            World world,
+            int x,
+            int y,
+            int z,
+            int side,
+            float hitX,
+            float hitY,
+            float hitZ) {
         // Conduit replacement
         if (player.isSneaking()) {
             return false;
@@ -159,7 +177,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 +210,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));
         }

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

@@ -1,11 +1,50 @@
 package crazypants.enderio.conduit;
 
+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;
+import cpw.mods.fml.common.network.IGuiHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.enderio.BlockEio;
+import crazypants.enderio.EnderIO;
+import crazypants.enderio.GuiHandler;
+import crazypants.enderio.ModObject;
+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.*;
+import crazypants.enderio.conduit.gui.item.PacketExistingItemFilterSnapshot;
+import crazypants.enderio.conduit.gui.item.PacketModItemFilter;
+import crazypants.enderio.conduit.liquid.PacketFluidLevel;
+import crazypants.enderio.conduit.packet.PacketConnectionMode;
+import crazypants.enderio.conduit.packet.PacketExtractMode;
+import crazypants.enderio.conduit.packet.PacketItemConduitFilter;
+import crazypants.enderio.conduit.packet.PacketOCConduitSignalColor;
+import crazypants.enderio.conduit.packet.PacketRedstoneConduitOutputStrength;
+import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor;
+import crazypants.enderio.conduit.packet.PacketRoundRobinMode;
+import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit;
+import crazypants.enderio.conduit.redstone.IRedstoneConduit;
+import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit;
+import crazypants.enderio.item.IRotatableFacade;
+import crazypants.enderio.item.ItemConduitProbe;
+import crazypants.enderio.machine.painter.PainterUtil;
+import crazypants.enderio.network.PacketHandler;
+import crazypants.enderio.tool.ToolUtil;
+import crazypants.util.IFacade;
 import java.util.ArrayList;
 import java.util.Collection;
 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;
@@ -27,64 +66,13 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.event.entity.PlaySoundAtEntityEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed;
-
-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.Optional;
-import cpw.mods.fml.common.Optional.Interface;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.network.IGuiHandler;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import crazypants.enderio.BlockEio;
-import crazypants.enderio.EnderIO;
-import crazypants.enderio.GuiHandler;
-import crazypants.enderio.ModObject;
-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.item.PacketExistingItemFilterSnapshot;
-import crazypants.enderio.conduit.gui.item.PacketModItemFilter;
-import crazypants.enderio.conduit.liquid.PacketFluidLevel;
-import crazypants.enderio.conduit.packet.PacketConnectionMode;
-import crazypants.enderio.conduit.packet.PacketExtractMode;
-import crazypants.enderio.conduit.packet.PacketItemConduitFilter;
-import crazypants.enderio.conduit.packet.PacketOCConduitSignalColor;
-import crazypants.enderio.conduit.packet.PacketRedstoneConduitOutputStrength;
-import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor;
-import crazypants.enderio.conduit.packet.PacketRoundRobinMode;
-import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit;
-import crazypants.enderio.conduit.redstone.IRedstoneConduit;
-import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit;
-import crazypants.enderio.item.IRotatableFacade;
-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(
-                iface = "powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode",
-                modid = "MineFactoryReloaded"),
-        @Interface(
-                iface = "mods.immibis.core.api.multipart.IMultipartRenderingBlockMarker",
-                modid = "ImmibisMicroblocks") })
+    @Interface(iface = "powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode", modid = "MineFactoryReloaded"),
+    @Interface(iface = "mods.immibis.core.api.multipart.IMultipartRenderingBlockMarker", modid = "ImmibisMicroblocks")
+})
 public class BlockConduitBundle extends BlockEio
         implements IGuiHandler, IFacade, IRotatableFacade, IRedNetOmniNode, IMultipartRenderingBlockMarker {
 
@@ -93,37 +81,28 @@ public class BlockConduitBundle extends BlockEio
 
     public static BlockConduitBundle create() {
 
-        PacketHandler.INSTANCE
-                .registerMessage(PacketFluidLevel.class, PacketFluidLevel.class, PacketHandler.nextID(), Side.CLIENT);
-        PacketHandler.INSTANCE
-                .registerMessage(PacketExtractMode.class, PacketExtractMode.class, PacketHandler.nextID(), Side.SERVER);
+        MinecraftForge.EVENT_BUS.register(ConduitNetworkTickHandler.instance);
+        FMLCommonHandler.instance().bus().register(ConduitNetworkTickHandler.instance);
+
         PacketHandler.INSTANCE.registerMessage(
-                PacketConnectionMode.class,
-                PacketConnectionMode.class,
-                PacketHandler.nextID(),
-                Side.SERVER);
+                PacketFluidLevel.class, PacketFluidLevel.class, PacketHandler.nextID(), Side.CLIENT);
         PacketHandler.INSTANCE.registerMessage(
-                PacketItemConduitFilter.class,
-                PacketItemConduitFilter.class,
-                PacketHandler.nextID(),
-                Side.SERVER);
+                PacketExtractMode.class, PacketExtractMode.class, PacketHandler.nextID(), Side.SERVER);
+        PacketHandler.INSTANCE.registerMessage(
+                PacketConnectionMode.class, PacketConnectionMode.class, PacketHandler.nextID(), Side.SERVER);
+        PacketHandler.INSTANCE.registerMessage(
+                PacketItemConduitFilter.class, PacketItemConduitFilter.class, PacketHandler.nextID(), Side.SERVER);
         PacketHandler.INSTANCE.registerMessage(
                 PacketExistingItemFilterSnapshot.class,
                 PacketExistingItemFilterSnapshot.class,
                 PacketHandler.nextID(),
                 Side.SERVER);
         PacketHandler.INSTANCE.registerMessage(
-                PacketModItemFilter.class,
-                PacketModItemFilter.class,
-                PacketHandler.nextID(),
-                Side.SERVER);
-        PacketHandler.INSTANCE
-                .registerMessage(PacketFluidFilter.class, PacketFluidFilter.class, PacketHandler.nextID(), Side.SERVER);
+                PacketModItemFilter.class, PacketModItemFilter.class, PacketHandler.nextID(), Side.SERVER);
         PacketHandler.INSTANCE.registerMessage(
-                PacketFluidChannel.class,
-                PacketFluidChannel.class,
-                PacketHandler.nextID(),
-                Side.SERVER);
+                PacketFluidFilter.class, PacketFluidFilter.class, PacketHandler.nextID(), Side.SERVER);
+        PacketHandler.INSTANCE.registerMessage(
+                PacketFluidChannel.class, PacketFluidChannel.class, PacketHandler.nextID(), Side.SERVER);
         PacketHandler.INSTANCE.registerMessage(
                 PacketRedstoneConduitSignalColor.class,
                 PacketRedstoneConduitSignalColor.class,
@@ -135,28 +114,20 @@ public class BlockConduitBundle extends BlockEio
                 PacketHandler.nextID(),
                 Side.SERVER);
         PacketHandler.INSTANCE.registerMessage(
-                PacketOpenConduitUI.class,
-                PacketOpenConduitUI.class,
-                PacketHandler.nextID(),
-                Side.SERVER);
+                PacketOpenConduitUI.class, PacketOpenConduitUI.class, PacketHandler.nextID(), Side.SERVER);
         PacketHandler.INSTANCE.registerMessage(
-                PacketSlotVisibility.class,
-                PacketSlotVisibility.class,
-                PacketHandler.nextID(),
-                Side.SERVER);
+                PacketSlotVisibility.class, PacketSlotVisibility.class, PacketHandler.nextID(), Side.SERVER);
         PacketHandler.INSTANCE.registerMessage(
                 PacketOCConduitSignalColor.class,
                 PacketOCConduitSignalColor.class,
                 PacketHandler.nextID(),
                 Side.SERVER);
         PacketHandler.INSTANCE.registerMessage(
-                PacketRoundRobinMode.class,
-                PacketRoundRobinMode.class,
-                PacketHandler.nextID(),
-                Side.SERVER);
+                PacketRoundRobinMode.class, PacketRoundRobinMode.class, PacketHandler.nextID(), Side.SERVER);
 
         BlockConduitBundle result = new BlockConduitBundle();
         result.init();
+        MinecraftForge.EVENT_BUS.register(result);
         return result;
     }
 
@@ -175,7 +146,6 @@ public class BlockConduitBundle extends BlockEio
         setResistance(10.0f);
         setCreativeTab(null);
         this.stepSound = new SoundType("silence", 0, 0) {
-
             @Override
             public String getBreakSound() {
                 return "EnderIO:" + soundName + ".dig";
@@ -238,16 +208,8 @@ public class BlockConduitBundle extends BlockEio
                     double d2 = z + (l1 + 0.5D) / b0;
                     int i2 = rand.nextInt(6);
                     EntityDiggingFX fx = new EntityDiggingFX(
-                            world,
-                            d0,
-                            d1,
-                            d2,
-                            d0 - x - 0.5D,
-                            d1 - y - 0.5D,
-                            d2 - z - 0.5D,
-                            this,
-                            i2,
-                            0).applyColourMultiplier(x, y, z);
+                                    world, d0, d1, d2, d0 - x - 0.5D, d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0)
+                            .applyColourMultiplier(x, y, z);
                     fx.setParticleIcon(tex);
                     effectRenderer.addEffect(fx);
                 }
@@ -257,16 +219,19 @@ public class BlockConduitBundle extends BlockEio
     }
 
     @SideOnly(Side.CLIENT)
-    private void addBlockHitEffects(World world, EffectRenderer effectRenderer, int x, int y, int z, int side,
-            IIcon tex) {
+    private void addBlockHitEffects(
+            World world, EffectRenderer effectRenderer, int x, int y, int z, int side, IIcon tex) {
         float f = 0.1F;
-        double d0 = x + rand.nextDouble() * (getBlockBoundsMaxX() - getBlockBoundsMinX() - f * 2.0F)
+        double d0 = x
+                + rand.nextDouble() * (getBlockBoundsMaxX() - getBlockBoundsMinX() - f * 2.0F)
                 + f
                 + getBlockBoundsMinX();
-        double d1 = y + rand.nextDouble() * (getBlockBoundsMaxY() - getBlockBoundsMinY() - f * 2.0F)
+        double d1 = y
+                + rand.nextDouble() * (getBlockBoundsMaxY() - getBlockBoundsMinY() - f * 2.0F)
                 + f
                 + getBlockBoundsMinY();
-        double d2 = z + rand.nextDouble() * (getBlockBoundsMaxZ() - getBlockBoundsMinZ() - f * 2.0F)
+        double d2 = z
+                + rand.nextDouble() * (getBlockBoundsMaxZ() - getBlockBoundsMinZ() - f * 2.0F)
                 + f
                 + getBlockBoundsMinZ();
         if (side == 0) {
@@ -288,6 +253,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 +295,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
@@ -426,8 +425,15 @@ public class BlockConduitBundle extends BlockEio
     }
 
     @Override
-    public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX,
-            double explosionY, double explosionZ) {
+    public float getExplosionResistance(
+            Entity par1Entity,
+            World world,
+            int x,
+            int y,
+            int z,
+            double explosionX,
+            double explosionY,
+            double explosionZ) {
         float resist = getExplosionResistance(par1Entity);
         TileEntity te = world.getTileEntity(x, y, z);
         return te instanceof IConduitBundle && ((IConduitBundle) te).getFacadeType() == FacadeType.HARDENED
@@ -435,6 +441,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,10 +504,11 @@ 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());
+            ItemStack fac = new ItemStack(
+                    EnderIO.itemConduitFacade, 1, te.getFacadeType().ordinal());
             PainterUtil.setSourceBlock(fac, te.getFacadeId(), te.getFacadeMetadata());
             drop.add(fac);
             ConduitUtil.playBreakSound(te.getFacadeId().stepSound, world, x, y, z);
@@ -538,10 +563,11 @@ 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()
+                if (con.getConduitConnections().isEmpty()
+                        && con.getExternalConnections().isEmpty()
                         && ConduitUtil.renderConduit(player, con)) {
                     te.removeConduit(con);
                     drop.addAll(con.getDrops());
@@ -585,16 +611,16 @@ 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);
     }
 
     @Override
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float par7,
-            float par8, float par9) {
+    public boolean onBlockActivated(
+            World world, int x, int y, int z, EntityPlayer player, int side, float par7, float par8, float par9) {
 
         TileEntity te = world.getTileEntity(x, y, z);
         if (!(te instanceof IConduitBundle)) {
@@ -686,7 +712,8 @@ public class BlockConduitBundle extends BlockEio
             }
         } else {
             IConduit closestConduit = bundle.getConduit(closest.component.conduitType);
-            if (closestConduit != null && ConduitUtil.renderConduit(player, closestConduit)
+            if (closestConduit != null
+                    && ConduitUtil.renderConduit(player, closestConduit)
                     && closestConduit.onBlockActivated(player, closest, all)) {
                 bundle.getEntity().markDirty();
                 return true;
@@ -709,8 +736,8 @@ public class BlockConduitBundle extends BlockEio
         return false;
     }
 
-    private boolean handleConduitProbeClick(World world, int x, int y, int z, EntityPlayer player,
-            IConduitBundle bundle, ItemStack stack) {
+    private boolean handleConduitProbeClick(
+            World world, int x, int y, int z, EntityPlayer player, IConduitBundle bundle, ItemStack stack) {
         if (stack.getItemDamage() != 1) {
             return false; // not in copy paste mode
         }
@@ -721,8 +748,8 @@ public class BlockConduitBundle extends BlockEio
         return ItemConduitProbe.copyPasteSettings(player, stack, bundle, rr.component.dir);
     }
 
-    private boolean handleConduitClick(World world, int x, int y, int z, EntityPlayer player, IConduitBundle bundle,
-            ItemStack stack) {
+    private boolean handleConduitClick(
+            World world, int x, int y, int z, EntityPlayer player, IConduitBundle bundle, ItemStack stack) {
         IConduitItem equipped = (IConduitItem) stack.getItem();
         if (!bundle.hasType(equipped.getBaseConduitType())) {
             if (!world.isRemote) {
@@ -737,8 +764,8 @@ public class BlockConduitBundle extends BlockEio
         return false;
     }
 
-    public boolean handleFacadeClick(World world, int x, int y, int z, EntityPlayer player, int side,
-            IConduitBundle bundle, ItemStack stack) {
+    public boolean handleFacadeClick(
+            World world, int x, int y, int z, EntityPlayer player, int side, IConduitBundle bundle, ItemStack stack) {
         if (MicroblocksUtil.supportMicroblocks() && hasMicroblocks(bundle)) {
             return false;
         }
@@ -763,7 +790,8 @@ public class BlockConduitBundle extends BlockEio
                 return false;
             }
             if (!world.isRemote && !player.capabilities.isCreativeMode) {
-                ItemStack fac = new ItemStack(EnderIO.itemConduitFacade, 1, bundle.getFacadeType().ordinal());
+                ItemStack fac = new ItemStack(
+                        EnderIO.itemConduitFacade, 1, bundle.getFacadeType().ordinal());
                 PainterUtil.setSourceBlock(fac, bundle.getFacadeId(), bundle.getFacadeMetadata());
                 Util.dropItems(world, fac, x, y, z, false);
             }
@@ -771,7 +799,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);
         }
@@ -784,7 +812,8 @@ public class BlockConduitBundle extends BlockEio
     }
 
     private boolean facadeEquals(IConduitBundle bundle, Block facadeID, int facadeMeta, int facadeType) {
-        return bundle.getFacadeId().equals(facadeID) && bundle.getFacadeMetadata() == facadeMeta
+        return bundle.getFacadeId().equals(facadeID)
+                && bundle.getFacadeMetadata() == facadeMeta
                 && bundle.getFacadeType().ordinal() == facadeType;
     }
 
@@ -820,7 +849,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 +864,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;
     }
@@ -866,8 +895,14 @@ public class BlockConduitBundle extends BlockEio
     }
 
     @Override
-    public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb,
-            List<AxisAlignedBB> arraylist, Entity par7Entity) {
+    public void addCollisionBoxesToList(
+            World world,
+            int x,
+            int y,
+            int z,
+            AxisAlignedBB axisalignedbb,
+            @SuppressWarnings("rawtypes") List arraylist,
+            Entity par7Entity) {
 
         if (MicroblocksUtil.supportMicroblocks()) {
             IM__addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity);
@@ -886,12 +921,7 @@ public class BlockConduitBundle extends BlockEio
             Collection<CollidableComponent> bounds = con.getCollidableComponents();
             for (CollidableComponent bnd : bounds) {
                 setBlockBounds(
-                        bnd.bound.minX,
-                        bnd.bound.minY,
-                        bnd.bound.minZ,
-                        bnd.bound.maxX,
-                        bnd.bound.maxY,
-                        bnd.bound.maxZ);
+                        bnd.bound.minX, bnd.bound.minY, bnd.bound.minZ, bnd.bound.maxX, bnd.bound.maxY, bnd.bound.maxZ);
                 super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity);
             }
 
@@ -932,7 +962,8 @@ public class BlockConduitBundle extends BlockEio
             // This is an ugly special case, TODO fix this
             for (RaytraceResult hit : results) {
                 IInsulatedRedstoneConduit cond = con.getConduit(IInsulatedRedstoneConduit.class);
-                if (cond != null && hit.component != null
+                if (cond != null
+                        && hit.component != null
                         && cond.getExternalConnections().contains(hit.component.dir)
                         && !cond.isSpecialConnection(hit.component.dir)
                         && hit.component.data == InsulatedRedstoneConduit.COLOR_CONTROLLER_ID) {
@@ -967,12 +998,7 @@ public class BlockConduitBundle extends BlockEio
         }
 
         return AxisAlignedBB.getBoundingBox(
-                x + minBB.minX,
-                y + minBB.minY,
-                z + minBB.minZ,
-                x + minBB.maxX,
-                y + minBB.maxY,
-                z + minBB.maxZ);
+                x + minBB.minX, y + minBB.minY, z + minBB.minZ, x + minBB.maxX, y + minBB.maxY, z + minBB.maxZ);
     }
 
     @Override
@@ -1018,8 +1044,8 @@ public class BlockConduitBundle extends BlockEio
         return doRayTraceAll(world, x, y, z, origin, direction, entityPlayer);
     }
 
-    private RaytraceResult doRayTrace(World world, int x, int y, int z, Vec3 origin, Vec3 direction,
-            EntityPlayer entityPlayer) {
+    private RaytraceResult doRayTrace(
+            World world, int x, int y, int z, Vec3 origin, Vec3 direction, EntityPlayer entityPlayer) {
         List<RaytraceResult> allHits = doRayTraceAll(world, x, y, z, origin, direction, entityPlayer);
         if (allHits == null) {
             return null;
@@ -1027,15 +1053,15 @@ public class BlockConduitBundle extends BlockEio
         return RaytraceResult.getClosestHit(origin, allHits);
     }
 
-    protected List<RaytraceResult> doRayTraceAll(World world, int x, int y, int z, Vec3 origin, Vec3 direction,
-            EntityPlayer player) {
+    protected List<RaytraceResult> doRayTraceAll(
+            World world, int x, int y, int z, Vec3 origin, Vec3 direction, EntityPlayer player) {
 
         TileEntity te = world.getTileEntity(x, y, z);
         if (!(te instanceof IConduitBundle)) {
             return null;
         }
         IConduitBundle bundle = (IConduitBundle) te;
-        List<RaytraceResult> hits = new ArrayList<>();
+        List<RaytraceResult> hits = new ArrayList<RaytraceResult>();
 
         if (player == null) {
             player = EnderIO.proxy.getClientPlayer();
@@ -1045,14 +1071,13 @@ public class BlockConduitBundle extends BlockEio
             setBlockBounds(0, 0, 0, 1, 1, 1);
             MovingObjectPosition hitPos = super.collisionRayTrace(world, x, y, z, origin, direction);
             if (hitPos != null) {
-                hits.add(
-                        new RaytraceResult(
-                                new CollidableComponent(null, BoundingBox.UNIT_CUBE, ForgeDirection.UNKNOWN, null),
-                                hitPos));
+                hits.add(new RaytraceResult(
+                        new CollidableComponent(null, BoundingBox.UNIT_CUBE, ForgeDirection.UNKNOWN, null), hitPos));
             }
         } 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)) {
@@ -1178,8 +1203,8 @@ public class BlockConduitBundle extends BlockEio
         return bundle.getConduit(IRedstoneConduit.class);
     }
 
-    public ItemStack getMicroblockPickBlock(MovingObjectPosition target, World world, int x, int y, int z,
-            EntityPlayer player) {
+    public ItemStack getMicroblockPickBlock(
+            MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
         return IMultipartSystem.instance.hook_getPickBlock(target, world, x, y, z, player);
     }
 
@@ -1199,79 +1224,23 @@ public class BlockConduitBundle extends BlockEio
         return IMultipartSystem.instance.hook_addHitEffects(worldObj, target, effectRenderer);
     }
 
-    private MovingObjectPosition IM__collisionRayTrace(MovingObjectPosition cur, World world, int x, int y, int z,
-            Vec3 src, Vec3 dst) {
+    private MovingObjectPosition IM__collisionRayTrace(
+            MovingObjectPosition cur, World world, int x, int y, int z, Vec3 src, Vec3 dst) {
         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);
     }
 
-    private ArrayList<ItemStack> IM__getDrops(List<ItemStack> cur, World world, int x, int y, int z, int metadata,
-            int fortune) {
+    private ArrayList<ItemStack> IM__getDrops(
+            List<ItemStack> cur, World world, int x, int y, int z, int metadata, int fortune) {
         return IMultipartSystem.instance.hook_getDrops(cur, world, x, y, z, metadata, fortune);
     }
 
     private boolean hasMicroblocks(IConduitBundle bundle) {
         return !bundle.getCoverSystem().getAllParts().isEmpty();
     }
-
-    public class EventHandler {
-
-        @SideOnly(Side.CLIENT)
-        @SubscribeEvent
-        public void onPlaySound(PlaySoundSourceEvent event) {
-            String path = event.sound.getPositionedSoundLocation().getResourcePath();
-            if ("silence.step".equals(path)) {
-                ISound snd = event.sound;
-                World world = EnderIO.proxy.getClientWorld();
-                if (world == null) return;
-                BlockCoord bc = new BlockCoord(snd.getXPosF(), snd.getYPosF(), snd.getZPosF());
-                TileEntity te = bc.getTileEntity(world);
-                if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
-                    Block facade = getFacade(world, bc.x, bc.y, bc.z, -1);
-                    ConduitUtil.playHitSound(facade.stepSound, world, bc.x, bc.y, bc.z);
-                } else {
-                    ConduitUtil.playHitSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z);
-                }
-            }
-        }
-
-        @SideOnly(Side.CLIENT)
-        @SubscribeEvent
-        public void onPlaySoundAtEntity(PlaySoundAtEntityEvent event) {
-            String path = event.name;
-            World world = event.entity.worldObj;
-            if ("EnderIO:silence.step".equals(path) && world.isRemote) {
-                BlockCoord bc = new BlockCoord(event.entity.posX, event.entity.posY - 2, event.entity.posZ);
-                TileEntity te = bc.getTileEntity(world);
-                if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
-                    Block facade = getFacade(world, bc.x, bc.y, bc.z, -1);
-                    ConduitUtil.playStepSound(facade.stepSound, world, bc.x, bc.y, bc.z);
-                } else {
-                    ConduitUtil.playStepSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z);
-                }
-            }
-        }
-
-        @SubscribeEvent
-        public void onBreakSpeed(BreakSpeed event) {
-            if (event.block == BlockConduitBundle.this) {
-                ItemStack held = event.entityPlayer.getCurrentEquippedItem();
-                if (held == null || held.getItem().getHarvestLevel(held, "pickaxe") == -1) {
-                    event.newSpeed += 2;
-                }
-                IConduitBundle te = (IConduitBundle) event.entity.worldObj.getTileEntity(event.x, event.y, event.z);
-                if (te != null && te.getFacadeType() == FacadeType.HARDENED) {
-                    if (!ConduitUtil.isSolidFacadeRendered(te, event.entityPlayer)) {
-                        event.newSpeed *= 6;
-                    } else {
-                        event.newSpeed *= 2;
-                    }
-                }
-            }
-        }
-    }
 }

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

@@ -1,34 +1,21 @@
 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 java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import static crazypants.enderio.gui.IconEIO.*;
 
 import com.enderio.core.api.client.render.IWidgetIcon;
 import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Lists;
-
 import crazypants.enderio.api.tool.IConduitControl;
 import crazypants.enderio.conduit.item.IItemConduit;
 import crazypants.enderio.conduit.liquid.ILiquidConduit;
 import crazypants.enderio.conduit.power.IPowerConduit;
 import crazypants.enderio.conduit.redstone.IRedstoneConduit;
+import java.util.List;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 
 public class ConduitDisplayMode {
 
@@ -61,13 +48,18 @@ public class ConduitDisplayMode {
     private String overrideName = null;
 
     /**
-     * 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.
+     * 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.
      *
-     * @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)
+     *
+     * @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.
      */
     public ConduitDisplayMode(String name, IWidgetIcon widgetSelected, IWidgetIcon widgetUnselected) {
         this(IConduit.class, widgetSelected, widgetUnselected);
@@ -75,16 +67,20 @@ public class ConduitDisplayMode {
     }
 
     /**
-     * Creates a new display mode for any {@link IConduitControl} wrench. Contains data about which conduit type this is
-     * for, and the icons to render while holding the wrench. wrench.
+     * Creates a new display mode for any {@link IConduitControl} wrench. Contains
+     * data about which conduit type this is for, and the icons to render while
+     * holding the wrench. wrench.
      *
-     * @param conduitType      The base class for your conduit type, typically an interface (e.g.
-     *                         {@code IPowerConduit}).
-     * @param widgetSelected   The widget to render when this type is selected.
-     * @param widgetUnselected The widget to render when this type is unselected.
+     * @param conduitType
+     *          The base class for your conduit type, typically an interface (e.g.
+     *          {@code IPowerConduit}).
+     * @param widgetSelected
+     *          The widget to render when this type is selected.
+     * @param widgetUnselected
+     *          The widget to render when this type is unselected.
      */
-    public ConduitDisplayMode(@Nonnull Class<? extends IConduit> conduitType, IWidgetIcon widgetSelected,
-            IWidgetIcon widgetUnselected) {
+    public ConduitDisplayMode(
+            @Nonnull Class<? extends IConduit> conduitType, IWidgetIcon widgetSelected, IWidgetIcon widgetUnselected) {
         this.conduitType = conduitType;
         this.widgetSelected = widgetSelected;
         this.widgetUnselected = widgetUnselected;
@@ -111,9 +107,11 @@ public class ConduitDisplayMode {
     }
 
     /**
-     * The name is null by default, and will use the simple class name of the conduit type.
+     * The name is null by default, and will use the simple class name of the
+     * conduit type.
      *
-     * @param name The override name to set.
+     * @param name
+     *          The override name to set.
      */
     public void setName(@Nullable String name) {
         this.overrideName = name;
@@ -196,8 +194,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) {
                 return input != ALL && input != NONE;

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

@@ -1,24 +1,26 @@
 package crazypants.enderio.conduit;
 
-import java.util.ArrayList;
-import java.util.IdentityHashMap;
-import java.util.List;
-
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
+import java.util.ArrayList;
+import java.util.IdentityHashMap;
+import java.util.List;
 
 public class ConduitNetworkTickHandler {
 
-    public interface TickListener {
+    public static final ConduitNetworkTickHandler instance = new ConduitNetworkTickHandler();
 
-        void tickStart(TickEvent.ServerTickEvent evt);
+    public static interface TickListener {
+        public void tickStart(TickEvent.ServerTickEvent evt);
 
-        void tickEnd(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);

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

@@ -1,29 +1,11 @@
 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;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.oredict.OreDictionary;
-import net.minecraftforge.oredict.ShapedOreRecipe;
-
 import appeng.api.AEApi;
 import cpw.mods.fml.common.Optional.Method;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -44,6 +26,12 @@ import crazypants.enderio.machine.MachineRecipeRegistry;
 import crazypants.enderio.material.BlockFusedQuartz;
 import crazypants.enderio.material.FrankenSkull;
 import crazypants.enderio.material.Material;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.oredict.OreDictionary;
+import net.minecraftforge.oredict.ShapedOreRecipe;
 
 public class ConduitRecipes {
 
@@ -71,14 +59,10 @@ public class ConduitRecipes {
 
         String binder = CONDUIT_BINDER.oreDict;
 
-        ItemStack zombieController = new ItemStack(
-                EnderIO.itemFrankenSkull,
-                1,
-                FrankenSkull.ZOMBIE_CONTROLLER.ordinal());
-        ItemStack skeletalContractor = new ItemStack(
-                EnderIO.itemFrankenSkull,
-                1,
-                FrankenSkull.SKELETAL_CONTRACTOR.ordinal());
+        ItemStack zombieController =
+                new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal());
+        ItemStack skeletalContractor =
+                new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SKELETAL_CONTRACTOR.ordinal());
 
         // Recipes
         addShaped(
@@ -88,16 +72,15 @@ public class ConduitRecipes {
                 "bbb",
                 'b',
                 binder);
-        GameRegistry.addRecipe(
-                new ShapedOreRecipe(
-                        new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.HARDENED.ordinal()),
-                        " o ",
-                        "oFo",
-                        " o ",
-                        'F',
-                        EnderIO.itemConduitFacade,
-                        'o',
-                        "dustObsidian"));
+        GameRegistry.addRecipe(new ShapedOreRecipe(
+                new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.HARDENED.ordinal()),
+                " o ",
+                "oFo",
+                " o ",
+                'F',
+                EnderIO.itemConduitFacade,
+                'o',
+                "dustObsidian"));
 
         int numConduits = Config.numConduitsPerRecipe;
         addShaped(
@@ -262,7 +245,8 @@ public class ConduitRecipes {
                     "ingotGold");
             lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 3);
 
-            if (OreDictionary.doesOreNameExist("ingotCopper") && OreDictionary.getOres("ingotCopper").size() > 0) {
+            if (OreDictionary.doesOreNameExist("ingotCopper")
+                    && OreDictionary.getOres("ingotCopper").size() > 0) {
                 addShaped(
                         new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 4),
                         "b#b",
@@ -569,8 +553,8 @@ public class ConduitRecipes {
         ItemStack itemConduit = new ItemStack(EnderIO.itemItemConduit, numConduits, 0);
         addShaped(itemConduit, "bbb", "###", "bbb", 'b', binder, '#', phasedIronNugget);
 
-        MachineRecipeRegistry.instance
-                .registerRecipe(blockPainter.unlocalisedName, EnderIO.itemConduitFacade.new FacadePainterRecipe());
+        MachineRecipeRegistry.instance.registerRecipe(
+                blockPainter.unlocalisedName, EnderIO.itemConduitFacade.new FacadePainterRecipe());
 
         // Filter Recipes
         ItemStack basicFilter = new ItemStack(EnderIO.itemBasicFilterUpgrade, 1, 0);
@@ -601,9 +585,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 +669,8 @@ 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);
 
@@ -696,7 +678,6 @@ public class ConduitRecipes {
         addShaped(res.copy(), "bbb", "fqf", "bbb", 'b', conduitBinder, 'f', pureFluix, 'q', quartzFiber);
 
         res.stackSize = 1;
-        ItemStack resDense = new ItemStack(EnderIO.itemMEConduit, 1, 1);
-        addShaped(resDense, "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', res);
+        addShaped(new ItemStack(EnderIO.itemMEConduit, 1, 1), "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', res);
     }
 }

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

@@ -1,27 +1,7 @@
 package crazypants.enderio.conduit;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Random;
-import java.util.Set;
-
-import net.minecraft.block.Block.SoundType;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
-
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.DyeColor;
-
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -38,31 +18,46 @@ import crazypants.enderio.conduit.redstone.IRedstoneConduit;
 import crazypants.enderio.conduit.redstone.Signal;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.tool.ToolUtil;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import net.minecraft.block.Block.SoundType;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
 
 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();
-        Collection<? extends IConduit> connections = ConduitUtil
-                .getConnectedConduits(world, te.xCoord, te.yCoord, te.zCoord, conduit.getBaseConduitType());
+        Collection<? extends IConduit> connections =
+                ConduitUtil.getConnectedConduits(world, te.xCoord, te.yCoord, te.zCoord, conduit.getBaseConduitType());
 
         if (reuseNetwork(conduit, connections, world)) {
             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) {
@@ -85,16 +80,16 @@ public class ConduitUtil {
     public static <T extends IConduit> void disconectConduits(T con, ForgeDirection connDir) {
         con.conduitConnectionRemoved(connDir);
         BlockCoord loc = con.getLocation().getLocation(connDir);
-        IConduit neighbour = ConduitUtil
-                .getConduit(con.getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, con.getBaseConduitType());
+        IConduit neighbour = ConduitUtil.getConduit(
+                con.getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, con.getBaseConduitType());
         if (neighbour != null) {
             neighbour.conduitConnectionRemoved(connDir.getOpposite());
             if (neighbour.getNetwork() != null) {
                 neighbour.getNetwork().destroyNetwork();
             }
         }
-        if (con.getNetwork() != null) { // this should have been destroyed when destroying the neighbours network but
-            // lets just make
+        if (con.getNetwork()
+                != null) { // this should have been destroyed when destroying the neighbours network but lets just make
             // sure
             con.getNetwork().destroyNetwork();
         }
@@ -106,9 +101,10 @@ public class ConduitUtil {
 
     public static <T extends IConduit> boolean joinConduits(T con, ForgeDirection faceHit) {
         BlockCoord loc = con.getLocation().getLocation(faceHit);
-        IConduit neighbour = ConduitUtil
-                .getConduit(con.getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, con.getBaseConduitType());
-        if (neighbour != null && con.canConnectToConduit(faceHit, neighbour)
+        IConduit neighbour = ConduitUtil.getConduit(
+                con.getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, con.getBaseConduitType());
+        if (neighbour != null
+                && con.canConnectToConduit(faceHit, neighbour)
                 && neighbour.canConnectToConduit(faceHit.getOpposite(), con)) {
             con.conduitConnectionAdded(faceHit);
             neighbour.conduitConnectionAdded(faceHit.getOpposite());
@@ -160,7 +156,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) {
@@ -244,17 +240,17 @@ public class ConduitUtil {
     }
 
     public static <T extends IConduit> T getConduit(World world, TileEntity te, ForgeDirection dir, Class<T> type) {
-        return ConduitUtil
-                .getConduit(world, te.xCoord + dir.offsetX, te.yCoord + dir.offsetY, te.zCoord + dir.offsetZ, type);
+        return ConduitUtil.getConduit(
+                world, te.xCoord + dir.offsetX, te.yCoord + dir.offsetY, te.zCoord + dir.offsetZ, type);
     }
 
-    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;
+    public static <T extends IConduit> Collection<T> getConnectedConduits(
+            World world, int x, int y, int z, Class<T> type) {
+        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,10 +316,10 @@ 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));
+            signalStrength = Math.max(
+                    signalStrength, te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord));
         }
         return RedstoneControlMode.isConditionMet(mode, signalStrength);
     }
@@ -363,7 +359,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());
@@ -377,7 +373,8 @@ public class ConduitUtil {
         if (cons.size() == 1) {
             player.openGui(
                     EnderIO.instance,
-                    GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + cons.iterator().next().ordinal(),
+                    GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE
+                            + cons.iterator().next().ordinal(),
                     world,
                     x,
                     y,
@@ -402,7 +399,8 @@ public class ConduitUtil {
     }
 
     private static void playClientBreakSound(SoundType snd) {
-        FMLClientHandler.instance().getClientPlayerEntity()
+        FMLClientHandler.instance()
+                .getClientPlayerEntity()
                 .playSound(snd.getBreakSound(), (snd.getVolume() + 1.0F) / 2.0F, snd.getPitch() * 0.8F);
     }
 
@@ -421,7 +419,8 @@ public class ConduitUtil {
     }
 
     private static void playClientHitSound(SoundType snd) {
-        FMLClientHandler.instance().getClientPlayerEntity()
+        FMLClientHandler.instance()
+                .getClientPlayerEntity()
                 .playSound(snd.getStepResourcePath(), (snd.getVolume() + 1.0F) / 8.0F, snd.getPitch() * 0.5F);
     }
 
@@ -440,7 +439,8 @@ public class ConduitUtil {
     }
 
     private static void playClientStepSound(SoundType snd) {
-        FMLClientHandler.instance().getClientPlayerEntity()
+        FMLClientHandler.instance()
+                .getClientPlayerEntity()
                 .playSound(snd.getStepResourcePath(), (snd.getVolume() + 1.0F) / 8.0F, snd.getPitch());
     }
 
@@ -459,7 +459,8 @@ public class ConduitUtil {
     }
 
     private static void playClientPlaceSound(SoundType snd) {
-        FMLClientHandler.instance().getClientPlayerEntity()
+        FMLClientHandler.instance()
+                .getClientPlayerEntity()
                 .playSound(snd.func_150496_b(), (snd.getVolume() + 1.0F) / 8.0F, snd.getPitch());
     }
 }

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

@@ -3,17 +3,12 @@ package crazypants.enderio.conduit;
 import crazypants.enderio.EnderIO;
 
 public enum ConnectionMode {
-
     IN_OUT("gui.conduit.ioMode.inOut"),
     INPUT("gui.conduit.ioMode.input"),
     OUTPUT("gui.conduit.ioMode.output"),
     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 +21,19 @@ public enum ConnectionMode {
 
     public static ConnectionMode getNext(ConnectionMode mode) {
         int ord = mode.ordinal() + 1;
-        if (ord >= ConnectionMode.VALUES.length) {
+        if (ord >= ConnectionMode.values().length) {
             ord = 0;
         }
-        return ConnectionMode.VALUES[ord];
+        return ConnectionMode.values()[ord];
     }
 
     public static ConnectionMode getPrevious(ConnectionMode mode) {
 
         int ord = mode.ordinal() - 1;
         if (ord < 0) {
-            ord = ConnectionMode.VALUES.length - 1;
+            ord = ConnectionMode.values().length - 1;
         }
-        return ConnectionMode.VALUES[ord];
+        return ConnectionMode.values()[ord];
     }
 
     public boolean acceptsInput() {

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

@@ -1,9 +1,11 @@
 package crazypants.enderio.conduit;
 
+import com.enderio.core.common.util.BlockCoord;
+import crazypants.enderio.conduit.geom.CollidableCache.CacheKey;
+import crazypants.enderio.conduit.geom.CollidableComponent;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -13,12 +15,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-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 {
 
     // Base functionality
@@ -139,9 +135,8 @@ public interface IConduit {
     public AbstractConduitNetwork<?, ?> createNetworkForType();
 
     /**
-     * Should the texture of the conduit connectors be mirrored around the conduit node?
+     * Should the texture of the conduit connectors be mirrored around the conduit
+     * node?
      */
     boolean shouldMirrorTexture();
-
-    ConduitRenderer getRenderer();
 }

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

@@ -1,20 +1,8 @@
 package crazypants.enderio.conduit;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import net.minecraft.block.Block;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
-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,18 +11,36 @@ 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 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;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.IFluidHandler;
 
-@InterfaceList({ @Interface(iface = "appeng.api.networking.IGridHost", modid = "appliedenergistics2"),
-        @Interface(iface = "mekanism.api.gas.IGasHandler", modid = "MekanismAPI|gas"),
-        @Interface(iface = "mods.immibis.microblocks.api.IMicroblockSupporterTile", modid = "ImmibisMicroblocks"),
-        @Interface(iface = "li.cil.oc.api.network.Environment", modid = "OpenComputersAPI|Network"),
-        @Interface(iface = "li.cil.oc.api.network.SidedEnvironment", modid = "OpenComputersAPI|Network") })
-public interface IConduitBundle extends IInternalPowerHandler, IFluidHandler, IItemDuct, IGasHandler, IGridHost,
-        IMicroblockSupporterTile, Environment, SidedEnvironment {
+@InterfaceList({
+    @Interface(iface = "appeng.api.networking.IGridHost", modid = "appliedenergistics2"),
+    @Interface(iface = "mekanism.api.gas.IGasHandler", modid = "MekanismAPI|gas"),
+    @Interface(iface = "mods.immibis.microblocks.api.IMicroblockSupporterTile", modid = "ImmibisMicroblocks"),
+    @Interface(iface = "li.cil.oc.api.network.Environment", modid = "OpenComputersAPI|Network"),
+    @Interface(iface = "li.cil.oc.api.network.SidedEnvironment", modid = "OpenComputersAPI|Network")
+})
+public interface IConduitBundle
+        extends IInternalPowerHandler,
+                IFluidHandler,
+                IItemDuct,
+                IGasHandler,
+                IGridHost,
+                IMicroblockSupporterTile,
+                Environment,
+                SidedEnvironment {
 
     TileEntity getEntity();
 
@@ -49,8 +55,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();

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

@@ -1,10 +1,9 @@
 package crazypants.enderio.conduit;
 
+import crazypants.enderio.api.tool.IHideFacades;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-import crazypants.enderio.api.tool.IHideFacades;
-
 public interface IConduitItem extends IHideFacades {
 
     Class<? extends IConduit> getBaseConduitType();

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

@@ -1,10 +1,8 @@
 package crazypants.enderio.conduit;
 
-import net.minecraftforge.common.util.ForgeDirection;
-
 import com.enderio.core.common.util.DyeColor;
-
 import crazypants.enderio.machine.RedstoneControlMode;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public interface IExtractor extends IConduit {
 

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

@@ -1,10 +1,9 @@
 package crazypants.enderio.conduit;
 
-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;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class MicroblocksUtil {
 

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

@@ -1,15 +1,13 @@
 package crazypants.enderio.conduit;
 
+import crazypants.enderio.conduit.geom.CollidableComponent;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 
-import crazypants.enderio.conduit.geom.CollidableComponent;
-
 public class RaytraceResult {
 
     public static RaytraceResult getClosestHit(Vec3 origin, Collection<RaytraceResult> candidates) {
@@ -33,8 +31,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) {
                 return Double.compare(o1.getDistanceTo(origin), o2.getDistanceTo(origin));

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

@@ -1,34 +1,8 @@
 package crazypants.enderio.conduit;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.Packet;
-import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-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,7 +25,13 @@ 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 java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumSet;
+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;
@@ -63,12 +43,28 @@ 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;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTankInfo;
 
 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 +72,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;
@@ -108,7 +104,8 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
 
     @Override
     public boolean shouldRenderInPass(int arg0) {
-        if (facadeId != null && facadeId.isOpaqueCube()
+        if (facadeId != null
+                && facadeId.isOpaqueCube()
                 && !ConduitUtil.isFacadeHidden(this, EnderIO.proxy.getClientPlayer())) {
             return false;
         }
@@ -337,8 +334,8 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
                 markForUpdate = true;
             }
         } else { // can do the else as only need to update once
-            ConduitDisplayMode curMode = ConduitDisplayMode
-                    .getDisplayMode(EnderIO.proxy.getClientPlayer().getCurrentEquippedItem());
+            ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(
+                    EnderIO.proxy.getClientPlayer().getCurrentEquippedItem());
             if (curMode != lastMode) {
                 markForUpdate = true;
                 lastMode = curMode;
@@ -406,29 +403,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 +427,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 +512,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 +537,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 +545,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 +565,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) {
@@ -610,11 +583,8 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
             }
             if (bb != null) {
                 bb = bb.scale(1.05, 1.05, 1.05);
-                CollidableComponent cc = new CollidableComponent(
-                        null,
-                        bb,
-                        ForgeDirection.UNKNOWN,
-                        ConduitConnectorType.INTERNAL);
+                CollidableComponent cc =
+                        new CollidableComponent(null, bb, ForgeDirection.UNKNOWN, ConduitConnectorType.INTERNAL);
                 result.add(cc);
                 cachedConnectors.add(cc);
             }
@@ -624,7 +594,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;
@@ -635,10 +605,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
                     if (bb.getArea() > area * 1.5f) {
                         bb = bb.scale(1.05, 1.05, 1.05);
                         CollidableComponent cc = new CollidableComponent(
-                                null,
-                                bb,
-                                ForgeDirection.UNKNOWN,
-                                ConduitConnectorType.INTERNAL);
+                                null, bb, ForgeDirection.UNKNOWN, ConduitConnectorType.INTERNAL);
                         result.add(cc);
                         cachedConnectors.add(cc);
                     }
@@ -659,11 +626,8 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
         }
 
         if (conBB != null) {
-            CollidableComponent cc = new CollidableComponent(
-                    null,
-                    conBB,
-                    ForgeDirection.UNKNOWN,
-                    ConduitConnectorType.INTERNAL);
+            CollidableComponent cc =
+                    new CollidableComponent(null, conBB, ForgeDirection.UNKNOWN, ConduitConnectorType.INTERNAL);
             result.add(cc);
             cachedConnectors.add(cc);
         }
@@ -695,34 +659,23 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
         Class<? extends IConduit> type = con.getCollidableType();
         if (con.hasConnections()) {
             for (ForgeDirection dir : con.getExternalConnections()) {
-                result.addAll(
-                        cc.getCollidables(
-                                cc.createKey(
-                                        type,
-                                        getOffset(con.getBaseConduitType(), dir),
-                                        ForgeDirection.UNKNOWN,
-                                        false),
-                                con));
+                result.addAll(cc.getCollidables(
+                        cc.createKey(type, getOffset(con.getBaseConduitType(), dir), ForgeDirection.UNKNOWN, false),
+                        con));
             }
             for (ForgeDirection dir : con.getConduitConnections()) {
-                result.addAll(
-                        cc.getCollidables(
-                                cc.createKey(
-                                        type,
-                                        getOffset(con.getBaseConduitType(), dir),
-                                        ForgeDirection.UNKNOWN,
-                                        false),
-                                con));
+                result.addAll(cc.getCollidables(
+                        cc.createKey(type, getOffset(con.getBaseConduitType(), dir), ForgeDirection.UNKNOWN, false),
+                        con));
             }
         } else {
-            result.addAll(
-                    cc.getCollidables(
-                            cc.createKey(
-                                    type,
-                                    getOffset(con.getBaseConduitType(), ForgeDirection.UNKNOWN),
-                                    ForgeDirection.UNKNOWN,
-                                    false),
-                            con));
+            result.addAll(cc.getCollidables(
+                    cc.createKey(
+                            type,
+                            getOffset(con.getBaseConduitType(), ForgeDirection.UNKNOWN),
+                            ForgeDirection.UNKNOWN,
+                            false),
+                    con));
         }
     }
 
@@ -967,6 +920,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
         return (IGridNode) node;
     }
 
+    @SuppressWarnings("cast")
     @Override
     @Method(modid = "appliedenergistics2")
     public void setGridNode(Object node) {
@@ -1075,7 +1029,8 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
     public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) {
         super.onDataPacket(net, pkt);
         if (covers != null) {
-            ((IMicroblockCoverSystem) covers).readDescriptionBytes(pkt.func_148857_g().getByteArray("C"), 0);
+            ((IMicroblockCoverSystem) covers)
+                    .readDescriptionBytes(pkt.func_148857_g().getByteArray("C"), 0);
         }
     }
 

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

@@ -1,5 +1,11 @@
 package crazypants.enderio.conduit.facade;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.enderio.BlockEio;
+import crazypants.enderio.ModObject;
+import crazypants.enderio.conduit.IConduitBundle;
+import crazypants.enderio.machine.painter.IPaintedBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
@@ -9,14 +15,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import crazypants.enderio.BlockEio;
-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 +23,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() {
@@ -83,7 +78,8 @@ public class BlockConduitFacade extends BlockEio implements IPaintedBlock, Clone
         if (blockOverride != null) {
             try { // work around for Issue #589
                 return blockOverride.colorMultiplier(par1IBlockAccess, par2, par3, par4);
-            } catch (Exception e) {}
+            } catch (Exception e) {
+            }
         }
         return super.colorMultiplier(par1IBlockAccess, par2, par3, par4);
     }
@@ -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;

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

@@ -1,23 +1,21 @@
 package crazypants.enderio.conduit.facade;
 
+import com.enderio.core.client.render.RenderUtil;
+import crazypants.enderio.EnderIO;
+import crazypants.enderio.machine.painter.PainterUtil;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.IItemRenderer;
-
 import org.lwjgl.opengl.GL11;
 
-import com.enderio.core.client.render.RenderUtil;
-
-import crazypants.enderio.EnderIO;
-import crazypants.enderio.machine.painter.PainterUtil;
-
 public class FacadeRenderer implements IItemRenderer {
 
     @Override
     public boolean handleRenderType(ItemStack item, ItemRenderType type) {
-        return type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED
+        return type == ItemRenderType.ENTITY
+                || type == ItemRenderType.EQUIPPED
                 || type == ItemRenderType.INVENTORY
                 || type == ItemRenderType.EQUIPPED_FIRST_PERSON;
     }

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

@@ -1,22 +1,9 @@
 package crazypants.enderio.conduit.facade;
 
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import com.enderio.core.api.client.gui.IAdvancedTooltipProvider;
 import com.enderio.core.api.client.gui.IResourceTooltipProvider;
 import com.enderio.core.client.handlers.SpecialTooltipHandler;
 import com.enderio.core.common.util.Util;
-
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -32,17 +19,23 @@ 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;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
 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 +61,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 +83,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");
@@ -111,14 +105,23 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
     }
 
     @Override
-    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side,
-            float par8, float par9, float par10) {
+    public boolean onItemUse(
+            ItemStack itemStack,
+            EntityPlayer player,
+            World world,
+            int x,
+            int y,
+            int z,
+            int side,
+            float par8,
+            float par9,
+            float par10) {
 
         if (world.isRemote) {
             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 +136,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--;
@@ -142,15 +145,16 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
             } else {
                 Block block = world.getBlock(placeX, placeY, placeZ);
                 if (block == EnderIO.blockConduitBundle) {
-                    ((BlockConduitBundle) block).handleFacadeClick(
-                            world,
-                            placeX,
-                            placeY,
-                            placeZ,
-                            player,
-                            dir.getOpposite().ordinal(),
-                            (IConduitBundle) world.getTileEntity(placeX, placeY, placeZ),
-                            itemStack);
+                    ((BlockConduitBundle) block)
+                            .handleFacadeClick(
+                                    world,
+                                    placeX,
+                                    placeY,
+                                    placeZ,
+                                    player,
+                                    dir.getOpposite().ordinal(),
+                                    (IConduitBundle) world.getTileEntity(placeX, placeY, placeZ),
+                                    itemStack);
                 }
             }
         }
@@ -173,9 +177,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 +189,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 +205,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("");

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

@@ -1,18 +1,7 @@
 package crazypants.enderio.conduit.gas;
 
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import net.minecraft.block.Block;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.DyeColor;
-
 import cpw.mods.fml.common.Optional.Method;
 import crazypants.enderio.conduit.AbstractConduit;
 import crazypants.enderio.conduit.ConduitUtil;
@@ -21,19 +10,30 @@ import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.machine.reservoir.TileReservoir;
+import java.util.EnumMap;
+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;
+import net.minecraftforge.common.util.ForgeDirection;
 
 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)
     public IGasHandler getExternalHandler(ForgeDirection direction) {
-        IGasHandler con = GasUtil.getExternalGasHandler(getBundle().getWorld(), getLocation().getLocation(direction));
+        IGasHandler con = GasUtil.getExternalGasHandler(
+                getBundle().getWorld(), getLocation().getLocation(direction));
         return (con != null && !(con instanceof IConduitBundle)) ? con : null;
     }
 
@@ -184,15 +184,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]);
                 }
             }
         }

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

@@ -1,21 +1,18 @@
 package crazypants.enderio.conduit.gas;
 
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import com.enderio.core.common.util.BlockCoord;
-
 import cpw.mods.fml.common.Optional.Method;
 import crazypants.enderio.conduit.AbstractConduitNetwork;
 import crazypants.enderio.conduit.ConduitUtil;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.RaytraceResult;
 import crazypants.enderio.tool.ToolUtil;
+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;
 
 public abstract class AbstractGasTankConduit extends AbstractGasConduit {
 
@@ -47,11 +44,7 @@ public abstract class AbstractGasTankConduit extends AbstractGasConduit {
 
                         BlockCoord loc = getLocation().getLocation(faceHit);
                         IGasConduit n = ConduitUtil.getConduit(
-                                getBundle().getEntity().getWorldObj(),
-                                loc.x,
-                                loc.y,
-                                loc.z,
-                                IGasConduit.class);
+                                getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, IGasConduit.class);
                         if (n == null) {
                             return false;
                         }

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

@@ -1,10 +1,9 @@
 package crazypants.enderio.conduit.gas;
 
-import net.minecraft.nbt.NBTTagCompound;
-
 import cpw.mods.fml.common.Optional.Method;
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
+import net.minecraft.nbt.NBTTagCompound;
 
 public class ConduitGasTank extends GasTank {
 

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

@@ -1,16 +1,7 @@
 package crazypants.enderio.conduit.gas;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-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;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -19,10 +10,16 @@ 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 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;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class GasConduit extends AbstractGasTankConduit {
 
@@ -34,12 +31,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 +79,7 @@ public class GasConduit extends AbstractGasTankConduit {
     }
 
     private void doExtract() {
+        BlockCoord loc = getLocation();
         if (!hasConnectionMode(ConnectionMode.INPUT)) {
             return;
         }
@@ -101,6 +94,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)) {

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

@@ -1,24 +1,21 @@
 package crazypants.enderio.conduit.gas;
 
+import com.enderio.core.common.util.BlockCoord;
+import crazypants.enderio.conduit.IConduit;
 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;
 
@@ -80,8 +77,11 @@ public class GasConduitNetwork extends AbstractGasTankConduitNetwork<GasConduit>
                 }
                 con.getTank().setGas(f);
                 BlockCoord bc = con.getLocation();
-                con.getBundle().getEntity().getWorldObj()
-                        .markTileEntityChunkModified(bc.x, bc.y, bc.z, con.getBundle().getEntity());
+                con.getBundle()
+                        .getEntity()
+                        .getWorldObj()
+                        .markTileEntityChunkModified(
+                                bc.x, bc.y, bc.z, con.getBundle().getEntity());
             }
         }
     }
@@ -154,7 +154,8 @@ public class GasConduitNetwork extends AbstractGasTankConduitNetwork<GasConduit>
     }
 
     public GasStack drain(ForgeDirection from, GasStack resource, boolean doDrain) {
-        if (resource == null || tank.isEmpty()
+        if (resource == null
+                || tank.isEmpty()
                 || !tank.containsValidGas()
                 || !GasConduitNetwork.areGassCompatable(getGasType(), resource)) {
             return null;
@@ -205,11 +206,11 @@ public class GasConduitNetwork extends AbstractGasTankConduitNetwork<GasConduit>
             GasStack couldDrain = gasType.copy();
             couldDrain.amount = maxExtract;
 
-            // GasStack drained = extTank.drain(dir.getOpposite(), couldDrain, true);
-            // if(drained == null || drained.amount <= 0) {
-            // return false;
-            // }
-            // tank.addAmount(drained.amount);
+            //      GasStack drained = extTank.drain(dir.getOpposite(), couldDrain, true);
+            //      if(drained == null || drained.amount <= 0) {
+            //        return false;
+            //      }
+            //      tank.addAmount(drained.amount);
 
             // Have to use this 'double handle' approach to work around an issue with TiC
             GasStack drained = extTank.drawGas(dir.getOpposite(), maxExtract);

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

@@ -1,17 +1,11 @@
 package crazypants.enderio.conduit.gas;
 
-import java.util.List;
-
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.common.util.ForgeDirection;
+import static com.enderio.core.client.render.CubeRenderer.addVecWithUV;
 
 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;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.IConduit;
@@ -20,17 +14,32 @@ 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 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;
 
 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,
-            double y, double z, float partialTick, float worldLight, RenderBlocks rb) {
+    public void renderEntity(
+            ConduitBundleRenderer conduitBundleRenderer,
+            IConduitBundle te,
+            IConduit conduit,
+            double x,
+            double y,
+            double z,
+            float partialTick,
+            float worldLight,
+            RenderBlocks rb) {
         super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb);
 
         if (!conduit.hasConnectionMode(ConnectionMode.INPUT) && !conduit.hasConnectionMode(ConnectionMode.OUTPUT)) {
@@ -54,8 +63,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;
@@ -86,8 +93,8 @@ public class GasConduitRenderer extends DefaultConduitRenderer {
                         vDir = RenderUtil.getUDirForFace(d);
                     } else if ((component.dir == ForgeDirection.NORTH || component.dir == ForgeDirection.SOUTH)
                             && d.offsetY != 0) {
-                                vDir = RenderUtil.getUDirForFace(d);
-                            }
+                        vDir = RenderUtil.getUDirForFace(d);
+                    }
 
                     float minU = texture.getMinU();
                     float maxU = texture.getMaxU();
@@ -101,17 +108,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);
                     }
                 }
             }
@@ -119,20 +124,15 @@ public class GasConduitRenderer extends DefaultConduitRenderer {
             if (conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) {
                 tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data);
                 List<Vertex> corners = component.bound.getCornersWithUvForFace(
-                        component.dir,
-                        tex.getMinU(),
-                        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);
+                        component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV());
+                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);
                 }
             }
         }
@@ -154,7 +154,7 @@ public class GasConduitRenderer extends DefaultConduitRenderer {
     }
 
     private int[] getClosest(ForgeDirection edge, List<Vertex> vertices) {
-        int[] res = new int[] { -1, -1 };
+        int[] res = new int[] {-1, -1};
         boolean highest = edge.offsetX > 0 || edge.offsetY > 0 || edge.offsetZ > 0;
         double minMax = highest ? -Double.MAX_VALUE : Double.MAX_VALUE;
         int index = 0;

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

@@ -1,8 +1,7 @@
 package crazypants.enderio.conduit.gas;
 
-import net.minecraftforge.common.util.ForgeDirection;
-
 import com.enderio.core.common.util.BlockCoord;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class GasOutput {
 

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

@@ -1,16 +1,14 @@
 package crazypants.enderio.conduit.gas;
 
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
-
 import com.enderio.core.common.util.BlockCoord;
-
 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;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
 
 public final class GasUtil {
 

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

@@ -1,11 +1,10 @@
 package crazypants.enderio.conduit.gas;
 
-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;
+import net.minecraftforge.common.util.ForgeDirection;
 
 @Interface(iface = "mekanism.api.gas.IGasHandler", modid = GasUtil.API_NAME)
 public interface IGasConduit extends IConduit, IGasHandler, IExtractor {

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

@@ -1,13 +1,7 @@
 package crazypants.enderio.conduit.gas;
 
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
 import com.enderio.core.api.client.gui.IAdvancedTooltipProvider;
 import com.enderio.core.client.handlers.SpecialTooltipHandler;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.EnderIO;
@@ -18,21 +12,22 @@ import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.ItemConduitSubtype;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.gui.IconEIO;
+import java.util.List;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 
 public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTooltipProvider {
 
-    private static final ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] {
-            new ItemConduitSubtype(ModObject.itemGasConduit.name(), "enderio:itemGasConduit"), };
+    private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] {
+        new ItemConduitSubtype(ModObject.itemGasConduit.name(), "enderio:itemGasConduit"),
+    };
 
     public static ItemGasConduit create() {
         ItemGasConduit result = new ItemGasConduit();
         if (GasUtil.isGasConduitEnabled()) {
             result.init();
-            ConduitDisplayMode.registerDisplayMode(
-                    new ConduitDisplayMode(
-                            IGasConduit.class,
-                            IconEIO.WRENCH_OVERLAY_GAS,
-                            IconEIO.WRENCH_OVERLAY_GAS_OFF));
+            ConduitDisplayMode.registerDisplayMode(new ConduitDisplayMode(
+                    IGasConduit.class, IconEIO.WRENCH_OVERLAY_GAS, IconEIO.WRENCH_OVERLAY_GAS_OFF));
         }
         return result;
     }
@@ -56,15 +51,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;

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

@@ -1,16 +1,14 @@
 package crazypants.enderio.conduit.gas;
 
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-
 import com.enderio.core.common.network.MessageTileEntity;
-
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import crazypants.util.ClientUtil;
 import io.netty.buffer.ByteBuf;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 
 public class PacketGasLevel extends MessageTileEntity<TileEntity> implements IMessageHandler<PacketGasLevel, IMessage> {
 

src/main/java/crazypants/enderio/conduit/geom/CollidableCache.java

@@ -1,18 +1,17 @@
 package crazypants.enderio.conduit.geom;
 
+import crazypants.enderio.conduit.IConduit;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-
 import net.minecraftforge.common.util.ForgeDirection;
 
-import crazypants.enderio.conduit.IConduit;
-
 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);

src/main/java/crazypants/enderio/conduit/geom/CollidableComponent.java

@@ -1,10 +1,8 @@
 package crazypants.enderio.conduit.geom;
 
-import net.minecraftforge.common.util.ForgeDirection;
-
 import com.enderio.core.client.render.BoundingBox;
-
 import crazypants.enderio.conduit.IConduit;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class CollidableComponent {
 
@@ -13,8 +11,8 @@ public class CollidableComponent {
     public final ForgeDirection dir;
     public final Object data;
 
-    public CollidableComponent(Class<? extends IConduit> conduitType, BoundingBox bound, ForgeDirection id,
-            Object data) {
+    public CollidableComponent(
+            Class<? extends IConduit> conduitType, BoundingBox bound, ForgeDirection id, Object data) {
         this.conduitType = conduitType;
         this.bound = bound;
         this.dir = id;
@@ -30,7 +28,8 @@ public class CollidableComponent {
     public boolean equals(Object obj) {
         if (obj instanceof CollidableComponent) {
             CollidableComponent other = (CollidableComponent) obj;
-            return conduitType == other.conduitType && bound.equals(((CollidableComponent) obj).bound)
+            return conduitType == other.conduitType
+                    && bound.equals(((CollidableComponent) obj).bound)
                     && dir == other.dir;
         }
         return false;
@@ -41,7 +40,8 @@ public class CollidableComponent {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((bound == null) ? 0 : bound.hashCode());
-        result = prime * result + ((conduitType == null) ? 0 : conduitType.getName().hashCode());
+        result = prime * result
+                + ((conduitType == null) ? 0 : conduitType.getName().hashCode());
         result = prime * result + ((dir == null) ? 0 : dir.hashCode());
         return result;
     }

src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java

@@ -1,17 +1,14 @@
 package crazypants.enderio.conduit.geom;
 
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Map;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
 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;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Map;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class ConduitGeometryUtil {
 
@@ -33,7 +30,8 @@ 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);
@@ -57,8 +55,8 @@ public class ConduitGeometryUtil {
         }
     }
 
-    private static BoundingBox[] createExternalConnector(ForgeDirection dir, float connectorDepth,
-            float connectorWidth) {
+    private static BoundingBox[] createExternalConnector(
+            ForgeDirection dir, float connectorDepth, float connectorWidth) {
 
         BoundingBox[] res = new BoundingBox[2];
 
@@ -79,8 +77,8 @@ public class ConduitGeometryUtil {
         return res;
     }
 
-    private static BoundingBox createConnectorComponent(ForgeDirection dir, float cornerMin, float cornerMax,
-            float depthMin, float depthMax) {
+    private static BoundingBox createConnectorComponent(
+            ForgeDirection dir, float cornerMin, float cornerMax, float depthMin, float depthMax) {
         float minX = (1 - Math.abs(dir.offsetX)) * cornerMin + dir.offsetX * depthMin;
         float minY = (1 - Math.abs(dir.offsetY)) * cornerMin + dir.offsetY * depthMin;
         float minZ = (1 - Math.abs(dir.offsetZ)) * cornerMin + dir.offsetZ * depthMin;
@@ -106,10 +104,10 @@ 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<>(
-            ConduitConnectorType.class);
+    private EnumMap<ConduitConnectorType, BoundingBox> connectorBounds =
+            new EnumMap<ConduitConnectorType, BoundingBox>(ConduitConnectorType.class);
 
     private ConduitGeometryUtil() {}
 
@@ -121,8 +119,8 @@ public class ConduitGeometryUtil {
         return EXTERNAL_CONNECTOR_BOUNDS.get(dir);
     }
 
-    public BoundingBox getBoundingBox(Class<? extends IConduit> type, ForgeDirection dir, boolean isStub,
-            Offset offset) {
+    public BoundingBox getBoundingBox(
+            Class<? extends IConduit> type, ForgeDirection dir, boolean isStub, Offset offset) {
         GeometryKey key = new GeometryKey(dir, isStub, offset, type);
         BoundingBox result = boundsCache.get(key);
         if (result == null) {
@@ -166,8 +164,8 @@ public class ConduitGeometryUtil {
         return createConduitBounds(type, key.dir, key.isStub, key.offset);
     }
 
-    private BoundingBox createConduitBounds(Class<? extends IConduit> type, ForgeDirection dir, boolean isStub,
-            Offset offset) {
+    private BoundingBox createConduitBounds(
+            Class<? extends IConduit> type, ForgeDirection dir, boolean isStub, Offset offset) {
         BoundingBox bb = CORE_BOUNDS;
 
         Vector3d min = bb.getMin();

src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java

@@ -2,14 +2,6 @@ package crazypants.enderio.conduit.geom;
 
 import static com.enderio.core.common.util.ForgeDirectionOffsets.offsetScaled;
 
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.List;
-
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import com.enderio.core.api.client.render.VertexTransform;
 import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.client.render.RenderUtil;
@@ -18,10 +10,17 @@ import com.enderio.core.client.render.VertexTransformComposite;
 import com.enderio.core.client.render.VertexTranslation;
 import com.enderio.core.common.vecmath.Vector3d;
 import com.enderio.core.common.vecmath.Vertex;
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.List;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.common.util.ForgeDirection;
 
 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 +82,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));
         }

src/main/java/crazypants/enderio/conduit/geom/GeometryKey.java

@@ -1,8 +1,7 @@
 package crazypants.enderio.conduit.geom;
 
-import net.minecraftforge.common.util.ForgeDirection;
-
 import crazypants.enderio.conduit.IConduit;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public final class GeometryKey {
 

src/main/java/crazypants/enderio/conduit/geom/Offset.java

@@ -8,7 +8,6 @@ import net.minecraftforge.common.util.ForgeDirection;
  * @author brad
  */
 public enum Offset {
-
     NONE(0, 0, 0),
     UP(ForgeDirection.UP),
     DOWN(ForgeDirection.DOWN),

src/main/java/crazypants/enderio/conduit/geom/Offsets.java

@@ -1,10 +1,5 @@
 package crazypants.enderio.conduit.geom;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.gas.IGasConduit;
 import crazypants.enderio.conduit.item.IItemConduit;
@@ -13,10 +8,13 @@ import crazypants.enderio.conduit.me.IMEConduit;
 import crazypants.enderio.conduit.oc.IOCConduit;
 import crazypants.enderio.conduit.power.IPowerConduit;
 import crazypants.enderio.conduit.redstone.IRedstoneConduit;
+import java.util.HashMap;
+import java.util.Map;
+import net.minecraftforge.common.util.ForgeDirection;
 
 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);

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

@@ -1,29 +1,24 @@
 package crazypants.enderio.conduit.gui;
 
-import java.awt.Color;
-import java.awt.Rectangle;
-import java.util.ArrayList;
-
-import javax.annotation.Nonnull;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.util.ResourceLocation;
-
 import com.enderio.core.api.client.gui.ITabPanel;
 import com.enderio.core.api.client.render.IWidgetIcon;
 import com.enderio.core.client.gui.button.CheckBox;
 import com.enderio.core.client.gui.widget.GuiToolTip;
 import com.enderio.core.client.handlers.SpecialTooltipHandler;
 import com.enderio.core.client.render.ColorUtil;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.item.FunctionUpgrade;
 import crazypants.enderio.conduit.packet.PacketConnectionMode;
 import crazypants.enderio.network.PacketHandler;
+import java.awt.*;
+import java.util.ArrayList;
+import javax.annotation.Nonnull;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.util.ResourceLocation;
 
 public class BaseSettingsPanel implements ITabPanel {
 
@@ -31,7 +26,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 +36,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;
@@ -72,13 +67,20 @@ public class BaseSettingsPanel implements ITabPanel {
     protected @Nonnull GuiToolTip filterExtractUpgradeTooltip;
     protected @Nonnull GuiToolTip filterInsertUpgradeTooltip;
 
-    protected BaseSettingsPanel(@Nonnull IWidgetIcon icon, @Nonnull String typeName, @Nonnull GuiExternalConnection gui,
+    protected BaseSettingsPanel(
+            @Nonnull IWidgetIcon icon,
+            @Nonnull String typeName,
+            @Nonnull GuiExternalConnection gui,
             @Nonnull IConduit con) {
         this(icon, typeName, gui, con, "externalConduitConnection");
     }
 
-    protected BaseSettingsPanel(@Nonnull IWidgetIcon icon, @Nonnull String typeName, @Nonnull GuiExternalConnection gui,
-            @Nonnull IConduit con, @Nonnull String texture) {
+    protected BaseSettingsPanel(
+            @Nonnull IWidgetIcon icon,
+            @Nonnull String typeName,
+            @Nonnull GuiExternalConnection gui,
+            @Nonnull IConduit con,
+            @Nonnull String texture) {
         this.icon = icon;
         this.typeName = typeName;
         this.gui = gui;
@@ -111,51 +113,51 @@ public class BaseSettingsPanel implements ITabPanel {
 
         x = rightColumn + 18 + 1;
 
-        filterExtractUpgradeTooltip = new GuiToolTip(
-                new Rectangle(rightColumn, 70, 18, 18),
-                EnderIO.lang.localize("gui.conduit.item.filterupgrade")) {
+        filterExtractUpgradeTooltip =
+                new GuiToolTip(
+                        new Rectangle(rightColumn, 70, 18, 18),
+                        EnderIO.lang.localize("gui.conduit.item.filterupgrade")) {
+                    @Override
+                    public boolean shouldDraw() {
+                        return !gui.getContainer().hasFilterUpgrades(true) && super.shouldDraw();
+                    }
+                };
 
-            @Override
-            public boolean shouldDraw() {
-                return !gui.getContainer().hasFilterUpgrades(true) && super.shouldDraw();
-            }
-        };
+        filterInsertUpgradeTooltip =
+                new GuiToolTip(
+                        new Rectangle(leftColumn, 70, 18, 18),
+                        EnderIO.lang.localize("gui.conduit.item.filterupgrade")) {
+                    @Override
+                    public boolean shouldDraw() {
+                        return !gui.getContainer().hasFilterUpgrades(false) && super.shouldDraw();
+                    }
+                };
 
-        filterInsertUpgradeTooltip = new GuiToolTip(
-                new Rectangle(leftColumn, 70, 18, 18),
-                EnderIO.lang.localize("gui.conduit.item.filterupgrade")) {
+        speedUpgradeTooltip =
+                new GuiToolTip(
+                        new Rectangle(rightColumn + 18, customTop + 43, 18, 18),
+                        EnderIO.lang.localize("gui.conduit.item.speedupgrade"),
+                        EnderIO.lang.localize("gui.conduit.item.speedupgrade2")) {
+                    @Override
+                    public boolean shouldDraw() {
+                        return !gui.getContainer().hasSpeedUpgrades() && super.shouldDraw();
+                    }
+                };
 
-            @Override
-            public boolean shouldDraw() {
-                return !gui.getContainer().hasFilterUpgrades(false) && super.shouldDraw();
-            }
-        };
-
-        speedUpgradeTooltip = new GuiToolTip(
-                new Rectangle(rightColumn + 18, customTop + 43, 18, 18),
-                EnderIO.lang.localize("gui.conduit.item.speedupgrade"),
-                EnderIO.lang.localize("gui.conduit.item.speedupgrade2")) {
-
-            @Override
-            public boolean shouldDraw() {
-                return !gui.getContainer().hasSpeedUpgrades() && super.shouldDraw();
-            }
-        };
-
-        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")));
         }
-        functionUpgradeTooltip = new GuiToolTip(
-                new Rectangle(rightColumn + 36, customTop + 43, 18, 18),
-                funcUpgradeTips.toArray(new String[0])) {
-
-            @Override
-            public boolean shouldDraw() {
-                return !gui.getContainer().hasFunctionUpgrades() && super.shouldDraw();
-            }
-        };
+        functionUpgradeTooltip =
+                new GuiToolTip(
+                        new Rectangle(rightColumn + 36, customTop + 43, 18, 18),
+                        funcUpgradeTips.toArray(new String[0])) {
+                    @Override
+                    public boolean shouldDraw() {
+                        return !gui.getContainer().hasFunctionUpgrades() && super.shouldDraw();
+                    }
+                };
 
         gui.getContainer().setInoutSlotsVisible(false, false);
     }

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

@@ -1,38 +1,32 @@
 package crazypants.enderio.conduit.gui;
 
-import java.awt.Point;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-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;
-
 import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot;
 import com.enderio.core.client.gui.widget.GhostSlot;
 import com.enderio.core.common.ContainerEnder;
 import com.enderio.core.common.util.ItemUtil;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.IConduitBundle;
 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;
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
-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 +49,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;
@@ -77,7 +70,6 @@ public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrade
             x = 131;
             y = 71;
             slotSpeedUpgrades = addSlotToContainer(new Slot(getInv(), 0, x, y) {
-
                 @Override
                 public boolean isItemValid(ItemStack par1ItemStack) {
                     return getInv().isItemValidForSlot(0, par1ItemStack);
@@ -94,7 +86,6 @@ public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrade
             x = 149;
             y = 71;
             slotFunctionUpgrades = addSlotToContainer(new Slot(getInv(), 1, x, y) {
-
                 @Override
                 public boolean isItemValid(ItemStack par1ItemStack) {
                     return getInv().isItemValidForSlot(1, par1ItemStack);
@@ -250,8 +241,9 @@ public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrade
 
             boolean merged = false;
             if (slotIndex < outputFilterUpgradeSlot) {
-                for (int targetSlotIdx = outputFilterUpgradeSlot; targetSlotIdx
-                        <= functionUpgradeSlot; targetSlotIdx++) {
+                for (int targetSlotIdx = outputFilterUpgradeSlot;
+                        targetSlotIdx <= functionUpgradeSlot;
+                        targetSlotIdx++) {
                     Slot targetSlot = (Slot) inventorySlots.get(targetSlotIdx);
                     if (targetSlot.xDisplayPosition >= 0 && mergeItemStackSpecial(origStack, targetSlot)) {
                         merged = true;
@@ -284,13 +276,7 @@ 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) {
             super(par1iInventory, par2, par3, par4);
         }

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

@@ -1,14 +1,11 @@
 package crazypants.enderio.conduit.gui;
 
-import javax.annotation.Nonnull;
-
-import net.minecraft.client.Minecraft;
-
-import org.lwjgl.opengl.GL11;
-
 import com.enderio.core.api.client.gui.IGuiScreen;
 import com.enderio.core.api.client.render.IWidgetIcon;
 import com.enderio.core.client.gui.button.TooltipButton;
+import javax.annotation.Nonnull;
+import net.minecraft.client.Minecraft;
+import org.lwjgl.opengl.GL11;
 
 public class FakeButton extends TooltipButton {
 
@@ -64,14 +61,15 @@ public class FakeButton extends TooltipButton {
             GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
             GL11.glEnable(GL11.GL_BLEND);
             GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-            icon.getMap().render(
-                    icon,
-                    xPosition + marginX,
-                    yPosition + marginY,
-                    width - 2 * marginX,
-                    height - 2 * marginY,
-                    0,
-                    true);
+            icon.getMap()
+                    .render(
+                            icon,
+                            xPosition + marginX,
+                            yPosition + marginY,
+                            width - 2 * marginX,
+                            height - 2 * marginY,
+                            0,
+                            true);
             GL11.glPopAttrib();
         }
     }

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

@@ -1,15 +1,9 @@
 package crazypants.enderio.conduit.gui;
 
-import java.awt.Color;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.util.IIcon;
-
 import com.enderio.core.client.gui.button.ColorButton;
 import com.enderio.core.client.render.ColorUtil;
 import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.common.util.DyeColor;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.IConduit;
@@ -20,7 +14,10 @@ import crazypants.enderio.gui.RedstoneModeButton;
 import crazypants.enderio.machine.IRedstoneModeControlable;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.network.PacketHandler;
+import java.awt.Color;
 import mekanism.api.gas.Gas;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.util.IIcon;
 
 public class GasSettings extends BaseSettingsPanel {
 
@@ -28,13 +25,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 +69,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 +100,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));
         }
     }

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

@@ -1,26 +1,9 @@
 package crazypants.enderio.conduit.gui;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import org.lwjgl.opengl.GL11;
-
 import com.enderio.core.api.client.gui.ITabPanel;
 import com.enderio.core.api.client.render.IWidgetIcon;
 import com.enderio.core.client.gui.widget.GhostSlot;
 import com.enderio.core.client.render.RenderUtil;
-
 import cpw.mods.fml.common.Optional;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IConduitBundle;
@@ -33,6 +16,19 @@ import crazypants.enderio.conduit.power.IPowerConduit;
 import crazypants.enderio.conduit.redstone.IRedstoneConduit;
 import crazypants.enderio.gui.GuiContainerBaseEIO;
 import crazypants.enderio.gui.IconEIO;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+import org.lwjgl.opengl.GL11;
 
 public class GuiExternalConnection extends GuiContainerBaseEIO {
 
@@ -50,7 +46,8 @@ 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 +63,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 +83,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) {
@@ -138,8 +135,8 @@ public class GuiExternalConnection extends GuiContainerBaseEIO {
     }
 
     /**
-     * Returns true when slots outside of standard gui bounds are clicked to prevent setting ghost filters dropping
-     * items on the ground.
+     * Returns true when slots outside of standard gui bounds are clicked to prevent
+     * setting ghost filters dropping items on the ground.
      */
     private boolean handleOobClick(int x, int y, int button) {
         boolean outOfBounds = x < guiLeft || y < guiTop || x >= guiLeft + xSize || y >= guiTop + ySize;

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

@@ -1,10 +1,17 @@
 package crazypants.enderio.conduit.gui;
 
+import com.enderio.core.client.render.ColorUtil;
+import com.enderio.core.common.util.BlockCoord;
+import crazypants.enderio.EnderIO;
+import crazypants.enderio.GuiHandler;
+import crazypants.enderio.conduit.IConduit;
+import crazypants.enderio.conduit.IConduitBundle;
+import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit;
+import crazypants.enderio.network.PacketHandler;
 import java.awt.Color;
 import java.awt.Point;
 import java.util.HashSet;
 import java.util.Set;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityClientPlayerMP;
@@ -14,17 +21,6 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.init.Blocks;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import com.enderio.core.client.render.ColorUtil;
-import com.enderio.core.common.util.BlockCoord;
-
-import crazypants.enderio.EnderIO;
-import crazypants.enderio.GuiHandler;
-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 {
 
     Set<ForgeDirection> cons;
@@ -34,7 +30,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 +48,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));

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

@@ -1,19 +1,5 @@
 package crazypants.enderio.conduit.gui;
 
-import java.awt.Color;
-import java.awt.Rectangle;
-import java.util.Collections;
-import java.util.List;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.fluids.FluidStack;
-
-import org.lwjgl.opengl.GL11;
-
 import com.enderio.core.client.gui.button.ColorButton;
 import com.enderio.core.client.gui.button.IconButton;
 import com.enderio.core.client.gui.button.ToggleButton;
@@ -21,7 +7,6 @@ import com.enderio.core.client.gui.widget.GuiToolTip;
 import com.enderio.core.client.render.ColorUtil;
 import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.common.util.DyeColor;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.IConduit;
@@ -35,6 +20,17 @@ import crazypants.enderio.gui.RedstoneModeButton;
 import crazypants.enderio.machine.IRedstoneModeControlable;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.network.PacketHandler;
+import java.awt.Color;
+import java.awt.Rectangle;
+import java.util.Collections;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.fluids.FluidStack;
+import org.lwjgl.opengl.GL11;
 
 public class LiquidSettings extends BaseSettingsPanel {
 
@@ -62,7 +58,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 +66,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;
 
@@ -139,13 +135,8 @@ public class LiquidSettings extends BaseSettingsPanel {
 
         if (isEnder) {
             x += rsB.getWidth();
-            roundRobinB = new ToggleButton(
-                    gui,
-                    ID_ROUND_ROBIN_BUTTON,
-                    x,
-                    y,
-                    IconEIO.ROUND_ROBIN_OFF,
-                    IconEIO.ROUND_ROBIN);
+            roundRobinB =
+                    new ToggleButton(gui, ID_ROUND_ROBIN_BUTTON, x, y, IconEIO.ROUND_ROBIN_OFF, IconEIO.ROUND_ROBIN);
             roundRobinB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinEnabled"));
             roundRobinB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinDisabled"));
             roundRobinB.setPaintSelectedBorder(false);
@@ -172,7 +163,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 +171,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 +275,6 @@ public class LiquidSettings extends BaseSettingsPanel {
         rsB.onGuiInit();
         colorB.onGuiInit();
 
-        gui.getContainer().setInventorySlotsVisible(true);
-
         if (!isEnder) {
             return;
         }
@@ -297,6 +286,7 @@ public class LiquidSettings extends BaseSettingsPanel {
         roundRobinB.onGuiInit();
         roundRobinB.setSelected(eConduit.isRoundRobin(gui.getDir()));
 
+        gui.getContainer().setInventorySlotsVisible(true);
         if (isFilterVisible()) {
             addFilterTooltips();
 

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

@@ -1,26 +1,23 @@
 package crazypants.enderio.conduit.gui;
 
-import java.awt.Color;
-
-import net.minecraft.client.gui.GuiButton;
-
 import com.enderio.core.client.gui.button.ColorButton;
 import com.enderio.core.client.render.ColorUtil;
 import com.enderio.core.common.util.DyeColor;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.oc.IOCConduit;
 import crazypants.enderio.conduit.packet.PacketOCConduitSignalColor;
 import crazypants.enderio.gui.IconEIO;
 import crazypants.enderio.network.PacketHandler;
+import java.awt.Color;
+import net.minecraft.client.gui.GuiButton;
 
 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 +39,7 @@ public class OCSettings extends BaseSettingsPanel {
     public void actionPerformed(GuiButton guiButton) {
         super.actionPerformed(guiButton);
         if (guiButton.id == ID_COLOR_BUTTON && cb != null) {
-            occon.setSignalColor(gui.getDir(), DyeColor.VALUES[cb.getColorIndex()]);
+            occon.setSignalColor(gui.getDir(), DyeColor.values()[cb.getColorIndex()]);
             PacketHandler.INSTANCE.sendToServer(new PacketOCConduitSignalColor(occon, gui.getDir()));
         }
     }

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

@@ -1,9 +1,6 @@
 package crazypants.enderio.conduit.gui;
 
-import net.minecraftforge.common.util.ForgeDirection;
-
 import com.enderio.core.common.util.DyeColor;
-
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
@@ -11,8 +8,8 @@ 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;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class PacketFluidChannel extends AbstractConduitPacket<ILiquidConduit>
         implements IMessageHandler<PacketFluidChannel, IMessage> {
@@ -24,8 +21,8 @@ public class PacketFluidChannel extends AbstractConduitPacket<ILiquidConduit>
 
     public PacketFluidChannel() {}
 
-    public PacketFluidChannel(AbstractEnderLiquidConduit eConduit, ForgeDirection dir, boolean isInput,
-            DyeColor channel) {
+    public PacketFluidChannel(
+            AbstractEnderLiquidConduit eConduit, ForgeDirection dir, boolean isInput, DyeColor channel) {
         super(eConduit.getBundle().getEntity(), ConTypeEnum.FLUID);
         this.dir = dir;
         this.isInput = isInput;
@@ -43,14 +40,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;

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

@@ -1,8 +1,5 @@
 package crazypants.enderio.conduit.gui;
 
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
@@ -12,8 +9,9 @@ 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;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class PacketFluidFilter extends AbstractConduitPacket<ILiquidConduit>
         implements IMessageHandler<PacketFluidFilter, IMessage> {
@@ -24,8 +22,8 @@ public class PacketFluidFilter extends AbstractConduitPacket<ILiquidConduit>
 
     public PacketFluidFilter() {}
 
-    public PacketFluidFilter(AbstractEnderLiquidConduit eConduit, ForgeDirection dir, FluidFilter filter,
-            boolean isInput) {
+    public PacketFluidFilter(
+            AbstractEnderLiquidConduit eConduit, ForgeDirection dir, FluidFilter filter, boolean isInput) {
         super(eConduit.getBundle().getEntity(), ConTypeEnum.FLUID);
         this.dir = dir;
         this.filter = filter;
@@ -45,7 +43,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 +52,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;

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

@@ -1,18 +1,15 @@
 package crazypants.enderio.conduit.gui;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import com.enderio.core.common.network.MessageTileEntity;
-
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.GuiHandler;
-import crazypants.util.ForgeDirections;
 import io.netty.buffer.ByteBuf;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class PacketOpenConduitUI extends MessageTileEntity<TileEntity>
         implements IMessageHandler<PacketOpenConduitUI, IMessage> {
@@ -35,7 +32,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) {

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

@@ -1,11 +1,10 @@
 package crazypants.enderio.conduit.gui;
 
-import net.minecraft.entity.player.EntityPlayerMP;
-
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import io.netty.buffer.ByteBuf;
+import net.minecraft.entity.player.EntityPlayerMP;
 
 public class PacketSlotVisibility implements IMessage, IMessageHandler<PacketSlotVisibility, IMessage> {
 

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

@@ -1,10 +1,7 @@
 package crazypants.enderio.conduit.gui;
 
-import net.minecraft.client.gui.GuiButton;
-
 import com.enderio.core.client.gui.button.ColorButton;
 import com.enderio.core.common.util.DyeColor;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.packet.PacketExtractMode;
@@ -14,6 +11,7 @@ import crazypants.enderio.gui.RedstoneModeButton;
 import crazypants.enderio.machine.IRedstoneModeControlable;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.network.PacketHandler;
+import net.minecraft.client.gui.GuiButton;
 
 public class PowerSettings extends BaseSettingsPanel {
 
@@ -21,9 +19,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 +57,7 @@ public class PowerSettings extends BaseSettingsPanel {
     public void actionPerformed(GuiButton guiButton) {
         super.actionPerformed(guiButton);
         if (guiButton.id == ID_COLOR_BUTTON) {
-            conduit.setExtractionSignalColor(gui.getDir(), DyeColor.VALUES[colorB.getColorIndex()]);
+            conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]);
             PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir()));
         }
     }

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

@@ -1,14 +1,9 @@
 package crazypants.enderio.conduit.gui;
 
-import java.awt.Color;
-
-import net.minecraft.client.gui.GuiButton;
-
 import com.enderio.core.client.gui.button.CheckBox;
 import com.enderio.core.client.gui.button.ColorButton;
 import com.enderio.core.client.render.ColorUtil;
 import com.enderio.core.common.util.DyeColor;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.packet.PacketRedstoneConduitOutputStrength;
@@ -16,6 +11,8 @@ import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor;
 import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit;
 import crazypants.enderio.gui.IconEIO;
 import crazypants.enderio.network.PacketHandler;
+import java.awt.Color;
+import net.minecraft.client.gui.GuiButton;
 
 public class RedstoneSettings extends BaseSettingsPanel {
 
@@ -25,8 +22,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 +58,7 @@ public class RedstoneSettings extends BaseSettingsPanel {
     public void actionPerformed(GuiButton guiButton) {
         super.actionPerformed(guiButton);
         if (guiButton.id == ID_COLOR_BUTTON && cb != null) {
-            insCon.setSignalColor(gui.getDir(), DyeColor.VALUES[cb.getColorIndex()]);
+            insCon.setSignalColor(gui.getDir(), DyeColor.values()[cb.getColorIndex()]);
             PacketHandler.INSTANCE.sendToServer(new PacketRedstoneConduitSignalColor(insCon, gui.getDir()));
         } else if (guiButton.id == ID_STRONG_BUTTON && strongCB != null) {
             insCon.setOutputStrength(gui.getDir(), strongCB.isSelected());

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

@@ -1,7 +1,6 @@
 package crazypants.enderio.conduit.gui;
 
 import com.enderio.core.api.client.gui.ITabPanel;
-
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.gas.IGasConduit;
 import crazypants.enderio.conduit.gui.item.ItemSettings;

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

@@ -1,19 +1,16 @@
 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;
+import net.minecraft.client.gui.GuiButton;
+import org.lwjgl.opengl.GL11;
 
 public class BasicItemFilterGui implements IItemFilterGui {
 
@@ -39,19 +36,28 @@ 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) {
+    public BasicItemFilterGui(
+            GuiContainerBaseEIO gui,
+            IItemFilterContainer filterContainer,
+            boolean isStickyModeAvailable,
+            boolean isInput) {
         this(gui, filterContainer, isStickyModeAvailable, isInput, isInput ? 104 : 6, 96, isInput ? 0 : 256);
     }
 
-    public BasicItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer,
-            boolean isStickyModeAvailable, boolean isInput, int xOffset, int yOffset, int buttonIdOffset) {
+    public BasicItemFilterGui(
+            GuiContainerBaseEIO gui,
+            IItemFilterContainer filterContainer,
+            boolean isStickyModeAvailable,
+            boolean isInput,
+            int xOffset,
+            int yOffset,
+            int buttonIdOffset) {
         this.gui = gui;
         this.isStickyModeAvailable = isStickyModeAvailable;
         this.filterContainer = filterContainer;
@@ -78,24 +84,14 @@ public class BasicItemFilterGui implements IItemFilterGui {
 
         x += 16;
         stickyB = new ToggleButton(
-                gui,
-                ID_STICKY + buttonIdOffset,
-                x,
-                y,
-                IconEIO.FILTER_STICKY_OFF,
-                IconEIO.FILTER_STICKY);
+                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);
+                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);
@@ -107,12 +103,11 @@ 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() {
         filter.createGhostSlots(gui.getGhostSlots(), xOffset + 1, yOffset + 1, new Runnable() {
-
             @Override
             public void run() {
                 sendFilterChange();
@@ -206,13 +201,17 @@ public class BasicItemFilterGui implements IItemFilterGui {
 
     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") };
+            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") };
+            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")
+            };
         }
     }
 }

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

@@ -1,19 +1,16 @@
 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;
+import net.minecraft.client.gui.GuiButton;
+import org.lwjgl.opengl.GL11;
 
 public class BigItemFilterGui implements IItemFilterGui {
 
@@ -39,17 +36,26 @@ 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;
 
-    public BigItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer,
-            boolean isStickyModeAvailable, boolean isInput) {
+    public BigItemFilterGui(
+            GuiContainerBaseEIO gui,
+            IItemFilterContainer filterContainer,
+            boolean isStickyModeAvailable,
+            boolean isInput) {
         this(gui, filterContainer, isStickyModeAvailable, isInput, isInput ? 104 : 6, 96, isInput ? 0 : 256);
     }
 
-    public BigItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer,
-            boolean isStickyModeAvailable, boolean isInput, int xOffset, int yOffset, int buttonIdOffset) {
+    public BigItemFilterGui(
+            GuiContainerBaseEIO gui,
+            IItemFilterContainer filterContainer,
+            boolean isStickyModeAvailable,
+            boolean isInput,
+            int xOffset,
+            int yOffset,
+            int buttonIdOffset) {
         this.gui = gui;
         this.isStickyModeAvailable = isStickyModeAvailable;
         this.filterContainer = filterContainer;
@@ -75,12 +81,7 @@ public class BigItemFilterGui implements IItemFilterGui {
 
         x += 16;
         useOreDictB = new ToggleButton(
-                gui,
-                ID_ORE_DICT + buttonIdOffset,
-                x,
-                y,
-                IconEIO.FILTER_ORE_DICT_OFF,
-                IconEIO.FILTER_ORE_DICT);
+                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);
@@ -92,16 +93,11 @@ 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(
-                gui,
-                ID_STICKY + buttonIdOffset,
-                x,
-                y,
-                IconEIO.FILTER_STICKY_OFF,
-                IconEIO.FILTER_STICKY);
+                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);
@@ -114,7 +110,6 @@ public class BigItemFilterGui implements IItemFilterGui {
 
     public void createFilterSlots() {
         filter.createGhostSlots(gui.getGhostSlots(), xOffset + 1, yOffset + 1, new Runnable() {
-
             @Override
             public void run() {
                 sendFilterChange();

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

@@ -1,23 +1,11 @@
 package crazypants.enderio.conduit.gui.item;
 
-import java.awt.Rectangle;
-import java.util.List;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.entity.RenderItem;
-import net.minecraft.item.ItemStack;
-
-import org.lwjgl.opengl.GL11;
-
 import com.enderio.core.api.client.gui.IGuiOverlay;
 import com.enderio.core.api.client.gui.IGuiScreen;
 import com.enderio.core.client.gui.button.IconButton;
 import com.enderio.core.client.gui.button.ToggleButton;
 import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.common.vecmath.Vector4f;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.gui.GuiExternalConnection;
 import crazypants.enderio.conduit.item.IItemConduit;
@@ -25,6 +13,14 @@ import crazypants.enderio.conduit.item.filter.ExistingItemFilter;
 import crazypants.enderio.conduit.packet.PacketItemConduitFilter;
 import crazypants.enderio.gui.IconEIO;
 import crazypants.enderio.network.PacketHandler;
+import java.awt.Rectangle;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.item.ItemStack;
+import org.lwjgl.opengl.GL11;
 
 public class ExistingItemFilterGui implements IItemFilterGui {
 
@@ -38,26 +34,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;
@@ -86,12 +82,7 @@ public class ExistingItemFilterGui implements IItemFilterGui {
 
         x += 16;
         stickyB = new ToggleButton(
-                gui,
-                ID_STICKY + buttonIdOffset,
-                x,
-                y,
-                IconEIO.FILTER_STICKY_OFF,
-                IconEIO.FILTER_STICKY);
+                gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY);
         String[] lines = EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled");
         stickyB.setSelectedToolTip(lines);
         stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled"));
@@ -105,37 +96,17 @@ public class ExistingItemFilterGui implements IItemFilterGui {
 
         x += 16;
         useOreDictB = new ToggleButton(
-                gui,
-                ID_ORE_DICT + buttonIdOffset,
-                x,
-                y,
-                IconEIO.FILTER_ORE_DICT_OFF,
-                IconEIO.FILTER_ORE_DICT);
+                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);
 
         snapshotB = new GuiButton(
-                ID_SNAPSHOT + buttonIdOffset,
-                0,
-                0,
-                56,
-                20,
-                EnderIO.lang.localize("gui.conduit.button.snap"));
+                ID_SNAPSHOT + buttonIdOffset, 0, 0, 56, 20, EnderIO.lang.localize("gui.conduit.button.snap"));
         mergeB = new GuiButton(
-                ID_MERGE + buttonIdOffset,
-                0,
-                0,
-                40,
-                20,
-                EnderIO.lang.localize("gui.conduit.button.merge"));
+                ID_MERGE + buttonIdOffset, 0, 0, 40, 20, EnderIO.lang.localize("gui.conduit.button.merge"));
         clearB = new GuiButton(
-                ID_CLEAR + buttonIdOffset,
-                0,
-                0,
-                56,
-                20,
-                EnderIO.lang.localize("gui.conduit.button.clear"));
+                ID_CLEAR + buttonIdOffset, 0, 0, 56, 20, EnderIO.lang.localize("gui.conduit.button.clear"));
         showB = new GuiButton(ID_SHOW + buttonIdOffset, 0, 0, 40, 20, EnderIO.lang.localize("gui.conduit.button.show"));
 
         snapshotOverlay = new SnapshotOverlay();
@@ -228,7 +199,8 @@ public class ExistingItemFilterGui implements IItemFilterGui {
         } else if (guiButton == whiteListB) {
             filter.setBlacklist(!filter.isBlacklist());
             sendSnapshotPacket(
-                    filter.isBlacklist() ? PacketExistingItemFilterSnapshot.Opcode.SET_BLACK
+                    filter.isBlacklist()
+                            ? PacketExistingItemFilterSnapshot.Opcode.SET_BLACK
                             : PacketExistingItemFilterSnapshot.Opcode.UNSET_BLACK);
         }
     }
@@ -238,8 +210,8 @@ public class ExistingItemFilterGui implements IItemFilterGui {
     }
 
     private void sendSnapshotPacket(PacketExistingItemFilterSnapshot.Opcode opcode) {
-        PacketHandler.INSTANCE
-                .sendToServer(new PacketExistingItemFilterSnapshot(itemConduit, gui.getDir(), isInput, opcode));
+        PacketHandler.INSTANCE.sendToServer(
+                new PacketExistingItemFilterSnapshot(itemConduit, gui.getDir(), isInput, opcode));
     }
 
     private void sendFilterChange() {
@@ -262,12 +234,12 @@ public class ExistingItemFilterGui implements IItemFilterGui {
 
     @Override
     public void renderCustomOptions(int top, float par1, int par2, int par3) {
-        // GL11.glColor3f(1, 1, 1);
-        // RenderUtil.bindTexture("enderio:textures/gui/itemFilter.png");
-        // gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 68, 0, 238, 18 * 5, 18);
-        // if(filter.isAdvanced()) {
-        // gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 86, 0, 238, 18 * 5, 18);
-        // }
+        //    GL11.glColor3f(1, 1, 1);
+        //    RenderUtil.bindTexture("enderio:textures/gui/itemFilter.png");
+        //    gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 68, 0, 238, 18 * 5, 18);
+        //    if(filter.isAdvanced()) {
+        //      gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 86, 0, 238, 18 * 5, 18);
+        //    }
     }
 
     class SnapshotOverlay implements IGuiOverlay {

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

@@ -1,13 +1,12 @@
 package crazypants.enderio.conduit.gui.item;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.item.IItemConduit;
 import crazypants.enderio.conduit.item.filter.IItemFilterUpgrade;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class InventoryUpgrades implements IInventory {
 

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

@@ -1,17 +1,16 @@
 package crazypants.enderio.conduit.gui.item;
 
-import net.minecraftforge.common.util.ForgeDirection;
-
 import crazypants.enderio.conduit.item.IItemConduit;
 import crazypants.enderio.conduit.item.filter.ItemFilter;
 import crazypants.enderio.conduit.packet.PacketItemConduitFilter;
 import crazypants.enderio.network.PacketHandler;
+import net.minecraftforge.common.util.ForgeDirection;
 
 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;

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

@@ -1,21 +1,11 @@
 package crazypants.enderio.conduit.gui.item;
 
-import java.awt.Color;
-
-import javax.annotation.Nonnull;
-
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-
-import org.lwjgl.opengl.GL11;
-
 import com.enderio.core.client.gui.button.ColorButton;
 import com.enderio.core.client.gui.button.MultiIconButton;
 import com.enderio.core.client.gui.button.ToggleButton;
 import com.enderio.core.client.render.ColorUtil;
 import com.enderio.core.client.render.EnderWidget;
 import com.enderio.core.common.util.DyeColor;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.IConduit;
@@ -31,7 +21,11 @@ import crazypants.enderio.gui.RedstoneModeButton;
 import crazypants.enderio.machine.IRedstoneModeControlable;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.network.PacketHandler;
-import crazypants.util.ColorUtils;
+import java.awt.*;
+import javax.annotation.Nonnull;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import org.lwjgl.opengl.GL11;
 
 public class ItemSettings extends BaseSettingsPanel {
 
@@ -44,7 +38,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 +49,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;
@@ -107,7 +101,6 @@ public class ItemSettings extends BaseSettingsPanel {
         colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel"));
 
         rsB = new RedstoneModeButton(gui, ID_REDSTONE_BUTTON, x, y, new IRedstoneModeControlable() {
-
             @Override
             public void setRedstoneControlMode(RedstoneControlMode mode) {
                 RedstoneControlMode curMode = getRedstoneControlMode();
@@ -128,7 +121,6 @@ public class ItemSettings extends BaseSettingsPanel {
         priDownB = MultiIconButton.createMinusButton(gui, ID_PRIORITY_DOWN, x, y + 8);
 
         FilterChangeListener fcl = new FilterChangeListener() {
-
             @Override
             public void onFilterChanged() {
                 if (insertFilterGui != null) {
@@ -175,7 +167,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()));
@@ -215,11 +206,9 @@ public class ItemSettings extends BaseSettingsPanel {
         } else if (guiButton.id == ID_EXTRACT_CHANNEL) {
             DyeColor col = DyeColor.fromIndex(extractChannelB.getColorIndex());
             itemConduit.setInputColor(gui.getDir(), col);
-        } else {
-            if (insertFilterGui != null) insertFilterGui.actionPerformed(guiButton);
-            if (extractFilterGui != null) extractFilterGui.actionPerformed(guiButton);
-            return;
         }
+        if (insertFilterGui != null) insertFilterGui.actionPerformed(guiButton);
+        if (extractFilterGui != null) extractFilterGui.actionPerformed(guiButton);
         PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
     }
 
@@ -241,7 +230,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);

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

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

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

@@ -1,24 +1,20 @@
 package crazypants.enderio.conduit.gui.item;
 
-import java.awt.Color;
-import java.awt.Rectangle;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.item.ItemStack;
-
-import org.lwjgl.opengl.GL11;
-
 import com.enderio.core.client.gui.button.IconButton;
 import com.enderio.core.client.render.ColorUtil;
-
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.gui.GuiExternalConnection;
 import crazypants.enderio.conduit.item.IItemConduit;
 import crazypants.enderio.conduit.item.filter.ModItemFilter;
 import crazypants.enderio.gui.IconEIO;
 import crazypants.enderio.network.PacketHandler;
+import java.awt.Color;
+import java.awt.Rectangle;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.item.ItemStack;
+import org.lwjgl.opengl.GL11;
 
 public class ModItemFilterGui implements IItemFilterGui {
 
@@ -37,6 +33,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 +52,16 @@ 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++) {
@@ -120,12 +121,7 @@ public class ModItemFilterGui implements IItemFilterGui {
             gui.drawTexturedModalRect(gui.getGuiLeft() + r.x - 1, gui.getGuiTop() + r.y - 1, 24, 214, 18, 18);
             // text box
             gui.drawTexturedModalRect(
-                    gui.getGuiLeft() + r.x + 38,
-                    gui.getGuiTop() + r.y - 1,
-                    tfTextureX,
-                    tfTextureY,
-                    tfWidth,
-                    18);
+                    gui.getGuiLeft() + r.x + 38, gui.getGuiTop() + r.y - 1, tfTextureX, tfTextureY, tfWidth, 18);
         }
 
         FontRenderer fr = Minecraft.getMinecraft().fontRenderer;