Merge remote-tracking branch 'Pilzinsel64/master' into dev

See more: https://github.com/GTNewHorizons/EnderIO/pull/118

build.gradle

@@ -1,4 +1,4 @@
-//version: 1684218858
+//version: 1680120787
 /*
  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 {
@@ -62,25 +66,21 @@ plugins {
     id 'org.jetbrains.kotlin.kapt' version '1.8.0' apply false
     id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false
     id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle
-    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
-    id 'com.palantir.git-version' version '3.0.0' apply false
-    id 'de.undercouch.download' version '5.4.0'
+    id 'com.github.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.14'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.2.4'
 }
-
-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'
 }
 
@@ -132,7 +132,7 @@ propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new
 // this is meant to be set using the user wide property file. by default we do nothing.
 propertyDefaultIfUnset("ideaOverrideBuildType", "") // Can be nothing, "gradle" or "idea"
 
-project.extensions.add(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')
@@ -201,14 +201,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()) {
@@ -222,8 +214,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
         }
@@ -409,7 +399,7 @@ minecraft {
 
     username = developmentEnvironmentUserName.toString()
 
-    lwjgl3Version = "3.3.2"
+    lwjgl3Version = "3.3.2-SNAPSHOT"
 
     // Enable assertions in the current mod
     extraRunJvmArguments.add("-ea:${modGroup}")
@@ -569,10 +559,9 @@ repositories {
 
 def mixinProviderGroup = "io.github.legacymoddingmc"
 def mixinProviderModule = "unimixins"
-def mixinProviderVersion = "0.1.7.1"
+def mixinProviderVersion = "0.1.6"
 def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
 def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
-ext.mixinProviderSpec = mixinProviderSpec
 
 dependencies {
     if (usesMixins.toBoolean()) {
@@ -724,13 +713,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
 }
 
 dependencies {
-    def lwjgl3ifyVersion = '1.3.5'
+    def lwjgl3ifyVersion = '1.3.3'
     def asmVersion = '9.4'
     if (modId != 'lwjgl3ify') {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.13')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.4')
     }
 
     java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}
@@ -804,7 +793,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
@@ -813,7 +802,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
@@ -823,21 +812,9 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
         }
         this.classpath(project.java17DependenciesCfg)
     }
-
-    public void setup(Project project) {
-        super.setup(project)
-        if (project.usesMixins.toBoolean()) {
-            this.extraJvmArgs.addAll(project.provider(() -> {
-                def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(project.mixinProviderSpec))
-                mixinCfg.canBeConsumed = false
-                mixinCfg.transitive = false
-                enableHotswap ? ["-javaagent:" + mixinCfg.singleFile.absolutePath] : []
-            }))
-        }
-    }
 }
 
-def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient")
+def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Side.CLIENT, "runClient")
 runClient17Task.configure {
     setup(project)
     group = "Modded Minecraft"
@@ -848,7 +825,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"
@@ -889,6 +866,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())
@@ -904,8 +886,7 @@ if (usesShadowedDependencies.toBoolean()) {
         ]
         archiveClassifier.set('dev')
         if (relocateShadowedDependencies.toBoolean()) {
-            relocationPrefix = modGroup + ".shadow"
-            enableRelocation = true
+            dependsOn(relocateShadowJar)
         }
     }
     configurations.runtimeElements.outgoing.artifacts.clear()
@@ -1238,7 +1219,7 @@ def addCurseForgeRelation(String type, String name) {
 
 // Updating
 
-def buildscriptGradleVersion = "8.1.1"
+def buildscriptGradleVersion = "8.0.2"
 
 tasks.named('wrapper', Wrapper).configure {
     gradleVersion = buildscriptGradleVersion
@@ -1270,21 +1251,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, they might have been deleted and replaced by newer " +
-            "versions.\nCheck if the versions you try to fetch are still on the distributing sites.\n" +
-            "The links can be found in repositories.gradle and build.gradle:repositories, " +
-            "not build.gradle:buildscript.repositories - this one is 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.")
-    }
-}
-
 static URL availableBuildScriptUrl() {
     new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/build.gradle")
 }
@@ -1422,7 +1388,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 {
@@ -1464,7 +1430,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.
@@ -1472,7 +1442,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
@@ -1480,8 +1477,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) {

dependencies.gradle

@@ -1,22 +1,21 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.2.14:dev')
-    implementation('com.github.GTNewHorizons:ForestryMC:4.6.7:dev')
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.53-GTNH:dev')
+    api('com.github.GTNewHorizons:EnderCore:0.2.13:dev')
+    implementation('com.github.GTNewHorizons:ForestryMC:4.6.5:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.45-GTNH:dev')
     implementation("com.github.GTNewHorizons:GTNHLib:0.0.13:dev")
     api('com.github.GTNewHorizons:BuildCraft:7.1.33:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
 
-    compileOnly('com.github.GTNewHorizons:waila:1.6.0:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-215-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.46:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.5.24:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-195-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Railcraft:9.14.1:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.2.0-GTNH:api') {transitive = false}
-    implementation('com.github.GTNewHorizons:Chisel:2.11.0-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.5-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.11.13-GTNH:api') {transitive = false}
+    implementation('com.github.GTNewHorizons:Chisel:2.10.17-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.1-GTNH:api') {transitive = false}
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023

gradle/wrapper/gradle-wrapper.properties

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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"),

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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") })

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

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

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

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

src/main/java/crazypants/enderio/conduit/power/PowerConduit.java

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

src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java

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

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

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

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

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

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

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

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

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

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

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

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

@@ -84,6 +84,8 @@ public final class Config {
     public static boolean reinforcedObsidianEnabled = true;
     public static boolean reinforcedObsidianUseDarkSteelBlocks = false;
 
+    public static boolean enforceOfflinePlayerUUID = false;
+
     public static boolean useAlternateBinderRecipe = false;
 
     public static boolean useAlternateTesseractModel = false;
@@ -321,8 +323,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;
@@ -1033,6 +1033,13 @@ public final class Config {
                 "Enable per tick sampling on individual power inputs and outputs. This allows slightly more detailed messages from the RF Reader but has a negative impact on server performance.")
                 .getBoolean(detailedPowerTrackingEnabled);
 
+        enforceOfflinePlayerUUID = config.get(
+                sectionAdvanced.name,
+                "enforceOfflinePlayerUUID",
+                false,
+                "Enforces to use the players offline UUID. Recommendet to use before creating your world, otherwise it might breaks all secuity related things.")
+                .getBoolean(enforceOfflinePlayerUUID);
+
         useSneakMouseWheelYetaWrench = config.get(
                 sectionPersonal.name,
                 "useSneakMouseWheelYetaWrench",
@@ -1918,16 +1925,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,

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

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

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

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

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

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

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

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

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

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

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

@@ -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"),

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -17,7 +17,6 @@ import java.util.UUID;
 import org.apache.commons.io.IOUtils;
 
 import com.enderio.core.common.util.PlayerUtil;
-
 import crazypants.enderio.Log;
 
 public class HyperCubeConfig {

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

@@ -17,6 +17,8 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
+import codechicken.nei.LayoutManager;
+
 import com.enderio.core.client.gui.button.IconButton;
 import com.enderio.core.client.gui.button.MultiIconButton;
 import com.enderio.core.client.gui.button.ToggleButton;
@@ -29,7 +31,6 @@ import com.enderio.core.client.render.EnderWidget;
 import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.common.util.ItemUtil;
 
-import codechicken.nei.LayoutManager;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java

@@ -9,7 +9,6 @@ import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 
 import com.enderio.core.common.network.CompressedDataInput;
-
 import crazypants.enderio.machine.invpanel.InventoryDatabase;
 
 public class InventoryDatabaseClient extends InventoryDatabase<ItemEntry> {

src/main/java/crazypants/enderio/machine/invpanel/server/InventoryFactory.java

@@ -4,11 +4,12 @@ import java.util.ArrayList;
 
 import net.minecraft.inventory.ISidedInventory;
 
+import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
+
 import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup;
 
 import cpw.mods.fml.common.Loader;
 import crazypants.enderio.conduit.item.NetworkedInventory;
-import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
 
 public abstract class InventoryFactory {
 

src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java

@@ -9,7 +9,6 @@ import net.minecraft.world.IBlockAccess;
 import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.client.render.CubeRenderer;
 import com.enderio.core.client.render.RenderUtil;
-
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 
 public class ElectricLightRenderer implements ISimpleBlockRenderingHandler {

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

@@ -17,7 +17,6 @@ import com.enderio.core.client.render.RenderUtil;
 import com.enderio.core.common.vecmath.Vector3d;
 import com.enderio.core.common.vecmath.Vector3f;
 import com.enderio.core.common.vecmath.Vertex;
-
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 
 public class ObeliskRenderer implements ISimpleBlockRenderingHandler {

src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java

@@ -11,7 +11,6 @@ import net.minecraftforge.common.util.ForgeDirection;
 import com.enderio.core.client.render.CubeRenderer;
 import com.enderio.core.client.render.IconUtil;
 import com.enderio.core.common.util.BlockCoord;
-
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 
 public class PaintedBlockRenderer implements ISimpleBlockRenderingHandler {

src/main/java/crazypants/enderio/machine/painter/PaintedItemRenderer.java

@@ -10,7 +10,6 @@ import net.minecraftforge.client.IItemRenderer;
 import org.lwjgl.opengl.GL11;
 
 import com.enderio.core.client.render.RenderUtil;
-
 import crazypants.enderio.EnderIO;
 
 public class PaintedItemRenderer implements IItemRenderer {

src/main/java/crazypants/enderio/machine/painter/PainterUtil.java

@@ -9,7 +9,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.google.common.base.Strings;
-
 import crazypants.enderio.EnderIO;
 
 public final class PainterUtil {

src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java

@@ -17,11 +17,12 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import cofh.api.energy.IEnergyContainerItem;
+
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.Util;
 import com.enderio.core.common.vecmath.VecmathUtil;
 
-import cofh.api.energy.IEnergyContainerItem;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.TileEntityEio;
 import crazypants.enderio.conduit.ConnectionMode;

src/main/java/crazypants/enderio/machine/solar/SolarPanelNetwork.java

@@ -7,9 +7,9 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import com.google.common.collect.Lists;
-
 import cofh.api.energy.EnergyStorage;
+
+import com.google.common.collect.Lists;
 import crazypants.enderio.config.Config;
 
 public class SolarPanelNetwork {

src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java

@@ -14,9 +14,10 @@ import net.minecraft.world.EnumSkyBlock;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import cofh.api.energy.EnergyStorage;
+
 import com.enderio.core.common.util.BlockCoord;
 
-import cofh.api.energy.EnergyStorage;
 import crazypants.enderio.TileEntityEio;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.power.IInternalPowerProvider;

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

@@ -12,7 +12,6 @@ import org.lwjgl.opengl.GL11;
 import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.client.render.CubeRenderer;
 import com.enderio.core.client.render.RenderUtil;
-
 import crazypants.enderio.EnderIO;
 
 public class TankItemRenderer implements IItemRenderer {

src/main/java/crazypants/enderio/machine/transceiver/Channel.java

@@ -3,7 +3,6 @@ package crazypants.enderio.machine.transceiver;
 import net.minecraft.nbt.NBTTagCompound;
 
 import com.mojang.authlib.GameProfile;
-
 import crazypants.util.UserIdent;
 
 public class Channel {

src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java

@@ -8,7 +8,6 @@ import net.minecraftforge.client.model.IModelCustom;
 import org.lwjgl.opengl.GL11;
 
 import com.enderio.core.client.render.RenderUtil;
-
 import crazypants.enderio.machine.transceiver.TileTransceiver;
 
 public class TransceiverModel extends ModelBase implements IModel {

src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java

@@ -6,7 +6,6 @@ import net.minecraft.client.model.ModelRenderer;
 import org.lwjgl.opengl.GL11;
 
 import com.enderio.core.client.render.RenderUtil;
-
 import crazypants.enderio.machine.transceiver.TileTransceiver;
 
 public class TransceiverModelAlt extends ModelBase implements IModel {

src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java

@@ -11,7 +11,6 @@ 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.EnderIO;
 
 public class ContainerVacuumChest extends ContainerEnder<TileVacuumChest> {

src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java

@@ -11,13 +11,14 @@ import net.minecraftforge.oredict.OreDictionary;
 
 import org.lwjgl.opengl.GL11;
 
-import com.enderio.core.client.render.EnderWidget;
-import com.enderio.core.common.util.ItemUtil;
-
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.ItemList;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+
+import com.enderio.core.client.render.EnderWidget;
+import com.enderio.core.common.util.ItemUtil;
+
 import crazypants.enderio.gui.IconEIO;
 import crazypants.enderio.machine.alloy.AlloyRecipeManager;
 import crazypants.enderio.machine.alloy.GuiAlloySmelter;

src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java

@@ -15,11 +15,12 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
 
-import com.enderio.core.client.render.EnderWidget;
-
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+
+import com.enderio.core.client.render.EnderWidget;
+
 import crazypants.enderio.gui.GuiContainerBaseEIO;
 import crazypants.enderio.gui.IconEIO;
 import crazypants.enderio.machine.enchanter.EnchanterRecipe;

src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java

@@ -14,12 +14,13 @@ import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
-import com.enderio.core.client.render.EnderWidget;
-
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.GuiRecipe;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+
+import com.enderio.core.client.render.EnderWidget;
+
 import crazypants.enderio.gui.IconEIO;
 import crazypants.enderio.machine.crusher.CrusherRecipeManager;
 import crazypants.enderio.machine.crusher.GrindingBall;

src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java

@@ -12,11 +12,12 @@ import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
-import com.enderio.core.client.render.EnderWidget;
-
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+
+import com.enderio.core.client.render.EnderWidget;
+
 import crazypants.enderio.gui.GuiContainerBaseEIO;
 import crazypants.enderio.gui.IconEIO;
 import crazypants.enderio.machine.power.PowerDisplayUtil;

src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java

@@ -13,11 +13,12 @@ import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
-import com.enderio.core.client.render.EnderWidget;
-
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+
+import com.enderio.core.client.render.EnderWidget;
+
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.ModObject;
 import crazypants.enderio.gui.GuiContainerBaseEIO;

src/main/java/crazypants/enderio/nei/VatRecipeHandler.java

@@ -13,16 +13,17 @@ import net.minecraftforge.fluids.FluidStack;
 
 import org.lwjgl.opengl.GL11;
 
-import com.enderio.core.client.render.EnderWidget;
-import com.enderio.core.client.render.RenderUtil;
-import com.enderio.core.common.util.FluidUtil;
-
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.GuiCraftingRecipe;
 import codechicken.nei.recipe.GuiRecipe;
 import codechicken.nei.recipe.GuiUsageRecipe;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+
+import com.enderio.core.client.render.EnderWidget;
+import com.enderio.core.client.render.RenderUtil;
+import com.enderio.core.common.util.FluidUtil;
+
 import crazypants.enderio.gui.GuiContainerBaseEIO;
 import crazypants.enderio.gui.IconEIO;
 import crazypants.enderio.machine.power.PowerDisplayUtil;

src/main/java/crazypants/enderio/power/PowerDistributor.java

@@ -9,7 +9,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.BlockCoord;
-
 import crazypants.enderio.machine.AbstractMachineEntity;
 
 public class PowerDistributor {

src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java

@@ -6,6 +6,9 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.UUID;
 
+import mods.railcraft.api.carts.CartTools;
+import mods.railcraft.api.carts.ILinkageManager;
+
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityMinecart;
 import net.minecraft.nbt.NBTTagCompound;
@@ -14,9 +17,6 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.vecmath.Vector3d;
 
-import mods.railcraft.api.carts.CartTools;
-import mods.railcraft.api.carts.ILinkageManager;
-
 public class RailcraftLinkUtil implements ICartLinkUtil {
 
     private Class<?> directionalClass;

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

@@ -10,7 +10,6 @@ import net.minecraft.item.ItemStack;
 import com.enderio.core.client.gui.widget.GhostSlot;
 import com.enderio.core.common.ContainerEnder;
 import com.enderio.core.common.util.ArrayInventory;
-
 import crazypants.enderio.teleport.ContainerTravelAuth.AuthInventory;
 
 public class ContainerTravelAuth extends ContainerEnder<AuthInventory> {