revert improvements from b284f46

See more: https://github.com/GTNewHorizons/EnderIO/pull/118

.gitignore

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

dependencies.gradle

@@ -1,30 +1,26 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.4.8:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.90-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.6.39:dev")
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:dev')
+    api('com.github.GTNewHorizons:EnderCore:0.2.17:dev')
+    implementation('com.github.GTNewHorizons:ForestryMC:4.6.14:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.4.3-GTNH:dev')
+    implementation("com.github.GTNewHorizons:GTNHLib:0.0.13:dev")
+    api('com.github.GTNewHorizons:BuildCraft:7.1.36:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
-    api("com.github.GTNewHorizons:TinkersConstruct:1.13.54-GTNH:dev")
 
-    compileOnly('com.github.GTNewHorizons:waila:1.8.14:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-688-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.464:dev') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.18-1.7.10:dev") {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.16.33:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.7-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.16.13-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.19-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.6.0:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-259-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.30:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.15.0:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.12.0-GTNH:api') {transitive = false}
+    implementation('com.github.GTNewHorizons:Chisel:2.11.4-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.17-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
-
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta56:api') {transitive = false}
 }

gradle.properties

@@ -1,109 +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 using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
-# See https://github.com/bsideup/jabel for details on how this works.
-enableModernJavaSyntax = true
-
-# Enables 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. 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
@@ -111,93 +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 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
-

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -85,8 +83,7 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,13 +130,10 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -147,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -155,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -204,11 +198,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -59,11 +57,11 @@ 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
 

settings.gradle

@@ -4,10 +4,10 @@ pluginManagement {
         maven {
             // RetroFuturaGradle
             name "GTNH Maven"
-            url "https://nexus.gtnewhorizons.com/repository/public/"
+            url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+            allowInsecureProtocol = true
             mavenContent {
-                includeGroup("com.gtnewhorizons")
-                includeGroupByRegex("com\\.gtnewhorizons\\..+")
+                includeGroup("com.gtnewhorizons.retrofuturagradle")
             }
         }
         gradlePluginPortal()
@@ -17,7 +17,12 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43'
+    id 'com.diffplug.blowdryerSetup' version '1.6.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains
 }
 
-
+blowdryerSetup {
+    repoSubfolder 'gtnhShared'
+    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.0')
+    //devLocal '.' // Use this when testing config updates locally
+}

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

@@ -1,5 +1,8 @@
 package crazypants.enderio;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -27,29 +30,39 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.conduit.BlockConduitBundle;
 import crazypants.enderio.conduit.IConduit;
+import crazypants.enderio.conduit.TileConduitBundle;
 import crazypants.enderio.conduit.facade.FacadeRenderer;
 import crazypants.enderio.conduit.gas.GasConduit;
+import crazypants.enderio.conduit.gas.GasConduitRenderer;
 import crazypants.enderio.conduit.gas.GasUtil;
 import crazypants.enderio.conduit.item.ItemConduit;
 import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.AdvancedLiquidConduit;
+import crazypants.enderio.conduit.liquid.AdvancedLiquidConduitRenderer;
 import crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.CrystallinePinkSlimeEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.EnderLiquidConduit;
+import crazypants.enderio.conduit.liquid.EnderLiquidConduitRenderer;
 import crazypants.enderio.conduit.liquid.LiquidConduit;
+import crazypants.enderio.conduit.liquid.LiquidConduitRenderer;
 import crazypants.enderio.conduit.liquid.MelodicEnderLiquidConduit;
 import crazypants.enderio.conduit.liquid.StellarEnderLiquidConduit;
 import crazypants.enderio.conduit.me.MEConduit;
 import crazypants.enderio.conduit.me.MEUtil;
 import crazypants.enderio.conduit.oc.OCConduit;
+import crazypants.enderio.conduit.oc.OCConduitRenderer;
 import crazypants.enderio.conduit.oc.OCUtil;
 import crazypants.enderio.conduit.power.PowerConduit;
+import crazypants.enderio.conduit.power.PowerConduitRenderer;
 import crazypants.enderio.conduit.power.endergy.PowerConduitEndergy;
 import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit;
+import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduitRenderer;
 import crazypants.enderio.conduit.redstone.RedstoneConduit;
 import crazypants.enderio.conduit.redstone.RedstoneSwitch;
+import crazypants.enderio.conduit.redstone.RedstoneSwitchRenderer;
 import crazypants.enderio.conduit.render.ConduitBundleRenderer;
 import crazypants.enderio.conduit.render.ConduitRenderer;
+import crazypants.enderio.conduit.render.DefaultConduitRenderer;
 import crazypants.enderio.conduit.render.ItemConduitRenderer;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.enderface.EnderIoRenderer;
@@ -103,8 +116,11 @@ import crazypants.enderio.machine.painter.BlockPaintedFenceGateRenderer;
 import crazypants.enderio.machine.painter.BlockPaintedGlowstone;
 import crazypants.enderio.machine.painter.PaintedBlockRenderer;
 import crazypants.enderio.machine.painter.PaintedItemRenderer;
+import crazypants.enderio.machine.power.BlockCapacitorBank;
+import crazypants.enderio.machine.power.CapBankRenderer2;
+import crazypants.enderio.machine.power.CapacitorBankRenderer;
 import crazypants.enderio.machine.ranged.RangeEntity;
-import crazypants.enderio.machine.ranged.RangeRenderer;
+import crazypants.enderio.machine.ranged.RangeRenerer;
 import crazypants.enderio.machine.reservoir.ReservoirRenderer;
 import crazypants.enderio.machine.reservoir.TileReservoir;
 import crazypants.enderio.machine.solar.BlockSolarPanel;
@@ -150,6 +166,10 @@ public class ClientProxy extends CommonProxy {
     };
     // @formatter:on
 
+    private final List<ConduitRenderer> conduitRenderers = new ArrayList<ConduitRenderer>();
+
+    private final DefaultConduitRenderer dcr = new DefaultConduitRenderer();
+
     private ConduitBundleRenderer cbr;
 
     private boolean checkedNei = false;
@@ -318,6 +338,13 @@ public class ClientProxy extends CommonProxy {
             ClientRegistry.bindTileEntitySpecialRenderer(TileCapBank.class, newCbr);
         }
 
+        CapacitorBankRenderer capr = new CapacitorBankRenderer();
+        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCapacitorBank), capr);
+
+        BlockCapacitorBank.renderId = RenderingRegistry.getNextAvailableRenderId();
+        CapBankRenderer2 cbr2 = new CapBankRenderer2();
+        RenderingRegistry.registerBlockHandler(cbr2);
+
         BlockVacuumChest.renderId = RenderingRegistry.getNextAvailableRenderId();
         VacuumChestRenderer vcr = new VacuumChestRenderer();
         RenderingRegistry.registerBlockHandler(vcr);
@@ -367,6 +394,7 @@ public class ClientProxy extends CommonProxy {
         cbr = new ConduitBundleRenderer((float) Config.conduitScale);
         BlockConduitBundle.rendererId = RenderingRegistry.getNextAvailableRenderId();
         RenderingRegistry.registerBlockHandler(cbr);
+        ClientRegistry.bindTileEntitySpecialRenderer(TileConduitBundle.class, cbr);
 
         ClientRegistry.bindTileEntitySpecialRenderer(TileTravelAnchor.class, new TravelEntitySpecialRenderer());
 
@@ -375,6 +403,20 @@ public class ClientProxy extends CommonProxy {
         RenderingRegistry.registerBlockHandler(esk);
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEndermanSkull), esk);
 
+        conduitRenderers.add(RedstoneSwitchRenderer.getInstance());
+        conduitRenderers.add(new AdvancedLiquidConduitRenderer());
+        conduitRenderers.add(LiquidConduitRenderer.create());
+        conduitRenderers.add(new PowerConduitRenderer());
+        conduitRenderers.add(new InsulatedRedstoneConduitRenderer());
+        conduitRenderers.add(new EnderLiquidConduitRenderer());
+        conduitRenderers.add(new crazypants.enderio.conduit.item.ItemConduitRenderer());
+        if (GasUtil.isGasConduitEnabled()) {
+            conduitRenderers.add(new GasConduitRenderer());
+        }
+        if (OCUtil.isOCEnabled()) {
+            conduitRenderers.add(new OCConduitRenderer());
+        }
+
         EnderIoRenderer eior = new EnderIoRenderer();
         ClientRegistry.bindTileEntitySpecialRenderer(TileEnderIO.class, eior);
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEnderIo), eior);
@@ -409,7 +451,7 @@ public class ClientProxy extends CommonProxy {
         FMLCommonHandler.instance().bus().register(KeyTracker.instance);
 
         RenderingRegistry.registerEntityRenderingHandler(SoundEntity.class, new SoundRenderer());
-        RenderingRegistry.registerEntityRenderingHandler(RangeEntity.class, new RangeRenderer());
+        RenderingRegistry.registerEntityRenderingHandler(RangeEntity.class, new RangeRenerer());
 
         MinecraftForge.EVENT_BUS.register(SoundDetector.instance);
         FMLCommonHandler.instance().bus().register(SoundDetector.instance);
@@ -438,7 +480,12 @@ public class ClientProxy extends CommonProxy {
 
     @Override
     public ConduitRenderer getRendererForConduit(IConduit conduit) {
-        return conduit.getRenderer();
+        for (ConduitRenderer renderer : conduitRenderers) {
+            if (renderer.isRendererForConduit(conduit)) {
+                return renderer;
+            }
+        }
+        return dcr;
     }
 
     @Override

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

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

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

@@ -1,8 +1,6 @@
 package crazypants.enderio;
 
-import static crazypants.enderio.EnderIO.MODID;
-import static crazypants.enderio.EnderIO.MOD_NAME;
-import static crazypants.enderio.EnderIO.VERSION;
+import static crazypants.enderio.EnderIO.*;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -62,7 +60,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;
@@ -132,6 +129,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,23 +179,18 @@ import crazypants.enderio.thaumcraft.ThaumcraftCompat;
 import crazypants.enderio.tool.EnderIOCrashCallable;
 import crazypants.util.EE3Util;
 
-@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = """
-        required-after:CoFHLib@[1.7.10R1.0.3B3,);\
-        required-after:endercore;\
-        required-after:gtnhlib@[0.2.10,);\
-        after:MineFactoryReloaded;\
-        after:Forestry;\
-        after:Waila@[1.5.8,);\
-        after:Thaumcraft;\
-        after:appliedenergistics2@[rv2-beta-8,);\
-        after:Railcraft@[9.16.7,)\
-        """, 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;
@@ -212,7 +205,7 @@ 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 hasGT5 = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi_post");
 
     // Materials
     public static ItemCapacitor itemBasicCapacitor;
@@ -269,7 +262,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;
@@ -284,6 +276,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;
@@ -393,6 +386,7 @@ public class EnderIO {
 
         blockCrusher = BlockCrusher.create();
         blockAlloySmelter = BlockAlloySmelter.create();
+        blockCapacitorBank = BlockCapacitorBank.create();
         blockCapBank = BlockCapBank.create();
 
         blockPainter = BlockPainter.create();
@@ -473,7 +467,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();
@@ -812,6 +805,7 @@ public class EnderIO {
         return Config.xpJuiceName;
     }
 
+    @SuppressWarnings("unchecked")
     private void addModIntegration() {
 
         if (Loader.isModLoaded("TConstruct")) {
@@ -822,7 +816,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");

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

@@ -18,7 +18,6 @@ public enum ModObject {
     itemBasicFilterUpgrade,
     itemBigFilterUpgrade,
     itemExistingItemFilter,
-    itemLimitedItemFilter,
     itemModItemFilter,
     itemPowerItemFilter,
     itemExtractSpeedUpgrade,
@@ -55,6 +54,7 @@ public enum ModObject {
     blockReservoir,
     blockAlloySmelter,
     blockSolarPanel,
+    blockCapacitorBank,
     blockCapBank,
     blockSagMill,
     blockHyperCube,

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

@@ -81,7 +81,7 @@ public enum TravelSource {
             return 0;
         }
 
-        TravelSource source = TravelController.instance.getTravelItemTravelSource(player, false);
+        TravelSource source = TravelController.instance.getTravelItemTravelSource(player);
         if (source == null) {
             return TravelSource.BLOCK.getMaxDistanceTravelledSq();
         } else {

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

@@ -148,9 +148,10 @@ public class BlockDarkSteelPressurePlate extends BlockPressurePlate
         return super.colorMultiplier(world, x, y, z);
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item arg0, CreativeTabs arg1, List<ItemStack> items) {
+    public void getSubBlocks(Item arg0, CreativeTabs arg1, List items) {
         items.add(new ItemStack(this, 1, 0));
         items.add(new ItemStack(this, 1, 1));
     }

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

@@ -23,6 +23,7 @@ public class ContainerDarkSteelAnvil extends ContainerRepair {
     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);

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

@@ -67,6 +67,7 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
         if (MicroblocksUtil.supportMicroblocks() && tryAddToMicroblocks(stack, player, world, x, y, z, side)) {
             return true;
         }
+
         BlockCoord placeAt = Util.canPlaceItem(stack, EnderIO.blockConduitBundle, player, world, x, y, z, side);
         if (placeAt != null) {
             if (!world.isRemote) {
@@ -83,7 +84,9 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
                 stack.stackSize--;
             }
             return true;
+
         } else {
+
             ForgeDirection dir = ForgeDirection.values()[side];
             int placeX = x + dir.offsetX;
             int placeY = y + dir.offsetY;
@@ -113,6 +116,7 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
                 }
             }
         }
+
         return false;
     }
 
@@ -158,7 +162,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()) {
@@ -190,8 +195,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

@@ -160,6 +160,7 @@ public class BlockConduitBundle extends BlockEio
 
         BlockConduitBundle result = new BlockConduitBundle();
         result.init();
+        MinecraftForge.EVENT_BUS.register(result);
         return result;
     }
 
@@ -291,6 +292,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();
@@ -298,7 +334,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
@@ -438,6 +473,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() {
@@ -588,8 +641,8 @@ public class BlockConduitBundle extends BlockEio
 
     @Override
     public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player) {
-        ITool tool = ToolUtil.getEquippedTool(player);
-        if (!player.isSneaking() || tool == null || !tool.canUse(player.getCurrentEquippedItem(), player, x, y, z)) {
+        ItemStack equipped = player.getCurrentEquippedItem();
+        if (!player.isSneaking() || equipped == null || equipped.getItem() != EnderIO.itemYetaWench) {
             return;
         }
         ConduitUtil.openConduitGui(world, x, y, z, player);
@@ -870,7 +923,7 @@ public class BlockConduitBundle extends BlockEio
 
     @Override
     public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb,
-            List<AxisAlignedBB> arraylist, Entity par7Entity) {
+            @SuppressWarnings("rawtypes") List arraylist, Entity par7Entity) {
 
         if (MicroblocksUtil.supportMicroblocks()) {
             IM__addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity);
@@ -1208,8 +1261,9 @@ public class BlockConduitBundle extends BlockEio
         return IMultipartSystem.instance.hook_collisionRayTrace(cur, world, x, y, z, src, dst);
     }
 
-    private void IM__addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask,
-            List<AxisAlignedBB> list, Entity entity) {
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    private void IM__addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask, List list,
+            Entity entity) {
         IMultipartSystem.instance.hook_addCollisionBoxesToList(world, x, y, z, mask, list, entity);
     }
 
@@ -1221,61 +1275,4 @@ public class BlockConduitBundle extends BlockEio
     private boolean hasMicroblocks(IConduitBundle bundle) {
         return !bundle.getCoverSystem().getAllParts().isEmpty();
     }
-
-    public class EventHandler {
-
-        @SideOnly(Side.CLIENT)
-        @SubscribeEvent
-        public void onPlaySound(PlaySoundSourceEvent event) {
-            String path = event.sound.getPositionedSoundLocation().getResourcePath();
-            if ("silence.step".equals(path)) {
-                ISound snd = event.sound;
-                World world = EnderIO.proxy.getClientWorld();
-                if (world == null) return;
-                BlockCoord bc = new BlockCoord(snd.getXPosF(), snd.getYPosF(), snd.getZPosF());
-                TileEntity te = bc.getTileEntity(world);
-                if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
-                    Block facade = getFacade(world, bc.x, bc.y, bc.z, -1);
-                    ConduitUtil.playHitSound(facade.stepSound, world, bc.x, bc.y, bc.z);
-                } else {
-                    ConduitUtil.playHitSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z);
-                }
-            }
-        }
-
-        @SideOnly(Side.CLIENT)
-        @SubscribeEvent
-        public void onPlaySoundAtEntity(PlaySoundAtEntityEvent event) {
-            String path = event.name;
-            World world = event.entity.worldObj;
-            if ("EnderIO:silence.step".equals(path) && world.isRemote) {
-                BlockCoord bc = new BlockCoord(event.entity.posX, event.entity.posY - 2, event.entity.posZ);
-                TileEntity te = bc.getTileEntity(world);
-                if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
-                    Block facade = getFacade(world, bc.x, bc.y, bc.z, -1);
-                    ConduitUtil.playStepSound(facade.stepSound, world, bc.x, bc.y, bc.z);
-                } else {
-                    ConduitUtil.playStepSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z);
-                }
-            }
-        }
-
-        @SubscribeEvent
-        public void onBreakSpeed(BreakSpeed event) {
-            if (event.block == BlockConduitBundle.this) {
-                ItemStack held = event.entityPlayer.getCurrentEquippedItem();
-                if (held == null || held.getItem().getHarvestLevel(held, "pickaxe") == -1) {
-                    event.newSpeed += 2;
-                }
-                IConduitBundle te = (IConduitBundle) event.entity.worldObj.getTileEntity(event.x, event.y, event.z);
-                if (te != null && te.getFacadeType() == FacadeType.HARDENED) {
-                    if (!ConduitUtil.isSolidFacadeRendered(te, event.entityPlayer)) {
-                        event.newSpeed *= 6;
-                    } else {
-                        event.newSpeed *= 2;
-                    }
-                }
-            }
-        }
-    }
 }

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

@@ -1,15 +1,6 @@
 package crazypants.enderio.conduit;
 
-import static crazypants.enderio.gui.IconEIO.CROSS;
-import static crazypants.enderio.gui.IconEIO.TICK;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_FLUID;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_FLUID_OFF;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_ITEM;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_ITEM_OFF;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_POWER;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_POWER_OFF;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_REDSTONE;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_REDSTONE_OFF;
+import static crazypants.enderio.gui.IconEIO.*;
 
 import java.util.List;
 

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

@@ -1,20 +1,10 @@
 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.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.endergy.AlloyEndergy.*;
 import static crazypants.util.RecipeUtil.addShaped;
 
 import net.minecraft.init.Blocks;
