update

* Replacing Conduits Now maintains all Connection Settings

* Only write/read connection nbt.

* Use Correct Connectionset

dependencies.gradle

@@ -1,26 +1,28 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.2.18:dev')
-    implementation('com.github.GTNewHorizons:ForestryMC:4.7.0:dev')
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev')
-    implementation("com.github.GTNewHorizons:GTNHLib:0.0.13:dev")
-    api('com.github.GTNewHorizons:BuildCraft:7.1.38:dev')
+    api('com.github.GTNewHorizons:EnderCore:0.4.6:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:ForestryMC:4.8.9:dev')
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.5.26-GTNH:dev')
+    compileOnly("com.github.GTNewHorizons:GTNHLib:0.2.11:dev")
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39: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')
 
-    compileOnly('com.github.GTNewHorizons:waila:1.6.5:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-291-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.3:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.106:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.15.2:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.12.1-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.19-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.7.3:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-350-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.159:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.15.8:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.13.5-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.14.1-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.11-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-alpha38:api') {transitive = false}
 }

gradle.properties

@@ -1,63 +1,104 @@
+# 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
 
-# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
+# Conventionally lowercase.
 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
 
-# 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/
+# Whether to use modGroup as the maven publishing group.
+# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
+useModGroupForPublishing = false
 
-# Will update your build.gradle automatically whenever an update is available
+# Updates your build.gradle and settings.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 a MCP channel and mappings version for dependency deobfuscation and the deobfParams task.
+# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
 channel = stable
+
+# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
 mappingsVersion = 12
 
-# Define other MCP mappings for dependency deobfuscation
-remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
+# Defines other MCP mappings for dependency deobfuscation.
+remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
 
-# 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
+# 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.
 developmentEnvironmentUserName = Developer
 
-# 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
+# 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 = false
+
+# 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 = false
+
+# 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.
 gradleTokenModId =
+
+# [DEPRECATED] Mod name replacement token.
 gradleTokenModName =
-gradleTokenVersion = GRADLETOKEN_VERSION
+
+# [DEPRECATED] Mod Group replacement token.
 gradleTokenGroupName =
 
-# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can
+# [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
 # 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. I must be placed into /src/main/resources/META-INF/
-# Example value: mymodid_at.cfg
+# 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 =
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
+
+# 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 compatability only
-# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
+# This parameter is for legacy compatibility 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
@@ -65,6 +106,87 @@ 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 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
-# responsibility check the licence and request permission for distribution, if required.
+# 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.
 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 the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+includeWellKnownRepositories = true
+
+# 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: GTNH Mixins 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,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,7 +145,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=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,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=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,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 $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.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-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.
+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
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-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.
+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
 
 goto fail
 

settings.gradle

@@ -4,10 +4,10 @@ pluginManagement {
         maven {
             // RetroFuturaGradle
             name "GTNH Maven"
-            url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-            allowInsecureProtocol = true
+            url "https://nexus.gtnewhorizons.com/repository/public/"
             mavenContent {
-                includeGroup("com.gtnewhorizons.retrofuturagradle")
+                includeGroup("com.gtnewhorizons")
+                includeGroupByRegex("com\\.gtnewhorizons\\..+")
             }
         }
         gradlePluginPortal()
@@ -17,12 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.diffplug.blowdryerSetup' version '1.6.0'
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.21'
 }
 
-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,8 +1,5 @@
 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;
@@ -33,36 +30,27 @@ 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;
@@ -166,10 +154,6 @@ 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;
@@ -403,20 +387,6 @@ 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);
@@ -480,12 +450,7 @@ public class ClientProxy extends CommonProxy {
 
     @Override
     public ConduitRenderer getRendererForConduit(IConduit conduit) {
-        for (ConduitRenderer renderer : conduitRenderers) {
-            if (renderer.isRendererForConduit(conduit)) {
-                return renderer;
-            }
-        }
-        return dcr;
+        return conduit.getRenderer();
     }
 
     @Override

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

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

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

@@ -62,6 +62,7 @@ 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;
@@ -185,14 +186,14 @@ import crazypants.util.EE3Util;
         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",
+        dependencies = "required-after:CoFHLib@(1.0.3B3,);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 = "GRADLETOKEN_VERSION";
+    public static final String VERSION = Tags.VERSION;
 
     @Instance(MODID)
     public static EnderIO instance;
@@ -264,6 +265,7 @@ 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;
@@ -469,6 +471,7 @@ public class EnderIO {
         itemBasicFilterUpgrade = ItemBasicItemFilter.create();
         itemBigFilterUpgrade = ItemBigItemFilter.create();
         itemExistingItemFilter = ItemExistingItemFilter.create();
+        itemLimitedItemFilter = ItemLimitedItemFilter.create();
         itemModItemFilter = ItemModItemFilter.create();
         itemPowerItemFilter = ItemPowerItemFilter.create();
         itemExtractSpeedUpgrade = ItemExtractSpeedUpgrade.create();

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

@@ -18,6 +18,7 @@ public enum ModObject {
     itemBasicFilterUpgrade,
     itemBigFilterUpgrade,
     itemExistingItemFilter,
+    itemLimitedItemFilter,
     itemModItemFilter,
     itemPowerItemFilter,
     itemExtractSpeedUpgrade,

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

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

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

@@ -67,7 +67,6 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
         if (MicroblocksUtil.supportMicroblocks() && tryAddToMicroblocks(stack, player, world, x, y, z, side)) {
             return true;
         }
-
         BlockCoord placeAt = Util.canPlaceItem(stack, EnderIO.blockConduitBundle, player, world, x, y, z, side);
         if (placeAt != null) {
             if (!world.isRemote) {
@@ -84,9 +83,7 @@ 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;
@@ -116,7 +113,6 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
                 }
             }
         }
-
         return false;
     }
 
@@ -162,8 +158,7 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
                     System.out.println("AbstractItemConduit.onItemUse: Conduit null.");
                     return false;
                 }
