Merge branch 'GTNewHorizons:master' into master

2026-11-15 17:45:08 +00:00 · 2023-07-24 09:58:04 +02:00 · 2023-05-09 20:21:53 +02:00 · 2023-05-08 18:14:50 +02:00 · 2023-05-08 08:05:01 +02:00 · 2023-05-01 23:14:59 +02:00
64 changed files with 346 additions and 1338 deletions
@@ -1,4 +1,4 @@
-//version: 1702141377
+//version: 1690104383
 /*
 DO NOT CHANGE THIS FILE!
 Also, you may replace this file at any time if there is an update available.
@@ -28,12 +28,27 @@ import java.util.concurrent.TimeUnit

 buildscript {
    repositories {
+        mavenCentral()
+
+        maven {
+            name 'forge'
+            url 'https://maven.minecraftforge.net'
+        }
        maven {
            // GTNH RetroFuturaGradle and ASM Fork
            name "GTNH Maven"
            url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
            allowInsecureProtocol = true
        }
+        maven {
+            name 'sonatype'
+            url 'https://oss.sonatype.org/content/repositories/snapshots/'
+        }
+        maven {
+            name 'Scala CI dependencies'
+            url 'https://repo1.maven.org/maven2/'
+        }
+
        mavenLocal()
    }
 }
@@ -54,7 +69,7 @@ plugins {
    id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
    id 'com.modrinth.minotaur' version '2.+' apply false
    id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
-    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.26'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.21'
 }

 print("You might want to check out './gradlew :faq' if your build fails.\n")
@@ -74,23 +89,6 @@ def out = services.get(StyledTextOutputFactory).create('an-output')
 def projectJavaVersion = JavaLanguageVersion.of(8)

 boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false
-boolean disableCheckstyle = project.hasProperty("disableCheckstyle") ? project.disableCheckstyle.toBoolean() : false
-
-final String CHECKSTYLE_CONFIG = """
-<!DOCTYPE module PUBLIC
-  "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-  "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-<module name="Checker">
-  <module name="TreeWalker">
-    <!-- Use CHECKSTYLE:OFF and CHECKSTYLE:ON comments to suppress checkstyle lints in a block -->
-    <module name="SuppressionCommentFilter"/>
-    <module name="AvoidStarImport">
-      <!-- Allow static wildcard imports for cases like Opcodes and LWJGL classes, these don't get created accidentally by the IDE -->
-      <property name="allowStaticMemberImports" value="true"/>
-    </module>
-  </module>
-</module>
-"""

 checkPropertyExists("modName")
 checkPropertyExists("modId")
@@ -142,17 +140,6 @@ if (!disableSpotless) {
    apply from: Blowdryer.file('spotless.gradle')
 }

-if (!disableCheckstyle) {
-    apply plugin: 'checkstyle'
-    tasks.named("checkstylePatchedMc") { enabled = false }
-    tasks.named("checkstyleMcLauncher") { enabled = false }
-    tasks.named("checkstyleIdeVirtualMain") { enabled = false }
-    tasks.named("checkstyleInjectedTags") { enabled = false }
-    checkstyle {
-        config = resources.text.fromString(CHECKSTYLE_CONFIG)
-    }
-}
-
 String javaSourceDir = "src/main/java/"
 String scalaSourceDir = "src/main/scala/"
 String kotlinSourceDir = "src/main/kotlin/"
@@ -287,7 +274,7 @@ if (apiPackage) {
 }

 if (accessTransformersFile) {
-    for (atFile in accessTransformersFile.split(" ")) {
+    for (atFile in accessTransformersFile.split(",")) {
        String targetFile = "src/main/resources/META-INF/" + atFile.trim()
        if (!getFile(targetFile).exists()) {
            throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
@@ -414,13 +401,9 @@ if (identifiedVersion == versionOverride) {

 group = "com.github.GTNewHorizons"
 if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
-    base {
-        archivesName = customArchiveBaseName
-    }
+    archivesBaseName = customArchiveBaseName
 } else {
-    base {
-        archivesName = modId
-    }
+    archivesBaseName = modId
 }


@@ -575,6 +558,9 @@ repositories {
    maven {
        name 'Overmind forge repo mirror'
        url 'https://gregtech.overminddl1.com/'
+        mavenContent {
+            excludeGroup("net.minecraftforge") // missing the `universal` artefact
+        }
    }
    maven {
        name = "GTNH Maven"
@@ -613,10 +599,15 @@ repositories {
        }
        maven {
            name = "ic2"
-            url = getURL("https://maven2.ic2.player.to/", "https://maven.ic2.player.to/")
-            content {
-                includeGroup "net.industrial-craft"
+            url = "https://maven.ic2.player.to/"
+            metadataSources {
+                mavenPom()
+                artifact()
            }
+        }
+        maven {
+            name = "ic2-mirror"
+            url = "https://maven2.ic2.player.to/"
            metadataSources {
                mavenPom()
                artifact()
@@ -631,13 +622,11 @@ repositories {

 def mixinProviderGroup = "io.github.legacymoddingmc"
 def mixinProviderModule = "unimixins"
-def mixinProviderVersion = "0.1.13"
+def mixinProviderVersion = "0.1.7.1"
 def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
 def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
 ext.mixinProviderSpec = mixinProviderSpec

-def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
-
 dependencies {
    if (usesMixins.toBoolean()) {
        annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
@@ -649,7 +638,7 @@ dependencies {
        }
    }
    if (usesMixins.toBoolean()) {
-        implementation(modUtils.enableMixins(mixinProviderSpec, mixingConfigRefMap))
+        implementation(modUtils.enableMixins(mixinProviderSpec))
    } else if (forceEnableMixins.toBoolean()) {
        runtimeOnlyNonPublishable(mixinProviderSpec)
    }
@@ -672,8 +661,6 @@ configurations.all {
        substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
        substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
        substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier")
-
-        substitute module('org.scala-lang:scala-library:2.11.1') using module('org.scala-lang:scala-library:2.11.5') because('To allow mixing with Java 8 targets')
    }
 }

@@ -704,6 +691,8 @@ if (file('dependencies.gradle.kts').exists()) {
    throw new RuntimeException("Missing dependencies.gradle[.kts]")
 }

+def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
+
 tasks.register('generateAssets') {
    group = "GTNH Buildscript"
    description = "Generates a mixin config file at /src/main/resources/mixins.modid.json if needed"
@@ -780,14 +769,23 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
 }

 dependencies {
-    def lwjgl3ifyVersion = '1.5.7'
+    def lwjgl3ifyVersion = '1.4.0'
+    def asmVersion = '9.4'
    if (modId != 'lwjgl3ify') {
        java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
    }
    if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.19')
    }

+    java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}
+    java17PatchDependencies("org.ow2.asm:asm:${asmVersion}")
+    java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}")
+    java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}")
+    java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}")
+    java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}")
+    java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1')
+    java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0")
    java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
 }

@@ -1150,10 +1148,7 @@ tasks.named("processIdeaSettings").configure {

 tasks.named("ideVirtualMainClasses").configure {
    // Make IntelliJ "Build project" build the mod jars
-    dependsOn("jar", "reobfJar")
-    if (!disableSpotless) {
-        dependsOn("spotlessCheck")
-    }
+    dependsOn("jar", "reobfJar", "spotlessCheck")
 }

 // workaround variable hiding in pom processing
@@ -1174,8 +1169,9 @@ publishing {
            version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
        }
    }
+
    repositories {
-        if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) {
+        if (usesMavenPublishing.toBoolean()) {
            maven {
                url = mavenPublishUrl
                allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
@@ -1297,7 +1293,7 @@ def addCurseForgeRelation(String type, String name) {

 // Updating

-def buildscriptGradleVersion = "8.5"
+def buildscriptGradleVersion = "8.2.1"

 tasks.named('wrapper', Wrapper).configure {
    gradleVersion = buildscriptGradleVersion
@@ -1576,25 +1572,6 @@ def getSecondaryArtifacts() {
    return secondaryArtifacts
 }

-def getURL(String main, String fallback) {
-    return pingURL(main, 10000) ? main : fallback
-}
-
-// credit: https://stackoverflow.com/a/3584332
-def pingURL(String url, int timeout) {
-    url = url.replaceFirst("^https", "http") // Otherwise an exception may be thrown on invalid SSL certificates.
-    try {
-        HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection()
-        connection.setConnectTimeout(timeout)
-        connection.setReadTimeout(timeout)
-        connection.setRequestMethod("HEAD")
-        int responseCode = connection.getResponseCode()
-        return 200 <= responseCode && responseCode <= 399
-    } catch (IOException ignored) {
-        return false
-    }
-}
-
 // For easier scripting of things that require variables defined earlier in the buildscript
 if (file('addon.late.gradle.kts').exists()) {
    apply from: 'addon.late.gradle.kts'
@@ -1,22 +1,22 @@
 // Add your dependencies here

 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.3.0:dev')
-    implementation('com.github.GTNewHorizons:ForestryMC:4.7.1:dev')
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev')
+    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.38:dev')
+    api('com.github.GTNewHorizons:BuildCraft:7.1.36:dev')
    api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
    shadowImplementation('cglib:cglib-nodep:3.3.0')

-    compileOnly('com.github.GTNewHorizons:waila:1.6.5:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-304-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.3:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.06:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.15.3:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.12.2-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.0-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.6.0:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-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('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,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -130,13 +130,10 @@ location of your Java installation."
    fi
 else
    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

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

 # Increase the maximum file descriptors if we can.
@@ -62,7 +62,6 @@ import crazypants.enderio.conduit.item.ItemItemConduit;
 import crazypants.enderio.conduit.item.filter.ItemBasicItemFilter;
 import crazypants.enderio.conduit.item.filter.ItemBigItemFilter;
 import crazypants.enderio.conduit.item.filter.ItemExistingItemFilter;
-import crazypants.enderio.conduit.item.filter.ItemLimitedItemFilter;
 import crazypants.enderio.conduit.item.filter.ItemModItemFilter;
 import crazypants.enderio.conduit.item.filter.ItemPowerItemFilter;
 import crazypants.enderio.conduit.liquid.ItemLiquidConduit;
@@ -265,7 +264,6 @@ public class EnderIO {
    public static ItemBasicItemFilter itemBasicFilterUpgrade;
    public static ItemBigItemFilter itemBigFilterUpgrade;
    public static ItemExistingItemFilter itemExistingItemFilter;
-    public static ItemLimitedItemFilter itemLimitedItemFilter;
    public static ItemModItemFilter itemModItemFilter;
    public static ItemPowerItemFilter itemPowerItemFilter;
    public static ItemExtractSpeedUpgrade itemExtractSpeedUpgrade;
@@ -471,7 +469,6 @@ public class EnderIO {
        itemBasicFilterUpgrade = ItemBasicItemFilter.create();
        itemBigFilterUpgrade = ItemBigItemFilter.create();
        itemExistingItemFilter = ItemExistingItemFilter.create();
-        itemLimitedItemFilter = ItemLimitedItemFilter.create();
        itemModItemFilter = ItemModItemFilter.create();
        itemPowerItemFilter = ItemPowerItemFilter.create();
        itemExtractSpeedUpgrade = ItemExtractSpeedUpgrade.create();
@@ -791,7 +788,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,7 +18,6 @@ public enum ModObject {
    itemBasicFilterUpgrade,
    itemBigFilterUpgrade,
    itemExistingItemFilter,
-    itemLimitedItemFilter,
    itemModItemFilter,
    itemPowerItemFilter,
    itemExtractSpeedUpgrade,
@@ -94,10 +94,11 @@ public interface ITelePad extends ITravelAccessable {
    /**
     * Util method to set all coords using a {@link BlockCoord} object.
     *
-     * @param coords The coords to set this telepad to.
     * @see #setX(int)
     * @see #setY(int)
     * @see #setZ(int)
+     *
+     * @param coords The coords to set this telepad to.
     */
    void setCoords(BlockCoord coords);