@@ -601,9 +591,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 +675,7 @@ public class ConduitRecipes {
         String fluix = "crystalFluix";
         String pureFluix = "crystalPureFluix";
 
-        ItemStack quartzFiber = AEApi.instance().definitions().parts().quartzFiber().maybeStack(1).get().copy();
+        ItemStack quartzFiber = AEApi.instance().parts().partQuartzFiber.stack(1).copy();
         ItemStack conduitBinder = new ItemStack(EnderIO.itemMaterial, 1, Material.CONDUIT_BINDER.ordinal());
         ItemStack res = new ItemStack(EnderIO.itemMEConduit, Config.numConduitsPerRecipe / 2);
 
@@ -697,6 +684,10 @@ public class ConduitRecipes {
 
         res.stackSize = 1;
         ItemStack resDense = new ItemStack(EnderIO.itemMEConduit, 1, 1);
+        ItemStack resUltra = new ItemStack(EnderIO.itemMEConduit, 1, 2);
         addShaped(resDense, "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', res);
+        if (Config.enableMEUltraDenseConduits) {
+            addShaped(resUltra, "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', resDense);
+        }
     }
 }

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

@@ -43,7 +43,7 @@ public class ConduitUtil {
 
     public static final Random RANDOM = new Random();
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     public static void ensureValidNetwork(IConduit conduit) {
         TileEntity te = conduit.getBundle().getEntity();
         World world = te.getWorldObj();
@@ -54,15 +54,13 @@ public class ConduitUtil {
             return;
         }
 
-        @SuppressWarnings("rawtypes")
         AbstractConduitNetwork res = conduit.createNetworkForType();
         res.init(conduit.getBundle(), connections, world);
         return;
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     private static boolean reuseNetwork(IConduit con, Collection<? extends IConduit> connections, World world) {
-        @SuppressWarnings("rawtypes")
         AbstractConduitNetwork network = null;
         for (IConduit conduit : connections) {
             if (network == null) {
@@ -160,7 +158,7 @@ public class ConduitUtil {
     }
 
     public static boolean isFacadeHidden(IConduitBundle bundle, EntityPlayer player) {
-        return bundle != null && bundle.getFacadeId() != null && shouldHeldItemHideFacades(player);
+        return bundle.getFacadeId() != null && shouldHeldItemHideFacades(player);
     }
 
     public static ConduitDisplayMode getDisplayMode(EntityPlayer player) {

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

@@ -17,7 +17,6 @@ import com.enderio.core.common.util.BlockCoord;
 
 import crazypants.enderio.conduit.geom.CollidableCache.CacheKey;
 import crazypants.enderio.conduit.geom.CollidableComponent;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 
 public interface IConduit {
 
@@ -142,6 +141,4 @@ public interface IConduit {
      * Should the texture of the conduit connectors be mirrored around the conduit node?
      */
     boolean shouldMirrorTexture();
-
-    ConduitRenderer getRenderer();
 }

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

@@ -49,8 +49,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/TileConduitBundle.java

@@ -25,7 +25,6 @@ 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;
@@ -67,7 +66,7 @@ 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;
@@ -75,9 +74,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;
@@ -405,29 +404,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[ForgeDirection.values().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(ForgeDirection.values()[i], nbt);
-            }
-        }
-    }
-
     @Override
     public void removeConduit(IConduit conduit) {
         if (conduit != null) {
@@ -452,7 +428,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);
         }
@@ -537,12 +513,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()) {
@@ -966,6 +941,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
         return (IGridNode) node;
     }
 
+    @SuppressWarnings("cast")
     @Override
     @Method(modid = "appliedenergistics2")
     public void setGridNode(Object node) {

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

@@ -16,7 +16,7 @@ import crazypants.enderio.ModObject;
 import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.machine.painter.IPaintedBlock;
 
-public class BlockConduitFacade extends BlockEio implements IPaintedBlock, Cloneable {
+public class BlockConduitFacade extends BlockEio implements IPaintedBlock {
 
     public static BlockConduitFacade create() {
         BlockConduitFacade result = new BlockConduitFacade();
@@ -24,10 +24,6 @@ public class BlockConduitFacade extends BlockEio implements IPaintedBlock, Clone
         return result;
     }
 
-    public BlockConduitFacade clone() throws CloneNotSupportedException {
-        return (BlockConduitFacade) super.clone();
-    }
-
     private Block blockOverride;
 
     private BlockConduitFacade() {
@@ -109,6 +105,7 @@ public class BlockConduitFacade extends BlockEio implements IPaintedBlock, Clone
         }
 
         Block block = cb.getFacadeId();
+        int meta = cb.getFacadeMetadata();
         if (block == null || block == this) {
             return;
         }

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

@@ -65,9 +65,10 @@ 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) {
+    public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) {
         for (FacadeType t : FacadeType.values()) {
             list.add(new ItemStack(item, 1, t.ordinal()));
         }
@@ -170,9 +171,10 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
         return result;
     }
 
+    @SuppressWarnings("rawtypes")
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List<String> list, boolean par4) {
+    public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) {
         super.addInformation(item, par2EntityPlayer, list, par4);
     }
 
@@ -181,13 +183,15 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
         return getUnlocalizedName();
     }
 
+    @SuppressWarnings("rawtypes")
     @Override
     @SideOnly(Side.CLIENT)
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     @SideOnly(Side.CLIENT)
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         if (PainterUtil.getSourceBlock(itemstack) == null) {
             list.add(EnderIO.lang.localize("item.itemConduitFacade.tooltip.notpainted"));
         } else {
@@ -195,9 +199,10 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
         }
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     @SideOnly(Side.CLIENT)
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack);
         if (itemstack.getItemDamage() == FacadeType.HARDENED.ordinal()) {
             list.add("");

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

@@ -10,6 +10,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.client.render.IconUtil;
+import com.enderio.core.common.util.BlockCoord;
 
 import cpw.mods.fml.common.Optional.Method;
 import cpw.mods.fml.relauncher.Side;
@@ -19,7 +20,6 @@ import crazypants.enderio.conduit.AbstractConduitNetwork;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.geom.CollidableComponent;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.config.Config;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasStack;
@@ -34,12 +34,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 +82,7 @@ public class GasConduit extends AbstractGasTankConduit {
     }
 
     private void doExtract() {
+        BlockCoord loc = getLocation();
         if (!hasConnectionMode(ConnectionMode.INPUT)) {
             return;
         }
@@ -101,6 +97,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/GasConduitRenderer.java

@@ -1,13 +1,15 @@
 package crazypants.enderio.conduit.gas;
 
+import static com.enderio.core.client.render.CubeRenderer.addVecWithUV;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.client.render.BoundingBox;
-import com.enderio.core.client.render.CubeRenderer;
 import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.common.vecmath.Vector3d;
 import com.enderio.core.common.vecmath.Vertex;
@@ -20,13 +22,15 @@ import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.geom.ConnectionModeGeometry;
 import crazypants.enderio.conduit.geom.Offset;
 import crazypants.enderio.conduit.render.ConduitBundleRenderer;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.conduit.render.DefaultConduitRenderer;
 import mekanism.api.gas.GasStack;
 
 public class GasConduitRenderer extends DefaultConduitRenderer {
 
-    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal.withInitial(GasConduitRenderer::new);
+    @Override
+    public boolean isRendererForConduit(IConduit conduit) {
+        return conduit instanceof GasConduit;
+    }
 
     @Override
     public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x,
@@ -54,8 +58,6 @@ public class GasConduitRenderer extends DefaultConduitRenderer {
     @Override
     protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) {
         super.renderConduit(tex, conduit, component, brightness);
-        final CubeRenderer cr = CubeRenderer.get();
-        int i;
 
         if (isNSEWUD(component.dir)) {
             GasConduit lc = (GasConduit) conduit;
@@ -101,17 +103,15 @@ public class GasConduitRenderer extends DefaultConduitRenderer {
                     List<Vertex> corners = bb.getCornersWithUvForFace(d, minU, maxU, minV, maxV);
                     moveEdgeCorners(corners, vDir, width);
                     moveEdgeCorners(corners, component.dir.getOpposite(), sideScale);
-                    for (i = 0; i < corners.size(); i++) {
-                        final Vertex c = corners.get(i);
-                        cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                    for (Vertex c : corners) {
+                        addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                     }
 
                     corners = bb.getCornersWithUvForFace(d, minU, maxU, minV, maxV);
                     moveEdgeCorners(corners, vDir.getOpposite(), width);
                     moveEdgeCorners(corners, component.dir.getOpposite(), sideScale);
-                    for (i = 0; i < corners.size(); i++) {
-                        final Vertex c = corners.get(i);
-                        cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                    for (Vertex c : corners) {
+                        addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                     }
                 }
             }
@@ -124,15 +124,14 @@ public class GasConduitRenderer extends DefaultConduitRenderer {
                         tex.getMaxU(),
                         tex.getMinV(),
                         tex.getMaxV());
-
-                for (i = 0; i < corners.size(); i++) {
-                    final Vertex c = corners.get(i);
-                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                Tessellator tessellator = Tessellator.instance;
+                for (Vertex c : corners) {
+                    addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                 }
                 // back face
-                for (i = corners.size() - 1; i >= 0; i--) {
-                    final Vertex c = corners.get(i);
-                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                for (int i = corners.size() - 1; i >= 0; i--) {
+                    Vertex c = corners.get(i);
+                    addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                 }
             }
         }

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

@@ -56,15 +56,15 @@ public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTool
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         String gpt = " " + EnderIO.lang.localize("gas.gasTick");
         int extractRate = Config.gasConduitExtractRate;
         int maxIo = Config.gasConduitMaxIoRate;

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

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

@@ -107,7 +107,7 @@ public class BasicItemFilterGui implements IItemFilterGui {
         useNbtB.setPaintSelectedBorder(false);
 
         x += 16;
-        fuzzyB = new CycleButton<>(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
+        fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
     }
 
     public void createFilterSlots() {

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

@@ -92,7 +92,7 @@ public class BigItemFilterGui implements IItemFilterGui {
         useNbtB.setPaintSelectedBorder(false);
 
         x += 16;
-        fuzzyB = new CycleButton<>(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
+        fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
 
         x += 16;
         stickyB = new ToggleButton(

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 int buttonIdOffset;
-    private int xOffset;
-    private int yOffset;
-    final boolean isStickyModeAvailable;
-    private 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/item/IItemConduit.java

@@ -11,15 +11,9 @@ import cofh.api.transport.IItemDuct;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IExtractor;
 import crazypants.enderio.conduit.item.filter.IItemFilter;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 
 public interface IItemConduit extends IConduit, IItemDuct, IExtractor {
 
-    @Override
-    default ConduitRenderer getRenderer() {
-        return ItemConduitRenderer.instance.get();
-    }
-
     IIcon getTextureForInputMode();
 
     IIcon getTextureForOutputMode();

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

@@ -13,12 +13,17 @@ import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.conduit.geom.ConnectionModeGeometry;
 import crazypants.enderio.conduit.geom.Offset;
 import crazypants.enderio.conduit.render.ConduitBundleRenderer;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.conduit.render.DefaultConduitRenderer;
 
 public class ItemConduitRenderer extends DefaultConduitRenderer {
 
-    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal.withInitial(ItemConduitRenderer::new);
+    @Override
+    public boolean isRendererForConduit(IConduit conduit) {
+        if (conduit instanceof IItemConduit) {
+            return true;
+        }
+        return false;
+    }
 
     @Override
     public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x,

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

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

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

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

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

@@ -22,7 +22,6 @@ import com.enderio.core.common.util.RoundRobinIterator;
 
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.item.filter.IItemFilter;
-import crazypants.enderio.conduit.item.filter.ItemFilterLimited;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.invpanel.TileInventoryPanel;
 
@@ -156,7 +155,6 @@ public class NetworkedInventory {
         int numSlots = slotIndices.length;
         ItemStack extractItem = null;
         int maxExtracted = con.getMaximumExtracted(conDir);
-        final IItemFilter filter = con.getInputFilter(conDir);
 
         int slot = -1;
         int slotChecksPerTick = Math.min(numSlots, ItemConduitNetwork.MAX_SLOT_CHECK_PER_TICK);
@@ -164,23 +162,12 @@ public class NetworkedInventory {
             int index = nextSlot(numSlots);
             slot = slotIndices[index];
             ItemStack item = getInventory().getStackInSlot(slot);
-            if (item != null) {
-                if (filter != null && filter.isLimited()) {
-                    final int count = ((ItemFilterLimited) filter).getInsertLimitInv(getInventory(), item);
-                    if (count <= 0) {
-                        continue;
-                    } else if (count < item.stackSize) {
-                        item = item.copy();
-                        item.stackSize = count;
-                    }
-                }
-                if (canExtractItem(item)) {
-                    extractItem = item.copy();
-                    if (getInventory().canExtractItem(slot, extractItem, inventorySide)) {
-                        if (doTransfer(extractItem, slot, maxExtracted)) {
-                            setNextStartingSlot(slot);
-                            return true;
-                        }
+            if (canExtractItem(item)) {
+                extractItem = item.copy();
+                if (getInventory().canExtractItem(slot, extractItem, inventorySide)) {
+                    if (doTransfer(extractItem, slot, maxExtracted)) {
+                        setNextStartingSlot(slot);
+                        return true;
                     }
                 }
             }
@@ -196,11 +183,7 @@ public class NetworkedInventory {
         if (filter == null) {
             return true;
         }
-        if (filter.isLimited()) {
-            return filter.isValid() && ((ItemFilterLimited) filter).doesItemPassFilterInv(this, itemStack);
-        } else {
-            return filter.doesItemPassFilter(this, itemStack);
-        }
+        return filter.doesItemPassFilter(this, itemStack);
     }
 
     private boolean doTransfer(ItemStack extractedItem, int slot, int maxExtract) {
@@ -295,20 +278,7 @@ public class NetworkedInventory {
         }
         IItemFilter filter = con.getOutputFilter(conDir);
         if (filter != null) {
-            if (filter.isLimited()) {
-                final int count = filter.getMaxCountThatCanPassFilter(item);
-                if (count <= 0) {
-                    return 0;
-                } else {
-                    final int maxInsert = ((ItemFilterLimited) filter).getInsertLimit(getInventory(), item);
-                    if (maxInsert <= 0) {
-                        return 0;
-                    } else if (maxInsert < item.stackSize) {
-                        item = item.copy();
-                        item.stackSize = maxInsert;
-                    }
-                }
-            } else if (!filter.doesItemPassFilter(this, item)) {
+            if (!filter.doesItemPassFilter(this, item)) {
                 return 0;
             }
         }

src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java

@@ -41,18 +41,10 @@ public interface IItemFilter {
 
     boolean isValid();
 
-    default boolean isLimited() {
-        return false;
-    }
-
     boolean isSticky();
 
     void createGhostSlots(List<GhostSlot> slots, int xOffset, int yOffset, Runnable cb);
 
-    default int getMaxCountThatCanPassFilter(ItemStack item) {
-        return 1;
-    }
-
     int getSlotCount();
 
     default String getUnlocalizedName() {

src/main/java/crazypants/enderio/conduit/item/filter/ItemBasicItemFilter.java

@@ -82,8 +82,9 @@ public class ItemBasicItemFilter extends Item implements IItemFilterUpgrade {
     }
 
     @Override
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
         for (int j = 0; j < 2; ++j) {
             par3List.add(new ItemStack(this, 1, j));
         }
@@ -91,8 +92,7 @@ public class ItemBasicItemFilter extends Item implements IItemFilterUpgrade {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
-            boolean par4) {
+    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
         if (FilterRegister.isFilterSet(par1ItemStack)) {
             if (!SpecialTooltipHandler.showAdvancedTooltips()) {
                 par3List.add(EnderIO.lang.localize("itemConduitFilterUpgrade"));

src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java

@@ -89,8 +89,7 @@ public class ItemExistingItemFilter extends Item implements IItemFilterUpgrade,
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
-            boolean par4) {
+    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
         if (FilterRegister.isFilterSet(par1ItemStack)) {
             if (SpecialTooltipHandler.showAdvancedTooltips()) {
                 par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured"));

src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java

@@ -91,13 +91,14 @@ public class ItemFilter implements IInventory, IItemFilter {
         return doesItemPassFilter(item);
     }
 
+    @SuppressWarnings("SimplifiableConditionalExpression")
     public boolean doesItemPassFilter(ItemStack item) {
         boolean allow = isValid() && itemMatched(item);
 
-        return isBlacklist ^ allow;
+        return isBlacklist ? !allow : allow;
     }
 
-    protected boolean itemMatched(ItemStack item) {
+    private boolean itemMatched(ItemStack item) {
         if (item == null) {
             return false;
         }
@@ -144,7 +145,7 @@ public class ItemFilter implements IInventory, IItemFilter {
         return matched;
     }
 
-    protected boolean isOreDicMatch(int filterItemIndex, ItemStack item) {
+    private boolean isOreDicMatch(int filterItemIndex, ItemStack item) {
         int[] ids1 = getCachedIds(filterItemIndex);
         if (ids1 == null || ids1.length == 0) {
             return false;
@@ -163,9 +164,8 @@ public class ItemFilter implements IInventory, IItemFilter {
         return false;
     }
 
-    protected boolean isNBTMatch(ItemStack filter, ItemStack item) {
-        if (filter.stackTagCompound == null && (item.stackTagCompound == null || item.stackTagCompound.hasNoTags()))
-            return true;
+    private boolean isNBTMatch(ItemStack filter, ItemStack item) {
+        if (filter.stackTagCompound == null && item.stackTagCompound == null) return true;
         if (filter.stackTagCompound == null || item.stackTagCompound == null) return false;
         if (!filter.getTagCompound().hasKey("GEN")) return filter.stackTagCompound.equals(item.stackTagCompound);
         NBTTagCompound filterTag = (NBTTagCompound) filter.getTagCompound().copy();
@@ -202,7 +202,7 @@ public class ItemFilter implements IInventory, IItemFilter {
         return !isItemListEmpty();
     }
 
-    protected boolean isItemListEmpty() {
+    private boolean isItemListEmpty() {
         for (ItemStack item : items) {
             if (item != null) {
                 return false;

src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterLimited.java

@@ -1,242 +0,0 @@
-package crazypants.enderio.conduit.item.filter;
-
-import java.util.List;
-
-import net.minecraft.inventory.ISidedInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-
-import com.enderio.core.client.gui.widget.GhostSlot;
-
-import cofh.lib.util.helpers.MathHelper;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import crazypants.enderio.conduit.gui.GuiExternalConnection;
-import crazypants.enderio.conduit.gui.item.IItemFilterGui;
-import crazypants.enderio.conduit.gui.item.ItemConduitFilterContainer;
-import crazypants.enderio.conduit.gui.item.LimitedItemFilterGui;
-import crazypants.enderio.conduit.item.IItemConduit;
-import crazypants.enderio.conduit.item.NetworkedInventory;
-
-public class ItemFilterLimited extends ItemFilter {
-
-    public ItemFilterLimited() {
-        this(10, true);
-    }
-
-    public ItemFilterLimited(int numItems, boolean isAdvanced) {
-        super(numItems, isAdvanced);
-    }
-
-    @Override
-    public String getInventoryName() {
-        return "Limited Item Filter";
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) {
-        ItemConduitFilterContainer cont = new ItemConduitFilterContainer(itemConduit, gui.getDir(), isInput);
-        LimitedItemFilterGui limitedItemFilterGui = new LimitedItemFilterGui(gui, cont, !isInput, isInput);
-        limitedItemFilterGui.createFilterSlots();
-        return limitedItemFilterGui;
-    }
-
-    @Override
-    public void createGhostSlots(List<GhostSlot> slots, int xOffset, int yOffset, Runnable cb) {
-        int index = 0;
-        int numRows = (int) (double) (items.length / 5);
-        for (int row = 0; row < numRows; ++row) {
-            for (int col = 0; col < 5; ++col) {
-                int x = xOffset + col * 18;
-                int y = yOffset + row * 20;
-                slots.add(new ItemFilterGhostSlot(index, x, y, cb));
-                index++;
-            }
-        }
-    }
-
-    @Override
-    public int getMaxCountThatCanPassFilter(ItemStack item) {
-        if (item == null || item.getItem() == null) {
-            return 0;
-        }
-        int count = 0;
-        for (int i = 0; i < items.length; i++) {
-            ItemStack invStack = items[i];
-            if (invStack != null && itemStackMatched(invStack, item, i)) {
-                count += invStack.stackSize;
-            }
-        }
-        return count;
-    }
-
-    @Override
-    public boolean isLimited() {
-        return true;
-    }
-
-    public int getInsertLimit(ISidedInventory inv, ItemStack item) {
-        if (item == null || item.getItem() == null) {
-            return 0;
-        }
-        int count = 0;
-        for (int i = 0; i < inv.getSizeInventory(); i++) {
-            ItemStack invStack = inv.getStackInSlot(i);
-            if (invStack != null && itemStackMatched(invStack, item, i)) {
-                count += invStack.stackSize;
-            }
-        }
-        return getMaxCountThatCanPassFilter(item) - count;
-    }
-
-    public int getInsertLimitInv(ISidedInventory inv, ItemStack item) {
-        return -getInsertLimit(inv, item);
-    }
-
-    public boolean doesCountPassFilter(int maxCount) {
-        return maxCount > 0;
-    }
-
-    @Override
-    public boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item) {
-        return isValid() && itemMatched(item) && doesCountPassFilter(getInsertLimit(inv.getInventory(), item));
-
-    }
-
-    // Filter in extract slot
-    public boolean doesItemPassFilterInv(NetworkedInventory inv, ItemStack item) {
-        return isValid() && itemMatched(item) && doesCountPassFilter(getInsertLimitInv(inv.getInventory(), item));
-    }
-
-    protected boolean itemStackMatched(ItemStack item, ItemStack filter, int slot) {
-        if (item == null) {
-            return false;
-        }
-
-        boolean checkDamage = fuzzyMode != FuzzyMode.DISABLED;
-        boolean damageMatched = false;
-        if (checkDamage && item.getItem().isDamageable()) {
-            damageMatched = fuzzyMode.compare(item);
-        }
-
-        if (isItemListEmpty()) {
-            if (checkDamage) {
-                return damageMatched;
-            } else {
-                return false;
-            }
-        }
-
-        boolean matched = false;
-
-        if (filter != null && item.getItem() == filter.getItem()) {
-            matched = true;
-
-            if (checkDamage && !damageMatched) {
-                matched = false;
-            } else if (matchMeta && item.getItemDamage() != filter.getItemDamage()) {
-                matched = false;
-            } else if (matchNBT && !isNBTMatch(item, filter)) {
-                matched = false;
-            }
-        }
-
-        if (!matched && useOreDict && isOreDicMatch(filter, item)) {
-            matched = true;
-        }
-        return matched;
-    }
-
-    public boolean isOreDicMatch(ItemStack filter, ItemStack item) {
-        int[] id_filter = OreDictionary.getOreIDs(filter);
-        if (id_filter.length == 0) {
-            return false;
-        }
-        int[] id_item = OreDictionary.getOreIDs(item);
-        if (id_item.length == 0) {
-            return false;
-        }
-        for (int id1 : id_filter) {
-            for (int id2 : id_item) {
-                if (id1 == id2) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public ItemStack decrStackSize(int fromSlot, int amount) {
-        if ((fromSlot < 0) || (fromSlot >= items.length)) {
-            return null;
-        }
-        oreIds.set(fromSlot, null);
-        ItemStack item = items[fromSlot];
-        items[fromSlot] = null;
-        return item.splitStack(amount);
-    }
-
-    @Override
-    public String toString() {
-        return "Limited" + super.toString();
-    }
-
-    @Override
-    public String getUnlocalizedName() {
-        return "gui.limited_item_filter";
-    }
-
-    class ItemFilterGhostSlot extends GhostSlot {
-
-        private final int slot;
-        private final Runnable cb;
-
-        private final int adjustOnShift;
-
-        ItemFilterGhostSlot(int slot, int x, int y, Runnable cb) {
-            this.x = x;
-            this.y = y;
-            this.slot = slot;
-            this.cb = cb;
-            this.displayStdOverlay = true;
-            this.stackSizeLimit = 64;
-            this.adjustOnShift = 10;
-        }
-
-        @Override
-        public void putStack(ItemStack stack) {
-            if (stack != null) {
-                stack = stack.copy();
-                if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) {
-                    if (Mouse.isButtonDown(0) || Mouse.getEventDWheel() > 0) {
-                        if (stack.stackSize - 1 == 1) {
-                            stack.stackSize += adjustOnShift - 2;
-                        } else {
-                            stack.stackSize = MathHelper
-                                    .clamp(stack.stackSize + adjustOnShift - 1, 1, stack.getMaxStackSize());
-                        }
-                    } else if (Mouse.isButtonDown(1) || Mouse.getEventDWheel() < 0) {
-                        if (stack.stackSize + 1 == 1) {
-                            stack.stackSize++;
-                        } else {
-                            stack.stackSize = MathHelper
-                                    .clamp(stack.stackSize - adjustOnShift + 1, 1, stack.getMaxStackSize());
-                        }
-                    }
-                }
-            }
-            items[slot] = stack;
-            cb.run();
-        }
-
-        @Override
-        public ItemStack getStack() {
-            return items[slot];
-        }
-    }
-}

src/main/java/crazypants/enderio/conduit/item/filter/ItemLimitedItemFilter.java

@@ -1,74 +0,0 @@
-package crazypants.enderio.conduit.item.filter;
-
-import java.util.List;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-
-import com.enderio.core.api.client.gui.IResourceTooltipProvider;
-import com.enderio.core.client.handlers.SpecialTooltipHandler;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import crazypants.enderio.EnderIO;
-import crazypants.enderio.EnderIOTab;
-import crazypants.enderio.ModObject;
-import crazypants.enderio.conduit.item.FilterRegister;
-
-public class ItemLimitedItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider {
-
-    public static ItemLimitedItemFilter create() {
-        ItemLimitedItemFilter result = new ItemLimitedItemFilter();
-        result.init();
-        return result;
-    }
-
-    protected ItemLimitedItemFilter() {
-        setCreativeTab(EnderIOTab.tabEnderIO);
-        setUnlocalizedName(ModObject.itemLimitedItemFilter.unlocalisedName);
-        setMaxDamage(0);
-        setMaxStackSize(64);
-    }
-
-    protected void init() {
-        GameRegistry.registerItem(this, ModObject.itemLimitedItemFilter.unlocalisedName);
-    }
-
-    @Override
-    public IItemFilter createFilterFromStack(ItemStack stack) {
-        IItemFilter filter = new ItemFilterLimited();
-        if (stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) {
-            filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter"));
-        }
-        return filter;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerIcons(IIconRegister IIconRegister) {
-        itemIcon = IIconRegister.registerIcon("enderio:limitedItemFilter");
-    }
-
-    @Override
-    public String getUnlocalizedNameForTooltip(ItemStack stack) {
-        return getUnlocalizedName();
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
-            boolean par4) {
-        if (FilterRegister.isFilterSet(par1ItemStack)) {
-            if (SpecialTooltipHandler.showAdvancedTooltips()) {
-                par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured"));
-                par3List.add(
-                        EnumChatFormatting.ITALIC
-                                + EnderIO.lang.localize("itemConduitFilterUpgrade.clearConfigMethod"));
-            }
-        }
-    }
-}

src/main/java/crazypants/enderio/conduit/item/filter/ItemModItemFilter.java

@@ -60,8 +60,7 @@ public class ItemModItemFilter extends Item implements IItemFilterUpgrade, IReso
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
-            boolean par4) {
+    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
         if (FilterRegister.isFilterSet(par1ItemStack)) {
             if (SpecialTooltipHandler.showAdvancedTooltips()) {
                 par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured"));

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

@@ -34,7 +34,6 @@ import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.RaytraceResult;
 import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.item.ItemConduit;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.tool.ToolUtil;
@@ -47,14 +46,9 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit {
     public static final String ICON_KEY_IN_OUT_OUT = ItemConduit.ICON_KEY_IN_OUT_OUT;
     public static final String ICON_KEY_IN_OUT_IN = ItemConduit.ICON_KEY_IN_OUT_IN;
 
-    static final Map<String, IIcon> ICONS = new HashMap<>();
+    static final Map<String, IIcon> ICONS = new HashMap<String, IIcon>();
     private final Set<BlockCoord> filledFromThisTick = new HashSet<>();
 
-    @Override
-    public ConduitRenderer getRenderer() {
-        return EnderLiquidConduitRenderer.instance.get();
-    }
-
     @SideOnly(Side.CLIENT)
     public static void initIcons() {
         IconUtil.addIconProvider(new IconUtil.IIconProvider() {
@@ -308,6 +302,7 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit {
     }
 
     private void doExtract() {
+        BlockCoord loc = getLocation();
         if (!hasExtractableMode()) {
             return;
         }

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

@@ -14,6 +14,7 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
 import com.enderio.core.client.render.IconUtil;
+import com.enderio.core.common.util.BlockCoord;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -22,7 +23,6 @@ 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 crazypants.enderio.machine.RedstoneControlMode;
 
@@ -37,12 +37,7 @@ public class AdvancedLiquidConduit extends AbstractTankConduit {
     public static final String ICON_INSERT_KEY = "enderio:liquidConduitAdvancedOutput";
     public static final String ICON_EMPTY_EDGE = "enderio:liquidConduitAdvancedEdge";
 
-    static final Map<String, IIcon> ICONS = new HashMap<>();
-
-    @Override
-    public ConduitRenderer getRenderer() {
-        return AdvancedLiquidConduitRenderer.instance.get();
-    }
+    static final Map<String, IIcon> ICONS = new HashMap<String, IIcon>();
 
     @SideOnly(Side.CLIENT)
     public static void initIcons() {
@@ -91,6 +86,7 @@ public class AdvancedLiquidConduit extends AbstractTankConduit {
     }
 
     private void doExtract() {
+        BlockCoord loc = getLocation();
         // Extraction can happen on extract mode or in/out mode
         if (!hasExtractableMode()) {
             return;
@@ -106,6 +102,7 @@ public class AdvancedLiquidConduit extends AbstractTankConduit {
             return;
         }
 
+        Fluid f = tank.getFluid() == null ? null : tank.getFluid().getFluid();
         for (ForgeDirection dir : externalConnections) {
             if (autoExtractForDir(dir)) {
                 if (network.extractFrom(this, dir, MAX_EXTRACT_PER_TICK)) {

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

@@ -1,14 +1,16 @@
 package crazypants.enderio.conduit.liquid;
 
+import static com.enderio.core.client.render.CubeRenderer.addVecWithUV;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
 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;
@@ -21,13 +23,14 @@ import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.geom.ConnectionModeGeometry;
 import crazypants.enderio.conduit.geom.Offset;
 import crazypants.enderio.conduit.render.ConduitBundleRenderer;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.conduit.render.DefaultConduitRenderer;
 
 public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer {
 
-    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal
-            .withInitial(AdvancedLiquidConduitRenderer::new);
+    @Override
+    public boolean isRendererForConduit(IConduit conduit) {
+        return conduit instanceof AdvancedLiquidConduit;
+    }
 
     @Override
     public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x,
@@ -55,8 +58,6 @@ public class AdvancedLiquidConduitRenderer 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)) {
             AdvancedLiquidConduit lc = (AdvancedLiquidConduit) conduit;
@@ -105,17 +106,15 @@ public class AdvancedLiquidConduitRenderer 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);
                     }
                 }
             }
@@ -128,14 +127,14 @@ public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer {
                         tex.getMaxU(),
                         tex.getMinV(),
                         tex.getMaxV());
-                for (i = 0; i < corners.size(); i++) {
-                    final Vertex c = corners.get(i);
-                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                Tessellator tessellator = Tessellator.instance;
+                for (Vertex c : corners) {
+                    addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                 }
                 // back face
-                for (i = corners.size() - 1; i >= 0; i--) {
+                for (int i = corners.size() - 1; i >= 0; i--) {
                     Vertex c = corners.get(i);
-                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                    addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                 }
             }
         }

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

@@ -134,7 +134,7 @@ public class ConduitTank implements IFluidTank {
             addAmount(-used);
         }
 
-        FluidStack drained = new FluidStack(fluid.getFluid(), used);
+        FluidStack drained = new FluidStack(fluid.getFluidID(), used);
 
         if (fluid.amount < 0) {
             fluid.amount = 0;

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

@@ -13,13 +13,17 @@ import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.conduit.geom.ConnectionModeGeometry;
 import crazypants.enderio.conduit.geom.Offset;
 import crazypants.enderio.conduit.render.ConduitBundleRenderer;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.conduit.render.DefaultConduitRenderer;
 
 public class EnderLiquidConduitRenderer extends DefaultConduitRenderer {
 
-    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal
-            .withInitial(EnderLiquidConduitRenderer::new);
+    @Override
+    public boolean isRendererForConduit(IConduit conduit) {
+        if (conduit instanceof AbstractEnderLiquidConduit) {
+            return true;
+        }
+        return false;
+    }
 
     @Override
     public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x,

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

@@ -77,15 +77,15 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT
 
     @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) {
         int extractRate;
         int maxIo;
 

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

@@ -27,7 +27,6 @@ import crazypants.enderio.conduit.ConduitUtil;
 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 crazypants.enderio.network.PacketHandler;
 
@@ -43,12 +42,7 @@ public class LiquidConduit extends AbstractTankConduit {
     public static final String ICON_INSERT_KEY = "enderio:liquidConduitInsert";
     public static final String ICON_EMPTY_INSERT_KEY = "enderio:emptyLiquidConduitInsert";
 
-    static final Map<String, IIcon> ICONS = new HashMap<>();
-
-    @Override
-    public ConduitRenderer getRenderer() {
-        return LiquidConduitRenderer.instance.get();
-    }
+    static final Map<String, IIcon> ICONS = new HashMap<String, IIcon>();
 
     @SideOnly(Side.CLIENT)
     public static void initIcons() {
@@ -143,7 +137,7 @@ public class LiquidConduit extends AbstractTankConduit {
                         }
                     }
                     if (!foundFluid) {
-                        continue;
+                        return;
                     }
 
                     FluidStack couldDrain = extTank.drain(dir.getOpposite(), MAX_EXTRACT_PER_TICK, false);
@@ -360,7 +354,7 @@ public class LiquidConduit extends AbstractTankConduit {
             return false;
         }
 
-        AbstractTankConduitNetwork<?> n = (AbstractTankConduitNetwork<?>) network;
+        AbstractTankConduitNetwork n = (AbstractTankConduitNetwork) network;
         if (tank.getFluid() == null) {
             tank.setLiquid(n.getFluidType() == null ? null : n.getFluidType().copy());
         } else if (n.getFluidType() == null) {

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

@@ -279,11 +279,13 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork<LiquidCondu
                 loc.y,
                 loc.z,
                 ILiquidConduit.class);
+        int numTargets = 0;
         for (ILiquidConduit n : connections) {
             LiquidConduit neighbour = (LiquidConduit) n;
             if (canFlowTo(con, neighbour)) { // can only flow within same network
                 totalAmount += neighbour.getTank().getFluidAmount();
                 totalCapacity += neighbour.getTank().getCapacity();
+                numTargets++;
             }
         }
 

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

@@ -1,11 +1,11 @@
 package crazypants.enderio.conduit.liquid;
 
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
-import java.util.concurrent.ConcurrentHashMap;
 
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
@@ -31,22 +31,32 @@ import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.render.ConduitBundleRenderer;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.conduit.render.DefaultConduitRenderer;
 
 public class LiquidConduitRenderer extends DefaultConduitRenderer implements IResourceManagerReloadListener {
 
-    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal.withInitial(LiquidConduitRenderer::new);
-
     private float downRatio;
 
     private float flatRatio;
 
     private float upRatio;
 
-    public LiquidConduitRenderer() {
+    private LiquidConduitRenderer() {
         super();
-        RenderUtil.registerReloadListener(this);
+    }
+
+    public static LiquidConduitRenderer create() {
+        LiquidConduitRenderer result = new LiquidConduitRenderer();
+        RenderUtil.registerReloadListener(result);
+        return result;
+    }
+
+    @Override
+    public boolean isRendererForConduit(IConduit conduit) {
+        if (conduit instanceof LiquidConduit) {
+            return true;
+        }
+        return false;
     }
 
     @Override
@@ -56,17 +66,10 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
         super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb);
     }
 
-    public void renderDynamicEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit,
-            double x, double y, double z, float partialTick, float worldLight) {
-
-    }
-
     @Override
     protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) {
-        Tessellator tessellator = Tessellator.instance;
         if (isNSEWUD(component.dir)) {
             LiquidConduit lc = (LiquidConduit) conduit;
-            IIcon fluidTex = conduit.getTransmitionTextureForState(component);
             FluidStack fluid = lc.getFluidType();
             if (fluid != null) {
                 renderFluidOutline(component, fluid);
@@ -74,40 +77,30 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
             BoundingBox[] cubes = toCubes(component.bound);
             for (BoundingBox cube : cubes) {
                 drawSection(cube, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, false);
-                // This check is kinda broken, but whatever, it was like that when this was done in a TESR too
-                if (lc.getTank().getFilledRatio() <= 0) {
-                    continue;
-                }
-                tessellator.setColorOpaque_F(0.7f, 0.7f, 0.7f);
-                drawSection(
-                        cube,
-                        fluidTex.getMinU(),
-                        fluidTex.getMaxU(),
-                        fluidTex.getMinV(),
-                        fluidTex.getMaxV(),
-                        component.dir,
-                        true);
             }
 
-            if (conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) {
-                final CubeRenderer cr = CubeRenderer.get();
-                int i;
-                tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data);
-                List<Vertex> corners = component.bound.getCornersWithUvForFace(
-                        component.dir,
-                        tex.getMinU(),
-                        tex.getMaxU(),
-                        tex.getMinV(),
-                        tex.getMaxV());
-                for (i = corners.size() - 1; i >= 0; i--) {
-                    Vertex c = corners.get(i);
-                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
-                }
-                // back face
-                for (i = corners.size() - 1; i >= 0; i--) {
-                    Vertex c = corners.get(i);
-                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
-                }
+        } else {
+            drawSection(
+                    component.bound,
+                    tex.getMinU(),
+                    tex.getMaxU(),
+                    tex.getMinV(),
+                    tex.getMaxV(),
+                    component.dir,
+                    true);
+        }
+
+        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 (Vertex c : corners) {
+                CubeRenderer.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+            }
+            // back face
+            for (int i = corners.size() - 1; i >= 0; i--) {
+                Vertex c = corners.get(i);
+                CubeRenderer.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
             }
         }
     }
@@ -127,29 +120,27 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
         }
     }
 
-    private static final Map<CollidableComponent, Map<Fluid, List<CachableRenderStatement>>> cache = Collections
-            .synchronizedMap(new WeakHashMap<>());
+    private static Map<CollidableComponent, Map<Fluid, List<CachableRenderStatement>>> cache = new WeakHashMap<CollidableComponent, Map<Fluid, List<CachableRenderStatement>>>();
 
     public static List<CachableRenderStatement> computeFluidOutlineToCache(CollidableComponent component, Fluid fluid,
             double scaleFactor, float outlineWidth) {
 
-        // Only init once per component across all threads so the cache stays accurate.
-        Map<Fluid, List<CachableRenderStatement>> cache0 = cache
-                .computeIfAbsent(component, _k -> new ConcurrentHashMap<>());
-        // The rest of this function 'should' be in a `computeIfAbsent` as well for:
-        // `cache0.computeIfAbsent(fluid, _k -> ...)` but that won't cause a bug in this case,
-        // just a bit more garbage.
+        Map<Fluid, List<CachableRenderStatement>> cache0 = cache.get(component);
+        if (cache0 == null) {
+            cache0 = new HashMap<Fluid, List<CachableRenderStatement>>();
+            cache.put(component, cache0);
+        }
         List<CachableRenderStatement> data = cache0.get(fluid);
         if (data != null) {
             return data;
         }
-        data = new ArrayList<>();
+        data = new ArrayList<CachableRenderStatement>();
+        cache0.put(fluid, data);
 
         IIcon texture = fluid.getStillIcon();
         if (texture == null) {
             texture = fluid.getIcon();
             if (texture == null) {
-                cache0.put(fluid, data);
                 return data;
             }
         }
@@ -208,7 +199,6 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
                 }
             }
         }
-        cache0.put(fluid, data);
         return data;
     }
 
@@ -256,6 +246,49 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
         // done in the dynamic section
     }
 
+    @Override
+    public boolean isDynamic() {
+        return true;
+    }
+
+    @Override
+    public void renderDynamicEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit,
+            double x, double y, double z, float partialTick, float worldLight) {
+
+        if (((LiquidConduit) conduit).getTank().getFilledRatio() <= 0) {
+            return;
+        }
+
+        Collection<CollidableComponent> components = conduit.getCollidableComponents();
+        Tessellator tessellator = Tessellator.instance;
+
+        calculateRatios((LiquidConduit) conduit);
+        transmissionScaleFactor = conduit.getTransmitionGeometryScale();
+
+        IIcon tex;
+        for (CollidableComponent component : components) {
+            if (renderComponent(component)) {
+                if (isNSEWUD(component.dir) && conduit.getTransmitionTextureForState(component) != null) {
+
+                    tessellator.setColorOpaque_F(1, 1, 1);
+                    tex = conduit.getTransmitionTextureForState(component);
+
+                    BoundingBox[] cubes = toCubes(component.bound);
+                    for (BoundingBox cube : cubes) {
+                        drawSection(
+                                cube,
+                                tex.getMinU(),
+                                tex.getMaxU(),
+                                tex.getMinV(),
+                                tex.getMaxV(),
+                                component.dir,
+                                true);
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     protected void setVerticesForTransmission(BoundingBox bound, ForgeDirection id) {
 
@@ -270,7 +303,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
         float transY = (bound.sizeY() - sizeY) / 2;
 
         Vector3d translation = new Vector3d(0, transY, 0);
-        CubeRenderer.get().setupVertices(bound.translate(translation));
+        CubeRenderer.setupVertices(bound.translate(translation));
     }
 
     private void calculateRatios(LiquidConduit conduit) {

src/main/java/crazypants/enderio/conduit/me/IMEConduit.java

@@ -14,5 +14,7 @@ public interface IMEConduit extends IConduit {
 
     boolean isDense();
 
+    boolean isDenseUltra();
+
     int getChannelsInUse();
 }

src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java

@@ -15,7 +15,8 @@ public class ItemMEConduit extends AbstractItemConduit {
 
     private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] {
             new ItemConduitSubtype(ModObject.itemMEConduit.name(), "enderio:itemMeConduit"),
-            new ItemConduitSubtype(ModObject.itemMEConduit.name() + "Dense", "enderio:itemMeConduitDense") };
+            new ItemConduitSubtype(ModObject.itemMEConduit.name() + "Dense", "enderio:itemMeConduitDense"),
+            new ItemConduitSubtype(ModObject.itemMEConduit.name() + "DenseUltra", "enderio:itemMeConduitDenseUltra") };
 
     public static ItemMEConduit create() {
         ItemMEConduit result = new ItemMEConduit();

src/main/java/crazypants/enderio/conduit/me/MEConduit.java

@@ -16,6 +16,7 @@ import com.enderio.core.client.render.IconUtil;
 import com.enderio.core.common.util.BlockCoord;
 
 import appeng.api.AEApi;
+import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGridConnection;
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
@@ -32,17 +33,10 @@ import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.conduit.RaytraceResult;
 import crazypants.enderio.conduit.TileConduitBundle;
 import crazypants.enderio.conduit.geom.CollidableComponent;
-import crazypants.enderio.conduit.render.ConduitRenderer;
-import crazypants.enderio.conduit.render.DefaultConduitRenderer;
 import crazypants.enderio.tool.ToolUtil;
 
 public class MEConduit extends AbstractConduit implements IMEConduit {
 
-    @Override
-    public ConduitRenderer getRenderer() {
-        return DefaultConduitRenderer.instance.get();
-    }
-
     protected MEConduitNetwork network;
     protected MEConduitGrid grid;
 
@@ -50,6 +44,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
     public static IIcon[] longTextures;
 
     private boolean isDense;
+    private boolean isDenseUltra;
     private int playerID = -1;
 
     public MEConduit() {
@@ -57,6 +52,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
     }
 
     public MEConduit(int itemDamage) {
+        isDenseUltra = itemDamage == 2;
         isDense = itemDamage == 1;
     }
 
@@ -65,14 +61,16 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
 
             @Override
             public void registerIcons(IIconRegister register) {
-                coreTextures = new IIcon[2];
-                longTextures = new IIcon[2];
+                coreTextures = new IIcon[3];
+                longTextures = new IIcon[3];
 
                 coreTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCore");
                 coreTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCoreDense");
+                coreTextures[2] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCoreDenseUltra");
 
                 longTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":meConduit");
                 longTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":meConduitDense");
+                longTextures[2] = register.registerIcon(EnderIO.DOMAIN + ":meConduitDenseUltra");
             }
 
             @Override
@@ -82,7 +80,10 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
         });
     }
 
-    public static int getDamageForState(boolean isDense) {
+    public static int getDamageForState(boolean isDense, boolean isDenseUltra) {
+        if (isDenseUltra) {
+            return 2;
+        }
         if (isDense) {
             return 1;
         }
@@ -96,7 +97,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
 
     @Override
     public ItemStack createItem() {
-        return new ItemStack(EnderIO.itemMEConduit, 1, getDamageForState(isDense));
+        return new ItemStack(EnderIO.itemMEConduit, 1, getDamageForState(isDense, isDenseUltra));
     }
 
     @Override
@@ -114,6 +115,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
     public void writeToNBT(NBTTagCompound nbtRoot) {
         super.writeToNBT(nbtRoot);
         nbtRoot.setBoolean("isDense", isDense);
+        nbtRoot.setBoolean("isDenseUltra", isDenseUltra);
         nbtRoot.setInteger("playerID", playerID);
     }
 
@@ -126,6 +128,9 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
         } else {
             playerID = -1;
         }
+        if (nbtRoot.hasKey("isDenseUltra")) {
+            isDenseUltra = nbtRoot.getBoolean("isDenseUltra");
+        }
     }
 
     public void setPlayerID(int playerID) {
@@ -196,12 +201,22 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
 
     @Method(modid = "appliedenergistics2")
     private Boolean canConnectToGridNode(IGridNode node, ForgeDirection dir) {
-        return node.getGridBlock().getConnectableSides().contains(dir.getOpposite());
+        if (node.getGridBlock().getConnectableSides().contains(dir.getOpposite())) {
+            if (isDenseUltra()) {
+                return node.hasFlag(GridFlags.ULTRA_DENSE_CAPACITY)
+                        || ((node.hasFlag(GridFlags.DENSE_CAPACITY)) && !node.hasFlag(GridFlags.CANNOT_CARRY));
+            } else if (isDense()) {
+                return true;
+            } else {
+                return !node.hasFlag(GridFlags.ULTRA_DENSE_CAPACITY);
+            }
+        }
+        return false;
     }
 
     @Override
     public IIcon getTextureForState(CollidableComponent component) {
-        int state = getDamageForState(isDense);
+        int state = getDamageForState(isDense, isDenseUltra);
         if (component.dir == ForgeDirection.UNKNOWN) {
             return coreTextures[state];
         } else {
@@ -378,4 +393,9 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
     public boolean isDense() {
         return isDense;
     }
+
+    @Override
+    public boolean isDenseUltra() {
+        return isDenseUltra;
+    }
 }

src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java

@@ -43,6 +43,9 @@ public class MEConduitGrid implements IGridBlock {
 
     @Override
     public EnumSet<GridFlags> getFlags() {
+        if (conduit.isDenseUltra()) {
+            return EnumSet.of(GridFlags.ULTRA_DENSE_CAPACITY);
+        }
         if (conduit.isDense()) {
             return EnumSet.of(GridFlags.DENSE_CAPACITY);
         }

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

@@ -7,7 +7,6 @@ import com.enderio.core.common.util.DyeColor;
 import cpw.mods.fml.common.Optional.Interface;
 import cpw.mods.fml.common.Optional.InterfaceList;
 import crazypants.enderio.conduit.IConduit;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import li.cil.oc.api.network.Environment;
 import li.cil.oc.api.network.SidedEnvironment;
 
@@ -15,16 +14,11 @@ import li.cil.oc.api.network.SidedEnvironment;
         @Interface(iface = "li.cil.oc.api.network.SidedEnvironment", modid = "OpenComputersAPI|Network") })
 public interface IOCConduit extends IConduit, Environment, SidedEnvironment {
 
-    String COLOR_CONTROLLER_ID = "ColorController";
-
-    @Override
-    default ConduitRenderer getRenderer() {
-        return OCConduitRenderer.instance.get();
-    }
+    public static final String COLOR_CONTROLLER_ID = "ColorController";
 
     void invalidate();
 
-    void setSignalColor(ForgeDirection dir, DyeColor col);
+    public abstract void setSignalColor(ForgeDirection dir, DyeColor col);
 
-    DyeColor getSignalColor(ForgeDirection dir);
+    public abstract DyeColor getSignalColor(ForgeDirection dir);
 }

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

@@ -7,12 +7,14 @@ import com.enderio.core.client.render.CubeRenderer;
 
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.geom.CollidableComponent;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.conduit.render.DefaultConduitRenderer;
 
 public class OCConduitRenderer extends DefaultConduitRenderer {
 
-    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal.withInitial(OCConduitRenderer::new);
+    @Override
+    public boolean isRendererForConduit(IConduit conduit) {
+        return conduit instanceof IOCConduit;
+    }
 
     @Override
     protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float selfIllum) {
@@ -21,7 +23,7 @@ public class OCConduitRenderer extends DefaultConduitRenderer {
                 int c = ((IOCConduit) conduit).getSignalColor(component.dir).getColor();
                 Tessellator tessellator = Tessellator.instance;
                 tessellator.setColorOpaque_I(c);
-                CubeRenderer.get().render(component.bound, tex);
+                CubeRenderer.render(component.bound, tex);
                 tessellator.setColorOpaque(255, 255, 255);
             }
         } else {

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

@@ -5,25 +5,19 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IExtractor;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.power.ICapacitor;
 import crazypants.enderio.power.IInternalPowerHandler;
 import crazypants.enderio.power.IPowerInterface;
 
 public interface IPowerConduit extends IConduit, IInternalPowerHandler, IExtractor {
 
-    String ICON_KEY = "enderio:powerConduit";
-    String ICON_KEY_INPUT = "enderio:powerConduitInput";
-    String ICON_KEY_OUTPUT = "enderio:powerConduitOutput";
-    String ICON_CORE_KEY = "enderio:powerConduitCore";
-    String ICON_TRANSMISSION_KEY = "enderio:powerConduitTransmission";
+    public static final String ICON_KEY = "enderio:powerConduit";
+    public static final String ICON_KEY_INPUT = "enderio:powerConduitInput";
+    public static final String ICON_KEY_OUTPUT = "enderio:powerConduitOutput";
+    public static final String ICON_CORE_KEY = "enderio:powerConduitCore";
+    public static final String ICON_TRANSMISSION_KEY = "enderio:powerConduitTransmission";
 
-    String COLOR_CONTROLLER_ID = "ColorController";
-
-    @Override
-    default ConduitRenderer getRenderer() {
-        return PowerConduitRenderer.instance.get();
-    }
+    public static final String COLOR_CONTROLLER_ID = "ColorController";
 
     IPowerInterface getExternalPowerReceptor(ForgeDirection direction);
 

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

@@ -12,8 +12,8 @@ import crazypants.enderio.ModObject;
 import crazypants.enderio.conduit.AbstractItemConduit;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.ItemConduitSubtype;
+import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.power.ICapacitor;
-import crazypants.enderio.power.PowerDisplayUtil;
 
 public class ItemPowerConduit extends AbstractItemConduit {
 
@@ -51,7 +51,7 @@ public class ItemPowerConduit extends AbstractItemConduit {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List<String> list, boolean par4) {
+    public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
         if (PREFIX == null) {
             POSTFIX = " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr();
             PREFIX = EnderIO.lang.localize("power.maxOutput") + " ";

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

@@ -266,6 +266,7 @@ public class NetworkPowerManager {
 
         float filledRatio = (float) energyStored / maxEnergyStored;
         int energyLeft = energyStored;
+        int given = 0;
         for (IPowerConduit con : network.getConduits()) {
             if (energyLeft > 0) {
                 // NB: use ceil to ensure we dont through away any energy due to
@@ -275,6 +276,7 @@ public class NetworkPowerManager {
                 give = Math.min(give, con.getMaxEnergyStored());
                 give = Math.min(give, energyLeft);
                 con.setEnergyStored(give);
+                given += give;
                 energyLeft -= give;
             } else {
                 con.setEnergyStored(0);

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

@@ -137,7 +137,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
         DyeColor col = DyeColor.getColorFromDye(player.getCurrentEquippedItem());
         if (ConduitUtil.isProbeEquipped(player)) {
             if (!player.worldObj.isRemote) {
-                PacketConduitProbe.sendInfoMessage(player, this);
+                new PacketConduitProbe().sendInfoMessage(player, this);
             }
             return true;
         } else if (col != null && res.component != null && isColorBandRendered(res.component.dir)) {
@@ -283,6 +283,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
     }
 
     private boolean isRedstoneEnabled(ForgeDirection dir) {
+        boolean result;
         RedstoneControlMode mode = getExtractionRedstoneMode(dir);
         if (mode == RedstoneControlMode.NEVER) {
             return false;
@@ -297,12 +298,10 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
         boolean res;
         if (mode == RedstoneControlMode.OFF) {
             // if checking for no signal, must be no signal from both
-            res = RedstoneControlMode.isConditionMet(mode, signal)
-                    && (col != DyeColor.RED || RedstoneControlMode.isConditionMet(mode, exSig));
+            res = mode.isConditionMet(mode, signal) && (col != DyeColor.RED || mode.isConditionMet(mode, exSig));
         } else {
             // if checking for a signal, either is fine
-            res = RedstoneControlMode.isConditionMet(mode, signal)
-                    || (col == DyeColor.RED && RedstoneControlMode.isConditionMet(mode, exSig));
+            res = mode.isConditionMet(mode, signal) || (col == DyeColor.RED && mode.isConditionMet(mode, exSig));
         }
         return res;
     }

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

@@ -17,13 +17,15 @@ 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 crazypants.enderio.machine.RedstoneControlMode;
 
 public class PowerConduitRenderer extends DefaultConduitRenderer {
 
-    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal.withInitial(PowerConduitRenderer::new);
+    @Override
+    public boolean isRendererForConduit(IConduit conduit) {
+        return conduit instanceof IPowerConduit;
+    }
 
     @Override
     public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x,
@@ -60,12 +62,13 @@ public class PowerConduitRenderer extends DefaultConduitRenderer {
                 Tessellator tessellator = Tessellator.instance;
                 tessellator.setColorOpaque_I(c);
 
+                Offset offset = conduit.getBundle().getOffset(IPowerConduit.class, component.dir);
                 BoundingBox bound = component.bound;
                 if (conMode != ConnectionMode.IN_OUT) {
                     Vector3d trans = ForgeDirectionOffsets.offsetScaled(component.dir, -0.075);
                     bound = bound.translate(trans);
                 }
-                CubeRenderer.get().render(bound, tex);
+                CubeRenderer.render(bound, tex);
                 tessellator.setColorOpaque(255, 255, 255);
             }
         } else {

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

@@ -13,8 +13,8 @@ import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.ItemConduitSubtype;
 import crazypants.enderio.conduit.power.IPowerConduit;
 import crazypants.enderio.conduit.power.ItemPowerConduit;
+import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.power.ICapacitor;
-import crazypants.enderio.power.PowerDisplayUtil;
 
 public class ItemPowerConduitEndergy extends ItemPowerConduit {
 
@@ -75,7 +75,7 @@ public class ItemPowerConduitEndergy extends ItemPowerConduit {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List<String> list, boolean par4) {
+    public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
         if (PREFIX == null) {
             POSTFIX = " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr();
             PREFIX = EnderIO.lang.localize("power.maxOutput") + " ";

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

@@ -5,20 +5,14 @@ import net.minecraftforge.common.util.ForgeDirection;
 import com.enderio.core.common.util.DyeColor;
 
 import crazypants.enderio.conduit.ConnectionMode;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 
 public interface IInsulatedRedstoneConduit extends IRedstoneConduit {
 
-    String KEY_INS_CONDUIT_ICON = "enderio:redstoneInsulatedConduit";
-    String KEY_INS_CORE_OFF_ICON = "enderio:redstoneInsulatedConduitCoreOff";
-    String KEY_INS_CORE_ON_ICON = "enderio:redstoneInsulatedConduitCoreOn";
+    static final String KEY_INS_CONDUIT_ICON = "enderio:redstoneInsulatedConduit";
+    static final String KEY_INS_CORE_OFF_ICON = "enderio:redstoneInsulatedConduitCoreOff";
+    static final String KEY_INS_CORE_ON_ICON = "enderio:redstoneInsulatedConduitCoreOn";
 
-    String COLOR_CONTROLLER_ID = "ColorController";
-
-    @Override
-    default ConduitRenderer getRenderer() {
-        return InsulatedRedstoneConduitRenderer.instance.get();
-    }
+    public static final String COLOR_CONTROLLER_ID = "ColorController";
 
     void onInputsChanged(ForgeDirection side, int[] inputValues);
 

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

@@ -7,13 +7,14 @@ import com.enderio.core.client.render.CubeRenderer;
 
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.geom.CollidableComponent;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.conduit.render.DefaultConduitRenderer;
 
 public class InsulatedRedstoneConduitRenderer extends DefaultConduitRenderer {
 
-    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal
-            .withInitial(InsulatedRedstoneConduitRenderer::new);
+    @Override
+    public boolean isRendererForConduit(IConduit conduit) {
+        return conduit instanceof IInsulatedRedstoneConduit;
+    }
 
     @Override
     protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float selfIllum) {
@@ -23,7 +24,7 @@ public class InsulatedRedstoneConduitRenderer extends DefaultConduitRenderer {
                 int c = ((IInsulatedRedstoneConduit) conduit).getSignalColor(component.dir).getColor();
                 Tessellator tessellator = Tessellator.instance;
                 tessellator.setColorOpaque_I(c);
-                CubeRenderer.get().render(component.bound, tex);
+                CubeRenderer.render(component.bound, tex);
                 tessellator.setColorOpaque(255, 255, 255);
             }
         } else {

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

@@ -33,19 +33,12 @@ import crazypants.enderio.conduit.AbstractConduitNetwork;
 import crazypants.enderio.conduit.ConduitUtil;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.geom.CollidableComponent;
-import crazypants.enderio.conduit.render.ConduitRenderer;
-import crazypants.enderio.conduit.render.DefaultConduitRenderer;
 import dan200.computercraft.api.ComputerCraftAPI;
 import powercrystals.minefactoryreloaded.api.rednet.IRedNetOutputNode;
 
 public class RedstoneConduit extends AbstractConduit implements IRedstoneConduit {
 
-    static final Map<String, IIcon> ICONS = new HashMap<>();
-
-    @Override
-    public ConduitRenderer getRenderer() {
-        return DefaultConduitRenderer.instance.get();
-    }
+    static final Map<String, IIcon> ICONS = new HashMap<String, IIcon>();
 
     @SideOnly(Side.CLIENT)
     public static void initIcons() {
@@ -72,9 +65,10 @@ public class RedstoneConduit extends AbstractConduit implements IRedstoneConduit
 
     protected boolean neighbourDirty = true;
 
+    @SuppressWarnings("unused")
     public RedstoneConduit() {
-        for (int i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) {
-            externalSignals.add(new HashSet<>());
+        for (ForgeDirection ignored : ForgeDirection.VALID_DIRECTIONS) {
+            externalSignals.add(new HashSet<Signal>());
         }
     }
 

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

@@ -24,7 +24,6 @@ import crazypants.enderio.conduit.RaytraceResult;
 import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.geom.ConduitGeometryUtil;
 import crazypants.enderio.conduit.geom.Offset;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 
 public class RedstoneSwitch extends RedstoneConduit {
 
@@ -34,11 +33,6 @@ public class RedstoneSwitch extends RedstoneConduit {
 
     private boolean isOn;
 
-    @Override
-    public ConduitRenderer getRenderer() {
-        return RedstoneSwitchRenderer.instance.get();
-    }
-
     @SideOnly(Side.CLIENT)
     public static void initIcons() {
         IconUtil.addIconProvider(new IconUtil.IIconProvider() {
@@ -103,7 +97,7 @@ public class RedstoneSwitch extends RedstoneConduit {
         Vector3d trans = ConduitGeometryUtil.instance.getTranslation(ForgeDirection.UNKNOWN, o);
 
         List<CollidableComponent> result = super.getCollidableComponents();
-        BoundingBox[] aabb = RedstoneSwitchBounds.get().getAABB();
+        BoundingBox[] aabb = RedstoneSwitchBounds.getInstance().getAABB();
 
         for (BoundingBox bb : aabb) {
             result.add(

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

@@ -9,11 +9,13 @@ import crazypants.enderio.config.Config;
 
 public class RedstoneSwitchBounds {
 
-    private static final ThreadLocal<RedstoneSwitchBounds> instance = ThreadLocal
-            .withInitial(RedstoneSwitchBounds::new);
+    private static RedstoneSwitchBounds instance;
 
-    public static RedstoneSwitchBounds get() {
-        return RedstoneSwitchBounds.instance.get();
+    public static final RedstoneSwitchBounds getInstance() {
+        if (instance == null) {
+            instance = new RedstoneSwitchBounds();
+        }
+        return instance;
     }
 
     final VertexTransform[] xForms;

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

@@ -17,21 +17,29 @@ import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.geom.ConduitConnectorType;
 import crazypants.enderio.conduit.geom.ConduitGeometryUtil;
 import crazypants.enderio.conduit.render.ConduitBundleRenderer;
-import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.conduit.render.DefaultConduitRenderer;
 
 public class RedstoneSwitchRenderer extends DefaultConduitRenderer {
 
-    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal.withInitial(RedstoneSwitchRenderer::new);
+    private static final RedstoneSwitchRenderer instance = new RedstoneSwitchRenderer();
+
+    public static RedstoneSwitchRenderer getInstance() {
+        return instance;
+    }
 
     private final VertexTransform[] xForms;
     private final BoundingBox switchBounds;
     private final BoundingBox connectorBounds;
 
-    public RedstoneSwitchRenderer() {
-        xForms = RedstoneSwitchBounds.get().xForms;
-        switchBounds = RedstoneSwitchBounds.get().switchBounds;
-        connectorBounds = RedstoneSwitchBounds.get().connectorBounds;
+    private RedstoneSwitchRenderer() {
+        xForms = RedstoneSwitchBounds.getInstance().xForms;
+        switchBounds = RedstoneSwitchBounds.getInstance().switchBounds;
+        connectorBounds = RedstoneSwitchBounds.getInstance().connectorBounds;
+    }
+
+    @Override
+    public boolean isRendererForConduit(IConduit conduit) {
+        return conduit.getClass() == RedstoneSwitch.class;
     }
 
     @Override
@@ -41,15 +49,13 @@ public class RedstoneSwitchRenderer extends DefaultConduitRenderer {
         super.renderEntity(conduitBundleRenderer, bundle, conduit, x, y, z, partialTick, worldLight, rb);
 
         RedstoneSwitch sw = (RedstoneSwitch) conduit;
-        int i;
 
-        final Tessellator tessellator = Tessellator.instance;
-        final CubeRenderer cr = CubeRenderer.get();
+        Tessellator tessellator = Tessellator.instance;
         float selfIllum = Math.max(worldLight, conduit.getSelfIlluminationForState(null));
         tessellator.setColorOpaque_F(selfIllum, selfIllum, selfIllum);
 
         IIcon[] icons = new IIcon[6];
-        for (i = 0; i < icons.length; i++) {
+        for (int i = 0; i < icons.length; i++) {
             icons[i] = EnderIO.blockConduitBundle.getConnectorIcon(ConduitConnectorType.INTERNAL);
         }
         icons[3] = sw.getSwitchIcon();
@@ -59,12 +65,12 @@ public class RedstoneSwitchRenderer extends DefaultConduitRenderer {
                 bundle.getOffset(IRedstoneConduit.class, ForgeDirection.UNKNOWN));
         BoundingBox bb = switchBounds.translate(trans);
 
-        for (i = 0; i < xForms.length; i++) {
-            cr.render(bb, icons, xForms[i], null);
+        for (VertexTransform tf : xForms) {
+            CubeRenderer.render(bb, icons, tf, null);
         }
         bb = connectorBounds.translate(trans);
-        for (i = 0; i < xForms.length; i++) {
-            cr.render(bb, icons[0], xForms[i]);
+        for (VertexTransform tf : xForms) {
+            CubeRenderer.render(bb, icons[0], tf);
         }
     }
 

src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java

@@ -11,6 +11,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
@@ -18,13 +19,16 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
+
 import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.client.render.CubeRenderer;
 import com.enderio.core.client.render.IconUtil;
+import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.IBlockAccessWrapper;
 import com.google.common.collect.Lists;
-import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.relauncher.Side;
@@ -47,18 +51,59 @@ import crazypants.enderio.config.Config;
 import crazypants.util.RenderPassHelper;
 
 @SideOnly(Side.CLIENT)
-@ThreadSafeISBRH(perThread = false)
-public class ConduitBundleRenderer implements ISimpleBlockRenderingHandler {
+public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler {
 
     public ConduitBundleRenderer(float conduitScale) {}
 
-    public ConduitBundleRenderer() {}
+    @Override
+    public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) {
+        IConduitBundle bundle = (IConduitBundle) te;
+        EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
+        if (bundle.hasFacade() && bundle.getFacadeId().isOpaqueCube() && !ConduitUtil.isFacadeHidden(bundle, player)) {
+            return;
+        }
+
+        float brightness = -1;
+        for (IConduit con : bundle.getConduits()) {
+            if (ConduitUtil.renderConduit(player, con)) {
+                ConduitRenderer renderer = EnderIO.proxy.getRendererForConduit(con);
+                if (renderer.isDynamic()) {
+                    if (brightness == -1) {
+                        BlockCoord loc = bundle.getLocation();
+                        brightness = bundle.getEntity().getWorldObj()
+                                .getLightBrightnessForSkyBlocks(loc.x, loc.y, loc.z, 0);
+
+                        RenderUtil.bindBlockTexture();
+
+                        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT);
+                        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
+                        GL11.glEnable(GL11.GL_BLEND);
+                        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+                        GL11.glShadeModel(GL11.GL_SMOOTH);
+
+                        GL11.glPushMatrix();
+                        GL11.glTranslated(x, y, z);
+
+                        Tessellator.instance.startDrawingQuads();
+                    }
+                    renderer.renderDynamicEntity(this, bundle, con, x, y, z, partialTick, brightness);
+                }
+            }
+        }
+
+        if (brightness != -1) {
+            Tessellator.instance.draw();
+
+            GL11.glShadeModel(GL11.GL_FLAT);
+            GL11.glPopMatrix();
+            GL11.glPopAttrib();
+        }
+    }
 
     @Override
     public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
             RenderBlocks rb) {
 
-        final Tessellator tessellator = Tessellator.instance;
         int pass = RenderPassHelper.getBlockRenderPass();
         if (pass == 1) {
             // If the MC renderer is told that an alpha pass is required ( see
@@ -68,10 +113,10 @@ public class ConduitBundleRenderer implements ISimpleBlockRenderingHandler {
             // around is to ensure we always render something in this pass. Throwing
             // in a polygon with a 0 area does the job
             // See: https://github.com/MinecraftForge/MinecraftForge/issues/981
-            tessellator.addVertexWithUV(x, y, z, 0, 0);
-            tessellator.addVertexWithUV(x, y, z, 0, 0);
-            tessellator.addVertexWithUV(x, y, z, 0, 0);
-            tessellator.addVertexWithUV(x, y, z, 0, 0);
+            Tessellator.instance.addVertexWithUV(x, y, z, 0, 0);
+            Tessellator.instance.addVertexWithUV(x, y, z, 0, 0);
+            Tessellator.instance.addVertexWithUV(x, y, z, 0, 0);
+            Tessellator.instance.addVertexWithUV(x, y, z, 0, 0);
         }
 
         IConduitBundle bundle = (IConduitBundle) world.getTileEntity(x, y, z);
@@ -80,7 +125,7 @@ public class ConduitBundleRenderer implements ISimpleBlockRenderingHandler {
         boolean renderedFacade = renderFacade(x, y, z, pass, rb, bundle, player);
         boolean renderConduit = !renderedFacade || ConduitUtil.isFacadeHidden(bundle, player);
 
-        if (bundle != null && renderConduit && (pass == 0 || rb.overrideBlockTexture != null)) {
+        if (renderConduit && (pass == 0 || rb.overrideBlockTexture != null)) {
             BlockCoord loc = bundle.getLocation();
             float brightness;
             if (!Config.updateLightingWhenHidingFacades && bundle.hasFacade()
@@ -93,34 +138,21 @@ public class ConduitBundleRenderer implements ISimpleBlockRenderingHandler {
             return true;
         }
 
-        return renderedFacade || (bundle != null && bundle.hasFacade() && !bundle.getFacadeId().isOpaqueCube());
+        return renderedFacade || (bundle.hasFacade() && !bundle.getFacadeId().isOpaqueCube());
     }
 
-    private static final ThreadLocal<BlockConduitFacade> facade = ThreadLocal.withInitial(() -> {
-        try {
-            return EnderIO.blockConduitFacade.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new RuntimeException(e);
-        }
-
-    });
-
     private boolean renderFacade(int x, int y, int z, int pass, RenderBlocks rb, IConduitBundle bundle,
             EntityClientPlayerMP player) {
         boolean res = false;
-        if (bundle == null) {
-            return false;
-        }
-        final Tessellator tessellator = Tessellator.instance;
         if (bundle.hasFacade()) {
             res = true;
             Block facadeId = bundle.getFacadeId();
             if (ConduitUtil.isFacadeHidden(bundle, player)) {
-                tessellator.setColorOpaque_F(1, 1, 1);
+                Tessellator.instance.setColorOpaque_F(1, 1, 1);
                 bundle.setFacadeId(null, false);
                 bundle.setFacadeRenderAs(FacadeRenderState.WIRE_FRAME);
 
-                BlockConduitFacade facb = facade.get();
+                BlockConduitFacade facb = EnderIO.blockConduitFacade;
                 facb.setBlockOverride(bundle);
                 facb.setBlockBounds(0, 0, 0, 1, 1, 1);
                 if (!rb.hasOverrideBlockTexture()) {
@@ -160,23 +192,20 @@ public class ConduitBundleRenderer implements ISimpleBlockRenderingHandler {
     public void renderConduits(IConduitBundle bundle, double x, double y, double z, float partialTick, float brightness,
             RenderBlocks rb) {
 
-        if (bundle == null) return;
-
-        final Tessellator tessellator = Tessellator.instance;
-        final CubeRenderer cr = CubeRenderer.get();
+        Tessellator tessellator = Tessellator.instance;
         tessellator.setColorOpaque_F(1, 1, 1);
         tessellator.addTranslation((float) x, (float) y, (float) z);
 
         // Conduits
-        Set<ForgeDirection> externals = new HashSet<>();
+        Set<ForgeDirection> externals = new HashSet<ForgeDirection>();
         EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
 
-        List<BoundingBox> wireBounds = new ArrayList<>();
+        List<BoundingBox> wireBounds = new ArrayList<BoundingBox>();
 
         for (IConduit con : bundle.getConduits()) {
 
             if (ConduitUtil.renderConduit(player, con)) {
-                final ConduitRenderer renderer = con.getRenderer();
+                ConduitRenderer renderer = EnderIO.proxy.getRendererForConduit(con);
                 renderer.renderEntity(this, bundle, con, x, y, z, partialTick, brightness, rb);
                 Set<ForgeDirection> extCons = con.getExternalConnections();
                 for (ForgeDirection dir : extCons) {
@@ -196,8 +225,7 @@ public class ConduitBundleRenderer implements ISimpleBlockRenderingHandler {
         // Internal conectors between conduits
         List<CollidableComponent> connectors = bundle.getConnectors();
         List<CollidableComponent> rendered = Lists.newArrayList();
-        for (int i = 0; i < connectors.size(); i++) {
-            final CollidableComponent component = connectors.get(i);
+        for (CollidableComponent component : connectors) {
             if (component.conduitType != null) {
                 IConduit conduit = bundle.getConduit(component.conduitType);
                 if (conduit != null) {
@@ -215,12 +243,12 @@ public class ConduitBundleRenderer implements ISimpleBlockRenderingHandler {
                                 if (r.component.conduitType == component.conduitType
                                         && !rendered.contains(r.component)) {
                                     rendered.add(r.component);
-                                    cr.render(component.bound, rb.overrideBlockTexture, true);
+                                    CubeRenderer.render(component.bound, rb.overrideBlockTexture, true);
                                 }
                             }
                         } else {
                             tessellator.setBrightness((int) (brightness));
-                            cr.render(component.bound, conduit.getTextureForState(component), true);
+                            CubeRenderer.render(component.bound, conduit.getTextureForState(component), true);
                         }
                     } else {
                         wireBounds.add(component.bound);
@@ -229,18 +257,16 @@ public class ConduitBundleRenderer implements ISimpleBlockRenderingHandler {
 
             } else if (ConduitUtil.getDisplayMode(player) == ConduitDisplayMode.ALL && !rb.hasOverrideBlockTexture()) {
                 IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data);
-                cr.render(component.bound, tex);
+                CubeRenderer.render(component.bound, tex);
             }
         }
         // render these after the 'normal' conduits so help with proper blending
-        BlockConduitFacade facb = facade.get();
-        for (int i = 0; i < wireBounds.size(); i++) {
-            final BoundingBox wireBound = wireBounds.get(i);
-            tessellator.setColorRGBA_F(1, 1, 1, 0.25f);
-            cr.render(wireBound, facb.getIcon(0, 0));
+        for (BoundingBox wireBound : wireBounds) {
+            Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.25f);
+            CubeRenderer.render(wireBound, EnderIO.blockConduitFacade.getIcon(0, 0));
         }
 
-        tessellator.setColorRGBA_F(1, 1, 1, 1f);
+        Tessellator.instance.setColorRGBA_F(1, 1, 1, 1f);
         // External connection terminations
         if (rb.overrideBlockTexture == null) {
             for (ForgeDirection dir : externals) {
@@ -253,10 +279,8 @@ public class ConduitBundleRenderer implements ISimpleBlockRenderingHandler {
     private void renderExternalConnection(ForgeDirection dir) {
         IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(ConduitConnectorType.EXTERNAL);
         BoundingBox[] bbs = ConduitGeometryUtil.instance.getExternalConnectorBoundingBoxes(dir);
-        final CubeRenderer cr = CubeRenderer.get();
-        for (int i = 0; i < bbs.length; i++) {
-            final BoundingBox bb = bbs[i];
-            cr.render(bb, tex, true);
+        for (BoundingBox bb : bbs) {
+            CubeRenderer.render(bb, tex, true);
         }
     }
 

src/main/java/crazypants/enderio/conduit/render/ConduitRenderer.java

@@ -7,7 +7,13 @@ import crazypants.enderio.conduit.IConduitBundle;
 
 public interface ConduitRenderer {
 
+    boolean isRendererForConduit(IConduit conduit);
+
     void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit con, double x, double y,
             double z, float partialTick, float worldLight, RenderBlocks rb);
 
+    boolean isDynamic();
+
+    void renderDynamicEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit con, double x,
+            double y, double z, float partialTick, float worldLight);
 }

src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java

@@ -1,11 +1,7 @@
 package crazypants.enderio.conduit.render;
 
-import static net.minecraftforge.common.util.ForgeDirection.DOWN;
-import static net.minecraftforge.common.util.ForgeDirection.EAST;
-import static net.minecraftforge.common.util.ForgeDirection.NORTH;
-import static net.minecraftforge.common.util.ForgeDirection.SOUTH;
-import static net.minecraftforge.common.util.ForgeDirection.UP;
-import static net.minecraftforge.common.util.ForgeDirection.WEST;
+import static com.enderio.core.client.render.CubeRenderer.*;
+import static net.minecraftforge.common.util.ForgeDirection.*;
 
 import java.util.Collection;
 import java.util.List;
@@ -16,7 +12,6 @@ import net.minecraft.util.IIcon;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.client.render.BoundingBox;
-import com.enderio.core.client.render.CubeRenderer;
 import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.common.vecmath.Vertex;
 
@@ -28,10 +23,13 @@ import crazypants.enderio.conduit.geom.CollidableComponent;
 
 public class DefaultConduitRenderer implements ConduitRenderer {
 
-    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal.withInitial(DefaultConduitRenderer::new);
-
     protected float transmissionScaleFactor;
 
+    @Override
+    public boolean isRendererForConduit(IConduit conduit) {
+        return true;
+    }
+
     @Override
     public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x,
             double y, double z, float partialTick, float worldLight, RenderBlocks rb) {
@@ -63,8 +61,11 @@ public class DefaultConduitRenderer implements ConduitRenderer {
         }
     }
 
+    @Override
+    public void renderDynamicEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit con,
+            double x, double y, double z, float partialTick, float worldLight) {}
+
     protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) {
-        final CubeRenderer cr = CubeRenderer.get();
 
         if (isNSEWUD(component.dir)) {
 
@@ -93,8 +94,9 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                         tex.getMaxU(),
                         tex.getMinV(),
                         tex.getMaxV());
+                Tessellator tessellator = Tessellator.instance;
                 for (Vertex c : corners) {
-                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                    addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                 }
             }
 
@@ -141,13 +143,12 @@ public class DefaultConduitRenderer implements ConduitRenderer {
     protected void drawSection(BoundingBox bound, float minU, float maxU, float minV, float maxV, ForgeDirection dir,
             boolean isTransmission, boolean mirrorTexture) {
 
-        final Tessellator tessellator = Tessellator.instance;
-        final CubeRenderer cr = CubeRenderer.get();
+        Tessellator tessellator = Tessellator.instance;
 
         if (isTransmission) {
             setVerticesForTransmission(bound, dir);
         } else {
-            cr.setupVertices(bound);
+            setupVertices(bound);
         }
 
         if (mirrorTexture && (dir == NORTH || dir == UP || dir == EAST)) {
@@ -167,15 +168,15 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                 tessellator.setColorOpaque_F(cm, cm, cm);
             }
             if (rotateSides) {
-                cr.addVecWithUV(cr.verts[1], maxU, maxV);
-                cr.addVecWithUV(cr.verts[0], maxU, minV);
-                cr.addVecWithUV(cr.verts[3], minU, minV);
-                cr.addVecWithUV(cr.verts[2], minU, maxV);
+                addVecWithUV(verts[1], maxU, maxV);
+                addVecWithUV(verts[0], maxU, minV);
+                addVecWithUV(verts[3], minU, minV);
+                addVecWithUV(verts[2], minU, maxV);
             } else {
-                cr.addVecWithUV(cr.verts[1], minU, minV);
-                cr.addVecWithUV(cr.verts[0], maxU, minV);
-                cr.addVecWithUV(cr.verts[3], maxU, maxV);
-                cr.addVecWithUV(cr.verts[2], minU, maxV);
+                addVecWithUV(verts[1], minU, minV);
+                addVecWithUV(verts[0], maxU, minV);
+                addVecWithUV(verts[3], maxU, maxV);
+                addVecWithUV(verts[2], minU, maxV);
             }
             if (dir == WEST || dir == EAST) {
                 float tmp = minU;
@@ -188,15 +189,15 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                 tessellator.setColorOpaque_F(cm, cm, cm);
             }
             if (rotateSides) {
-                cr.addVecWithUV(cr.verts[4], maxU, maxV);
-                cr.addVecWithUV(cr.verts[5], maxU, minV);
-                cr.addVecWithUV(cr.verts[6], minU, minV);
-                cr.addVecWithUV(cr.verts[7], minU, maxV);
+                addVecWithUV(verts[4], maxU, maxV);
+                addVecWithUV(verts[5], maxU, minV);
+                addVecWithUV(verts[6], minU, minV);
+                addVecWithUV(verts[7], minU, maxV);
             } else {
-                cr.addVecWithUV(cr.verts[4], minU, minV);
-                cr.addVecWithUV(cr.verts[5], maxU, minV);
-                cr.addVecWithUV(cr.verts[6], maxU, maxV);
-                cr.addVecWithUV(cr.verts[7], minU, maxV);
+                addVecWithUV(verts[4], minU, minV);
+                addVecWithUV(verts[5], maxU, minV);
+                addVecWithUV(verts[6], maxU, maxV);
+                addVecWithUV(verts[7], minU, maxV);
             }
             if (dir == WEST || dir == EAST) {
                 float tmp = minU;
@@ -213,15 +214,15 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                 tessellator.setColorOpaque_F(cm, cm, cm);
             }
             if (rotateTopBottom) {
-                cr.addVecWithUV(cr.verts[6], maxU, maxV);
-                cr.addVecWithUV(cr.verts[2], minU, maxV);
-                cr.addVecWithUV(cr.verts[3], minU, minV);
-                cr.addVecWithUV(cr.verts[7], maxU, minV);
+                addVecWithUV(verts[6], maxU, maxV);
+                addVecWithUV(verts[2], minU, maxV);
+                addVecWithUV(verts[3], minU, minV);
+                addVecWithUV(verts[7], maxU, minV);
             } else {
-                cr.addVecWithUV(cr.verts[6], minU, minV);
-                cr.addVecWithUV(cr.verts[2], minU, maxV);
-                cr.addVecWithUV(cr.verts[3], maxU, maxV);
-                cr.addVecWithUV(cr.verts[7], maxU, minV);
+                addVecWithUV(verts[6], minU, minV);
+                addVecWithUV(verts[2], minU, maxV);
+                addVecWithUV(verts[3], maxU, maxV);
+                addVecWithUV(verts[7], maxU, minV);
             }
 
             tessellator.setNormal(0, -1, 0);
@@ -230,15 +231,15 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                 tessellator.setColorOpaque_F(cm, cm, cm);
             }
             if (rotateTopBottom) {
-                cr.addVecWithUV(cr.verts[0], minU, minV);
-                cr.addVecWithUV(cr.verts[1], minU, maxV);
-                cr.addVecWithUV(cr.verts[5], maxU, maxV);
-                cr.addVecWithUV(cr.verts[4], maxU, minV);
+                addVecWithUV(verts[0], minU, minV);
+                addVecWithUV(verts[1], minU, maxV);
+                addVecWithUV(verts[5], maxU, maxV);
+                addVecWithUV(verts[4], maxU, minV);
             } else {
-                cr.addVecWithUV(cr.verts[0], maxU, maxV);
-                cr.addVecWithUV(cr.verts[1], minU, maxV);
-                cr.addVecWithUV(cr.verts[5], minU, minV);
-                cr.addVecWithUV(cr.verts[4], maxU, minV);
+                addVecWithUV(verts[0], maxU, maxV);
+                addVecWithUV(verts[1], minU, maxV);
+                addVecWithUV(verts[5], minU, minV);
+                addVecWithUV(verts[4], maxU, minV);
             }
         }
 
@@ -250,15 +251,15 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                 tessellator.setColorOpaque_F(cm, cm, cm);
             }
             if (rotateSides) {
-                cr.addVecWithUV(cr.verts[2], minU, maxV);
-                cr.addVecWithUV(cr.verts[6], minU, minV);
-                cr.addVecWithUV(cr.verts[5], maxU, minV);
-                cr.addVecWithUV(cr.verts[1], maxU, maxV);
+                addVecWithUV(verts[2], minU, maxV);
+                addVecWithUV(verts[6], minU, minV);
+                addVecWithUV(verts[5], maxU, minV);
+                addVecWithUV(verts[1], maxU, maxV);
             } else {
-                cr.addVecWithUV(cr.verts[2], minU, maxV);
-                cr.addVecWithUV(cr.verts[6], maxU, maxV);
-                cr.addVecWithUV(cr.verts[5], maxU, minV);
-                cr.addVecWithUV(cr.verts[1], minU, minV);
+                addVecWithUV(verts[2], minU, maxV);
+                addVecWithUV(verts[6], maxU, maxV);
+                addVecWithUV(verts[5], maxU, minV);
+                addVecWithUV(verts[1], minU, minV);
             }
 
             tessellator.setNormal(-1, 0, 0);
@@ -267,15 +268,15 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                 tessellator.setColorOpaque_F(cm, cm, cm);
             }
             if (rotateSides) {
-                cr.addVecWithUV(cr.verts[0], maxU, maxV);
-                cr.addVecWithUV(cr.verts[4], maxU, minV);
-                cr.addVecWithUV(cr.verts[7], minU, minV);
-                cr.addVecWithUV(cr.verts[3], minU, maxV);
+                addVecWithUV(verts[0], maxU, maxV);
+                addVecWithUV(verts[4], maxU, minV);
+                addVecWithUV(verts[7], minU, minV);
+                addVecWithUV(verts[3], minU, maxV);
             } else {
-                cr.addVecWithUV(cr.verts[0], minU, minV);
-                cr.addVecWithUV(cr.verts[4], maxU, minV);
-                cr.addVecWithUV(cr.verts[7], maxU, maxV);
-                cr.addVecWithUV(cr.verts[3], minU, maxV);
+                addVecWithUV(verts[0], minU, minV);
+                addVecWithUV(verts[4], maxU, minV);
+                addVecWithUV(verts[7], maxU, maxV);
+                addVecWithUV(verts[3], minU, maxV);
             }
         }
         tessellator.setColorOpaque_F(1, 1, 1);
@@ -285,7 +286,7 @@ public class DefaultConduitRenderer implements ConduitRenderer {
         float xs = dir.offsetX == 0 ? transmissionScaleFactor : 1;
         float ys = dir.offsetY == 0 ? transmissionScaleFactor : 1;
         float zs = dir.offsetZ == 0 ? transmissionScaleFactor : 1;
-        CubeRenderer.get().setupVertices(bound.scale(xs, ys, zs));
+        setupVertices(bound.scale(xs, ys, zs));
     }
 
     // TODO: This is a really hacky, imprecise and slow way to do this
@@ -344,4 +345,8 @@ public class DefaultConduitRenderer implements ConduitRenderer {
         return new BoundingBox[] { bb };
     }
 
+    @Override
+    public boolean isDynamic() {
+        return false;
+    }
 }

src/main/java/crazypants/enderio/conduit/render/ItemConduitRenderer.java

@@ -62,9 +62,8 @@ public class ItemConduitRenderer implements IItemRenderer {
     }
 
     private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) {
-        final Tessellator tessellator = Tessellator.instance;
-        tessellator.startDrawingQuads();
-        CubeRenderer.get().render(bb, item.getItem().getIconFromDamage(item.getItemDamage()));
-        tessellator.draw();
+        Tessellator.instance.startDrawingQuads();
+        CubeRenderer.render(bb, item.getItem().getIconFromDamage(item.getItemDamage()));
+        Tessellator.instance.draw();
     }
 }

src/main/java/crazypants/enderio/config/Config.java

@@ -74,6 +74,7 @@ public final class Config {
     public static final Section sectionMobConfig = new Section("Mob Config", "mobconfig");
     public static final Section sectionRailConfig = new Section("Rail", "railconfig");
     public static final Section sectionEnchantments = new Section("Enchantments", "enchantments");
+    public static final Section sectionWeather = new Section("Weather", "weather");
     public static final Section sectionTelepad = new Section("Telepad", "telepad");
     public static final Section sectionInventoryPanel = new Section("InventoryPanel", "inventorypanel");
     public static final Section sectionMisc = new Section("Misc", "misc");
@@ -83,6 +84,8 @@ public final class Config {
     public static boolean reinforcedObsidianEnabled = true;
     public static boolean reinforcedObsidianUseDarkSteelBlocks = false;
 
+    public static boolean enforceOfflinePlayerUUID = false;
+
     public static boolean useAlternateBinderRecipe = false;
 
     public static boolean useAlternateTesseractModel = false;
@@ -153,17 +156,13 @@ public final class Config {
     public static int travelStaffBlinkPauseTicks = 10;
 
     public static boolean travelStaffEnabled = true;
-    public static boolean travelStaffAllowInBaublesSlot = true;
-    public static boolean travelStaffKeybindEnabled = true;
     public static boolean travelStaffBlinkEnabled = true;
     public static boolean travelStaffBlinkThroughSolidBlocksEnabled = true;
     public static boolean travelStaffBlinkThroughClearBlocksEnabled = true;
     public static boolean travelStaffBlinkThroughUnbreakableBlocksEnabled = false;
     public static String[] travelStaffBlinkBlackList = new String[] { "minecraft:bedrock", "Thaumcraft:blockWarded" };
-    public static String travelStaffBaublesType = "UNIVERSAL";
     public static float travelAnchorZoomScale = 0.2f;
     public static boolean travelStaffSearchOptimize = true;
-    public static boolean validateTravelEventServerside = true;
 
     /** The max distance for travelling to a Travel Anchor. */
     public static int teleportStaffMaxDistance = 2048;
@@ -174,34 +173,6 @@ public final class Config {
      */
     public static int teleportStaffFailedBlinkDistance = 64;
 
-    /**
-     * Sets the teleport staff right-click action.
-     *
-     * <p>
-     * Values:
-     * <ul>
-     * <li><b>0:</b> Do nothing
-     * <li><b>1:</b> Teleport to look
-     * <li><b>2:</b> Teleport to anchor
-     * <li><b>3:</b> Teleport to anchor, or to look if no anchor <em>(default)</em>
-     * </ul>
-     */
-    public static int teleportStaffAction = 3;
-
-    /**
-     * Sets the teleport staff sneak right-click action.
-     *
-     * <p>
-     * Values:
-     * <ul>
-     * <li><b>0:</b> Do nothing
-     * <li><b>1:</b> Teleport to look <em>(default)</em>
-     * <li><b>2:</b> Teleport to anchor
-     * <li><b>3:</b> Teleport to anchor, or to look if no anchor
-     * </ul>
-     */
-    public static int teleportStaffSneakAction = 1;
-
     public static int enderIoRange = 8;
     public static boolean enderIoMeAccessEnabled = true;
 
@@ -284,8 +255,6 @@ public final class Config {
 
     public static int darkSteelApiaristArmorCost = 10;
 
-    public static int darkSteelTrackmanGogglesCost = 10;
-
     public static int darkSteelSwimCost = 10;
 
     public static int darkSteelNightVisionCost = 10;
@@ -390,8 +359,6 @@ public final class Config {
             "TwilightForest:item.steeleafHoe", "TwilightForest:item.ironwoodHoe", "IC2:itemToolBronzeHoe" };
     public static List<ItemStack> farmHoes = new ArrayList<ItemStack>();
     public static int farmSaplingReserveAmount = 8;
-    public static double farmParticlesMaxRange = 64;
-    public static int farmParticlesCount = 15;
 
     public static int magnetPowerUsePerSecondRF = 1;
     public static int magnetPowerCapacityRF = 100000;
@@ -476,6 +443,7 @@ public final class Config {
 
     public static boolean isGasConduitEnabled = true;
     public static boolean enableMEConduits = true;
+    public static boolean enableMEUltraDenseConduits = false;
     public static boolean enableOCConduits = true;
     public static boolean enableOCConduitsAnimatedTexture = true;
 
@@ -543,6 +511,10 @@ public final class Config {
     public static boolean spawnGuardStopAllSlimesDebug = false;
     public static boolean spawnGuardStopAllSquidSpawning = false;
 
+    public static int weatherObeliskClearFluid = 2000;
+    public static int weatherObeliskRainFluid = 500;
+    public static int weatherObeliskThunderFluid = 1000;
+
     // Loot Defaults
     public static boolean lootDarkSteel = true;
     public static boolean lootItemConduitProbe = true;
@@ -595,8 +567,6 @@ public final class Config {
 
     public static boolean strictTPItemChecking = true;
 
-    public static float fusedQuartzExplosionResistance = 2000.0f;
-
     public static void load(FMLPreInitializationEvent event) {
         PacketHandler.INSTANCE
                 .registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT);
@@ -1067,6 +1037,13 @@ public final class Config {
                 "Enable per tick sampling on individual power inputs and outputs. This allows slightly more detailed messages from the RF Reader but has a negative impact on server performance.")
                 .getBoolean(detailedPowerTrackingEnabled);
 
+        enforceOfflinePlayerUUID = config.get(
+                sectionAdvanced.name,
+                "enforceOfflinePlayerUUID",
+                false,
+                "Enforces to use the players offline UUID. Recommendet to use before creating your world, otherwise it might breaks all secuity related things.")
+                .getBoolean(enforceOfflinePlayerUUID);
+
         useSneakMouseWheelYetaWrench = config.get(
                 sectionPersonal.name,
                 "useSneakMouseWheelYetaWrench",
@@ -1197,19 +1174,6 @@ public final class Config {
                 "travelStaffEnabled",
                 travelAnchorEnabled,
                 "If set to false: the travel staff will not be craftable.").getBoolean(travelStaffEnabled);
-        travelStaffAllowInBaublesSlot = config
-                .get(
-                        sectionStaff.name,
-                        "travelStaffAllowInBaublesSlot",
-                        travelStaffAllowInBaublesSlot,
-                        "If true the travel staff can be put into Baubles slots (requires Baubles to be installed)")
-                .getBoolean(travelStaffAllowInBaublesSlot);
-        travelStaffKeybindEnabled = config.get(
-                sectionStaff.name,
-                "travelStaffKeybindEnabled",
-                travelStaffKeybindEnabled,
-                "If set to false: the Travel Staff Blink keybind will not be useable. (keybind allows when staff is anywhere in inventory, might not be wanted)")
-                .getBoolean(travelStaffKeybindEnabled);
         travelStaffBlinkEnabled = config
                 .get(
                         sectionStaff.name,
@@ -1243,13 +1207,6 @@ public final class Config {
                 sectionStaff.name,
                 travelStaffBlinkBlackList,
                 "Lists the blocks that cannot be teleported through in the form 'modID:blockName'");
-        travelStaffBaublesType = config.get(
-                sectionStaff.name,
-                "travelStaffBaublesType",
-                travelStaffBaublesType,
-                "The BaublesType the Travel Staff should be, 'AMULET', 'RING', 'BELT', or 'UNIVERSAL' (requires Baubles to be installed and travelStaffAllowInBaublesSlot to be on)")
-                .getString();
-
         travelAnchorZoomScale = config.getFloat(
                 "travelAnchorZoomScale",
                 sectionStaff.name,
@@ -1266,13 +1223,6 @@ public final class Config {
                         + "This config is experimental, so if you encounter any strange behavior, please report to GTNH developer.")
                 .getBoolean(travelStaffSearchOptimize);
 
-        validateTravelEventServerside = config.get(
-                sectionStaff.name,
-                "validateTravelEventServerside",
-                validateTravelEventServerside,
-                "If set to true: Server will validate if player actually can teleport. False will allow hacking, but also allows Staff of Traveling Keybind mod to work.")
-                .getBoolean(validateTravelEventServerside);
-
         teleportStaffMaxDistance = config
                 .get(
                         sectionStaff.name,
@@ -1297,27 +1247,6 @@ public final class Config {
                         "Number of blocks teleported when no block is being looked at.")
                 .getInt(teleportStaffFailedBlinkDistance);
 
-        teleportStaffAction = config.get(
-                sectionStaff.name,
-                "teleportStaffAction",
-                teleportStaffAction,
-                "Sets the action for right-click with the staff of teleportation. Values:\n" + "    0: Do nothing\n"
-                        + "    1: Teleport to look\n"
-                        + "    2: Teleport to anchor\n"
-                        + "    3: Teleport to anchor, or look if no anchor (default)")
-                .getInt(teleportStaffAction);
-
-        teleportStaffSneakAction = config.get(
-                sectionStaff.name,
-                "teleportStaffSneakAction",
-                teleportStaffSneakAction,
-                "Sets the action for sneak right-click with the staff of teleportation. Values:\n"
-                        + "    0: Do nothing\n"
-                        + "    1: Teleport to look (default)\n"
-                        + "    2: Teleport to anchor\n"
-                        + "    3: Teleport to anchor, or look if no anchor")
-                .getInt(teleportStaffSneakAction);
-
         enderIoRange = config.get(
                 sectionEfficiency.name,
                 "enderIoRange",
@@ -1608,14 +1537,6 @@ public final class Config {
                 darkSteelApiaristArmorCost,
                 "Number of levels required for the Apiarist Armor upgrade.").getInt(darkSteelApiaristArmorCost);
 
-        darkSteelTrackmanGogglesCost = config
-                .get(
-                        sectionDarkSteel.name,
-                        "darkSteelTrackmanGogglesCost",
-                        darkSteelTrackmanGogglesCost,
-                        "Number of levels required for the Trackman's Goggles upgrade.")
-                .getInt(darkSteelTrackmanGogglesCost);
-
         darkSteelTravelCost = config.get(
                 sectionDarkSteel.name,
                 "darkSteelTravelCost",
@@ -2117,18 +2038,6 @@ public final class Config {
                         + "always shear all leaves.")
                 .getInt(farmSaplingReserveAmount);
 
-        farmParticlesMaxRange = config.get(
-                sectionFarm.name,
-                "farmParticlesMaxRange",
-                farmParticlesMaxRange,
-                "The max range of the farm action particles.").getDouble(farmParticlesMaxRange);
-
-        farmParticlesCount = config.get(
-                sectionFarm.name,
-                "farmParticlesCount",
-                farmParticlesCount,
-                "The number of particles produces by farm action.").getInt(farmParticlesCount);
-
         combustionGeneratorUseOpaqueModel = config
                 .get(
                         sectionAesthetic.name,
@@ -2183,7 +2092,7 @@ public final class Config {
                 sectionMagnet.name,
                 "magnetAllowDeactivatedInBaublesSlot",
                 magnetAllowDeactivatedInBaublesSlot,
-                "If true the magnet can be put into a Baubles slot even if switched off (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)")
+                "If true the magnet can be put into the 'amulet' Baubles slot even if switched off (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)")
                 .getBoolean(magnetAllowDeactivatedInBaublesSlot);
 
         magnetAllowPowerExtraction = config.get(
@@ -2196,7 +2105,7 @@ public final class Config {
                 sectionMagnet.name,
                 "magnetBaublesType",
                 magnetBaublesType,
-                "The BaublesType the magnet should be, 'AMULET', 'RING', 'BELT', or UNIVERSAL (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)")
+                "The BaublesType the magnet should be, 'AMULET', 'RING' or 'BELT' (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)")
                 .getString();
 
         useCombustionGenModel = config
@@ -2421,6 +2330,11 @@ public final class Config {
                 sectionItems.name,
                 enableMEConduits,
                 "Allows ME conduits. Only has an effect with AE2 installed.");
+        enableMEUltraDenseConduits = config.getBoolean(
+                "enableMEUltraDenseConduits",
+                sectionItems.name,
+                enableMEUltraDenseConduits,
+                "Allows ME Ultra Dense conduits. Only has an effect with AE2 installed.");
         enableOCConduits = config.getBoolean(
                 "enableOCConduits",
                 sectionItems.name,
@@ -2743,6 +2657,22 @@ public final class Config {
                 spawnGuardStopAllSquidSpawning,
                 "When true no squid will be spawned.");
 
+        weatherObeliskClearFluid = config.get(
+                sectionWeather.name,
+                "weatherObeliskClearFluid",
+                weatherObeliskClearFluid,
+                "The fluid required (in mB) to set the world to clear weather").getInt();
+        weatherObeliskRainFluid = config.get(
+                sectionWeather.name,
+                "weatherObeliskRainFluid",
+                weatherObeliskRainFluid,
+                "The fluid required (in mB) to set the world to rainy weather").getInt();
+        weatherObeliskThunderFluid = config.get(
+                sectionWeather.name,
+                "weatherObeliskThunderFluid",
+                weatherObeliskThunderFluid,
+                "The fluid required (in mB) to set the world to thundering weather").getInt();
+
         // Loot Config
         lootDarkSteel = config.getBoolean(
                 "lootDarkSteel",
@@ -2971,13 +2901,6 @@ public final class Config {
                 strictTPItemChecking,
                 "If true, turn on strict checking of item energy checking. This might cause traveling tools from third party mods to fire fake security warnings on server side and not function correctly.")
                 .getBoolean(strictTPItemChecking);
-        fusedQuartzExplosionResistance = config.getFloat(
-                "fusedQuartzExplosionResistance",
-                sectionMisc.name,
-                fusedQuartzExplosionResistance,
-                0.0f,
-                Float.MAX_VALUE,
-                "How blast resistant the three Fused Quartz blocks should be.");
     }
 
     public static void checkYetaAccess() {

src/main/java/crazypants/enderio/config/PacketConfigSync.java

@@ -27,7 +27,6 @@ public class PacketConfigSync implements IMessage, IMessageHandler<PacketConfigS
         buf.writeInt(Config.teleportStaffFailedBlinkDistance);
         buf.writeBoolean(Config.telepadLockCoords);
         buf.writeBoolean(Config.telepadLockDimension);
-        buf.writeBoolean(Config.travelStaffKeybindEnabled);
     }
 
     @Override
@@ -47,7 +46,6 @@ public class PacketConfigSync implements IMessage, IMessageHandler<PacketConfigS
         Config.teleportStaffFailedBlinkDistance = data.readInt();
         Config.telepadLockCoords = data.readBoolean();
         Config.telepadLockDimension = data.readBoolean();
-        Config.travelStaffKeybindEnabled = data.readBoolean();
     }
 
     @Override

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

@@ -1,9 +1,6 @@
 package crazypants.enderio.enderface;
 
-import java.util.List;
-
 import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
 
 public class ContainerWrapper extends net.minecraft.inventory.Container {
 
@@ -31,8 +28,9 @@ public class ContainerWrapper extends net.minecraft.inventory.Container {
         return wrapped.getSlot(arg0);
     }
 
+    @SuppressWarnings("rawtypes")
     @Override
-    public List<ItemStack> getInventory() {
+    public java.util.List getInventory() {
         return wrapped.getInventory();
     }
 

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

@@ -55,7 +55,7 @@ public class EnderIoRenderer extends TileEntitySpecialRenderer implements IItemR
     }
 
     public void render(double x, double y, double z, Matrix4d lookMat, int brightness) {
-        final Tessellator tessellator = Tessellator.instance;
+
         GL11.glPushMatrix();
         GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5);
 
@@ -111,8 +111,8 @@ public class EnderIoRenderer extends TileEntitySpecialRenderer implements IItemR
         GL11.glTranslated(x, y, z);
 
         RenderUtil.bindBlockTexture();
-        tessellator.startDrawingQuads();
-        tessellator.setBrightness(brightness);
+        Tessellator.instance.startDrawingQuads();
+        Tessellator.instance.setBrightness(brightness);
 
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
@@ -120,8 +120,8 @@ public class EnderIoRenderer extends TileEntitySpecialRenderer implements IItemR
         GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL);
         GL11.glPolygonOffset(-1.0f, -1.0f);
 
-        CubeRenderer.get().render(BoundingBox.UNIT_CUBE, EnderIO.blockEnderIo.frameIcon);
-        tessellator.draw();
+        CubeRenderer.render(BoundingBox.UNIT_CUBE, EnderIO.blockEnderIo.frameIcon);
+        Tessellator.instance.draw();
         GL11.glPopMatrix();
 
         GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL);

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

@@ -214,7 +214,7 @@ public class GuiEnderface extends GuiScreen {
 
         if (hit != null) {
             Block block = world.getBlock(hit.blockX, hit.blockY, hit.blockZ);
-            if (block == EnderIO.blockHyperCube) {
+            if (block == EnderIO.blockHyperCube || block == EnderIO.blockCapacitorBank) {
                 block.onBlockActivated(world, hit.blockX, hit.blockY, hit.blockZ, player, 0, 0, 0, 0);
             } else {
                 openInterface(hit.blockX, hit.blockY, hit.blockZ, hit.sideHit, hit.hitVec);
@@ -538,13 +538,34 @@ public class GuiEnderface extends GuiScreen {
         int h = gh;
         int left = guiLeft;
         int top = guiTop;
+        int cx = left + w / 2;
+        int cy = top + h / 2;
 
         // black outline
         drawRect(left, top, left + w, top + h, 0xFF000000);
-        left += 2;
-        top += 2;
-        w -= 4;
-        h -= 4;
+        left += 1;
+        top += 1;
+        w -= 2;
+        h -= 2;
+
+        // border
+        int topH = 0xFFFFFFFF;
+        int botH = 0xFF555555;
+        int rightH = 0xFF555555;
+        int leftH = 0xFFFFFFFF;
+        if (animateInX) {
+            leftH = 0xFF555555;
+            rightH = 0xFFFFFFFF;
+        }
+        if (animateInY) {
+            topH = 0xFF555555;
+            botH = 0xFFFFFFFF;
+        }
+
+        left += 1;
+        top += 1;
+        w -= 2;
+        h -= 2;
         drawRect(left, top, left + w, top + h, 0xFF00331C);
     }
 

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

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

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

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

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

@@ -97,6 +97,7 @@ public class ItemConduitProbe extends Item implements IResourceTooltipProvider,
         if (!(te instanceof IConduitBundle)) {
             return false;
         }
+        IConduitBundle cb = (IConduitBundle) te;
         if (itemStack.getItemDamage() == 0) {
             if (PacketConduitProbe.canCreatePacket(world, x, y, z)) {
                 if (world.isRemote) {

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

@@ -133,8 +133,9 @@ public class ItemEnderFood extends ItemFood implements IResourceTooltipProvider
         setHasSubtypes(true);
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
-    public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
+    public void getSubItems(Item item, CreativeTabs tab, List list) {
         for (EnderFood f : EnderFood.VALUES) {
             list.add(f.getStack());
         }

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

@@ -28,7 +28,7 @@ import crazypants.enderio.EnderIOTab;
 import crazypants.enderio.ModObject;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.item.darksteel.DarkSteelItems;
-import crazypants.enderio.power.PowerDisplayUtil;
+import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.util.BaublesUtil;
 
 @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles|API")
@@ -96,7 +96,7 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
         ItemStack is = new ItemStack(this);
         setFull(is);
         par3List.add(is);
@@ -108,7 +108,7 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List<String> list, boolean par4) {
+    public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
         super.addInformation(itemStack, par2EntityPlayer, list, par4);
         String str = PowerDisplayUtil.formatPower(getEnergyStored(itemStack)) + "/"
                 + PowerDisplayUtil.formatPower(getMaxEnergyStored(itemStack))
@@ -206,7 +206,6 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
     }
 
     @Override
-    @Method(modid = "Baubles|API")
     public void onWornTick(ItemStack itemstack, EntityLivingBase player) {
         if (player instanceof EntityPlayer && isActive(itemstack)
                 && hasPower(itemstack)
@@ -223,21 +222,17 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
     }
 
     @Override
-    @Method(modid = "Baubles|API")
     public void onEquipped(ItemStack itemstack, EntityLivingBase player) {}
 
     @Override
-    @Method(modid = "Baubles|API")
     public void onUnequipped(ItemStack itemstack, EntityLivingBase player) {}
 
     @Override
-    @Method(modid = "Baubles|API")
     public boolean canEquip(ItemStack itemstack, EntityLivingBase player) {
         return Config.magnetAllowInBaublesSlot && (Config.magnetAllowDeactivatedInBaublesSlot || isActive(itemstack));
     }
 
     @Override
-    @Method(modid = "Baubles|API")
     public boolean canUnequip(ItemStack itemstack, EntityLivingBase player) {
         return true;
     }

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

@@ -1,11 +1,6 @@
 package crazypants.enderio.item;
 
-import static crazypants.enderio.material.Alloy.CONDUCTIVE_IRON;
-import static crazypants.enderio.material.Alloy.DARK_STEEL;
-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.SOULARIUM;
+import static crazypants.enderio.material.Alloy.*;
 import static crazypants.enderio.material.Material.VIBRANT_CYSTAL;
 import static crazypants.enderio.material.endergy.AlloyEndergy.STELLAR_ALLOY;
 import static crazypants.util.RecipeUtil.addShaped;

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

@@ -367,8 +367,7 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
-            boolean par4) {
+    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
         if (par1ItemStack != null) {
             String mobName = getMobTypeFromStack(par1ItemStack);
             if (mobName != null) {

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

@@ -190,14 +190,18 @@ public class ItemYetaWrench extends Item
     }
 
     /* IAdvancedTooltipProvider */
-    @Override
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
 
+    @SuppressWarnings("rawtypes")
     @Override
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}
 
+    @SuppressWarnings("rawtypes")
     @Override
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @Override
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         ArrayList<String> tmp = new ArrayList<String>();
         SpecialTooltipHandler.addDetailedTooltipFromResources(tmp, getUnlocalizedName());
         String keyName = Keyboard.getKeyName(KeyTracker.instance.getYetaWrenchMode().getKeyCode());

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

@@ -8,7 +8,6 @@ import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatComponentTranslation;
 
 import org.lwjgl.input.Keyboard;
 
@@ -18,26 +17,21 @@ import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent;
 import crazypants.enderio.EnderIO;
-import crazypants.enderio.api.teleport.IItemOfTravel;
 import crazypants.enderio.api.tool.IConduitControl;
 import crazypants.enderio.conduit.ConduitDisplayMode;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.item.PacketMagnetState.SlotType;
 import crazypants.enderio.item.darksteel.DarkSteelController;
 import crazypants.enderio.item.darksteel.DarkSteelItems;
-import crazypants.enderio.item.darksteel.ItemDarkSteelArmor;
 import crazypants.enderio.item.darksteel.PacketUpgradeState;
 import crazypants.enderio.item.darksteel.PacketUpgradeState.Type;
 import crazypants.enderio.item.darksteel.SoundDetector;
 import crazypants.enderio.item.darksteel.upgrade.JumpUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.SoundDetectorUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.SpeedUpgrade;
-import crazypants.enderio.item.darksteel.upgrade.TrackmanGogglesUpgrade;
 import crazypants.enderio.network.PacketHandler;
-import crazypants.enderio.teleport.TravelController;
 import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade;
 import crazypants.util.BaublesUtil;
-import mods.railcraft.api.core.items.IToolGoggles;
 
 public class KeyTracker {
 
@@ -57,16 +51,10 @@ public class KeyTracker {
 
     private final KeyBinding gogglesKey;
 
-    private final KeyBinding trackmansGogglesKey;
-
     private final KeyBinding yetaWrenchMode;
 
     private final KeyBinding magnetKey;
 
-    private final KeyBinding staffOfTravelingTPKey;
-
-    private static long lastBlinkTick = -1;
-
     public KeyTracker() {
         glideKey = new KeyBinding(
                 EnderIO.lang.localize("keybind.glidertoggle"),
@@ -89,12 +77,6 @@ public class KeyTracker {
                 EnderIO.lang.localize("category.darksteelarmor"));
         ClientRegistry.registerKeyBinding(gogglesKey);
 
-        trackmansGogglesKey = new KeyBinding(
-                EnderIO.lang.localize("keybind.trackmansgoggles"),
-                Keyboard.KEY_NONE,
-                EnderIO.lang.localize("category.darksteelarmor"));
-        ClientRegistry.registerKeyBinding(trackmansGogglesKey);
-
         stepAssistKey = new KeyBinding(
                 EnderIO.lang.localize("keybind.stepassist"),
                 Keyboard.KEY_NONE,
@@ -124,12 +106,6 @@ public class KeyTracker {
                 Keyboard.KEY_NONE,
                 EnderIO.lang.localize("category.tools"));
         ClientRegistry.registerKeyBinding(magnetKey);
-
-        staffOfTravelingTPKey = new KeyBinding(
-                EnderIO.lang.localize("keybind.staffoftravelingtp"),
-                Keyboard.KEY_NONE,
-                EnderIO.lang.localize("category.tools"));
-        ClientRegistry.registerKeyBinding(staffOfTravelingTPKey);
     }
 
     @SubscribeEvent
@@ -139,12 +115,10 @@ public class KeyTracker {
         handleNightVision();
         handleYetaWrench();
         handleGoggles();
-        handleTrackmanGoggles();
         handleStepAssist();
         handleSpeed();
         handleJump();
         handleMagnet();
-        handleStaffOfTravelingTP();
     }
 
     private void sendEnabledChatMessage(String messageBase, boolean isActive) {
@@ -159,38 +133,6 @@ public class KeyTracker {
         PacketHandler.INSTANCE.sendToServer(new PacketUpgradeState(type, isActive));
     }
 
-    private void handleStaffOfTravelingTP() {
-        if (staffOfTravelingTPKey.isPressed()) {
-            if (Config.travelStaffKeybindEnabled) {
-                EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-                if (player != null) {
-                    ItemStack travelItem = player.getHeldItem();
-                    if (travelItem == null || travelItem.getItem() == null
-                            || !(travelItem.getItem() instanceof IItemOfTravel)
-                            || !((IItemOfTravel) travelItem.getItem()).isActive(player, travelItem)) {
-                        travelItem = TravelController.instance.findTravelItemInInventoryOrBaubles(player);
-                    }
-
-                    if (travelItem != null && travelItem.getItem() != null) {
-                        long ticksSinceBlink = EnderIO.proxy.getTickCount() - lastBlinkTick;
-                        if (ticksSinceBlink < 0) {
-                            lastBlinkTick = -1;
-                        }
-                        if (ticksSinceBlink >= Config.travelStaffBlinkPauseTicks) {
-                            if (TravelController.instance.doBlink(travelItem, player)) {
-                                lastBlinkTick = EnderIO.proxy.getTickCount();
-                            }
-                        }
-                    }
-                }
-            } else {
-                TravelController.showMessage(
-                        Minecraft.getMinecraft().thePlayer,
-                        new ChatComponentTranslation("enderio.travelStaffKeybind.isDisabled"));
-            }
-        }
-    }
-
     private void handleMagnet() {
         if (magnetKey.isPressed()) {
             EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
@@ -244,22 +186,6 @@ public class KeyTracker {
         }
     }
 
-    private void handleTrackmanGoggles() {
-        if (trackmansGogglesKey.isPressed()) {
-            EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-            if (!TrackmanGogglesUpgrade.isUpgradeEquipped(player)) {
-                return;
-            }
-            ItemStack helmet = player.getEquipmentInSlot(4);
-            ((ItemDarkSteelArmor) helmet.getItem()).incrementAura(helmet);
-            IToolGoggles.displaySwitchMessage(
-                    Minecraft.getMinecraft().theWorld,
-                    Minecraft.getMinecraft().thePlayer,
-                    ((ItemDarkSteelArmor) helmet.getItem()).getCurrentAura(helmet));
-            return;
-        }
-    }
-
     private void handleGoggles() {
         if (gogglesKey.isPressed()) {
             EntityPlayer player = Minecraft.getMinecraft().thePlayer;

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

@@ -120,7 +120,6 @@ public class MagnetController {
         }
     }
 
-    @SuppressWarnings("unchecked")
     private List<Entity> selectEntitiesWithinAABB(World world, AxisAlignedBB bb) {
         List<Entity> arraylist = null;
 

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

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

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

@@ -33,7 +33,6 @@ import crazypants.enderio.item.darksteel.upgrade.SoundDetectorUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.SpeedUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.SpoonUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.SwimUpgrade;
-import crazypants.enderio.item.darksteel.upgrade.TrackmanGogglesUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade;
 import crazypants.enderio.material.Alloy;
 import crazypants.enderio.material.endergy.AlloyEndergy;
@@ -76,9 +75,6 @@ public class DarkSteelRecipeManager {
             upgrades.add(ApiaristArmorUpgrade.LEGS);
             upgrades.add(ApiaristArmorUpgrade.BOOTS);
         }
-        if (Loader.isModLoaded("Railcraft")) {
-            upgrades.add(TrackmanGogglesUpgrade.INSTANCE);
-        }
     }
 
     @SubscribeEvent
@@ -144,8 +140,8 @@ public class DarkSteelRecipeManager {
     public static int getEnchantmentRepairCost(ItemStack itemStack) {
         // derived from ContainerRepair
         int res = 0;
-        Map<Integer, Integer> map1 = EnchantmentHelper.getEnchantments(itemStack);
-        Iterator<Integer> iter = map1.keySet().iterator();
+        Map map1 = EnchantmentHelper.getEnchantments(itemStack);
+        Iterator iter = map1.keySet().iterator();
         while (iter.hasNext()) {
             int i1 = ((Integer) iter.next()).intValue();
             Enchantment enchantment = Enchantment.enchantmentsList[i1];
@@ -186,8 +182,7 @@ public class DarkSteelRecipeManager {
         return upgrades;
     }
 
-    public void addCommonTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list,
-            boolean flag) {
+    public void addCommonTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         for (IDarkSteelUpgrade upgrade : upgrades) {
             if (upgrade.hasUpgrade(itemstack)) {
                 upgrade.addCommonEntries(itemstack, entityplayer, list, flag);
@@ -195,8 +190,7 @@ public class DarkSteelRecipeManager {
         }
     }
 
-    public void addBasicTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list,
-            boolean flag) {
+    public void addBasicTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         for (IDarkSteelUpgrade upgrade : upgrades) {
             if (upgrade.hasUpgrade(itemstack)) {
                 upgrade.addBasicEntries(itemstack, entityplayer, list, flag);
@@ -204,8 +198,7 @@ public class DarkSteelRecipeManager {
         }
     }
 
-    public void addAdvancedTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list,
-            boolean flag) {
+    public void addAdvancedTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
 
         List<IDarkSteelUpgrade> applyableUpgrades = new ArrayList<IDarkSteelUpgrade>();
         for (IDarkSteelUpgrade upgrade : upgrades) {

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

@@ -10,7 +10,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.ISpecialArmor;
@@ -35,13 +34,9 @@ import crazypants.enderio.item.darksteel.upgrade.ApiaristArmorUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.NaturalistEyeUpgrade;
-import crazypants.enderio.item.darksteel.upgrade.TrackmanGogglesUpgrade;
 import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade;
 import forestry.api.apiculture.IArmorApiarist;
 import forestry.api.core.IArmorNaturalist;
-import mods.railcraft.api.core.items.IToolGoggles;
-import mods.railcraft.common.core.RailcraftConfig;
-import mods.railcraft.common.items.ItemGoggles.GoggleAura;
 import thaumcraft.api.IGoggles;
 import thaumcraft.api.IVisDiscountGear;
 import thaumcraft.api.aspects.Aspect;
@@ -50,12 +45,11 @@ import thaumcraft.api.nodes.IRevealer;
 @InterfaceList({ @Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft"),
         @Interface(iface = "thaumcraft.api.IVisDiscountGear", modid = "Thaumcraft"),
         @Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft"),
-        @Interface(iface = "mods.railcraft.api.core.items.IToolGoggles", modid = "Railcraft"),
         @Interface(iface = "forestry.api.apiculture.IArmorApiarist", modid = "Forestry"),
         @Interface(iface = "forestry.api.core.IArmorNaturalist", modid = "Forestry") })
 public class ItemDarkSteelArmor extends ItemArmor
         implements IEnergyContainerItem, ISpecialArmor, IAdvancedTooltipProvider, IDarkSteelItem, IGoggles, IRevealer,
-        IVisDiscountGear, IArmorApiarist, IArmorNaturalist, IToolGoggles {
+        IVisDiscountGear, IArmorApiarist, IArmorNaturalist {
 
     public static final ArmorMaterial MATERIAL = EnumHelper
             .addArmorMaterial("darkSteel", 35, new int[] { 2, 6, 5, 2 }, 15);
@@ -131,9 +125,10 @@ public class ItemDarkSteelArmor extends ItemArmor
         GameRegistry.registerItem(this, getUnlocalizedName());
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 
@@ -168,17 +163,17 @@ public class ItemDarkSteelArmor extends ItemArmor
     }
 
     @Override
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         if (!Config.addDurabilityTootip) {
             list.add(ItemUtil.getDurabilityString(itemstack));
         }
@@ -327,45 +322,9 @@ public class ItemDarkSteelArmor extends ItemArmor
     @Override
     @Method(modid = "Forestry")
     public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee) {
-        if (armor == null || !DarkSteelItems.isArmorPart(armor.getItem(), 0)) {
+        if (armor == null || DarkSteelItems.isArmorPart(armor.getItem(), 0)) {
             return false;
         }
         return NaturalistEyeUpgrade.isUpgradeEquipped(player);
     }
-
-    // Railcraft
-
-    public void incrementAura(ItemStack goggles) {
-        if (goggles != null && goggles.getItem() instanceof ItemDarkSteelArmor
-                && DarkSteelItems.isArmorPart(goggles.getItem(), 0)) {
-            NBTTagCompound data = goggles.getTagCompound();
-            if (data == null) {
-                data = new NBTTagCompound();
-                goggles.setTagCompound(data);
-            }
-            byte aura = data.getByte("aura");
-            aura++;
-            if (aura >= GoggleAura.VALUES.length) aura = 0;
-            data.setByte("aura", aura);
-
-            if (this.getCurrentAura(goggles) == GoggleAura.TRACKING && !RailcraftConfig.isTrackingAuraEnabled()) {
-                incrementAura(goggles);
-            }
-        }
-    }
-
-    @Override
-    @Method(modid = "Railcraft")
-    public GoggleAura getCurrentAura(ItemStack goggles) {
-        if (TrackmanGogglesUpgrade.loadFromItem(goggles) != null) {
-            NBTTagCompound data = goggles.getTagCompound();
-            if (data != null) {
-                return GoggleAura.VALUES[data.getByte("aura")];
-            } else {
-                return GoggleAura.NONE;
-            }
-        } else {
-            return GoggleAura.NONE;
-        }
-    }
 }

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

@@ -67,6 +67,7 @@ public class ItemDarkSteelAxe extends ItemAxe
 
     public static ItemDarkSteelAxe create() {
         ItemDarkSteelAxe res = new ItemDarkSteelAxe();
+        MinecraftForge.EVENT_BUS.register(res);
         res.init();
         return res;
     }
@@ -95,7 +96,7 @@ public class ItemDarkSteelAxe extends ItemAxe
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 
@@ -187,6 +188,18 @@ public class ItemDarkSteelAxe extends ItemAxe
         return usedPower;
     }
 
+    @SubscribeEvent
+    public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {
+        if (evt.entityPlayer.isSneaking()
+                && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest)
+                && isLog(evt.block, evt.metadata)) {
+            evt.newSpeed = evt.originalSpeed / Config.darkSteelAxeSpeedPenaltyMultiHarvest;
+        }
+        if (isEquipped(evt.entityPlayer) && evt.block.getMaterial() == Material.leaves) {
+            evt.newSpeed = 6;
+        }
+    }
+
     @Override
     public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side,
             float par8, float par9, float par10) {
@@ -245,7 +258,6 @@ public class ItemDarkSteelAxe extends ItemAxe
 
     protected void init() {
         GameRegistry.registerItem(this, getUnlocalizedName());
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override
@@ -275,17 +287,17 @@ public class ItemDarkSteelAxe extends ItemAxe
     }
 
     @Override
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         if (!Config.addDurabilityTootip) {
             list.add(ItemUtil.getDurabilityString(itemstack));
         }
@@ -316,7 +328,7 @@ public class ItemDarkSteelAxe extends ItemAxe
         public int compare(BlockCoord arg0, BlockCoord arg1) {
             int d1 = refPoint.getDistSq(arg0);
             int d2 = refPoint.getDistSq(arg1);
-            return compare(d1, d2);
+            return compare(d1, d1);
         }
 
         // NB: Copy of Integer.compare, which i sonly in Java 1.7+
@@ -324,19 +336,4 @@ public class ItemDarkSteelAxe extends ItemAxe
             return (x < y) ? -1 : ((x == y) ? 0 : 1);
         }
     }
-
-    public class EventHandler {
-
-        @SubscribeEvent
-        public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {
-            if (evt.entityPlayer.isSneaking()
-                    && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest)
-                    && isLog(evt.block, evt.metadata)) {
-                evt.newSpeed = evt.originalSpeed / Config.darkSteelAxeSpeedPenaltyMultiHarvest;
-            }
-            if (isEquipped(evt.entityPlayer) && evt.block.getMaterial() == Material.leaves) {
-                evt.newSpeed = 6;
-            }
-        }
-    }
 }

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

@@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
+import net.minecraftforge.common.MinecraftForge;
 
 import com.enderio.core.api.client.gui.IAdvancedTooltipProvider;
 import com.enderio.core.common.util.ItemUtil;
@@ -33,7 +34,7 @@ import crazypants.enderio.config.Config;
 import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.SpoonUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade;
-import crazypants.enderio.power.PowerDisplayUtil;
+import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.teleport.TravelController;
 
 public class ItemDarkSteelPickaxe extends ItemPickaxe
@@ -60,6 +61,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe
     public static ItemDarkSteelPickaxe create() {
         ItemDarkSteelPickaxe res = new ItemDarkSteelPickaxe();
         res.init();
+        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 
@@ -81,7 +83,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 
@@ -272,17 +274,17 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe
     }
 
     @Override
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         if (!Config.addDurabilityTootip) {
             list.add(ItemUtil.getDurabilityString(itemstack));
         }

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

@@ -62,12 +62,13 @@ public class ItemDarkSteelShears extends ItemShears
 
     public static ItemDarkSteelShears create() {
         ItemDarkSteelShears res = new ItemDarkSteelShears();
+        MinecraftForge.EVENT_BUS.register(res);
         res.init();
         return res;
     }
 
-    private final MultiHarvestComparator harvestComparator = new MultiHarvestComparator();
-    private final EntityComparator entityComparator = new EntityComparator();
+    protected final MultiHarvestComparator harvestComparator = new MultiHarvestComparator();
+    protected final EntityComparator entityComparator = new EntityComparator();
     protected String name;
 
     protected ItemDarkSteelShears(String name) {
@@ -91,7 +92,7 @@ public class ItemDarkSteelShears extends ItemShears
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 
@@ -162,7 +163,6 @@ public class ItemDarkSteelShears extends ItemShears
         }
     };
 
-    @SuppressWarnings("unchecked")
     @Override
     public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity) {
         if (entity.worldObj.isRemote) {
@@ -182,15 +182,15 @@ public class ItemDarkSteelShears extends ItemShears
                     entity.posX + Config.darkSteelShearsEntityAreaBoostWhenPowered,
                     entity.posY + Config.darkSteelShearsEntityAreaBoostWhenPowered,
                     entity.posZ + Config.darkSteelShearsEntityAreaBoostWhenPowered);
-            List<IShearable> sortedTargets = new ArrayList<>(
+            List<Entity> sortedTargets = new ArrayList<Entity>(
                     entity.worldObj.selectEntitiesWithinAABB(IShearable.class, bb, selectShearable));
             entityComparator.refPoint = entity;
-            Collections.sort((List<Entity>) (Object) sortedTargets, entityComparator);
+            Collections.sort(sortedTargets, entityComparator);
 
             boolean result = false;
             int maxSheep = Math.min(sortedTargets.size(), powerStored / Config.darkSteelShearsPowerUsePerDamagePoint);
             for (int i = 0; i < maxSheep; i++) {
-                Entity entity2 = (Entity) sortedTargets.get(i);
+                Entity entity2 = sortedTargets.get(i);
                 if (entity2 instanceof EntityLivingBase
                         && super.itemInteractionForEntity(itemstack, player, (EntityLivingBase) entity2)) {
                     result = true;
@@ -201,6 +201,14 @@ public class ItemDarkSteelShears extends ItemShears
         return false;
     }
 
+    @SubscribeEvent
+    public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {
+        if (evt.originalSpeed > 2.0
+                && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelShearsPowerUsePerDamagePoint)) {
+            evt.newSpeed = evt.originalSpeed * Config.darkSteelShearsEffeciencyBoostWhenPowered;
+        }
+    }
+
     @Override
     public void setDamage(ItemStack stack, int newDamage) {
         int oldDamage = getDamage(stack);
@@ -222,7 +230,6 @@ public class ItemDarkSteelShears extends ItemShears
 
     protected void init() {
         GameRegistry.registerItem(this, getUnlocalizedName());
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override
@@ -257,17 +264,17 @@ public class ItemDarkSteelShears extends ItemShears
     }
 
     @Override
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         if (!Config.addDurabilityTootip) {
             list.add(ItemUtil.getDurabilityString(itemstack));
         }
@@ -322,15 +329,4 @@ public class ItemDarkSteelShears extends ItemShears
             return 0;
         }
     }
-
-    public static class EventHandler {
-
-        @SubscribeEvent
-        public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {
-            if (evt.originalSpeed > 2.0
-                    && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelShearsPowerUsePerDamagePoint)) {
-                evt.newSpeed = evt.originalSpeed * Config.darkSteelShearsEffeciencyBoostWhenPowered;
-            }
-        }
-    }
 }

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

@@ -72,6 +72,7 @@ public class ItemDarkSteelSword extends ItemSword
     public static ItemDarkSteelSword create() {
         ItemDarkSteelSword res = new ItemDarkSteelSword();
         res.init();
+        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 
@@ -95,7 +96,7 @@ public class ItemDarkSteelSword extends ItemSword
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 
@@ -116,6 +117,71 @@ public class ItemDarkSteelSword extends ItemSword
         return false;
     }
 
+    @SubscribeEvent
+    public void onEnderTeleport(EnderTeleportEvent evt) {
+        if (evt.entityLiving.getEntityData().getBoolean("hitByDarkSteelSword")) {
+            evt.setCanceled(true);
+        }
+    }
+
+    // Set priorty to lowest in the hope any other mod adding head drops will have already added them
+    // by the time this is called to prevent multiple head drops
+    @SubscribeEvent(priority = EventPriority.LOWEST)
+    public void onEntityDrop(LivingDropsEvent evt) {
+
+        if (!(evt.source.getEntity() instanceof EntityPlayer)) {
+            return;
+        }
+
+        EntityPlayer player = (EntityPlayer) evt.source.getEntity();
+        // Handle TiC weapons with beheading differently
+        if (handleBeheadingWeapons(player, evt)) {
+            return;
+        }
+
+        double skullDropChance = getSkullDropChance(player, evt);
+        if (player instanceof FakePlayer) {
+            skullDropChance *= Config.fakePlayerSkullChance;
+        }
+        if (Math.random() <= skullDropChance) {
+            dropSkull(evt, player);
+        }
+
+        // Special handling for ender pear drops
+        if (isEquipped(player)) {
+            String name = EntityList.getEntityString(evt.entityLiving);
+            if (evt.entityLiving instanceof EntityEnderman || ENDERZOO_ENDERMINY.equals(name)) {
+                int numPearls = 0;
+                if (Math.random() <= Config.darkSteelSwordEnderPearlDropChance) {
+                    numPearls++;
+                }
+                for (int i = 0; i < evt.lootingLevel; i++) {
+                    if (Math.random() <= Config.darkSteelSwordEnderPearlDropChancePerLooting) {
+                        numPearls++;
+                    }
+                }
+
+                int existing = 0;
+                for (EntityItem stack : evt.drops) {
+                    if (stack.getEntityItem() != null && stack.getEntityItem().getItem() == Items.ender_pearl) {
+                        existing += stack.getEntityItem().stackSize;
+                    }
+                }
+                int toDrop = numPearls - existing;
+                if (toDrop > 0) {
+                    evt.drops.add(
+                            Util.createDrop(
+                                    player.worldObj,
+                                    new ItemStack(Items.ender_pearl, toDrop, 0),
+                                    evt.entityLiving.posX,
+                                    evt.entityLiving.posY,
+                                    evt.entityLiving.posZ,
+                                    false));
+                }
+            }
+        }
+    }
+
     protected void dropSkull(LivingDropsEvent evt, EntityPlayer player) {
         ItemStack skull = getSkullForEntity(evt.entityLiving);
         if (skull != null && !containsDrop(evt, skull)) {
@@ -226,7 +292,6 @@ public class ItemDarkSteelSword extends ItemSword
 
     protected void init() {
         GameRegistry.registerItem(this, getUnlocalizedName());
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override
@@ -289,17 +354,17 @@ public class ItemDarkSteelSword extends ItemSword
     }
 
     @Override
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
         if (!Config.addDurabilityTootip) {
             list.add(ItemUtil.getDurabilityString(itemstack));
         }
@@ -321,15 +386,7 @@ public class ItemDarkSteelSword extends ItemSword
 
     @Override
     public boolean isActive(EntityPlayer ep, ItemStack equipped) {
-        if (ep != null && equipped != null && isTravelUpgradeActive(ep, equipped)) {
-            // Only "active" if held while sneaking. But still "active" for the purposes of travel keybind if not held
-            if (isEquipped(ep)) {
-                return ep.isSneaking();
-            } else {
-                return true;
-            }
-        }
-        return false;
+        return isTravelUpgradeActive(ep, equipped);
     }
 
     @Override
@@ -343,12 +400,12 @@ public class ItemDarkSteelSword extends ItemSword
     }
 
     private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) {
-        return ep != null && equipped != null && TravelUpgrade.loadFromItem(equipped) != null;
+        return isEquipped(ep) && ep.isSneaking() && TravelUpgrade.loadFromItem(equipped) != null;
     }
 
     @Override
     public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
-        if (isActive(player, stack)) {
+        if (isTravelUpgradeActive(player, stack)) {
             if (world.isRemote) {
                 if (TravelController.instance.activateTravelAccessable(stack, world, player, TravelSource.STAFF)) {
                     player.swingItem();
@@ -372,73 +429,4 @@ public class ItemDarkSteelSword extends ItemSword
 
         return super.onItemRightClick(stack, world, player);
     }
-
-    public class EventHandler {
-
-        @SubscribeEvent
-        public void onEnderTeleport(EnderTeleportEvent evt) {
-            if (evt.entityLiving.getEntityData().getBoolean("hitByDarkSteelSword")) {
-                evt.setCanceled(true);
-            }
-        }
-
-        // Set priorty to lowest in the hope any other mod adding head drops will have already added them
-        // by the time this is called to prevent multiple head drops
-        @SubscribeEvent(priority = EventPriority.LOWEST)
-        public void onEntityDrop(LivingDropsEvent evt) {
-
-            if (!(evt.source.getEntity() instanceof EntityPlayer)) {
-                return;
-            }
-
-            EntityPlayer player = (EntityPlayer) evt.source.getEntity();
-            // Handle TiC weapons with beheading differently
-            if (handleBeheadingWeapons(player, evt)) {
-                return;
-            }
-
-            double skullDropChance = getSkullDropChance(player, evt);
-            if (player instanceof FakePlayer) {
-                skullDropChance *= Config.fakePlayerSkullChance;
-            }
-            if (Math.random() <= skullDropChance) {
-                dropSkull(evt, player);
-            }
-
-            // Special handling for ender pear drops
-            if (isEquipped(player)) {
-                String name = EntityList.getEntityString(evt.entityLiving);
-                if (evt.entityLiving instanceof EntityEnderman || ENDERZOO_ENDERMINY.equals(name)) {
-                    int numPearls = 0;
-                    if (Math.random() <= Config.darkSteelSwordEnderPearlDropChance) {
-                        numPearls++;
-                    }
-                    for (int i = 0; i < evt.lootingLevel; i++) {
-                        if (Math.random() <= Config.darkSteelSwordEnderPearlDropChancePerLooting) {
-                            numPearls++;
-                        }
-                    }
-
-                    int existing = 0;
-                    for (EntityItem stack : evt.drops) {
-                        if (stack.getEntityItem() != null && stack.getEntityItem().getItem() == Items.ender_pearl) {
-                            existing += stack.getEntityItem().stackSize;
-                        }
-                    }
-                    int toDrop = numPearls - existing;
-                    if (toDrop > 0) {
-                        evt.drops.add(
-                                Util.createDrop(
-                                        player.worldObj,
-                                        new ItemStack(Items.ender_pearl, toDrop, 0),
-                                        evt.entityLiving.posX,
-                                        evt.entityLiving.posY,
-                                        evt.entityLiving.posZ,
-                                        false));
-                    }
-                }
-            }
-        }
-
-    }
 }

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

@@ -8,17 +8,13 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.EnumHelper;
 
-import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem;
 import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade;
-import gregtech.api.hazards.Hazard;
-import gregtech.api.hazards.IHazardProtector;
 
-@Optional.InterfaceList({ @Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech_nh") })
-public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelItem, IHazardProtector {
+public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelItem {
 
     public static final ArmorMaterial MATERIAL = EnumHelper
             .addArmorMaterial("endSteel", 50, new int[] { 4, 7, 10, 5 }, 25);
@@ -60,9 +56,10 @@ public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelIt
         return 0;
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 
@@ -80,11 +77,4 @@ public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelIt
 
         par3List.add(is);
     }
-
-    /// GT5 Hazmat protection
-    @Optional.Method(modid = "gregtech_nh")
-    @Override
-    public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) {
-        return true;
-    }
 }

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

@@ -6,6 +6,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -29,6 +30,7 @@ public class ItemEndSteelAxe extends ItemDarkSteelAxe implements IEndSteelItem {
     public static ItemEndSteelAxe create() {
         ItemEndSteelAxe res = new ItemEndSteelAxe();
         res.init();
+        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 
@@ -38,7 +40,7 @@ public class ItemEndSteelAxe extends ItemDarkSteelAxe implements IEndSteelItem {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);