update

[ci skip] upgraded build system
update bs+deps
2026-11-15 01:25:13 +00:00 · 2024-02-17 11:13:20 +01:00 · 2024-02-04 19:58:13 +00:00 · 2024-01-31 22:47:55 +01:00 · 2024-01-31 07:53:01 +01:00 · 2024-01-24 18:19:30 +01:00
71 changed files with 1452 additions and 1927 deletions
@@ -1,22 +1,22 @@
 // Add your dependencies here

 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.2.16:dev')
-    implementation('com.github.GTNewHorizons:ForestryMC:4.6.13:dev')
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.76-GTNH:dev')
-    implementation("com.github.GTNewHorizons:GTNHLib:0.0.13:dev")
-    api('com.github.GTNewHorizons:BuildCraft:7.1.36:dev')
+    api('com.github.GTNewHorizons:EnderCore:0.3.1:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:ForestryMC:4.8.2:dev')
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.5.18-GTNH:dev')
+    compileOnly("com.github.GTNewHorizons:GTNHLib:0.2.4: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.0:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-240-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.140:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.14.6:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.12.0-GTNH:api') {transitive = false}
-    implementation('com.github.GTNewHorizons:Chisel:2.11.3-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.12-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.7.0:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-323-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.70:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.15.5:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.13.3-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.13.4-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.6-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
@@ -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
-gradleTokenModId =
-gradleTokenModName =
+# 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 =
+
+# Name of the token containing the project's current version to generate/replace.
 gradleTokenVersion = GRADLETOKEN_VERSION
+
+# [DEPRECATED] Mod ID replacement token.
+gradleTokenModId =
+
+# [DEPRECATED] Mod name replacement token.
+gradleTokenModName =
+
+# [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 = EnderIO.java
+
+# 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, IC2/Player maven, 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
+
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -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
@@ -130,10 +131,13 @@ location of your Java installation."
    fi
 else
    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

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

 # Increase the maximum file descriptors if we can.
@@ -141,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
@@ -149,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
@@ -198,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" \
@@ -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

@@ -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.14'
 }

-blowdryerSetup {
-    repoSubfolder 'gtnhShared'
-    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.0')
-    //devLocal '.' // Use this when testing config updates locally
-}
+
@@ -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,7 +186,7 @@ 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 {

@@ -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();
@@ -788,7 +791,7 @@ public class EnderIO {
    @EventHandler
    public void loadComplete(FMLLoadCompleteEvent event) {
        processImc(FMLInterModComms.fetchRuntimeMessages(this)); // Some mods send IMCs during PostInit, so we catch
-                                                                 // them here.
+        // them here.
    }

    private static String getXPJuiceName() {
@@ -18,6 +18,7 @@ public enum ModObject {
    itemBasicFilterUpgrade,
    itemBigFilterUpgrade,
    itemExistingItemFilter,
+    itemLimitedItemFilter,
    itemModItemFilter,
    itemPowerItemFilter,
    itemExtractSpeedUpgrade,
@@ -94,11 +94,10 @@ public interface ITelePad extends ITravelAccessable {
    /**
     * Util method to set all coords using a {@link BlockCoord} object.
     *
+     * @param coords The coords to set this telepad to.
     * @see #setX(int)
     * @see #setY(int)
     * @see #setZ(int)
-     *
-     * @param coords The coords to set this telepad to.
     */
    void setCoords(BlockCoord coords);

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

-        TravelSource source = TravelController.instance.getTravelItemTravelSource(player);
+        TravelSource source = TravelController.instance.getTravelItemTravelSource(player, false);
        if (source == null) {
            return TravelSource.BLOCK.getMaxDistanceTravelledSq();
        } else {
@@ -88,7 +88,7 @@ public abstract class AbstractConduit implements IConduit {
     * If this is true, it will trigger a reconnection on the next Tick.
     * <p>
     * Use the method needUpdateConnections() instead of setting this to true.
-     * 
+     *
     * @see needUpdateConnections()
     */
    private boolean needUpdateConnections = false;
@@ -47,7 +47,13 @@ import crazypants.enderio.api.tool.ITool;
 import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType;
 import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.geom.ConduitConnectorType;
-import crazypants.enderio.conduit.gui.*;
+import crazypants.enderio.conduit.gui.ExternalConnectionContainer;
+import crazypants.enderio.conduit.gui.GuiExternalConnection;
+import crazypants.enderio.conduit.gui.GuiExternalConnectionSelector;
+import crazypants.enderio.conduit.gui.PacketFluidChannel;
+import crazypants.enderio.conduit.gui.PacketFluidFilter;
+import crazypants.enderio.conduit.gui.PacketOpenConduitUI;
+import crazypants.enderio.conduit.gui.PacketSlotVisibility;
 import crazypants.enderio.conduit.gui.item.PacketExistingItemFilterSnapshot;
 import crazypants.enderio.conduit.gui.item.PacketModItemFilter;
 import crazypants.enderio.conduit.liquid.PacketFluidLevel;
@@ -635,8 +641,8 @@ public class BlockConduitBundle extends BlockEio

    @Override
    public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player) {
-        ItemStack equipped = player.getCurrentEquippedItem();
-        if (!player.isSneaking() || equipped == null || equipped.getItem() != EnderIO.itemYetaWench) {
+        ITool tool = ToolUtil.getEquippedTool(player);
+        if (!player.isSneaking() || tool == null || !tool.canUse(player.getCurrentEquippedItem(), player, x, y, z)) {
            return;
        }
        ConduitUtil.openConduitGui(world, x, y, z, player);
@@ -1,6 +1,15 @@
 package crazypants.enderio.conduit;

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

 import java.util.List;

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

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

 import net.minecraft.init.Blocks;
@@ -590,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);

@@ -92,7 +92,7 @@ public class ConduitUtil {
            }
        }
        if (con.getNetwork() != null) { // this should have been destroyed when destroying the neighbours network but
-                                        // lets just make
+            // lets just make
            // sure
            con.getNetwork().destroyNetwork();
        }
@@ -50,7 +50,6 @@ import crazypants.enderio.conduit.power.IPowerConduit;
 import crazypants.enderio.conduit.redstone.IRedstoneConduit;
 import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit;
 import crazypants.enderio.config.Config;
-import li.cil.oc.api.network.*;
 import li.cil.oc.api.network.Message;
 import li.cil.oc.api.network.Node;
 import mekanism.api.gas.Gas;
@@ -1,6 +1,7 @@
 package crazypants.enderio.conduit.gui;

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

 import javax.annotation.Nonnull;
@@ -1,6 +1,6 @@
 package crazypants.enderio.conduit.gui.item;

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

 import javax.annotation.Nonnull;

@@ -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") };
+        }
+    }
+}
@@ -612,8 +612,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {

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

    @Override
@@ -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;
            }
        }
@@ -30,7 +30,7 @@ public interface IItemFilter {

    /**
     * Checks if the given item passes the filter or not.
-     * 
+     *
     * @param inv  the attached inventory - or null when used without an inventory (eg for a GUI)
     * @param item the item to check
     * @return true if the item is allowed to pass
@@ -41,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() {
@@ -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,8 +164,9 @@ public class ItemFilter implements IInventory, IItemFilter {
        return false;
    }

-    private boolean isNBTMatch(ItemStack filter, ItemStack item) {
-        if (filter.stackTagCompound == null && item.stackTagCompound == null) return true;
+    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;
        if (!filter.getTagCompound().hasKey("GEN")) return filter.stackTagCompound.equals(item.stackTagCompound);
        NBTTagCompound filterTag = (NBTTagCompound) filter.getTagCompound().copy();
@@ -202,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;
@@ -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];
+        }
+    }
+}
@@ -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"));
+            }
+        }
+    }
+}
@@ -13,7 +13,6 @@ import crazypants.enderio.EnderIOTab;
 import crazypants.enderio.ModObject;

 /**
- *
 * @author matthias
 */
 public class ItemPowerItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider {
@@ -19,7 +19,6 @@ import crazypants.enderio.conduit.item.NetworkedInventory;
 import io.netty.buffer.ByteBuf;

 /**
- *
 * @author matthias
 */
 public class PowerItemFilter implements IItemFilter {
@@ -157,11 +157,11 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I
        boolean res;
        if (mode == RedstoneControlMode.OFF) {
            // if checking for no signal, must be no signal from both
-            res = mode.isConditionMet(mode, signal)
+            res = RedstoneControlMode.isConditionMet(mode, signal)
                    && (col != DyeColor.RED || isConditionMetByExternalSignal(dir, mode, col));
        } else {
            // if checking for a signal, either is fine
-            res = mode.isConditionMet(mode, signal)
+            res = RedstoneControlMode.isConditionMet(mode, signal)
                    || (col == DyeColor.RED && isConditionMetByExternalSignal(dir, mode, col));
        }
        return res;
@@ -180,7 +180,12 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I
            }
        }

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

    @Override
@@ -1,6 +1,10 @@
 package crazypants.enderio.conduit.liquid;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;

 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
@@ -1,7 +1,5 @@
 package crazypants.enderio.conduit.liquid;

-import static com.enderio.core.client.render.CubeRenderer.*;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -19,6 +17,7 @@ import net.minecraftforge.fluids.Fluid;
 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.util.ForgeDirectionOffsets;
 import com.enderio.core.common.vecmath.Vector2f;
@@ -96,12 +95,12 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
            List<Vertex> corners = component.bound
                    .getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV());
            for (Vertex c : corners) {
-                addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                CubeRenderer.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
            }
            // back face
            for (int i = corners.size() - 1; i >= 0; i--) {
                Vertex c = corners.get(i);
-                addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                CubeRenderer.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
            }
        }
    }
@@ -304,7 +303,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
        float transY = (bound.sizeY() - sizeY) / 2;

        Vector3d translation = new Vector3d(0, transY, 0);
-        setupVertices(bound.translate(translation));
+        CubeRenderer.setupVertices(bound.translate(translation));
    }

    private void calculateRatios(LiquidConduit conduit) {
@@ -1,7 +1,14 @@
 package crazypants.enderio.conduit.render;

-import static com.enderio.core.client.render.CubeRenderer.*;
-import static net.minecraftforge.common.util.ForgeDirection.*;
+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;
+import static net.minecraftforge.common.util.ForgeDirection.SOUTH;
+import static net.minecraftforge.common.util.ForgeDirection.UP;
+import static net.minecraftforge.common.util.ForgeDirection.WEST;

 import java.util.Collection;
 import java.util.List;
@@ -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
@@ -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
@@ -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;
    }