@@ -14,8 +14,9 @@ import cpw.mods.fml.common.eventhandler.Cancelable;
 * <li>Staff of travelling</li>
 * <li>Telepad</li>
 * </ul>
- * <p>
+ *
 * As well as any externally added teleports, assuming they fire this event manually.
+ *
 */
@Cancelable
 public class TeleportEntityEvent extends EntityEvent {
@@ -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,13 +47,7 @@ import crazypants.enderio.api.tool.ITool;
 import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType;
 import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.geom.ConduitConnectorType;
-import crazypants.enderio.conduit.gui.ExternalConnectionContainer;
-import crazypants.enderio.conduit.gui.GuiExternalConnection;
-import crazypants.enderio.conduit.gui.GuiExternalConnectionSelector;
-import crazypants.enderio.conduit.gui.PacketFluidChannel;
-import crazypants.enderio.conduit.gui.PacketFluidFilter;
-import crazypants.enderio.conduit.gui.PacketOpenConduitUI;
-import crazypants.enderio.conduit.gui.PacketSlotVisibility;
+import crazypants.enderio.conduit.gui.*;
 import crazypants.enderio.conduit.gui.item.PacketExistingItemFilterSnapshot;
 import crazypants.enderio.conduit.gui.item.PacketModItemFilter;
 import crazypants.enderio.conduit.liquid.PacketFluidLevel;
@@ -641,8 +635,8 @@ public class BlockConduitBundle extends BlockEio

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

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

 import java.util.List;

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

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

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

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

@@ -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,6 +50,7 @@ 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,7 +1,6 @@
 package crazypants.enderio.conduit.gui;

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

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

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

 import javax.annotation.Nonnull;

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

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

    @Override
@@ -22,7 +22,6 @@ import com.enderio.core.common.util.RoundRobinIterator;

 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.item.filter.IItemFilter;
-import crazypants.enderio.conduit.item.filter.ItemFilterLimited;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.invpanel.TileInventoryPanel;

@@ -156,7 +155,6 @@ public class NetworkedInventory {
        int numSlots = slotIndices.length;
        ItemStack extractItem = null;
        int maxExtracted = con.getMaximumExtracted(conDir);
-        final IItemFilter filter = con.getInputFilter(conDir);

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

    private boolean doTransfer(ItemStack extractedItem, int slot, int maxExtract) {
@@ -295,20 +278,7 @@ public class NetworkedInventory {
        }
        IItemFilter filter = con.getOutputFilter(conDir);
        if (filter != null) {
-            if (filter.isLimited()) {
-                final int count = filter.getMaxCountThatCanPassFilter(item);
-                if (count <= 0) {
-                    return 0;
-                } else {
-                    final int maxInsert = ((ItemFilterLimited) filter).getInsertLimit(getInventory(), item);
-                    if (maxInsert <= 0) {
-                        return 0;
-                    } else if (maxInsert < item.stackSize) {
-                        item = item.copy();
-                        item.stackSize = maxInsert;
-                    }
-                }
-            } else if (!filter.doesItemPassFilter(this, item)) {
+            if (!filter.doesItemPassFilter(this, item)) {
                return 0;
            }
        }
@@ -30,7 +30,7 @@ public interface IItemFilter {

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

    boolean isValid();

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

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

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

    default String getUnlocalizedName() {
@@ -98,7 +98,7 @@ public class ItemFilter implements IInventory, IItemFilter {
        return isBlacklist ? !allow : allow;
    }

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

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

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

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

 /**
+ *
 * @author matthias
 */
 public class ItemPowerItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider {
@@ -19,6 +19,7 @@ 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 = RedstoneControlMode.isConditionMet(mode, signal)
+            res = mode.isConditionMet(mode, signal)
                    && (col != DyeColor.RED || isConditionMetByExternalSignal(dir, mode, col));
        } else {
            // if checking for a signal, either is fine
-            res = RedstoneControlMode.isConditionMet(mode, signal)
+            res = mode.isConditionMet(mode, signal)
                    || (col == DyeColor.RED && isConditionMetByExternalSignal(dir, mode, col));
        }
        return res;
@@ -180,12 +180,7 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I
            }
        }

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

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

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

 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
@@ -1,5 +1,7 @@
 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;
@@ -17,7 +19,6 @@ 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;
@@ -95,12 +96,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) {
-                CubeRenderer.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                addVecWithUV(c.xyz, c.uv.x, c.uv.y);
            }
            // back face
            for (int i = corners.size() - 1; i >= 0; i--) {
                Vertex c = corners.get(i);
-                CubeRenderer.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
+                addVecWithUV(c.xyz, c.uv.x, c.uv.y);
            }
        }
    }
@@ -303,7 +304,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe
        float transY = (bound.sizeY() - sizeY) / 2;

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

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

-import static com.enderio.core.client.render.CubeRenderer.addVecWithUV;
-import static com.enderio.core.client.render.CubeRenderer.setupVertices;
-import static com.enderio.core.client.render.CubeRenderer.verts;
-import static net.minecraftforge.common.util.ForgeDirection.DOWN;
-import static net.minecraftforge.common.util.ForgeDirection.EAST;
-import static net.minecraftforge.common.util.ForgeDirection.NORTH;
-import static net.minecraftforge.common.util.ForgeDirection.SOUTH;
-import static net.minecraftforge.common.util.ForgeDirection.UP;
-import static net.minecraftforge.common.util.ForgeDirection.WEST;
+import static com.enderio.core.client.render.CubeRenderer.*;
+import static net.minecraftforge.common.util.ForgeDirection.*;

 import java.util.Collection;
 import java.util.List;
@@ -84,6 +84,8 @@ public final class Config {
    public static boolean reinforcedObsidianEnabled = true;
    public static boolean reinforcedObsidianUseDarkSteelBlocks = false;

+    public static boolean enforceOfflinePlayerUUID = false;
+
    public static boolean useAlternateBinderRecipe = false;

    public static boolean useAlternateTesseractModel = false;
@@ -154,17 +156,13 @@ public final class Config {
    public static int travelStaffBlinkPauseTicks = 10;

    public static boolean travelStaffEnabled = true;
-    public static boolean travelStaffAllowInBaublesSlot = true;
-    public static boolean travelStaffKeybindEnabled = true;
    public static boolean travelStaffBlinkEnabled = true;
    public static boolean travelStaffBlinkThroughSolidBlocksEnabled = true;
    public static boolean travelStaffBlinkThroughClearBlocksEnabled = true;
    public static boolean travelStaffBlinkThroughUnbreakableBlocksEnabled = false;
    public static String[] travelStaffBlinkBlackList = new String[] { "minecraft:bedrock", "Thaumcraft:blockWarded" };
-    public static String travelStaffBaublesType = "UNIVERSAL";
    public static float travelAnchorZoomScale = 0.2f;
    public static boolean travelStaffSearchOptimize = true;
-    public static boolean validateTravelEventServerside = true;

    /** The max distance for travelling to a Travel Anchor. */
    public static int teleportStaffMaxDistance = 2048;
@@ -1039,6 +1037,13 @@ public final class Config {
                "Enable per tick sampling on individual power inputs and outputs. This allows slightly more detailed messages from the RF Reader but has a negative impact on server performance.")
                .getBoolean(detailedPowerTrackingEnabled);

+        enforceOfflinePlayerUUID = config.get(
+                sectionAdvanced.name,
+                "enforceOfflinePlayerUUID",
+                false,
+                "Enforces to use the players offline UUID. Recommendet to use before creating your world, otherwise it might breaks all secuity related things.")
+                .getBoolean(enforceOfflinePlayerUUID);
+
        useSneakMouseWheelYetaWrench = config.get(
                sectionPersonal.name,
                "useSneakMouseWheelYetaWrench",
@@ -1169,19 +1174,6 @@ public final class Config {
                "travelStaffEnabled",
                travelAnchorEnabled,
                "If set to false: the travel staff will not be craftable.").getBoolean(travelStaffEnabled);
-        travelStaffAllowInBaublesSlot = config
-                .get(
-                        sectionStaff.name,
-                        "travelStaffAllowInBaublesSlot",
-                        travelStaffAllowInBaublesSlot,
-                        "If true the travel staff can be put into Baubles slots (requires Baubles to be installed)")
-                .getBoolean(travelStaffAllowInBaublesSlot);
-        travelStaffKeybindEnabled = config.get(
-                sectionStaff.name,
-                "travelStaffKeybindEnabled",
-                travelStaffKeybindEnabled,
-                "If set to false: the Travel Staff Blink keybind will not be useable. (keybind allows when staff is anywhere in inventory, might not be wanted)")
-                .getBoolean(travelStaffKeybindEnabled);
        travelStaffBlinkEnabled = config
                .get(
                        sectionStaff.name,
@@ -1215,13 +1207,6 @@ public final class Config {
                sectionStaff.name,
                travelStaffBlinkBlackList,
                "Lists the blocks that cannot be teleported through in the form 'modID:blockName'");
-        travelStaffBaublesType = config.get(
-                sectionStaff.name,
-                "travelStaffBaublesType",
-                travelStaffBaublesType,
-                "The BaublesType the Travel Staff should be, 'AMULET', 'RING', 'BELT', or 'UNIVERSAL' (requires Baubles to be installed and travelStaffAllowInBaublesSlot to be on)")
-                .getString();
-
        travelAnchorZoomScale = config.getFloat(
                "travelAnchorZoomScale",
                sectionStaff.name,
@@ -1238,13 +1223,6 @@ public final class Config {
                        + "This config is experimental, so if you encounter any strange behavior, please report to GTNH developer.")
                .getBoolean(travelStaffSearchOptimize);

-        validateTravelEventServerside = config.get(
-                sectionStaff.name,
-                "validateTravelEventServerside",
-                validateTravelEventServerside,
-                "If set to true: Server will validate if player actually can teleport. False will allow hacking, but also allows Staff of Traveling Keybind mod to work.")
-                .getBoolean(validateTravelEventServerside);
-
        teleportStaffMaxDistance = config
                .get(
                        sectionStaff.name,
@@ -2114,7 +2092,7 @@ public final class Config {
                sectionMagnet.name,
                "magnetAllowDeactivatedInBaublesSlot",
                magnetAllowDeactivatedInBaublesSlot,
-                "If true the magnet can be put into a Baubles slot even if switched off (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)")
+                "If true the magnet can be put into the 'amulet' Baubles slot even if switched off (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)")
                .getBoolean(magnetAllowDeactivatedInBaublesSlot);

        magnetAllowPowerExtraction = config.get(
@@ -2127,7 +2105,7 @@ public final class Config {
                sectionMagnet.name,
                "magnetBaublesType",
                magnetBaublesType,
-                "The BaublesType the magnet should be, 'AMULET', 'RING', 'BELT', or UNIVERSAL (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)")
+                "The BaublesType the magnet should be, 'AMULET', 'RING' or 'BELT' (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)")
                .getString();

        useCombustionGenModel = config
@@ -27,7 +27,6 @@ public class PacketConfigSync implements IMessage, IMessageHandler<PacketConfigS
        buf.writeInt(Config.teleportStaffFailedBlinkDistance);
        buf.writeBoolean(Config.telepadLockCoords);
        buf.writeBoolean(Config.telepadLockDimension);
-        buf.writeBoolean(Config.travelStaffKeybindEnabled);
    }

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

    @Override
@@ -206,7 +206,6 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
    }

    @Override
-    @Method(modid = "Baubles|API")
    public void onWornTick(ItemStack itemstack, EntityLivingBase player) {
        if (player instanceof EntityPlayer && isActive(itemstack)
                && hasPower(itemstack)
@@ -223,21 +222,17 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
    }

    @Override
-    @Method(modid = "Baubles|API")
    public void onEquipped(ItemStack itemstack, EntityLivingBase player) {}

    @Override
-    @Method(modid = "Baubles|API")
    public void onUnequipped(ItemStack itemstack, EntityLivingBase player) {}

    @Override
-    @Method(modid = "Baubles|API")
    public boolean canEquip(ItemStack itemstack, EntityLivingBase player) {
        return Config.magnetAllowInBaublesSlot && (Config.magnetAllowDeactivatedInBaublesSlot || isActive(itemstack));
    }

    @Override
-    @Method(modid = "Baubles|API")
    public boolean canUnequip(ItemStack itemstack, EntityLivingBase player) {
        return true;
    }
@@ -1,13 +1,8 @@
 package crazypants.enderio.item;

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

 import net.minecraft.init.Blocks;
@@ -8,7 +8,6 @@ import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatComponentTranslation;

 import org.lwjgl.input.Keyboard;

@@ -18,7 +17,6 @@ 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;
@@ -32,7 +30,6 @@ 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;

@@ -58,10 +55,6 @@ 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"),
@@ -113,12 +106,6 @@ public class KeyTracker {
                Keyboard.KEY_NONE,
                EnderIO.lang.localize("category.tools"));
        ClientRegistry.registerKeyBinding(magnetKey);
-
-        staffOfTravelingTPKey = new KeyBinding(
-                EnderIO.lang.localize("keybind.staffoftravelingtp"),
-                Keyboard.KEY_NONE,
-                EnderIO.lang.localize("category.tools"));
-        ClientRegistry.registerKeyBinding(staffOfTravelingTPKey);
    }

    @SubscribeEvent
@@ -132,7 +119,6 @@ public class KeyTracker {
        handleSpeed();
        handleJump();
        handleMagnet();
-        handleStaffOfTravelingTP();
    }

    private void sendEnabledChatMessage(String messageBase, boolean isActive) {
@@ -147,37 +133,6 @@ public class KeyTracker {
        PacketHandler.INSTANCE.sendToServer(new PacketUpgradeState(type, isActive));
    }

-    private void handleStaffOfTravelingTP() {
-        if (staffOfTravelingTPKey.isPressed()) {
-            if (Config.travelStaffKeybindEnabled) {
-                EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-                if (player != null) {
-                    ItemStack travelItem = player.getHeldItem();
-                    if (travelItem == null || travelItem.getItem() == null
-                            || !(travelItem.getItem() instanceof IItemOfTravel)) {
-                        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;
@@ -489,7 +489,11 @@ public abstract class AbstractMachineEntity extends TileEntityEio
        if (stack == null || stack.stackTagCompound == null) {
            return;
        }
-        readCommon(stack.stackTagCompound);
+        NBTTagCompound root = stack.stackTagCompound;
+        if (!root.hasKey("eio.abstractMachine")) {
+            return;
+        }
+        readCommon(root);
    }

    @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,10 +9,7 @@ import com.enderio.core.common.vecmath.VecmathUtil;

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

 public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile {

@@ -12,6 +12,7 @@ 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 {

@@ -49,7 +50,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,19 +1,9 @@
 package crazypants.enderio.machine;

 import static crazypants.enderio.EnderIO.itemBasicCapacitor;
-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 static crazypants.enderio.material.Alloy.*;
+import static crazypants.enderio.material.Material.*;
+import static crazypants.util.RecipeUtil.*;

 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -34,7 +24,6 @@ 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 {

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

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

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

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

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

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

        // KillerJoe
        ItemStack kj = new ItemStack(EnderIO.blockKillerJoe, 1, 0);
-        RecipeUtil.addShaped(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', frankenZombie);
+        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);
-        RecipeUtil
-                .addShaped(wirelessCharger, "sss", "ses", "scs", 's', electricalSteel, 'c', capacitor3, 'e', enderRes);
+        addShaped(wirelessCharger, "sss", "ses", "scs", 's', electricalSteel, 'c', capacitor3, 'e', enderRes);

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

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

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

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

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

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

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

            if (Config.useHardRecipes) {
-                RecipeUtil.addShaped(
+                addShaped(
                        solarPanel,
                        "efe",
                        "pfp",
@@ -494,7 +469,7 @@ public class MachineRecipes {
                        energeticAlloy,
                        'p',
                        phasedGold);
-                RecipeUtil.addShaped(
+                addShaped(
                        advSolarPanel,
                        "efe",
                        "pfp",
@@ -509,7 +484,7 @@ public class MachineRecipes {
                        phasedIron,
                        'p',
                        phasedGold);
-                RecipeUtil.addShaped(
+                addShaped(
                        vibSolarPanel,
                        "efe",
                        "pfp",
@@ -525,7 +500,7 @@ public class MachineRecipes {
                        'p',
                        phasedGold);
            } else {
-                RecipeUtil.addShaped(
+                addShaped(
                        solarPanel,
                        "efe",
                        "pfp",
@@ -540,7 +515,7 @@ public class MachineRecipes {
                        energeticAlloy,
                        'c',
                        redstoneAlloy);
-                RecipeUtil.addShaped(
+                addShaped(
                        advSolarPanel,
                        "efe",
                        "pfp",
@@ -555,7 +530,7 @@ public class MachineRecipes {
                        phasedIron,
                        'c',
                        electricalSteel);
-                RecipeUtil.addShaped(
+                addShaped(
                        vibSolarPanel,
                        "efe",
                        "pfp",
@@ -578,7 +553,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);
-        RecipeUtil.addShaped(
+        addShaped(
                mJMonitor,
                "sms",
                "sMs",
@@ -596,11 +571,11 @@ public class MachineRecipes {

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

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

        // Soul Binder
        Object enderBit;
@@ -613,7 +588,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);
-        RecipeUtil.addShaped(
+        addShaped(
                soulBinder,
                "ses",
                "zmc",
@@ -634,7 +609,7 @@ public class MachineRecipes {
        // Attractor
        ItemStack attractor = new ItemStack(EnderIO.blockAttractor);
        ItemStack attractorCrystal = new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal());
-        RecipeUtil.addShaped(
+        addShaped(
                attractor,
                " c ",
                "ese",
@@ -654,7 +629,7 @@ public class MachineRecipes {
                EnderIO.blockEndermanSkull,
                1,
                BlockEndermanSkull.SkullType.TORMENTED.ordinal());
-        RecipeUtil.addShaped(
+        addShaped(
                aversion,
                " c ",
                "ese",
@@ -671,12 +646,12 @@ public class MachineRecipes {
        // Experience
        ItemStack xp = new ItemStack(EnderIO.blockExperianceOblisk);
        ItemStack xpItem = new ItemStack(EnderIO.itemXpTransfer);
-        RecipeUtil.addShaped(xp, " x ", " s ", "sms", 's', soularium, 'm', machineChassi, 'x', xpItem);
+        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());
-        RecipeUtil.addShaped(
+        addShaped(
                weather,
                " x ",
                "ese",
@@ -711,14 +686,14 @@ public class MachineRecipes {
                EnderIO.blockElectricLight,
                1,
                BlockItemElectricLight.Type.WIRELESS_INV.ordinal());
-        RecipeUtil.addShapeless(wirelessLamp, poweredLamp, enderRes);
-        RecipeUtil.addShapeless(wirelessLamp, wirelessLampInv, Blocks.redstone_torch);
-        RecipeUtil.addShapeless(wirelessLampInv, poweredLampInv, enderRes);
-        RecipeUtil.addShapeless(wirelessLampInv, wirelessLamp, Blocks.redstone_torch);
+        addShapeless(wirelessLamp, poweredLamp, enderRes);
+        addShapeless(wirelessLamp, wirelessLampInv, Blocks.redstone_torch);
+        addShapeless(wirelessLampInv, poweredLampInv, enderRes);
+        addShapeless(wirelessLampInv, wirelessLamp, Blocks.redstone_torch);

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

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

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

        // MJ Reader

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

        // Slice'N'Splice
        ItemStack sns = new ItemStack(EnderIO.blockSliceAndSplice);
-        RecipeUtil.addShaped(
+        addShaped(
                sns,
                "iki",
                "ams",
@@ -833,28 +808,8 @@ public class MachineRecipes {
        ItemStack itemBuffer = Type.getStack(Type.ITEM);
        ItemStack powerBuffer = Type.getStack(Type.POWER);
        ItemStack omniBuffer = Type.getStack(Type.OMNI);
-        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);
+        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);
    }
 }
@@ -4,20 +4,13 @@ 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;
    }
@@ -60,12 +53,4 @@ 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,6 +20,7 @@ import crazypants.enderio.Log;

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

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

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

 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
@@ -120,6 +120,7 @@ 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) {
@@ -143,7 +144,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,14 +1,6 @@
 package crazypants.enderio.machine.obelisk;

-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 static org.lwjgl.opengl.GL11.*;

 import java.util.Random;

@@ -114,7 +106,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(null, 0, 0, 0, getFloatingItem(te));
+            ei = new EntityItem(world, 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,12 +71,14 @@ 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 : new SmartTank(FluidRegistry.WATER, 16000);
+            return tank != null ? tank : dummy;
        }
-        return new SmartTank(FluidRegistry.WATER, 16000);
+        return dummy;
    }

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

-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 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 java.util.ArrayList;

@@ -40,7 +23,6 @@ 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 {

@@ -81,7 +63,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.
-                    RecipeUtil.addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName);
+                    addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName);
                }
            }
            isPrimaryName = true;
@@ -90,7 +72,7 @@ public class MaterialRecipes {
                if (isPrimaryName) {
                    isPrimaryName = false;
                } else {
-                    RecipeUtil.addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName);
+                    addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName);
                }
            }
        }
@@ -105,7 +87,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.
-                    RecipeUtil.addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName);
+                    addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName);
                }
            }
            isPrimaryName = true;
@@ -114,7 +96,7 @@ public class MaterialRecipes {
                if (isPrimaryName) {
                    isPrimaryName = false;
                } else {
-                    RecipeUtil.addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName);
+                    addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName);
                }
            }
        }
@@ -149,9 +131,9 @@ public class MaterialRecipes {
        OreDictionary.registerOre("itemSkull", new ItemStack(EnderIO.blockEndermanSkull));

        // Glass stuff for compatibility
-        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);
+        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);

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

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

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

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

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

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

-            RecipeUtil.addShaped(
+            addShaped(
                    SILVER_CAPACITOR.getItemStack(),
                    " sr",
                    "sis",
@@ -374,7 +356,7 @@ public class MaterialRecipes {
                    "ingotSilver",
                    'i',
                    "ingotLead");
-            RecipeUtil.addShaped(
+            addShaped(
                    ENDERGETIC_CAPACITOR.getItemStack(),
                    " i ",
                    "cCc",
@@ -385,7 +367,7 @@ public class MaterialRecipes {
                    SILVER_CAPACITOR.getItemStack(),
                    'C',
                    "dustCoal");
-            RecipeUtil.addShaped(
+            addShaped(
                    ENDERGISED_CAPACITOR.getItemStack(),
                    " i ",
                    "cCc",
@@ -401,37 +383,37 @@ public class MaterialRecipes {
        // Conduit Binder
        ItemStack cbc = BINDER_COMPOSITE.getStack(8);
        if (Config.useAlternateBinderRecipe) {
-            RecipeUtil.addShaped(cbc, "gcg", "sgs", "gcg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball);
+            addShaped(cbc, "gcg", "sgs", "gcg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball);
        } else {
-            RecipeUtil.addShaped(cbc, "ggg", "scs", "ggg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball);
+            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());
-        RecipeUtil.addShapeless(phasedIronNugget, phasedIron);
+        addShapeless(phasedIronNugget, phasedIron);
        phasedIronNugget = phasedIronNugget.copy();
        phasedIronNugget.stackSize = 1;
-        RecipeUtil.addShaped(PHASED_IRON.getStackIngot(), "eee", "eee", "eee", 'e', phasedIronNugget);
+        addShaped(PHASED_IRON.getStackIngot(), "eee", "eee", "eee", 'e', phasedIronNugget);

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

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

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

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

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

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

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

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

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

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

        // Machine Chassis

@@ -469,10 +451,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";
-        RecipeUtil.addShaped(chassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', mat, 'c', capacitor);
+        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());
-        RecipeUtil.addShaped(
+        addShaped(
                soulchassis,
                "fif",
                "ici",
@@ -488,7 +470,7 @@ public class MaterialRecipes {
                EnderIO.itemMachinePart,
                1,
                MachinePart.END_STEEL_MACHINE_CHASSIS.ordinal());
-        RecipeUtil.addShaped(
+        addShaped(
                endchassis,
                "fif",
                "ici",
@@ -502,8 +484,8 @@ public class MaterialRecipes {

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

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

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

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

        for (Alloy alloy : Alloy.values()) {
-            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());
+            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());
        }

        for (AlloyEndergy alloy : AlloyEndergy.values()) {
-            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());
+            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());
        }

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

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

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

-        if (OreDictionaryHelper.hasCopper()) {
+        if (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 (OreDictionaryHelper.hasTin()) {
+        if (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,10 +1,6 @@
 package crazypants.enderio.material;

-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;
+import static com.enderio.core.common.util.OreDictionaryHelper.*;

 public enum PowderIngot {

@@ -112,6 +112,6 @@ public class ItemTeleportStaff extends ItemTravelStaff {

    @Override
    public boolean isActive(EntityPlayer ep, ItemStack equipped) {
-        return (ep != null && equipped != null);
+        return isEquipped(ep);
    }
 }
@@ -4,7 +4,6 @@ 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;
@@ -13,11 +12,7 @@ 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;
@@ -29,8 +24,7 @@ import crazypants.enderio.api.teleport.TravelSource;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.power.PowerDisplayUtil;

-@Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles|API")
-public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTravel, IResourceTooltipProvider, IBauble {
+public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTravel, IResourceTooltipProvider {

    public static boolean isEquipped(EntityPlayer ep) {
        if (ep == null || ep.getCurrentEquippedItem() == null) {
@@ -180,7 +174,7 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTrave

    @Override
    public boolean isActive(EntityPlayer ep, ItemStack equipped) {
-        return (ep != null && equipped != null);
+        return isEquipped(ep);
    }

    @Override
@@ -190,45 +184,7 @@ 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,18 +16,9 @@ import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
-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.util.*;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.common.MinecraftForge;
@@ -65,7 +56,6 @@ 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 {

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

-    /**
-     * @return the error message, or null if the packet is valid.
-     */
-    public String validatePacketTravelEvent(EntityPlayerMP toTp, int x, int y, int z, int powerUse,
+    public boolean 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 "dist check fail";
-        // allow 4 blocks of c/s player pos desync
-        if (getPower(toTp, source, target, -4F) > powerUse) return "power use too little";
+        if (dist * 100 > source.getMaxDistanceTravelledSq() * 115) return false;
+        if (powerUse < getRequiredPower(toTp, source, target)) return false;
        ItemStack equippedItem = toTp.getCurrentEquippedItem();
        switch (source) {
            case TELEPAD:
                // this source is invalid for this type of packet
-                return "invalid travel source";
+                return false;
            case BLOCK:
                // this source is only triggered when player is on any active travel anchor
                BlockCoord on = getActiveTravelBlock(toTp);
-                if (on == null) return "on anchor is null";
+                if (on == null) return false;
                // 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 null;
+                if (on.x == x && on.z == z) return true;
                // or another anchor
                TileEntity maybeAnchor = target.getTileEntity(toTp.worldObj);
-                if (!(maybeAnchor instanceof ITravelAccessable)) return "not anchor";
+                if (!(maybeAnchor instanceof ITravelAccessable)) return false;
                ITravelAccessable anchor = (ITravelAccessable) maybeAnchor;
-                if (!anchor.canBlockBeAccessed(toTp) && isValidTarget(toTp, target, TravelSource.BLOCK)) {
-                    return "not valid target";
-                }
-                return null;
+                return anchor.canBlockBeAccessed(toTp) || !isValidTarget(toTp, target, TravelSource.BLOCK);
            case STAFF:
            case STAFF_BLINK:
-                if (Config.travelStaffKeybindEnabled) {
-                    if (equippedItem == null || equippedItem.getItem() == null
-                            || !(equippedItem.getItem() instanceof IItemOfTravel)) {
-                        equippedItem = findTravelItemInInventoryOrBaubles(toTp);
-                    }
-                }
-                if (equippedItem == null || !(equippedItem.getItem() instanceof IItemOfTravel)) return "not staff";
-                if (!((IItemOfTravel) equippedItem.getItem()).isActive(toTp, equippedItem)) return "staff not active";
+                if (equippedItem == null || !(equippedItem.getItem() instanceof IItemOfTravel)) return false;
+                if (!((IItemOfTravel) equippedItem.getItem()).isActive(toTp, equippedItem)) return false;
                int energy = ((IItemOfTravel) equippedItem.getItem()).canExtractInternal(equippedItem, powerUse);
-                if (energy != -1 && energy != powerUse) {
-                    return "not enough power";
-                }
-                return null;
+                return energy == -1 || energy == powerUse;
            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
-                if (equippedItem != null && equippedItem.getItem() instanceof ItemTeleportStaff) {
-                    return null;
-                }
-                return "not staff";
+                return equippedItem != null && equippedItem.getItem() instanceof ItemTeleportStaff;
            default:
                throw new AssertionError("unidentified travel source");
        }
@@ -619,99 +586,25 @@ public class TravelController {
        return getTravelItemTravelSource(ep) != null;
    }

-    /** Returns null if no travel item is in inventory/baubles. */
+    /** Returns null if no travel item is equipped. */
    @Nullable
    public TravelSource getTravelItemTravelSource(EntityPlayer ep) {
-        if (ep == null) {
+        if (ep == null || ep.getCurrentEquippedItem() == null) {
            return null;
        }
-
        ItemStack equipped = ep.getCurrentEquippedItem();
-        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;
-                }
+        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);
    }
@@ -769,11 +662,7 @@ public class TravelController {
        }
        int requiredPower;
        ItemStack staff = player.getCurrentEquippedItem();
-        if (staff == null || !(staff.getItem() instanceof IItemOfTravel)) {
-            staff = findTravelItemInInventoryOrBaubles(player);
-        }
-
-        requiredPower = getPower(player, source, coord, 0F);
+        requiredPower = (int) (getDistance(player, coord) * source.getPowerCostPerBlockTraveledRF());
        int canUsePower = getEnergyInTravelItem(staff);
        if (requiredPower > canUsePower) {
            // make sure chat is sent only once per trial
@@ -786,10 +675,6 @@ 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;
    }
@@ -1099,7 +984,7 @@ public class TravelController {
        return null;
    }

-    public static void showMessage(EntityPlayer player, IChatComponent chatComponent) {
+    private static void showMessage(EntityPlayer player, IChatComponent chatComponent) {
        if (Loader.isModLoaded("gtnhlib")) {
            if (player instanceof EntityPlayerMP) {
                chatComponent.setChatStyle(new ChatStyle().setColor(EnumChatFormatting.WHITE));
@@ -3,7 +3,6 @@ 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;
@@ -19,7 +18,6 @@ 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> {
@@ -85,14 +83,12 @@ public class PacketTravelEvent implements IMessage, IMessageHandler<PacketTravel

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

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

@@ -130,35 +126,18 @@ public class PacketTravelEvent implements IMessage, IMessageHandler<PacketTravel
            if (conserveMotion) {
                Vector3d velocityVex = Util.getLookVecEio(player);
                S12PacketEntityVelocity p = new S12PacketEntityVelocity(
-                        player.getEntityId(),
+                        toTp.getEntityId(),
                        velocityVex.x,
                        velocityVex.y,
                        velocityVex.z);
                ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(p);
            }

-            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();
+            if (powerUse > 0 && player.getCurrentEquippedItem() != null
+                    && player.getCurrentEquippedItem().getItem() instanceof IItemOfTravel) {
+                ItemStack item = player.getCurrentEquippedItem().copy();
                ((IItemOfTravel) item.getItem()).extractInternal(item, powerUse);
-                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);
-                }
+                toTp.setCurrentItemOrArmor(0, item);
            }
        }

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

-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 static org.lwjgl.opengl.GL11.*;

 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,8 +1,6 @@
 package crazypants.enderio.waila;

-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 static crazypants.enderio.waila.IWailaInfoProvider.*;

 import java.text.MessageFormat;
 import java.util.List;
@@ -125,6 +123,8 @@ 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,6 +188,8 @@ 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;
@@ -263,7 +265,7 @@ public class WailaCompat implements IWailaDataProvider {
        }

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

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

-    private void getWailaBodyConduitBundle(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor) {
+    private void getWailaBodyConduitBundle(ItemStack itemStack, List<String> currenttip) {
        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");
@@ -316,7 +318,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);
@@ -348,7 +350,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");
@@ -407,4 +409,7 @@ public class WailaCompat implements IWailaDataProvider {
        return tag;
    }

+    public static NBTTagCompound getNBTData() {
+        return _accessor.getNBTData();
+    }
 }
@@ -4,8 +4,9 @@ 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}
+ *
 */
 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,8 +10,9 @@ 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 {

@@ -6,6 +6,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.common.UsernameCache;

 import com.enderio.core.common.util.PlayerUtil;
@@ -13,6 +14,7 @@ import com.google.common.base.Charsets;
 import com.mojang.authlib.GameProfile;

 import crazypants.enderio.Log;
+import crazypants.enderio.config.Config;

 public class UserIdent {

@@ -76,7 +78,7 @@ public class UserIdent {
     * changes, implement them and write a log message.
     */
    public static @Nonnull UserIdent create(@Nonnull String suuid, @Nullable String playerName) {
-        if (NONE_MARKER.equals(suuid)) {
+        if (NONE_MARKER.equals(suuid) || Config.enforceOfflinePlayerUUID) {
            return new UserIdent(null, playerName);
        }
        try {
@@ -110,8 +112,7 @@ public class UserIdent {
     */
    public static @Nonnull UserIdent create(@Nullable GameProfile gameProfile) {
        if (gameProfile != null && (gameProfile.getId() != null || gameProfile.getName() != null)) {
-            if (gameProfile.getId() != null && gameProfile.getName() != null
-                    && gameProfile.getId().equals(offlineUUID(gameProfile.getName()))) {
+            if (gameProfile.getName() != null && (Config.enforceOfflinePlayerUUID || !isOnlineMode())) {
                return new UserIdent(null, gameProfile.getName());
            } else {
                return new UserIdent(gameProfile.getId(), gameProfile.getName());
@@ -121,6 +122,11 @@ public class UserIdent {
        }
    }

+    private static boolean isOnlineMode() {
+        MinecraftServer server = MinecraftServer.getServer();
+        return server != null ? server.isServerInOnlineMode() : true;
+    }
+
    private static @Nonnull UUID offlineUUID(String playerName) {
        UUID result = UUID.nameUUIDFromBytes(("OfflinePlayer:" + playerName).getBytes(Charsets.UTF_8));
        return result != null ? result : new UUID(-1, -1);
@@ -221,6 +227,9 @@ public class UserIdent {

        @Override
        public boolean equals(Object obj) {
+            if (obj instanceof UUID) {
+                return getUUID().equals(obj);
+            }
            return this == obj;
        }

@@ -93,11 +93,6 @@ 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
@@ -731,7 +726,6 @@ 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
@@ -1392,7 +1386,6 @@ 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
Pilzinsel64	3ef15ad081	Merge branch 'GTNewHorizons:master' into master	2023-07-24 09:58:04 +02:00
Pilzinsel64	1d92c0dd7f	Merge branch 'GTNewHorizons:master' into master	2023-05-09 20:21:53 +02:00
Pilzinsel64	13d6533edc	Merge branch 'GTNewHorizons:master' into master	2023-05-08 18:14:50 +02:00
Pilzinsel64	a4373ebe5c	Merge branch 'GTNewHorizons:master' into master	2023-05-08 08:05:01 +02:00
Pilzinsel64	f91de79376	Merge branch 'GTNewHorizons:master' into master	2023-05-01 23:14:59 +02:00
Pilzinsel64	567cd3e78b	Merge branch 'GTNewHorizons:master' into master	2023-04-30 20:08:08 +02:00
Pilzinsel64	84e23b3e8e	add config `enforceOfflinePlayerUUID`	2023-04-17 17:20:15 +02:00
Pilzinsel64	eba2bf1f86	re-add .github	2023-04-17 14:03:56 +02:00
Pilzinsel64	47bd83e29e	remove .github	2023-04-17 14:03:43 +02:00
Pilzinsel64	f7b49fccdd	Fix invalid check for offline UUID in `UserIdent.create()` (#2 ) See more: https://github.com/GTNewHorizons/EnderIO/pull/118	2023-04-17 13:34:53 +02:00