-                bundle.removeConduit(existingConduit);
-                bundle.addConduit(newConduit);
+                bundle.replaceConduit(existingConduit, newConduit);
                 if (!player.capabilities.isCreativeMode) {
                     stack.stackSize--;
                     for (ItemStack drop : existingConduit.getDrops()) {

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

@@ -601,6 +601,9 @@ 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);
 

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

@@ -158,7 +158,7 @@ public class ConduitUtil {
     }
 
     public static boolean isFacadeHidden(IConduitBundle bundle, EntityPlayer player) {
-        return bundle.getFacadeId() != null && shouldHeldItemHideFacades(player);
+        return bundle != null && bundle.getFacadeId() != null && shouldHeldItemHideFacades(player);
     }
 
     public static ConduitDisplayMode getDisplayMode(EntityPlayer player) {

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

@@ -17,6 +17,7 @@ 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 {
 
@@ -141,4 +142,6 @@ 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,6 +49,8 @@ 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

@@ -404,6 +404,29 @@ 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) {
@@ -428,7 +451,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
         if (worldObj.isRemote) {
             return;
         }
-        List<IConduit> copy = new ArrayList<IConduit>(conduits);
+        List<IConduit> copy = new ArrayList<>(conduits);
         for (IConduit con : copy) {
             removeConduit(con, false);
         }

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 {
+public class BlockConduitFacade extends BlockEio implements IPaintedBlock, Cloneable {
 
     public static BlockConduitFacade create() {
         BlockConduitFacade result = new BlockConduitFacade();
@@ -24,6 +24,10 @@ public class BlockConduitFacade extends BlockEio implements IPaintedBlock {
         return result;
     }
 
+    public BlockConduitFacade clone() throws CloneNotSupportedException {
+        return (BlockConduitFacade) super.clone();
+    }
+
     private Block blockOverride;
 
     private BlockConduitFacade() {

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

@@ -20,6 +20,7 @@ import crazypants.enderio.conduit.AbstractConduitNetwork;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.geom.CollidableComponent;
+import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.config.Config;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasStack;
@@ -34,7 +35,12 @@ 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<String, IIcon>();
+    static final Map<String, IIcon> ICONS = new HashMap<>();
+
+    @Override
+    public ConduitRenderer getRenderer() {
+        return GasConduitRenderer.instance.get();
+    }
 
     @SideOnly(Side.CLIENT)
     public static void initIcons() {

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

@@ -1,15 +1,13 @@
 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;
@@ -22,15 +20,13 @@ 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 {
 
-    @Override
-    public boolean isRendererForConduit(IConduit conduit) {
-        return conduit instanceof GasConduit;
-    }
+    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal.withInitial(GasConduitRenderer::new);
 
     @Override
     public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x,
@@ -58,6 +54,8 @@ 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;
@@ -103,15 +101,17 @@ 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 (Vertex c : corners) {
-                        addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                    for (i = 0; i < corners.size(); i++) {
+                        final Vertex c = corners.get(i);
+                        cr.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 (Vertex c : corners) {
-                        addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                    for (i = 0; i < corners.size(); i++) {
+                        final Vertex c = corners.get(i);
+                        cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                     }
                 }
             }
@@ -124,14 +124,15 @@ public class GasConduitRenderer extends DefaultConduitRenderer {
                         tex.getMaxU(),
                         tex.getMinV(),
                         tex.getMaxV());
-                Tessellator tessellator = Tessellator.instance;
-                for (Vertex c : corners) {
-                    addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+
+                for (i = 0; i < corners.size(); i++) {
+                    final Vertex c = corners.get(i);
+                    cr.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);
-                    addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                for (i = corners.size() - 1; i >= 0; i--) {
+                    final Vertex c = corners.get(i);
+                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                 }
             }
         }

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

@@ -0,0 +1,202 @@
+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,9 +11,15 @@ 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,17 +13,12 @@ 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 {
 
-    @Override
-    public boolean isRendererForConduit(IConduit conduit) {
-        if (conduit instanceof IItemConduit) {
-            return true;
-        }
-        return false;
-    }
+    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal.withInitial(ItemConduitRenderer::new);
 
     @Override
     public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x,

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

@@ -22,6 +22,7 @@ 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;
 
@@ -155,6 +156,7 @@ 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);
@@ -162,12 +164,23 @@ public class NetworkedInventory {
             int index = nextSlot(numSlots);
             slot = slotIndices[index];
             ItemStack item = getInventory().getStackInSlot(slot);
-            if (canExtractItem(item)) {
-                extractItem = item.copy();
-                if (getInventory().canExtractItem(slot, extractItem, inventorySide)) {
-                    if (doTransfer(extractItem, slot, maxExtracted)) {
-                        setNextStartingSlot(slot);
-                        return true;
+            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;
+                        }
                     }
                 }
             }
@@ -183,7 +196,11 @@ public class NetworkedInventory {
         if (filter == null) {
             return true;
         }
-        return filter.doesItemPassFilter(this, itemStack);
+        if (filter.isLimited()) {
+            return filter.isValid() && ((ItemFilterLimited) filter).doesItemPassFilterInv(this, itemStack);
+        } else {
+            return filter.doesItemPassFilter(this, itemStack);
+        }
     }
 
     private boolean doTransfer(ItemStack extractedItem, int slot, int maxExtract) {
@@ -278,7 +295,20 @@ public class NetworkedInventory {
         }
         IItemFilter filter = con.getOutputFilter(conDir);
         if (filter != null) {
-            if (!filter.doesItemPassFilter(this, item)) {
+            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)) {
                 return 0;
             }
         }

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

@@ -41,10 +41,18 @@ 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/ItemFilter.java

@@ -98,7 +98,7 @@ public class ItemFilter implements IInventory, IItemFilter {
         return isBlacklist ? !allow : allow;
     }
 
-    private boolean itemMatched(ItemStack item) {
+    protected boolean itemMatched(ItemStack item) {
         if (item == null) {
             return false;
         }
@@ -145,7 +145,7 @@ public class ItemFilter implements IInventory, IItemFilter {
         return matched;
     }
 
-    private boolean isOreDicMatch(int filterItemIndex, ItemStack item) {
+    protected boolean isOreDicMatch(int filterItemIndex, ItemStack item) {
         int[] ids1 = getCachedIds(filterItemIndex);
         if (ids1 == null || ids1.length == 0) {
             return false;
@@ -164,7 +164,7 @@ public class ItemFilter implements IInventory, IItemFilter {
         return false;
     }
 
-    private boolean isNBTMatch(ItemStack filter, ItemStack item) {
+    protected boolean isNBTMatch(ItemStack filter, ItemStack item) {
         if (filter.stackTagCompound == null && (item.stackTagCompound == null || item.stackTagCompound.hasNoTags()))
             return true;
         if (filter.stackTagCompound == null || item.stackTagCompound == null) return false;
@@ -203,7 +203,7 @@ public class ItemFilter implements IInventory, IItemFilter {
         return !isItemListEmpty();
     }
 
-    private boolean isItemListEmpty() {
+    protected boolean isItemListEmpty() {
         for (ItemStack item : items) {
             if (item != null) {
                 return false;

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

@@ -0,0 +1,242 @@
+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

@@ -0,0 +1,73 @@
+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 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/liquid/AbstractEnderLiquidConduit.java

@@ -34,6 +34,7 @@ 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;
@@ -46,9 +47,14 @@ 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<String, IIcon>();
+    static final Map<String, IIcon> ICONS = new HashMap<>();
     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() {

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

@@ -23,6 +23,7 @@ import crazypants.enderio.conduit.AbstractConduitNetwork;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.geom.CollidableComponent;
+import crazypants.enderio.conduit.render.ConduitRenderer;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.RedstoneControlMode;
 
@@ -37,7 +38,12 @@ 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<String, IIcon>();
+    static final Map<String, IIcon> ICONS = new HashMap<>();
+
+    @Override
+    public ConduitRenderer getRenderer() {
+        return AdvancedLiquidConduitRenderer.instance.get();
+    }
 
     @SideOnly(Side.CLIENT)
     public static void initIcons() {

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

@@ -1,16 +1,14 @@
 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;
@@ -23,14 +21,13 @@ 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 {
 
-    @Override
-    public boolean isRendererForConduit(IConduit conduit) {
-        return conduit instanceof AdvancedLiquidConduit;
-    }
+    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal
+            .withInitial(AdvancedLiquidConduitRenderer::new);
 
     @Override
     public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x,
@@ -58,6 +55,8 @@ 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;
@@ -106,15 +105,17 @@ 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 (Vertex c : corners) {
-                        addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                    for (i = 0; i < corners.size(); i++) {
+                        final Vertex c = corners.get(i);
+                        cr.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 (Vertex c : corners) {
-                        addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                    for (i = 0; i < corners.size(); i++) {
+                        final Vertex c = corners.get(i);
+                        cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                     }
                 }
             }
@@ -127,14 +128,14 @@ public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer {
                         tex.getMaxU(),
                         tex.getMinV(),
                         tex.getMaxV());
-                Tessellator tessellator = Tessellator.instance;
-                for (Vertex c : corners) {
-                    addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                for (i = 0; i < corners.size(); i++) {
+                    final Vertex c = corners.get(i);
+                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                 }
                 // back face
-                for (int i = corners.size() - 1; i >= 0; i--) {
+                for (i = corners.size() - 1; i >= 0; i--) {
                     Vertex c = corners.get(i);
-                    addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                 }
             }
         }

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

@@ -13,17 +13,13 @@ 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 {
 
-    @Override
-    public boolean isRendererForConduit(IConduit conduit) {
-        if (conduit instanceof AbstractEnderLiquidConduit) {
-            return true;
-        }
-        return false;
-    }
+    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal
+            .withInitial(EnderLiquidConduitRenderer::new);
 
     @Override
     public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x,

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

@@ -27,6 +27,7 @@ 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;
 
@@ -42,7 +43,12 @@ 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<String, IIcon>();
+    static final Map<String, IIcon> ICONS = new HashMap<>();
+
+    @Override
+    public ConduitRenderer getRenderer() {
+        return LiquidConduitRenderer.instance.get();
+    }
 
     @SideOnly(Side.CLIENT)
     public static void initIcons() {

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

@@ -31,32 +31,22 @@ 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;
 
-    private LiquidConduitRenderer() {
+    public LiquidConduitRenderer() {
         super();
-    }
-
-    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;
+        RenderUtil.registerReloadListener(this);
     }
 
     @Override
@@ -91,16 +81,19 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
         }
 
         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 (Vertex c : corners) {
-                CubeRenderer.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+            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 (int i = corners.size() - 1; i >= 0; i--) {
+            for (i = corners.size() - 1; i >= 0; i--) {
                 Vertex c = corners.get(i);
-                CubeRenderer.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
             }
         }
     }
@@ -303,7 +296,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
         float transY = (bound.sizeY() - sizeY) / 2;
 
         Vector3d translation = new Vector3d(0, transY, 0);
-        CubeRenderer.setupVertices(bound.translate(translation));
+        CubeRenderer.get().setupVertices(bound.translate(translation));
     }
 
     private void calculateRatios(LiquidConduit conduit) {

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

@@ -33,10 +33,17 @@ 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;
 

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

@@ -7,6 +7,7 @@ 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;
 
@@ -14,11 +15,16 @@ 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 {
 
-    public static final String COLOR_CONTROLLER_ID = "ColorController";
+    String COLOR_CONTROLLER_ID = "ColorController";
+
+    @Override
+    default ConduitRenderer getRenderer() {
+        return OCConduitRenderer.instance.get();
+    }
 
     void invalidate();
 
-    public abstract void setSignalColor(ForgeDirection dir, DyeColor col);
+    void setSignalColor(ForgeDirection dir, DyeColor col);
 
-    public abstract DyeColor getSignalColor(ForgeDirection dir);
+    DyeColor getSignalColor(ForgeDirection dir);
 }

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

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

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

@@ -5,19 +5,25 @@ 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 {
 
-    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 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 COLOR_CONTROLLER_ID = "ColorController";
+    String COLOR_CONTROLLER_ID = "ColorController";
+
+    @Override
+    default ConduitRenderer getRenderer() {
+        return PowerConduitRenderer.instance.get();
+    }
 
     IPowerInterface getExternalPowerReceptor(ForgeDirection direction);
 

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

@@ -17,15 +17,13 @@ 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 {
 
-    @Override
-    public boolean isRendererForConduit(IConduit conduit) {
-        return conduit instanceof IPowerConduit;
-    }
+    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal.withInitial(PowerConduitRenderer::new);
 
     @Override
     public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x,
@@ -68,7 +66,7 @@ public class PowerConduitRenderer extends DefaultConduitRenderer {
                     Vector3d trans = ForgeDirectionOffsets.offsetScaled(component.dir, -0.075);
                     bound = bound.translate(trans);
                 }
-                CubeRenderer.render(bound, tex);
+                CubeRenderer.get().render(bound, tex);
                 tessellator.setColorOpaque(255, 255, 255);
             }
         } else {

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

@@ -5,14 +5,20 @@ 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 {
 
-    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 KEY_INS_CONDUIT_ICON = "enderio:redstoneInsulatedConduit";
+    String KEY_INS_CORE_OFF_ICON = "enderio:redstoneInsulatedConduitCoreOff";
+    String KEY_INS_CORE_ON_ICON = "enderio:redstoneInsulatedConduitCoreOn";
 
-    public static final String COLOR_CONTROLLER_ID = "ColorController";
+    String COLOR_CONTROLLER_ID = "ColorController";
+
+    @Override
+    default ConduitRenderer getRenderer() {
+        return InsulatedRedstoneConduitRenderer.instance.get();
+    }
 
     void onInputsChanged(ForgeDirection side, int[] inputValues);
 

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

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

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

@@ -33,12 +33,19 @@ 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<String, IIcon>();
+    static final Map<String, IIcon> ICONS = new HashMap<>();
+
+    @Override
+    public ConduitRenderer getRenderer() {
+        return DefaultConduitRenderer.instance.get();
+    }
 
     @SideOnly(Side.CLIENT)
     public static void initIcons() {

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

@@ -24,6 +24,7 @@ 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 {
 
@@ -33,6 +34,11 @@ 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() {
@@ -97,7 +103,7 @@ public class RedstoneSwitch extends RedstoneConduit {
         Vector3d trans = ConduitGeometryUtil.instance.getTranslation(ForgeDirection.UNKNOWN, o);
 
         List<CollidableComponent> result = super.getCollidableComponents();
-        BoundingBox[] aabb = RedstoneSwitchBounds.getInstance().getAABB();
+        BoundingBox[] aabb = RedstoneSwitchBounds.get().getAABB();
 
         for (BoundingBox bb : aabb) {
             result.add(

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

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

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

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

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

@@ -29,6 +29,7 @@ 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;
@@ -51,22 +52,27 @@ import crazypants.enderio.config.Config;
 import crazypants.util.RenderPassHelper;
 
 @SideOnly(Side.CLIENT)
+@ThreadSafeISBRH(perThread = false)
 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)) {
+        if (bundle == null || (bundle.hasFacade() && bundle.getFacadeId().isOpaqueCube()
+                && !ConduitUtil.isFacadeHidden(bundle, player))) {
             return;
         }
+        final Tessellator tessellator = Tessellator.instance;
 
         float brightness = -1;
         for (IConduit con : bundle.getConduits()) {
             if (ConduitUtil.renderConduit(player, con)) {
-                ConduitRenderer renderer = EnderIO.proxy.getRendererForConduit(con);
+                final ConduitRenderer renderer = con.getRenderer();
                 if (renderer.isDynamic()) {
                     if (brightness == -1) {
                         BlockCoord loc = bundle.getLocation();
@@ -84,7 +90,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
                         GL11.glPushMatrix();
                         GL11.glTranslated(x, y, z);
 
-                        Tessellator.instance.startDrawingQuads();
+                        tessellator.startDrawingQuads();
                     }
                     renderer.renderDynamicEntity(this, bundle, con, x, y, z, partialTick, brightness);
                 }
@@ -92,7 +98,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
         }
 
         if (brightness != -1) {
-            Tessellator.instance.draw();
+            tessellator.draw();
 
             GL11.glShadeModel(GL11.GL_FLAT);
             GL11.glPopMatrix();
@@ -104,6 +110,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
     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
@@ -113,10 +120,10 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
             // 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.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);
+            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);
         }
 
         IConduitBundle bundle = (IConduitBundle) world.getTileEntity(x, y, z);
@@ -125,7 +132,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
         boolean renderedFacade = renderFacade(x, y, z, pass, rb, bundle, player);
         boolean renderConduit = !renderedFacade || ConduitUtil.isFacadeHidden(bundle, player);
 
-        if (renderConduit && (pass == 0 || rb.overrideBlockTexture != null)) {
+        if (bundle != null && renderConduit && (pass == 0 || rb.overrideBlockTexture != null)) {
             BlockCoord loc = bundle.getLocation();
             float brightness;
             if (!Config.updateLightingWhenHidingFacades && bundle.hasFacade()
@@ -138,21 +145,34 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
             return true;
         }
 
-        return renderedFacade || (bundle.hasFacade() && !bundle.getFacadeId().isOpaqueCube());
+        return renderedFacade || (bundle != null && 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.instance.setColorOpaque_F(1, 1, 1);
+                tessellator.setColorOpaque_F(1, 1, 1);
                 bundle.setFacadeId(null, false);
                 bundle.setFacadeRenderAs(FacadeRenderState.WIRE_FRAME);
 
-                BlockConduitFacade facb = EnderIO.blockConduitFacade;
+                BlockConduitFacade facb = facade.get();
                 facb.setBlockOverride(bundle);
                 facb.setBlockBounds(0, 0, 0, 1, 1, 1);
                 if (!rb.hasOverrideBlockTexture()) {
@@ -192,20 +212,23 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
     public void renderConduits(IConduitBundle bundle, double x, double y, double z, float partialTick, float brightness,
             RenderBlocks rb) {
 
-        Tessellator tessellator = Tessellator.instance;
+        if (bundle == null) return;
+
+        final Tessellator tessellator = Tessellator.instance;
+        final CubeRenderer cr = CubeRenderer.get();
         tessellator.setColorOpaque_F(1, 1, 1);
         tessellator.addTranslation((float) x, (float) y, (float) z);
 
         // Conduits
-        Set<ForgeDirection> externals = new HashSet<ForgeDirection>();
+        Set<ForgeDirection> externals = new HashSet<>();
         EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
 
-        List<BoundingBox> wireBounds = new ArrayList<BoundingBox>();
+        List<BoundingBox> wireBounds = new ArrayList<>();
 
         for (IConduit con : bundle.getConduits()) {
 
             if (ConduitUtil.renderConduit(player, con)) {
-                ConduitRenderer renderer = EnderIO.proxy.getRendererForConduit(con);
+                final ConduitRenderer renderer = con.getRenderer();
                 renderer.renderEntity(this, bundle, con, x, y, z, partialTick, brightness, rb);
                 Set<ForgeDirection> extCons = con.getExternalConnections();
                 for (ForgeDirection dir : extCons) {
@@ -225,7 +248,8 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
         // Internal conectors between conduits
         List<CollidableComponent> connectors = bundle.getConnectors();
         List<CollidableComponent> rendered = Lists.newArrayList();
-        for (CollidableComponent component : connectors) {
+        for (int i = 0; i < connectors.size(); i++) {
+            final CollidableComponent component = connectors.get(i);
             if (component.conduitType != null) {
                 IConduit conduit = bundle.getConduit(component.conduitType);
                 if (conduit != null) {
@@ -243,12 +267,12 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
                                 if (r.component.conduitType == component.conduitType
                                         && !rendered.contains(r.component)) {
                                     rendered.add(r.component);
-                                    CubeRenderer.render(component.bound, rb.overrideBlockTexture, true);
+                                    cr.render(component.bound, rb.overrideBlockTexture, true);
                                 }
                             }
                         } else {
                             tessellator.setBrightness((int) (brightness));
-                            CubeRenderer.render(component.bound, conduit.getTextureForState(component), true);
+                            cr.render(component.bound, conduit.getTextureForState(component), true);
                         }
                     } else {
                         wireBounds.add(component.bound);
@@ -257,16 +281,18 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
 
             } else if (ConduitUtil.getDisplayMode(player) == ConduitDisplayMode.ALL && !rb.hasOverrideBlockTexture()) {
                 IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data);
-                CubeRenderer.render(component.bound, tex);
+                cr.render(component.bound, tex);
             }
         }
         // render these after the 'normal' conduits so help with proper blending
-        for (BoundingBox wireBound : wireBounds) {
-            Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.25f);
-            CubeRenderer.render(wireBound, EnderIO.blockConduitFacade.getIcon(0, 0));
+        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));
         }
 
-        Tessellator.instance.setColorRGBA_F(1, 1, 1, 1f);
+        tessellator.setColorRGBA_F(1, 1, 1, 1f);
         // External connection terminations
         if (rb.overrideBlockTexture == null) {
             for (ForgeDirection dir : externals) {
@@ -279,8 +305,10 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
     private void renderExternalConnection(ForgeDirection dir) {
         IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(ConduitConnectorType.EXTERNAL);
         BoundingBox[] bbs = ConduitGeometryUtil.instance.getExternalConnectorBoundingBoxes(dir);
-        for (BoundingBox bb : bbs) {
-            CubeRenderer.render(bb, tex, true);
+        final CubeRenderer cr = CubeRenderer.get();
+        for (int i = 0; i < bbs.length; i++) {
+            final BoundingBox bb = bbs[i];
+            cr.render(bb, tex, true);
         }
     }
 

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

@@ -7,8 +7,6 @@ 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);
 

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

@@ -1,8 +1,5 @@
 package crazypants.enderio.conduit.render;
 
-import static com.enderio.core.client.render.CubeRenderer.addVecWithUV;
-import static com.enderio.core.client.render.CubeRenderer.setupVertices;
-import static com.enderio.core.client.render.CubeRenderer.verts;
 import static net.minecraftforge.common.util.ForgeDirection.DOWN;
 import static net.minecraftforge.common.util.ForgeDirection.EAST;
 import static net.minecraftforge.common.util.ForgeDirection.NORTH;
@@ -19,6 +16,7 @@ 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;
 
@@ -30,12 +28,9 @@ import crazypants.enderio.conduit.geom.CollidableComponent;
 
 public class DefaultConduitRenderer implements ConduitRenderer {
 
-    protected float transmissionScaleFactor;
+    public static final ThreadLocal<ConduitRenderer> instance = ThreadLocal.withInitial(DefaultConduitRenderer::new);
 
-    @Override
-    public boolean isRendererForConduit(IConduit conduit) {
-        return true;
-    }
+    protected float transmissionScaleFactor;
 
     @Override
     public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x,
@@ -73,6 +68,7 @@ public class DefaultConduitRenderer implements ConduitRenderer {
             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)) {
 
@@ -103,7 +99,7 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                         tex.getMaxV());
                 Tessellator tessellator = Tessellator.instance;
                 for (Vertex c : corners) {
-                    addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                    cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                 }
             }
 
@@ -150,12 +146,13 @@ public class DefaultConduitRenderer implements ConduitRenderer {
     protected void drawSection(BoundingBox bound, float minU, float maxU, float minV, float maxV, ForgeDirection dir,
             boolean isTransmission, boolean mirrorTexture) {
 
-        Tessellator tessellator = Tessellator.instance;
+        final Tessellator tessellator = Tessellator.instance;
+        final CubeRenderer cr = CubeRenderer.get();
 
         if (isTransmission) {
             setVerticesForTransmission(bound, dir);
         } else {
-            setupVertices(bound);
+            cr.setupVertices(bound);
         }
 
         if (mirrorTexture && (dir == NORTH || dir == UP || dir == EAST)) {
@@ -175,15 +172,15 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                 tessellator.setColorOpaque_F(cm, cm, cm);
             }
             if (rotateSides) {
-                addVecWithUV(verts[1], maxU, maxV);
-                addVecWithUV(verts[0], maxU, minV);
-                addVecWithUV(verts[3], minU, minV);
-                addVecWithUV(verts[2], minU, maxV);
+                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);
             } else {
-                addVecWithUV(verts[1], minU, minV);
-                addVecWithUV(verts[0], maxU, minV);
-                addVecWithUV(verts[3], maxU, maxV);
-                addVecWithUV(verts[2], minU, maxV);
+                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);
             }
             if (dir == WEST || dir == EAST) {
                 float tmp = minU;
@@ -196,15 +193,15 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                 tessellator.setColorOpaque_F(cm, cm, cm);
             }
             if (rotateSides) {
-                addVecWithUV(verts[4], maxU, maxV);
-                addVecWithUV(verts[5], maxU, minV);
-                addVecWithUV(verts[6], minU, minV);
-                addVecWithUV(verts[7], minU, maxV);
+                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);
             } else {
-                addVecWithUV(verts[4], minU, minV);
-                addVecWithUV(verts[5], maxU, minV);
-                addVecWithUV(verts[6], maxU, maxV);
-                addVecWithUV(verts[7], minU, maxV);
+                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);
             }
             if (dir == WEST || dir == EAST) {
                 float tmp = minU;
@@ -221,15 +218,15 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                 tessellator.setColorOpaque_F(cm, cm, cm);
             }
             if (rotateTopBottom) {
-                addVecWithUV(verts[6], maxU, maxV);
-                addVecWithUV(verts[2], minU, maxV);
-                addVecWithUV(verts[3], minU, minV);
-                addVecWithUV(verts[7], maxU, minV);
+                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);
             } else {
-                addVecWithUV(verts[6], minU, minV);
-                addVecWithUV(verts[2], minU, maxV);
-                addVecWithUV(verts[3], maxU, maxV);
-                addVecWithUV(verts[7], maxU, minV);
+                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);
             }
 
             tessellator.setNormal(0, -1, 0);
@@ -238,15 +235,15 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                 tessellator.setColorOpaque_F(cm, cm, cm);
             }
             if (rotateTopBottom) {
-                addVecWithUV(verts[0], minU, minV);
-                addVecWithUV(verts[1], minU, maxV);
-                addVecWithUV(verts[5], maxU, maxV);
-                addVecWithUV(verts[4], maxU, minV);
+                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);
             } else {
-                addVecWithUV(verts[0], maxU, maxV);
-                addVecWithUV(verts[1], minU, maxV);
-                addVecWithUV(verts[5], minU, minV);
-                addVecWithUV(verts[4], maxU, minV);
+                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);
             }
         }
 
@@ -258,15 +255,15 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                 tessellator.setColorOpaque_F(cm, cm, cm);
             }
             if (rotateSides) {
-                addVecWithUV(verts[2], minU, maxV);
-                addVecWithUV(verts[6], minU, minV);
-                addVecWithUV(verts[5], maxU, minV);
-                addVecWithUV(verts[1], maxU, maxV);
+                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);
             } else {
-                addVecWithUV(verts[2], minU, maxV);
-                addVecWithUV(verts[6], maxU, maxV);
-                addVecWithUV(verts[5], maxU, minV);
-                addVecWithUV(verts[1], minU, minV);
+                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);
             }
 
             tessellator.setNormal(-1, 0, 0);
@@ -275,15 +272,15 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                 tessellator.setColorOpaque_F(cm, cm, cm);
             }
             if (rotateSides) {
-                addVecWithUV(verts[0], maxU, maxV);
-                addVecWithUV(verts[4], maxU, minV);
-                addVecWithUV(verts[7], minU, minV);
-                addVecWithUV(verts[3], minU, maxV);
+                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);
             } else {
-                addVecWithUV(verts[0], minU, minV);
-                addVecWithUV(verts[4], maxU, minV);
-                addVecWithUV(verts[7], maxU, maxV);
-                addVecWithUV(verts[3], minU, maxV);
+                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);
             }
         }
         tessellator.setColorOpaque_F(1, 1, 1);
@@ -293,7 +290,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;
-        setupVertices(bound.scale(xs, ys, zs));
+        CubeRenderer.get().setupVertices(bound.scale(xs, ys, zs));
     }
 
     // TODO: This is a really hacky, imprecise and slow way to do this

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

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

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

@@ -154,13 +154,17 @@ 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;
@@ -1165,6 +1169,19 @@ 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,
@@ -1198,6 +1215,13 @@ 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,
@@ -1214,6 +1238,13 @@ 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,
@@ -2083,7 +2114,7 @@ public final class Config {
                 sectionMagnet.name,
                 "magnetAllowDeactivatedInBaublesSlot",
                 magnetAllowDeactivatedInBaublesSlot,
-                "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)")
+                "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)")
                 .getBoolean(magnetAllowDeactivatedInBaublesSlot);
 
         magnetAllowPowerExtraction = config.get(
@@ -2096,7 +2127,7 @@ public final class Config {
                 sectionMagnet.name,
                 "magnetBaublesType",
                 magnetBaublesType,
-                "The BaublesType the magnet should be, 'AMULET', 'RING' or 'BELT' (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)")
+                "The BaublesType the magnet should be, 'AMULET', 'RING', 'BELT', or UNIVERSAL (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)")
                 .getString();
 
         useCombustionGenModel = config

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

@@ -27,6 +27,7 @@ public class PacketConfigSync implements IMessage, IMessageHandler<PacketConfigS
         buf.writeInt(Config.teleportStaffFailedBlinkDistance);
         buf.writeBoolean(Config.telepadLockCoords);
         buf.writeBoolean(Config.telepadLockDimension);
+        buf.writeBoolean(Config.travelStaffKeybindEnabled);
     }
 
     @Override
@@ -46,6 +47,7 @@ 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/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.instance.startDrawingQuads();
-        Tessellator.instance.setBrightness(brightness);
+        tessellator.startDrawingQuads();
+        tessellator.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.render(BoundingBox.UNIT_CUBE, EnderIO.blockEnderIo.frameIcon);
-        Tessellator.instance.draw();
+        CubeRenderer.get().render(BoundingBox.UNIT_CUBE, EnderIO.blockEnderIo.frameIcon);
+        tessellator.draw();
         GL11.glPopMatrix();
 
         GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL);

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

@@ -206,6 +206,7 @@ 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)
@@ -222,17 +223,21 @@ 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/KeyTracker.java

@@ -8,6 +8,7 @@ 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;
 
@@ -17,6 +18,7 @@ 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;
@@ -30,6 +32,7 @@ import crazypants.enderio.item.darksteel.upgrade.JumpUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.SoundDetectorUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.SpeedUpgrade;
 import crazypants.enderio.network.PacketHandler;
+import crazypants.enderio.teleport.TravelController;
 import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade;
 import crazypants.util.BaublesUtil;
 
@@ -55,6 +58,10 @@ public class KeyTracker {
 
     private final KeyBinding magnetKey;
 
+    private final KeyBinding staffOfTravelingTPKey;
+
+    private static long lastBlinkTick = -1;
+
     public KeyTracker() {
         glideKey = new KeyBinding(
                 EnderIO.lang.localize("keybind.glidertoggle"),
@@ -106,6 +113,12 @@ 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
@@ -119,6 +132,7 @@ public class KeyTracker {
         handleSpeed();
         handleJump();
         handleMagnet();
+        handleStaffOfTravelingTP();
     }
 
     private void sendEnabledChatMessage(String messageBase, boolean isActive) {
@@ -133,6 +147,37 @@ 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)) {
+                        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;

src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java

@@ -17,10 +17,12 @@ import com.enderio.core.client.render.CubeRenderer;
 import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.client.render.VertexRotation;
 import com.enderio.core.common.vecmath.Vector3d;
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import crazypants.enderio.EnderIO;
 
+@ThreadSafeISBRH(perThread = false)
 public class EndermanSkullRenderer implements ISimpleBlockRenderingHandler, IItemRenderer {
 
     public EndermanSkullRenderer() {}
@@ -75,9 +77,9 @@ public class EndermanSkullRenderer implements ISimpleBlockRenderingHandler, IIte
         float height = 0.5f;
         BoundingBox bb = new BoundingBox(size, 0, size, 1 - size, height, 1 - size);
         if (renderer.hasOverrideBlockTexture()) {
-            CubeRenderer.render(bb, renderer.overrideBlockTexture, rot);
+            CubeRenderer.get().render(bb, renderer.overrideBlockTexture, rot);
         } else {
-            CubeRenderer.render(bb, icons, rot, true);
+            CubeRenderer.get().render(bb, icons, rot, true);
 
             if (meta > 1) {
                 renderBolts(rot, size);
@@ -94,27 +96,28 @@ public class EndermanSkullRenderer implements ISimpleBlockRenderingHandler, IIte
         float boltSize = size / 3;
         BoundingBox baseBolt = BoundingBox.UNIT_CUBE.scale(boltSize, boltSize, boltSize);
         IIcon icon = EnderIO.blockSoulFuser.getIcon(ForgeDirection.EAST.ordinal(), 0);
+        final CubeRenderer cr = CubeRenderer.get();
 
         float offset = 0.15f;
         bb = baseBolt.translate(size + boltSize / 2, -0.15f, offset);
-        CubeRenderer.render(bb, icon, rot, true);
+        cr.render(bb, icon, rot, true);
         bb = baseBolt.translate(size + boltSize / 2, -0.15f, -offset);
-        CubeRenderer.render(bb, icon, rot, true);
+        cr.render(bb, icon, rot, true);
 
         bb = baseBolt.translate(-(size + boltSize / 2), -0.15f, offset);
-        CubeRenderer.render(bb, icon, rot, true);
+        cr.render(bb, icon, rot, true);
         bb = baseBolt.translate(-(size + boltSize / 2), -0.15f, -offset);
-        CubeRenderer.render(bb, icon, rot, true);
+        cr.render(bb, icon, rot, true);
 
         bb = baseBolt.translate(-offset, -0.15f, -(size + boltSize / 2));
-        CubeRenderer.render(bb, icon, rot, true);
+        cr.render(bb, icon, rot, true);
         bb = baseBolt.translate(offset, -0.15f, -(size + boltSize / 2));
-        CubeRenderer.render(bb, icon, rot, true);
+        cr.render(bb, icon, rot, true);
 
         bb = baseBolt.translate(offset, -0.15f, (size + boltSize / 2));
-        CubeRenderer.render(bb, icon, rot, true);
+        cr.render(bb, icon, rot, true);
         bb = baseBolt.translate(-offset, -0.15f, (size + boltSize / 2));
-        CubeRenderer.render(bb, icon, rot, true);
+        cr.render(bb, icon, rot, true);
     }
 
     @Override

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

@@ -19,12 +19,14 @@ import com.enderio.core.client.render.CustomRenderBlocks;
 import com.enderio.core.client.render.IconUtil;
 import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.common.vecmath.Vertex;
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import crazypants.enderio.machine.painter.IPaintableTileEntity;
 import crazypants.enderio.machine.painter.PaintedBlockRenderer;
 import crazypants.enderio.machine.painter.PainterUtil;
 
+@ThreadSafeISBRH(perThread = true)
 public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, IItemRenderer {
 
     private OverlayRenderer overlayRenderer = new OverlayRenderer() {
@@ -40,7 +42,7 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, II
 
     private CustomCubeRenderer ccr = new CustomCubeRenderer();
 
-    private PaintedBlockRenderer paintedRenderer = new PaintedBlockRenderer(this.getRenderId(), null); // passthrough
+    private final PaintedBlockRenderer paintedRenderer = new PaintedBlockRenderer(this.getRenderId(), null);
     // renderer for
     // paintable
     // machines
@@ -75,8 +77,9 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, II
 
         BoundingBox bb = BoundingBox.UNIT_CUBE;
         bb = bb.translate(0, -0.1f, 0);
+        final Tessellator tessellator = Tessellator.instance;
 
-        Tessellator.instance.startDrawingQuads();
+        tessellator.startDrawingQuads();
 
         IIcon[] textures = RenderUtil.getBlockTextures(block, metadata);
 
@@ -84,8 +87,8 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, II
         for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
             brightnessPerSide[dir.ordinal()] = Math.max(RenderUtil.getColorMultiplierForFace(dir) + 0.1f, 1f);
         }
-        CubeRenderer.render(bb, textures, null, brightnessPerSide);
-        Tessellator.instance.draw();
+        CubeRenderer.get().render(bb, textures, null, brightnessPerSide);
+        tessellator.draw();
     }
 
     @Override

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

@@ -19,7 +19,6 @@ import com.enderio.core.common.vecmath.Vertex;
 
 public class OverlayRenderer implements IRenderFace {
 
-    private static final CustomCubeRenderer ccr = CustomCubeRenderer.instance;
     private AbstractMachineEntity te;
 
     public void setTile(AbstractMachineEntity te) {
@@ -30,6 +29,7 @@ public class OverlayRenderer implements IRenderFace {
     @Override
     public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z,
             IIcon texture, List<Vertex> refVertices, boolean translateToXyz) {
+        CustomCubeRenderer ccr = CustomCubeRenderer.get();
 
         if (te != null && par1Block instanceof AbstractMachineBlock) {
             BlockCoord bc = new BlockCoord(x, y, z);

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

@@ -21,6 +21,7 @@ import com.enderio.core.client.render.ConnectedTextureRenderer;
 import com.enderio.core.client.render.CubeRenderer;
 import com.enderio.core.client.render.CustomCubeRenderer;
 import com.enderio.core.client.render.RenderUtil;
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.relauncher.Side;
@@ -36,6 +37,7 @@ import crazypants.enderio.machine.capbank.render.FillGauge.GaugeKey;
 import crazypants.enderio.power.PowerHandlerUtil;
 
 @SideOnly(Side.CLIENT)
+@ThreadSafeISBRH(perThread = true)
 public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler, IItemRenderer {
 
     private ConnectedTextureRenderer connectedTexRenderer;
@@ -47,7 +49,7 @@ public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpl
         connectedTexRenderer = new ConnectedTextureRenderer();
         connectedTexRenderer.setMatchMeta(true);
         fillGaugeRenderer = new FillGauge();
-        infoRenderers = new HashMap<InfoDisplayType, IInfoRenderer>();
+        infoRenderers = new HashMap<>();
         infoRenderers.put(InfoDisplayType.LEVEL_BAR, fillGaugeRenderer);
         infoRenderers.put(InfoDisplayType.IO, new IoDisplay());
     }
@@ -60,6 +62,7 @@ public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpl
     @Override
     public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
             RenderBlocks renderer) {
+        CustomCubeRenderer ccr = CustomCubeRenderer.get();
 
         int meta = world.getBlockMetadata(x, y, z);
         meta = MathHelper.clamp_int(meta, 0, CapBankType.types().size() - 1);
@@ -70,13 +73,13 @@ public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpl
             connectedTexRenderer.setForceAllEdges(false);
         }
         connectedTexRenderer.setEdgeTexture(EnderIO.blockCapBank.getBorderIcon(0, meta));
-        CustomCubeRenderer.instance.setOverrideTexture(renderer.overrideBlockTexture);
+        ccr.setOverrideTexture(renderer.overrideBlockTexture);
         if (renderer.overrideBlockTexture == null) {
-            CustomCubeRenderer.instance.renderBlock(world, block, x, y, z, connectedTexRenderer);
+            ccr.renderBlock(world, block, x, y, z, connectedTexRenderer);
         } else {
-            CustomCubeRenderer.instance.renderBlock(world, block, x, y, z);
+            ccr.renderBlock(world, block, x, y, z);
         }
-        CustomCubeRenderer.instance.setOverrideTexture(null);
+        ccr.setOverrideTexture(null);
         return true;
     }
 
@@ -108,7 +111,7 @@ public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpl
         Tessellator tes = Tessellator.instance;
 
         tes.startDrawingQuads();
-        CubeRenderer.render(EnderIO.blockCapBank, item.getItemDamage());
+        CubeRenderer.get().render(EnderIO.blockCapBank, item.getItemDamage());
         tes.draw();
 
         GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL);
@@ -126,7 +129,7 @@ public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpl
         nw.setMaxEnergyStoredL(CapBankType.getTypeFromMeta(item.getItemDamage()).getMaxEnergyStored());
         nw.setEnergyStored(PowerHandlerUtil.getStoredEnergyForItem(item));
 
-        GaugeInfo gi = new GaugeInfo(1, 0);
+        GaugeInfo gi = GaugeInfo.DEFAULT;
         GaugeKey key = new GaugeKey(ForgeDirection.SOUTH, FillGauge.Type.SINGLE);
         fillGaugeRenderer.doRender(nw, RenderUtil.BRIGHTNESS_MAX, gi, key);
         // key = new GaugeKey(ForgeDirection.EAST, FillGauge.Type.SINGLE);

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

@@ -1,6 +1,5 @@
 package crazypants.enderio.machine.capbank.render;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,6 +31,7 @@ public class FillGauge implements IInfoRenderer, IResourceManagerReloadListener
     private static final double HEIGHT = 0.75;
     private static final double VERT_BORDER = (1 - HEIGHT) / 2;
     private static final double WIDTH = 0.25;
+    private final Vertex[] newVerts = new Vertex[] { new Vertex(), new Vertex(), new Vertex(), new Vertex() };
 
     enum Type {
         SINGLE,
@@ -95,8 +95,8 @@ public class FillGauge implements IInfoRenderer, IResourceManagerReloadListener
         if (ratio <= 0) {
             return;
         }
-        double maxY = ratio * info.height;
-        if (maxY <= info.yPosition) {
+        double maxY = ratio * info.getHeight();
+        if (maxY <= info.getyPosition()) {
             // empty
             return;
         }
@@ -105,26 +105,24 @@ public class FillGauge implements IInfoRenderer, IResourceManagerReloadListener
         Tessellator.instance.addTranslation((float) offset.x, (float) offset.y, (float) offset.z);
 
         List<Vertex> verts = levelVertexCache.get(key);
-        if (maxY >= info.yPosition + 1) {
+        if (maxY >= info.getyPosition() + 1) {
             // full bar
             RenderUtil.addVerticesToTessellator(verts, Tessellator.instance);
 
         } else {
             // need to render partial bar
-            double myMaxY = maxY - info.yPosition;
+            double myMaxY = maxY - info.getyPosition();
 
             if (info.type == Type.BOTTOM || info.type == Type.SINGLE) {
                 // If we have some power and we are the bottom bit of the display,
                 // always show at least a little bit in the bar
                 myMaxY = Math.max(0.2, myMaxY);
             }
-            List<Vertex> newVerts = new ArrayList<Vertex>();
-            for (Vertex v : verts) {
-                v = new Vertex(v);
-                newVerts.add(v);
-                if (v.y() > myMaxY) {
-                    v.setXYZ(v.x(), myMaxY, v.z());
-                    v.setUV(v.u(), barMinV + (float) (myMaxY * barHeightV));
+            for (int i = 0; i < verts.size(); i++) {
+                newVerts[i].set(verts.get(i));
+                if (newVerts[i].y() > myMaxY) {
+                    newVerts[i].setXYZ(newVerts[i].x(), myMaxY, newVerts[i].z());
+                    newVerts[i].setUV(newVerts[i].u(), barMinV + (float) (myMaxY * barHeightV));
                 }
             }
             RenderUtil.addVerticesToTessellator(newVerts, Tessellator.instance);
@@ -136,7 +134,7 @@ public class FillGauge implements IInfoRenderer, IResourceManagerReloadListener
     private GaugeInfo getGaugeInfo(TileCapBank cb, ForgeDirection dir) {
 
         if (!cb.getType().isMultiblock()) {
-            return new GaugeInfo(1, 0);
+            return GaugeInfo.DEFAULT;
         }
 
         int height = 1;
@@ -240,8 +238,10 @@ public class FillGauge implements IInfoRenderer, IResourceManagerReloadListener
 
     static class GaugeInfo {
 
-        int height;
-        int yPosition;
+        public static final GaugeInfo DEFAULT = new GaugeInfo(1, 0);
+
+        private int height;
+        private int yPosition;
         Type type;
 
         GaugeInfo(int height, int position) {
@@ -262,6 +262,14 @@ public class FillGauge implements IInfoRenderer, IResourceManagerReloadListener
             }
             return Type.MIDDLE;
         }
+
+        public int getHeight() {
+            return height;
+        }
+
+        public int getyPosition() {
+            return yPosition;
+        }
     }
 
     static class GaugeKey {

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

@@ -21,6 +21,14 @@ import crazypants.enderio.machine.power.PowerDisplayUtil;
 
 public class IoDisplay implements IInfoRenderer {
 
+    private float previousAverageInput;
+    private float previousAverageOutput;
+
+    String averageInputText = "0";
+    String averageOutputText = "0";
+    HeadingText heading1;
+    HeadingText heading2;
+
     @Override
     public void render(TileCapBank cb, ForgeDirection dir, double x, double y, double z, float partialTick) {
         if (dir.offsetY != 0) {
@@ -137,10 +145,8 @@ public class IoDisplay implements IInfoRenderer {
 
         nw.requestPowerUpdate(cb, 20);
 
-        HeadingText heading1 = HeadingText.STABLE;
-        HeadingText heading2 = null;
-        String text1;
-        String text2 = "";
+        heading1 = HeadingText.STABLE;
+        heading2 = null;
 
         FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
         float size = 0.15f * Math.min(info.width, info.height);
@@ -150,8 +156,14 @@ public class IoDisplay implements IInfoRenderer {
         if (info.height * 3 >= info.width * 4) {
             heading1 = HeadingText.INPUT;
             heading2 = HeadingText.OUTPUT;
-            text1 = getChangeText(nw.getAverageInputPerTick(), fr);
-            text2 = getChangeText(nw.getAverageOutputPerTick(), fr);
+            if (previousAverageInput != nw.getAverageInputPerTick()) {
+                averageInputText = getChangeText(nw.getAverageInputPerTick(), fr);
+                previousAverageInput = nw.getAverageInputPerTick();
+            }
+            if (previousAverageOutput != nw.getAverageOutputPerTick()) {
+                averageOutputText = getChangeText(nw.getAverageOutputPerTick(), fr);
+                previousAverageOutput = nw.getAverageOutputPerTick();
+            }
             offset = -size * 2.5f;
         } else {
             int change = Math.round(nw.getAverageChangePerTick());
@@ -160,7 +172,10 @@ public class IoDisplay implements IInfoRenderer {
             } else if (change < 0) {
                 heading1 = HeadingText.LOSS;
             }
-            text1 = getChangeText(change, fr);
+            if (change != previousAverageInput) {
+                averageInputText = getChangeText(change, fr);
+                previousAverageInput = change;
+            }
             offset = -size;
         }
 
@@ -184,9 +199,9 @@ public class IoDisplay implements IInfoRenderer {
         GL11.glDisable(GL11.GL_LIGHTING);
         OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
 
-        offset = drawText(heading1, text1, offset, scale, size, fr);
+        offset = drawText(heading1, averageInputText, offset, scale, size, fr);
         if (heading2 != null) {
-            drawText(heading2, text2, offset, scale, size, fr);
+            drawText(heading2, averageOutputText, offset, scale, size, fr);
         }
 
         GL11.glEnable(GL11.GL_LIGHTING);

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

@@ -28,13 +28,19 @@ public class FarmingStationRenderer extends TechneMachineRenderer<TileFarmStatio
         if (world != null) {
             TileEntity te = world.getTileEntity(x, y, z);
             if (te instanceof TileFarmStation && ((TileFarmStation) te).isActive()) {
+                final Tessellator tessellator = Tessellator.instance;
                 BoundingBox bb = BoundingBox.UNIT_CUBE.scale(10D / 16D, 0.25, 10D / 16D);
                 bb = bb.scale(1.01, 1, 1.01);
                 bb = bb.translate(0, 5f / 16f, 0);
                 bb = bb.translate(x, y, z);
-                Tessellator.instance.setColorOpaque_F(1, 1, 1);
-                Tessellator.instance.setBrightness(0xF000F0);
-                CubeRenderer.render(bb, override != null ? override : Blocks.portal.getBlockTextureFromSide(1));
+                tessellator.setColorOpaque_F(1, 1, 1);
+                tessellator.setBrightness(0xF000F0);
+                IIcon ico = override != null ? override : Blocks.portal.getBlockTextureFromSide(1);
+                float x1 = ico.getInterpolatedU(3);
+                float x2 = ico.getInterpolatedU(13);
+                float y1 = ico.getInterpolatedV(6);
+                float y2 = ico.getInterpolatedV(10);
+                CubeRenderer.get().render(bb, x1, x2, y1, y2);
             }
         }
 

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

@@ -89,7 +89,7 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement
             }
             tes.setBrightness(brightness);
 
-            CubeRenderer.render(bb, icon);
+            CubeRenderer.get().render(bb, icon);
 
             GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
             GL11.glEnable(GL11.GL_BLEND);

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

@@ -111,7 +111,7 @@ public class HyperCubeRenderer extends TileEntitySpecialRenderer implements IIte
         } else {
             GL11.glColor4f(1, 1, 1, 1f);
         }
-        CubeRenderer.render(bb, icon);
+        CubeRenderer.get().render(bb, icon);
         tessellator.draw();
 
         GL11.glPopMatrix();

src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java

@@ -142,7 +142,7 @@ public class KillerJoeRenderer extends TileEntitySpecialRenderer implements IIte
             tes.setBrightness(brightness);
             tes.setColorOpaque_F(1, 1, 1);
 
-            CubeRenderer.render(bb, icon);
+            CubeRenderer.get().render(bb, icon);
 
             GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
             GL11.glEnable(GL11.GL_BLEND);

src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java

@@ -9,9 +9,11 @@ import net.minecraft.world.IBlockAccess;
 import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.client.render.CubeRenderer;
 import com.enderio.core.client.render.RenderUtil;
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 
+@ThreadSafeISBRH(perThread = false)
 public class ElectricLightRenderer implements ISimpleBlockRenderingHandler {
 
     @Override
@@ -19,13 +21,13 @@ public class ElectricLightRenderer implements ISimpleBlockRenderingHandler {
 
         BoundingBox bb = new BoundingBox(0, 0, 0, 1, 0.2, 1);
         boolean doDraw = false;
-
-        Tessellator.instance.startDrawingQuads();
+        final Tessellator tessellator = Tessellator.instance;
+        tessellator.startDrawingQuads();
 
         IIcon[] textures = RenderUtil.getBlockTextures(block, metadata);
-        CubeRenderer.render(bb, textures, null, null);
+        CubeRenderer.get().render(bb, textures, null, null);
 
-        Tessellator.instance.draw();
+        tessellator.draw();
     }
 
     @Override
@@ -45,9 +47,9 @@ public class ElectricLightRenderer implements ISimpleBlockRenderingHandler {
 
         IIcon[] textures = RenderUtil.getBlockTextures(world, x, y, z);
         if (renderer.hasOverrideBlockTexture()) {
-            CubeRenderer.render(bb, renderer.overrideBlockTexture);
+            CubeRenderer.get().render(bb, renderer.overrideBlockTexture);
         } else {
-            CubeRenderer.render(bb, textures, null, null);
+            CubeRenderer.get().render(bb, textures, null, null);
         }
 
         return true;

src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java

@@ -17,13 +17,15 @@ import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.common.vecmath.Vector3d;
 import com.enderio.core.common.vecmath.Vector3f;
 import com.enderio.core.common.vecmath.Vertex;
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 
+@ThreadSafeISBRH(perThread = true)
 public class ObeliskRenderer implements ISimpleBlockRenderingHandler {
 
-    private static final VertXForm2 xform2 = new VertXForm2();
-    private static final VertXForm3 xform3 = new VertXForm3();
+    private final VertXForm2 xform2 = new VertXForm2();
+    private final VertXForm3 xform3 = new VertXForm3();
 
     private static final float WIDE_PINCH = 0.9f;
     private static final float WIDTH = 18f / 32f * WIDE_PINCH;
@@ -39,11 +41,12 @@ public class ObeliskRenderer implements ISimpleBlockRenderingHandler {
 
     @Override
     public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
+        final Tessellator tessellator = Tessellator.instance;
         GL11.glDisable(GL11.GL_LIGHTING);
         GL11.glEnable(GL11.GL_ALPHA_TEST);
-        Tessellator.instance.startDrawingQuads();
+        tessellator.startDrawingQuads();
         renderWorldBlock(null, 0, 0, 0, block, 0, renderer);
-        Tessellator.instance.draw();
+        tessellator.draw();
         GL11.glDisable(GL11.GL_ALPHA_TEST);
         GL11.glEnable(GL11.GL_LIGHTING);
     }
@@ -66,6 +69,8 @@ public class ObeliskRenderer implements ISimpleBlockRenderingHandler {
         } else { // item
             icons = RenderUtil.getBlockTextures(block, 0);
         }
+        final Tessellator tessellator = Tessellator.instance;
+        final CubeRenderer cr = CubeRenderer.get();
 
         // bottom texture goes into its own BB
         IIcon[] bottomIcons = new IIcon[6];
@@ -75,18 +80,18 @@ public class ObeliskRenderer implements ISimpleBlockRenderingHandler {
         bottomIcons[BOTTOM] = icons[BOTTOM];
         icons[BOTTOM] = IconUtil.blankTexture;
 
-        Tessellator.instance.addTranslation(x, y, z);
+        tessellator.addTranslation(x, y, z);
 
         xform2.isX = false;
-        CubeRenderer.render(bb1, icons, xform2, true);
+        cr.render(bb1, icons, xform2, true);
 
         xform2.isX = true;
         icons[TOP] = IconUtil.blankTexture;
-        CubeRenderer.render(bb2, icons, xform2, true);
+        cr.render(bb2, icons, xform2, true);
 
-        CubeRenderer.render(BoundingBox.UNIT_CUBE, bottomIcons, xform3, true);
+        cr.render(BoundingBox.UNIT_CUBE, bottomIcons, xform3, true);
 
-        Tessellator.instance.addTranslation(-x, -y, -z);
+        tessellator.addTranslation(-x, -y, -z);
 
         return true;
     }

src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGateRenderer.java

@@ -7,9 +7,12 @@ import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.IBlockAccess;
 
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
+
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import crazypants.enderio.EnderIO;
 
+@ThreadSafeISBRH(perThread = false)
 public class BlockPaintedFenceGateRenderer implements ISimpleBlockRenderingHandler {
 
     @Override

src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java

@@ -11,10 +11,13 @@ import net.minecraftforge.common.util.ForgeDirection;
 import com.enderio.core.client.render.CubeRenderer;
 import com.enderio.core.client.render.IconUtil;
 import com.enderio.core.common.util.BlockCoord;
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRHFactory;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.common.Optional;
 
-public class PaintedBlockRenderer implements ISimpleBlockRenderingHandler {
+@Optional.Interface(modid = "angelica", iface = "com.gtnewhorizons.angelica.api.ThreadSafeISBRHFactory")
+public class PaintedBlockRenderer implements ISimpleBlockRenderingHandler, ThreadSafeISBRHFactory {
 
     private int renderId;
     private Block defaultBlock;
@@ -22,6 +25,13 @@ public class PaintedBlockRenderer implements ISimpleBlockRenderingHandler {
     public PaintedBlockRenderer(int renderId, Block defaultBlock) {
         this.renderId = renderId;
         this.defaultBlock = defaultBlock;
+
+    }
+
+    @Override
+    @Optional.Method(modid = "angelica")
+    public ThreadSafeISBRHFactory newInstance() {
+        return new PaintedBlockRenderer(renderId, defaultBlock);
     }
 
     @Override
@@ -31,9 +41,10 @@ public class PaintedBlockRenderer implements ISimpleBlockRenderingHandler {
 
     @Override
     public void renderInventoryBlock(Block blk, int meta, int modelId, RenderBlocks arg3) {
-        Tessellator.instance.startDrawingQuads();
-        CubeRenderer.render(blk, meta);
-        Tessellator.instance.draw();
+        final Tessellator tessellator = Tessellator.instance;
+        tessellator.startDrawingQuads();
+        CubeRenderer.get().render(blk, meta);
+        tessellator.draw();
     }
 
     @Override

src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java

@@ -24,18 +24,20 @@ import com.enderio.core.common.vecmath.Vector3d;
 import com.enderio.core.common.vecmath.Vector4d;
 import com.enderio.core.common.vecmath.Vector4f;
 import com.enderio.core.common.vecmath.Vertex;
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.machine.power.GaugeBounds.VPos;
 
+@ThreadSafeISBRH(perThread = true)
 public class CapBankRenderer2 implements ISimpleBlockRenderingHandler {
 
     private static final BlockCoord DEFAULT_BC = new BlockCoord(0, 0, 0);
     private static final BlockCoord[] DEFAULT_MB = new BlockCoord[] { DEFAULT_BC };
     private static final double PIXEL_SIZE = 1 / 16d;
 
-    private final List<IRenderFace> renderers = new ArrayList<IRenderFace>(2);
+    private final List<IRenderFace> renderers = new ArrayList<>(2);
 
     private ConnectedTextureRenderer connectedTexRenderer;
 
@@ -67,7 +69,7 @@ public class CapBankRenderer2 implements ISimpleBlockRenderingHandler {
             connectedTexRenderer.setEdgeTexture(EnderIO.blockAlloySmelter.getBlockTextureFromSide(3));
             connectedTexRenderer.setForceAllEdges(false);
         }
-        CustomCubeRenderer.instance.renderBlock(world, block, x, y, z, renderers);
+        CustomCubeRenderer.get().renderBlock(world, block, x, y, z, renderers);
         return true;
     }
 

src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java

@@ -109,7 +109,8 @@ public class CapacitorBankRenderer extends TileEntitySpecialRenderer implements
         }
 
         tes.startDrawingQuads();
-        CubeRenderer.render(BoundingBox.UNIT_CUBE, EnderIO.blockCapacitorBank.getIcon(0, 0), null, brightness, true);
+        CubeRenderer.get()
+                .render(BoundingBox.UNIT_CUBE, EnderIO.blockCapacitorBank.getIcon(0, 0), null, brightness, true);
         tes.draw();
 
         GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL);

src/main/java/crazypants/enderio/machine/ranged/RangeRenerer.java

@@ -21,6 +21,7 @@ public class RangeRenerer extends RenderEntity {
     public void doRender(Entity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) {
 
         RangeEntity se = ((RangeEntity) entity);
+        final Tessellator tessellator = Tessellator.instance;
 
         GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
         GL11.glDisable(GL11.GL_LIGHTING);
@@ -43,10 +44,10 @@ public class RangeRenerer extends RenderEntity {
         GL11.glColor4f(1, 1, 1, 0.4f);
 
         RenderUtil.bindBlockTexture();
-        Tessellator.instance.startDrawingQuads();
-        Tessellator.instance.setBrightness(15 << 20 | 15 << 4);
-        CubeRenderer.render(BoundingBox.UNIT_CUBE, IconUtil.whiteTexture);
-        Tessellator.instance.draw();
+        tessellator.startDrawingQuads();
+        tessellator.setBrightness(15 << 20 | 15 << 4);
+        CubeRenderer.get().render(BoundingBox.UNIT_CUBE, IconUtil.whiteTexture);
+        tessellator.draw();
 
         RenderUtil.bindItemTexture();
 

src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java

@@ -74,18 +74,19 @@ public class ReservoirRenderer extends TileEntitySpecialRenderer implements IRes
         GL11.glTranslatef((float) x + offset.x, (float) y + offset.y, (float) z + offset.z);
 
         BoundingBox bb = res.getLiquidRenderBounds();
+        final Tessellator tessellator = Tessellator.instance;
 
         if (res.isAutoEject()) {
 
             // switch
             RenderUtil.bindBlockTexture();
 
-            Tessellator.instance.startDrawingQuads();
-            Tessellator.instance.setColorRGBA_F(val, val, val, 1);
+            tessellator.startDrawingQuads();
+            tessellator.setColorRGBA_F(val, val, val, 1);
             for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
                 drawSwitch(dir, bb);
             }
-            Tessellator.instance.draw();
+            tessellator.draw();
         }
 
         if (fullness > 0) {
@@ -96,9 +97,9 @@ public class ReservoirRenderer extends TileEntitySpecialRenderer implements IRes
             IIcon tex = getLiquidTexture();
             float maxV = tex.getMinV() + ((tex.getMaxV() - tex.getMinV()) * fullness);
 
-            Tessellator.instance.startDrawingQuads();
-            Tessellator.instance.setColorRGBA_F(val, val, val, 1);
-            CubeRenderer.render(
+            tessellator.startDrawingQuads();
+            tessellator.setColorRGBA_F(val, val, val, 1);
+            CubeRenderer.get().render(
                     new BoundingBox(
                             bb.minX + margin,
                             bb.minY + margin,
@@ -110,7 +111,7 @@ public class ReservoirRenderer extends TileEntitySpecialRenderer implements IRes
                     tex.getMaxU(),
                     tex.getMinV(),
                     maxV);
-            Tessellator.instance.draw();
+            tessellator.draw();
         }
 
         GL11.glPopAttrib();
@@ -119,10 +120,10 @@ public class ReservoirRenderer extends TileEntitySpecialRenderer implements IRes
         Minecraft.getMinecraft().entityRenderer.enableLightmap(0);
     }
 
-    private Vector3d forward = new Vector3d();
-    private Vector3d left = new Vector3d();
-    private Vector3d up = new Vector3d();
-    private Vector3d offset = new Vector3d();
+    private final Vector3d forward = new Vector3d();
+    private final Vector3d left = new Vector3d();
+    private final Vector3d up = new Vector3d();
+    private final Vector3d offset = new Vector3d();
 
     private void drawSwitch(ForgeDirection dir, BoundingBox bb) {
         Tessellator tes = Tessellator.instance;

src/main/java/crazypants/enderio/machine/solar/SolarPanelRenderer.java

@@ -18,13 +18,15 @@ import com.enderio.core.client.render.CubeRenderer;
 import com.enderio.core.client.render.CustomCubeRenderer;
 import com.enderio.core.client.render.IconUtil;
 import com.enderio.core.client.render.RenderUtil;
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import crazypants.enderio.EnderIO;
 
+@ThreadSafeISBRH(perThread = true)
 public class SolarPanelRenderer implements ISimpleBlockRenderingHandler {
 
-    private ConnectedTextureRenderer ctr;
+    private final ConnectedTextureRenderer ctr;
 
     public SolarPanelRenderer() {
         ctr = new ConnectedTextureRenderer();
@@ -40,7 +42,7 @@ public class SolarPanelRenderer implements ISimpleBlockRenderingHandler {
         float offset = -0.5f;
         tes.addTranslation(offset, 0, offset);
         tes.startDrawingQuads();
-        CubeRenderer.render(
+        CubeRenderer.get().render(
                 new BoundingBox(EnderIO.blockSolarPanel),
                 RenderUtil.getBlockTextures(EnderIO.blockSolarPanel, metadata),
                 false);
@@ -62,19 +64,23 @@ public class SolarPanelRenderer implements ISimpleBlockRenderingHandler {
     @Override
     public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
             RenderBlocks renderer) {
+        CustomCubeRenderer ccr = CustomCubeRenderer.get();
+        final Tessellator tessellator = Tessellator.instance;
+
         renderer.renderStandardBlock(block, x, y, z);
-        Tessellator.instance.addTranslation(0, 0.0001f, 0);
+        tessellator.addTranslation(0, 0.0001f, 0);
         int meta = world.getBlockMetadata(x, y, z);
         meta = MathHelper.clamp_int(meta, 0, 1);
         ctr.setEdgeTexture(EnderIO.blockSolarPanel.getBorderIcon(0, meta));
-        CustomCubeRenderer.instance.setOverrideTexture(IconUtil.blankTexture);
+
+        ccr.setOverrideTexture(IconUtil.blankTexture);
         if (!renderer.hasOverrideBlockTexture()) {
-            CustomCubeRenderer.instance.renderBlock(world, block, x, y, z, ctr);
+            ccr.renderBlock(world, block, x, y, z, ctr);
         } else {
-            CustomCubeRenderer.instance.renderBlock(world, block, x, y, z);
+            ccr.renderBlock(world, block, x, y, z);
         }
-        CustomCubeRenderer.instance.setOverrideTexture(null);
-        Tessellator.instance.addTranslation(0, -0.0001f, 0);
+        ccr.setOverrideTexture(null);
+        tessellator.addTranslation(0, -0.0001f, 0);
         return true;
     }
 

src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java

@@ -14,11 +14,13 @@ 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.common.util.ForgeDirectionOffsets;
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import crazypants.enderio.ClientProxy;
 import crazypants.enderio.EnderIO;
 
+@ThreadSafeISBRH(perThread = true)
 public class SoulBinderRenderer implements ISimpleBlockRenderingHandler {
 
     private float skullScale = 0.5f;
@@ -30,9 +32,10 @@ public class SoulBinderRenderer implements ISimpleBlockRenderingHandler {
     public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
 
         GL11.glDisable(GL11.GL_LIGHTING);
-        Tessellator.instance.startDrawingQuads();
+        final Tessellator tessellator = Tessellator.instance;
+        tessellator.startDrawingQuads();
         renderWorldBlock(null, 0, 0, 0, block, 0, renderer);
-        Tessellator.instance.draw();
+        tessellator.draw();
         GL11.glEnable(GL11.GL_LIGHTING);
     }
 
@@ -42,6 +45,8 @@ public class SoulBinderRenderer implements ISimpleBlockRenderingHandler {
 
         IIcon soulariumIcon = EnderIO.blockSoulFuser.getIcon(ForgeDirection.EAST.ordinal(), 0);
         override = renderer.overrideBlockTexture;
+        final Tessellator tessellator = Tessellator.instance;
+        final CubeRenderer cr = CubeRenderer.get();
 
         // Horrible hack to get the MC lighting engine to set the correct values for me
         if (renderer != null && world != null) {
@@ -51,23 +56,23 @@ public class SoulBinderRenderer implements ISimpleBlockRenderingHandler {
         }
         BoundingBox bb;
 
-        Tessellator.instance.addTranslation(x, y, z);
+        tessellator.addTranslation(x, y, z);
 
         bb = BoundingBox.UNIT_CUBE.scale(0.85, 0.85, 0.85);
         setIcons(soulariumIcon, soulariumIcon, ForgeDirection.NORTH);
-        CubeRenderer.render(bb, icons, true);
+        cr.render(bb, icons, true);
 
         float slabWidth = 0.15f;
         bb = BoundingBox.UNIT_CUBE.scale(1, slabWidth, 1);
         bb = bb.translate(0, 0.5f - (slabWidth / 2), 0);
         setIcons(soulariumIcon, EnderIO.blockSoulFuser.getIcon(ForgeDirection.UP.ordinal(), 0), ForgeDirection.UP);
-        CubeRenderer.render(bb, icons, true);
+        cr.render(bb, icons, true);
 
         bb = BoundingBox.UNIT_CUBE.scale(1, slabWidth, 1);
         bb = bb.translate(0, -0.5f + (slabWidth / 2), 0);
         setIcons(soulariumIcon, soulariumIcon, ForgeDirection.NORTH);
 
-        CubeRenderer.render(bb, icons, true);
+        cr.render(bb, icons, true);
 
         IIcon endermanIcon;
         int facing = ForgeDirection.SOUTH.ordinal();
@@ -86,7 +91,7 @@ public class SoulBinderRenderer implements ISimpleBlockRenderingHandler {
         renderSkull(forFacing(ForgeDirection.NORTH, facing), soulariumIcon, EnderIO.blockSoulFuser.zombieSkullIcon);
         renderSkull(forFacing(ForgeDirection.EAST, facing), soulariumIcon, EnderIO.blockSoulFuser.creeperSkullIcon);
 
-        Tessellator.instance.addTranslation(-x, -y, -z);
+        tessellator.addTranslation(-x, -y, -z);
 
         return true;
     }
@@ -99,7 +104,7 @@ public class SoulBinderRenderer implements ISimpleBlockRenderingHandler {
         BoundingBox bb;
         bb = scaledBB.translate(ForgeDirectionOffsets.offsetScaled(face, 0.5 - skullScale / 2));
         setIcons(soulariumIcon, faceIcon, face);
-        CubeRenderer.render(bb, icons, true);
+        CubeRenderer.get().render(bb, icons, true);
     }
 
     private void setIcons(IIcon defaultIcon, IIcon faceIcon, ForgeDirection faceSide) {

src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java

@@ -34,6 +34,7 @@ public class TankFluidRenderer extends TileEntitySpecialRenderer {
         }
         IIcon icon = tank.getFluid().getFluid().getStillIcon();
         if (icon != null) {
+            final Tessellator tessellator = Tessellator.instance;
             float fullness = tank.getFilledRatio();
             y += 0.01f; // prevent bottom side z-fighting
             float scale = 0.98f;
@@ -49,11 +50,11 @@ public class TankFluidRenderer extends TileEntitySpecialRenderer {
 
             RenderUtil.bindBlockTexture();
 
-            Tessellator.instance.startDrawingQuads();
-            Tessellator.instance.addTranslation(x, y, z);
-            CubeRenderer.render(bb, icon);
-            Tessellator.instance.addTranslation(-x, -y, -z);
-            Tessellator.instance.draw();
+            tessellator.startDrawingQuads();
+            tessellator.addTranslation(x, y, z);
+            CubeRenderer.get().render(bb, icon);
+            tessellator.addTranslation(-x, -y, -z);
+            tessellator.draw();
 
             GL11.glPopAttrib();
         }

src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java

@@ -42,11 +42,12 @@ public class TankItemRenderer implements IItemRenderer {
         GL11.glEnable(GL11.GL_ALPHA_TEST);
         Block block = EnderIO.blockTank;
         int meta = item.getItemDamage();
+        final Tessellator tessellator = Tessellator.instance;
 
         IIcon[] icons = RenderUtil.getBlockTextures(block, meta);
         BoundingBox bb = BoundingBox.UNIT_CUBE.translate(0, -0.1f, 0);
-        Tessellator.instance.startDrawingQuads();
-        CubeRenderer.render(bb, icons, null, RenderUtil.getDefaultPerSideBrightness());
-        Tessellator.instance.draw();
+        tessellator.startDrawingQuads();
+        CubeRenderer.get().render(bb, icons, null, RenderUtil.getDefaultPerSideBrightness());
+        tessellator.draw();
     }
 }

src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java

@@ -162,7 +162,7 @@ public class TransceiverRenderer extends TileEntitySpecialRenderer implements II
         } else {
             GL11.glColor4f(1, 1, 1, 1f);
         }
-        CubeRenderer.render(bb, icon);
+        CubeRenderer.get().render(bb, icon);
         tessellator.draw();
 
         GL11.glPopMatrix();

src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java

@@ -11,18 +11,22 @@ import net.minecraftforge.client.IItemRenderer;
 
 import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.client.render.CubeRenderer;
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import crazypants.enderio.EnderIO;
 
+@ThreadSafeISBRH(perThread = false)
 public class VacuumChestRenderer implements ISimpleBlockRenderingHandler, IItemRenderer {
 
     @Override
     public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
-        Tessellator.instance.startDrawingQuads();
-        CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.6, 0.6, 0.6), EnderIO.blockHyperCube.getIcon(0, 0));
-        CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.90, 0.90, 0.90), EnderIO.blockVacuumChest.getIcon(0, 0));
-        Tessellator.instance.draw();
+        final Tessellator tessellator = Tessellator.instance;
+        final CubeRenderer cr = CubeRenderer.get();
+        tessellator.startDrawingQuads();
+        cr.render(BoundingBox.UNIT_CUBE.scale(0.6, 0.6, 0.6), EnderIO.blockHyperCube.getIcon(0, 0));
+        cr.render(BoundingBox.UNIT_CUBE.scale(0.90, 0.90, 0.90), EnderIO.blockVacuumChest.getIcon(0, 0));
+        tessellator.draw();
     }
 
     @Override

src/main/java/crazypants/enderio/machine/wireless/WirelessChargerRenderer.java

@@ -13,10 +13,12 @@ import com.enderio.core.client.render.VertexRotation;
 import com.enderio.core.client.render.VertexTransformComposite;
 import com.enderio.core.client.render.VertexTranslation;
 import com.enderio.core.common.vecmath.Vector3d;
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import crazypants.enderio.EnderIO;
 
+@ThreadSafeISBRH(perThread = false)
 public class WirelessChargerRenderer implements ISimpleBlockRenderingHandler {
 
     @Override
@@ -37,7 +39,8 @@ public class WirelessChargerRenderer implements ISimpleBlockRenderingHandler {
     public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
             RenderBlocks renderer) {
 
-        Tessellator tes = Tessellator.instance;
+        final Tessellator tes = Tessellator.instance;
+        final CubeRenderer cr = CubeRenderer.get();
 
         IIcon baseIcon = EnderIO.blockWirelessCharger.getIcon(0, 0);
 
@@ -50,34 +53,33 @@ public class WirelessChargerRenderer implements ISimpleBlockRenderingHandler {
         VertexTransform trans = new VertexTranslation(0, -0.5 + 0.025, 0);
 
         VertexTransformComposite xform = new VertexTransformComposite(rot, trans);
-        CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.7, 0.05, 0.7), baseIcon, xform, true);
+        cr.render(BoundingBox.UNIT_CUBE.scale(0.7, 0.05, 0.7), baseIcon, xform, true);
 
         trans = new VertexTranslation(0, 0.5 - 0.025, 0);
         xform = new VertexTransformComposite(rot, trans);
-        CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.7, 0.05, 0.7), baseIcon, xform, true);
+        cr.render(BoundingBox.UNIT_CUBE.scale(0.7, 0.05, 0.7), baseIcon, xform, true);
 
-        CubeRenderer
-                .render(BoundingBox.UNIT_CUBE.scale(0.2, 0.91, 0.2), EnderIO.blockWirelessCharger.getCenterOn(), true);
+        cr.render(BoundingBox.UNIT_CUBE.scale(0.2, 0.91, 0.2), EnderIO.blockWirelessCharger.getCenterOn(), true);
 
         trans = new VertexTranslation(0, 0, 0.5 - 0.01);
         xform = new VertexTransformComposite(trans);
-        CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true);
-        CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true);
+        cr.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true);
+        cr.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true);
 
         rot = new VertexRotation(Math.toRadians(90), new Vector3d(0, 1, 0), new Vector3d(0.5, 0.5, 0.5));
         xform = new VertexTransformComposite(trans, rot);
-        CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true);
-        CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true);
+        cr.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true);
+        cr.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true);
 
         rot = new VertexRotation(Math.toRadians(180), new Vector3d(0, 1, 0), new Vector3d(0.5, 0.5, 0.5));
         xform = new VertexTransformComposite(trans, rot);
-        CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true);
-        CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true);
+        cr.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true);
+        cr.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true);
 
         rot = new VertexRotation(Math.toRadians(270), new Vector3d(0, 1, 0), new Vector3d(0.5, 0.5, 0.5));
         xform = new VertexTransformComposite(trans, rot);
-        CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true);
-        CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true);
+        cr.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true);
+        cr.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true);
 
         tes.addTranslation(-x, -y, -z);
 

src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java

@@ -14,6 +14,7 @@ import com.enderio.core.client.render.ConnectedTextureRenderer;
 import com.enderio.core.client.render.ConnectedTextureRenderer.DefaultTextureCallback;
 import com.enderio.core.client.render.CustomCubeRenderer;
 import com.enderio.core.client.render.RenderUtil;
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import crazypants.enderio.EnderIO;
@@ -22,6 +23,7 @@ import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.painter.PainterUtil;
 import crazypants.enderio.machine.painter.TileEntityPaintedBlock;
 
+@ThreadSafeISBRH(perThread = false)
 public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler {
 
     static int renderPass;
@@ -115,19 +117,19 @@ public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler {
             return;
         }
 
-        CustomCubeRenderer.instance.setOverrideTexture(EnderIO.blockFusedQuartz.getIcon(0, meta));
+        final CustomCubeRenderer ccr = CustomCubeRenderer.get();
+
+        ccr.setOverrideTexture(EnderIO.blockFusedQuartz.getIcon(0, meta));
 
         if (tecb != null && tecb.getSourceBlock() != null) {
             connectedTextureRenderer.setEdgeTexureCallback(
                     new DefaultTextureCallback(tecb.getSourceBlock(), tecb.getSourceBlockMetadata()));
-            CustomCubeRenderer.instance
-                    .renderBlock(blockAccess, EnderIO.blockFusedQuartz, x, y, z, connectedTextureRenderer);
+            ccr.renderBlock(blockAccess, EnderIO.blockFusedQuartz, x, y, z, connectedTextureRenderer);
         } else {
             connectedTextureRenderer.setEdgeTexture(EnderIO.blockFusedQuartz.getDefaultFrameIcon(meta));
-            CustomCubeRenderer.instance
-                    .renderBlock(blockAccess, EnderIO.blockFusedQuartz, x, y, z, connectedTextureRenderer);
+            ccr.renderBlock(blockAccess, EnderIO.blockFusedQuartz, x, y, z, connectedTextureRenderer);
         }
 
-        CustomCubeRenderer.instance.setOverrideTexture(null);
+        ccr.setOverrideTexture(null);
     }
 }

src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java

@@ -112,6 +112,6 @@ public class ItemTeleportStaff extends ItemTravelStaff {
 
     @Override
     public boolean isActive(EntityPlayer ep, ItemStack equipped) {
-        return isEquipped(ep);
+        return (ep != null && equipped != null);
     }
 }

src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -12,7 +13,11 @@ import net.minecraft.world.World;
 
 import com.enderio.core.api.client.gui.IResourceTooltipProvider;
 
+import baubles.api.BaubleType;
+import baubles.api.IBauble;
 import cofh.api.energy.ItemEnergyContainer;
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.Optional.Method;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -24,7 +29,8 @@ import crazypants.enderio.api.teleport.TravelSource;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.power.PowerDisplayUtil;
 
-public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTravel, IResourceTooltipProvider {
+@Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles|API")
+public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTravel, IResourceTooltipProvider, IBauble {
 
     public static boolean isEquipped(EntityPlayer ep) {
         if (ep == null || ep.getCurrentEquippedItem() == null) {
@@ -174,7 +180,7 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTrave
 
     @Override
     public boolean isActive(EntityPlayer ep, ItemStack equipped) {
-        return isEquipped(ep);
+        return (ep != null && equipped != null);
     }
 
     @Override
@@ -184,7 +190,45 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTrave
     }
 
     @Override
+    @Method(modid = "Baubles|API")
+    public BaubleType getBaubleType(ItemStack itemstack) {
+        BaubleType t = null;
+        try {
+            t = BaubleType.valueOf(Config.travelStaffBaublesType);
+        } catch (Exception e) {
+            // NOP
+        }
+        return t != null ? t : BaubleType.AMULET;
+    }
+
+    @Override
+    @Method(modid = "Baubles|API")
+    public void onWornTick(ItemStack itemstack, EntityLivingBase player) {}
+
+    @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.travelStaffAllowInBaublesSlot;
+    }
+
+    @Override
+    @Method(modid = "Baubles|API")
+    public boolean canUnequip(ItemStack itemstack, EntityLivingBase player) {
+        return true;
+    }
+
+    @Override
+    @Method(modid = "Baubles|API")
     public boolean showDurabilityBar(ItemStack stack) {
         return Config.renderDurabilityBar && super.showDurabilityBar(stack);
     }
+
 }

src/main/java/crazypants/enderio/teleport/TravelController.java

@@ -16,6 +16,7 @@ import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
@@ -64,6 +65,7 @@ import crazypants.enderio.teleport.packet.PacketDrainStaff;
 import crazypants.enderio.teleport.packet.PacketLongDistanceTravelEvent;
 import crazypants.enderio.teleport.packet.PacketOpenAuthGui;
 import crazypants.enderio.teleport.packet.PacketTravelEvent;
+import crazypants.util.BaublesUtil;
 
 public class TravelController {
 
@@ -124,6 +126,10 @@ public class TravelController {
      */
     public String validatePacketTravelEvent(EntityPlayerMP toTp, int x, int y, int z, int powerUse,
             boolean conserveMotion, TravelSource source) {
+
+        // If config indicates to allow for 'hacking' the travel packet, then don't do any validation.
+        if (!Config.validateTravelEventServerside) return null;
+
         BlockCoord target = new BlockCoord(x, y, z);
         double dist = getDistanceSquared(toTp, target);
         // allow 15% overshoot to account for rounding
@@ -146,12 +152,18 @@ public class TravelController {
                 TileEntity maybeAnchor = target.getTileEntity(toTp.worldObj);
                 if (!(maybeAnchor instanceof ITravelAccessable)) return "not anchor";
                 ITravelAccessable anchor = (ITravelAccessable) maybeAnchor;
-                if (!anchor.canBlockBeAccessed(toTp) && isValidTarget(toTp, target, TravelSource.BLOCK)) {
+                if (!isValidTarget(toTp, target, TravelSource.BLOCK)) {
                     return "not valid target";
                 }
                 return null;
             case STAFF:
             case STAFF_BLINK:
+                if (Config.travelStaffKeybindEnabled) {
+                    if (equippedItem == null || equippedItem.getItem() == null
+                            || !(equippedItem.getItem() instanceof IItemOfTravel)) {
+                        equippedItem = findTravelItemInInventoryOrBaubles(toTp);
+                    }
+                }
                 if (equippedItem == null || !(equippedItem.getItem() instanceof IItemOfTravel)) return "not staff";
                 if (!((IItemOfTravel) equippedItem.getItem()).isActive(toTp, equippedItem)) return "staff not active";
                 int energy = ((IItemOfTravel) equippedItem.getItem()).canExtractInternal(equippedItem, powerUse);
@@ -515,7 +527,7 @@ public class TravelController {
             }
             onBlockCoord = getActiveTravelBlock(player);
             boolean onBlock = onBlockCoord != null;
-            showTargets = onBlock || isTravelItemActive(player);
+            showTargets = onBlock || isTravelItemActive(player, false);
             if (showTargets) {
                 updateSelectedTarget(player);
             } else {
@@ -603,29 +615,104 @@ public class TravelController {
         return ((IItemOfTravel) equipped.getItem()).getEnergyStored(equipped);
     }
 
-    public boolean isTravelItemActive(EntityPlayer ep) {
-        return getTravelItemTravelSource(ep) != null;
+    public boolean isTravelItemActive(EntityPlayer ep, boolean checkInventoryAndBaubles) {
+        return getTravelItemTravelSource(ep, checkInventoryAndBaubles) != null;
     }
 
-    /** Returns null if no travel item is equipped. */
+    /** Returns null if no travel item is in inventory/baubles. */
     @Nullable
-    public TravelSource getTravelItemTravelSource(EntityPlayer ep) {
-        if (ep == null || ep.getCurrentEquippedItem() == null) {
+    public TravelSource getTravelItemTravelSource(EntityPlayer ep, boolean checkInventoryAndBaubles) {
+        if (ep == null) {
             return null;
         }
+
         ItemStack equipped = ep.getCurrentEquippedItem();
-        if (equipped.getItem() instanceof ItemTeleportStaff) {
-            if (((ItemTeleportStaff) equipped.getItem()).isActive(ep, equipped)) {
-                return TravelSource.TELEPORT_STAFF;
-            }
-        } else if (equipped.getItem() instanceof IItemOfTravel) {
-            if (((IItemOfTravel) equipped.getItem()).isActive(ep, equipped)) {
-                return TravelSource.STAFF;
+        if (checkInventoryAndBaubles) {
+            if (equipped == null || !(equipped.getItem() instanceof IItemOfTravel)) {
+                equipped = findTravelItemInInventoryOrBaubles(ep);
             }
         }
+        if (equipped != null) {
+            if (equipped.getItem() instanceof ItemTeleportStaff) {
+                if (((ItemTeleportStaff) equipped.getItem()).isActive(ep, equipped)) {
+                    return TravelSource.TELEPORT_STAFF;
+                }
+            } else if (equipped.getItem() instanceof IItemOfTravel) {
+                if (((IItemOfTravel) equipped.getItem()).isActive(ep, equipped)) {
+                    return TravelSource.STAFF;
+                }
+            }
+        }
+
         return null;
     }
 
+    /**
+     * Returns null if no Travel item found in inventory/baubles. <br>
+     * DO NOT CHANGE THIS CODE WITHOUT ALSO CHANGING
+     * TravelController.{@link #findTravelItemSlotInInventoryOrBaubles(EntityPlayer)}
+     */
+    @Nullable
+    public ItemStack findTravelItemInInventoryOrBaubles(EntityPlayer ep) {
+        ItemStack travelItem = null;
+        for (int i = 0; i < ep.inventory.getSizeInventory(); i++) {
+            ItemStack stack = ep.inventory.getStackInSlot(i);
+            if (stack != null && stack.getItem() instanceof IItemOfTravel) {
+                travelItem = stack;
+                break;
+            }
+        }
+
+        if (travelItem == null) {
+            IInventory baubles = BaublesUtil.instance().getBaubles(ep);
+            if (baubles != null) {
+                for (int i = 0; i < baubles.getSizeInventory(); i++) {
+                    ItemStack stack = baubles.getStackInSlot(i);
+                    if (stack != null && stack.getItem() instanceof IItemOfTravel) {
+                        travelItem = stack;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return travelItem;
+    }
+
+    /**
+     * Uses same code as {@link #findTravelItemInInventoryOrBaubles(EntityPlayer)}, but returns the slot of that
+     * item.<br>
+     * Baubles return value is unique/hacky, if <-1 return, then do the following to calculate the baubles slot:
+     * "Math.abs(returnval)-2" <br>
+     * Example: -3 return is Bauble slot 1, -2 return is Bauble slot 0
+     *
+     * @return -1 if no travel item found. 0 or more if item found in inventory. -2 or less if item found in Baubles.
+     */
+    public int findTravelItemSlotInInventoryOrBaubles(EntityPlayer ep) {
+        int travelItemSlot = -1;
+        for (int i = 0; i < ep.inventory.getSizeInventory(); i++) {
+            ItemStack stack = ep.inventory.getStackInSlot(i);
+            if (stack != null && (stack.getItem() instanceof IItemOfTravel)) {
+                travelItemSlot = i;
+                break;
+            }
+        }
+
+        if (travelItemSlot == -1) {
+            IInventory baubles = BaublesUtil.instance().getBaubles(ep);
+            if (baubles != null) {
+                for (int i = 0; i < baubles.getSizeInventory(); i++) {
+                    ItemStack stack = baubles.getStackInSlot(i);
+                    if (stack != null && stack.getItem() instanceof IItemOfTravel) {
+                        travelItemSlot = -(i + 2);
+                        break;
+                    }
+                }
+            }
+        }
+        return travelItemSlot;
+    }
+
     public boolean travelToSelectedTarget(EntityPlayer player, TravelSource source, boolean conserveMomentum) {
         return travelToLocation(player, source, selectedCoord, conserveMomentum);
     }
@@ -678,11 +765,15 @@ public class TravelController {
     }
 
     public int getRequiredPower(EntityPlayer player, TravelSource source, BlockCoord coord) {
-        if (!isTravelItemActive(player)) {
+        if (!isTravelItemActive(player, true)) {
             return 0;
         }
         int requiredPower;
         ItemStack staff = player.getCurrentEquippedItem();
+        if (staff == null || !(staff.getItem() instanceof IItemOfTravel)) {
+            staff = findTravelItemInInventoryOrBaubles(player);
+        }
+
         requiredPower = getPower(player, source, coord, 0F);
         int canUsePower = getEnergyInTravelItem(staff);
         if (requiredPower > canUsePower) {
@@ -973,7 +1064,7 @@ public class TravelController {
 
     @SideOnly(Side.CLIENT)
     private int getMaxTravelDistanceSqForPlayer(EntityPlayer player) {
-        TravelSource source = getTravelItemTravelSource(player);
+        TravelSource source = getTravelItemTravelSource(player, false);
         if (source == null) {
             return TravelSource.BLOCK.getMaxDistanceTravelledSq();
         }
@@ -1009,7 +1100,7 @@ public class TravelController {
         return null;
     }
 
-    private static void showMessage(EntityPlayer player, IChatComponent chatComponent) {
+    public static void showMessage(EntityPlayer player, IChatComponent chatComponent) {
         if (Loader.isModLoaded("gtnhlib")) {
             if (player instanceof EntityPlayerMP) {
                 chatComponent.setChatStyle(new ChatStyle().setColor(EnumChatFormatting.WHITE));

src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java

@@ -47,7 +47,6 @@ public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer {
 
     @Override
     public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) {
-
         if (!TravelController.instance.showTargets()) {
             return;
         }
@@ -65,11 +64,14 @@ public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer {
         if (!ta.canSeeBlock(Minecraft.getMinecraft().thePlayer)) {
             return;
         }
+        final CubeRenderer cr = CubeRenderer.get();
+        final Tessellator tessellator = Tessellator.instance;
 
         Vector3d eye = Util.getEyePositionEio(Minecraft.getMinecraft().thePlayer);
         Vector3d loc = new Vector3d(tileentity.xCoord + 0.5, tileentity.yCoord + 0.5, tileentity.zCoord + 0.5);
         double maxDistance = TravelSource.BLOCK.getMaxDistanceTravelledSq();
-        TravelSource source = TravelController.instance.getTravelItemTravelSource(Minecraft.getMinecraft().thePlayer);
+        TravelSource source = TravelController.instance
+                .getTravelItemTravelSource(Minecraft.getMinecraft().thePlayer, false);
         if (source != null) {
             maxDistance = source.getMaxDistanceTravelledSq();
         }
@@ -101,20 +103,20 @@ public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer {
         GL11.glPushMatrix();
         GL11.glTranslated(x, y, z);
 
-        Tessellator.instance.startDrawingQuads();
+        tessellator.startDrawingQuads();
         renderBlock(tileentity.getWorldObj(), sf);
-        Tessellator.instance.draw();
+        tessellator.draw();
 
-        Tessellator.instance.startDrawingQuads();
-        Tessellator.instance.setBrightness(15 << 20 | 15 << 4);
+        tessellator.startDrawingQuads();
+        tessellator.setBrightness(15 << 20 | 15 << 4);
         if (TravelController.instance.isBlockSelected(bc)) {
-            Tessellator.instance.setColorRGBA_F(selectedColor.x, selectedColor.y, selectedColor.z, selectedColor.w);
-            CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(sf + 0.05, sf + 0.05, sf + 0.05), getSelectedIcon());
+            tessellator.setColorRGBA_F(selectedColor.x, selectedColor.y, selectedColor.z, selectedColor.w);
+            cr.render(BoundingBox.UNIT_CUBE.scale(sf + 0.05, sf + 0.05, sf + 0.05), getSelectedIcon());
         } else {
-            Tessellator.instance.setColorRGBA_F(highlightColor.x, highlightColor.y, highlightColor.z, highlightColor.w);
-            CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(sf + 0.05, sf + 0.05, sf + 0.05), getHighlightIcon());
+            tessellator.setColorRGBA_F(highlightColor.x, highlightColor.y, highlightColor.z, highlightColor.w);
+            cr.render(BoundingBox.UNIT_CUBE.scale(sf + 0.05, sf + 0.05, sf + 0.05), getHighlightIcon());
         }
-        Tessellator.instance.draw();
+        tessellator.draw();
         GL11.glPopMatrix();
 
         renderLabel(tileentity, x, y, z, ta, sf);
@@ -199,7 +201,7 @@ public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer {
 
     protected void renderBlock(IBlockAccess world, double sf) {
         Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.75f);
-        CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(sf, sf, sf), EnderIO.blockTravelPlatform.getIcon(0, 0));
+        CubeRenderer.get().render(BoundingBox.UNIT_CUBE.scale(sf, sf, sf), EnderIO.blockTravelPlatform.getIcon(0, 0));
     }
 
     public Vector4f getSelectedColor() {

src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java

@@ -3,6 +3,7 @@ package crazypants.enderio.teleport.packet;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.play.server.S12PacketEntityVelocity;
 import net.minecraftforge.common.MinecraftForge;
@@ -18,6 +19,7 @@ import crazypants.enderio.api.teleport.IItemOfTravel;
 import crazypants.enderio.api.teleport.TeleportEntityEvent;
 import crazypants.enderio.api.teleport.TravelSource;
 import crazypants.enderio.teleport.TravelController;
+import crazypants.util.BaublesUtil;
 import io.netty.buffer.ByteBuf;
 
 public class PacketTravelEvent implements IMessage, IMessageHandler<PacketTravelEvent, IMessage> {
@@ -128,18 +130,35 @@ public class PacketTravelEvent implements IMessage, IMessageHandler<PacketTravel
             if (conserveMotion) {
                 Vector3d velocityVex = Util.getLookVecEio(player);
                 S12PacketEntityVelocity p = new S12PacketEntityVelocity(
-                        toTp.getEntityId(),
+                        player.getEntityId(),
                         velocityVex.x,
                         velocityVex.y,
                         velocityVex.z);
                 ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(p);
             }
 
-            if (powerUse > 0 && player.getCurrentEquippedItem() != null
-                    && player.getCurrentEquippedItem().getItem() instanceof IItemOfTravel) {
-                ItemStack item = player.getCurrentEquippedItem().copy();
+            ItemStack travelItem = player.getCurrentEquippedItem();
+            int itemSlot = -1;
+            if (travelItem == null || travelItem.getItem() == null
+                    || !(travelItem.getItem() instanceof IItemOfTravel)) {
+                travelItem = TravelController.instance.findTravelItemInInventoryOrBaubles(player);
+                itemSlot = TravelController.instance.findTravelItemSlotInInventoryOrBaubles(player);
+            }
+            if (powerUse > 0 && travelItem != null && travelItem.getItem() instanceof IItemOfTravel) {
+                ItemStack item = travelItem.copy();
                 ((IItemOfTravel) item.getItem()).extractInternal(item, powerUse);
-                toTp.setCurrentItemOrArmor(0, item);
+                if (itemSlot == -1) {
+                    // Is held in players hand.
+                    player.setCurrentItemOrArmor(0, item);
+                } else if (itemSlot > -1) {
+                    // Greater than -1 is an inventory slot.
+                    player.inventory.setInventorySlotContents(itemSlot, item);
+                } else if (itemSlot < -1) {
+                    // Less than -1 is a bauble slot. Special calculation needed to determine ACTUAL Baubles slot
+                    int baubleSlot = Math.abs(itemSlot) - 2;
+                    IInventory baubles = BaublesUtil.instance().getBaubles(player);
+                    baubles.setInventorySlotContents(baubleSlot, item);
+                }
             }
         }
 

src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java

@@ -92,8 +92,9 @@ public class TelePadRenderer extends TechneModelRenderer {
 
     @Override
     public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
-        Tessellator.instance.startDrawingQuads();
-        CubeRenderer.render(block, metadata);
-        Tessellator.instance.draw();
+        final Tessellator tessellator = Tessellator.instance;
+        tessellator.startDrawingQuads();
+        CubeRenderer.get().render(block, metadata);
+        tessellator.draw();
     }
 }

src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java

@@ -82,7 +82,7 @@ public class TelePadSpecialRenderer extends TravelEntitySpecialRenderer {
     @Override
     protected void renderBlock(IBlockAccess world, double sf) {
         Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.75f);
-        CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(sf, sf, sf), EnderIO.blockTelePad.getHighlightIcon());
+        CubeRenderer.get().render(BoundingBox.UNIT_CUBE.scale(sf, sf, sf), EnderIO.blockTelePad.getHighlightIcon());
     }
 
     @Override

src/main/java/crazypants/enderio/waila/WailaCompat.java

@@ -140,30 +140,24 @@ public class WailaCompat implements IWailaDataProvider {
     @Override
     public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
         MovingObjectPosition pos = accessor.getPosition();
-        if (config.getConfig("facades.hidden")) {
-            if (accessor.getBlock() instanceof IFacade) {
-                // If facades are hidden, we need to ignore it
-                if (accessor.getTileEntity() instanceof IConduitBundle && ConduitUtil
-                        .isFacadeHidden((IConduitBundle) accessor.getTileEntity(), accessor.getPlayer())) {
-                    return null;
-                }
-                IFacade bundle = (IFacade) accessor.getBlock();
-                Block facade = bundle.getFacade(
-                        accessor.getWorld(),
+        if (config.getConfig("facades.hidden") && accessor.getBlock() instanceof IFacade) {
+            // If facades are hidden, we need to ignore it
+            if (accessor.getTileEntity() instanceof IConduitBundle
+                    && ConduitUtil.isFacadeHidden((IConduitBundle) accessor.getTileEntity(), accessor.getPlayer())) {
+                return null;
+            }
+            IFacade bundle = (IFacade) accessor.getBlock();
+            Block facade = bundle
+                    .getFacade(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, accessor.getSide().ordinal());
+            if (facade != accessor.getBlock()) {
+                ItemStack ret = facade.getPickBlock(
+                        pos,
+                        new WailaWorldWrapper(accessor.getWorld()),
                         pos.blockX,
                         pos.blockY,
                         pos.blockZ,
-                        accessor.getSide().ordinal());
-                if (facade != accessor.getBlock()) {
-                    ItemStack ret = facade.getPickBlock(
-                            pos,
-                            new WailaWorldWrapper(accessor.getWorld()),
-                            pos.blockX,
-                            pos.blockY,
-                            pos.blockZ,
-                            accessor.getPlayer());
-                    return ret;
-                }
+                        accessor.getPlayer());
+                return ret;
             }
         } else if (accessor.getBlock() instanceof BlockDarkSteelAnvil) {
             return accessor.getBlock().getPickBlock(

src/main/resources/assets/enderio/lang/en_US.lang

@@ -93,6 +93,11 @@ item.itemExistingItemFilter.tooltip.detailed.line5=content to the snapshot
 enderio.item.itemExistingItemFilter.filterUpdated=New items have been added to the snapshot
 enderio.item.itemExistingItemFilter.filterNotUpdated=The snapshot already covers all items in the inventory
 
+item.itemLimitedItemFilter.name=Limited Item Filter
+item.itemLimitedItemFilter.tooltip.basic.line1=Upgrade for item conduits
+item.itemLimitedItemFilter.tooltip.detailed.line1=Filters items based on
+item.itemLimitedItemFilter.tooltip.detailed.line2=their stack size
+
 item.itemModItemFilter.name=Mod Item Filter
 item.itemModItemFilter.tooltip.basic.line1=Upgrade for item conduits
 item.itemModItemFilter.tooltip.detailed.line1=Selects only items for a specified
@@ -726,6 +731,7 @@ item.itemTravelStaff.tooltip.detailed.line3=activated by R-Click
 item.itemTravelStaff.tooltip.detailed.line4=Shift-R-Click will teleport the
 item.itemTravelStaff.tooltip.detailed.line5=player a short distance
 enderio.itemTravelStaff.notEnoughPower=Not enough power
+enderio.travelStaffKeybind.isDisabled=Travel Staff Blink Keybind Disabled!
 
 item.itemTeleportStaff.name=Staff of Teleportation
 item.itemTeleportStaff.tooltip.detailed.line1=R-Click to teleport wherever you are looking
@@ -1386,6 +1392,7 @@ enderio.keybind.jump=Jump
 enderio.keybind.stepassist=Step Assist
 enderio.keybind.yetawrenchmode=Yeta Wrench Mode
 enderio.keybind.magnet=Toggle Electromagnet
+enderio.keybind.staffoftravelingtp=Travel Staff Blink
 enderio.nei.alloysmelter=Alloy Smelter
 enderio.nei.enchanter=Enchanter
 enderio.nei.sagmill=SAG Mill