Prevent ghostloading (#116 )

* prevent ghostloading by MEConduit * prevent more ghostloading by MEConduit * spottlessApply * prevent ghostloading by ConduitUtil --------- Co-authored-by: Pilzinsel64 <[email protected]>
2026-11-15 09:34:50 +00:00 · 2023-03-29 22:15:12 +02:00
173 changed files with 1077 additions and 984 deletions
@@ -0,0 +1,33 @@
+#!/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
+
@@ -1,4 +1,4 @@
-//version: 1690104383
+//version: 1677938302
 /*
 DO NOT CHANGE THIS FILE!
 Also, you may replace this file at any time if there is an update available.
@@ -6,25 +6,29 @@
 */


+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.Application
-import org.jetbrains.gradle.ext.Gradle
+import org.jetbrains.gradle.ext.*

-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 {
@@ -61,26 +65,22 @@ plugins {
    id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false
    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 '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 '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.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle
-    id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
+    id 'com.diffplug.spotless' version '6.7.2' apply false
    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.2.2'
 }
-
-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.")

-// In submodules, .git is a file pointing to the real git dir
-if (project.file('.git/HEAD').isFile() || project.file('.git').isFile()) {
+if (project.file('.git/HEAD').isFile()) {
    apply plugin: 'com.palantir.git-version'
 }

@@ -115,8 +115,6 @@ propertyDefaultIfUnset("usesMixinDebug", project.usesMixins)
 propertyDefaultIfUnset("forceEnableMixins", false)
 propertyDefaultIfUnset("channel", "stable")
 propertyDefaultIfUnset("mappingsVersion", "12")
-propertyDefaultIfUnset("usesMavenPublishing", true)
-propertyDefaultIfUnset("mavenPublishUrl", "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases")
 propertyDefaultIfUnset("modrinthProjectId", "")
 propertyDefaultIfUnset("modrinthRelations", "")
 propertyDefaultIfUnset("curseForgeProjectId", "")
@@ -134,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(com.diffplug.blowdryer.Blowdryer, "Blowdryer", com.diffplug.blowdryer.Blowdryer) // Make blowdryer available in "apply from:" scripts
+project.extensions.add(Blowdryer, "Blowdryer", Blowdryer) // Make blowdryer available in "apply from:" scripts
 if (!disableSpotless) {
    apply plugin: 'com.diffplug.spotless'
    apply from: Blowdryer.file('spotless.gradle')
@@ -155,21 +153,13 @@ java {
        } else {
            languageVersion.set(projectJavaVersion)
        }
-        vendor.set(JvmVendorSpec.AZUL)
+        vendor.set(JvmVendorSpec.ADOPTIUM)
    }
    if (!noPublishedSources) {
        withSourcesJar()
    }
 }

-tasks.withType(JavaCompile).configureEach {
-    options.encoding = "UTF-8"
-}
-
-tasks.withType(ScalaCompile).configureEach {
-    options.encoding = "UTF-8"
-}
-
 pluginManager.withPlugin('org.jetbrains.kotlin.jvm') {
    // If Kotlin is enabled in the project
    kotlin {
@@ -203,14 +193,6 @@ 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()) {
@@ -224,8 +206,6 @@ 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
        }
@@ -242,7 +222,7 @@ if (enableModernJavaSyntax.toBoolean()) {

        javaCompiler.set(javaToolchains.compilerFor {
            languageVersion.set(JavaLanguageVersion.of(17))
-            vendor.set(JvmVendorSpec.AZUL)
+            vendor.set(JvmVendorSpec.ADOPTIUM)
        })
    }
 }
@@ -359,27 +339,7 @@ catch (Exception ignored) {
 String identifiedVersion
 String versionOverride = System.getenv("VERSION") ?: null
 try {
-    // Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty
-    if (versionOverride == null) {
-        def gitDetails = versionDetails()
-        def isDirty = gitVersion().endsWith(".dirty") // No public API for this, isCleanTag has a different meaning
-        String branchName = gitDetails.branchName ?: (System.getenv('GIT_BRANCH') ?: 'git')
-        if (branchName.startsWith('origin/')) {
-            branchName = branchName.minus('origin/')
-        }
-        branchName = branchName.replaceAll("[^a-zA-Z0-9-]+", "-") // sanitize branch names for semver
-        identifiedVersion = gitDetails.lastTag ?: '${gitDetails.gitHash}'
-        if (gitDetails.commitDistance > 0) {
-            identifiedVersion += "-${branchName}.${gitDetails.commitDistance}+${gitDetails.gitHash}"
-            if (isDirty) {
-                identifiedVersion += "-dirty"
-            }
-        } else if (isDirty) {
-            identifiedVersion += "-${branchName}+${gitDetails.gitHash}-dirty"
-        }
-    } else {
-        identifiedVersion = versionOverride
-    }
+    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
 }
 catch (Exception ignored) {
    out.style(Style.Failure).text(
@@ -431,12 +391,14 @@ minecraft {

    username = developmentEnvironmentUserName.toString()

-    lwjgl3Version = "3.3.2"
+    lwjgl3Version = "3.3.2-SNAPSHOT"

    // Enable assertions in the current mod
    extraRunJvmArguments.add("-ea:${modGroup}")

    if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
+        extraTweakClasses.add("org.spongepowered.asm.launch.MixinTweaker")
+
        if (usesMixinDebug.toBoolean()) {
            extraRunJvmArguments.addAll([
                "-Dmixin.debug.countInjections=true",
@@ -487,19 +449,10 @@ sourceSets {
    }
 }

-if (file('addon.gradle.kts').exists()) {
-    apply from: 'addon.gradle.kts'
-} else if (file('addon.gradle').exists()) {
+if (file('addon.gradle').exists()) {
    apply from: 'addon.gradle'
 }

-// File for local tweaks not commited to Git
-if (file('addon.local.gradle.kts').exists()) {
-    apply from: 'addon.local.gradle.kts'
-} else if (file('addon.local.gradle').exists()) {
-    apply from: 'addon.local.gradle'
-}
-
 // Allow unsafe repos but warn
 repositories.configureEach { repo ->
    if (repo instanceof org.gradle.api.artifacts.repositories.UrlArtifactRepository) {
@@ -510,14 +463,7 @@ repositories.configureEach { repo ->
    }
 }

-if (file('repositories.gradle.kts').exists()) {
-    apply from: 'repositories.gradle.kts'
-} else if (file('repositories.gradle').exists()) {
-    apply from: 'repositories.gradle'
-} else {
-    logger.error("Neither repositories.gradle.kts nor repositories.gradle was found, make sure you extracted the full ExampleMod template.")
-    throw new RuntimeException("Missing repositories.gradle[.kts]")
-}
+apply from: 'repositories.gradle'

 configurations {
    runtimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
@@ -567,6 +513,14 @@ repositories {
        url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
        allowInsecureProtocol = true
    }
+    if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
+        if (usesMixinDebug.toBoolean()) {
+            maven {
+                name = "Fabric Maven"
+                url = "https://maven.fabricmc.net/"
+            }
+        }
+    }
    maven {
        name 'sonatype'
        url 'https://oss.sonatype.org/content/repositories/snapshots/'
@@ -575,28 +529,13 @@ repositories {
        }
    }
    if (includeWellKnownRepositories.toBoolean()) {
-        exclusiveContent {
-            forRepository {
-                maven {
-                    name "CurseMaven"
-                    url "https://cursemaven.com"
-                }
-            }
-            filter {
+        maven {
+            name "CurseMaven"
+            url "https://cursemaven.com"
+            content {
                includeGroup "curse.maven"
            }
        }
-        exclusiveContent {
-            forRepository {
-                maven {
-                    name = "Modrinth"
-                    url = "https://api.modrinth.com/maven"
-                }
-            }
-            filter {
-                includeGroup "maven.modrinth"
-            }
-        }
        maven {
            name = "ic2"
            url = "https://maven.ic2.player.to/"
@@ -620,78 +559,35 @@ repositories {
    }
 }

-def mixinProviderGroup = "io.github.legacymoddingmc"
-def mixinProviderModule = "unimixins"
-def mixinProviderVersion = "0.1.7.1"
-def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
-def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
-ext.mixinProviderSpec = mixinProviderSpec
-
 dependencies {
    if (usesMixins.toBoolean()) {
        annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
        annotationProcessor('com.google.guava:guava:24.1.1-jre')
        annotationProcessor('com.google.code.gson:gson:2.8.6')
-        annotationProcessor(mixinProviderSpec)
+        annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.13:processor')
        if (usesMixinDebug.toBoolean()) {
            runtimeOnlyNonPublishable('org.jetbrains:intellij-fernflower:1.2.1.16')
        }
    }
-    if (usesMixins.toBoolean()) {
-        implementation(modUtils.enableMixins(mixinProviderSpec))
-    } else if (forceEnableMixins.toBoolean()) {
-        runtimeOnlyNonPublishable(mixinProviderSpec)
+    if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
+        implementation('com.gtnewhorizon:gtnhmixins:2.1.13')
    }
 }

 pluginManager.withPlugin('org.jetbrains.kotlin.kapt') {
    if (usesMixins.toBoolean()) {
        dependencies {
-            kapt(mixinProviderSpec)
+            kapt('com.gtnewhorizon:gtnhmixins:2.1.13:processor')
        }
    }
 }

-// Replace old mixin mods with unimixins
-// https://docs.gradle.org/8.0.2/userguide/resolution_rules.html#sec:substitution_with_classifier
-configurations.all {
-    resolutionStrategy.dependencySubstitution {
-        substitute module('com.gtnewhorizon:gtnhmixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
-        substitute module('com.github.GTNewHorizons:Mixingasm') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
-        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")
-    }
-}
-
-dependencies {
-    constraints {
-        def minGtnhLibVersion = "0.0.13"
-        implementation("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
-            because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
-        }
-        runtimeOnly("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
-            because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
-        }
-        devOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
-            because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
-        }
-        runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
-            because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
-        }
-    }
-}
-
-if (file('dependencies.gradle.kts').exists()) {
-    apply from: 'dependencies.gradle.kts'
-} else if (file('dependencies.gradle').exists()) {
-    apply from: 'dependencies.gradle'
-} else {
-    logger.error("Neither dependencies.gradle.kts nor dependencies.gradle was found, make sure you extracted the full ExampleMod template.")
-    throw new RuntimeException("Missing dependencies.gradle[.kts]")
-}
+apply from: 'dependencies.gradle'

 def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
+def mixinTmpDir = buildDir.path + File.separator + 'tmp' + File.separator + 'mixins'
+def refMap = "${mixinTmpDir}" + File.separator + mixingConfigRefMap
+def mixinSrg = "${mixinTmpDir}" + File.separator + "mixins.srg"

 tasks.register('generateAssets') {
    group = "GTNH Buildscript"
@@ -723,17 +619,46 @@ tasks.register('generateAssets') {
 }

 if (usesMixins.toBoolean()) {
+    tasks.named("reobfJar", ReobfuscatedJar).configure {
+        extraSrgFiles.from(mixinSrg)
+    }
+
    tasks.named("processResources").configure {
        dependsOn("generateAssets")
    }

    tasks.named("compileJava", JavaCompile).configure {
+        doFirst {
+            new File(mixinTmpDir).mkdirs()
+        }
        options.compilerArgs += [
+            "-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}",
+            "-AoutSrgFile=${mixinSrg}",
+            "-AoutRefMapFile=${refMap}",
            // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
            "-XDenableSunApiLintControl",
            "-XDignore.symbol.file"
        ]
    }
+
+    pluginManager.withPlugin('org.jetbrains.kotlin.kapt') {
+        kapt {
+            correctErrorTypes = true
+            javacOptions {
+                option("-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}")
+                option("-AoutSrgFile=$mixinSrg")
+                option("-AoutRefMapFile=$refMap")
+            }
+        }
+        tasks.configureEach { task ->
+            if (task.name == "kaptKotlin") {
+                task.doFirst {
+                    new File(mixinTmpDir).mkdirs()
+                }
+            }
+        }
+    }
+
 }

 tasks.named("processResources", ProcessResources).configure {
@@ -751,6 +676,7 @@ tasks.named("processResources", ProcessResources).configure {
    }

    if (usesMixins.toBoolean()) {
+        from refMap
        dependsOn("compileJava", "compileScala")
    }
 }
@@ -769,13 +695,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
 }

 dependencies {
-    def lwjgl3ifyVersion = '1.4.0'
+    def lwjgl3ifyVersion = '1.1.35'
    def asmVersion = '9.4'
    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.0.40')
    }

    java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}
@@ -849,7 +775,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
    public boolean setEnableHotswap(boolean enable) { enableHotswap = enable }

    @Inject
-    public RunHotswappableMinecraftTask(Distribution side, String superTask, org.gradle.api.invocation.Gradle gradle) {
+    public RunHotswappableMinecraftTask(Side side, String superTask, org.gradle.api.invocation.Gradle gradle) {
        super(side, gradle)

        this.lwjglVersion = 3
@@ -858,7 +784,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
        this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : []))

        this.classpath(project.java17PatchDependenciesCfg)
-        if (side == Distribution.CLIENT) {
+        if (side == Side.CLIENT) {
            this.classpath(project.minecraftTasks.lwjgl3Configuration)
        }
        // Use a raw provider instead of map to not create a dependency on the task
@@ -867,22 +793,14 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
            !file.path.contains("2.9.4-nightly-20150209") // Remove lwjgl2
        }
        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] : []
-            }))
+        if (!(project.usesMixins.toBoolean() || project.forceEnableMixins.toBoolean())) {
+            this.extraArgs.addAll("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")
        }
    }
 }

-def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient")
+def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Side.CLIENT, "runClient")
 runClient17Task.configure {
    setup(project)
    group = "Modded Minecraft"
@@ -893,7 +811,7 @@ runClient17Task.configure {
    userUUID = minecraft.userUUID
 }

-def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Distribution.DEDICATED_SERVER, "runServer")
+def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Side.SERVER, "runServer")
 runServer17Task.configure {
    setup(project)
    group = "Modded Minecraft"
@@ -934,6 +852,11 @@ 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())
@@ -949,8 +872,7 @@ if (usesShadowedDependencies.toBoolean()) {
        ]
        archiveClassifier.set('dev')
        if (relocateShadowedDependencies.toBoolean()) {
-            relocationPrefix = modGroup + ".shadow"
-            enableRelocation = true
+            dependsOn(relocateShadowJar)
        }
    }
    configurations.runtimeElements.outgoing.artifacts.clear()
@@ -1024,9 +946,6 @@ idea {
                }
            }
            runConfigurations {
-                "0. Build and Test"(Gradle) {
-                    taskNames = ["build"]
-                }
                "1. Run Client"(Gradle) {
                    taskNames = ["runClient"]
                }
@@ -1087,7 +1006,6 @@ idea {
            }
            compiler.javac {
                afterEvaluate {
-                    javacAdditionalOptions = "-encoding utf8"
                    moduleJavacAdditionalOptions = [
                        (project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ')
                    ]
@@ -1146,11 +1064,6 @@ tasks.named("processIdeaSettings").configure {
    dependsOn("injectTags")
 }

-tasks.named("ideVirtualMainClasses").configure {
-    // Make IntelliJ "Build project" build the mod jars
-    dependsOn("jar", "reobfJar", "spotlessCheck")
-}
-
 // workaround variable hiding in pom processing
 def projectConfigs = project.configurations

@@ -1171,14 +1084,12 @@ publishing {
    }

    repositories {
-        if (usesMavenPublishing.toBoolean()) {
-            maven {
-                url = mavenPublishUrl
-                allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
-                credentials {
-                    username = System.getenv("MAVEN_USER") ?: "NONE"
-                    password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
-                }
+        maven {
+            url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
+            allowInsecureProtocol = true
+            credentials {
+                username = System.getenv("MAVEN_USER") ?: "NONE"
+                password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
            }
        }
    }
@@ -1214,7 +1125,7 @@ if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) {
        }
    }
    if (usesMixins.toBoolean()) {
-        addModrinthDep("required", "project", "unimixins")
+        addModrinthDep("required", "project", "gtnhmixins")
    }
    tasks.modrinth.dependsOn(build)
    tasks.publish.dependsOn(tasks.modrinth)
@@ -1258,7 +1169,7 @@ if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null
        }
    }
    if (usesMixins.toBoolean()) {
-        addCurseForgeRelation("requiredDependency", "unimixins")
+        addCurseForgeRelation("requiredDependency", "gtnhmixins")
    }
    tasks.curseforge.dependsOn(build)
    tasks.publish.dependsOn(tasks.curseforge)
@@ -1293,7 +1204,7 @@ def addCurseForgeRelation(String type, String name) {

 // Updating

-def buildscriptGradleVersion = "8.2.1"
+def buildscriptGradleVersion = "8.0.1"

 tasks.named('wrapper', Wrapper).configure {
    gradleVersion = buildscriptGradleVersion
@@ -1325,23 +1236,6 @@ 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")
 }
@@ -1399,14 +1293,8 @@ boolean isNewBuildScriptVersionAvailable() {

    String currentBuildScript = getFile("build.gradle").getText()
    String currentBuildScriptHash = getVersionHash(currentBuildScript)
-    String availableBuildScriptHash
-    try {
-        String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
-        availableBuildScriptHash = getVersionHash(availableBuildScript)
-    } catch (IOException e) {
-        logger.warn("Could not check for buildscript update availability: {}", e.message)
-        return false
-    }
+    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
+    String availableBuildScriptHash = getVersionHash(availableBuildScript)

    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
    return !isUpToDate
@@ -1485,7 +1373,7 @@ static int replaceParams(File file, Map<String, String> params) {
    return 0
 }

-// Dependency Deobfuscation (Deprecated, use the new RFG API documented in dependencies.gradle)
+// Dependency Deobfuscation

 def deobf(String sourceURL) {
    try {
@@ -1527,7 +1415,11 @@ def deobfMaven(String repoURL, String mavenDep) {
 }

 def deobfCurse(String curseDep) {
-    return dependencies.rfg.deobf("curse.maven:$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.")
+    }
 }

 // The method above is to be preferred. Use this method if the filename is not at the end of the URL.
@@ -1535,7 +1427,34 @@ 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
@@ -1543,8 +1462,50 @@ def deobf(String sourceURL, String rawFileName) {
        quiet true
        overwrite false
    }
-    return dependencies.rfg.deobf(files(obfFile))
+
+    exec {
+        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
+        workingDir bon2Dir
+        standardOutput = new FileOutputStream("${deobfFile}.log")
+    }
+
+    return files(deobfFile)
 }
+
+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) {
@@ -1571,17 +1532,3 @@ def getSecondaryArtifacts() {
    if (apiPackage) secondaryArtifacts += [apiJar]
    return secondaryArtifacts
 }
-
-// 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'
-} else if (file('addon.late.gradle').exists()) {
-    apply from: 'addon.late.gradle'
-}
-
-// File for local tweaks not commited to Git
-if (file('addon.late.local.gradle.kts').exists()) {
-    apply from: 'addon.late.local.gradle.kts'
-} else if (file('addon.late.local.gradle').exists()) {
-    apply from: 'addon.late.local.gradle'
-}
@@ -1,26 +1,24 @@
 // Add your dependencies here

 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.2.16:dev')
-    implementation('com.github.GTNewHorizons:ForestryMC:4.6.13:dev')
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.76-GTNH:dev')
-    implementation("com.github.GTNewHorizons:GTNHLib:0.0.13:dev")
-    api('com.github.GTNewHorizons:BuildCraft:7.1.36:dev')
+    api('com.github.GTNewHorizons:EnderCore:0.2.13:dev')
+    implementation('com.github.GTNewHorizons:ForestryMC:4.5.8:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.35-GTNH:dev')
+    api('com.github.GTNewHorizons:BuildCraft:7.1.27: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.5.23:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-168-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.13.6:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.11.13-GTNH:api') {transitive = false}
+    implementation('com.github.GTNewHorizons:Chisel:2.10.8-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.8.0.13-GTNH:api') {transitive = false}
    compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
    compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
    compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
-    compileOnly(rfg.deobf('curse.maven:computercraft-67504:2269339')) // https://www.curseforge.com/minecraft/mc-mods/computercraft/files/2269339
-    compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
-    compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2
+    compileOnly(deobf('https://media.forgecdn.net/files/2269/339/ComputerCraft1.75.jar')) // https://www.curseforge.com/minecraft/mc-mods/computercraft/files/2269339
+    compileOnly(deobf('https://media.forgecdn.net/files/2426/270/Mekanism-1.7.10-9.1.0.281.jar')) // https://aidancbrady.com/mekanism/download/
+    compileOnly(deobf('https://immibis.com/mcmoddl/files/immibis-microblocks-59.1.2.jar'))
 }
@@ -1,6 +1,6 @@
 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.0.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -85,6 +85,9 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

@@ -141,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
@@ -149,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
      '' | soft) :;; #(
      *)
        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -194,10 +197,6 @@ if "$cygwin" || "$msys" ; then
    done
 fi

-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -207,7 +207,6 @@ 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;
@@ -2,13 +2,10 @@ 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);
@@ -4,20 +4,10 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

 import cofh.api.energy.IEnergyContainerItem;