@@ -1,8 +1,13 @@
 package crazypants.enderio.item;

-import static crazypants.enderio.material.Alloy.*;
+import static crazypants.enderio.material.Alloy.CONDUCTIVE_IRON;
+import static crazypants.enderio.material.Alloy.DARK_STEEL;
+import static crazypants.enderio.material.Alloy.ELECTRICAL_STEEL;
+import static crazypants.enderio.material.Alloy.END_STEEL;
+import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY;
+import static crazypants.enderio.material.Alloy.SOULARIUM;
 import static crazypants.enderio.material.Material.VIBRANT_CYSTAL;
-import static crazypants.enderio.material.endergy.AlloyEndergy.*;
+import static crazypants.enderio.material.endergy.AlloyEndergy.STELLAR_ALLOY;
 import static crazypants.util.RecipeUtil.addShaped;

 import net.minecraft.init.Blocks;
@@ -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;
@@ -333,7 +333,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe

    @Override
    public int canExtractInternal(ItemStack equipped, int power) {
-        return extractEnergy(equipped, power, true);
+        return Math.min(getEnergyStored(equipped), power);
    }

    private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) {
@@ -396,7 +396,7 @@ public class ItemDarkSteelSword extends ItemSword

    @Override
    public int canExtractInternal(ItemStack equipped, int power) {
-        return extractEnergy(equipped, power, true);
+        return Math.min(getEnergyStored(equipped), power);
    }

    private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) {
@@ -489,11 +489,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio
        if (stack == null || stack.stackTagCompound == null) {
            return;
        }
-        NBTTagCompound root = stack.stackTagCompound;
-        if (!root.hasKey("eio.abstractMachine")) {
-            return;
-        }
-        readCommon(root);
+        readCommon(stack.stackTagCompound);
    }

    @Override
@@ -41,9 +41,9 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, II
    private CustomCubeRenderer ccr = new CustomCubeRenderer();

    private PaintedBlockRenderer paintedRenderer = new PaintedBlockRenderer(this.getRenderId(), null); // passthrough
