Update dependencies.gradle

* Update dependencies

* Replace faulty dummy object logic with object creation

* Remove logic that is exiting a function erroneously

build.gradle

@@ -1,4 +1,4 @@
-//version: 1690104383
+//version: 1702141377
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -28,27 +28,12 @@ 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()
     }
 }
@@ -69,7 +54,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.21'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.26'
 }
 
 print("You might want to check out './gradlew :faq' if your build fails.\n")
@@ -89,6 +74,23 @@ 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")
@@ -140,6 +142,17 @@ 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/"
@@ -274,7 +287,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)
@@ -401,9 +414,13 @@ if (identifiedVersion == versionOverride) {
 
 group = "com.github.GTNewHorizons"
 if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
-    archivesBaseName = customArchiveBaseName
+    base {
+        archivesName = customArchiveBaseName
+    }
 } else {
-    archivesBaseName = modId
+    base {
+        archivesName = modId
+    }
 }
 
 
@@ -558,9 +575,6 @@ repositories {
     maven {
         name 'Overmind forge repo mirror'
         url 'https://gregtech.overminddl1.com/'
-        mavenContent {
-            excludeGroup("net.minecraftforge") // missing the `universal` artefact
-        }
     }
     maven {
         name = "GTNH Maven"
@@ -599,15 +613,10 @@ repositories {
         }
         maven {
             name = "ic2"
-            url = "https://maven.ic2.player.to/"
-            metadataSources {
-                mavenPom()
-                artifact()
+            url = getURL("https://maven2.ic2.player.to/", "https://maven.ic2.player.to/")
+            content {
+                includeGroup "net.industrial-craft"
             }
-        }
-        maven {
-            name = "ic2-mirror"
-            url = "https://maven2.ic2.player.to/"
             metadataSources {
                 mavenPom()
                 artifact()
@@ -622,11 +631,13 @@ repositories {
 
 def mixinProviderGroup = "io.github.legacymoddingmc"
 def mixinProviderModule = "unimixins"
-def mixinProviderVersion = "0.1.7.1"
+def mixinProviderVersion = "0.1.13"
 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')
@@ -638,7 +649,7 @@ dependencies {
         }
     }
     if (usesMixins.toBoolean()) {
-        implementation(modUtils.enableMixins(mixinProviderSpec))
+        implementation(modUtils.enableMixins(mixinProviderSpec, mixingConfigRefMap))
     } else if (forceEnableMixins.toBoolean()) {
         runtimeOnlyNonPublishable(mixinProviderSpec)
     }
@@ -661,6 +672,8 @@ 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')
     }
 }
 
@@ -691,8 +704,6 @@ 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"
@@ -769,23 +780,14 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
 }
 
 dependencies {
-    def lwjgl3ifyVersion = '1.4.0'
-    def asmVersion = '9.4'
+    def lwjgl3ifyVersion = '1.5.7'
     if (modId != 'lwjgl3ify') {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.19')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
     }
 
-    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}
 }
 
@@ -1148,7 +1150,10 @@ tasks.named("processIdeaSettings").configure {
 
 tasks.named("ideVirtualMainClasses").configure {
     // Make IntelliJ "Build project" build the mod jars
-    dependsOn("jar", "reobfJar", "spotlessCheck")
+    dependsOn("jar", "reobfJar")
+    if (!disableSpotless) {
+        dependsOn("spotlessCheck")
+    }
 }
 
 // workaround variable hiding in pom processing
@@ -1169,9 +1174,8 @@ publishing {
             version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
         }
     }
-
     repositories {
-        if (usesMavenPublishing.toBoolean()) {
+        if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) {
             maven {
                 url = mavenPublishUrl
                 allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
@@ -1293,7 +1297,7 @@ def addCurseForgeRelation(String type, String name) {
 
 // Updating
 
-def buildscriptGradleVersion = "8.2.1"
+def buildscriptGradleVersion = "8.5"
 
 tasks.named('wrapper', Wrapper).configure {
     gradleVersion = buildscriptGradleVersion
@@ -1572,6 +1576,25 @@ 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'

dependencies.gradle

@@ -1,22 +1,22 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.2.16:dev')
-    implementation('com.github.GTNewHorizons:ForestryMC:4.6.13:dev')
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.76-GTNH:dev')
+    api('com.github.GTNewHorizons:EnderCore:0.2.19:dev')
+    implementation('com.github.GTNewHorizons:ForestryMC:4.7.0:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev')
     implementation("com.github.GTNewHorizons:GTNHLib:0.0.13:dev")
-    api('com.github.GTNewHorizons:BuildCraft:7.1.36:dev')
+    api('com.github.GTNewHorizons:BuildCraft:7.1.38:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
 
-    compileOnly('com.github.GTNewHorizons:waila:1.6.0:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-240-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.140:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.14.6:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.12.0-GTNH:api') {transitive = false}
-    implementation('com.github.GTNewHorizons:Chisel:2.11.3-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.12-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.6.5:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-291-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.3:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.106:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.15.2:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.12.1-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.19-GTNH:api') {transitive = false}
     compileOnly('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

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

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

@@ -788,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() {

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

@@ -94,11 +94,10 @@ public interface ITelePad extends ITravelAccessable {
     /**
      * Util method to set all coords using a {@link BlockCoord} object.
      *
+     * @param coords The coords to set this telepad to.
      * @see #setX(int)
      * @see #setY(int)
      * @see #setZ(int)
-     *
-     * @param coords The coords to set this telepad to.
      */
     void setCoords(BlockCoord coords);
 

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

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

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

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

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

@@ -47,7 +47,13 @@ import crazypants.enderio.api.tool.ITool;
 import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType;
 import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.geom.ConduitConnectorType;
-import crazypants.enderio.conduit.gui.*;
+import crazypants.enderio.conduit.gui.ExternalConnectionContainer;
+import crazypants.enderio.conduit.gui.GuiExternalConnection;
+import crazypants.enderio.conduit.gui.GuiExternalConnectionSelector;
+import crazypants.enderio.conduit.gui.PacketFluidChannel;
+import crazypants.enderio.conduit.gui.PacketFluidFilter;
+import crazypants.enderio.conduit.gui.PacketOpenConduitUI;
+import crazypants.enderio.conduit.gui.PacketSlotVisibility;
 import crazypants.enderio.conduit.gui.item.PacketExistingItemFilterSnapshot;
 import crazypants.enderio.conduit.gui.item.PacketModItemFilter;
 import crazypants.enderio.conduit.liquid.PacketFluidLevel;
@@ -635,8 +641,8 @@ public class BlockConduitBundle extends BlockEio
 
     @Override
     public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player) {
-        ItemStack equipped = player.getCurrentEquippedItem();
-        if (!player.isSneaking() || equipped == null || equipped.getItem() != EnderIO.itemYetaWench) {
+        ITool tool = ToolUtil.getEquippedTool(player);
+        if (!player.isSneaking() || tool == null || !tool.canUse(player.getCurrentEquippedItem(), player, x, y, z)) {
             return;
         }
         ConduitUtil.openConduitGui(world, x, y, z, player);

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

@@ -1,6 +1,15 @@
 package crazypants.enderio.conduit;
 
-import static crazypants.enderio.gui.IconEIO.*;
+import static crazypants.enderio.gui.IconEIO.CROSS;
+import static crazypants.enderio.gui.IconEIO.TICK;
+import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_FLUID;
+import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_FLUID_OFF;
+import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_ITEM;
+import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_ITEM_OFF;
+import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_POWER;
+import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_POWER_OFF;
+import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_REDSTONE;
+import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_REDSTONE_OFF;
 
 import java.util.List;
 
@@ -55,11 +64,10 @@ public class ConduitDisplayMode {
      * Use this constructor if you have custom display logic, it will use {@code IConduit.class} as the conduitType, and
      * the passed name as the override name.
      *
-     * @see #ConduitDisplayMode(Class, IWidgetIcon, IWidgetIcon)
-     *
      * @param name             The override name.
      * @param widgetSelected   The widget to render when this type is selected.
      * @param widgetUnselected The widget to render when this type is unselected.
+     * @see #ConduitDisplayMode(Class, IWidgetIcon, IWidgetIcon)
      */
     public ConduitDisplayMode(String name, IWidgetIcon widgetSelected, IWidgetIcon widgetUnselected) {
         this(IConduit.class, widgetSelected, widgetUnselected);

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

@@ -1,9 +1,20 @@
 package crazypants.enderio.conduit;
 
 import static crazypants.enderio.ModObject.blockPainter;
-import static crazypants.enderio.material.Alloy.*;
-import static crazypants.enderio.material.Material.*;
-import static crazypants.enderio.material.endergy.AlloyEndergy.*;
+import static crazypants.enderio.material.Alloy.CONDUCTIVE_IRON;
+import static crazypants.enderio.material.Alloy.ELECTRICAL_STEEL;
+import static crazypants.enderio.material.Alloy.END_STEEL;
+import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY;
+import static crazypants.enderio.material.Alloy.PHASED_GOLD;
+import static crazypants.enderio.material.Alloy.REDSTONE_ALLOY;
+import static crazypants.enderio.material.Material.CONDUIT_BINDER;
+import static crazypants.enderio.material.Material.PHASED_IRON_NUGGET;
+import static crazypants.enderio.material.endergy.AlloyEndergy.CRUDE_STEEL;
+import static crazypants.enderio.material.endergy.AlloyEndergy.CRYSTALLINE_ALLOY;
+import static crazypants.enderio.material.endergy.AlloyEndergy.CRYSTALLINE_PINK_SLIME;
+import static crazypants.enderio.material.endergy.AlloyEndergy.ENERGETIC_SILVER;
+import static crazypants.enderio.material.endergy.AlloyEndergy.MELODIC_ALLOY;
+import static crazypants.enderio.material.endergy.AlloyEndergy.STELLAR_ALLOY;
 import static crazypants.util.RecipeUtil.addShaped;
 
 import net.minecraft.init.Blocks;

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

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

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

@@ -50,7 +50,6 @@ import crazypants.enderio.conduit.power.IPowerConduit;
 import crazypants.enderio.conduit.redstone.IRedstoneConduit;
 import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit;
 import crazypants.enderio.config.Config;
-import li.cil.oc.api.network.*;
 import li.cil.oc.api.network.Message;
 import li.cil.oc.api.network.Node;
 import mekanism.api.gas.Gas;

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

@@ -1,6 +1,7 @@
 package crazypants.enderio.conduit.gui;
 
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Rectangle;
 import java.util.ArrayList;
 
 import javax.annotation.Nonnull;

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

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

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

@@ -612,8 +612,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
 
     @Override
     public ItemStack createItem() {
-        ItemStack result = new ItemStack(EnderIO.itemItemConduit, 1, metaData);
-        return result;
+        return new ItemStack(EnderIO.itemItemConduit, 1, metaData);
     }
 
     @Override

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

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

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

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

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

@@ -13,7 +13,6 @@ import crazypants.enderio.EnderIOTab;
 import crazypants.enderio.ModObject;
 
 /**
- *
  * @author matthias
  */
 public class ItemPowerItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider {

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

@@ -19,7 +19,6 @@ import crazypants.enderio.conduit.item.NetworkedInventory;
 import io.netty.buffer.ByteBuf;
 
 /**
- *
  * @author matthias
  */
 public class PowerItemFilter implements IItemFilter {

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

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

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

@@ -1,6 +1,10 @@
 package crazypants.enderio.conduit.liquid;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;

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

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

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

@@ -1,7 +1,14 @@
 package crazypants.enderio.conduit.render;
 
-import static com.enderio.core.client.render.CubeRenderer.*;
-import static net.minecraftforge.common.util.ForgeDirection.*;
+import static com.enderio.core.client.render.CubeRenderer.addVecWithUV;
+import static com.enderio.core.client.render.CubeRenderer.setupVertices;
+import static com.enderio.core.client.render.CubeRenderer.verts;
+import static net.minecraftforge.common.util.ForgeDirection.DOWN;
+import static net.minecraftforge.common.util.ForgeDirection.EAST;
+import static net.minecraftforge.common.util.ForgeDirection.NORTH;
+import static net.minecraftforge.common.util.ForgeDirection.SOUTH;
+import static net.minecraftforge.common.util.ForgeDirection.UP;
+import static net.minecraftforge.common.util.ForgeDirection.WEST;
 
 import java.util.Collection;
 import java.util.List;

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

@@ -1,8 +1,13 @@
 package crazypants.enderio.item;
 
-import static crazypants.enderio.material.Alloy.*;
+import static crazypants.enderio.material.Alloy.CONDUCTIVE_IRON;
+import static crazypants.enderio.material.Alloy.DARK_STEEL;
+import static crazypants.enderio.material.Alloy.ELECTRICAL_STEEL;
+import static crazypants.enderio.material.Alloy.END_STEEL;
+import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY;
+import static crazypants.enderio.material.Alloy.SOULARIUM;
 import static crazypants.enderio.material.Material.VIBRANT_CYSTAL;
-import static crazypants.enderio.material.endergy.AlloyEndergy.*;
+import static crazypants.enderio.material.endergy.AlloyEndergy.STELLAR_ALLOY;
 import static crazypants.util.RecipeUtil.addShaped;
 
 import net.minecraft.init.Blocks;

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

@@ -333,7 +333,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe
 
     @Override
     public int canExtractInternal(ItemStack equipped, int power) {
-        return extractEnergy(equipped, power, true);
+        return Math.min(getEnergyStored(equipped), power);
     }
 
     private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) {

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

@@ -396,7 +396,7 @@ public class ItemDarkSteelSword extends ItemSword
 
     @Override
     public int canExtractInternal(ItemStack equipped, int power) {
-        return extractEnergy(equipped, power, true);
+        return Math.min(getEnergyStored(equipped), power);
     }
 
     private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) {

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

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

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

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

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

@@ -9,7 +9,10 @@ import com.enderio.core.common.vecmath.VecmathUtil;
 
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.network.PacketHandler;
-import crazypants.enderio.power.*;
+import crazypants.enderio.power.Capacitors;
+import crazypants.enderio.power.ICapacitor;
+import crazypants.enderio.power.IInternalPoweredTile;
+import crazypants.enderio.power.PowerHandlerUtil;
 
 public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile {
 

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

@@ -12,7 +12,6 @@ import crazypants.enderio.machine.recipe.RecipeBonusType;
  * progress' recipe for a machine is stored to and retrieved from a machines TileEntity soley based on its UID.
  *
  * @author cp
- *
  */
 public interface IMachineRecipe {
 
@@ -50,7 +49,7 @@ public interface IMachineRecipe {
     /**
      * Returns the output from a single 'cycle' of the recipe (even if the inputs would allow the recipe to be crafted
      * several times).
-     *
+     * <p>
      * This method must not return null. If no output is generated an empty array should be returned.
      *
      * @param randomChance a random number to be used as a seed for determining whether '% chance' outputs are returned.

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

@@ -1,9 +1,19 @@
 package crazypants.enderio.machine;
 
 import static crazypants.enderio.EnderIO.itemBasicCapacitor;
-import static crazypants.enderio.material.Alloy.*;
-import static crazypants.enderio.material.Material.*;
-import static crazypants.util.RecipeUtil.*;
+import static crazypants.enderio.material.Alloy.DARK_STEEL;
+import static crazypants.enderio.material.Alloy.ELECTRICAL_STEEL;
+import static crazypants.enderio.material.Alloy.END_STEEL;
+import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY;
+import static crazypants.enderio.material.Alloy.PHASED_GOLD;
+import static crazypants.enderio.material.Alloy.PHASED_IRON;
+import static crazypants.enderio.material.Alloy.REDSTONE_ALLOY;
+import static crazypants.enderio.material.Alloy.SOULARIUM;
+import static crazypants.enderio.material.Material.CONDUIT_BINDER;
+import static crazypants.enderio.material.Material.ENDER_CRYSTAL;
+import static crazypants.enderio.material.Material.PULSATING_CYSTAL;
+import static crazypants.enderio.material.Material.SILICON;
+import static crazypants.enderio.material.Material.VIBRANT_CYSTAL;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -24,6 +34,7 @@ import crazypants.enderio.material.FrankenSkull;
 import crazypants.enderio.material.MachinePart;
 import crazypants.enderio.material.Material;
 import crazypants.enderio.power.Capacitors;
+import crazypants.util.RecipeUtil;
 
 public class MachineRecipes {
 
@@ -62,13 +73,24 @@ public class MachineRecipes {
         String silicon = SILICON.oreDict;
 
         if (Config.addPeacefulRecipes) {
-            addShaped(frankenZombie, "gdg", "dzd", "gdg", 'g', "ingotGold", 'd', "gemDiamond", 'z', zombieController);
-            addShaped(sentientEnder, "ddd", "ded", "dgd", 'g', "blockGold", 'd', "gemDiamond", 'e', enderRes);
+            RecipeUtil.addShaped(
+                    frankenZombie,
+                    "gdg",
+                    "dzd",
+                    "gdg",
+                    'g',
+                    "ingotGold",
+                    'd',
+                    "gemDiamond",
+                    'z',
+                    zombieController);
+            RecipeUtil
+                    .addShaped(sentientEnder, "ddd", "ded", "dgd", 'g', "blockGold", 'd', "gemDiamond", 'e', enderRes);
         }
 
         // stirling gen
         ItemStack stirlingGen = new ItemStack(EnderIO.blockStirlingGenerator, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                 stirlingGen,
                 "bbb",
                 "bfb",
@@ -85,7 +107,7 @@ public class MachineRecipes {
         // Combustion Gen
         ItemStack res = new ItemStack(EnderIO.blockTank, 1, 0);
         ItemStack comGen = new ItemStack(EnderIO.blockCombustionGenerator, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                 comGen,
                 "eee",
                 "rmr",
@@ -103,7 +125,7 @@ public class MachineRecipes {
 
         // ZombieGen
         ItemStack zg = new ItemStack(EnderIO.blockZombieGenerator, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                 zg,
                 "eee",
                 "qzq",
@@ -117,7 +139,7 @@ public class MachineRecipes {
 
         // FrankenzombieGen
         ItemStack fg = new ItemStack(EnderIO.blockFrankenZombieGenerator, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                 fg,
                 "eee",
                 "qzq",
@@ -131,7 +153,7 @@ public class MachineRecipes {
 
         // EnderGen
         ItemStack eg = new ItemStack(EnderIO.blockEnderGenerator, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                 eg,
                 "eee",
                 "qzq",
@@ -145,17 +167,18 @@ public class MachineRecipes {
 
         // KillerJoe
         ItemStack kj = new ItemStack(EnderIO.blockKillerJoe, 1, 0);
-        addShaped(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', frankenZombie);
+        RecipeUtil.addShaped(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', frankenZombie);
 
         // Wireless charger
         ItemStack wirelessCharger = new ItemStack(EnderIO.blockWirelessCharger);
         // addShaped(wirelessCharger, "svs", "imi", "scs", 's', electricSteel, 'i', silicon, 'm', machineChassi, 'c',
         // capacitor3, 'v', vibCry);
-        addShaped(wirelessCharger, "sss", "ses", "scs", 's', electricalSteel, 'c', capacitor3, 'e', enderRes);
+        RecipeUtil
+                .addShaped(wirelessCharger, "sss", "ses", "scs", 's', electricalSteel, 'c', capacitor3, 'e', enderRes);
 
         // Crafter
         ItemStack crafter = new ItemStack(EnderIO.blockCrafter, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                 crafter,
                 "iti",
                 "imi",
@@ -177,7 +200,7 @@ public class MachineRecipes {
         } else {
             zombieBit = zombieController;
         }
-        addShaped(
+        RecipeUtil.addShaped(
                 poweredSpawner,
                 "ese",
                 "eme",
@@ -202,15 +225,16 @@ public class MachineRecipes {
             } else {
                 glassSides = "glass";
             }
-            addShaped(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz);
+            RecipeUtil
+                    .addShaped(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz);
         }
 
         // Tanks
         ItemStack basicTank = new ItemStack(EnderIO.blockTank, 1, 0);
-        addShaped(basicTank, "ibi", "bgb", "ibi", 'g', "glass", 'i', "ingotIron", 'b', Blocks.iron_bars);
+        RecipeUtil.addShaped(basicTank, "ibi", "bgb", "ibi", 'g', "glass", 'i', "ingotIron", 'b', Blocks.iron_bars);
 
         ItemStack advTank = new ItemStack(EnderIO.blockTank, 1, 1);
-        addShaped(
+        RecipeUtil.addShaped(
                 advTank,
                 "ibi",
                 "bgb",
@@ -225,7 +249,7 @@ public class MachineRecipes {
         // mill
         ItemStack crusher = new ItemStack(EnderIO.blockCrusher, 1, 0);
         if (Config.useHardRecipes) {
-            addShaped(
+            RecipeUtil.addShaped(
                     crusher,
                     "ooo",
                     "fmf",
@@ -241,7 +265,7 @@ public class MachineRecipes {
                     'o',
                     Blocks.obsidian);
         } else {
-            addShaped(
+            RecipeUtil.addShaped(
                     crusher,
                     "fff",
                     "imi",
@@ -259,7 +283,7 @@ public class MachineRecipes {
         // alloy smelter
         ItemStack alloySmelter = new ItemStack(EnderIO.blockAlloySmelter, 1, 0);
         if (Config.useHardRecipes) {
-            addShaped(
+            RecipeUtil.addShaped(
                     alloySmelter,
                     "bfb",
                     "fmf",
@@ -273,7 +297,7 @@ public class MachineRecipes {
                     'f',
                     Blocks.furnace);
         } else {
-            addShaped(
+            RecipeUtil.addShaped(
                     alloySmelter,
                     "bfb",
                     "fmf",
@@ -290,7 +314,7 @@ public class MachineRecipes {
 
         // Vat
         ItemStack still = new ItemStack(EnderIO.blockVat, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                 still,
                 "eve",
                 "tmt",
@@ -310,13 +334,14 @@ public class MachineRecipes {
 
         ItemStack capBank1 = BlockItemCapBank
                 .createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.SIMPLE), 0);
-        addShaped(capBank1, "bcb", "cmc", "bcb", 'b', "ingotIron", 'c', capacitor, 'm', "blockRedstone");
+        RecipeUtil.addShaped(capBank1, "bcb", "cmc", "bcb", 'b', "ingotIron", 'c', capacitor, 'm', "blockRedstone");
         ItemStack capBank2 = BlockItemCapBank
                 .createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.ACTIVATED), 0);
-        addShaped(capBank2, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor2, 'm', "blockRedstone");
+        RecipeUtil
+                .addShaped(capBank2, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor2, 'm', "blockRedstone");
         ItemStack capBank3 = BlockItemCapBank
                 .createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.VIBRANT), 0);
-        addShaped(capBank3, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor3, 'm', vibCry);
+        RecipeUtil.addShaped(capBank3, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor3, 'm', vibCry);
 
         ConvertOldRecipe convertRecipe = new ConvertOldRecipe();
         GameRegistry.addRecipe(convertRecipe);
@@ -351,7 +376,7 @@ public class MachineRecipes {
         // painter
         ItemStack painter = new ItemStack(EnderIO.blockPainter, 1, 0);
         if (Config.useHardRecipes) {
-            addShaped(
+            RecipeUtil.addShaped(
                     painter,
                     "qqq",
                     "mdm",
@@ -367,7 +392,7 @@ public class MachineRecipes {
                     'd',
                     "gemDiamond");
         } else {
-            addShaped(
+            RecipeUtil.addShaped(
                     painter,
                     "qdq",
                     "mMm",
@@ -391,7 +416,7 @@ public class MachineRecipes {
         } else {
             zombieBit = zombieController;
         }
-        addShaped(
+        RecipeUtil.addShaped(
                 farm,
                 "ehe",
                 "eme",
@@ -411,7 +436,7 @@ public class MachineRecipes {
             // transceiver
             ItemStack transceiver = new ItemStack(EnderIO.blockTransceiver, 1, 0);
             if (Config.transceiverUseEasyRecipe) {
-                addShaped(
+                RecipeUtil.addShaped(
                         transceiver,
                         "oeo",
                         "pdp",
@@ -427,7 +452,7 @@ public class MachineRecipes {
                         'd',
                         Items.diamond);
             } else {
-                addShaped(
+                RecipeUtil.addShaped(
                         transceiver,
                         "oeo",
                         "pdp",
@@ -442,7 +467,7 @@ public class MachineRecipes {
                         fusedQuartz,
                         'd',
                         endCry);
-                addShapeless(transceiver, new ItemStack(EnderIO.blockHyperCube, 1, 0));
+                RecipeUtil.addShapeless(transceiver, new ItemStack(EnderIO.blockHyperCube, 1, 0));
             }
         }
 
@@ -454,7 +479,7 @@ public class MachineRecipes {
             ItemStack vibSolarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 2);
 
             if (Config.useHardRecipes) {
-                addShaped(
+                RecipeUtil.addShaped(
                         solarPanel,
                         "efe",
                         "pfp",
@@ -469,7 +494,7 @@ public class MachineRecipes {
                         energeticAlloy,
                         'p',
                         phasedGold);
-                addShaped(
+                RecipeUtil.addShaped(
                         advSolarPanel,
                         "efe",
                         "pfp",
@@ -484,7 +509,7 @@ public class MachineRecipes {
                         phasedIron,
                         'p',
                         phasedGold);
-                addShaped(
+                RecipeUtil.addShaped(
                         vibSolarPanel,
                         "efe",
                         "pfp",
@@ -500,7 +525,7 @@ public class MachineRecipes {
                         'p',
                         phasedGold);
             } else {
-                addShaped(
+                RecipeUtil.addShaped(
                         solarPanel,
                         "efe",
                         "pfp",
@@ -515,7 +540,7 @@ public class MachineRecipes {
                         energeticAlloy,
                         'c',
                         redstoneAlloy);
-                addShaped(
+                RecipeUtil.addShaped(
                         advSolarPanel,
                         "efe",
                         "pfp",
@@ -530,7 +555,7 @@ public class MachineRecipes {
                         phasedIron,
                         'c',
                         electricalSteel);
-                addShaped(
+                RecipeUtil.addShaped(
                         vibSolarPanel,
                         "efe",
                         "pfp",
@@ -553,7 +578,7 @@ public class MachineRecipes {
         ItemStack powerConduit = new ItemStack(EnderIO.itemPowerConduit, 1, 0);
         ItemStack redstoneConduit = new ItemStack(EnderIO.itemRedstoneConduit, 1, 2);
         ItemStack mJMonitor = new ItemStack(EnderIO.blockPowerMonitor, 1, 0);
-        addShaped(
+        RecipeUtil.addShaped(
                 mJMonitor,
                 "sms",
                 "sMs",
@@ -571,11 +596,11 @@ public class MachineRecipes {
 
         // Enchanter
         ItemStack enchanter = new ItemStack(EnderIO.blockEnchanter);
-        addShaped(enchanter, "dbd", "sss", " s ", 'd', "gemDiamond", 'b', Items.book, 's', darkSteel);
+        RecipeUtil.addShaped(enchanter, "dbd", "sss", " s ", 'd', "gemDiamond", 'b', Items.book, 's', darkSteel);
 
         // Vacuum Chest
         ItemStack vacuumChest = new ItemStack(EnderIO.blockVacuumChest);
-        addShaped(vacuumChest, "iii", "ici", "ipi", 'i', "ingotIron", 'c', "chestWood", 'p', pulCry);
+        RecipeUtil.addShaped(vacuumChest, "iii", "ici", "ipi", 'i', "ingotIron", 'c', "chestWood", 'p', pulCry);
 
         // Soul Binder
         Object enderBit;
@@ -588,7 +613,7 @@ public class MachineRecipes {
         ItemStack zombieSkull = new ItemStack(Items.skull, 1, 4);
         ItemStack skeletonSkull = new ItemStack(Items.skull, 1, 0);
         ItemStack soulBinder = new ItemStack(EnderIO.blockSoulFuser);
-        addShaped(
+        RecipeUtil.addShaped(
                 soulBinder,
                 "ses",
                 "zmc",
@@ -609,7 +634,7 @@ public class MachineRecipes {
         // Attractor
         ItemStack attractor = new ItemStack(EnderIO.blockAttractor);
         ItemStack attractorCrystal = new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal());
-        addShaped(
+        RecipeUtil.addShaped(
                 attractor,
                 " c ",
                 "ese",
@@ -629,7 +654,7 @@ public class MachineRecipes {
                 EnderIO.blockEndermanSkull,
                 1,
                 BlockEndermanSkull.SkullType.TORMENTED.ordinal());
-        addShaped(
+        RecipeUtil.addShaped(
                 aversion,
                 " c ",
                 "ese",
@@ -646,12 +671,12 @@ public class MachineRecipes {
         // Experience
         ItemStack xp = new ItemStack(EnderIO.blockExperianceOblisk);
         ItemStack xpItem = new ItemStack(EnderIO.itemXpTransfer);
-        addShaped(xp, " x ", " s ", "sms", 's', soularium, 'm', machineChassi, 'x', xpItem);
+        RecipeUtil.addShaped(xp, " x ", " s ", "sms", 's', soularium, 'm', machineChassi, 'x', xpItem);
 
         // Weather
         ItemStack weather = new ItemStack(EnderIO.blockWeatherObelisk);
         ItemStack weatherItem = new ItemStack(EnderIO.itemMaterial, 1, Material.WEATHER_CRYSTAL.ordinal());
-        addShaped(
+        RecipeUtil.addShaped(
                 weather,
                 " x ",
                 "ese",
@@ -686,14 +711,14 @@ public class MachineRecipes {
                 EnderIO.blockElectricLight,
                 1,
                 BlockItemElectricLight.Type.WIRELESS_INV.ordinal());
-        addShapeless(wirelessLamp, poweredLamp, enderRes);
-        addShapeless(wirelessLamp, wirelessLampInv, Blocks.redstone_torch);
-        addShapeless(wirelessLampInv, poweredLampInv, enderRes);
-        addShapeless(wirelessLampInv, wirelessLamp, Blocks.redstone_torch);
+        RecipeUtil.addShapeless(wirelessLamp, poweredLamp, enderRes);
+        RecipeUtil.addShapeless(wirelessLamp, wirelessLampInv, Blocks.redstone_torch);
+        RecipeUtil.addShapeless(wirelessLampInv, poweredLampInv, enderRes);
+        RecipeUtil.addShapeless(wirelessLampInv, wirelessLamp, Blocks.redstone_torch);
 
         // inventory panel
         ItemStack awareness = new ItemStack(EnderIO.itemFunctionUpgrade, 1, FunctionUpgrade.INVENTORY_PANEL.ordinal());
-        addShaped(
+        RecipeUtil.addShaped(
                 awareness,
                 "bsb",
                 "ses",
@@ -707,7 +732,7 @@ public class MachineRecipes {
                 'i',
                 electricalSteel);
         ItemStack invPanel = new ItemStack(EnderIO.blockInventoryPanel);
-        addShaped(
+        RecipeUtil.addShaped(
                 invPanel,
                 "dad",
                 "psp",
@@ -727,7 +752,7 @@ public class MachineRecipes {
 
         // powered light
         if (Config.useHardRecipes) {
-            addShaped(
+            RecipeUtil.addShaped(
                     poweredLamp,
                     "ggg",
                     "sds",
@@ -741,7 +766,7 @@ public class MachineRecipes {
                     'c',
                     capacitor);
         } else {
-            addShaped(
+            RecipeUtil.addShaped(
                     poweredLamp,
                     "ggg",
                     "sds",
@@ -756,19 +781,19 @@ public class MachineRecipes {
                     capacitor);
         }
         ItemStack invPoweredLamp = new ItemStack(EnderIO.blockElectricLight, 1, 1);
-        addShapeless(invPoweredLamp, poweredLamp, Blocks.redstone_torch);
-        addShapeless(poweredLamp, invPoweredLamp, Blocks.redstone_torch);
+        RecipeUtil.addShapeless(invPoweredLamp, poweredLamp, Blocks.redstone_torch);
+        RecipeUtil.addShapeless(poweredLamp, invPoweredLamp, Blocks.redstone_torch);
 
         // light
         ItemStack lamp = new ItemStack(EnderIO.blockElectricLight, 1, 2);
-        addShaped(lamp, "   ", "ggg", "isi", 'g', "glass", 's', "glowstone", 'i', "ingotIron");
+        RecipeUtil.addShaped(lamp, "   ", "ggg", "isi", 'g', "glass", 's', "glowstone", 'i', "ingotIron");
         ItemStack invLamp = new ItemStack(EnderIO.blockElectricLight, 1, 3);
-        addShapeless(invLamp, lamp, Blocks.redstone_torch);
-        addShapeless(lamp, invLamp, Blocks.redstone_torch);
+        RecipeUtil.addShapeless(invLamp, lamp, Blocks.redstone_torch);
+        RecipeUtil.addShapeless(lamp, invLamp, Blocks.redstone_torch);
 
         // MJ Reader
 
-        addShaped(
+        RecipeUtil.addShaped(
                 mJReader,
                 "epe",
                 "gcg",
@@ -788,7 +813,7 @@ public class MachineRecipes {
 
         // Slice'N'Splice
         ItemStack sns = new ItemStack(EnderIO.blockSliceAndSplice);
-        addShaped(
+        RecipeUtil.addShaped(
                 sns,
                 "iki",
                 "ams",
@@ -808,8 +833,28 @@ public class MachineRecipes {
         ItemStack itemBuffer = Type.getStack(Type.ITEM);
         ItemStack powerBuffer = Type.getStack(Type.POWER);
         ItemStack omniBuffer = Type.getStack(Type.OMNI);
-        addShaped(itemBuffer, "isi", "scs", "isi", 'i', "ingotIron", 's', "ingotElectricalSteel", 'c', "chestWood");
-        addShaped(powerBuffer, "isi", "sfs", "isi", 'i', "ingotIron", 's', "ingotElectricalSteel", 'f', machineChassis);
-        addShapeless(omniBuffer, itemBuffer, powerBuffer);
+        RecipeUtil.addShaped(
+                itemBuffer,
+                "isi",
+                "scs",
+                "isi",
+                'i',
+                "ingotIron",
+                's',
+                "ingotElectricalSteel",
+                'c',
+                "chestWood");
+        RecipeUtil.addShaped(
+                powerBuffer,
+                "isi",
+                "sfs",
+                "isi",
+                'i',
+                "ingotIron",
+                's',
+                "ingotElectricalSteel",
+                'f',
+                machineChassis);
+        RecipeUtil.addShapeless(omniBuffer, itemBuffer, powerBuffer);
     }
 }

src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java

@@ -4,13 +4,20 @@ import java.util.HashMap;
 import java.util.Map;
 
 import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.WorldEvent;
 
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import crazypants.enderio.machine.capbank.TileCapBank;
 
 public class ClientNetworkManager {
 
     private static final ClientNetworkManager instance = new ClientNetworkManager();
 
+    static {
+        MinecraftForge.EVENT_BUS.register(instance);
+    }
+
     public static ClientNetworkManager getInstance() {
         return instance;
     }
@@ -53,4 +60,12 @@ public class ClientNetworkManager {
         CapBankClientNetwork network = getOrCreateNetwork(id);
         network.addMember(tileCapBank);
     }
+
+    @SubscribeEvent
+    public void onWorldUnload(WorldEvent.Unload event) {
+        if (event.world.isRemote) {
+            networks.forEach((id, network) -> network.destroyNetwork());
+            networks.clear();
+        }
+    }
 }

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

@@ -20,7 +20,6 @@ import crazypants.enderio.Log;
 
 /**
  * This is not in the FakePlayer hierarchy for reasons.
- *
  */
 public class FakeFarmPlayer extends EntityPlayerMP {
 

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

@@ -1,6 +1,8 @@
 package crazypants.enderio.machine.farm;
 
-import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL11.GL_LIGHTING;
+import static org.lwjgl.opengl.GL11.glDisable;
+import static org.lwjgl.opengl.GL11.glEnable;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;

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

@@ -120,7 +120,6 @@ public enum Fertilizer {
     /**
      * Returns the singleton instance for the fertilizer that was given as parameter. If the given item is no
      * fertilizer, it will return an instance of Fertilizer.None.
-     *
      */
     public static Fertilizer getInstance(ItemStack stack) {
         for (Fertilizer fertilizer : validFertilizers) {
@@ -144,7 +143,7 @@ public enum Fertilizer {
 
     /**
      * Tries to apply the given item on the given block using the type-specific method. SFX is played on success.
-     *
+     * <p>
      * If the item was successfully applied, the stacksize will be decreased if appropriate. The caller will need to
      * check for stacksize 0 and null the inventory slot if needed.
      *

src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java

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

src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java

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

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

@@ -1,6 +1,14 @@
 package crazypants.enderio.machine.obelisk;
 
-import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL11.GL_ALL_ATTRIB_BITS;
+import static org.lwjgl.opengl.GL11.glDepthMask;
+import static org.lwjgl.opengl.GL11.glPopAttrib;
+import static org.lwjgl.opengl.GL11.glPopMatrix;
+import static org.lwjgl.opengl.GL11.glPushAttrib;
+import static org.lwjgl.opengl.GL11.glPushMatrix;
+import static org.lwjgl.opengl.GL11.glRotatef;
+import static org.lwjgl.opengl.GL11.glScalef;
+import static org.lwjgl.opengl.GL11.glTranslated;
 
 import java.util.Random;
 
@@ -106,7 +114,7 @@ public class ObeliskSpecialRenderer<T extends TileEntity> extends TileEntitySpec
 
     protected void renderItemStack(T te, World world, double x, double y, double z, float tick) {
         if (ei == null) {
-            ei = new EntityItem(world, 0, 0, 0, getFloatingItem(te));
+            ei = new EntityItem(null, 0, 0, 0, getFloatingItem(te));
         }
 
         ei.setEntityItemStack(getFloatingItem(te));

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

@@ -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() {

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

@@ -71,14 +71,12 @@ public class BlockItemTank extends ItemBlockWithMetadata implements IAdvancedToo
         EnderIO.blockTank.addDetailedEntries(itemstack, entityplayer, list, flag);
     }
 
-    private static final FluidTank dummy = new SmartTank(FluidRegistry.WATER, 16000);
-
     private FluidTank loadTank(ItemStack stack) {
         if (stack.hasTagCompound()) {
             FluidTank tank = TileTank.loadTank(stack.getTagCompound());
-            return tank != null ? tank : dummy;
+            return tank != null ? tank : new SmartTank(FluidRegistry.WATER, 16000);
         }
-        return dummy;
+        return new SmartTank(FluidRegistry.WATER, 16000);
     }
 
     private void saveTank(ItemStack stack, FluidTank tank) {

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

@@ -1,11 +1,28 @@
 package crazypants.enderio.material;
 
-import static com.enderio.core.common.util.OreDictionaryHelper.*;
-import static crazypants.enderio.material.Alloy.*;
-import static crazypants.enderio.material.Material.*;
-import static crazypants.enderio.material.endergy.AlloyEndergy.*;
-import static crazypants.enderio.power.Capacitors.*;
-import static crazypants.util.RecipeUtil.*;
+import static crazypants.enderio.material.Alloy.DARK_STEEL;
+import static crazypants.enderio.material.Alloy.END_STEEL;
+import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY;
+import static crazypants.enderio.material.Alloy.PHASED_GOLD;
+import static crazypants.enderio.material.Alloy.PHASED_IRON;
+import static crazypants.enderio.material.Alloy.SOULARIUM;
+import static crazypants.enderio.material.Material.BINDER_COMPOSITE;
+import static crazypants.enderio.material.Material.CONDUIT_BINDER;
+import static crazypants.enderio.material.Material.PRECIENT_CRYSTAL;
+import static crazypants.enderio.material.endergy.AlloyEndergy.CRYSTALLINE_ALLOY;
+import static crazypants.enderio.material.endergy.AlloyEndergy.ENERGETIC_SILVER;
+import static crazypants.enderio.material.endergy.AlloyEndergy.MELODIC_ALLOY;
+import static crazypants.enderio.material.endergy.AlloyEndergy.STELLAR_ALLOY;
+import static crazypants.enderio.material.endergy.AlloyEndergy.VIVID_ALLOY;
+import static crazypants.enderio.power.Capacitors.ACTIVATED_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.BASIC_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.CRYSTALLINE_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.ENDERGETIC_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.ENDERGISED_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.ENDER_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.MELODIC_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.SILVER_CAPACITOR;
+import static crazypants.enderio.power.Capacitors.STELLAR_CAPACITOR;
 
 import java.util.ArrayList;
 
@@ -23,6 +40,7 @@ import crazypants.enderio.config.Config;
 import crazypants.enderio.item.ItemEnderFood.EnderFood;
 import crazypants.enderio.material.endergy.AlloyEndergy;
 import crazypants.enderio.power.Capacitors;
+import crazypants.util.RecipeUtil;
 
 public class MaterialRecipes {
 
@@ -63,7 +81,7 @@ public class MaterialRecipes {
                     // Allow free conversion of additional/legacy oreDict name items into
                     // our item because we only register recipes for the primary oreDict
                     // name. Use a 2-to-2 recipe because the 1-to-n is already in use.
-                    addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName);
+                    RecipeUtil.addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName);
                 }
             }
             isPrimaryName = true;
@@ -72,7 +90,7 @@ public class MaterialRecipes {
                 if (isPrimaryName) {
                     isPrimaryName = false;
                 } else {
-                    addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName);
+                    RecipeUtil.addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName);
                 }
             }
         }
@@ -87,7 +105,7 @@ public class MaterialRecipes {
                     // Allow free conversion of additional/legacy oreDict name items into
                     // our item because we only register recipes for the primary oreDict
                     // name. Use a 2-to-2 recipe because the 1-to-n is already in use.
-                    addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName);
+                    RecipeUtil.addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName);
                 }
             }
             isPrimaryName = true;
@@ -96,7 +114,7 @@ public class MaterialRecipes {
                 if (isPrimaryName) {
                     isPrimaryName = false;
                 } else {
-                    addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName);
+                    RecipeUtil.addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName);
                 }
             }
         }
@@ -131,9 +149,9 @@ public class MaterialRecipes {
         OreDictionary.registerOre("itemSkull", new ItemStack(EnderIO.blockEndermanSkull));
 
         // Glass stuff for compatibility
-        addShaped(new ItemStack(Blocks.glass_pane, 16, 0), "eee", "eee", 'e', pureGlass);
-        addShapeless(new ItemStack(Blocks.glass), pureGlass);
-        addShaped(new ItemStack(Items.glass_bottle, 3, 0), "g g", " g ", 'g', pureGlass);
+        RecipeUtil.addShaped(new ItemStack(Blocks.glass_pane, 16, 0), "eee", "eee", 'e', pureGlass);
+        RecipeUtil.addShapeless(new ItemStack(Blocks.glass), pureGlass);
+        RecipeUtil.addShaped(new ItemStack(Items.glass_bottle, 3, 0), "g g", " g ", 'g', pureGlass);
 
         Material.registerOres(EnderIO.itemMaterial);
         MachinePart.registerOres(EnderIO.itemMachinePart);
@@ -170,7 +188,7 @@ public class MaterialRecipes {
 
         // Capacitors
         if (Config.useHardRecipes) {
-            addShaped(
+            RecipeUtil.addShaped(
                     BASIC_CAPACITOR.getItemStack(),
                     " gr",
                     "gig",
@@ -181,7 +199,7 @@ public class MaterialRecipes {
                     "ingotGold",
                     'i',
                     ingotCopper);
-            addShaped(
+            RecipeUtil.addShaped(
                     ACTIVATED_CAPACITOR.getItemStack(),
                     "iii",
                     "cCc",
@@ -192,7 +210,7 @@ public class MaterialRecipes {
                     BASIC_CAPACITOR.getItemStack(),
                     'C',
                     "dustCoal");
-            addShaped(
+            RecipeUtil.addShaped(
                     ENDER_CAPACITOR.getItemStack(),
                     "iii",
                     "cCc",
@@ -206,7 +224,7 @@ public class MaterialRecipes {
 
             String prismarine = OreDictionary.doesOreNameExist("shardPrismarine") ? "shardPrismarine"
                     : "itemPulsatingCrystal";
-            addShaped(
+            RecipeUtil.addShaped(
                     CRYSTALLINE_CAPACITOR.getItemStack(),
                     "iii",
                     "cCc",
@@ -217,7 +235,7 @@ public class MaterialRecipes {
                     capacitorEnder,
                     'C',
                     prismarine);
-            addShaped(
+            RecipeUtil.addShaped(
                     MELODIC_CAPACITOR.getItemStack(),
                     "iii",
                     "cCc",
@@ -228,7 +246,7 @@ public class MaterialRecipes {
                     CRYSTALLINE_CAPACITOR.getItemStack(),
                     'C',
                     endSteel);
-            addShaped(
+            RecipeUtil.addShaped(
                     STELLAR_CAPACITOR.getItemStack(),
                     "iii",
                     "cCc",
@@ -240,7 +258,7 @@ public class MaterialRecipes {
                     'C',
                     PRECIENT_CRYSTAL.oreDict);
 
-            addShaped(
+            RecipeUtil.addShaped(
                     SILVER_CAPACITOR.getItemStack(),
                     " sr",
                     "sis",
@@ -251,7 +269,7 @@ public class MaterialRecipes {
                     "ingotSilver",
                     'i',
                     "ingotLead");
-            addShaped(
+            RecipeUtil.addShaped(
                     ENDERGETIC_CAPACITOR.getItemStack(),
                     "iii",
                     "cCc",
@@ -262,7 +280,7 @@ public class MaterialRecipes {
                     SILVER_CAPACITOR.getItemStack(),
                     'C',
                     "dustCoal");
-            addShaped(
+            RecipeUtil.addShaped(
                     ENDERGISED_CAPACITOR.getItemStack(),
                     "iii",
                     "cCc",
@@ -275,7 +293,7 @@ public class MaterialRecipes {
                     "glowstone");
 
         } else {
-            addShaped(
+            RecipeUtil.addShaped(
                     BASIC_CAPACITOR.getItemStack(),
                     " gr",
                     "gig",
@@ -286,7 +304,7 @@ public class MaterialRecipes {
                     "ingotGold",
                     'i',
                     ingotCopper);
-            addShaped(
+            RecipeUtil.addShaped(
                     ACTIVATED_CAPACITOR.getItemStack(),
                     " i ",
                     "cCc",
@@ -297,7 +315,7 @@ public class MaterialRecipes {
                     BASIC_CAPACITOR.getItemStack(),
                     'C',
                     "dustCoal");
-            addShaped(
+            RecipeUtil.addShaped(
                     ENDER_CAPACITOR.getItemStack(),
                     " i ",
                     "cCc",
@@ -311,7 +329,7 @@ public class MaterialRecipes {
 
             String prismarine = OreDictionary.doesOreNameExist("shardPrismarine") ? "shardPrismarine"
                     : "itemPulsatingCrystal";
-            addShaped(
+            RecipeUtil.addShaped(
                     CRYSTALLINE_CAPACITOR.getItemStack(),
                     " i ",
                     "cCc",
@@ -322,7 +340,7 @@ public class MaterialRecipes {
                     capacitorEnder,
                     'C',
                     prismarine);
-            addShaped(
+            RecipeUtil.addShaped(
                     MELODIC_CAPACITOR.getItemStack(),
                     " i ",
                     "cCc",
@@ -333,7 +351,7 @@ public class MaterialRecipes {
                     CRYSTALLINE_CAPACITOR.getItemStack(),
                     'C',
                     endSteel);
-            addShaped(
+            RecipeUtil.addShaped(
                     STELLAR_CAPACITOR.getItemStack(),
                     " i ",
                     "cCc",
@@ -345,7 +363,7 @@ public class MaterialRecipes {
                     'C',
                     PRECIENT_CRYSTAL.oreDict);
 
-            addShaped(
+            RecipeUtil.addShaped(
                     SILVER_CAPACITOR.getItemStack(),
                     " sr",
                     "sis",
@@ -356,7 +374,7 @@ public class MaterialRecipes {
                     "ingotSilver",
                     'i',
                     "ingotLead");
-            addShaped(
+            RecipeUtil.addShaped(
                     ENDERGETIC_CAPACITOR.getItemStack(),
                     " i ",
                     "cCc",
@@ -367,7 +385,7 @@ public class MaterialRecipes {
                     SILVER_CAPACITOR.getItemStack(),
                     'C',
                     "dustCoal");
-            addShaped(
+            RecipeUtil.addShaped(
                     ENDERGISED_CAPACITOR.getItemStack(),
                     " i ",
                     "cCc",
@@ -383,37 +401,37 @@ public class MaterialRecipes {
         // Conduit Binder
         ItemStack cbc = BINDER_COMPOSITE.getStack(8);
         if (Config.useAlternateBinderRecipe) {
-            addShaped(cbc, "gcg", "sgs", "gcg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball);
+            RecipeUtil.addShaped(cbc, "gcg", "sgs", "gcg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball);
         } else {
-            addShaped(cbc, "ggg", "scs", "ggg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball);
+            RecipeUtil.addShaped(cbc, "ggg", "scs", "ggg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball);
         }
         GameRegistry.addSmelting(BINDER_COMPOSITE.getStack(), CONDUIT_BINDER.getStack(4), 0);
 
         // Nuggets
         ItemStack phasedIronNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.PHASED_IRON_NUGGET.ordinal());
-        addShapeless(phasedIronNugget, phasedIron);
+        RecipeUtil.addShapeless(phasedIronNugget, phasedIron);
         phasedIronNugget = phasedIronNugget.copy();
         phasedIronNugget.stackSize = 1;
-        addShaped(PHASED_IRON.getStackIngot(), "eee", "eee", "eee", 'e', phasedIronNugget);
+        RecipeUtil.addShaped(PHASED_IRON.getStackIngot(), "eee", "eee", "eee", 'e', phasedIronNugget);
 
         ItemStack vibrantNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.VIBRANT_NUGGET.ordinal());
-        addShapeless(vibrantNugget, phasedGold);
+        RecipeUtil.addShapeless(vibrantNugget, phasedGold);
         vibrantNugget = vibrantNugget.copy();
         vibrantNugget.stackSize = 1;
-        addShaped(PHASED_GOLD.getStackIngot(), "eee", "eee", "eee", 'e', vibrantNugget);
+        RecipeUtil.addShaped(PHASED_GOLD.getStackIngot(), "eee", "eee", "eee", 'e', vibrantNugget);
 
         ItemStack endSteelNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.END_STEEL_NUGGET.ordinal());
-        addShapeless(endSteelNugget, endSteel);
+        RecipeUtil.addShapeless(endSteelNugget, endSteel);
         endSteelNugget = endSteelNugget.copy();
         endSteelNugget.stackSize = 1;
-        addShaped(END_STEEL.getStackIngot(), "eee", "eee", "eee", 'e', endSteelNugget);
+        RecipeUtil.addShaped(END_STEEL.getStackIngot(), "eee", "eee", "eee", 'e', endSteelNugget);
 
         // Crystals
         ItemStack pulsCry = new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal());
-        addShaped(pulsCry, "nnn", "ngn", "nnn", 'n', phasedIronNugget, 'g', "gemDiamond");
+        RecipeUtil.addShaped(pulsCry, "nnn", "ngn", "nnn", 'n', phasedIronNugget, 'g', "gemDiamond");
 
         ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal());
-        addShaped(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', "gemEmerald");
+        RecipeUtil.addShaped(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', "gemEmerald");
 
         // Smelting
         ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal());
@@ -426,23 +444,23 @@ public class MaterialRecipes {
 
         // Ender Dusts
         ItemStack enderDust = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal());
-        addShaped(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust);
+        RecipeUtil.addShaped(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust);
 
         // Dark Iron Bars
         ItemStack diBars = new ItemStack(EnderIO.blockDarkIronBars, 16, 0);
-        addShaped(diBars, "ddd", "ddd", 'd', darkSteel);
+        RecipeUtil.addShaped(diBars, "ddd", "ddd", 'd', darkSteel);
 
         // Dark Iron Bars
         ItemStack soBars = new ItemStack(EnderIO.blockSoulariumBars, 16, 0);
-        addShaped(soBars, "ddd", "ddd", 'd', soularium);
+        RecipeUtil.addShaped(soBars, "ddd", "ddd", 'd', soularium);
 
         // Dark Iron Bars
         ItemStack esBars = new ItemStack(EnderIO.blockEndSteelBars, 16, 0);
-        addShaped(esBars, "ddd", "ddd", 'd', endSteel);
+        RecipeUtil.addShaped(esBars, "ddd", "ddd", 'd', endSteel);
 
         // Fused Quartz Frame
-        addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "stickWood");
-        addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "woodStick");
+        RecipeUtil.addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "stickWood");
+        RecipeUtil.addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "woodStick");
 
         // Machine Chassis
 
@@ -451,10 +469,10 @@ public class MaterialRecipes {
         ItemStack chassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal());
         String mat = Config.useSteelInChassi == true && steelIngots != null && !steelIngots.isEmpty() ? "ingotSteel"
                 : "ingotIron";
-        addShaped(chassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', mat, 'c', capacitor);
+        RecipeUtil.addShaped(chassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', mat, 'c', capacitor);
 
         ItemStack soulchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.SOUL_MACHINE_CHASSIS.ordinal());
-        addShaped(
+        RecipeUtil.addShaped(
                 soulchassis,
                 "fif",
                 "ici",
@@ -470,7 +488,7 @@ public class MaterialRecipes {
                 EnderIO.itemMachinePart,
                 1,
                 MachinePart.END_STEEL_MACHINE_CHASSIS.ordinal());
-        addShaped(
+        RecipeUtil.addShaped(
                 endchassis,
                 "fif",
                 "ici",
@@ -484,8 +502,8 @@ public class MaterialRecipes {
 
         // Basic Gear
         ItemStack gear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal());
-        addShaped(gear, "scs", "c c", "scs", 's', "stickWood", 'c', "cobblestone");
-        addShaped(gear, "scs", "c c", "scs", 's', "woodStick", 'c', "cobblestone");
+        RecipeUtil.addShaped(gear, "scs", "c c", "scs", 's', "stickWood", 'c', "cobblestone");
+        RecipeUtil.addShaped(gear, "scs", "c c", "scs", 's', "woodStick", 'c', "cobblestone");
 
         // Weather Crystal
         ItemStack main = Config.useHardRecipes
@@ -502,7 +520,7 @@ public class MaterialRecipes {
             if (Config.reinforcedObsidianUseDarkSteelBlocks) {
                 corners = Alloy.DARK_STEEL.getOreBlock();
             }
-            addShaped(
+            RecipeUtil.addShaped(
                     reinfObs,
                     "dbd",
                     "bob",
@@ -515,25 +533,39 @@ public class MaterialRecipes {
                     Blocks.obsidian);
         }
 
-        addShaped(EnderIO.blockDarkSteelAnvil, "bbb", " i ", "iii", 'b', DARK_STEEL.getOreBlock(), 'i', darkSteel);
+        RecipeUtil.addShaped(
+                EnderIO.blockDarkSteelAnvil,
+                "bbb",
+                " i ",
+                "iii",
+                'b',
+                DARK_STEEL.getOreBlock(),
+                'i',
+                darkSteel);
 
-        addShaped(new ItemStack(EnderIO.blockDarkSteelLadder, 12), "b", "b", "b", 'b', EnderIO.blockDarkIronBars);
+        RecipeUtil.addShaped(
+                new ItemStack(EnderIO.blockDarkSteelLadder, 12),
+                "b",
+                "b",
+                "b",
+                'b',
+                EnderIO.blockDarkIronBars);
 
         for (Alloy alloy : Alloy.values()) {
-            addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot());
-            addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot());
-            addShapeless(alloy.getStackIngot(9), alloy.getOreBlock());
+            RecipeUtil.addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot());
+            RecipeUtil.addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot());
+            RecipeUtil.addShapeless(alloy.getStackIngot(9), alloy.getOreBlock());
         }
 
         for (AlloyEndergy alloy : AlloyEndergy.values()) {
-            addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot());
-            addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot());
-            addShapeless(alloy.getStackIngot(9), alloy.getOreBlock());
+            RecipeUtil.addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot());
+            RecipeUtil.addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot());
+            RecipeUtil.addShapeless(alloy.getStackIngot(9), alloy.getOreBlock());
         }
 
         // DS Rod
         ItemStack darkRod = new ItemStack(EnderIO.itemMaterial, 1, Material.DARK_STEEL_ROD.ordinal());
-        addShaped(darkRod, " ns", "nsn", "sn ", 's', darkSteel, 'n', endSteelNugget);
+        RecipeUtil.addShaped(darkRod, " ns", "nsn", "sn ", 's', darkSteel, 'n', endSteelNugget);
 
         // Food
         ItemStack flour = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.FLOUR.ordinal());
@@ -542,14 +574,14 @@ public class MaterialRecipes {
         GameRegistry.addSmelting(flour, bread, 0.35f);
 
         ItemStack enderios = EnderFood.ENDERIOS.getStack();
-        addShapeless(enderios, Items.bowl, Items.milk_bucket, "cropWheat", "dustEnderPearl");
+        RecipeUtil.addShapeless(enderios, Items.bowl, Items.milk_bucket, "cropWheat", "dustEnderPearl");
 
-        if (hasCopper()) {
+        if (OreDictionaryHelper.hasCopper()) {
             ItemStack dustCopper = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal());
             ItemStack ingotCoppper = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_COPPER);
             GameRegistry.addSmelting(dustCopper, ingotCoppper, 0);
         }
-        if (hasTin()) {
+        if (OreDictionaryHelper.hasTin()) {
             ItemStack dustTin = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal());
             ItemStack ingotTin = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_TIN);
             GameRegistry.addSmelting(dustTin, ingotTin, 0);

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

@@ -1,6 +1,10 @@
 package crazypants.enderio.material;
 
-import static com.enderio.core.common.util.OreDictionaryHelper.*;
+import static com.enderio.core.common.util.OreDictionaryHelper.DUST_ENDERPEARL;
+import static com.enderio.core.common.util.OreDictionaryHelper.INGOT_COPPER;
+import static com.enderio.core.common.util.OreDictionaryHelper.INGOT_ENDERIUM;
+import static com.enderio.core.common.util.OreDictionaryHelper.INGOT_TIN;
+import static com.enderio.core.common.util.OreDictionaryHelper.isRegistered;
 
 public enum PowderIngot {
 

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

@@ -18,7 +18,15 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.*;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovementInput;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.common.MinecraftForge;
@@ -111,42 +119,55 @@ public class TravelController {
         }
     }
 
-    public boolean validatePacketTravelEvent(EntityPlayerMP toTp, int x, int y, int z, int powerUse,
+    /**
+     * @return the error message, or null if the packet is valid.
+     */
+    public String validatePacketTravelEvent(EntityPlayerMP toTp, int x, int y, int z, int powerUse,
             boolean conserveMotion, TravelSource source) {
         BlockCoord target = new BlockCoord(x, y, z);
         double dist = getDistanceSquared(toTp, target);
         // allow 15% overshoot to account for rounding
-        if (dist * 100 > source.getMaxDistanceTravelledSq() * 115) return false;
-        if (powerUse < getRequiredPower(toTp, source, target)) return false;
+        if (dist * 100 > source.getMaxDistanceTravelledSq() * 115) return "dist check fail";
+        // allow 4 blocks of c/s player pos desync
+        if (getPower(toTp, source, target, -4F) > powerUse) return "power use too little";
         ItemStack equippedItem = toTp.getCurrentEquippedItem();
         switch (source) {
             case TELEPAD:
                 // this source is invalid for this type of packet
-                return false;
+                return "invalid travel source";
             case BLOCK:
                 // this source is only triggered when player is on any active travel anchor
                 BlockCoord on = getActiveTravelBlock(toTp);
-                if (on == null) return false;
+                if (on == null) return "on anchor is null";
                 // target must be a valid selectedCoord
                 // selectedCoord can either be a block right above/below when the player is on anchor...
-                if (on.x == x && on.z == z) return true;
+                if (on.x == x && on.z == z) return null;
                 // or another anchor
                 TileEntity maybeAnchor = target.getTileEntity(toTp.worldObj);
-                if (!(maybeAnchor instanceof ITravelAccessable)) return false;
+                if (!(maybeAnchor instanceof ITravelAccessable)) return "not anchor";
                 ITravelAccessable anchor = (ITravelAccessable) maybeAnchor;
-                return anchor.canBlockBeAccessed(toTp) || !isValidTarget(toTp, target, TravelSource.BLOCK);
+                if (!anchor.canBlockBeAccessed(toTp) && isValidTarget(toTp, target, TravelSource.BLOCK)) {
+                    return "not valid target";
+                }
+                return null;
             case STAFF:
             case STAFF_BLINK:
-                if (equippedItem == null || !(equippedItem.getItem() instanceof IItemOfTravel)) return false;
-                if (!((IItemOfTravel) equippedItem.getItem()).isActive(toTp, equippedItem)) return false;
+                if (equippedItem == null || !(equippedItem.getItem() instanceof IItemOfTravel)) return "not staff";
+                if (!((IItemOfTravel) equippedItem.getItem()).isActive(toTp, equippedItem)) return "staff not active";
                 int energy = ((IItemOfTravel) equippedItem.getItem()).canExtractInternal(equippedItem, powerUse);
-                return energy == -1 || energy == powerUse;
+                if (energy != -1 && energy != powerUse) {
+                    return "not enough power";
+                }
+                return null;
             case TELEPORT_STAFF_BLINK:
             case TELEPORT_STAFF:
                 // tp staff is creative version of traveling staff
                 // no energy check or anything else needed
                 // but the player must actually be equipped with one of these
-                return equippedItem != null && equippedItem.getItem() instanceof ItemTeleportStaff;
+                if (equippedItem != null && equippedItem.getItem() instanceof ItemTeleportStaff) {
+                    return null;
+                }
+                return "not staff";
             default:
                 throw new AssertionError("unidentified travel source");
         }
@@ -662,7 +683,7 @@ public class TravelController {
         }
         int requiredPower;
         ItemStack staff = player.getCurrentEquippedItem();
-        requiredPower = (int) (getDistance(player, coord) * source.getPowerCostPerBlockTraveledRF());
+        requiredPower = getPower(player, source, coord, 0F);
         int canUsePower = getEnergyInTravelItem(staff);
         if (requiredPower > canUsePower) {
             // make sure chat is sent only once per trial
@@ -675,6 +696,10 @@ public class TravelController {
         return requiredPower;
     }
 
+    private int getPower(EntityPlayer player, TravelSource source, BlockCoord coord, float distanceWavier) {
+        return (int) ((getDistance(player, coord) + distanceWavier) * source.getPowerCostPerBlockTraveledRF());
+    }
+
     private boolean isInRangeTarget(EntityPlayer player, BlockCoord bc, float maxSq) {
         return getDistanceSquared(player, bc) <= maxSq;
     }

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

@@ -83,12 +83,14 @@ public class PacketTravelEvent implements IMessage, IMessageHandler<PacketTravel
 
         TravelSource source = TravelSource.values()[message.source];
 
-        if (!TravelController.instance
-                .validatePacketTravelEvent(toTp, x, y, z, message.powerUse, message.conserveMotion, source)) {
+        String error = TravelController.instance
+                .validatePacketTravelEvent(toTp, x, y, z, message.powerUse, message.conserveMotion, source);
+        if (error != null) {
             Log.LOGGER.warn(
                     Log.securityMarker,
-                    "Player {} tried to tp without valid prereq.",
-                    ctx.getServerHandler().playerEntity.getGameProfile());
+                    "Player {} tried to tp without valid prereq: {}",
+                    ctx.getServerHandler().playerEntity.getGameProfile(),
+                    error);
             return null;
         }
 

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

@@ -1,6 +1,23 @@
 package crazypants.enderio.teleport.telepad;
 
-import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL11.GL_ALL_ATTRIB_BITS;
+import static org.lwjgl.opengl.GL11.GL_ALPHA_TEST;
+import static org.lwjgl.opengl.GL11.GL_BLEND;
+import static org.lwjgl.opengl.GL11.GL_CULL_FACE;
+import static org.lwjgl.opengl.GL11.GL_LIGHTING;
+import static org.lwjgl.opengl.GL11.GL_ONE;
+import static org.lwjgl.opengl.GL11.GL_SMOOTH;
+import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA;
+import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D;
+import static org.lwjgl.opengl.GL11.GL_ZERO;
+import static org.lwjgl.opengl.GL11.glDepthMask;
+import static org.lwjgl.opengl.GL11.glDisable;
+import static org.lwjgl.opengl.GL11.glEnable;
+import static org.lwjgl.opengl.GL11.glPushAttrib;
+import static org.lwjgl.opengl.GL11.glPushMatrix;
+import static org.lwjgl.opengl.GL11.glRotatef;
+import static org.lwjgl.opengl.GL11.glShadeModel;
+import static org.lwjgl.opengl.GL11.glTranslated;
 
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;

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

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

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

@@ -1,6 +1,8 @@
 package crazypants.enderio.waila;
 
-import static crazypants.enderio.waila.IWailaInfoProvider.*;
+import static crazypants.enderio.waila.IWailaInfoProvider.BIT_BASIC;
+import static crazypants.enderio.waila.IWailaInfoProvider.BIT_COMMON;
+import static crazypants.enderio.waila.IWailaInfoProvider.BIT_DETAILED;
 
 import java.text.MessageFormat;
 import java.util.List;
@@ -123,8 +125,6 @@ public class WailaCompat implements IWailaDataProvider {
 
     public static final WailaCompat INSTANCE = new WailaCompat();
 
-    private static IWailaDataAccessor _accessor = null;
-
     public static void load(IWailaRegistrar registrar) {
         registrar.registerStackProvider(INSTANCE, IFacade.class);
         registrar.registerStackProvider(INSTANCE, BlockDarkSteelAnvil.class);
@@ -188,8 +188,6 @@ public class WailaCompat implements IWailaDataProvider {
     public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
             IWailaConfigHandler config) {
 
-        _accessor = accessor;
-
         EntityPlayer player = accessor.getPlayer();
         MovingObjectPosition pos = accessor.getPosition();
         int x = pos.blockX, y = pos.blockY, z = pos.blockZ;
@@ -265,7 +263,7 @@ public class WailaCompat implements IWailaDataProvider {
         }
 
         if (te instanceof IConduitBundle) {
-            getWailaBodyConduitBundle(itemStack, currenttip);
+            getWailaBodyConduitBundle(itemStack, currenttip, accessor);
 
         } else if (te instanceof IInternalPoweredTile && block == accessor.getBlock() && !(te instanceof TileCapBank)) {
             IInternalPoweredTile power = (IInternalPoweredTile) te;
@@ -295,13 +293,13 @@ public class WailaCompat implements IWailaDataProvider {
         return currenttip;
     }
 
-    private void getWailaBodyConduitBundle(ItemStack itemStack, List<String> currenttip) {
+    private void getWailaBodyConduitBundle(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor) {
         if (itemStack == null) {
             return;
         }
 
         if (itemStack.getItem() == EnderIO.itemPowerConduit || itemStack.getItem() == EnderIO.itemPowerConduitEndergy) {
-            NBTTagCompound nbtRoot = _accessor.getNBTData();
+            NBTTagCompound nbtRoot = accessor.getNBTData();
             if (nbtRoot.hasKey("storedEnergyRF")) {
                 int stored = nbtRoot.getInteger("storedEnergyRF");
                 int max = nbtRoot.getInteger("maxStoredRF");
@@ -318,7 +316,7 @@ public class WailaCompat implements IWailaDataProvider {
             }
 
         } else if (itemStack.getItem() == EnderIO.itemLiquidConduit) {
-            NBTTagCompound nbtRoot = _accessor.getNBTData();
+            NBTTagCompound nbtRoot = accessor.getNBTData();
             if (nbtRoot.hasKey("fluidLocked") && nbtRoot.hasKey("FluidName")) {
                 boolean fluidTypeLocked = nbtRoot.getBoolean("fluidLocked");
                 FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbtRoot);
@@ -350,7 +348,7 @@ public class WailaCompat implements IWailaDataProvider {
             }
 
         } else if (itemStack.getItem() == EnderIO.itemMEConduit) {
-            NBTTagCompound nbtRoot = _accessor.getNBTData();
+            NBTTagCompound nbtRoot = accessor.getNBTData();
             if (nbtRoot.hasKey("isDense")) {
                 boolean isDenseUltra = nbtRoot.getBoolean("isDenseUltra");
                 boolean isDense = nbtRoot.getBoolean("isDense");
@@ -409,7 +407,4 @@ public class WailaCompat implements IWailaDataProvider {
         return tag;
     }
 
-    public static NBTTagCompound getNBTData() {
-        return _accessor.getNBTData();
-    }
 }

src/main/java/crazypants/enderio/xp/XpUtil.java

@@ -4,9 +4,8 @@ import net.minecraft.entity.player.EntityPlayer;
 
 /**
  * Values taken from OpenMods EnchantmentUtils to ensure consistent behavior
- * 
- * @see {@link https://github.com/OpenMods/OpenModsLib/blob/master/src/main/java/openmods/utils/EnchantmentUtils.java}
  *
+ * @see {@link https://github.com/OpenMods/OpenModsLib/blob/master/src/main/java/openmods/utils/EnchantmentUtils.java}
  */
 public class XpUtil {
 

src/main/java/crazypants/util/BaublesUtil.java

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

src/main/java/crazypants/util/GalacticraftUtil.java

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