-import crazypants.enderio.config.Config;

 public interface IItemOfTravel extends IEnergyContainerItem {

    boolean isActive(EntityPlayer ep, ItemStack equipped);

    void extractInternal(ItemStack equipped, int power);
-
-    /**
-     * @param equipped player who is currently holding this item. caller will ensure the item held has your Item as item
-     *                 type
-     * @return -1 if method not supported, or max(can extract, power), e.g. 0 if item is empty.
-     */
-    default int canExtractInternal(ItemStack equipped, int power) {
-        return Config.strictTPItemChecking ? 0 : -1;
-    }
 }
@@ -8,7 +8,6 @@ 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 {
@@ -9,6 +9,11 @@ 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;
@@ -47,10 +52,6 @@ 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 {

@@ -2,6 +2,11 @@ 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;
@@ -24,10 +29,6 @@ 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 {

@@ -6,6 +6,9 @@ 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;
@@ -28,6 +31,9 @@ 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;
@@ -67,10 +73,6 @@ 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(
@@ -4,6 +4,11 @@ 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;
@@ -11,10 +16,11 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.IFluidHandler;

-import com.enderio.core.common.util.BlockCoord;
-
 import appeng.api.networking.IGridHost;
 import cofh.api.transport.IItemDuct;
+
+import com.enderio.core.common.util.BlockCoord;
+
 import cpw.mods.fml.common.Optional.Interface;
 import cpw.mods.fml.common.Optional.InterfaceList;
 import cpw.mods.fml.relauncher.Side;
@@ -23,10 +29,6 @@ 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"),
@@ -3,7 +3,6 @@ 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 {
@@ -1,10 +1,11 @@
 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 {

@@ -7,6 +7,19 @@ 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;
@@ -24,10 +37,11 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;

-import com.enderio.core.client.render.BoundingBox;
-
 import appeng.api.networking.IGridNode;
 import appeng.api.util.AECableType;
+
+import com.enderio.core.client.render.BoundingBox;
+
 import cpw.mods.fml.common.Optional.Method;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -50,18 +64,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;
-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 {

@@ -5,6 +5,8 @@ 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;
@@ -21,7 +23,6 @@ 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 {

@@ -2,6 +2,9 @@ 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;
@@ -14,8 +17,6 @@ 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 {

@@ -1,7 +1,7 @@
 package crazypants.enderio.conduit.gas;

-import crazypants.enderio.conduit.AbstractConduitNetwork;
 import mekanism.api.gas.GasStack;
+import crazypants.enderio.conduit.AbstractConduitNetwork;

 public class AbstractGasTankConduitNetwork<T extends AbstractGasTankConduit>
        extends AbstractConduitNetwork<IGasConduit, T> {
@@ -1,10 +1,11 @@
 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 {

@@ -3,6 +3,9 @@ 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;
@@ -21,8 +24,6 @@ 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 {

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

@@ -4,6 +4,8 @@ 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;
@@ -23,7 +25,6 @@ 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 {

@@ -1,5 +1,8 @@
 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;

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

@@ -1,11 +1,12 @@
 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 {
@@ -3,7 +3,6 @@ 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 {
@@ -10,7 +10,6 @@ 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 {
@@ -10,7 +10,6 @@ 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;

@@ -25,14 +24,12 @@ 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> implements IContainerWithTileEntity {
+public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrades> {

    private final IItemConduit itemConduit;
    private final ForgeDirection direction;
-    private final TileEntity te;

    private int speedUpgradeSlotLimit = 15;

@@ -55,7 +52,6 @@ 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;
@@ -284,11 +280,6 @@ 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) {
@@ -2,6 +2,8 @@ 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;

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

@@ -49,7 +49,6 @@ 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;
@@ -53,7 +53,6 @@ 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;
@@ -58,7 +58,6 @@ 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;
@@ -58,7 +58,6 @@ 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;
@@ -5,9 +5,10 @@ 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;
@@ -18,11 +18,12 @@ 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;
@@ -5,10 +5,11 @@ 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;
@@ -16,7 +16,6 @@ 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;
@@ -24,8 +23,6 @@ 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 {

@@ -57,12 +54,6 @@ 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.
@@ -12,7 +12,6 @@ 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> {
@@ -10,7 +10,6 @@ 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> {
@@ -12,9 +12,6 @@ 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;
@@ -22,6 +19,10 @@ 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;
@@ -1,5 +1,8 @@
 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;
@@ -7,8 +10,6 @@ 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") })
@@ -9,6 +9,11 @@ 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;
@@ -40,10 +45,6 @@ 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 {

@@ -1,5 +1,11 @@
 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;
@@ -7,11 +13,6 @@ 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 {
@@ -6,7 +6,6 @@ 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 {
@@ -51,12 +50,4 @@ 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());
-    }
 }
@@ -40,7 +40,6 @@ 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;
@@ -45,7 +45,6 @@ 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);
@@ -68,7 +68,6 @@ 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);
@@ -40,7 +40,6 @@ 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;
@@ -38,7 +38,6 @@ 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);
@@ -40,7 +40,6 @@ 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;
@@ -39,7 +39,6 @@ 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);
@@ -68,21 +68,17 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
    }

    public static void initIcons() {
-        initIcons(POSTFIX, ICONS);
-    }
-
-    protected static void initIcons(String[] postfix, Map<String, IIcon> icons) {
        IconUtil.addIconProvider(new IconUtil.IIconProvider() {

            @Override
            public void registerIcons(IIconRegister register) {
-                for (String pf : postfix) {
-                    icons.put(ICON_KEY + pf, register.registerIcon(ICON_KEY + pf));
-                    icons.put(ICON_KEY_INPUT + pf, register.registerIcon(ICON_KEY_INPUT));
-                    icons.put(ICON_KEY_OUTPUT + pf, register.registerIcon(ICON_KEY_OUTPUT));
-                    icons.put(ICON_CORE_KEY + pf, register.registerIcon(ICON_CORE_KEY + pf));
+                for (String pf : POSTFIX) {
+                    ICONS.put(ICON_KEY + pf, register.registerIcon(ICON_KEY + pf));
+                    ICONS.put(ICON_KEY_INPUT + pf, register.registerIcon(ICON_KEY_INPUT));
+                    ICONS.put(ICON_KEY_OUTPUT + pf, register.registerIcon(ICON_KEY_OUTPUT));
+                    ICONS.put(ICON_CORE_KEY + pf, register.registerIcon(ICON_CORE_KEY + pf));
                }
-                icons.put(ICON_TRANSMISSION_KEY, register.registerIcon(ICON_TRANSMISSION_KEY));
+                ICONS.put(ICON_TRANSMISSION_KEY, register.registerIcon(ICON_TRANSMISSION_KEY));
            }

            @Override
@@ -123,10 +119,6 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
        this.subtype = meta;
    }

-    protected int getSubtype() {
-        return subtype;
-    }
-
    @Override
    public boolean getConnectionsDirty() {
        return connectionsDirty;
@@ -2,20 +2,51 @@ package crazypants.enderio.conduit.power.endergy;

 import static crazypants.enderio.config.Config.powerConduitEndergyTiers;

+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumMap;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;

+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;

+import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.client.render.IconUtil;
+import com.enderio.core.common.util.DyeColor;
+import com.enderio.core.common.vecmath.Vector3d;

 import crazypants.enderio.EnderIO;
+import crazypants.enderio.conduit.AbstractConduitNetwork;
+import crazypants.enderio.conduit.ConduitUtil;
+import crazypants.enderio.conduit.ConnectionMode;
+import crazypants.enderio.conduit.IConduit;
+import crazypants.enderio.conduit.IConduitBundle;
+import crazypants.enderio.conduit.RaytraceResult;
+import crazypants.enderio.conduit.geom.CollidableCache.CacheKey;
 import crazypants.enderio.conduit.geom.CollidableComponent;
+import crazypants.enderio.conduit.geom.ConduitGeometryUtil;
+import crazypants.enderio.conduit.power.IPowerConduit;
 import crazypants.enderio.conduit.power.PowerConduit;
+import crazypants.enderio.conduit.power.PowerConduitNetwork;
+import crazypants.enderio.config.Config;
+import crazypants.enderio.item.PacketConduitProbe;
+import crazypants.enderio.machine.RedstoneControlMode;
 import crazypants.enderio.power.BasicCapacitor;
 import crazypants.enderio.power.ICapacitor;
+import crazypants.enderio.power.IPowerInterface;
+import crazypants.enderio.power.PowerHandlerUtil;
+import crazypants.enderio.tool.ToolUtil;

 public class PowerConduitEndergy extends PowerConduit {

@@ -45,51 +76,487 @@ public class PowerConduitEndergy extends PowerConduit {
    }

    public static void initIcons() {
-        initIcons(POSTFIX, ICONS);
+        IconUtil.addIconProvider(new IconUtil.IIconProvider() {
+
+            @Override
+            public void registerIcons(IIconRegister register) {
+                for (String pf : POSTFIX) {
+                    ICONS.put(ICON_KEY + pf, register.registerIcon(ICON_KEY + pf));
+                    ICONS.put(ICON_KEY_INPUT + pf, register.registerIcon(ICON_KEY_INPUT));
+                    ICONS.put(ICON_KEY_OUTPUT + pf, register.registerIcon(ICON_KEY_OUTPUT));
+                    ICONS.put(ICON_CORE_KEY + pf, register.registerIcon(ICON_CORE_KEY + pf));
+                }
+                ICONS.put(ICON_TRANSMISSION_KEY, register.registerIcon(ICON_TRANSMISSION_KEY));
+            }
+
+            @Override
+            public int getTextureType() {
+                return 0;
+            }
+        });
    }

-    public PowerConduitEndergy() {
-        super();
-    }
+    public static final float WIDTH = 0.075f;
+    public static final float HEIGHT = 0.075f;
+
+    public static final Vector3d MIN = new Vector3d(0.5f - WIDTH, 0.5 - HEIGHT, 0.5 - WIDTH);
+    public static final Vector3d MAX = new Vector3d(MIN.x + WIDTH, MIN.y + HEIGHT, MIN.z + WIDTH);
+
+    public static final BoundingBox BOUNDS = new BoundingBox(MIN, MAX);
+
+    protected PowerConduitNetwork network;
+
+    private int energyStoredRF;
+
+    private int subtype;
+
+    protected final EnumMap<ForgeDirection, RedstoneControlMode> rsModes = new EnumMap<ForgeDirection, RedstoneControlMode>(
+            ForgeDirection.class);
+    protected final EnumMap<ForgeDirection, DyeColor> rsColors = new EnumMap<ForgeDirection, DyeColor>(
+            ForgeDirection.class);
+
+    protected EnumMap<ForgeDirection, Long> recievedTicks;
+
+    private final Map<ForgeDirection, Integer> externalRedstoneSignals = new HashMap<ForgeDirection, Integer>();
+
+    private boolean redstoneStateDirty = true;
+
+    public PowerConduitEndergy() {}

    public PowerConduitEndergy(int meta) {
-        super(meta);
+        this.subtype = meta;
+    }
+
+    @Override
+    public boolean getConnectionsDirty() {
+        return connectionsDirty;
+    }
+
+    @Override
+    public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List<RaytraceResult> all) {
+        DyeColor col = DyeColor.getColorFromDye(player.getCurrentEquippedItem());
+        if (ConduitUtil.isProbeEquipped(player)) {
+            if (!player.worldObj.isRemote) {
+                new PacketConduitProbe().sendInfoMessage(player, this);
+            }
+            return true;
+        } else if (col != null && res.component != null && isColorBandRendered(res.component.dir)) {
+            setExtractionSignalColor(res.component.dir, col);
+            return true;
+        } else if (ToolUtil.isToolEquipped(player)) {
+            if (!getBundle().getEntity().getWorldObj().isRemote) {
+                if (res != null && res.component != null) {
+                    ForgeDirection connDir = res.component.dir;
+                    ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit);
+                    if (connDir == ForgeDirection.UNKNOWN || connDir == faceHit) {
+                        if (getConnectionMode(faceHit) == ConnectionMode.DISABLED) {
+                            setConnectionMode(faceHit, getNextConnectionMode(faceHit));
+                            return true;
+                        }
+                        // Attempt to join networks
+                        return ConduitUtil.joinConduits(this, faceHit);
+                    } else if (externalConnections.contains(connDir)) {
+                        setConnectionMode(connDir, getNextConnectionMode(connDir));
+                        return true;
+                    } else if (containsConduitConnection(connDir)) {
+                        ConduitUtil.disconectConduits(this, connDir);
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean isColorBandRendered(ForgeDirection dir) {
+        return getConnectionMode(dir) != ConnectionMode.DISABLED
+                && getExtractionRedstoneMode(dir) != RedstoneControlMode.IGNORE;
    }

    @Override
    public ICapacitor getCapacitor() {
-        return getCapacitors()[getSubtype()];
+        return getCapacitors()[subtype];
+    }
+
+    @Override
+    public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) {
+        rsModes.put(dir, mode);
+        setClientStateDirty();
+    }
+
+    @Override
+    public RedstoneControlMode getExtractionRedstoneMode(ForgeDirection dir) {
+        RedstoneControlMode res = rsModes.get(dir);
+        if (res == null) {
+            res = RedstoneControlMode.IGNORE;
+        }
+        return res;
+    }
+
+    @Override
+    public void setExtractionSignalColor(ForgeDirection dir, DyeColor col) {
+        rsColors.put(dir, col);
+        setClientStateDirty();
+    }
+
+    @Override
+    public DyeColor getExtractionSignalColor(ForgeDirection dir) {
+        DyeColor res = rsColors.get(dir);
+        if (res == null) {
+            res = DyeColor.RED;
+        }
+        return res;
+    }
+
+    @Override
+    protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) {
+        setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]);
+        setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir);
+    }
+
+    @Override
+    protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) {
+        dataRoot.setShort("extractionSignalColor", (short) getExtractionSignalColor(dir).ordinal());
+        dataRoot.setShort("extractionRedstoneMode", (short) getExtractionRedstoneMode(dir).ordinal());
+    }
+
+    @Override
+    public void writeToNBT(NBTTagCompound nbtRoot) {
+        super.writeToNBT(nbtRoot);
+        nbtRoot.setShort("subtype", (short) subtype);
+        nbtRoot.setInteger("energyStoredRF", energyStoredRF);
+
+        for (Entry<ForgeDirection, RedstoneControlMode> entry : rsModes.entrySet()) {
+            if (entry.getValue() != null) {
+                short ord = (short) entry.getValue().ordinal();
+                nbtRoot.setShort("pRsMode." + entry.getKey().name(), ord);
+            }
+        }
+
+        for (Entry<ForgeDirection, DyeColor> entry : rsColors.entrySet()) {
+            if (entry.getValue() != null) {
+                short ord = (short) entry.getValue().ordinal();
+                nbtRoot.setShort("pRsCol." + entry.getKey().name(), ord);
+            }
+        }
+    }
+
+    @Override
+    public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) {
+        super.readFromNBT(nbtRoot, nbtVersion);
+        subtype = nbtRoot.getShort("subtype");
+
+        if (nbtRoot.hasKey("energyStored")) {
+            nbtRoot.setInteger("energyStoredRF", (int) (nbtRoot.getFloat("energyStored") * 10));
+        }
+        setEnergyStored(nbtRoot.getInteger("energyStoredRF"));
+
+        for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
+            String key = "pRsMode." + dir.name();
+            if (nbtRoot.hasKey(key)) {
+                short ord = nbtRoot.getShort(key);
+                if (ord >= 0 && ord < RedstoneControlMode.values().length) {
+                    rsModes.put(dir, RedstoneControlMode.values()[ord]);
+                }
+            }
+            key = "pRsCol." + dir.name();
+            if (nbtRoot.hasKey(key)) {
+                short ord = nbtRoot.getShort(key);
+                if (ord >= 0 && ord < DyeColor.values().length) {
+                    rsColors.put(dir, DyeColor.values()[ord]);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onTick() {}
+
+    @Override
+    public int getEnergyStored() {
+        return energyStoredRF;
+    }
+
+    @Override
+    public void setEnergyStored(int energyStored) {
+        energyStoredRF = MathHelper.clamp_int(energyStored, 0, getMaxEnergyStored());
+    }
+
+    private boolean isRedstoneEnabled(ForgeDirection dir) {
+        boolean result;
+        RedstoneControlMode mode = getExtractionRedstoneMode(dir);
+        if (mode == RedstoneControlMode.NEVER) {
+            return false;
+        }
+        if (mode == RedstoneControlMode.IGNORE) {
+            return true;
+        }
+
+        DyeColor col = getExtractionSignalColor(dir);
+        int signal = ConduitUtil.getInternalSignalForColor(getBundle(), col);
+        int exSig = getExternalRedstoneSignalForDir(dir);
+        boolean res;
+        if (mode == RedstoneControlMode.OFF) {
+            // if checking for no signal, must be no signal from both
+            res = mode.isConditionMet(mode, signal) && (col != DyeColor.RED || mode.isConditionMet(mode, exSig));
+        } else {
+            // if checking for a signal, either is fine
+            res = mode.isConditionMet(mode, signal) || (col == DyeColor.RED && mode.isConditionMet(mode, exSig));
+        }
+        return res;
+    }
+
+    private int getExternalRedstoneSignalForDir(ForgeDirection dir) {
+        if (redstoneStateDirty) {
+            externalRedstoneSignals.clear();
+            redstoneStateDirty = false;
+        }
+        Integer cached = externalRedstoneSignals.get(dir);
+        int result;
+        if (cached == null) {
+            TileEntity te = getBundle().getEntity();
+            result = te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord);
+            externalRedstoneSignals.put(dir, result);
+        } else {
+            result = cached;
+        }
+        return result;
+    }
+
+    @Override
+    public int getMaxEnergyRecieved(ForgeDirection dir) {
+        ConnectionMode mode = getConnectionMode(dir);
+        if (mode == ConnectionMode.OUTPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(dir)) {
+            return 0;
+        }
+        return getCapacitor().getMaxEnergyReceived();
+    }
+
+    @Override
+    public int getMaxEnergyExtracted(ForgeDirection dir) {
+        ConnectionMode mode = getConnectionMode(dir);
+        if (mode == ConnectionMode.INPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(dir)) {
+            return 0;
+        }
+        if (recievedRfThisTick(dir)) {
+            return 0;
+        }
+        return getCapacitor().getMaxEnergyExtracted();
+    }
+
+    private boolean recievedRfThisTick(ForgeDirection dir) {
+        if (recievedTicks == null || dir == null
+                || recievedTicks.get(dir) == null
+                || getBundle() == null
+                || getBundle().getWorld() == null) {
+            return false;
+        }
+
+        long curTick = getBundle().getWorld().getTotalWorldTime();
+        long recT = recievedTicks.get(dir);
+        if (curTick - recT <= 5) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onNeighborBlockChange(Block blockId) {
+        redstoneStateDirty = true;
+        if (network != null && network.powerManager != null) {
+            network.powerManager.receptorsChanged();
+        }
+        return super.onNeighborBlockChange(blockId);
+    }
+
+    @Override
+    public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) {
+        super.setConnectionMode(dir, mode);
+        recievedTicks = null;
+    }
+
+    @Override
+    public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
+        if (getMaxEnergyRecieved(from) == 0 || maxReceive <= 0) {
+            return 0;
+        }
+        int freeSpace = getMaxEnergyStored() - getEnergyStored();
+        int result = (int) Math.min(maxReceive, freeSpace);
+        if (!simulate && result > 0) {
+            setEnergyStored(getEnergyStored() + result);
+
+            if (getBundle() != null) {
+                if (recievedTicks == null) {
+                    recievedTicks = new EnumMap<ForgeDirection, Long>(ForgeDirection.class);
+                }
+                recievedTicks.put(from, getBundle().getWorld().getTotalWorldTime());
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
+        return 0;
+    }
+
+    @Override
+    public boolean canConnectEnergy(ForgeDirection from) {
+        return true;
+    }
+
+    @Override
+    public int getEnergyStored(ForgeDirection from) {
+        return getEnergyStored();
+    }
+
+    @Override
+    public int getMaxEnergyStored(ForgeDirection from) {
+        return getMaxEnergyStored();
+    }
+
+    @Override
+    public AbstractConduitNetwork<?, ?> getNetwork() {
+        return network;
+    }
+
+    @Override
+    public boolean setNetwork(AbstractConduitNetwork<?, ?> network) {
+        this.network = (PowerConduitNetwork) network;
+        return true;
+    }
+
+    @Override
+    public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) {
+        IPowerInterface rec = getExternalPowerReceptor(direction);
+
+        return rec != null && rec.canConduitConnect(direction);
+    }
+
+    @Override
+    public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) {
+        boolean res = super.canConnectToConduit(direction, conduit);
+        if (!res) {
+            return false;
+        }
+        if (Config.powerConduitCanDifferentTiersConnect) {
+            return res;
+        }
+        if (!(conduit instanceof IPowerConduit)) {
+            return false;
+        }
+        IPowerConduit pc = (IPowerConduit) conduit;
+        return pc.getMaxEnergyStored() == getMaxEnergyStored();
+    }
+
+    @Override
+    public void externalConnectionAdded(ForgeDirection direction) {
+        super.externalConnectionAdded(direction);
+        if (network != null) {
+            TileEntity te = bundle.getEntity();
+            network.powerReceptorAdded(
+                    this,
+                    direction,
+                    te.xCoord + direction.offsetX,
+                    te.yCoord + direction.offsetY,
+                    te.zCoord + direction.offsetZ,
+                    getExternalPowerReceptor(direction));
+        }
+    }
+
+    @Override
+    public void externalConnectionRemoved(ForgeDirection direction) {
+        super.externalConnectionRemoved(direction);
+        if (network != null) {
+            TileEntity te = bundle.getEntity();
+            network.powerReceptorRemoved(
+                    te.xCoord + direction.offsetX,
+                    te.yCoord + direction.offsetY,
+                    te.zCoord + direction.offsetZ);
+        }
+    }
+
+    @Override
+    public IPowerInterface getExternalPowerReceptor(ForgeDirection direction) {
+        TileEntity te = bundle.getEntity();
+        World world = te.getWorldObj();
+        if (world == null) {
+            return null;
+        }
+        TileEntity test = world.getTileEntity(
+                te.xCoord + direction.offsetX,
+                te.yCoord + direction.offsetY,
+                te.zCoord + direction.offsetZ);
+        if (test == null) {
+            return null;
+        }
+        if (test instanceof IConduitBundle) {
+            return null;
+        }
+        return PowerHandlerUtil.create(test);
    }

    @Override
    public ItemStack createItem() {
-        return createItemStackForSubtype(getSubtype());
+        return createItemStackForSubtype(subtype);
+    }
+
+    @Override
+    public Class<? extends IConduit> getBaseConduitType() {
+        return IPowerConduit.class;
    }

    // Rendering
    @Override
    public IIcon getTextureForState(CollidableComponent component) {
        if (component.dir == ForgeDirection.UNKNOWN) {
-            return ICONS.get(ICON_CORE_KEY + POSTFIX[getSubtype()]);
+            return ICONS.get(ICON_CORE_KEY + POSTFIX[subtype]);
        }
        if (COLOR_CONTROLLER_ID.equals(component.data)) {
            return IconUtil.whiteTexture;
        }
-        return ICONS.get(ICON_KEY + POSTFIX[getSubtype()]);
+        return ICONS.get(ICON_KEY + POSTFIX[subtype]);
    }

    @Override
    public IIcon getTextureForInputMode() {
-        return ICONS.get(ICON_KEY_INPUT + POSTFIX[getSubtype()]);
+        return ICONS.get(ICON_KEY_INPUT + POSTFIX[subtype]);
    }

    @Override
    public IIcon getTextureForOutputMode() {
-        return ICONS.get(ICON_KEY_OUTPUT + POSTFIX[getSubtype()]);
+        return ICONS.get(ICON_KEY_OUTPUT + POSTFIX[subtype]);
+    }
+
+    @Override
+    public IIcon getTransmitionTextureForState(CollidableComponent component) {
+        return null;
+    }
+
+    @Override
+    public Collection<CollidableComponent> createCollidables(CacheKey key) {
+        Collection<CollidableComponent> baseCollidables = super.createCollidables(key);
+        if (key.dir == ForgeDirection.UNKNOWN) {
+            return baseCollidables;
+        }
+
+        BoundingBox bb = ConduitGeometryUtil.instance.createBoundsForConnectionController(key.dir, key.offset);
+        CollidableComponent cc = new CollidableComponent(IPowerConduit.class, bb, key.dir, COLOR_CONTROLLER_ID);
+
+        List<CollidableComponent> result = new ArrayList<CollidableComponent>();
+        result.addAll(baseCollidables);
+        result.add(cc);
+
+        return result;
    }

    @Override
    public int getMaxEnergyStored() {
-        return getCapacitors()[getSubtype()].getMaxEnergyStored();
+        return getCapacitors()[subtype].getMaxEnergyStored();
+    }
+
+    @Override
+    public boolean displayPower() {
+        return true;
    }
 }
@@ -3,7 +3,6 @@ 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 {
@@ -6,7 +6,6 @@ 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 {
@@ -21,12 +21,13 @@ 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;
@@ -17,6 +17,8 @@ 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;
@@ -34,7 +36,6 @@ 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 {

@@ -4,7 +4,6 @@ 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 {
@@ -101,7 +101,6 @@ public final class Config {
    public static int transceiverUpkeepCostRF = 10;
    public static int transceiverBucketTransmissionCostRF = 100;
    public static int transceiverMaxIoRF = 20480;
-    public static int transceiverInternalBuffer = 500000;
    public static boolean transceiverUseEasyRecipe = false;

    public static File configDirectory;
@@ -321,8 +320,6 @@ 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;
@@ -563,8 +560,6 @@ public final class Config {
    public static float inventoryPanelExtractCostPerItem = 12.0f;
    public static float inventoryPanelExtractCostPerOperation = 32.0f;

-    public static boolean strictTPItemChecking = true;
-
    public static void load(FMLPreInitializationEvent event) {
        PacketHandler.INSTANCE
                .registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT);
@@ -1007,13 +1002,6 @@ public final class Config {
                transceiverMaxIoRF,
                "Maximum RF/t sent and received by a Dimensional Transceiver per tick. Input and output limits are not cumulative")
                .getInt(transceiverMaxIoRF);
-        transceiverInternalBuffer = config
-                .get(
-                        sectionPower.name,
-                        "transceiverInternalBuffer",
-                        transceiverInternalBuffer,
-                        "Maximum RF for the send/receive buffer. Need to be at least transceiverMaxIoRF.")
-                .getInt(transceiverInternalBuffer);
        transceiverBucketTransmissionCostRF = config
                .get(
                        sectionEfficiency.name,
@@ -1920,16 +1908,6 @@ 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,
@@ -2886,12 +2864,6 @@ public final class Config {
                0.0f,
                10000.0f,
                "Internal power used per extract operation (independent of stack size)");
-        strictTPItemChecking = config.get(
-                sectionMisc.name,
-                "strictTPItemChecking",
-                strictTPItemChecking,
-                "If true, turn on strict checking of item energy checking. This might cause traveling tools from third party mods to fire fake security warnings on server side and not function correctly.")
-                .getBoolean(strictTPItemChecking);
    }

    public static void checkYetaAccess() {
@@ -17,7 +17,6 @@ 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 {
@@ -8,7 +8,6 @@ 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 {
@@ -12,12 +12,13 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;

-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 com.enderio.core.api.client.gui.IResourceTooltipProvider;
+import com.enderio.core.common.util.ItemUtil;
+
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.Optional.Method;
@@ -236,9 +237,4 @@ 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);
-    }
 }
@@ -20,10 +20,11 @@ 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;
@@ -27,13 +27,14 @@ 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;
@@ -16,10 +16,15 @@ 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;
@@ -37,10 +42,6 @@ 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"),
@@ -24,11 +24,12 @@ 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;
@@ -18,11 +18,12 @@ 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;
@@ -331,11 +332,6 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe
        extractEnergy(equipped, power, false);
    }

-    @Override
-    public int canExtractInternal(ItemStack equipped, int power) {
-        return extractEnergy(equipped, power, true);
-    }
-
    private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) {
        return isEquipped(ep) && ep.isSneaking() && TravelUpgrade.loadFromItem(equipped) != null;
    }
@@ -20,11 +20,12 @@ 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;
@@ -24,11 +24,12 @@ 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;
@@ -394,11 +395,6 @@ public class ItemDarkSteelSword extends ItemSword
        extractEnergy(equipped, power, false);
    }

-    @Override
-    public int canExtractInternal(ItemStack equipped, int power) {
-        return extractEnergy(equipped, power, true);
-    }
-
    private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) {
        return isEquipped(ep) && ep.isSneaking() && TravelUpgrade.loadFromItem(equipped) != null;
    }
@@ -10,12 +10,11 @@ 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 {
@@ -45,29 +44,26 @@ public class PoweredItemRenderer implements IItemRenderer {
        ri.renderItemIntoGUI(mc.fontRenderer, mc.getTextureManager(), item, 0, 0, true);
        GL11.glDisable(GL11.GL_LIGHTING);

-        if (isJustCrafted(item) || (!Config.renderChargeBar && !Config.renderDurabilityBar)) {
+        if (isJustCrafted(item)) {
            return;
        }

        boolean hasEnergyUpgrade = EnergyUpgrade.loadFromItem(item) != null;
-        int y = (Config.renderDurabilityBar ^ Config.renderChargeBar) || !hasEnergyUpgrade ? 13 : 12;
-        int bgH = (Config.renderDurabilityBar ^ Config.renderChargeBar) || !hasEnergyUpgrade ? 2 : 4;
+        int y = hasEnergyUpgrade ? 12 : 13;
+        int bgH = hasEnergyUpgrade ? 4 : 2;
        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
        RenderUtil.renderQuad2D(2, y, 0, 13, bgH, ColorUtil.getRGB(Color.black));

-        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);
-        }
+        double maxDam = item.getMaxDamage();
+        double dispDamage = item.getItemDamageForDisplay();
+        y = hasEnergyUpgrade ? 14 : 13;
+        renderBar(y, maxDam, dispDamage, Color.green, Color.red);

-        if (Config.renderChargeBar && hasEnergyUpgrade) {
+        if (hasEnergyUpgrade) {
            IEnergyContainerItem armor = (IEnergyContainerItem) item.getItem();
            maxDam = armor.getMaxEnergyStored(item);
            dispDamage = armor.getEnergyStored(item);
-            y = Config.renderDurabilityBar ? 12 : 13;
+            y = 12;
            Color color = new Color(0x2D, 0xCE, 0xFA); // electric blue
            renderBar2(y, maxDam, maxDam - dispDamage, color, color);
        }
@@ -6,7 +6,6 @@ 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 {
@@ -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 {
@@ -2,25 +2,19 @@ package crazypants.enderio.machine;

 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
-import net.minecraft.tileentity.TileEntity;
+import net.minecraft.inventory.IInventory;

-import crazypants.enderio.machine.gui.IContainerWithTileEntity;
+public class ContainerNoInv extends Container {

-public class ContainerNoInv extends Container implements IContainerWithTileEntity {
+    private IInventory inv;

-    private final AbstractMachineEntity tile;
-
-    public ContainerNoInv(AbstractMachineEntity tile) {
-        this.tile = tile;
+    public ContainerNoInv(IInventory inv) {
+        super();
+        this.inv = inv;
    }

    @Override
    public boolean canInteractWith(EntityPlayer player) {
-        return tile.isUseableByPlayer(player);
-    }
-
-    @Override
-    public TileEntity getTileEntity() {
-        return tile;
+        return inv.isUseableByPlayer(player);
    }
 }
@@ -8,7 +8,6 @@ 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 {
@@ -9,7 +9,6 @@ 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> {
@@ -62,7 +61,6 @@ 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) {
@@ -8,7 +8,6 @@ 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> {
@@ -48,7 +47,6 @@ 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);
        }
@@ -0,0 +1,45 @@
+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;
+    }
+}
@@ -6,7 +6,6 @@ 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> {
@@ -53,7 +52,6 @@ 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);
@@ -13,7 +13,6 @@ 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 {
@@ -9,7 +9,6 @@ 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> {
@@ -5,7 +5,6 @@ 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> {
@@ -44,7 +43,6 @@ 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);
@@ -7,7 +7,6 @@ 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 {
@@ -43,7 +42,7 @@ public class BlockItemCapBank extends ItemBlock implements IEnergyContainerItem

    @Override
    public boolean showDurabilityBar(ItemStack itemStack) {
-        return Config.renderDurabilityBar && !CapBankType.getTypeFromMeta(itemStack.getItemDamage()).isCreative();
+        return !CapBankType.getTypeFromMeta(itemStack.getItemDamage()).isCreative();
    }

    @Override
@@ -10,14 +10,15 @@ 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 ContainerEnderTileEntity<TileCapBank> {
+public class ContainerCapBank extends ContainerEnder<TileCapBank> {

    private InventoryImpl inv;

@@ -18,12 +18,13 @@ 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;
@@ -11,10 +11,11 @@ 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;
@@ -10,7 +10,6 @@ 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 {
@@ -8,7 +8,6 @@ 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> {
@@ -47,8 +46,9 @@ 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 (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null;
-        msg.execute(te);
+        if (te != null) {
+            msg.execute(te);
+        }
        return null;
    }

@@ -7,7 +7,6 @@ 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> {
@@ -11,10 +11,9 @@ 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;

-import crazypants.enderio.machine.gui.ContainerEnderTileEntity;
-
-public class ContainerEnchanter extends ContainerEnderTileEntity<TileEnchanter> {
+public class ContainerEnchanter extends ContainerEnder<TileEnchanter> {

    public ContainerEnchanter(EntityPlayer player, InventoryPlayer playerInv, TileEnchanter te) {
        super(playerInv, te);
@@ -14,7 +14,6 @@ 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 {
@@ -5,7 +5,6 @@ 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>
@@ -35,8 +34,9 @@ public class PacketFarmLockedSlot extends MessageTileEntity<TileFarmStation>
    @Override
    public IMessage onMessage(PacketFarmLockedSlot message, MessageContext ctx) {
        TileFarmStation te = message.getTileEntity(message.getWorld(ctx));
-        if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null;
-        te.toggleLockedState(message.buttonID);
+        if (te != null) {
+            te.toggleLockedState(message.buttonID);
+        }
        return null;
    }
 }
@@ -7,7 +7,6 @@ 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 {
@@ -4,7 +4,6 @@ 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 {
@@ -4,7 +4,6 @@ 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 {
@@ -8,7 +8,6 @@ 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 {
@@ -10,7 +10,6 @@ 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 {
@@ -17,7 +17,6 @@ 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 {
@@ -12,7 +12,6 @@ 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 {
@@ -8,7 +8,6 @@ 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 {