-                                                                                                       // renderer for
-                                                                                                       // paintable
-                                                                                                       // machines
+    // renderer for
+    // paintable
+    // machines

    @Override
    public boolean handleRenderType(ItemStack item, ItemRenderType type) {
@@ -9,7 +9,10 @@ import com.enderio.core.common.vecmath.VecmathUtil;

 import crazypants.enderio.EnderIO;
 import crazypants.enderio.network.PacketHandler;
-import crazypants.enderio.power.*;
+import crazypants.enderio.power.Capacitors;
+import crazypants.enderio.power.ICapacitor;
+import crazypants.enderio.power.IInternalPoweredTile;
+import crazypants.enderio.power.PowerHandlerUtil;

 public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile {

@@ -12,7 +12,6 @@ import crazypants.enderio.machine.recipe.RecipeBonusType;
 * progress' recipe for a machine is stored to and retrieved from a machines TileEntity soley based on its UID.
 *
 * @author cp
- *
 */
 public interface IMachineRecipe {

@@ -50,7 +49,7 @@ public interface IMachineRecipe {
    /**
     * Returns the output from a single 'cycle' of the recipe (even if the inputs would allow the recipe to be crafted
     * several times).
-     *
+     * <p>
     * This method must not return null. If no output is generated an empty array should be returned.
     *
     * @param randomChance a random number to be used as a seed for determining whether '% chance' outputs are returned.
@@ -1,9 +1,19 @@
 package crazypants.enderio.machine;

 import static crazypants.enderio.EnderIO.itemBasicCapacitor;
-import static crazypants.enderio.material.Alloy.*;
-import static crazypants.enderio.material.Material.*;
-import static crazypants.util.RecipeUtil.*;
+import static crazypants.enderio.material.Alloy.DARK_STEEL;
+import static crazypants.enderio.material.Alloy.ELECTRICAL_STEEL;
+import static crazypants.enderio.material.Alloy.END_STEEL;
+import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY;
+import static crazypants.enderio.material.Alloy.PHASED_GOLD;
+import static crazypants.enderio.material.Alloy.PHASED_IRON;
+import static crazypants.enderio.material.Alloy.REDSTONE_ALLOY;
+import static crazypants.enderio.material.Alloy.SOULARIUM;
+import static crazypants.enderio.material.Material.CONDUIT_BINDER;
+import static crazypants.enderio.material.Material.ENDER_CRYSTAL;
+import static crazypants.enderio.material.Material.PULSATING_CYSTAL;
+import static crazypants.enderio.material.Material.SILICON;
+import static crazypants.enderio.material.Material.VIBRANT_CYSTAL;

 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -24,6 +34,7 @@ import crazypants.enderio.material.FrankenSkull;
 import crazypants.enderio.material.MachinePart;
 import crazypants.enderio.material.Material;
 import crazypants.enderio.power.Capacitors;
+import crazypants.util.RecipeUtil;

 public class MachineRecipes {

@@ -62,13 +73,24 @@ public class MachineRecipes {
        String silicon = SILICON.oreDict;

        if (Config.addPeacefulRecipes) {
-            addShaped(frankenZombie, "gdg", "dzd", "gdg", 'g', "ingotGold", 'd', "gemDiamond", 'z', zombieController);
-            addShaped(sentientEnder, "ddd", "ded", "dgd", 'g', "blockGold", 'd', "gemDiamond", 'e', enderRes);
+            RecipeUtil.addShaped(
+                    frankenZombie,
+                    "gdg",
+                    "dzd",
+                    "gdg",
+                    'g',
+                    "ingotGold",
+                    'd',
+                    "gemDiamond",
+                    'z',
+                    zombieController);
+            RecipeUtil
+                    .addShaped(sentientEnder, "ddd", "ded", "dgd", 'g', "blockGold", 'd', "gemDiamond", 'e', enderRes);
        }

        // stirling gen
        ItemStack stirlingGen = new ItemStack(EnderIO.blockStirlingGenerator, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                stirlingGen,
                "bbb",
                "bfb",
@@ -85,7 +107,7 @@ public class MachineRecipes {
        // Combustion Gen
        ItemStack res = new ItemStack(EnderIO.blockTank, 1, 0);
        ItemStack comGen = new ItemStack(EnderIO.blockCombustionGenerator, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                comGen,
                "eee",
                "rmr",
@@ -103,7 +125,7 @@ public class MachineRecipes {

        // ZombieGen
        ItemStack zg = new ItemStack(EnderIO.blockZombieGenerator, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                zg,
                "eee",
                "qzq",
@@ -117,7 +139,7 @@ public class MachineRecipes {

        // FrankenzombieGen
        ItemStack fg = new ItemStack(EnderIO.blockFrankenZombieGenerator, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                fg,
                "eee",
                "qzq",
@@ -131,7 +153,7 @@ public class MachineRecipes {

        // EnderGen
        ItemStack eg = new ItemStack(EnderIO.blockEnderGenerator, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                eg,
                "eee",
                "qzq",
@@ -145,17 +167,18 @@ public class MachineRecipes {

        // KillerJoe
        ItemStack kj = new ItemStack(EnderIO.blockKillerJoe, 1, 0);
-        addShaped(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', frankenZombie);
+        RecipeUtil.addShaped(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', frankenZombie);

        // Wireless charger
        ItemStack wirelessCharger = new ItemStack(EnderIO.blockWirelessCharger);
        // addShaped(wirelessCharger, "svs", "imi", "scs", 's', electricSteel, 'i', silicon, 'm', machineChassi, 'c',
        // capacitor3, 'v', vibCry);
-        addShaped(wirelessCharger, "sss", "ses", "scs", 's', electricalSteel, 'c', capacitor3, 'e', enderRes);
+        RecipeUtil
+                .addShaped(wirelessCharger, "sss", "ses", "scs", 's', electricalSteel, 'c', capacitor3, 'e', enderRes);

        // Crafter
        ItemStack crafter = new ItemStack(EnderIO.blockCrafter, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                crafter,
                "iti",
                "imi",
@@ -177,7 +200,7 @@ public class MachineRecipes {
        } else {
            zombieBit = zombieController;
        }
-        addShaped(
+        RecipeUtil.addShaped(
                poweredSpawner,
                "ese",
                "eme",
@@ -202,15 +225,16 @@ public class MachineRecipes {
            } else {
                glassSides = "glass";
            }
-            addShaped(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz);
+            RecipeUtil
+                    .addShaped(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz);
        }

        // Tanks
        ItemStack basicTank = new ItemStack(EnderIO.blockTank, 1, 0);
-        addShaped(basicTank, "ibi", "bgb", "ibi", 'g', "glass", 'i', "ingotIron", 'b', Blocks.iron_bars);
+        RecipeUtil.addShaped(basicTank, "ibi", "bgb", "ibi", 'g', "glass", 'i', "ingotIron", 'b', Blocks.iron_bars);

        ItemStack advTank = new ItemStack(EnderIO.blockTank, 1, 1);
-        addShaped(
+        RecipeUtil.addShaped(
                advTank,
                "ibi",
                "bgb",
@@ -225,7 +249,7 @@ public class MachineRecipes {
        // mill
        ItemStack crusher = new ItemStack(EnderIO.blockCrusher, 1, 0);
        if (Config.useHardRecipes) {
-            addShaped(
+            RecipeUtil.addShaped(
                    crusher,
                    "ooo",
                    "fmf",
@@ -241,7 +265,7 @@ public class MachineRecipes {
                    'o',
                    Blocks.obsidian);
        } else {
-            addShaped(
+            RecipeUtil.addShaped(
                    crusher,
                    "fff",
                    "imi",
@@ -259,7 +283,7 @@ public class MachineRecipes {
        // alloy smelter
        ItemStack alloySmelter = new ItemStack(EnderIO.blockAlloySmelter, 1, 0);
        if (Config.useHardRecipes) {
-            addShaped(
+            RecipeUtil.addShaped(
                    alloySmelter,
                    "bfb",
                    "fmf",
@@ -273,7 +297,7 @@ public class MachineRecipes {
                    'f',
                    Blocks.furnace);
        } else {
-            addShaped(
+            RecipeUtil.addShaped(
                    alloySmelter,
                    "bfb",
                    "fmf",
@@ -290,7 +314,7 @@ public class MachineRecipes {

        // Vat
        ItemStack still = new ItemStack(EnderIO.blockVat, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                still,
                "eve",
                "tmt",
@@ -310,13 +334,14 @@ public class MachineRecipes {

        ItemStack capBank1 = BlockItemCapBank
                .createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.SIMPLE), 0);
-        addShaped(capBank1, "bcb", "cmc", "bcb", 'b', "ingotIron", 'c', capacitor, 'm', "blockRedstone");
+        RecipeUtil.addShaped(capBank1, "bcb", "cmc", "bcb", 'b', "ingotIron", 'c', capacitor, 'm', "blockRedstone");
        ItemStack capBank2 = BlockItemCapBank
                .createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.ACTIVATED), 0);
-        addShaped(capBank2, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor2, 'm', "blockRedstone");
+        RecipeUtil
+                .addShaped(capBank2, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor2, 'm', "blockRedstone");
        ItemStack capBank3 = BlockItemCapBank
                .createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.VIBRANT), 0);
-        addShaped(capBank3, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor3, 'm', vibCry);
+        RecipeUtil.addShaped(capBank3, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor3, 'm', vibCry);

        ConvertOldRecipe convertRecipe = new ConvertOldRecipe();
        GameRegistry.addRecipe(convertRecipe);
@@ -351,7 +376,7 @@ public class MachineRecipes {
        // painter
        ItemStack painter = new ItemStack(EnderIO.blockPainter, 1, 0);
        if (Config.useHardRecipes) {
-            addShaped(
+            RecipeUtil.addShaped(
                    painter,
                    "qqq",
                    "mdm",
@@ -367,7 +392,7 @@ public class MachineRecipes {
                    'd',
                    "gemDiamond");
        } else {
-            addShaped(
+            RecipeUtil.addShaped(
                    painter,
                    "qdq",
                    "mMm",
@@ -391,7 +416,7 @@ public class MachineRecipes {
        } else {
            zombieBit = zombieController;
        }
-        addShaped(
+        RecipeUtil.addShaped(
                farm,
                "ehe",
                "eme",
@@ -411,7 +436,7 @@ public class MachineRecipes {
            // transceiver
            ItemStack transceiver = new ItemStack(EnderIO.blockTransceiver, 1, 0);
            if (Config.transceiverUseEasyRecipe) {
-                addShaped(
+                RecipeUtil.addShaped(
                        transceiver,
                        "oeo",
                        "pdp",
@@ -427,7 +452,7 @@ public class MachineRecipes {
                        'd',
                        Items.diamond);
            } else {
-                addShaped(
+                RecipeUtil.addShaped(
                        transceiver,
                        "oeo",
                        "pdp",
@@ -442,7 +467,7 @@ public class MachineRecipes {
                        fusedQuartz,
                        'd',
                        endCry);
-                addShapeless(transceiver, new ItemStack(EnderIO.blockHyperCube, 1, 0));
+                RecipeUtil.addShapeless(transceiver, new ItemStack(EnderIO.blockHyperCube, 1, 0));
            }
        }

@@ -454,7 +479,7 @@ public class MachineRecipes {
            ItemStack vibSolarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 2);

            if (Config.useHardRecipes) {
-                addShaped(
+                RecipeUtil.addShaped(
                        solarPanel,
                        "efe",
                        "pfp",
@@ -469,7 +494,7 @@ public class MachineRecipes {
                        energeticAlloy,
                        'p',
                        phasedGold);
-                addShaped(
+                RecipeUtil.addShaped(
                        advSolarPanel,
                        "efe",
                        "pfp",
@@ -484,7 +509,7 @@ public class MachineRecipes {
                        phasedIron,
                        'p',
                        phasedGold);
-                addShaped(
+                RecipeUtil.addShaped(
                        vibSolarPanel,
                        "efe",
                        "pfp",
@@ -500,7 +525,7 @@ public class MachineRecipes {
                        'p',
                        phasedGold);
            } else {
-                addShaped(
+                RecipeUtil.addShaped(
                        solarPanel,
                        "efe",
                        "pfp",
@@ -515,7 +540,7 @@ public class MachineRecipes {
                        energeticAlloy,
                        'c',
                        redstoneAlloy);
-                addShaped(
+                RecipeUtil.addShaped(
                        advSolarPanel,
                        "efe",
                        "pfp",
@@ -530,7 +555,7 @@ public class MachineRecipes {
                        phasedIron,
                        'c',
                        electricalSteel);
-                addShaped(
+                RecipeUtil.addShaped(
                        vibSolarPanel,
                        "efe",
                        "pfp",
@@ -553,7 +578,7 @@ public class MachineRecipes {
        ItemStack powerConduit = new ItemStack(EnderIO.itemPowerConduit, 1, 0);
        ItemStack redstoneConduit = new ItemStack(EnderIO.itemRedstoneConduit, 1, 2);
        ItemStack mJMonitor = new ItemStack(EnderIO.blockPowerMonitor, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                mJMonitor,
                "sms",
                "sMs",
@@ -571,11 +596,11 @@ public class MachineRecipes {

        // Enchanter
        ItemStack enchanter = new ItemStack(EnderIO.blockEnchanter);
-        addShaped(enchanter, "dbd", "sss", " s ", 'd', "gemDiamond", 'b', Items.book, 's', darkSteel);
+        RecipeUtil.addShaped(enchanter, "dbd", "sss", " s ", 'd', "gemDiamond", 'b', Items.book, 's', darkSteel);

        // Vacuum Chest
        ItemStack vacuumChest = new ItemStack(EnderIO.blockVacuumChest);
-        addShaped(vacuumChest, "iii", "ici", "ipi", 'i', "ingotIron", 'c', "chestWood", 'p', pulCry);
+        RecipeUtil.addShaped(vacuumChest, "iii", "ici", "ipi", 'i', "ingotIron", 'c', "chestWood", 'p', pulCry);

        // Soul Binder
        Object enderBit;
@@ -588,7 +613,7 @@ public class MachineRecipes {
        ItemStack zombieSkull = new ItemStack(Items.skull, 1, 4);
        ItemStack skeletonSkull = new ItemStack(Items.skull, 1, 0);
        ItemStack soulBinder = new ItemStack(EnderIO.blockSoulFuser);
-        addShaped(
+        RecipeUtil.addShaped(
                soulBinder,
                "ses",
                "zmc",
@@ -609,7 +634,7 @@ public class MachineRecipes {
        // Attractor
        ItemStack attractor = new ItemStack(EnderIO.blockAttractor);
        ItemStack attractorCrystal = new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal());
-        addShaped(
+        RecipeUtil.addShaped(
                attractor,
                " c ",
                "ese",
@@ -629,7 +654,7 @@ public class MachineRecipes {
                EnderIO.blockEndermanSkull,
                1,
                BlockEndermanSkull.SkullType.TORMENTED.ordinal());
-        addShaped(
+        RecipeUtil.addShaped(
                aversion,
                " c ",
                "ese",
@@ -646,12 +671,12 @@ public class MachineRecipes {
        // Experience
        ItemStack xp = new ItemStack(EnderIO.blockExperianceOblisk);
        ItemStack xpItem = new ItemStack(EnderIO.itemXpTransfer);
-        addShaped(xp, " x ", " s ", "sms", 's', soularium, 'm', machineChassi, 'x', xpItem);
+        RecipeUtil.addShaped(xp, " x ", " s ", "sms", 's', soularium, 'm', machineChassi, 'x', xpItem);

        // Weather
        ItemStack weather = new ItemStack(EnderIO.blockWeatherObelisk);
        ItemStack weatherItem = new ItemStack(EnderIO.itemMaterial, 1, Material.WEATHER_CRYSTAL.ordinal());
-        addShaped(
+        RecipeUtil.addShaped(
                weather,
                " x ",
                "ese",
@@ -686,14 +711,14 @@ public class MachineRecipes {
                EnderIO.blockElectricLight,
                1,
                BlockItemElectricLight.Type.WIRELESS_INV.ordinal());
-        addShapeless(wirelessLamp, poweredLamp, enderRes);
-        addShapeless(wirelessLamp, wirelessLampInv, Blocks.redstone_torch);
-        addShapeless(wirelessLampInv, poweredLampInv, enderRes);
-        addShapeless(wirelessLampInv, wirelessLamp, Blocks.redstone_torch);
+        RecipeUtil.addShapeless(wirelessLamp, poweredLamp, enderRes);
+        RecipeUtil.addShapeless(wirelessLamp, wirelessLampInv, Blocks.redstone_torch);
+        RecipeUtil.addShapeless(wirelessLampInv, poweredLampInv, enderRes);
+        RecipeUtil.addShapeless(wirelessLampInv, wirelessLamp, Blocks.redstone_torch);

        // inventory panel
        ItemStack awareness = new ItemStack(EnderIO.itemFunctionUpgrade, 1, FunctionUpgrade.INVENTORY_PANEL.ordinal());
-        addShaped(
+        RecipeUtil.addShaped(
                awareness,
                "bsb",
                "ses",
@@ -707,7 +732,7 @@ public class MachineRecipes {
                'i',
                electricalSteel);
        ItemStack invPanel = new ItemStack(EnderIO.blockInventoryPanel);
-        addShaped(
+        RecipeUtil.addShaped(
                invPanel,
                "dad",
                "psp",
@@ -727,7 +752,7 @@ public class MachineRecipes {

        // powered light
        if (Config.useHardRecipes) {
-            addShaped(
+            RecipeUtil.addShaped(
                    poweredLamp,
                    "ggg",
                    "sds",
@@ -741,7 +766,7 @@ public class MachineRecipes {
                    'c',
                    capacitor);
        } else {
-            addShaped(
+            RecipeUtil.addShaped(
                    poweredLamp,
                    "ggg",
                    "sds",
@@ -756,19 +781,19 @@ public class MachineRecipes {
                    capacitor);
        }
        ItemStack invPoweredLamp = new ItemStack(EnderIO.blockElectricLight, 1, 1);
-        addShapeless(invPoweredLamp, poweredLamp, Blocks.redstone_torch);
-        addShapeless(poweredLamp, invPoweredLamp, Blocks.redstone_torch);
+        RecipeUtil.addShapeless(invPoweredLamp, poweredLamp, Blocks.redstone_torch);
+        RecipeUtil.addShapeless(poweredLamp, invPoweredLamp, Blocks.redstone_torch);

        // light
        ItemStack lamp = new ItemStack(EnderIO.blockElectricLight, 1, 2);
-        addShaped(lamp, "   ", "ggg", "isi", 'g', "glass", 's', "glowstone", 'i', "ingotIron");
+        RecipeUtil.addShaped(lamp, "   ", "ggg", "isi", 'g', "glass", 's', "glowstone", 'i', "ingotIron");
        ItemStack invLamp = new ItemStack(EnderIO.blockElectricLight, 1, 3);
-        addShapeless(invLamp, lamp, Blocks.redstone_torch);
-        addShapeless(lamp, invLamp, Blocks.redstone_torch);
+        RecipeUtil.addShapeless(invLamp, lamp, Blocks.redstone_torch);
+        RecipeUtil.addShapeless(lamp, invLamp, Blocks.redstone_torch);

        // MJ Reader

-        addShaped(
+        RecipeUtil.addShaped(
                mJReader,
                "epe",
                "gcg",
@@ -788,7 +813,7 @@ public class MachineRecipes {

        // Slice'N'Splice
        ItemStack sns = new ItemStack(EnderIO.blockSliceAndSplice);
-        addShaped(
+        RecipeUtil.addShaped(
                sns,
                "iki",
                "ams",
@@ -808,8 +833,28 @@ public class MachineRecipes {
        ItemStack itemBuffer = Type.getStack(Type.ITEM);
        ItemStack powerBuffer = Type.getStack(Type.POWER);
        ItemStack omniBuffer = Type.getStack(Type.OMNI);
-        addShaped(itemBuffer, "isi", "scs", "isi", 'i', "ingotIron", 's', "ingotElectricalSteel", 'c', "chestWood");
-        addShaped(powerBuffer, "isi", "sfs", "isi", 'i', "ingotIron", 's', "ingotElectricalSteel", 'f', machineChassis);
-        addShapeless(omniBuffer, itemBuffer, powerBuffer);
+        RecipeUtil.addShaped(
+                itemBuffer,
+                "isi",
+                "scs",
+                "isi",
+                'i',
+                "ingotIron",
+                's',
+                "ingotElectricalSteel",
+                'c',
+                "chestWood");
+        RecipeUtil.addShaped(
+                powerBuffer,
+                "isi",
+                "sfs",
+                "isi",
+                'i',
+                "ingotIron",
+                's',
+                "ingotElectricalSteel",
+                'f',
+                machineChassis);
+        RecipeUtil.addShapeless(omniBuffer, itemBuffer, powerBuffer);
    }
 }
@@ -4,13 +4,20 @@ import java.util.HashMap;
 import java.util.Map;

 import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.WorldEvent;

+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import crazypants.enderio.machine.capbank.TileCapBank;

 public class ClientNetworkManager {

    private static final ClientNetworkManager instance = new ClientNetworkManager();

+    static {
+        MinecraftForge.EVENT_BUS.register(instance);
+    }
+
    public static ClientNetworkManager getInstance() {
        return instance;
    }
@@ -53,4 +60,12 @@ public class ClientNetworkManager {
        CapBankClientNetwork network = getOrCreateNetwork(id);
        network.addMember(tileCapBank);
    }
+
+    @SubscribeEvent
+    public void onWorldUnload(WorldEvent.Unload event) {
+        if (event.world.isRemote) {
+            networks.forEach((id, network) -> network.destroyNetwork());
+            networks.clear();
+        }
+    }
 }
@@ -20,7 +20,6 @@ import crazypants.enderio.Log;

 /**
 * This is not in the FakePlayer hierarchy for reasons.
- *
 */
 public class FakeFarmPlayer extends EntityPlayerMP {

@@ -1,6 +1,8 @@
 package crazypants.enderio.machine.farm;

-import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL11.GL_LIGHTING;
+import static org.lwjgl.opengl.GL11.glDisable;
+import static org.lwjgl.opengl.GL11.glEnable;

 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
@@ -120,7 +120,6 @@ public enum Fertilizer {
    /**
     * Returns the singleton instance for the fertilizer that was given as parameter. If the given item is no
     * fertilizer, it will return an instance of Fertilizer.None.
-     *
     */
    public static Fertilizer getInstance(ItemStack stack) {
        for (Fertilizer fertilizer : validFertilizers) {
@@ -144,7 +143,7 @@ public enum Fertilizer {

    /**
     * Tries to apply the given item on the given block using the type-specific method. SFX is played on success.
-     *
+     * <p>
     * If the item was successfully applied, the stacksize will be decreased if appropriate. The caller will need to
     * check for stacksize 0 and null the inventory slot if needed.
     *
@@ -37,7 +37,7 @@ public class NaturaBerryFarmer extends PickableFarmer {
            block = farm.getBlock(checkBlock);

            if (super.canHarvest(farm, bc, block, meta)) { // redundant check because our canHarvest checks all 5 blocks
-                                                           // so a bush may be invalid in
+                // so a bush may be invalid in
                // the stack of 5
                IHarvestResult blockRes = super.harvestBlock(farm, checkBlock, block, meta);

@@ -301,7 +301,7 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH

    /**
     * This is called by PacketUpdateExtractionDisabled on the client side
-     * 
+     *
     * @param extractionDisabled if extraction is disabled
     */
    void updateExtractionDisabled(boolean extractionDisabled) {
@@ -1,6 +1,14 @@
 package crazypants.enderio.machine.obelisk;

-import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL11.GL_ALL_ATTRIB_BITS;
+import static org.lwjgl.opengl.GL11.glDepthMask;
+import static org.lwjgl.opengl.GL11.glPopAttrib;
+import static org.lwjgl.opengl.GL11.glPopMatrix;
+import static org.lwjgl.opengl.GL11.glPushAttrib;
+import static org.lwjgl.opengl.GL11.glPushMatrix;
+import static org.lwjgl.opengl.GL11.glRotatef;
+import static org.lwjgl.opengl.GL11.glScalef;
+import static org.lwjgl.opengl.GL11.glTranslated;

 import java.util.Random;

@@ -106,7 +114,7 @@ public class ObeliskSpecialRenderer<T extends TileEntity> extends TileEntitySpec

    protected void renderItemStack(T te, World world, double x, double y, double z, float tick) {
        if (ei == null) {
-            ei = new EntityItem(world, 0, 0, 0, getFloatingItem(te));
+            ei = new EntityItem(null, 0, 0, 0, getFloatingItem(te));
        }

        ei.setEntityItemStack(getFloatingItem(te));
@@ -151,7 +151,7 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx

    /**
     * Computes the required amount of XP to start the current recipe.
-     * 
+     *
     * @return 0 if no XP is required, negative when more than required XP is stored.
     */
    private int getXPRequired() {
@@ -71,14 +71,12 @@ public class BlockItemTank extends ItemBlockWithMetadata implements IAdvancedToo
        EnderIO.blockTank.addDetailedEntries(itemstack, entityplayer, list, flag);
    }

-    private static final FluidTank dummy = new SmartTank(FluidRegistry.WATER, 16000);
-
    private FluidTank loadTank(ItemStack stack) {
        if (stack.hasTagCompound()) {
            FluidTank tank = TileTank.loadTank(stack.getTagCompound());
-            return tank != null ? tank : dummy;
+            return tank != null ? tank : new SmartTank(FluidRegistry.WATER, 16000);
        }
-        return dummy;
+        return new SmartTank(FluidRegistry.WATER, 16000);
    }

    private void saveTank(ItemStack stack, FluidTank tank) {
@@ -1,11 +1,28 @@
 package crazypants.enderio.material;

-import static com.enderio.core.common.util.OreDictionaryHelper.*;
-import static crazypants.enderio.material.Alloy.*;
-import static crazypants.enderio.material.Material.*;
-import static crazypants.enderio.material.endergy.AlloyEndergy.*;
-import static crazypants.enderio.power.Capacitors.*;
-import static crazypants.util.RecipeUtil.*;
+import static crazypants.enderio.material.Alloy.DARK_STEEL;
+import static crazypants.enderio.material.Alloy.END_STEEL;
+import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY;
+import static crazypants.enderio.material.Alloy.PHASED_GOLD;
+import static crazypants.enderio.material.Alloy.PHASED_IRON;
+import static crazypants.enderio.material.Alloy.SOULARIUM;
+import static crazypants.enderio.material.Material.BINDER_COMPOSITE;
+import static crazypants.enderio.material.Material.CONDUIT_BINDER;
+import static crazypants.enderio.material.Material.PRECIENT_CRYSTAL;
+import static crazypants.enderio.material.endergy.AlloyEndergy.CRYSTALLINE_ALLOY;
+import static crazypants.enderio.material.endergy.AlloyEndergy.ENERGETIC_SILVER;
+import static crazypants.enderio.material.endergy.AlloyEndergy.MELODIC_ALLOY;
+import static crazypants.enderio.material.endergy.AlloyEndergy.STELLAR_ALLOY;
+import static crazypants.enderio.material.endergy.AlloyEndergy.VIVID_ALLOY;
+import static crazypants.enderio.power.Capacitors.ACTIVATED_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.BASIC_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.CRYSTALLINE_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.ENDERGETIC_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.ENDERGISED_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.ENDER_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.MELODIC_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.SILVER_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.STELLAR_CAPACITOR;

 import java.util.ArrayList;

@@ -23,6 +40,7 @@ import crazypants.enderio.config.Config;
 import crazypants.enderio.item.ItemEnderFood.EnderFood;
 import crazypants.enderio.material.endergy.AlloyEndergy;
 import crazypants.enderio.power.Capacitors;
+import crazypants.util.RecipeUtil;

 public class MaterialRecipes {

@@ -63,7 +81,7 @@ public class MaterialRecipes {
                    // Allow free conversion of additional/legacy oreDict name items into
                    // our item because we only register recipes for the primary oreDict
                    // name. Use a 2-to-2 recipe because the 1-to-n is already in use.
-                    addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName);
+                    RecipeUtil.addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName);
                }
            }
            isPrimaryName = true;
@@ -72,7 +90,7 @@ public class MaterialRecipes {
                if (isPrimaryName) {
                    isPrimaryName = false;
                } else {
-                    addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName);
+                    RecipeUtil.addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName);
                }
            }
        }
@@ -87,7 +105,7 @@ public class MaterialRecipes {
                    // Allow free conversion of additional/legacy oreDict name items into
                    // our item because we only register recipes for the primary oreDict
                    // name. Use a 2-to-2 recipe because the 1-to-n is already in use.
-                    addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName);
+                    RecipeUtil.addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName);
                }
            }
            isPrimaryName = true;
@@ -96,7 +114,7 @@ public class MaterialRecipes {
                if (isPrimaryName) {
                    isPrimaryName = false;
                } else {
-                    addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName);
+                    RecipeUtil.addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName);
                }
            }
        }
@@ -131,9 +149,9 @@ public class MaterialRecipes {
        OreDictionary.registerOre("itemSkull", new ItemStack(EnderIO.blockEndermanSkull));

        // Glass stuff for compatibility
-        addShaped(new ItemStack(Blocks.glass_pane, 16, 0), "eee", "eee", 'e', pureGlass);
-        addShapeless(new ItemStack(Blocks.glass), pureGlass);
-        addShaped(new ItemStack(Items.glass_bottle, 3, 0), "g g", " g ", 'g', pureGlass);
+        RecipeUtil.addShaped(new ItemStack(Blocks.glass_pane, 16, 0), "eee", "eee", 'e', pureGlass);
+        RecipeUtil.addShapeless(new ItemStack(Blocks.glass), pureGlass);
+        RecipeUtil.addShaped(new ItemStack(Items.glass_bottle, 3, 0), "g g", " g ", 'g', pureGlass);

        Material.registerOres(EnderIO.itemMaterial);
        MachinePart.registerOres(EnderIO.itemMachinePart);
@@ -170,7 +188,7 @@ public class MaterialRecipes {

        // Capacitors
        if (Config.useHardRecipes) {
-            addShaped(
+            RecipeUtil.addShaped(
                    BASIC_CAPACITOR.getItemStack(),
                    " gr",
                    "gig",
@@ -181,7 +199,7 @@ public class MaterialRecipes {
                    "ingotGold",
                    'i',
                    ingotCopper);
-            addShaped(
+            RecipeUtil.addShaped(
                    ACTIVATED_CAPACITOR.getItemStack(),
                    "iii",
                    "cCc",
@@ -192,7 +210,7 @@ public class MaterialRecipes {
                    BASIC_CAPACITOR.getItemStack(),
                    'C',
                    "dustCoal");
-            addShaped(
+            RecipeUtil.addShaped(
                    ENDER_CAPACITOR.getItemStack(),
                    "iii",
                    "cCc",
@@ -206,7 +224,7 @@ public class MaterialRecipes {

            String prismarine = OreDictionary.doesOreNameExist("shardPrismarine") ? "shardPrismarine"
                    : "itemPulsatingCrystal";
-            addShaped(
+            RecipeUtil.addShaped(
                    CRYSTALLINE_CAPACITOR.getItemStack(),
                    "iii",
                    "cCc",
@@ -217,7 +235,7 @@ public class MaterialRecipes {
                    capacitorEnder,
                    'C',
                    prismarine);
-            addShaped(
+            RecipeUtil.addShaped(
                    MELODIC_CAPACITOR.getItemStack(),
                    "iii",
                    "cCc",
@@ -228,7 +246,7 @@ public class MaterialRecipes {
                    CRYSTALLINE_CAPACITOR.getItemStack(),
                    'C',
                    endSteel);
-            addShaped(
+            RecipeUtil.addShaped(
                    STELLAR_CAPACITOR.getItemStack(),
                    "iii",
                    "cCc",
@@ -240,7 +258,7 @@ public class MaterialRecipes {
                    'C',
                    PRECIENT_CRYSTAL.oreDict);

-            addShaped(
+            RecipeUtil.addShaped(
                    SILVER_CAPACITOR.getItemStack(),
                    " sr",
                    "sis",
@@ -251,7 +269,7 @@ public class MaterialRecipes {
                    "ingotSilver",
                    'i',
                    "ingotLead");
-            addShaped(
+            RecipeUtil.addShaped(
                    ENDERGETIC_CAPACITOR.getItemStack(),
                    "iii",
                    "cCc",
@@ -262,7 +280,7 @@ public class MaterialRecipes {
                    SILVER_CAPACITOR.getItemStack(),
                    'C',
                    "dustCoal");
-            addShaped(
+            RecipeUtil.addShaped(
                    ENDERGISED_CAPACITOR.getItemStack(),
                    "iii",
                    "cCc",
@@ -275,7 +293,7 @@ public class MaterialRecipes {
                    "glowstone");

        } else {
-            addShaped(
+            RecipeUtil.addShaped(
                    BASIC_CAPACITOR.getItemStack(),
                    " gr",
                    "gig",
@@ -286,7 +304,7 @@ public class MaterialRecipes {
                    "ingotGold",
                    'i',
                    ingotCopper);
-            addShaped(
+            RecipeUtil.addShaped(
                    ACTIVATED_CAPACITOR.getItemStack(),
                    " i ",
                    "cCc",
@@ -297,7 +315,7 @@ public class MaterialRecipes {
                    BASIC_CAPACITOR.getItemStack(),
                    'C',
                    "dustCoal");
-            addShaped(
+            RecipeUtil.addShaped(
                    ENDER_CAPACITOR.getItemStack(),
                    " i ",
                    "cCc",
@@ -311,7 +329,7 @@ public class MaterialRecipes {

            String prismarine = OreDictionary.doesOreNameExist("shardPrismarine") ? "shardPrismarine"
                    : "itemPulsatingCrystal";
-            addShaped(
+            RecipeUtil.addShaped(
                    CRYSTALLINE_CAPACITOR.getItemStack(),
                    " i ",
                    "cCc",
@@ -322,7 +340,7 @@ public class MaterialRecipes {
                    capacitorEnder,
                    'C',
                    prismarine);
-            addShaped(
+            RecipeUtil.addShaped(
                    MELODIC_CAPACITOR.getItemStack(),
                    " i ",
                    "cCc",
@@ -333,7 +351,7 @@ public class MaterialRecipes {
                    CRYSTALLINE_CAPACITOR.getItemStack(),
                    'C',
                    endSteel);
-            addShaped(
+            RecipeUtil.addShaped(
                    STELLAR_CAPACITOR.getItemStack(),
                    " i ",
                    "cCc",
@@ -345,7 +363,7 @@ public class MaterialRecipes {
                    'C',
                    PRECIENT_CRYSTAL.oreDict);

-            addShaped(
+            RecipeUtil.addShaped(
                    SILVER_CAPACITOR.getItemStack(),
                    " sr",
                    "sis",
@@ -356,7 +374,7 @@ public class MaterialRecipes {
                    "ingotSilver",
                    'i',
                    "ingotLead");
-            addShaped(
+            RecipeUtil.addShaped(
                    ENDERGETIC_CAPACITOR.getItemStack(),
                    " i ",
                    "cCc",
@@ -367,7 +385,7 @@ public class MaterialRecipes {
                    SILVER_CAPACITOR.getItemStack(),
                    'C',
                    "dustCoal");
-            addShaped(
+            RecipeUtil.addShaped(
                    ENDERGISED_CAPACITOR.getItemStack(),
                    " i ",
                    "cCc",
@@ -383,37 +401,37 @@ public class MaterialRecipes {
        // Conduit Binder
        ItemStack cbc = BINDER_COMPOSITE.getStack(8);
        if (Config.useAlternateBinderRecipe) {
-            addShaped(cbc, "gcg", "sgs", "gcg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball);
+            RecipeUtil.addShaped(cbc, "gcg", "sgs", "gcg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball);
        } else {
-            addShaped(cbc, "ggg", "scs", "ggg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball);
+            RecipeUtil.addShaped(cbc, "ggg", "scs", "ggg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball);
        }
        GameRegistry.addSmelting(BINDER_COMPOSITE.getStack(), CONDUIT_BINDER.getStack(4), 0);

        // Nuggets
        ItemStack phasedIronNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.PHASED_IRON_NUGGET.ordinal());
-        addShapeless(phasedIronNugget, phasedIron);
+        RecipeUtil.addShapeless(phasedIronNugget, phasedIron);
        phasedIronNugget = phasedIronNugget.copy();
        phasedIronNugget.stackSize = 1;
-        addShaped(PHASED_IRON.getStackIngot(), "eee", "eee", "eee", 'e', phasedIronNugget);
+        RecipeUtil.addShaped(PHASED_IRON.getStackIngot(), "eee", "eee", "eee", 'e', phasedIronNugget);

        ItemStack vibrantNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.VIBRANT_NUGGET.ordinal());
-        addShapeless(vibrantNugget, phasedGold);
+        RecipeUtil.addShapeless(vibrantNugget, phasedGold);
        vibrantNugget = vibrantNugget.copy();
        vibrantNugget.stackSize = 1;
-        addShaped(PHASED_GOLD.getStackIngot(), "eee", "eee", "eee", 'e', vibrantNugget);
+        RecipeUtil.addShaped(PHASED_GOLD.getStackIngot(), "eee", "eee", "eee", 'e', vibrantNugget);

        ItemStack endSteelNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.END_STEEL_NUGGET.ordinal());
-        addShapeless(endSteelNugget, endSteel);
+        RecipeUtil.addShapeless(endSteelNugget, endSteel);
        endSteelNugget = endSteelNugget.copy();
        endSteelNugget.stackSize = 1;
-        addShaped(END_STEEL.getStackIngot(), "eee", "eee", "eee", 'e', endSteelNugget);
+        RecipeUtil.addShaped(END_STEEL.getStackIngot(), "eee", "eee", "eee", 'e', endSteelNugget);

        // Crystals
        ItemStack pulsCry = new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal());
-        addShaped(pulsCry, "nnn", "ngn", "nnn", 'n', phasedIronNugget, 'g', "gemDiamond");
+        RecipeUtil.addShaped(pulsCry, "nnn", "ngn", "nnn", 'n', phasedIronNugget, 'g', "gemDiamond");

        ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal());
-        addShaped(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', "gemEmerald");
+        RecipeUtil.addShaped(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', "gemEmerald");

        // Smelting
        ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal());
@@ -426,23 +444,23 @@ public class MaterialRecipes {

        // Ender Dusts
        ItemStack enderDust = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal());
-        addShaped(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust);
+        RecipeUtil.addShaped(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust);

        // Dark Iron Bars
        ItemStack diBars = new ItemStack(EnderIO.blockDarkIronBars, 16, 0);
-        addShaped(diBars, "ddd", "ddd", 'd', darkSteel);
+        RecipeUtil.addShaped(diBars, "ddd", "ddd", 'd', darkSteel);

        // Dark Iron Bars
        ItemStack soBars = new ItemStack(EnderIO.blockSoulariumBars, 16, 0);
-        addShaped(soBars, "ddd", "ddd", 'd', soularium);
+        RecipeUtil.addShaped(soBars, "ddd", "ddd", 'd', soularium);

        // Dark Iron Bars
        ItemStack esBars = new ItemStack(EnderIO.blockEndSteelBars, 16, 0);
-        addShaped(esBars, "ddd", "ddd", 'd', endSteel);
+        RecipeUtil.addShaped(esBars, "ddd", "ddd", 'd', endSteel);

        // Fused Quartz Frame
-        addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "stickWood");
-        addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "woodStick");
+        RecipeUtil.addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "stickWood");
+        RecipeUtil.addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "woodStick");

        // Machine Chassis

@@ -451,10 +469,10 @@ public class MaterialRecipes {
        ItemStack chassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal());
        String mat = Config.useSteelInChassi == true && steelIngots != null && !steelIngots.isEmpty() ? "ingotSteel"
                : "ingotIron";
-        addShaped(chassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', mat, 'c', capacitor);
+        RecipeUtil.addShaped(chassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', mat, 'c', capacitor);

        ItemStack soulchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.SOUL_MACHINE_CHASSIS.ordinal());
-        addShaped(
+        RecipeUtil.addShaped(
                soulchassis,
                "fif",
                "ici",
@@ -470,7 +488,7 @@ public class MaterialRecipes {
                EnderIO.itemMachinePart,
                1,
                MachinePart.END_STEEL_MACHINE_CHASSIS.ordinal());
-        addShaped(
+        RecipeUtil.addShaped(
                endchassis,
                "fif",
                "ici",
@@ -484,8 +502,8 @@ public class MaterialRecipes {

        // Basic Gear
        ItemStack gear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal());
-        addShaped(gear, "scs", "c c", "scs", 's', "stickWood", 'c', "cobblestone");
-        addShaped(gear, "scs", "c c", "scs", 's', "woodStick", 'c', "cobblestone");
+        RecipeUtil.addShaped(gear, "scs", "c c", "scs", 's', "stickWood", 'c', "cobblestone");
+        RecipeUtil.addShaped(gear, "scs", "c c", "scs", 's', "woodStick", 'c', "cobblestone");

        // Weather Crystal
        ItemStack main = Config.useHardRecipes
@@ -502,7 +520,7 @@ public class MaterialRecipes {
            if (Config.reinforcedObsidianUseDarkSteelBlocks) {
                corners = Alloy.DARK_STEEL.getOreBlock();
            }
-            addShaped(
+            RecipeUtil.addShaped(
                    reinfObs,
                    "dbd",
                    "bob",
@@ -515,25 +533,39 @@ public class MaterialRecipes {
                    Blocks.obsidian);
        }

-        addShaped(EnderIO.blockDarkSteelAnvil, "bbb", " i ", "iii", 'b', DARK_STEEL.getOreBlock(), 'i', darkSteel);
+        RecipeUtil.addShaped(
+                EnderIO.blockDarkSteelAnvil,
+                "bbb",
+                " i ",
+                "iii",
+                'b',
+                DARK_STEEL.getOreBlock(),
+                'i',
+                darkSteel);

-        addShaped(new ItemStack(EnderIO.blockDarkSteelLadder, 12), "b", "b", "b", 'b', EnderIO.blockDarkIronBars);
+        RecipeUtil.addShaped(
+                new ItemStack(EnderIO.blockDarkSteelLadder, 12),
+                "b",
+                "b",
+                "b",
+                'b',
+                EnderIO.blockDarkIronBars);

        for (Alloy alloy : Alloy.values()) {
-            addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot());
-            addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot());
-            addShapeless(alloy.getStackIngot(9), alloy.getOreBlock());
+            RecipeUtil.addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot());
+            RecipeUtil.addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot());
+            RecipeUtil.addShapeless(alloy.getStackIngot(9), alloy.getOreBlock());
        }

        for (AlloyEndergy alloy : AlloyEndergy.values()) {
-            addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot());
-            addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot());
-            addShapeless(alloy.getStackIngot(9), alloy.getOreBlock());
+            RecipeUtil.addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot());
+            RecipeUtil.addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot());
+            RecipeUtil.addShapeless(alloy.getStackIngot(9), alloy.getOreBlock());
        }

        // DS Rod
        ItemStack darkRod = new ItemStack(EnderIO.itemMaterial, 1, Material.DARK_STEEL_ROD.ordinal());
-        addShaped(darkRod, " ns", "nsn", "sn ", 's', darkSteel, 'n', endSteelNugget);
+        RecipeUtil.addShaped(darkRod, " ns", "nsn", "sn ", 's', darkSteel, 'n', endSteelNugget);

        // Food
        ItemStack flour = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.FLOUR.ordinal());
@@ -542,14 +574,14 @@ public class MaterialRecipes {
        GameRegistry.addSmelting(flour, bread, 0.35f);

        ItemStack enderios = EnderFood.ENDERIOS.getStack();
-        addShapeless(enderios, Items.bowl, Items.milk_bucket, "cropWheat", "dustEnderPearl");
+        RecipeUtil.addShapeless(enderios, Items.bowl, Items.milk_bucket, "cropWheat", "dustEnderPearl");

-        if (hasCopper()) {
+        if (OreDictionaryHelper.hasCopper()) {
            ItemStack dustCopper = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal());
            ItemStack ingotCoppper = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_COPPER);
            GameRegistry.addSmelting(dustCopper, ingotCoppper, 0);
        }
-        if (hasTin()) {
+        if (OreDictionaryHelper.hasTin()) {
            ItemStack dustTin = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal());
            ItemStack ingotTin = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_TIN);
            GameRegistry.addSmelting(dustTin, ingotTin, 0);
@@ -1,6 +1,10 @@
 package crazypants.enderio.material;

-import static com.enderio.core.common.util.OreDictionaryHelper.*;
+import static com.enderio.core.common.util.OreDictionaryHelper.DUST_ENDERPEARL;
+import static com.enderio.core.common.util.OreDictionaryHelper.INGOT_COPPER;
+import static com.enderio.core.common.util.OreDictionaryHelper.INGOT_ENDERIUM;
+import static com.enderio.core.common.util.OreDictionaryHelper.INGOT_TIN;
+import static com.enderio.core.common.util.OreDictionaryHelper.isRegistered;

 public enum PowderIngot {

@@ -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);
    }
 }
@@ -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);
    }
+
 }
@@ -16,9 +16,18 @@ 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.*;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovementInput;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.common.MinecraftForge;
@@ -56,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 {

@@ -111,42 +121,65 @@ public class TravelController {
        }
    }

-    public boolean validatePacketTravelEvent(EntityPlayerMP toTp, int x, int y, int z, int powerUse,
+    /**
+     * @return the error message, or null if the packet is valid.
+     */
+    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
-        if (dist * 100 > source.getMaxDistanceTravelledSq() * 115) return false;
-        if (powerUse < getRequiredPower(toTp, source, target)) return false;
+        if (dist * 100 > source.getMaxDistanceTravelledSq() * 115) return "dist check fail";
+        // allow 4 blocks of c/s player pos desync
+        if (getPower(toTp, source, target, -4F) > powerUse) return "power use too little";
        ItemStack equippedItem = toTp.getCurrentEquippedItem();
        switch (source) {
            case TELEPAD:
                // this source is invalid for this type of packet
-                return false;
+                return "invalid travel source";
            case BLOCK:
                // this source is only triggered when player is on any active travel anchor
                BlockCoord on = getActiveTravelBlock(toTp);
-                if (on == null) return false;
+                if (on == null) return "on anchor is null";
                // target must be a valid selectedCoord
                // selectedCoord can either be a block right above/below when the player is on anchor...
-                if (on.x == x && on.z == z) return true;
+                if (on.x == x && on.z == z) return null;
                // or another anchor
                TileEntity maybeAnchor = target.getTileEntity(toTp.worldObj);
-                if (!(maybeAnchor instanceof ITravelAccessable)) return false;
+                if (!(maybeAnchor instanceof ITravelAccessable)) return "not anchor";
                ITravelAccessable anchor = (ITravelAccessable) maybeAnchor;
-                return 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 (equippedItem == null || !(equippedItem.getItem() instanceof IItemOfTravel)) return false;
-                if (!((IItemOfTravel) equippedItem.getItem()).isActive(toTp, equippedItem)) return false;
+                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);
-                return energy == -1 || energy == powerUse;
+                if (energy != -1 && energy != powerUse) {
+                    return "not enough power";
+                }
+                return null;
            case TELEPORT_STAFF_BLINK:
            case TELEPORT_STAFF:
                // tp staff is creative version of traveling staff
                // no energy check or anything else needed
                // but the player must actually be equipped with one of these
-                return equippedItem != null && equippedItem.getItem() instanceof ItemTeleportStaff;
+                if (equippedItem != null && equippedItem.getItem() instanceof ItemTeleportStaff) {
+                    return null;
+                }
+                return "not staff";
            default:
                throw new AssertionError("unidentified travel source");
        }
@@ -494,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 {
@@ -582,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);
    }
@@ -657,12 +765,16 @@ 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();
-        requiredPower = (int) (getDistance(player, coord) * source.getPowerCostPerBlockTraveledRF());
+        if (staff == null || !(staff.getItem() instanceof IItemOfTravel)) {
+            staff = findTravelItemInInventoryOrBaubles(player);
+        }
+
+        requiredPower = getPower(player, source, coord, 0F);
        int canUsePower = getEnergyInTravelItem(staff);
        if (requiredPower > canUsePower) {
            // make sure chat is sent only once per trial
@@ -675,6 +787,10 @@ public class TravelController {
        return requiredPower;
    }

+    private int getPower(EntityPlayer player, TravelSource source, BlockCoord coord, float distanceWavier) {
+        return (int) ((getDistance(player, coord) + distanceWavier) * source.getPowerCostPerBlockTraveledRF());
+    }
+
    private boolean isInRangeTarget(EntityPlayer player, BlockCoord bc, float maxSq) {
        return getDistanceSquared(player, bc) <= maxSq;
    }
@@ -948,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();
        }
@@ -984,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));
@@ -69,7 +69,8 @@ public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer {
        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();
        }
@@ -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> {
@@ -83,12 +85,14 @@ public class PacketTravelEvent implements IMessage, IMessageHandler<PacketTravel

        TravelSource source = TravelSource.values()[message.source];

-        if (!TravelController.instance
-                .validatePacketTravelEvent(toTp, x, y, z, message.powerUse, message.conserveMotion, source)) {
+        String error = TravelController.instance
+                .validatePacketTravelEvent(toTp, x, y, z, message.powerUse, message.conserveMotion, source);
+        if (error != null) {
            Log.LOGGER.warn(
                    Log.securityMarker,
-                    "Player {} tried to tp without valid prereq.",
-                    ctx.getServerHandler().playerEntity.getGameProfile());
+                    "Player {} tried to tp without valid prereq: {}",
+                    ctx.getServerHandler().playerEntity.getGameProfile(),
+                    error);
            return null;
        }

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

@@ -1,6 +1,23 @@
 package crazypants.enderio.teleport.telepad;

-import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL11.GL_ALL_ATTRIB_BITS;
+import static org.lwjgl.opengl.GL11.GL_ALPHA_TEST;
+import static org.lwjgl.opengl.GL11.GL_BLEND;
+import static org.lwjgl.opengl.GL11.GL_CULL_FACE;
+import static org.lwjgl.opengl.GL11.GL_LIGHTING;
+import static org.lwjgl.opengl.GL11.GL_ONE;
+import static org.lwjgl.opengl.GL11.GL_SMOOTH;
+import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA;
+import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D;
+import static org.lwjgl.opengl.GL11.GL_ZERO;
+import static org.lwjgl.opengl.GL11.glDepthMask;
+import static org.lwjgl.opengl.GL11.glDisable;
+import static org.lwjgl.opengl.GL11.glEnable;
+import static org.lwjgl.opengl.GL11.glPushAttrib;
+import static org.lwjgl.opengl.GL11.glPushMatrix;
+import static org.lwjgl.opengl.GL11.glRotatef;
+import static org.lwjgl.opengl.GL11.glShadeModel;
+import static org.lwjgl.opengl.GL11.glTranslated;

 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
@@ -16,7 +16,7 @@ public interface IWailaInfoProvider {

    /**
     * Adds the block's info to the WAILA information
-     * 
+     *
     * @param tooltip - current list of strings in the WAILA body
     * @param world
     * @param x
@@ -1,6 +1,8 @@
 package crazypants.enderio.waila;

-import static crazypants.enderio.waila.IWailaInfoProvider.*;
+import static crazypants.enderio.waila.IWailaInfoProvider.BIT_BASIC;
+import static crazypants.enderio.waila.IWailaInfoProvider.BIT_COMMON;
+import static crazypants.enderio.waila.IWailaInfoProvider.BIT_DETAILED;

 import java.text.MessageFormat;
 import java.util.List;
@@ -123,8 +125,6 @@ public class WailaCompat implements IWailaDataProvider {

    public static final WailaCompat INSTANCE = new WailaCompat();

-    private static IWailaDataAccessor _accessor = null;
-
    public static void load(IWailaRegistrar registrar) {
        registrar.registerStackProvider(INSTANCE, IFacade.class);
        registrar.registerStackProvider(INSTANCE, BlockDarkSteelAnvil.class);
@@ -188,8 +188,6 @@ public class WailaCompat implements IWailaDataProvider {
    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
            IWailaConfigHandler config) {

-        _accessor = accessor;
-
        EntityPlayer player = accessor.getPlayer();
        MovingObjectPosition pos = accessor.getPosition();
        int x = pos.blockX, y = pos.blockY, z = pos.blockZ;
@@ -265,7 +263,7 @@ public class WailaCompat implements IWailaDataProvider {
        }

        if (te instanceof IConduitBundle) {
-            getWailaBodyConduitBundle(itemStack, currenttip);
+            getWailaBodyConduitBundle(itemStack, currenttip, accessor);

        } else if (te instanceof IInternalPoweredTile && block == accessor.getBlock() && !(te instanceof TileCapBank)) {
            IInternalPoweredTile power = (IInternalPoweredTile) te;
@@ -295,13 +293,13 @@ public class WailaCompat implements IWailaDataProvider {
        return currenttip;
    }

-    private void getWailaBodyConduitBundle(ItemStack itemStack, List<String> currenttip) {
+    private void getWailaBodyConduitBundle(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor) {
        if (itemStack == null) {
            return;
        }

        if (itemStack.getItem() == EnderIO.itemPowerConduit || itemStack.getItem() == EnderIO.itemPowerConduitEndergy) {
-            NBTTagCompound nbtRoot = _accessor.getNBTData();
+            NBTTagCompound nbtRoot = accessor.getNBTData();
            if (nbtRoot.hasKey("storedEnergyRF")) {
                int stored = nbtRoot.getInteger("storedEnergyRF");
                int max = nbtRoot.getInteger("maxStoredRF");
@@ -318,7 +316,7 @@ public class WailaCompat implements IWailaDataProvider {
            }

        } else if (itemStack.getItem() == EnderIO.itemLiquidConduit) {
-            NBTTagCompound nbtRoot = _accessor.getNBTData();
+            NBTTagCompound nbtRoot = accessor.getNBTData();
            if (nbtRoot.hasKey("fluidLocked") && nbtRoot.hasKey("FluidName")) {
                boolean fluidTypeLocked = nbtRoot.getBoolean("fluidLocked");
                FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbtRoot);
@@ -350,7 +348,7 @@ public class WailaCompat implements IWailaDataProvider {
            }

        } else if (itemStack.getItem() == EnderIO.itemMEConduit) {
-            NBTTagCompound nbtRoot = _accessor.getNBTData();
+            NBTTagCompound nbtRoot = accessor.getNBTData();
            if (nbtRoot.hasKey("isDense")) {
                boolean isDenseUltra = nbtRoot.getBoolean("isDenseUltra");
                boolean isDense = nbtRoot.getBoolean("isDense");
@@ -409,7 +407,4 @@ public class WailaCompat implements IWailaDataProvider {
        return tag;
    }

-    public static NBTTagCompound getNBTData() {
-        return _accessor.getNBTData();
-    }
 }
@@ -4,9 +4,8 @@ import net.minecraft.entity.player.EntityPlayer;

 /**
 * Values taken from OpenMods EnchantmentUtils to ensure consistent behavior
- * 
- * @see {@link https://github.com/OpenMods/OpenModsLib/blob/master/src/main/java/openmods/utils/EnchantmentUtils.java}
 *
+ * @see {@link https://github.com/OpenMods/OpenModsLib/blob/master/src/main/java/openmods/utils/EnchantmentUtils.java}
 */
 public class XpUtil {

@@ -66,7 +66,7 @@ public class BaublesUtil {

    /**
     * Do NOT modify this inventory on the client side of a singleplayer game!
-     *
+     * <p>
     * Wrap it in a ShadowInventory if you need to.
     */
    public IInventory getBaubles(EntityPlayer player) {
@@ -10,9 +10,8 @@ import crazypants.enderio.Log;

 /**
 * This is a near-verbatim copy of Galacticraft's API class 'AccessInventoryGC'.
- *
+ * <p>
 * We don't need the extended functionality and already have more APIs included than is good for our sanity.
- *
 */
 public class GalacticraftUtil {

@@ -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
Author	SHA1	Message	Date
Martin Robertz	5265340e3c	update	2024-02-17 11:13:20 +01:00
Raven Szewczyk	37e239ae81	[ci skip] upgraded build system	2024-02-04 19:58:13 +00:00
Martin Robertz	a725ebf120	update bs+deps	2024-01-31 22:47:55 +01:00
Pascal	6affe75674	fix protection mode of travel anchor (#149 )	2024-01-31 07:53:01 +01:00
Martin Robertz	19f19d348b	update bs+deps	2024-01-24 18:19:30 +01:00
Under	3154d03b4f	Fix Anchor always rendering bug (#148 ) * Fix Anchor always rendering bug Also stop inventory scanning from happening every client tick, whoops. Tested by placing a debug point on line 768 of TravelController (in getRequiredPower) and a debug point at line 656 of TravelController (in findTravelItemInInventoryOrBaubles). Debug points were used to verify that the code was ONLY hit when actual teleport happens, and not happening every tick like what was accidentally happening before. * Run spotlessApply Forgot that was a thing I do for GTNH stuff.	2024-01-24 10:58:27 -06:00
Martin Robertz	9e84167012	update bs+deps	2024-01-10 00:42:52 +01:00
bombcar	d1a1bf1ed5	add required hard dependency on cofhlib (#146 ) * add required hard dependency on cofhlib * update bs, dependencies, and settings.gradle	2024-01-10 00:41:51 +01:00
Raven Szewczyk	c1309fa37d	[ci skip] upgraded build system	2024-01-08 21:25:19 +00:00
Martin Robertz	6a0785e1da	exchange existing Item filter from newer Ender io version (#145 )	2023-12-30 12:09:44 +01:00
Martin Robertz	6a4d655c71	update deps	2023-12-24 20:21:36 +01:00
Under	3639ade571	Staff Of Traveling Keybind Feature (#144 ) * Staff Of Traveling Keybind Update Two main things 1. Added a keybind for Staff of Traveling blink ability 2. Due to the new keybind, also added Baubles support for Staff of Traveling. By extension, both features 1 and 2 also apply to the Staff of Teleportation. * Update en_US.lang * Add config to disable Travel Staff Keybind Change as per request by @Caedis . New config option is synced in the PacketConfigSync class. A helpful info message is displayed when players attempt to use the keybind but it is disabled so it's immediately apparent why it's not working. * Typo/formatting Fix type, remove unnecessary null check. * Annotations and UNIVERSAL bauble type Added annotations missing from ItemMagnet and ItemTravelStaff for Baubles. Added option 'UNIVERSAL' to description of magnet and travel staff Bauble type configs. Changed default of staff to be 'UNIVERSAL', because bauble slots are limited enough as-is.	2023-12-24 20:18:57 +01:00
Martin Robertz	95daa9b035	update deps	2023-12-20 20:21:36 +01:00
Under	f249fd2973	Add Config to allow servers to re-enable support for client-side 'hacks' like Staff Of Traveling Keybind mod. (#142 ) * Update Config.java Adding config to allow not validating travel staff packets. * Update TravelController.java Disable validation if server config deems it so. * spotlessApply fix * Wrong ordering and spotlessApply	2023-12-20 20:06:38 +01:00
Tuorp Alexander Anishin Martin Robertz	9f3f8243f9	Limited Item Filter (#143 ) * Limited Item Filter * simplify inverted limit Co-authored-by: Alexander Anishin <[email protected]> * Update src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterLimited.java Co-authored-by: Alexander Anishin <[email protected]> * Update src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterLimited.java Co-authored-by: Alexander Anishin <[email protected]> * Update ItemFilterLimited.java --------- Co-authored-by: Alexander Anishin <[email protected]> Co-authored-by: Martin Robertz <[email protected]>	2023-12-20 19:50:55 +01:00
Martin Robertz	23a5484ee8	update deps	2023-12-13 15:38:04 +01:00
Bears Dot Zone	4b5837cac2	Fix an edge case pertaining to freshly crafted tanks (#141 ) * Update dependencies * Replace faulty dummy object logic with object creation * Remove logic that is exiting a function erroneously	2023-12-13 15:32:56 +01:00
Spacebuilder2020andMartin Robertz	1251427388	Fix NBT Match where tag is empty but exists (#138 ) * Fix NBT Match where tag is empty but exists * Apply Splotless * update deps * update gradle + bs --------- Co-authored-by: Martin Robertz <[email protected]>	2023-12-13 09:40:48 +01:00
ghostflyby	3e7d69f460	Open conduit connection GUI with more wrenches (#139 )	2023-11-25 16:02:12 +08:00
Martin Robertz	88725a144d	update deps	2023-11-16 13:59:12 +01:00
Pelotrio	123f22f20e	Add unload event handling to ClientNetworkManager (#137 ) Added a new method `onWorldUnload` to `ClientNetworkManager` to destroy and clear any network instances when the world event `Unload` is triggered. The addition of this event handler was necessary to prevent the possibility of any network instances persisting on the client side beyond the World lifetime, thus potentially causing memory leaks.	2023-11-16 15:42:32 +03:00
Martin Robertz	0b0f7a4f1a	update deps	2023-11-11 12:13:03 +01:00
Martin Robertz	b00c5996f7	update bs+deps	2023-11-11 12:12:45 +01:00
Pelotrio	83f52d15c7	Removed the redundant static IWailaDataAccessor _accessor to not leak the world object	2023-11-10 18:34:39 -08:00
Pelotrio	287c4498d2	Use null for the Item to render to not leak the world	2023-11-10 18:34:39 -08:00
Martin Robertz	2470e81f0e	update bs+de+wci	2023-10-15 17:43:47 +02:00
Alexdoru	1af6fcae0b	set fluid conduit default to output only	2023-10-15 13:34:45 +02:00
Alexdoru	f44111da96	revert changes to conduit default connection modes	2023-10-15 13:34:45 +02:00
Dream-MasterXXL	4ae9ff2d77	update bs+deps	2023-10-05 00:42:17 +02:00
Martin Robertz	71f79536a7	update deps	2023-09-28 20:54:35 +02:00
Alexdoru	0920bf28d6	Change default connection mode of fluid conduits (#134 ) * update bs * change default connection mode of fluid conduits * fix imports	2023-09-28 20:45:53 +02:00
Martin Robertz	8e4107d11e	update bs+deps	2023-09-22 19:09:29 +02:00
Glease	349bcc0926	allow small overshoot of power use for traveling (#133 )	2023-09-22 20:04:04 +03:00
Glease	070660efe4	fix travel upgrade items using wrong way to determine power stored (#131 ) Signed-off-by: Glease <[email protected]>	2023-07-24 01:45:41 +08:00