Validate TE of packet (#126)

* Validate TE of packet

* Remove outdated script

.github/scripts/test-no-error-reports.sh

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-RUNDIR="run"
-CRASH="crash-reports"
-SERVERLOG="server.log"
-
-if [[ -d $RUNDIR/$CRASH ]]; then
-  echo "Crash reports detected:"
-  cat $RUNDIR/$CRASH/crash*.txt
-  exit 1
-fi
-
-if grep --quiet "Fatal errors were detected" $SERVERLOG; then
-  echo "Fatal errors detected:"
-  cat server.log
-  exit 1
-fi
-
-if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" $SERVERLOG; then
-  echo "Server force stopped:"
-  cat server.log
-  exit 1
-fi
-
-if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then
-  echo "Server didn't finish startup:"
-  cat server.log
-  exit 1
-fi
-
-echo "No crash reports detected"
-exit 0
-

build.gradle

@@ -1,4 +1,4 @@
-//version: 1680120787
+//version: 1685785062
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -6,29 +6,25 @@
  */
 
 
-import com.diffplug.blowdryer.Blowdryer
-import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.gtnewhorizons.retrofuturagradle.ObfuscationAttribute
 import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar
 import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask
+import com.gtnewhorizons.retrofuturagradle.util.Distribution
 import com.matthewprenger.cursegradle.CurseArtifact
 import com.matthewprenger.cursegradle.CurseRelation
 import com.modrinth.minotaur.dependencies.ModDependency
 import com.modrinth.minotaur.dependencies.VersionDependency
-import cpw.mods.fml.relauncher.Side
-import org.gradle.api.tasks.options.Option;
 import org.gradle.internal.logging.text.StyledTextOutput.Style
 import org.gradle.internal.logging.text.StyledTextOutputFactory
 import org.gradle.internal.xml.XmlTransformer
-import org.jetbrains.gradle.ext.*
+import org.jetbrains.gradle.ext.Application
+import org.jetbrains.gradle.ext.Gradle
 
+import javax.inject.Inject
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.concurrent.TimeUnit
-import java.util.zip.ZipEntry
-import java.util.zip.ZipOutputStream
-import javax.inject.Inject
 
 buildscript {
     repositories {
@@ -66,21 +62,25 @@ plugins {
     id 'org.jetbrains.kotlin.kapt' version '1.8.0' apply false
     id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false
     id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle
-    id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
-    id 'com.palantir.git-version' version '0.13.0' apply false // 0.13.0 is the last jvm8 supporting version
-    id 'de.undercouch.download' version '5.3.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
+    id 'com.palantir.git-version' version '3.0.0' apply false
+    id 'de.undercouch.download' version '5.4.0'
     id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle
-    id 'com.diffplug.spotless' version '6.7.2' apply false
+    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.2.4'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.14'
 }
+
+print("You might want to check out './gradlew :faq' if your build fails.\n")
+
 boolean settingsupdated = verifySettingsGradle()
 settingsupdated = verifyGitAttributes() || settingsupdated
 if (settingsupdated)
     throw new GradleException("Settings has been updated, please re-run task.")
 
-if (project.file('.git/HEAD').isFile()) {
+// In submodules, .git is a file pointing to the real git dir
+if (project.file('.git/HEAD').isFile() || project.file('.git').isFile()) {
     apply plugin: 'com.palantir.git-version'
 }
 
@@ -132,7 +132,7 @@ propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new
 // this is meant to be set using the user wide property file. by default we do nothing.
 propertyDefaultIfUnset("ideaOverrideBuildType", "") // Can be nothing, "gradle" or "idea"
 
-project.extensions.add(Blowdryer, "Blowdryer", Blowdryer) // Make blowdryer available in "apply from:" scripts
+project.extensions.add(com.diffplug.blowdryer.Blowdryer, "Blowdryer", com.diffplug.blowdryer.Blowdryer) // Make blowdryer available in "apply from:" scripts
 if (!disableSpotless) {
     apply plugin: 'com.diffplug.spotless'
     apply from: Blowdryer.file('spotless.gradle')
@@ -201,6 +201,14 @@ configurations {
         canBeConsumed = false
         canBeResolved = false
     }
+
+    create("devOnlyNonPublishable") {
+        description = "Runtime and compiletime dependencies that are not published alongside the jar (compileOnly + runtimeOnlyNonPublishable)"
+        canBeConsumed = false
+        canBeResolved = false
+    }
+    compileOnly.extendsFrom(devOnlyNonPublishable)
+    runtimeOnlyNonPublishable.extendsFrom(devOnlyNonPublishable)
 }
 
 if (enableModernJavaSyntax.toBoolean()) {
@@ -214,6 +222,8 @@ if (enableModernJavaSyntax.toBoolean()) {
 
     dependencies {
         annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0'
+        // workaround for https://github.com/bsideup/jabel/issues/174
+        annotationProcessor 'net.java.dev.jna:jna-platform:5.13.0'
         compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') {
             transitive = false // We only care about the 1 annotation class
         }
@@ -399,7 +409,7 @@ minecraft {
 
     username = developmentEnvironmentUserName.toString()
 
-    lwjgl3Version = "3.3.2-SNAPSHOT"
+    lwjgl3Version = "3.3.2"
 
     // Enable assertions in the current mod
     extraRunJvmArguments.add("-ea:${modGroup}")
@@ -559,9 +569,10 @@ repositories {
 
 def mixinProviderGroup = "io.github.legacymoddingmc"
 def mixinProviderModule = "unimixins"
-def mixinProviderVersion = "0.1.6"
+def mixinProviderVersion = "0.1.7.1"
 def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
 def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
+ext.mixinProviderSpec = mixinProviderSpec
 
 dependencies {
     if (usesMixins.toBoolean()) {
@@ -713,13 +724,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
 }
 
 dependencies {
-    def lwjgl3ifyVersion = '1.3.3'
+    def lwjgl3ifyVersion = '1.3.5'
     def asmVersion = '9.4'
     if (modId != 'lwjgl3ify') {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.4')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.13')
     }
 
     java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}
@@ -793,7 +804,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
     public boolean setEnableHotswap(boolean enable) { enableHotswap = enable }
 
     @Inject
-    public RunHotswappableMinecraftTask(Side side, String superTask, org.gradle.api.invocation.Gradle gradle) {
+    public RunHotswappableMinecraftTask(Distribution side, String superTask, org.gradle.api.invocation.Gradle gradle) {
         super(side, gradle)
 
         this.lwjglVersion = 3
@@ -802,7 +813,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
         this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : []))
 
         this.classpath(project.java17PatchDependenciesCfg)
-        if (side == Side.CLIENT) {
+        if (side == Distribution.CLIENT) {
             this.classpath(project.minecraftTasks.lwjgl3Configuration)
         }
         // Use a raw provider instead of map to not create a dependency on the task
@@ -812,9 +823,21 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
         }
         this.classpath(project.java17DependenciesCfg)
     }
+
+    public void setup(Project project) {
+        super.setup(project)
+        if (project.usesMixins.toBoolean()) {
+            this.extraJvmArgs.addAll(project.provider(() -> {
+                def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(project.mixinProviderSpec))
+                mixinCfg.canBeConsumed = false
+                mixinCfg.transitive = false
+                enableHotswap ? ["-javaagent:" + mixinCfg.singleFile.absolutePath] : []
+            }))
+        }
+    }
 }
 
-def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Side.CLIENT, "runClient")
+def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient")
 runClient17Task.configure {
     setup(project)
     group = "Modded Minecraft"
@@ -825,7 +848,7 @@ runClient17Task.configure {
     userUUID = minecraft.userUUID
 }
 
-def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Side.SERVER, "runServer")
+def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Distribution.DEDICATED_SERVER, "runServer")
 runServer17Task.configure {
     setup(project)
     group = "Modded Minecraft"
@@ -866,11 +889,6 @@ tasks.named("jar", Jar).configure {
 }
 
 if (usesShadowedDependencies.toBoolean()) {
-    tasks.register('relocateShadowJar', ConfigureShadowRelocation) {
-        target = tasks.shadowJar
-        prefix = modGroup + ".shadow"
-        enabled = relocateShadowedDependencies.toBoolean()
-    }
     tasks.named("shadowJar", ShadowJar).configure {
         manifest {
             attributes(getManifestAttributes())
@@ -886,7 +904,8 @@ if (usesShadowedDependencies.toBoolean()) {
         ]
         archiveClassifier.set('dev')
         if (relocateShadowedDependencies.toBoolean()) {
-            dependsOn(relocateShadowJar)
+            relocationPrefix = modGroup + ".shadow"
+            enableRelocation = true
         }
     }
     configurations.runtimeElements.outgoing.artifacts.clear()
@@ -1219,7 +1238,7 @@ def addCurseForgeRelation(String type, String name) {
 
 // Updating
 
-def buildscriptGradleVersion = "8.0.2"
+def buildscriptGradleVersion = "8.1.1"
 
 tasks.named('wrapper', Wrapper).configure {
     gradleVersion = buildscriptGradleVersion
@@ -1251,6 +1270,23 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA
     }
 }
 
+// If you want to add more cases to this task, implement them as arguments if total amount to print gets too large
+tasks.register('faq') {
+    group = 'GTNH Buildscript'
+    description = 'Prints frequently asked questions about building a project'
+
+    doLast {
+        print("If your build fails to fetch dependencies, run './gradlew updateDependencies'. " +
+            "Or you can manually check if the versions are still on the distributing sites - " +
+            "the links can be found in repositories.gradle and build.gradle:repositories, " +
+            "but not build.gradle:buildscript.repositories - those ones are for gradle plugin metadata.\n\n" +
+            "If your build fails to recognize the syntax of new Java versions, enable Jabel in your " +
+            "gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties. " +
+            "However, keep in mind that Jabel enables only syntax features, but not APIs that were introduced in " +
+            "Java 9 or later.")
+    }
+}
+
 static URL availableBuildScriptUrl() {
     new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/build.gradle")
 }
@@ -1388,7 +1424,7 @@ static int replaceParams(File file, Map<String, String> params) {
     return 0
 }
 
-// Dependency Deobfuscation
+// Dependency Deobfuscation (Deprecated, use the new RFG API documented in dependencies.gradle)
 
 def deobf(String sourceURL) {
     try {
@@ -1430,11 +1466,7 @@ def deobfMaven(String repoURL, String mavenDep) {
 }
 
 def deobfCurse(String curseDep) {
-    try {
-        return deobfMaven("https://www.cursemaven.com/", "curse.maven:$curseDep")
-    } catch (Exception ignored) {
-        out.style(Style.Failure).println("Failed to get $curseDep from cursemaven.")
-    }
+    return dependencies.rfg.deobf("curse.maven:$curseDep")
 }
 
 // The method above is to be preferred. Use this method if the filename is not at the end of the URL.
@@ -1442,34 +1474,7 @@ def deobf(String sourceURL, String rawFileName) {
     String bon2Version = "2.5.1"
     String fileName = URLDecoder.decode(rawFileName, "UTF-8")
     String cacheDir = "$project.gradle.gradleUserHomeDir/caches"
-    String bon2Dir = "$cacheDir/forge_gradle/deobf"
-    String bon2File = "$bon2Dir/BON2-${bon2Version}.jar"
     String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar"
-    String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar"
-
-    if (file(deobfFile).exists()) {
-        return files(deobfFile)
-    }
-
-    String mappingsVer
-    String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/'
-    if (remoteMappings) {
-        String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion"
-        String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip"
-
-        zipMappings(mappingsZIP, remoteMappings, bon2Dir)
-
-        mappingsVer = "snapshot_$id"
-    } else {
-        mappingsVer = "${channel}_$mappingsVersion"
-    }
-
-    download.run {
-        src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
-        dest bon2File
-        quiet true
-        overwrite false
-    }
 
     download.run {
         src sourceURL
@@ -1477,50 +1482,8 @@ def deobf(String sourceURL, String rawFileName) {
         quiet true
         overwrite false
     }
-
-    exec {
-        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
-        workingDir bon2Dir
-        standardOutput = new FileOutputStream("${deobfFile}.log")
-    }
-
-    return files(deobfFile)
+    return dependencies.rfg.deobf(files(obfFile))
 }
-
-def zipMappings(String zipPath, String url, String bon2Dir) {
-    File zipFile = new File(zipPath)
-    if (zipFile.exists()) {
-        return
-    }
-
-    String fieldsCache = "$bon2Dir/data/fields.csv"
-    String methodsCache = "$bon2Dir/data/methods.csv"
-
-    download.run {
-        src "${url}fields.csv"
-        dest fieldsCache
-        quiet true
-    }
-    download.run {
-        src "${url}methods.csv"
-        dest methodsCache
-        quiet true
-    }
-
-    zipFile.getParentFile().mkdirs()
-    ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))
-
-    zos.putNextEntry(new ZipEntry("fields.csv"))
-    Files.copy(Paths.get(fieldsCache), zos)
-    zos.closeEntry()
-
-    zos.putNextEntry(new ZipEntry("methods.csv"))
-    Files.copy(Paths.get(methodsCache), zos)
-    zos.closeEntry()
-
-    zos.close()
-}
-
 // Helper methods
 
 def checkPropertyExists(String propertyName) {

dependencies.gradle

@@ -1,21 +1,22 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.2.13:dev')
-    implementation('com.github.GTNewHorizons:ForestryMC:4.6.5:dev')
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.45-GTNH:dev')
+    api('com.github.GTNewHorizons:EnderCore:0.2.14:dev')
+    implementation('com.github.GTNewHorizons:ForestryMC:4.6.7:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.53-GTNH:dev')
     implementation("com.github.GTNewHorizons:GTNHLib:0.0.13:dev")
     api('com.github.GTNewHorizons:BuildCraft:7.1.33: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.5.24:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-195-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.6.0:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-215-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.46:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Railcraft:9.14.1:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.11.13-GTNH:api') {transitive = false}
-    implementation('com.github.GTNewHorizons:Chisel:2.10.17-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.1-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.2.0-GTNH:api') {transitive = false}
+    implementation('com.github.GTNewHorizons:Chisel:2.11.0-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.5-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,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -207,6 +207,7 @@ public class EnderIO {
     public static final Lang lang = new Lang("enderio");
 
     public static final boolean hasLwjgl3 = Loader.isModLoaded("lwjgl3ify");
+    public static final boolean hasGT5 = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi_post");
 
     // Materials
     public static ItemCapacitor itemBasicCapacitor;

src/main/java/crazypants/enderio/Log.java

@@ -2,10 +2,13 @@ package crazypants.enderio;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.MarkerManager;
 
 public final class Log {
 
     public static final Logger LOGGER = LogManager.getLogger(EnderIO.MODID);
+    public static final Marker securityMarker = MarkerManager.getMarker("SuspiciousPackets");
 
     public static void warn(String msg) {
         LOGGER.warn(msg);

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

@@ -8,6 +8,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
 import com.enderio.core.common.util.BlockCoord;
+
 import crazypants.util.UserIdent;
 
 public interface ITravelAccessable {

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

@@ -9,11 +9,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import mods.immibis.microblocks.api.EnumPartClass;
-import mods.immibis.microblocks.api.EnumPosition;
-import mods.immibis.microblocks.api.IMicroblockCoverSystem;
-import mods.immibis.microblocks.api.Part;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -52,6 +47,10 @@ import crazypants.enderio.conduit.power.IPowerConduit;
 import crazypants.enderio.conduit.power.PowerConduitNetwork;
 import crazypants.enderio.conduit.redstone.IRedstoneConduit;
 import crazypants.enderio.conduit.redstone.RedstoneConduitNetwork;
+import mods.immibis.microblocks.api.EnumPartClass;
+import mods.immibis.microblocks.api.EnumPosition;
+import mods.immibis.microblocks.api.IMicroblockCoverSystem;
+import mods.immibis.microblocks.api.Part;
 
 public abstract class AbstractConduit implements IConduit {
 

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

@@ -2,11 +2,6 @@ package crazypants.enderio.conduit;
 
 import java.util.List;
 
-import mods.immibis.microblocks.api.IMicroblockCoverSystem;
-import mods.immibis.microblocks.api.IMicroblockSupporterTile;
-import mods.immibis.microblocks.api.MicroblockAPIUtils;
-import mods.immibis.microblocks.api.Part;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -29,6 +24,10 @@ import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.EnderIOTab;
 import crazypants.enderio.ModObject;
+import mods.immibis.microblocks.api.IMicroblockCoverSystem;
+import mods.immibis.microblocks.api.IMicroblockSupporterTile;
+import mods.immibis.microblocks.api.MicroblockAPIUtils;
+import mods.immibis.microblocks.api.Part;
 
 public abstract class AbstractItemConduit extends Item implements IConduitItem {
 

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

@@ -6,9 +6,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
-import mods.immibis.core.api.multipart.IMultipartRenderingBlockMarker;
-import mods.immibis.core.api.multipart.IMultipartSystem;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.ISound;
@@ -31,9 +28,6 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.event.entity.PlaySoundAtEntityEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed;
 
-import powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode;
-import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType;
-
 import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.Util;
@@ -73,6 +67,10 @@ import crazypants.enderio.machine.painter.PainterUtil;
 import crazypants.enderio.network.PacketHandler;
 import crazypants.enderio.tool.ToolUtil;
 import crazypants.util.IFacade;
+import mods.immibis.core.api.multipart.IMultipartRenderingBlockMarker;
+import mods.immibis.core.api.multipart.IMultipartSystem;
+import powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode;
+import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType;
 
 @Optional.InterfaceList({
         @Interface(

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

@@ -4,11 +4,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
-import li.cil.oc.api.network.Environment;
-import li.cil.oc.api.network.SidedEnvironment;
-import mekanism.api.gas.IGasHandler;
-import mods.immibis.microblocks.api.IMicroblockSupporterTile;
-
 import net.minecraft.block.Block;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
@@ -16,11 +11,10 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.IFluidHandler;
 
-import appeng.api.networking.IGridHost;
-import cofh.api.transport.IItemDuct;
-
 import com.enderio.core.common.util.BlockCoord;
 
+import appeng.api.networking.IGridHost;
+import cofh.api.transport.IItemDuct;
 import cpw.mods.fml.common.Optional.Interface;
 import cpw.mods.fml.common.Optional.InterfaceList;
 import cpw.mods.fml.relauncher.Side;
@@ -29,6 +23,10 @@ import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType;
 import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.geom.Offset;
 import crazypants.enderio.power.IInternalPowerHandler;
+import li.cil.oc.api.network.Environment;
+import li.cil.oc.api.network.SidedEnvironment;
+import mekanism.api.gas.IGasHandler;
+import mods.immibis.microblocks.api.IMicroblockSupporterTile;
 
 @InterfaceList({ @Interface(iface = "appeng.api.networking.IGridHost", modid = "appliedenergistics2"),
         @Interface(iface = "mekanism.api.gas.IGasHandler", modid = "MekanismAPI|gas"),

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

@@ -3,6 +3,7 @@ package crazypants.enderio.conduit;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.DyeColor;
+
 import crazypants.enderio.machine.RedstoneControlMode;
 
 public interface IExtractor extends IConduit {

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

@@ -1,11 +1,10 @@
 package crazypants.enderio.conduit;
 
-import mods.immibis.microblocks.api.EnumPosition;
-
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Optional.Method;
+import mods.immibis.microblocks.api.EnumPosition;
 
 public class MicroblocksUtil {
 

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

@@ -7,19 +7,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-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;
-import mekanism.api.gas.GasStack;
-import mods.immibis.microblocks.api.EnumPartClass;
-import mods.immibis.microblocks.api.EnumPosition;
-import mods.immibis.microblocks.api.IMicroblockCoverSystem;
-import mods.immibis.microblocks.api.IMicroblockSystem;
-import mods.immibis.microblocks.api.MicroblockAPIUtils;
-import mods.immibis.microblocks.api.Part;
-import mods.immibis.microblocks.api.PartType;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
@@ -37,11 +24,10 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
-import appeng.api.networking.IGridNode;
-import appeng.api.util.AECableType;
-
 import com.enderio.core.client.render.BoundingBox;
 
+import appeng.api.networking.IGridNode;
+import appeng.api.util.AECableType;
 import cpw.mods.fml.common.Optional.Method;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -64,6 +50,18 @@ 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;
+import mekanism.api.gas.GasStack;
+import mods.immibis.microblocks.api.EnumPartClass;
+import mods.immibis.microblocks.api.EnumPosition;
+import mods.immibis.microblocks.api.IMicroblockCoverSystem;
+import mods.immibis.microblocks.api.IMicroblockSystem;
+import mods.immibis.microblocks.api.MicroblockAPIUtils;
+import mods.immibis.microblocks.api.Part;
+import mods.immibis.microblocks.api.PartType;
 
 public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
 

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

@@ -5,8 +5,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import mekanism.api.gas.IGasHandler;
-
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -23,6 +21,7 @@ import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.machine.reservoir.TileReservoir;
+import mekanism.api.gas.IGasHandler;
 
 public abstract class AbstractGasConduit extends AbstractConduit implements IGasConduit {
 

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

@@ -2,9 +2,6 @@ package crazypants.enderio.conduit.gas;
 
 import java.util.List;
 
-import mekanism.api.gas.GasStack;
-import mekanism.api.gas.IGasHandler;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -17,6 +14,8 @@ import crazypants.enderio.conduit.ConduitUtil;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.RaytraceResult;
 import crazypants.enderio.tool.ToolUtil;
+import mekanism.api.gas.GasStack;
+import mekanism.api.gas.IGasHandler;
 
 public abstract class AbstractGasTankConduit extends AbstractGasConduit {
 

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

@@ -1,7 +1,7 @@
 package crazypants.enderio.conduit.gas;
 
-import mekanism.api.gas.GasStack;
 import crazypants.enderio.conduit.AbstractConduitNetwork;
+import mekanism.api.gas.GasStack;
 
 public class AbstractGasTankConduitNetwork<T extends AbstractGasTankConduit>
         extends AbstractConduitNetwork<IGasConduit, T> {

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

@@ -1,11 +1,10 @@
 package crazypants.enderio.conduit.gas;
 
-import mekanism.api.gas.GasStack;
-import mekanism.api.gas.GasTank;
-
 import net.minecraft.nbt.NBTTagCompound;
 
 import cpw.mods.fml.common.Optional.Method;
+import mekanism.api.gas.GasStack;
+import mekanism.api.gas.GasTank;
 
 public class ConduitGasTank extends GasTank {
 

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

@@ -3,9 +3,6 @@ package crazypants.enderio.conduit.gas;
 import java.util.HashMap;
 import java.util.Map;
 
-import mekanism.api.gas.Gas;
-import mekanism.api.gas.GasStack;
-
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
@@ -24,6 +21,8 @@ import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.config.Config;
+import mekanism.api.gas.Gas;
+import mekanism.api.gas.GasStack;
 
 public class GasConduit extends AbstractGasTankConduit {
 

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

@@ -4,15 +4,15 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import mekanism.api.gas.GasStack;
-import mekanism.api.gas.IGasHandler;
-
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.BlockCoord;
+
 import crazypants.enderio.conduit.IConduit;
+import mekanism.api.gas.GasStack;
+import mekanism.api.gas.IGasHandler;
 
 public class GasConduitNetwork extends AbstractGasTankConduitNetwork<GasConduit> {
 

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

@@ -4,8 +4,6 @@ import static com.enderio.core.client.render.CubeRenderer.addVecWithUV;
 
 import java.util.List;
 
-import mekanism.api.gas.GasStack;
-
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
@@ -25,6 +23,7 @@ import crazypants.enderio.conduit.geom.ConnectionModeGeometry;
 import crazypants.enderio.conduit.geom.Offset;
 import crazypants.enderio.conduit.render.ConduitBundleRenderer;
 import crazypants.enderio.conduit.render.DefaultConduitRenderer;
+import mekanism.api.gas.GasStack;
 
 public class GasConduitRenderer extends DefaultConduitRenderer {
 

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

@@ -1,8 +1,5 @@
 package crazypants.enderio.conduit.gas;
 
-import mekanism.api.gas.GasStack;
-import mekanism.api.gas.IGasHandler;
-
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 
@@ -12,6 +9,8 @@ import cpw.mods.fml.common.ModAPIManager;
 import cpw.mods.fml.common.Optional.Method;
 import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.config.Config;
+import mekanism.api.gas.GasStack;
+import mekanism.api.gas.IGasHandler;
 
 public final class GasUtil {
 

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

@@ -1,12 +1,11 @@
 package crazypants.enderio.conduit.gas;
 
-import mekanism.api.gas.IGasHandler;
-
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.common.Optional.Interface;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IExtractor;
+import mekanism.api.gas.IGasHandler;
 
 @Interface(iface = "mekanism.api.gas.IGasHandler", modid = GasUtil.API_NAME)
 public interface IGasConduit extends IConduit, IGasHandler, IExtractor {

src/main/java/crazypants/enderio/conduit/geom/CollidableComponent.java

@@ -3,6 +3,7 @@ package crazypants.enderio.conduit.geom;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.client.render.BoundingBox;
+
 import crazypants.enderio.conduit.IConduit;
 
 public class CollidableComponent {

src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java

@@ -10,6 +10,7 @@ import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.common.util.ForgeDirectionOffsets;
 import com.enderio.core.common.vecmath.VecmathUtil;
 import com.enderio.core.common.vecmath.Vector3d;
+
 import crazypants.enderio.conduit.IConduit;
 
 public class ConduitGeometryUtil {

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

@@ -10,6 +10,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
@@ -24,12 +25,14 @@ import crazypants.enderio.conduit.gui.item.InventoryUpgrades;
 import crazypants.enderio.conduit.item.IItemConduit;
 import crazypants.enderio.conduit.item.SpeedUpgrade;
 import crazypants.enderio.conduit.item.filter.IItemFilter;
+import crazypants.enderio.machine.gui.IContainerWithTileEntity;
 import crazypants.enderio.network.PacketHandler;
 
-public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrades> {
+public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrades> implements IContainerWithTileEntity {
 
     private final IItemConduit itemConduit;
     private final ForgeDirection direction;
+    private final TileEntity te;
 
     private int speedUpgradeSlotLimit = 15;
 
@@ -52,6 +55,7 @@ public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrade
         super(playerInv, new InventoryUpgrades(bundle.getConduit(IItemConduit.class), dir));
         this.direction = dir;
         this.itemConduit = bundle.getConduit(IItemConduit.class);
+        this.te = (TileEntity) bundle;
         slotLocations.addAll(playerSlotLocations.values());
 
         int x;
@@ -280,6 +284,11 @@ public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrade
         return copystack;
     }
 
+    @Override
+    public TileEntity getTileEntity() {
+        return te;
+    }
+
     private class FilterSlot extends Slot {
 
         public FilterSlot(IInventory par1iInventory, int par2, int par3, int par4) {

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

@@ -2,8 +2,6 @@ package crazypants.enderio.conduit.gui;
 
 import java.awt.Color;
 
-import mekanism.api.gas.Gas;
-
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.util.IIcon;
 
@@ -22,6 +20,7 @@ import crazypants.enderio.gui.RedstoneModeButton;
 import crazypants.enderio.machine.IRedstoneModeControlable;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.network.PacketHandler;
+import mekanism.api.gas.Gas;
 
 public class GasSettings extends BaseSettingsPanel {
 

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

@@ -49,6 +49,7 @@ public class PacketFluidChannel extends AbstractConduitPacket<ILiquidConduit>
 
     @Override
     public IMessage onMessage(PacketFluidChannel message, MessageContext ctx) {
+        if (isInvalidPacketForGui(message, ctx)) return null;
         ILiquidConduit conduit = message.getTileCasted(ctx);
         if (!(conduit instanceof AbstractEnderLiquidConduit)) {
             return null;

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

@@ -53,6 +53,7 @@ public class PacketFluidFilter extends AbstractConduitPacket<ILiquidConduit>
 
     @Override
     public IMessage onMessage(PacketFluidFilter message, MessageContext ctx) {
+        if (isInvalidPacketForGui(message, ctx)) return null;
         ILiquidConduit conduit = message.getTileCasted(ctx);
         if (!(conduit instanceof AbstractEnderLiquidConduit)) {
             return null;

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

@@ -58,6 +58,7 @@ public class PacketExistingItemFilterSnapshot extends AbstractConduitPacket<IIte
 
     @Override
     public PacketExistingItemFilterSnapshot onMessage(PacketExistingItemFilterSnapshot message, MessageContext ctx) {
+        if (isInvalidPacketForGui(message, ctx)) return null;
         IItemConduit conduit = message.getTileCasted(ctx);
         if (conduit == null) {
             return null;

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

@@ -58,6 +58,7 @@ public class PacketModItemFilter extends AbstractConduitPacket<IItemConduit>
 
     @Override
     public IMessage onMessage(PacketModItemFilter message, MessageContext ctx) {
+        if (isInvalidPacketForGui(message, ctx)) return null;
         IItemConduit conduit = message.getTileCasted(ctx);
         if (conduit == null) {
             return null;

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

@@ -5,10 +5,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import cofh.api.transport.IItemDuct;
-
 import com.enderio.core.common.util.DyeColor;
 
+import cofh.api.transport.IItemDuct;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IExtractor;
 import crazypants.enderio.conduit.item.filter.IItemFilter;

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

@@ -18,12 +18,11 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import cofh.api.inventory.IInventoryConnection;
-
 import com.enderio.core.client.render.IconUtil;
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.DyeColor;
 
+import cofh.api.inventory.IInventoryConnection;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.AbstractConduit;
 import crazypants.enderio.conduit.AbstractConduitNetwork;

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

@@ -5,11 +5,10 @@ import java.util.List;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-import cofh.api.energy.IEnergyContainerItem;
-
 import com.enderio.core.client.gui.widget.GhostSlot;
 import com.enderio.core.common.network.NetworkUtil;
 
+import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.conduit.gui.GuiExternalConnection;

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

@@ -16,6 +16,7 @@ import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.DyeColor;
 import com.enderio.core.common.util.FluidUtil;
 
+import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.AbstractConduit;
 import crazypants.enderio.conduit.ConduitUtil;
 import crazypants.enderio.conduit.ConnectionMode;
@@ -23,6 +24,8 @@ import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.machine.reservoir.TileReservoir;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
 public abstract class AbstractLiquidConduit extends AbstractConduit implements ILiquidConduit {
 
@@ -54,6 +57,12 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I
         if (h == null) {
             return false;
         }
+
+        if (EnderIO.hasGT5 && h instanceof IGregTechTileEntity) {
+            IMetaTileEntity mte = ((IGregTechTileEntity) h).getMetaTileEntity();
+            return mte != null && mte.getCapacity() > 0;
+        }
+
         // TODO: This check was added to work around a bug in dynamic tanks, but
         // it causes issues with not conecting to empty tanks such as dim. trans +
         // BC fluid pipes, so I am removing it for now.

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

@@ -12,6 +12,7 @@ import net.minecraftforge.fluids.IFluidHandler;
 
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.FluidUtil;
+
 import crazypants.enderio.conduit.IConduit;
 
 public class AdvancedLiquidConduitNetwork extends AbstractTankConduitNetwork<AdvancedLiquidConduit> {

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

@@ -10,6 +10,7 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;
 
 import com.enderio.core.common.util.BlockCoord;
+
 import crazypants.enderio.conduit.ConduitUtil;
 
 public class LiquidConduitNetwork extends AbstractTankConduitNetwork<LiquidConduit> {

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

@@ -12,6 +12,9 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import com.enderio.core.client.render.IconUtil;
+import com.enderio.core.common.util.BlockCoord;
+
 import appeng.api.AEApi;
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGridConnection;
@@ -19,10 +22,6 @@ import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
 import appeng.api.parts.IPart;
 import appeng.api.parts.IPartHost;
-
-import com.enderio.core.client.render.IconUtil;
-import com.enderio.core.common.util.BlockCoord;
-
 import cpw.mods.fml.common.Optional.Method;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.conduit.AbstractConduit;

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

@@ -1,8 +1,5 @@
 package crazypants.enderio.conduit.oc;
 
-import li.cil.oc.api.network.Environment;
-import li.cil.oc.api.network.SidedEnvironment;
-
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.DyeColor;
@@ -10,6 +7,8 @@ import com.enderio.core.common.util.DyeColor;
 import cpw.mods.fml.common.Optional.Interface;
 import cpw.mods.fml.common.Optional.InterfaceList;
 import crazypants.enderio.conduit.IConduit;
+import li.cil.oc.api.network.Environment;
+import li.cil.oc.api.network.SidedEnvironment;
 
 @InterfaceList({ @Interface(iface = "li.cil.oc.api.network.Environment", modid = "OpenComputersAPI|Network"),
         @Interface(iface = "li.cil.oc.api.network.SidedEnvironment", modid = "OpenComputersAPI|Network") })

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

@@ -9,11 +9,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import li.cil.oc.api.network.Environment;
-import li.cil.oc.api.network.Message;
-import li.cil.oc.api.network.Node;
-import li.cil.oc.api.network.SidedEnvironment;
-
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -45,6 +40,10 @@ import crazypants.enderio.conduit.geom.CollidableComponent;
 import crazypants.enderio.conduit.geom.ConduitGeometryUtil;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.tool.ToolUtil;
+import li.cil.oc.api.network.Environment;
+import li.cil.oc.api.network.Message;
+import li.cil.oc.api.network.Node;
+import li.cil.oc.api.network.SidedEnvironment;
 
 public class OCConduit extends AbstractConduit implements IOCConduit {
 

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

@@ -1,11 +1,5 @@
 package crazypants.enderio.conduit.oc;
 
-import li.cil.oc.api.Network;
-import li.cil.oc.api.network.ManagedEnvironment;
-import li.cil.oc.api.network.Message;
-import li.cil.oc.api.network.Node;
-import li.cil.oc.api.network.Visibility;
-
 import net.minecraft.nbt.NBTTagCompound;
 
 import com.enderio.core.common.util.DyeColor;
@@ -13,6 +7,11 @@ import com.enderio.core.common.util.DyeColor;
 import cpw.mods.fml.common.Optional.Interface;
 import cpw.mods.fml.common.Optional.Method;
 import crazypants.enderio.conduit.AbstractConduitNetwork;
+import li.cil.oc.api.Network;
+import li.cil.oc.api.network.ManagedEnvironment;
+import li.cil.oc.api.network.Message;
+import li.cil.oc.api.network.Node;
+import li.cil.oc.api.network.Visibility;
 
 @Interface(iface = "li.cil.oc.api.network.ManagedEnvironment", modid = "OpenComputersAPI|Network")
 public class OCConduitNetwork extends AbstractConduitNetwork<IOCConduit, IOCConduit> implements ManagedEnvironment {

src/main/java/crazypants/enderio/conduit/packet/AbstractConduitPacket.java

@@ -6,6 +6,7 @@ import net.minecraft.world.World;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.IConduitBundle;
+import crazypants.enderio.network.PacketUtil;
 import io.netty.buffer.ByteBuf;
 
 public class AbstractConduitPacket<T extends IConduit> extends AbstractConduitBundlePacket {
@@ -50,4 +51,12 @@ public class AbstractConduitPacket<T extends IConduit> extends AbstractConduitBu
         IConduitBundle bundle = (IConduitBundle) te;
         return (T) bundle.getConduit(getConType());
     }
+
+    /**
+     * Validates if TileEntity received from client is actually the one player is interacting with. It prevents
+     * malicious user disturbing random machine settings etc.
+     */
+    protected static boolean isInvalidPacketForGui(AbstractConduitPacket<?> message, MessageContext ctx) {
+        return PacketUtil.isInvalidPacketForGui(ctx, message.getTileEntity(message.getWorld(ctx)), message.getClass());
+    }
 }

src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java

@@ -40,6 +40,7 @@ public class PacketConnectionMode extends AbstractConduitPacket<IConduit>
 
     @Override
     public IMessage onMessage(PacketConnectionMode message, MessageContext ctx) {
+        if (isInvalidPacketForGui(message, ctx)) return null;
         IConduit conduit = message.getTileCasted(ctx);
         if (conduit == null) {
             return null;

src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java

@@ -45,6 +45,7 @@ public class PacketExtractMode extends AbstractConduitPacket<IExtractor>
 
     @Override
     public IMessage onMessage(PacketExtractMode message, MessageContext ctx) {
+        if (isInvalidPacketForGui(message, ctx)) return null;
         message.getTileCasted(ctx).setExtractionRedstoneMode(message.mode, message.dir);
         message.getTileCasted(ctx).setExtractionSignalColor(message.dir, message.color);
         message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z);

src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java

@@ -68,6 +68,7 @@ public class PacketItemConduitFilter extends AbstractConduitPacket<IItemConduit>
 
     @Override
     public IMessage onMessage(PacketItemConduitFilter message, MessageContext ctx) {
+        if (isInvalidPacketForGui(message, ctx)) return null;
         IItemConduit conduit = message.getTileCasted(ctx);
         conduit.setSelfFeedEnabled(message.dir, message.loopMode);
         conduit.setRoundRobinEnabled(message.dir, message.roundRobin);

src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java

@@ -40,6 +40,7 @@ public class PacketOCConduitSignalColor extends AbstractConduitPacket<IOCConduit
 
     @Override
     public IMessage onMessage(PacketOCConduitSignalColor message, MessageContext ctx) {
+        if (isInvalidPacketForGui(message, ctx)) return null;
         message.getTileCasted(ctx).setSignalColor(message.dir, message.col);
         message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z);
         return null;

src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitOutputStrength.java

@@ -38,6 +38,7 @@ public class PacketRedstoneConduitOutputStrength extends AbstractConduitPacket<I
 
     @Override
     public IMessage onMessage(PacketRedstoneConduitOutputStrength message, MessageContext ctx) {
+        if (isInvalidPacketForGui(message, ctx)) return null;
         IInsulatedRedstoneConduit tile = message.getTileCasted(ctx);
         if (tile != null) {
             tile.setOutputStrength(message.dir, message.isStrong);

src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java

@@ -40,6 +40,7 @@ public class PacketRedstoneConduitSignalColor extends AbstractConduitPacket<IIns
 
     @Override
     public IMessage onMessage(PacketRedstoneConduitSignalColor message, MessageContext ctx) {
+        if (isInvalidPacketForGui(message, ctx)) return null;
         message.getTileCasted(ctx).setSignalColor(message.dir, message.col);
         message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z);
         return null;

src/main/java/crazypants/enderio/conduit/packet/PacketRoundRobinMode.java

@@ -39,6 +39,7 @@ public class PacketRoundRobinMode extends AbstractConduitPacket<ILiquidConduit>
 
     @Override
     public IMessage onMessage(PacketRoundRobinMode message, MessageContext ctx) {
+        if (isInvalidPacketForGui(message, ctx)) return null;
         final ILiquidConduit conduit = message.getTileCasted(ctx);
         if (conduit instanceof AbstractEnderLiquidConduit) {
             ((AbstractEnderLiquidConduit) conduit).setRoundRobin(message.dir, message.roundRobin);

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

@@ -3,6 +3,7 @@ package crazypants.enderio.conduit.redstone;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.DyeColor;
+
 import crazypants.enderio.conduit.ConnectionMode;
 
 public interface IInsulatedRedstoneConduit extends IRedstoneConduit {

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

@@ -6,6 +6,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.DyeColor;
+
 import crazypants.enderio.conduit.IConduit;
 
 public interface IRedstoneConduit extends IConduit {

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

@@ -21,13 +21,12 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import cofh.api.tileentity.IRedstoneControl;
-
 import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.client.render.IconUtil;
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.DyeColor;
 
+import cofh.api.tileentity.IRedstoneControl;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.EnderIO;

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

@@ -17,8 +17,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import powercrystals.minefactoryreloaded.api.rednet.IRedNetOutputNode;
-
 import com.enderio.core.client.render.IconUtil;
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.DyeColor;
@@ -36,6 +34,7 @@ import crazypants.enderio.conduit.ConduitUtil;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.geom.CollidableComponent;
 import dan200.computercraft.api.ComputerCraftAPI;
+import powercrystals.minefactoryreloaded.api.rednet.IRedNetOutputNode;
 
 public class RedstoneConduit extends AbstractConduit implements IRedstoneConduit {
 

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

@@ -4,6 +4,7 @@ import com.enderio.core.api.client.render.VertexTransform;
 import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.client.render.VertexRotation;
 import com.enderio.core.common.vecmath.Vector3d;
+
 import crazypants.enderio.config.Config;
 
 public class RedstoneSwitchBounds {

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

@@ -321,6 +321,8 @@ public final class Config {
     public static boolean addFuelTooltipsToAllFluidContainers = true;
     public static boolean addFurnaceFuelTootip = true;
     public static boolean addDurabilityTootip = true;
+    public static boolean renderDurabilityBar = true;
+    public static boolean renderChargeBar = true;
 
     public static int farmContinuousEnergyUseRF = 40;
     public static int farmActionEnergyUseRF = 500;
@@ -1916,6 +1918,16 @@ public final class Config {
                 "addFurnaceFuelTootip",
                 addFuelTooltipsToAllFluidContainers,
                 "If true, adds burn duration tooltips to furnace fuels").getBoolean(addFurnaceFuelTootip);
+        renderChargeBar = config.get(
+                sectionPersonal.name,
+                "renderChargeBar",
+                renderChargeBar,
+                "If true, render the bar when an item has RF").getBoolean(renderChargeBar);
+        renderDurabilityBar = config.get(
+                sectionPersonal.name,
+                "renderDurabilityBar",
+                renderDurabilityBar,
+                "If true, render the bar when an item is damaged").getBoolean(renderDurabilityBar);
 
         farmContinuousEnergyUseRF = config.get(
                 sectionFarm.name,

src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java

@@ -17,6 +17,7 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
 
 import com.enderio.core.common.util.EntityUtil;
+
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class EntityWitherSkeleton extends EntitySkeleton {

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

@@ -8,6 +8,7 @@ import net.minecraft.util.ResourceLocation;
 
 import com.enderio.core.client.gui.GuiContainerBase;
 import com.enderio.core.client.render.RenderUtil;
+
 import crazypants.enderio.EnderIO;
 
 public abstract class GuiContainerBaseEIO extends GuiContainerBase {

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

@@ -12,13 +12,12 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
-import baubles.api.BaubleType;
-import baubles.api.IBauble;
-import cofh.api.energy.ItemEnergyContainer;
-
 import com.enderio.core.api.client.gui.IResourceTooltipProvider;
 import com.enderio.core.common.util.ItemUtil;
 
+import baubles.api.BaubleType;
+import baubles.api.IBauble;
+import cofh.api.energy.ItemEnergyContainer;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.Optional.Method;
@@ -237,4 +236,9 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
     public boolean canUnequip(ItemStack itemstack, EntityLivingBase player) {
         return true;
     }
+
+    @Override
+    public boolean showDurabilityBar(ItemStack stack) {
+        return Config.renderDurabilityBar && super.showDurabilityBar(stack);
+    }
 }

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

@@ -20,11 +20,10 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
 
 import org.lwjgl.input.Keyboard;
 
-import cofh.api.block.IDismantleable;
-
 import com.enderio.core.api.client.gui.IAdvancedTooltipProvider;
 import com.enderio.core.client.handlers.SpecialTooltipHandler;
 
+import cofh.api.block.IDismantleable;
 import cpw.mods.fml.common.eventhandler.Event.Result;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;

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

@@ -27,14 +27,13 @@ import net.minecraftforge.event.entity.player.PlayerEvent;
 
 import org.lwjgl.opengl.GL11;
 
-import cofh.api.energy.IEnergyContainerItem;
-
 import com.enderio.core.common.util.Util;
 import com.enderio.core.common.vecmath.VecmathUtil;
 import com.enderio.core.common.vecmath.Vector3d;
 import com.enderio.core.common.vecmath.Vector4d;
 import com.mojang.authlib.GameProfile;
 
+import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;

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

@@ -16,15 +16,10 @@ import net.minecraftforge.common.ISpecialArmor;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.EnumHelper;
 
-import thaumcraft.api.IGoggles;
-import thaumcraft.api.IVisDiscountGear;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.nodes.IRevealer;
-import cofh.api.energy.IEnergyContainerItem;
-
 import com.enderio.core.api.client.gui.IAdvancedTooltipProvider;
 import com.enderio.core.common.util.ItemUtil;
 
+import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional.Interface;
 import cpw.mods.fml.common.Optional.InterfaceList;
@@ -42,6 +37,10 @@ import crazypants.enderio.item.darksteel.upgrade.NaturalistEyeUpgrade;
 import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade;
 import forestry.api.apiculture.IArmorApiarist;
 import forestry.api.core.IArmorNaturalist;
+import thaumcraft.api.IGoggles;
+import thaumcraft.api.IVisDiscountGear;
+import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.nodes.IRevealer;
 
 @InterfaceList({ @Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft"),
         @Interface(iface = "thaumcraft.api.IVisDiscountGear", modid = "Thaumcraft"),

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

@@ -24,12 +24,11 @@ import net.minecraftforge.event.ForgeEventFactory;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.oredict.OreDictionary;
 
-import cofh.api.energy.IEnergyContainerItem;
-
 import com.enderio.core.api.client.gui.IAdvancedTooltipProvider;
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.ItemUtil;
 
+import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;

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

@@ -18,12 +18,11 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
 import net.minecraftforge.common.MinecraftForge;
 
-import cofh.api.energy.IEnergyContainerItem;
-
 import com.enderio.core.api.client.gui.IAdvancedTooltipProvider;
 import com.enderio.core.common.util.ItemUtil;
 import com.google.common.collect.Sets;
 
+import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

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

@@ -20,12 +20,11 @@ import net.minecraftforge.common.IShearable;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 
-import cofh.api.energy.IEnergyContainerItem;
-
 import com.enderio.core.api.client.gui.IAdvancedTooltipProvider;
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.ItemUtil;
 
+import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;

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

@@ -24,12 +24,11 @@ import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.entity.living.EnderTeleportEvent;
 import net.minecraftforge.event.entity.living.LivingDropsEvent;
 
-import cofh.api.energy.IEnergyContainerItem;
-
 import com.enderio.core.api.client.gui.IAdvancedTooltipProvider;
 import com.enderio.core.common.util.ItemUtil;
 import com.enderio.core.common.util.Util;
 
+import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.registry.GameRegistry;

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

@@ -10,11 +10,12 @@ import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;
 
-import cofh.api.energy.IEnergyContainerItem;
-
 import com.enderio.core.client.render.ColorUtil;
 import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.common.vecmath.Vector4f;
+
+import cofh.api.energy.IEnergyContainerItem;
+import crazypants.enderio.config.Config;
 import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade;
 
 public class PoweredItemRenderer implements IItemRenderer {
@@ -44,26 +45,29 @@ public class PoweredItemRenderer implements IItemRenderer {
         ri.renderItemIntoGUI(mc.fontRenderer, mc.getTextureManager(), item, 0, 0, true);
         GL11.glDisable(GL11.GL_LIGHTING);
 
-        if (isJustCrafted(item)) {
+        if (isJustCrafted(item) || (!Config.renderChargeBar && !Config.renderDurabilityBar)) {
             return;
         }
 
         boolean hasEnergyUpgrade = EnergyUpgrade.loadFromItem(item) != null;
-        int y = hasEnergyUpgrade ? 12 : 13;
-        int bgH = hasEnergyUpgrade ? 4 : 2;
+        int y = (Config.renderDurabilityBar ^ Config.renderChargeBar) || !hasEnergyUpgrade ? 13 : 12;
+        int bgH = (Config.renderDurabilityBar ^ Config.renderChargeBar) || !hasEnergyUpgrade ? 2 : 4;
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
         RenderUtil.renderQuad2D(2, y, 0, 13, bgH, ColorUtil.getRGB(Color.black));
 
-        double maxDam = item.getMaxDamage();
-        double dispDamage = item.getItemDamageForDisplay();
-        y = hasEnergyUpgrade ? 14 : 13;
-        renderBar(y, maxDam, dispDamage, Color.green, Color.red);
+        double maxDam, dispDamage;
+        if (Config.renderDurabilityBar) {
+            maxDam = item.getMaxDamage();
+            dispDamage = item.getItemDamageForDisplay();
+            y = Config.renderChargeBar && hasEnergyUpgrade ? 14 : 13;
+            renderBar(y, maxDam, dispDamage, Color.green, Color.red);
+        }
 
-        if (hasEnergyUpgrade) {
+        if (Config.renderChargeBar && hasEnergyUpgrade) {
             IEnergyContainerItem armor = (IEnergyContainerItem) item.getItem();
             maxDam = armor.getMaxEnergyStored(item);
             dispDamage = armor.getEnergyStored(item);
-            y = 12;
+            y = Config.renderDurabilityBar ? 12 : 13;
             Color color = new Color(0x2D, 0xCE, 0xFA); // electric blue
             renderBar2(y, maxDam, maxDam - dispDamage, color, color);
         }

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

@@ -6,6 +6,7 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 
 import com.enderio.core.common.vecmath.Vector3d;
+
 import crazypants.enderio.config.Config;
 
 public class SoundEntity extends Entity {

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

@@ -9,13 +9,13 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import thaumcraft.api.crafting.IInfusionStabiliser;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.BlockEio;
 import crazypants.enderio.ModObject;
+import thaumcraft.api.crafting.IInfusionStabiliser;
 
 @Optional.Interface(iface = "thaumcraft.api.crafting.IInfusionStabiliser", modid = "Thaumcraft")
 public class BlockEndermanSkull extends BlockEio implements IInfusionStabiliser {

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

@@ -2,19 +2,25 @@ package crazypants.enderio.machine;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
+import net.minecraft.tileentity.TileEntity;
 
-public class ContainerNoInv extends Container {
+import crazypants.enderio.machine.gui.IContainerWithTileEntity;
 
-    private IInventory inv;
+public class ContainerNoInv extends Container implements IContainerWithTileEntity {
 
-    public ContainerNoInv(IInventory inv) {
-        super();
-        this.inv = inv;
+    private final AbstractMachineEntity tile;
+
+    public ContainerNoInv(AbstractMachineEntity tile) {
+        this.tile = tile;
     }
 
     @Override
     public boolean canInteractWith(EntityPlayer player) {
-        return inv.isUseableByPlayer(player);
+        return tile.isUseableByPlayer(player);
+    }
+
+    @Override
+    public TileEntity getTileEntity() {
+        return tile;
     }
 }

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

@@ -8,6 +8,7 @@ import net.minecraftforge.common.util.FakePlayer;
 
 import com.enderio.core.common.util.BlockCoord;
 import com.mojang.authlib.GameProfile;
+
 import crazypants.enderio.machine.farm.FakeNetHandlerPlayServer;
 
 public class FakePlayerEIO extends FakePlayer {

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

@@ -9,6 +9,7 @@ import com.enderio.core.common.util.BlockCoord;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import crazypants.enderio.network.PacketUtil;
 import io.netty.buffer.ByteBuf;
 
 public class PacketIoMode implements IMessage, IMessageHandler<PacketIoMode, IMessage> {
@@ -61,6 +62,7 @@ public class PacketIoMode implements IMessage, IMessageHandler<PacketIoMode, IMe
     public IMessage onMessage(PacketIoMode message, MessageContext ctx) {
         EntityPlayer player = ctx.getServerHandler().playerEntity;
         TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z);
+        if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null;
         if (te instanceof IIoConfigurable) {
             IIoConfigurable me = (IIoConfigurable) te;
             if (message.face == ForgeDirection.UNKNOWN) {

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

@@ -8,6 +8,7 @@ import com.enderio.core.common.util.BlockCoord;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import crazypants.enderio.network.PacketUtil;
 import io.netty.buffer.ByteBuf;
 
 public class PacketItemBuffer implements IMessage, IMessageHandler<PacketItemBuffer, IMessage> {
@@ -47,6 +48,7 @@ public class PacketItemBuffer implements IMessage, IMessageHandler<PacketItemBuf
     public IMessage onMessage(PacketItemBuffer message, MessageContext ctx) {
         EntityPlayer player = ctx.getServerHandler().playerEntity;
         TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z);
+        if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null;
         if (te instanceof IItemBuffer) {
             ((IItemBuffer) te).setBufferStacks(message.bufferStacks);
         }

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

@@ -1,45 +0,0 @@
-package crazypants.enderio.machine;
-
-import net.minecraft.tileentity.TileEntity;
-
-import com.enderio.core.api.common.util.IProgressTile;
-import com.enderio.core.common.network.MessageTileEntity;
-
-import cpw.mods.fml.common.network.simpleimpl.IMessage;
-import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
-import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-import crazypants.enderio.EnderIO;
-import io.netty.buffer.ByteBuf;
-
-public class PacketProgress extends MessageTileEntity<TileEntity> implements IMessageHandler<PacketProgress, IMessage> {
-
-    private float progress;
-
-    public PacketProgress() {}
-
-    public PacketProgress(IProgressTile tile) {
-        super(tile.getTileEntity());
-        progress = tile.getProgress();
-    }
-
-    @Override
-    public void toBytes(ByteBuf buf) {
-        super.toBytes(buf);
-        buf.writeFloat(progress);
-    }
-
-    @Override
-    public void fromBytes(ByteBuf buf) {
-        super.fromBytes(buf);
-        progress = buf.readFloat();
-    }
-
-    @Override
-    public IMessage onMessage(PacketProgress message, MessageContext ctx) {
-        TileEntity tile = message.getTileEntity(EnderIO.proxy.getClientWorld());
-        if (tile instanceof IProgressTile) {
-            ((IProgressTile) tile).setProgress(message.progress);
-        }
-        return null;
-    }
-}

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

@@ -6,6 +6,7 @@ import net.minecraft.tileentity.TileEntity;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import crazypants.enderio.network.PacketUtil;
 import io.netty.buffer.ByteBuf;
 
 public class PacketRedstoneMode implements IMessage, IMessageHandler<PacketRedstoneMode, IMessage> {
@@ -52,6 +53,7 @@ public class PacketRedstoneMode implements IMessage, IMessageHandler<PacketRedst
     public IMessage onMessage(PacketRedstoneMode message, MessageContext ctx) {
         EntityPlayer player = ctx.getServerHandler().playerEntity;
         TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z);
+        if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null;
         if (te instanceof IRedstoneModeControlable) {
             IRedstoneModeControlable me = (IRedstoneModeControlable) te;
             me.setRedstoneControlMode(message.mode);

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

@@ -13,6 +13,7 @@ import com.enderio.core.client.render.TechneUtil;
 import com.enderio.core.client.render.VertexRotationFacing;
 import com.enderio.core.client.render.VertexTransformComposite;
 import com.google.common.collect.ObjectArrays;
+
 import crazypants.enderio.EnderIO;
 
 public class TechneMachineRenderer<T extends AbstractMachineEntity> extends TechneModelRenderer {

src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java

@@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.stats.AchievementList;
 
 import com.enderio.core.common.util.Util;
+
 import crazypants.enderio.machine.gui.AbstractMachineContainer;
 
 public class ContainerAlloySmelter extends AbstractMachineContainer<TileAlloySmelter> {

src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java

@@ -5,6 +5,7 @@ import net.minecraft.tileentity.TileEntity;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import crazypants.enderio.network.PacketUtil;
 import io.netty.buffer.ByteBuf;
 
 public class PacketClientState implements IMessage, IMessageHandler<PacketClientState, IMessage> {
@@ -43,6 +44,7 @@ public class PacketClientState implements IMessage, IMessageHandler<PacketClient
 
     public IMessage onMessage(PacketClientState message, MessageContext ctx) {
         TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z);
+        if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null;
         if (te instanceof TileAlloySmelter) {
             TileAlloySmelter me = (TileAlloySmelter) te;
             me.setMode(message.mode);

src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java

@@ -7,6 +7,7 @@ import net.minecraft.item.ItemStack;
 import cofh.api.energy.IEnergyContainerItem;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.EnderIOTab;
+import crazypants.enderio.config.Config;
 import crazypants.enderio.power.PowerHandlerUtil;
 
 public class BlockItemCapBank extends ItemBlock implements IEnergyContainerItem {
@@ -42,7 +43,7 @@ public class BlockItemCapBank extends ItemBlock implements IEnergyContainerItem
 
     @Override
     public boolean showDurabilityBar(ItemStack itemStack) {
-        return !CapBankType.getTypeFromMeta(itemStack.getItemDamage()).isCreative();
+        return Config.renderDurabilityBar && !CapBankType.getTypeFromMeta(itemStack.getItemDamage()).isCreative();
     }
 
     @Override

src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java

@@ -10,15 +10,14 @@ import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import com.enderio.core.common.ContainerEnder;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.machine.capbank.network.InventoryImpl;
+import crazypants.enderio.machine.gui.ContainerEnderTileEntity;
 import crazypants.util.BaublesUtil;
 import crazypants.util.ShadowInventory;
 
-public class ContainerCapBank extends ContainerEnder<TileCapBank> {
+public class ContainerCapBank extends ContainerEnderTileEntity<TileCapBank> {
 
     private InventoryImpl inv;
 

src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java

@@ -18,13 +18,12 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import cofh.api.energy.IEnergyContainerItem;
-
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.EntityUtil;
 import com.enderio.core.common.util.Util;
 import com.enderio.core.common.vecmath.Vector3d;
 
+import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.EnderIO;

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

@@ -11,11 +11,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import cofh.api.energy.IEnergyContainerItem;
-
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.RoundRobinIterator;
 
+import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
 import crazypants.enderio.conduit.ConduitNetworkTickHandler;
 import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener;

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

@@ -10,6 +10,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.BlockCoord;
+
 import crazypants.enderio.machine.capbank.TileCapBank;
 
 public class NetworkUtil {

src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java

@@ -8,6 +8,7 @@ import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import crazypants.enderio.network.PacketUtil;
 import io.netty.buffer.ByteBuf;
 
 public class PacketCrafter extends MessageTileEntity<TileCrafter> implements IMessageHandler<PacketCrafter, IMessage> {
@@ -46,9 +47,8 @@ public class PacketCrafter extends MessageTileEntity<TileCrafter> implements IMe
     @Override
     public IMessage onMessage(PacketCrafter msg, MessageContext ctx) {
         TileCrafter te = msg.getTileEntity(ctx.getServerHandler().playerEntity.worldObj);
-        if (te != null) {
-            msg.execute(te);
-        }
+        if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null;
+        msg.execute(te);
         return null;
     }
 

src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java

@@ -7,6 +7,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import org.lwjgl.opengl.GL11;
 
 import com.enderio.core.client.gui.widget.GuiToolTip;
+
 import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
 
 public class GuiCrusher extends GuiPoweredMachineBase<TileCrusher> {

src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java

@@ -11,9 +11,10 @@ import net.minecraft.item.ItemStack;
 
 import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot;
 import com.enderio.core.client.gui.widget.GhostSlot;
-import com.enderio.core.common.ContainerEnder;
 
-public class ContainerEnchanter extends ContainerEnder<TileEnchanter> {
+import crazypants.enderio.machine.gui.ContainerEnderTileEntity;
+
+public class ContainerEnchanter extends ContainerEnderTileEntity<TileEnchanter> {
 
     public ContainerEnchanter(EntityPlayer player, InventoryPlayer playerInv, TileEnchanter te) {
         super(playerInv, te);

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

@@ -14,6 +14,7 @@ import net.minecraftforge.oredict.OreDictionary;
 
 import com.enderio.core.common.util.BlockCoord;
 import com.google.common.collect.Lists;
+
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public enum Fertilizer {

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

@@ -5,6 +5,7 @@ import com.enderio.core.common.network.MessageTileEntity;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import crazypants.enderio.network.PacketUtil;
 import io.netty.buffer.ByteBuf;
 
 public class PacketFarmLockedSlot extends MessageTileEntity<TileFarmStation>
@@ -34,9 +35,8 @@ public class PacketFarmLockedSlot extends MessageTileEntity<TileFarmStation>
     @Override
     public IMessage onMessage(PacketFarmLockedSlot message, MessageContext ctx) {
         TileFarmStation te = message.getTileEntity(message.getWorld(ctx));
-        if (te != null) {
-            te.toggleLockedState(message.buttonID);
-        }
+        if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null;
+        te.toggleLockedState(message.buttonID);
         return null;
     }
 }

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

@@ -7,6 +7,7 @@ import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 
 import com.enderio.core.common.util.BlockCoord;
+
 import crazypants.enderio.machine.farm.TileFarmStation;
 
 public class FarmersCommune implements IFarmerJoe {

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

@@ -4,6 +4,7 @@ import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 
 import com.enderio.core.common.util.BlockCoord;
+
 import crazypants.enderio.machine.farm.TileFarmStation;
 
 public interface IFarmerJoe {

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

@@ -4,6 +4,7 @@ import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 
 import com.enderio.core.common.util.BlockCoord;
+
 import crazypants.enderio.machine.farm.TileFarmStation;
 
 public class MelonFarmer extends CustomSeedFarmer {

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

@@ -8,6 +8,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.BlockCoord;
+
 import crazypants.enderio.machine.farm.TileFarmStation;
 
 public class NetherWartFarmer extends CustomSeedFarmer {

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

@@ -10,6 +10,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 import com.enderio.core.common.util.BlockCoord;
+
 import crazypants.enderio.machine.farm.TileFarmStation;
 
 public class PickableFarmer extends CustomSeedFarmer {

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

@@ -17,6 +17,7 @@ import net.minecraftforge.common.IPlantable;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.BlockCoord;
+
 import crazypants.enderio.machine.farm.TileFarmStation;
 
 public class PlantableFarmer implements IFarmerJoe {

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

@@ -12,6 +12,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.BlockCoord;
+
 import crazypants.enderio.machine.farm.TileFarmStation;
 
 public class StemFarmer extends CustomSeedFarmer {

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

@@ -8,6 +8,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.BlockCoord;
+
 import crazypants.enderio.machine.farm.TileFarmStation;
 
 public class TreeHarvestUtil {

src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java

@@ -11,13 +11,12 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
 import com.enderio.core.api.common.util.IProgressTile;
-import com.enderio.core.common.ContainerEnder;
 import com.enderio.core.common.util.Util;
 
 import crazypants.enderio.machine.AbstractMachineEntity;
 import crazypants.enderio.machine.SlotDefinition;
 
-public abstract class AbstractMachineContainer<T extends AbstractMachineEntity> extends ContainerEnder<T> {
+public abstract class AbstractMachineContainer<T extends AbstractMachineEntity> extends ContainerEnderTileEntity<T> {
 
     protected Slot upgradeSlot;
 

src/main/java/crazypants/enderio/machine/gui/ContainerEnderTileEntity.java

@@ -0,0 +1,20 @@
+package crazypants.enderio.machine.gui;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.tileentity.TileEntity;
+
+import com.enderio.core.common.ContainerEnder;
+
+public class ContainerEnderTileEntity<T extends TileEntity & IInventory> extends ContainerEnder<T>
+        implements IContainerWithTileEntity {
+
+    public ContainerEnderTileEntity(InventoryPlayer playerInv, T inv) {
+        super(playerInv, inv);
+    }
+
+    @Override
+    public TileEntity getTileEntity() {
+        return getInv();
+    }
+}

src/main/java/crazypants/enderio/machine/gui/IContainerWithTileEntity.java

@@ -0,0 +1,13 @@
+package crazypants.enderio.machine.gui;
+
+import net.minecraft.tileentity.TileEntity;
+
+/**
+ * Container implementing this interface holds TileEntity player is interacting with.
+ *
+ * @see crazypants.enderio.network.PacketUtil#isInvalidPacketForGui
+ */
+public interface IContainerWithTileEntity {
+
+    TileEntity getTileEntity();
+}

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

@@ -10,6 +10,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.InventoryWrapper;
+
 import crazypants.enderio.ModObject;
 
 public class CompositeInventory implements ISidedInventory {