update 2.8.x deps and change to boubles expanded

Co-authored-by: Martin Robertz <[email protected]>

dependencies.gradle

@@ -1,23 +1,24 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.4.6:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.5:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.34-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.6.18:dev")
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:dev')
+    api('com.github.GTNewHorizons:EnderCore:0.4.8:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.91-GTNH:dev')
+    api("com.github.GTNewHorizons:GTNHLib:0.6.40:dev")
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45: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')
+    api("com.github.GTNewHorizons:TinkersConstruct:1.13.54-GTNH:dev")
 
-    compileOnly('com.github.GTNewHorizons:waila:1.8.4:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-576-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.227:dev') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.6-1.7.10:dev") {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.16.7:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.0-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.16.2-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.12-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.8.14:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-691-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.16-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.474:dev') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.10-1.7.10:dev") {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.16.33:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.9-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.16.14-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.20-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
@@ -25,5 +26,6 @@ dependencies {
     compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
     compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2
 
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta40:api') {transitive = false}
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta62:api') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.3:dev")
 }

gradle.properties

@@ -41,11 +41,11 @@ developmentEnvironmentUserName = Developer
 
 # Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
 # See https://github.com/bsideup/jabel for details on how this works.
-enableModernJavaSyntax = false
+enableModernJavaSyntax = true
 
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
-enableGenericInjection = false
+enableGenericInjection = true
 
 # Generate a class with a String field for the mod version named as defined below.
 # If generateGradleTokenClass is empty or not missing, no such class will be generated.
@@ -80,7 +80,7 @@ apiPackage = api
 # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
 # There can be multiple files in a space-separated list.
 # Example value: mymodid_at.cfg nei_at.cfg
-accessTransformersFile =
+accessTransformersFile = enderio_at.cfg
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
@@ -151,7 +151,7 @@ modrinthProjectId =
 #       type can be one of [project, version],
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
 modrinthRelations =
 
 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.44'
 }
 
 

src/main/java/crazypants/enderio/ClientProxy.java

@@ -103,9 +103,6 @@ import crazypants.enderio.machine.painter.BlockPaintedFenceGateRenderer;
 import crazypants.enderio.machine.painter.BlockPaintedGlowstone;
 import crazypants.enderio.machine.painter.PaintedBlockRenderer;
 import crazypants.enderio.machine.painter.PaintedItemRenderer;
-import crazypants.enderio.machine.power.BlockCapacitorBank;
-import crazypants.enderio.machine.power.CapBankRenderer2;
-import crazypants.enderio.machine.power.CapacitorBankRenderer;
 import crazypants.enderio.machine.ranged.RangeEntity;
 import crazypants.enderio.machine.ranged.RangeRenderer;
 import crazypants.enderio.machine.reservoir.ReservoirRenderer;
@@ -321,13 +318,6 @@ public class ClientProxy extends CommonProxy {
             ClientRegistry.bindTileEntitySpecialRenderer(TileCapBank.class, newCbr);
         }
 
-        CapacitorBankRenderer capr = new CapacitorBankRenderer();
-        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCapacitorBank), capr);
-
-        BlockCapacitorBank.renderId = RenderingRegistry.getNextAvailableRenderId();
-        CapBankRenderer2 cbr2 = new CapBankRenderer2();
-        RenderingRegistry.registerBlockHandler(cbr2);
-
         BlockVacuumChest.renderId = RenderingRegistry.getNextAvailableRenderId();
         VacuumChestRenderer vcr = new VacuumChestRenderer();
         RenderingRegistry.registerBlockHandler(vcr);

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

@@ -132,7 +132,6 @@ import crazypants.enderio.machine.painter.BlockPaintedStair;
 import crazypants.enderio.machine.painter.BlockPaintedWall;
 import crazypants.enderio.machine.painter.BlockPainter;
 import crazypants.enderio.machine.painter.PaintSourceValidator;
-import crazypants.enderio.machine.power.BlockCapacitorBank;
 import crazypants.enderio.machine.ranged.RangeEntity;
 import crazypants.enderio.machine.reservoir.BlockReservoir;
 import crazypants.enderio.machine.slicensplice.BlockSliceAndSplice;
@@ -182,12 +181,17 @@ import crazypants.enderio.thaumcraft.ThaumcraftCompat;
 import crazypants.enderio.tool.EnderIOCrashCallable;
 import crazypants.util.EE3Util;
 
-@Mod(
-        modid = MODID,
-        name = MOD_NAME,
-        version = VERSION,
-        dependencies = "required-after:CoFHLib@(1.0.3B3,);required-after:endercore;after:MineFactoryReloaded;after:Forestry;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,);after:chisel;required-after:gtnhlib@[0.2.10,)",
-        guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
+@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = """
+        required-after:CoFHLib@[1.7.10R1.0.3B3,);\
+        required-after:endercore;\
+        required-after:gtnhlib@[0.2.10,);\
+        after:MineFactoryReloaded;\
+        after:Forestry;\
+        after:Waila@[1.5.8,);\
+        after:Thaumcraft;\
+        after:appliedenergistics2@[rv2-beta-8,);\
+        after:Railcraft@[9.16.7,)\
+        """, guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
 public class EnderIO {
 
     public static final String MODID = "EnderIO";
@@ -208,7 +212,8 @@ 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");
+    public static final boolean hasGT5 = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi");
+    public static final boolean hasHP = Loader.isModLoaded("hodgepodge");
 
     // Materials
     public static ItemCapacitor itemBasicCapacitor;
@@ -280,7 +285,6 @@ public class EnderIO {
     public static BlockSolarPanel blockSolarPanel;
     public static BlockReservoir blockReservoir;
     public static BlockAlloySmelter blockAlloySmelter;
-    public static BlockCapacitorBank blockCapacitorBank;
     public static BlockCapBank blockCapBank;
     public static BlockWirelessCharger blockWirelessCharger;
     public static BlockCrusher blockCrusher;
@@ -390,7 +394,6 @@ public class EnderIO {
 
         blockCrusher = BlockCrusher.create();
         blockAlloySmelter = BlockAlloySmelter.create();
-        blockCapacitorBank = BlockCapacitorBank.create();
         blockCapBank = BlockCapBank.create();
 
         blockPainter = BlockPainter.create();
@@ -484,7 +487,9 @@ public class EnderIO {
         itemGrindingBall = ItemGrindingBall.create();
         itemAlloyEndergy = ItemAlloyEndergy.create();
         itemGrindingBallEndergy = ItemGrindingBallEndergy.create();
-        itemPowderIngot = ItemPowderIngot.create();
+        if (!hasGT5) {
+            itemPowderIngot = ItemPowderIngot.create();
+        }
 
         registerFluids();
 
@@ -724,7 +729,9 @@ public class EnderIO {
             SkeletonHandler.registerSkeleton(this);
         }
 
-        MaterialRecipes.registerDependantOresInDictionary();
+        if (!hasGT5) {
+            MaterialRecipes.registerDependantOresInDictionary();
+        }
 
         EnderfaceRecipes.addRecipes();
         MaterialRecipes.addRecipes();
@@ -810,7 +817,6 @@ public class EnderIO {
         return Config.xpJuiceName;
     }
 
-    @SuppressWarnings("unchecked")
     private void addModIntegration() {
 
         if (Loader.isModLoaded("TConstruct")) {
@@ -821,6 +827,7 @@ public class EnderIO {
 
                 Class<?> modFluxClass = Class.forName("tconstruct.modifiers.tools.ModFlux");
                 Field batteriesField = modFluxClass.getField("batteries");
+                @SuppressWarnings("unchecked")
                 List<ItemStack> batteries = (List<ItemStack>) batteriesField.get(modFluxInst);
                 batteries.add(new ItemStack(blockCapBank));
                 Log.info("Registered Capacitor Banks as Tinkers Construct Flux Upgrades");

src/main/java/crazypants/enderio/ModObject.java

@@ -55,7 +55,6 @@ public enum ModObject {
     blockReservoir,
     blockAlloySmelter,
     blockSolarPanel,
-    blockCapacitorBank,
     blockCapBank,
     blockSagMill,
     blockHyperCube,

src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java

@@ -148,10 +148,9 @@ public class BlockDarkSteelPressurePlate extends BlockPressurePlate
         return super.colorMultiplier(world, x, y, z);
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item arg0, CreativeTabs arg1, List items) {
+    public void getSubBlocks(Item arg0, CreativeTabs arg1, List<ItemStack> items) {
         items.add(new ItemStack(this, 1, 0));
         items.add(new ItemStack(this, 1, 1));
     }

src/main/java/crazypants/enderio/block/ContainerDarkSteelAnvil.java

@@ -23,7 +23,6 @@ public class ContainerDarkSteelAnvil extends ContainerRepair {
     private final Field _materialCost = ReflectionHelper
             .findField(ContainerRepair.class, "materialCost", "stackSizeToBeUsedInRepair", "field_82856_l");
 
-    @SuppressWarnings("unchecked")
     public ContainerDarkSteelAnvil(InventoryPlayer playerInv, final World world, final int x, final int y, final int z,
             EntityPlayer player) {
         super(playerInv, world, x, y, z, player);

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

@@ -190,9 +190,8 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
     }
 
     @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         for (int j = 0; j < subtypes.length; ++j) {
             par3List.add(new ItemStack(this, 1, j));
         }

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

@@ -160,7 +160,6 @@ public class BlockConduitBundle extends BlockEio
 
         BlockConduitBundle result = new BlockConduitBundle();
         result.init();
-        MinecraftForge.EVENT_BUS.register(result);
         return result;
     }
 
@@ -292,41 +291,6 @@ public class BlockConduitBundle extends BlockEio
         effectRenderer.addEffect(digFX);
     }
 
-    @SideOnly(Side.CLIENT)
-    @SubscribeEvent
-    public void onPlaySound(PlaySoundSourceEvent event) {
-        String path = event.sound.getPositionedSoundLocation().getResourcePath();
-        if ("silence.step".equals(path)) {
-            ISound snd = event.sound;
-            World world = EnderIO.proxy.getClientWorld();
-            BlockCoord bc = new BlockCoord(snd.getXPosF(), snd.getYPosF(), snd.getZPosF());
-            TileEntity te = bc.getTileEntity(world);
-            if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
-                Block facade = getFacade(world, bc.x, bc.y, bc.z, -1);
-                ConduitUtil.playHitSound(facade.stepSound, world, bc.x, bc.y, bc.z);
-            } else {
-                ConduitUtil.playHitSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z);
-            }
-        }
-    }
-
-    @SideOnly(Side.CLIENT)
-    @SubscribeEvent
-    public void onPlaySoundAtEntity(PlaySoundAtEntityEvent event) {
-        String path = event.name;
-        World world = event.entity.worldObj;
-        if ("EnderIO:silence.step".equals(path) && world.isRemote) {
-            BlockCoord bc = new BlockCoord(event.entity.posX, event.entity.posY - 2, event.entity.posZ);
-            TileEntity te = bc.getTileEntity(world);
-            if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
-                Block facade = getFacade(world, bc.x, bc.y, bc.z, -1);
-                ConduitUtil.playStepSound(facade.stepSound, world, bc.x, bc.y, bc.z);
-            } else {
-                ConduitUtil.playStepSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z);
-            }
-        }
-    }
-
     @Override
     protected void init() {
         super.init();
@@ -334,6 +298,7 @@ public class BlockConduitBundle extends BlockEio
             EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), this);
         }
         EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_EXTERNAL_CONNECTION_SELECTOR, this);
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override
@@ -473,24 +438,6 @@ public class BlockConduitBundle extends BlockEio
                 : resist;
     }
 
-    @SubscribeEvent
-    public void onBreakSpeed(BreakSpeed event) {
-        if (event.block == this) {
-            ItemStack held = event.entityPlayer.getCurrentEquippedItem();
-            if (held == null || held.getItem().getHarvestLevel(held, "pickaxe") == -1) {
-                event.newSpeed += 2;
-            }
-            IConduitBundle te = (IConduitBundle) event.entity.worldObj.getTileEntity(event.x, event.y, event.z);
-            if (te != null && te.getFacadeType() == FacadeType.HARDENED) {
-                if (!ConduitUtil.isSolidFacadeRendered(te, event.entityPlayer)) {
-                    event.newSpeed *= 6;
-                } else {
-                    event.newSpeed *= 2;
-                }
-            }
-        }
-    }
-
     @Override
     @SideOnly(Side.CLIENT)
     public int getRenderBlockPass() {
@@ -923,7 +870,7 @@ public class BlockConduitBundle extends BlockEio
 
     @Override
     public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb,
-            @SuppressWarnings("rawtypes") List arraylist, Entity par7Entity) {
+            List<AxisAlignedBB> arraylist, Entity par7Entity) {
 
         if (MicroblocksUtil.supportMicroblocks()) {
             IM__addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity);
@@ -1261,9 +1208,8 @@ public class BlockConduitBundle extends BlockEio
         return IMultipartSystem.instance.hook_collisionRayTrace(cur, world, x, y, z, src, dst);
     }
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    private void IM__addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask, List list,
-            Entity entity) {
+    private void IM__addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask,
+            List<AxisAlignedBB> list, Entity entity) {
         IMultipartSystem.instance.hook_addCollisionBoxesToList(world, x, y, z, mask, list, entity);
     }
 
@@ -1275,4 +1221,61 @@ public class BlockConduitBundle extends BlockEio
     private boolean hasMicroblocks(IConduitBundle bundle) {
         return !bundle.getCoverSystem().getAllParts().isEmpty();
     }
+
+    public class EventHandler {
+
+        @SideOnly(Side.CLIENT)
+        @SubscribeEvent
+        public void onPlaySound(PlaySoundSourceEvent event) {
+            String path = event.sound.getPositionedSoundLocation().getResourcePath();
+            if ("silence.step".equals(path)) {
+                ISound snd = event.sound;
+                World world = EnderIO.proxy.getClientWorld();
+                if (world == null) return;
+                BlockCoord bc = new BlockCoord(snd.getXPosF(), snd.getYPosF(), snd.getZPosF());
+                TileEntity te = bc.getTileEntity(world);
+                if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
+                    Block facade = getFacade(world, bc.x, bc.y, bc.z, -1);
+                    ConduitUtil.playHitSound(facade.stepSound, world, bc.x, bc.y, bc.z);
+                } else {
+                    ConduitUtil.playHitSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z);
+                }
+            }
+        }
+
+        @SideOnly(Side.CLIENT)
+        @SubscribeEvent
+        public void onPlaySoundAtEntity(PlaySoundAtEntityEvent event) {
+            String path = event.name;
+            World world = event.entity.worldObj;
+            if ("EnderIO:silence.step".equals(path) && world.isRemote) {
+                BlockCoord bc = new BlockCoord(event.entity.posX, event.entity.posY - 2, event.entity.posZ);
+                TileEntity te = bc.getTileEntity(world);
+                if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
+                    Block facade = getFacade(world, bc.x, bc.y, bc.z, -1);
+                    ConduitUtil.playStepSound(facade.stepSound, world, bc.x, bc.y, bc.z);
+                } else {
+                    ConduitUtil.playStepSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z);
+                }
+            }
+        }
+
+        @SubscribeEvent
+        public void onBreakSpeed(BreakSpeed event) {
+            if (event.block == BlockConduitBundle.this) {
+                ItemStack held = event.entityPlayer.getCurrentEquippedItem();
+                if (held == null || held.getItem().getHarvestLevel(held, "pickaxe") == -1) {
+                    event.newSpeed += 2;
+                }
+                IConduitBundle te = (IConduitBundle) event.entity.worldObj.getTileEntity(event.x, event.y, event.z);
+                if (te != null && te.getFacadeType() == FacadeType.HARDENED) {
+                    if (!ConduitUtil.isSolidFacadeRendered(te, event.entityPlayer)) {
+                        event.newSpeed *= 6;
+                    } else {
+                        event.newSpeed *= 2;
+                    }
+                }
+            }
+        }
+    }
 }

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

@@ -688,7 +688,7 @@ public class ConduitRecipes {
         String fluix = "crystalFluix";
         String pureFluix = "crystalPureFluix";
 
-        ItemStack quartzFiber = AEApi.instance().parts().partQuartzFiber.stack(1).copy();
+        ItemStack quartzFiber = AEApi.instance().definitions().parts().quartzFiber().maybeStack(1).get().copy();
         ItemStack conduitBinder = new ItemStack(EnderIO.itemMaterial, 1, Material.CONDUIT_BINDER.ordinal());
         ItemStack res = new ItemStack(EnderIO.itemMEConduit, Config.numConduitsPerRecipe / 2);
 

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

@@ -43,7 +43,7 @@ public class ConduitUtil {
 
     public static final Random RANDOM = new Random();
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @SuppressWarnings("unchecked")
     public static void ensureValidNetwork(IConduit conduit) {
         TileEntity te = conduit.getBundle().getEntity();
         World world = te.getWorldObj();
@@ -54,13 +54,15 @@ public class ConduitUtil {
             return;
         }
 
+        @SuppressWarnings("rawtypes")
         AbstractConduitNetwork res = conduit.createNetworkForType();
         res.init(conduit.getBundle(), connections, world);
         return;
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @SuppressWarnings("unchecked")
     private static boolean reuseNetwork(IConduit con, Collection<? extends IConduit> connections, World world) {
+        @SuppressWarnings("rawtypes")
         AbstractConduitNetwork network = null;
         for (IConduit conduit : connections) {
             if (network == null) {

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

@@ -542,6 +542,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
         return result;
     }
 
+    @SuppressWarnings("unchecked")
     private void addConnectors(List<CollidableComponent> result) {
 
         if (conduits.isEmpty()) {
@@ -965,7 +966,6 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
         return (IGridNode) node;
     }
 
-    @SuppressWarnings("cast")
     @Override
     @Method(modid = "appliedenergistics2")
     public void setGridNode(Object node) {

src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java

@@ -109,7 +109,6 @@ public class BlockConduitFacade extends BlockEio implements IPaintedBlock, Clone
         }
 
         Block block = cb.getFacadeId();
-        int meta = cb.getFacadeMetadata();
         if (block == null || block == this) {
             return;
         }

src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java

@@ -65,10 +65,9 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
         GameRegistry.registerItem(this, ModObject.itemConduitFacade.unlocalisedName);
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) {
+    public void getSubItems(Item item, CreativeTabs p_150895_2_, List<ItemStack> list) {
         for (FacadeType t : FacadeType.values()) {
             list.add(new ItemStack(item, 1, t.ordinal()));
         }
@@ -171,10 +170,9 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
         return result;
     }
 
-    @SuppressWarnings("rawtypes")
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) {
+    public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List<String> list, boolean par4) {
         super.addInformation(item, par2EntityPlayer, list, par4);
     }
 
@@ -183,15 +181,13 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
         return getUnlocalizedName();
     }
 
-    @SuppressWarnings("rawtypes")
     @Override
     @SideOnly(Side.CLIENT)
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     @SideOnly(Side.CLIENT)
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         if (PainterUtil.getSourceBlock(itemstack) == null) {
             list.add(EnderIO.lang.localize("item.itemConduitFacade.tooltip.notpainted"));
         } else {
@@ -199,10 +195,9 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
         }
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     @SideOnly(Side.CLIENT)
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack);
         if (itemstack.getItemDamage() == FacadeType.HARDENED.ordinal()) {
             list.add("");

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

@@ -10,7 +10,6 @@ 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 cpw.mods.fml.common.Optional.Method;
 import cpw.mods.fml.relauncher.Side;
@@ -88,7 +87,6 @@ public class GasConduit extends AbstractGasTankConduit {
     }
 
     private void doExtract() {
-        BlockCoord loc = getLocation();
         if (!hasConnectionMode(ConnectionMode.INPUT)) {
             return;
         }
@@ -103,7 +101,6 @@ public class GasConduit extends AbstractGasTankConduit {
             return;
         }
 
-        Gas f = tank.getGas() == null ? null : tank.getGas().getGas();
         for (ForgeDirection dir : externalConnections) {
             if (autoExtractForDir(dir)) {
                 if (network.extractFrom(this, dir, MAX_EXTRACT_PER_TICK)) {

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

@@ -56,15 +56,15 @@ public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTool
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         String gpt = " " + EnderIO.lang.localize("gas.gasTick");
         int extractRate = Config.gasConduitExtractRate;
         int maxIo = Config.gasConduitMaxIoRate;

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

@@ -103,8 +103,6 @@ public class GasSettings extends BaseSettingsPanel {
     protected void renderCustomOptions(int top, float par1, int par2, int par3) {
         boolean isInput = isInput();
         if (isInput) {
-            int x = gui.getGuiLeft() + gap + gui.getFontRenderer().getStringWidth(autoExtractStr) + gap + 2;
-            int y = customTop;
             gui.getFontRenderer().drawString(autoExtractStr, left, top, ColorUtil.getRGB(Color.DARK_GRAY));
         }
     }

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

@@ -107,7 +107,7 @@ public class BasicItemFilterGui implements IItemFilterGui {
         useNbtB.setPaintSelectedBorder(false);
 
         x += 16;
-        fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
+        fuzzyB = new CycleButton<>(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
     }
 
     public void createFilterSlots() {

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

@@ -92,7 +92,7 @@ public class BigItemFilterGui implements IItemFilterGui {
         useNbtB.setPaintSelectedBorder(false);
 
         x += 16;
-        fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
+        fuzzyB = new CycleButton<>(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
 
         x += 16;
         stickyB = new ToggleButton(

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

@@ -101,7 +101,7 @@ public class LimitedItemFilterGui implements IItemFilterGui {
         useNbtB.setPaintSelectedBorder(false);
 
         x += 16;
-        fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
+        fuzzyB = new CycleButton<>(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
     }
 
     public void createFilterSlots() {

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

@@ -64,9 +64,8 @@ public class ItemExtractSpeedUpgrade extends Item implements IResourceTooltipPro
     }
 
     @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         for (int j = 0; j < UPGRADES.length; ++j) {
             par3List.add(new ItemStack(par1, 1, j));
         }

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

@@ -64,9 +64,8 @@ public class ItemFunctionUpgrade extends Item implements IResourceTooltipProvide
     }
 
     @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         for (int j = 0; j < UPGRADES.length; ++j) {
             par3List.add(new ItemStack(par1, 1, j));
         }

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

@@ -82,9 +82,8 @@ public class ItemBasicItemFilter extends Item implements IItemFilterUpgrade {
     }
 
     @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         for (int j = 0; j < 2; ++j) {
             par3List.add(new ItemStack(this, 1, j));
         }
@@ -92,7 +91,8 @@ public class ItemBasicItemFilter extends Item implements IItemFilterUpgrade {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
+    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
+            boolean par4) {
         if (FilterRegister.isFilterSet(par1ItemStack)) {
             if (!SpecialTooltipHandler.showAdvancedTooltips()) {
                 par3List.add(EnderIO.lang.localize("itemConduitFilterUpgrade"));

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

@@ -89,7 +89,8 @@ public class ItemExistingItemFilter extends Item implements IItemFilterUpgrade,
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
+    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
+            boolean par4) {
         if (FilterRegister.isFilterSet(par1ItemStack)) {
             if (SpecialTooltipHandler.showAdvancedTooltips()) {
                 par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured"));

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

@@ -91,11 +91,10 @@ public class ItemFilter implements IInventory, IItemFilter {
         return doesItemPassFilter(item);
     }
 
-    @SuppressWarnings("SimplifiableConditionalExpression")
     public boolean doesItemPassFilter(ItemStack item) {
         boolean allow = isValid() && itemMatched(item);
 
-        return isBlacklist ? !allow : allow;
+        return isBlacklist ^ allow;
     }
 
     protected boolean itemMatched(ItemStack item) {

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

@@ -60,7 +60,8 @@ public class ItemLimitedItemFilter extends Item implements IItemFilterUpgrade, I
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
+    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
+            boolean par4) {
         if (FilterRegister.isFilterSet(par1ItemStack)) {
             if (SpecialTooltipHandler.showAdvancedTooltips()) {
                 par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured"));

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

@@ -60,7 +60,8 @@ public class ItemModItemFilter extends Item implements IItemFilterUpgrade, IReso
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
+    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
+            boolean par4) {
         if (FilterRegister.isFilterSet(par1ItemStack)) {
             if (SpecialTooltipHandler.showAdvancedTooltips()) {
                 par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured"));

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

@@ -308,7 +308,6 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit {
     }
 
     private void doExtract() {
-        BlockCoord loc = getLocation();
         if (!hasExtractableMode()) {
             return;
         }

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

@@ -14,7 +14,6 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
 import com.enderio.core.client.render.IconUtil;
-import com.enderio.core.common.util.BlockCoord;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -92,7 +91,6 @@ public class AdvancedLiquidConduit extends AbstractTankConduit {
     }
 
     private void doExtract() {
-        BlockCoord loc = getLocation();
         // Extraction can happen on extract mode or in/out mode
         if (!hasExtractableMode()) {
             return;
@@ -108,7 +106,6 @@ public class AdvancedLiquidConduit extends AbstractTankConduit {
             return;
         }
 
-        Fluid f = tank.getFluid() == null ? null : tank.getFluid().getFluid();
         for (ForgeDirection dir : externalConnections) {
             if (autoExtractForDir(dir)) {
                 if (network.extractFrom(this, dir, MAX_EXTRACT_PER_TICK)) {

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

@@ -134,7 +134,7 @@ public class ConduitTank implements IFluidTank {
             addAmount(-used);
         }
 
-        FluidStack drained = new FluidStack(fluid.getFluidID(), used);
+        FluidStack drained = new FluidStack(fluid.getFluid(), used);
 
         if (fluid.amount < 0) {
             fluid.amount = 0;

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

@@ -77,15 +77,15 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         int extractRate;
         int maxIo;
 

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

@@ -360,7 +360,7 @@ public class LiquidConduit extends AbstractTankConduit {
             return false;
         }
 
-        AbstractTankConduitNetwork n = (AbstractTankConduitNetwork) network;
+        AbstractTankConduitNetwork<?> n = (AbstractTankConduitNetwork<?>) network;
         if (tank.getFluid() == null) {
             tank.setLiquid(n.getFluidType() == null ? null : n.getFluidType().copy());
         } else if (n.getFluidType() == null) {

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

@@ -279,13 +279,11 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork<LiquidCondu
                 loc.y,
                 loc.z,
                 ILiquidConduit.class);
-        int numTargets = 0;
         for (ILiquidConduit n : connections) {
             LiquidConduit neighbour = (LiquidConduit) n;
             if (canFlowTo(con, neighbour)) { // can only flow within same network
                 totalAmount += neighbour.getTank().getFluidAmount();
                 totalCapacity += neighbour.getTank().getCapacity();
-                numTargets++;
             }
         }
 

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

@@ -12,8 +12,8 @@ import crazypants.enderio.ModObject;
 import crazypants.enderio.conduit.AbstractItemConduit;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.ItemConduitSubtype;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.power.ICapacitor;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class ItemPowerConduit extends AbstractItemConduit {
 
@@ -51,7 +51,7 @@ public class ItemPowerConduit extends AbstractItemConduit {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
+    public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List<String> list, boolean par4) {
         if (PREFIX == null) {
             POSTFIX = " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr();
             PREFIX = EnderIO.lang.localize("power.maxOutput") + " ";

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

@@ -266,7 +266,6 @@ public class NetworkPowerManager {
 
         float filledRatio = (float) energyStored / maxEnergyStored;
         int energyLeft = energyStored;
-        int given = 0;
         for (IPowerConduit con : network.getConduits()) {
             if (energyLeft > 0) {
                 // NB: use ceil to ensure we dont through away any energy due to
@@ -276,7 +275,6 @@ public class NetworkPowerManager {
                 give = Math.min(give, con.getMaxEnergyStored());
                 give = Math.min(give, energyLeft);
                 con.setEnergyStored(give);
-                given += give;
                 energyLeft -= give;
             } else {
                 con.setEnergyStored(0);

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

@@ -137,7 +137,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
         DyeColor col = DyeColor.getColorFromDye(player.getCurrentEquippedItem());
         if (ConduitUtil.isProbeEquipped(player)) {
             if (!player.worldObj.isRemote) {
-                new PacketConduitProbe().sendInfoMessage(player, this);
+                PacketConduitProbe.sendInfoMessage(player, this);
             }
             return true;
         } else if (col != null && res.component != null && isColorBandRendered(res.component.dir)) {
@@ -283,7 +283,6 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
     }
 
     private boolean isRedstoneEnabled(ForgeDirection dir) {
-        boolean result;
         RedstoneControlMode mode = getExtractionRedstoneMode(dir);
         if (mode == RedstoneControlMode.NEVER) {
             return false;
@@ -298,10 +297,12 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
         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));
+            res = RedstoneControlMode.isConditionMet(mode, signal)
+                    && (col != DyeColor.RED || RedstoneControlMode.isConditionMet(mode, exSig));
         } else {
             // if checking for a signal, either is fine
-            res = mode.isConditionMet(mode, signal) || (col == DyeColor.RED && mode.isConditionMet(mode, exSig));
+            res = RedstoneControlMode.isConditionMet(mode, signal)
+                    || (col == DyeColor.RED && RedstoneControlMode.isConditionMet(mode, exSig));
         }
         return res;
     }

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

@@ -60,7 +60,6 @@ public class PowerConduitRenderer extends DefaultConduitRenderer {
                 Tessellator tessellator = Tessellator.instance;
                 tessellator.setColorOpaque_I(c);
 
-                Offset offset = conduit.getBundle().getOffset(IPowerConduit.class, component.dir);
                 BoundingBox bound = component.bound;
                 if (conMode != ConnectionMode.IN_OUT) {
                     Vector3d trans = ForgeDirectionOffsets.offsetScaled(component.dir, -0.075);

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

@@ -13,8 +13,8 @@ import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.ItemConduitSubtype;
 import crazypants.enderio.conduit.power.IPowerConduit;
 import crazypants.enderio.conduit.power.ItemPowerConduit;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.power.ICapacitor;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class ItemPowerConduitEndergy extends ItemPowerConduit {
 
@@ -75,7 +75,7 @@ public class ItemPowerConduitEndergy extends ItemPowerConduit {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
+    public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List<String> list, boolean par4) {
         if (PREFIX == null) {
             POSTFIX = " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr();
             PREFIX = EnderIO.lang.localize("power.maxOutput") + " ";

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

@@ -72,10 +72,9 @@ public class RedstoneConduit extends AbstractConduit implements IRedstoneConduit
 
     protected boolean neighbourDirty = true;
 
-    @SuppressWarnings("unused")
     public RedstoneConduit() {
-        for (ForgeDirection ignored : ForgeDirection.VALID_DIRECTIONS) {
-            externalSignals.add(new HashSet<Signal>());
+        for (int i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) {
+            externalSignals.add(new HashSet<>());
         }
     }
 

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

@@ -93,7 +93,6 @@ public class DefaultConduitRenderer implements ConduitRenderer {
                         tex.getMaxU(),
                         tex.getMinV(),
                         tex.getMaxV());
-                Tessellator tessellator = Tessellator.instance;
                 for (Vertex c : corners) {
                     cr.addVecWithUV(c.xyz, c.uv.x, c.uv.y);
                 }

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

@@ -74,7 +74,6 @@ public final class Config {
     public static final Section sectionMobConfig = new Section("Mob Config", "mobconfig");
     public static final Section sectionRailConfig = new Section("Rail", "railconfig");
     public static final Section sectionEnchantments = new Section("Enchantments", "enchantments");
-    public static final Section sectionWeather = new Section("Weather", "weather");
     public static final Section sectionTelepad = new Section("Telepad", "telepad");
     public static final Section sectionInventoryPanel = new Section("InventoryPanel", "inventorypanel");
     public static final Section sectionMisc = new Section("Misc", "misc");
@@ -544,10 +543,6 @@ public final class Config {
     public static boolean spawnGuardStopAllSlimesDebug = false;
     public static boolean spawnGuardStopAllSquidSpawning = false;
 
-    public static int weatherObeliskClearFluid = 2000;
-    public static int weatherObeliskRainFluid = 500;
-    public static int weatherObeliskThunderFluid = 1000;
-
     // Loot Defaults
     public static boolean lootDarkSteel = true;
     public static boolean lootItemConduitProbe = true;
@@ -600,6 +595,8 @@ public final class Config {
 
     public static boolean strictTPItemChecking = true;
 
+    public static float fusedQuartzExplosionResistance = 2000.0f;
+
     public static void load(FMLPreInitializationEvent event) {
         PacketHandler.INSTANCE
                 .registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT);
@@ -2746,22 +2743,6 @@ public final class Config {
                 spawnGuardStopAllSquidSpawning,
                 "When true no squid will be spawned.");
 
-        weatherObeliskClearFluid = config.get(
-                sectionWeather.name,
-                "weatherObeliskClearFluid",
-                weatherObeliskClearFluid,
-                "The fluid required (in mB) to set the world to clear weather").getInt();
-        weatherObeliskRainFluid = config.get(
-                sectionWeather.name,
-                "weatherObeliskRainFluid",
-                weatherObeliskRainFluid,
-                "The fluid required (in mB) to set the world to rainy weather").getInt();
-        weatherObeliskThunderFluid = config.get(
-                sectionWeather.name,
-                "weatherObeliskThunderFluid",
-                weatherObeliskThunderFluid,
-                "The fluid required (in mB) to set the world to thundering weather").getInt();
-
         // Loot Config
         lootDarkSteel = config.getBoolean(
                 "lootDarkSteel",
@@ -2990,6 +2971,13 @@ public final class Config {
                 strictTPItemChecking,
                 "If true, turn on strict checking of item energy checking. This might cause traveling tools from third party mods to fire fake security warnings on server side and not function correctly.")
                 .getBoolean(strictTPItemChecking);
+        fusedQuartzExplosionResistance = config.getFloat(
+                "fusedQuartzExplosionResistance",
+                sectionMisc.name,
+                fusedQuartzExplosionResistance,
+                0.0f,
+                Float.MAX_VALUE,
+                "How blast resistant the three Fused Quartz blocks should be.");
     }
 
     public static void checkYetaAccess() {

src/main/java/crazypants/enderio/enderface/ContainerWrapper.java

@@ -1,6 +1,9 @@
 package crazypants.enderio.enderface;
 
+import java.util.List;
+
 import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
 
 public class ContainerWrapper extends net.minecraft.inventory.Container {
 
@@ -28,9 +31,8 @@ public class ContainerWrapper extends net.minecraft.inventory.Container {
         return wrapped.getSlot(arg0);
     }
 
-    @SuppressWarnings("rawtypes")
     @Override
-    public java.util.List getInventory() {
+    public List<ItemStack> getInventory() {
         return wrapped.getInventory();
     }
 

src/main/java/crazypants/enderio/enderface/GuiEnderface.java

@@ -214,7 +214,7 @@ public class GuiEnderface extends GuiScreen {
 
         if (hit != null) {
             Block block = world.getBlock(hit.blockX, hit.blockY, hit.blockZ);
-            if (block == EnderIO.blockHyperCube || block == EnderIO.blockCapacitorBank) {
+            if (block == EnderIO.blockHyperCube) {
                 block.onBlockActivated(world, hit.blockX, hit.blockY, hit.blockZ, player, 0, 0, 0, 0);
             } else {
                 openInterface(hit.blockX, hit.blockY, hit.blockZ, hit.sideHit, hit.hitVec);
@@ -538,34 +538,13 @@ public class GuiEnderface extends GuiScreen {
         int h = gh;
         int left = guiLeft;
         int top = guiTop;
-        int cx = left + w / 2;
-        int cy = top + h / 2;
 
         // black outline
         drawRect(left, top, left + w, top + h, 0xFF000000);
-        left += 1;
-        top += 1;
-        w -= 2;
-        h -= 2;
-
-        // border
-        int topH = 0xFFFFFFFF;
-        int botH = 0xFF555555;
-        int rightH = 0xFF555555;
-        int leftH = 0xFFFFFFFF;
-        if (animateInX) {
-            leftH = 0xFF555555;
-            rightH = 0xFFFFFFFF;
-        }
-        if (animateInY) {
-            topH = 0xFF555555;
-            botH = 0xFFFFFFFF;
-        }
-
-        left += 1;
-        top += 1;
-        w -= 2;
-        h -= 2;
+        left += 2;
+        top += 2;
+        w -= 4;
+        h -= 4;
         drawRect(left, top, left + w, top + h, 0xFF00331C);
     }
 

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

@@ -14,7 +14,7 @@ import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.AbstractMachineEntity;
 import crazypants.enderio.machine.generator.stirling.StirlingGeneratorContainer;
 import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class TooltipHandlerBurnTime implements ITooltipCallback {
 

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

@@ -15,7 +15,7 @@ import crazypants.enderio.EnderIO;
 import crazypants.enderio.fluid.FluidFuelRegister;
 import crazypants.enderio.fluid.IFluidCoolant;
 import crazypants.enderio.fluid.IFluidFuel;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class TooltipHandlerFluid implements ITooltipCallback {
 

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

@@ -97,7 +97,6 @@ public class ItemConduitProbe extends Item implements IResourceTooltipProvider,
         if (!(te instanceof IConduitBundle)) {
             return false;
         }
-        IConduitBundle cb = (IConduitBundle) te;
         if (itemStack.getItemDamage() == 0) {
             if (PacketConduitProbe.canCreatePacket(world, x, y, z)) {
                 if (world.isRemote) {

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

@@ -133,9 +133,8 @@ public class ItemEnderFood extends ItemFood implements IResourceTooltipProvider
         setHasSubtypes(true);
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
-    public void getSubItems(Item item, CreativeTabs tab, List list) {
+    public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
         for (EnderFood f : EnderFood.VALUES) {
             list.add(f.getStack());
         }

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

@@ -28,7 +28,7 @@ import crazypants.enderio.EnderIOTab;
 import crazypants.enderio.ModObject;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.item.darksteel.DarkSteelItems;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.PowerDisplayUtil;
 import crazypants.util.BaublesUtil;
 
 @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles|API")
@@ -96,7 +96,7 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         ItemStack is = new ItemStack(this);
         setFull(is);
         par3List.add(is);
@@ -108,7 +108,7 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
+    public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List<String> list, boolean par4) {
         super.addInformation(itemStack, par2EntityPlayer, list, par4);
         String str = PowerDisplayUtil.formatPower(getEnergyStored(itemStack)) + "/"
                 + PowerDisplayUtil.formatPower(getMaxEnergyStored(itemStack))

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

@@ -367,7 +367,8 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
+    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
+            boolean par4) {
         if (par1ItemStack != null) {
             String mobName = getMobTypeFromStack(par1ItemStack);
             if (mobName != null) {

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

@@ -190,18 +190,14 @@ public class ItemYetaWrench extends Item
     }
 
     /* IAdvancedTooltipProvider */
-
-    @SuppressWarnings("rawtypes")
     @Override
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
 
-    @SuppressWarnings("rawtypes")
     @Override
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         ArrayList<String> tmp = new ArrayList<String>();
         SpecialTooltipHandler.addDetailedTooltipFromResources(tmp, getUnlocalizedName());
         String keyName = Keyboard.getKeyName(KeyTracker.instance.getYetaWrenchMode().getKeyCode());

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

@@ -11,12 +11,14 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentTranslation;
 
 import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
 
 import com.enderio.core.common.util.ChatUtil;
 
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent;
+import cpw.mods.fml.common.gameevent.InputEvent.MouseInputEvent;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.api.teleport.IItemOfTravel;
 import crazypants.enderio.api.tool.IConduitControl;
@@ -134,6 +136,18 @@ public class KeyTracker {
 
     @SubscribeEvent
     public void onKeyInput(KeyInputEvent event) {
+        handleInput();
+    }
+
+    // mouse button presses arrive on a separate event
+    @SubscribeEvent
+    public void onMouseInput(MouseInputEvent event) {
+        if (Mouse.getEventButton() >= 0) {
+            handleInput();
+        }
+    }
+
+    private void handleInput() {
         handleGlide();
         handleSoundDetector();
         handleNightVision();

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

@@ -120,6 +120,7 @@ public class MagnetController {
         }
     }
 
+    @SuppressWarnings("unchecked")
     private List<Entity> selectEntitiesWithinAABB(World world, AxisAlignedBB bb) {
         List<Entity> arraylist = null;
 

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

@@ -24,10 +24,10 @@ import crazypants.enderio.conduit.power.IPowerConduit;
 import crazypants.enderio.conduit.power.NetworkPowerManager;
 import crazypants.enderio.conduit.power.PowerConduitNetwork;
 import crazypants.enderio.conduit.power.PowerTracker;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.power.EnergyHandlerPI;
 import crazypants.enderio.power.IInternalPowerReceiver;
 import crazypants.enderio.power.IInternalPoweredTile;
+import crazypants.enderio.power.PowerDisplayUtil;
 import io.netty.buffer.ByteBuf;
 
 public class PacketConduitProbe implements IMessage, IMessageHandler<PacketConduitProbe, IMessage> {

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

@@ -144,8 +144,8 @@ public class DarkSteelRecipeManager {
     public static int getEnchantmentRepairCost(ItemStack itemStack) {
         // derived from ContainerRepair
         int res = 0;
-        Map map1 = EnchantmentHelper.getEnchantments(itemStack);
-        Iterator iter = map1.keySet().iterator();
+        Map<Integer, Integer> map1 = EnchantmentHelper.getEnchantments(itemStack);
+        Iterator<Integer> iter = map1.keySet().iterator();
         while (iter.hasNext()) {
             int i1 = ((Integer) iter.next()).intValue();
             Enchantment enchantment = Enchantment.enchantmentsList[i1];
@@ -186,7 +186,8 @@ public class DarkSteelRecipeManager {
         return upgrades;
     }
 
-    public void addCommonTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addCommonTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list,
+            boolean flag) {
         for (IDarkSteelUpgrade upgrade : upgrades) {
             if (upgrade.hasUpgrade(itemstack)) {
                 upgrade.addCommonEntries(itemstack, entityplayer, list, flag);
@@ -194,7 +195,8 @@ public class DarkSteelRecipeManager {
         }
     }
 
-    public void addBasicTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addBasicTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list,
+            boolean flag) {
         for (IDarkSteelUpgrade upgrade : upgrades) {
             if (upgrade.hasUpgrade(itemstack)) {
                 upgrade.addBasicEntries(itemstack, entityplayer, list, flag);
@@ -202,7 +204,8 @@ public class DarkSteelRecipeManager {
         }
     }
 
-    public void addAdvancedTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addAdvancedTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list,
+            boolean flag) {
 
         List<IDarkSteelUpgrade> applyableUpgrades = new ArrayList<IDarkSteelUpgrade>();
         for (IDarkSteelUpgrade upgrade : upgrades) {

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

@@ -131,10 +131,9 @@ public class ItemDarkSteelArmor extends ItemArmor
         GameRegistry.registerItem(this, getUnlocalizedName());
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 
@@ -169,17 +168,17 @@ public class ItemDarkSteelArmor extends ItemArmor
     }
 
     @Override
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         if (!Config.addDurabilityTootip) {
             list.add(ItemUtil.getDurabilityString(itemstack));
         }

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

@@ -67,7 +67,6 @@ public class ItemDarkSteelAxe extends ItemAxe
 
     public static ItemDarkSteelAxe create() {
         ItemDarkSteelAxe res = new ItemDarkSteelAxe();
-        MinecraftForge.EVENT_BUS.register(res);
         res.init();
         return res;
     }
@@ -96,7 +95,7 @@ public class ItemDarkSteelAxe extends ItemAxe
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 
@@ -188,18 +187,6 @@ public class ItemDarkSteelAxe extends ItemAxe
         return usedPower;
     }
 
-    @SubscribeEvent
-    public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {
-        if (evt.entityPlayer.isSneaking()
-                && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest)
-                && isLog(evt.block, evt.metadata)) {
-            evt.newSpeed = evt.originalSpeed / Config.darkSteelAxeSpeedPenaltyMultiHarvest;
-        }
-        if (isEquipped(evt.entityPlayer) && evt.block.getMaterial() == Material.leaves) {
-            evt.newSpeed = 6;
-        }
-    }
-
     @Override
     public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side,
             float par8, float par9, float par10) {
@@ -258,6 +245,7 @@ public class ItemDarkSteelAxe extends ItemAxe
 
     protected void init() {
         GameRegistry.registerItem(this, getUnlocalizedName());
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override
@@ -287,17 +275,17 @@ public class ItemDarkSteelAxe extends ItemAxe
     }
 
     @Override
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         if (!Config.addDurabilityTootip) {
             list.add(ItemUtil.getDurabilityString(itemstack));
         }
@@ -328,7 +316,7 @@ public class ItemDarkSteelAxe extends ItemAxe
         public int compare(BlockCoord arg0, BlockCoord arg1) {
             int d1 = refPoint.getDistSq(arg0);
             int d2 = refPoint.getDistSq(arg1);
-            return compare(d1, d1);
+            return compare(d1, d2);
         }
 
         // NB: Copy of Integer.compare, which i sonly in Java 1.7+
@@ -336,4 +324,19 @@ public class ItemDarkSteelAxe extends ItemAxe
             return (x < y) ? -1 : ((x == y) ? 0 : 1);
         }
     }
+
+    public class EventHandler {
+
+        @SubscribeEvent
+        public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {
+            if (evt.entityPlayer.isSneaking()
+                    && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest)
+                    && isLog(evt.block, evt.metadata)) {
+                evt.newSpeed = evt.originalSpeed / Config.darkSteelAxeSpeedPenaltyMultiHarvest;
+            }
+            if (isEquipped(evt.entityPlayer) && evt.block.getMaterial() == Material.leaves) {
+                evt.newSpeed = 6;
+            }
+        }
+    }
 }

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

@@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
-import net.minecraftforge.common.MinecraftForge;
 
 import com.enderio.core.api.client.gui.IAdvancedTooltipProvider;
 import com.enderio.core.common.util.ItemUtil;
@@ -34,7 +33,7 @@ import crazypants.enderio.config.Config;
 import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.SpoonUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.PowerDisplayUtil;
 import crazypants.enderio.teleport.TravelController;
 
 public class ItemDarkSteelPickaxe extends ItemPickaxe
@@ -61,7 +60,6 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe
     public static ItemDarkSteelPickaxe create() {
         ItemDarkSteelPickaxe res = new ItemDarkSteelPickaxe();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 
@@ -83,7 +81,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 
@@ -274,17 +272,17 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe
     }
 
     @Override
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         if (!Config.addDurabilityTootip) {
             list.add(ItemUtil.getDurabilityString(itemstack));
         }

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

@@ -62,13 +62,12 @@ public class ItemDarkSteelShears extends ItemShears
 
     public static ItemDarkSteelShears create() {
         ItemDarkSteelShears res = new ItemDarkSteelShears();
-        MinecraftForge.EVENT_BUS.register(res);
         res.init();
         return res;
     }
 
-    protected final MultiHarvestComparator harvestComparator = new MultiHarvestComparator();
-    protected final EntityComparator entityComparator = new EntityComparator();
+    private final MultiHarvestComparator harvestComparator = new MultiHarvestComparator();
+    private final EntityComparator entityComparator = new EntityComparator();
     protected String name;
 
     protected ItemDarkSteelShears(String name) {
@@ -92,7 +91,7 @@ public class ItemDarkSteelShears extends ItemShears
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 
@@ -163,6 +162,7 @@ public class ItemDarkSteelShears extends ItemShears
         }
     };
 
+    @SuppressWarnings("unchecked")
     @Override
     public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity) {
         if (entity.worldObj.isRemote) {
@@ -182,15 +182,15 @@ public class ItemDarkSteelShears extends ItemShears
                     entity.posX + Config.darkSteelShearsEntityAreaBoostWhenPowered,
                     entity.posY + Config.darkSteelShearsEntityAreaBoostWhenPowered,
                     entity.posZ + Config.darkSteelShearsEntityAreaBoostWhenPowered);
-            List<Entity> sortedTargets = new ArrayList<Entity>(
+            List<IShearable> sortedTargets = new ArrayList<>(
                     entity.worldObj.selectEntitiesWithinAABB(IShearable.class, bb, selectShearable));
             entityComparator.refPoint = entity;
-            Collections.sort(sortedTargets, entityComparator);
+            Collections.sort((List<Entity>) (Object) sortedTargets, entityComparator);
 
             boolean result = false;
             int maxSheep = Math.min(sortedTargets.size(), powerStored / Config.darkSteelShearsPowerUsePerDamagePoint);
             for (int i = 0; i < maxSheep; i++) {
-                Entity entity2 = sortedTargets.get(i);
+                Entity entity2 = (Entity) sortedTargets.get(i);
                 if (entity2 instanceof EntityLivingBase
                         && super.itemInteractionForEntity(itemstack, player, (EntityLivingBase) entity2)) {
                     result = true;
@@ -201,14 +201,6 @@ public class ItemDarkSteelShears extends ItemShears
         return false;
     }
 
-    @SubscribeEvent
-    public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {
-        if (evt.originalSpeed > 2.0
-                && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelShearsPowerUsePerDamagePoint)) {
-            evt.newSpeed = evt.originalSpeed * Config.darkSteelShearsEffeciencyBoostWhenPowered;
-        }
-    }
-
     @Override
     public void setDamage(ItemStack stack, int newDamage) {
         int oldDamage = getDamage(stack);
@@ -230,6 +222,7 @@ public class ItemDarkSteelShears extends ItemShears
 
     protected void init() {
         GameRegistry.registerItem(this, getUnlocalizedName());
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override
@@ -264,17 +257,17 @@ public class ItemDarkSteelShears extends ItemShears
     }
 
     @Override
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         if (!Config.addDurabilityTootip) {
             list.add(ItemUtil.getDurabilityString(itemstack));
         }
@@ -329,4 +322,15 @@ public class ItemDarkSteelShears extends ItemShears
             return 0;
         }
     }
+
+    public static class EventHandler {
+
+        @SubscribeEvent
+        public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {
+            if (evt.originalSpeed > 2.0
+                    && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelShearsPowerUsePerDamagePoint)) {
+                evt.newSpeed = evt.originalSpeed * Config.darkSteelShearsEffeciencyBoostWhenPowered;
+            }
+        }
+    }
 }

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

@@ -72,7 +72,6 @@ public class ItemDarkSteelSword extends ItemSword
     public static ItemDarkSteelSword create() {
         ItemDarkSteelSword res = new ItemDarkSteelSword();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 
@@ -96,7 +95,7 @@ public class ItemDarkSteelSword extends ItemSword
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 
@@ -117,71 +116,6 @@ public class ItemDarkSteelSword extends ItemSword
         return false;
     }
 
-    @SubscribeEvent
-    public void onEnderTeleport(EnderTeleportEvent evt) {
-        if (evt.entityLiving.getEntityData().getBoolean("hitByDarkSteelSword")) {
-            evt.setCanceled(true);
-        }
-    }
-
-    // Set priorty to lowest in the hope any other mod adding head drops will have already added them
-    // by the time this is called to prevent multiple head drops
-    @SubscribeEvent(priority = EventPriority.LOWEST)
-    public void onEntityDrop(LivingDropsEvent evt) {
-
-        if (!(evt.source.getEntity() instanceof EntityPlayer)) {
-            return;
-        }
-
-        EntityPlayer player = (EntityPlayer) evt.source.getEntity();
-        // Handle TiC weapons with beheading differently
-        if (handleBeheadingWeapons(player, evt)) {
-            return;
-        }
-
-        double skullDropChance = getSkullDropChance(player, evt);
-        if (player instanceof FakePlayer) {
-            skullDropChance *= Config.fakePlayerSkullChance;
-        }
-        if (Math.random() <= skullDropChance) {
-            dropSkull(evt, player);
-        }
-
-        // Special handling for ender pear drops
-        if (isEquipped(player)) {
-            String name = EntityList.getEntityString(evt.entityLiving);
-            if (evt.entityLiving instanceof EntityEnderman || ENDERZOO_ENDERMINY.equals(name)) {
-                int numPearls = 0;
-                if (Math.random() <= Config.darkSteelSwordEnderPearlDropChance) {
-                    numPearls++;
-                }
-                for (int i = 0; i < evt.lootingLevel; i++) {
-                    if (Math.random() <= Config.darkSteelSwordEnderPearlDropChancePerLooting) {
-                        numPearls++;
-                    }
-                }
-
-                int existing = 0;
-                for (EntityItem stack : evt.drops) {
-                    if (stack.getEntityItem() != null && stack.getEntityItem().getItem() == Items.ender_pearl) {
-                        existing += stack.getEntityItem().stackSize;
-                    }
-                }
-                int toDrop = numPearls - existing;
-                if (toDrop > 0) {
-                    evt.drops.add(
-                            Util.createDrop(
-                                    player.worldObj,
-                                    new ItemStack(Items.ender_pearl, toDrop, 0),
-                                    evt.entityLiving.posX,
-                                    evt.entityLiving.posY,
-                                    evt.entityLiving.posZ,
-                                    false));
-                }
-            }
-        }
-    }
-
     protected void dropSkull(LivingDropsEvent evt, EntityPlayer player) {
         ItemStack skull = getSkullForEntity(evt.entityLiving);
         if (skull != null && !containsDrop(evt, skull)) {
@@ -292,6 +226,7 @@ public class ItemDarkSteelSword extends ItemSword
 
     protected void init() {
         GameRegistry.registerItem(this, getUnlocalizedName());
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override
@@ -354,17 +289,17 @@ public class ItemDarkSteelSword extends ItemSword
     }
 
     @Override
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag);
     }
 
     @Override
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         if (!Config.addDurabilityTootip) {
             list.add(ItemUtil.getDurabilityString(itemstack));
         }
@@ -437,4 +372,73 @@ public class ItemDarkSteelSword extends ItemSword
 
         return super.onItemRightClick(stack, world, player);
     }
+
+    public class EventHandler {
+
+        @SubscribeEvent
+        public void onEnderTeleport(EnderTeleportEvent evt) {
+            if (evt.entityLiving.getEntityData().getBoolean("hitByDarkSteelSword")) {
+                evt.setCanceled(true);
+            }
+        }
+
+        // Set priorty to lowest in the hope any other mod adding head drops will have already added them
+        // by the time this is called to prevent multiple head drops
+        @SubscribeEvent(priority = EventPriority.LOWEST)
+        public void onEntityDrop(LivingDropsEvent evt) {
+
+            if (!(evt.source.getEntity() instanceof EntityPlayer)) {
+                return;
+            }
+
+            EntityPlayer player = (EntityPlayer) evt.source.getEntity();
+            // Handle TiC weapons with beheading differently
+            if (handleBeheadingWeapons(player, evt)) {
+                return;
+            }
+
+            double skullDropChance = getSkullDropChance(player, evt);
+            if (player instanceof FakePlayer) {
+                skullDropChance *= Config.fakePlayerSkullChance;
+            }
+            if (Math.random() <= skullDropChance) {
+                dropSkull(evt, player);
+            }
+
+            // Special handling for ender pear drops
+            if (isEquipped(player)) {
+                String name = EntityList.getEntityString(evt.entityLiving);
+                if (evt.entityLiving instanceof EntityEnderman || ENDERZOO_ENDERMINY.equals(name)) {
+                    int numPearls = 0;
+                    if (Math.random() <= Config.darkSteelSwordEnderPearlDropChance) {
+                        numPearls++;
+                    }
+                    for (int i = 0; i < evt.lootingLevel; i++) {
+                        if (Math.random() <= Config.darkSteelSwordEnderPearlDropChancePerLooting) {
+                            numPearls++;
+                        }
+                    }
+
+                    int existing = 0;
+                    for (EntityItem stack : evt.drops) {
+                        if (stack.getEntityItem() != null && stack.getEntityItem().getItem() == Items.ender_pearl) {
+                            existing += stack.getEntityItem().stackSize;
+                        }
+                    }
+                    int toDrop = numPearls - existing;
+                    if (toDrop > 0) {
+                        evt.drops.add(
+                                Util.createDrop(
+                                        player.worldObj,
+                                        new ItemStack(Items.ender_pearl, toDrop, 0),
+                                        evt.entityLiving.posX,
+                                        evt.entityLiving.posY,
+                                        evt.entityLiving.posZ,
+                                        false));
+                    }
+                }
+            }
+        }
+
+    }
 }

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

@@ -17,7 +17,7 @@ import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade;
 import gregtech.api.hazards.Hazard;
 import gregtech.api.hazards.IHazardProtector;
 
-@Optional.InterfaceList({ @Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech") })
+@Optional.InterfaceList({ @Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech_nh") })
 public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelItem, IHazardProtector {
 
     public static final ArmorMaterial MATERIAL = EnumHelper
@@ -60,10 +60,9 @@ public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelIt
         return 0;
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 
@@ -83,7 +82,7 @@ public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelIt
     }
 
     /// GT5 Hazmat protection
-    @Optional.Method(modid = "gregtech")
+    @Optional.Method(modid = "gregtech_nh")
     @Override
     public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) {
         return true;

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

@@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -30,7 +29,6 @@ public class ItemEndSteelAxe extends ItemDarkSteelAxe implements IEndSteelItem {
     public static ItemEndSteelAxe create() {
         ItemEndSteelAxe res = new ItemEndSteelAxe();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 
@@ -40,7 +38,7 @@ public class ItemEndSteelAxe extends ItemDarkSteelAxe implements IEndSteelItem {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 

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

@@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -30,7 +29,6 @@ public class ItemEndSteelPickaxe extends ItemDarkSteelPickaxe implements IEndSte
     public static ItemEndSteelPickaxe create() {
         ItemEndSteelPickaxe res = new ItemEndSteelPickaxe();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 
@@ -40,7 +38,7 @@ public class ItemEndSteelPickaxe extends ItemDarkSteelPickaxe implements IEndSte
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 

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

@@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.EnumHelper;
 
 import cpw.mods.fml.relauncher.Side;
@@ -35,7 +34,6 @@ public class ItemEndSteelSword extends ItemDarkSteelSword implements IEndSteelIt
     public static ItemEndSteelSword create() {
         ItemEndSteelSword res = new ItemEndSteelSword();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 
@@ -45,7 +43,7 @@ public class ItemEndSteelSword extends ItemDarkSteelSword implements IEndSteelIt
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 

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

@@ -70,9 +70,8 @@ public class ItemGliderWing extends Item implements IResourceTooltipProvider {
     }
 
     @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         for (int j = 0; j < 2; ++j) {
             par3List.add(new ItemStack(par1, 1, j));
         }

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

@@ -17,7 +17,7 @@ import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade;
 import gregtech.api.hazards.Hazard;
 import gregtech.api.hazards.IHazardProtector;
 
-@Optional.InterfaceList({ @Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech") })
+@Optional.InterfaceList({ @Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech_nh") })
 public class ItemStellarArmor extends ItemDarkSteelArmor implements IStellarItem, IHazardProtector {
 
     public static final ArmorMaterial MATERIAL = EnumHelper
@@ -61,10 +61,9 @@ public class ItemStellarArmor extends ItemDarkSteelArmor implements IStellarItem
         return 0;
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 
@@ -84,7 +83,7 @@ public class ItemStellarArmor extends ItemDarkSteelArmor implements IStellarItem
     }
 
     /// GT5 Hazmat protection
-    @Optional.Method(modid = "gregtech")
+    @Optional.Method(modid = "gregtech_nh")
     @Override
     public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) {
         return true;

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

@@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -30,7 +29,6 @@ public class ItemStellarAxe extends ItemDarkSteelAxe implements IStellarItem {
     public static ItemStellarAxe create() {
         ItemStellarAxe res = new ItemStellarAxe();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 
@@ -40,7 +38,7 @@ public class ItemStellarAxe extends ItemDarkSteelAxe implements IStellarItem {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 

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

@@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -30,7 +29,6 @@ public class ItemStellarPickaxe extends ItemDarkSteelPickaxe implements IStellar
     public static ItemStellarPickaxe create() {
         ItemStellarPickaxe res = new ItemStellarPickaxe();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 
@@ -40,7 +38,7 @@ public class ItemStellarPickaxe extends ItemDarkSteelPickaxe implements IStellar
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 

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

@@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.EnumHelper;
 
 import cpw.mods.fml.relauncher.Side;
@@ -35,7 +34,6 @@ public class ItemStellarSword extends ItemDarkSteelSword implements IStellarItem
     public static ItemStellarSword create() {
         ItemStellarSword res = new ItemStellarSword();
         res.init();
-        MinecraftForge.EVENT_BUS.register(res);
         return res;
     }
 
@@ -45,7 +43,7 @@ public class ItemStellarSword extends ItemDarkSteelSword implements IStellarItem
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         ItemStack is = new ItemStack(this);
         par3List.add(is);
 

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

@@ -32,8 +32,6 @@ public class SoundRenderer extends RenderEntity {
 
         GL11.glColor4f(1, 1, 1, alpha);
 
-        float scale = se.lifeSpan / 20f;
-
         EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
         GL11.glPushMatrix();
         GL11.glTranslatef((float) x, (float) y, (float) z);

src/main/java/crazypants/enderio/item/darksteel/upgrade/AbstractUpgrade.java

@@ -66,19 +66,19 @@ public abstract class AbstractUpgrade implements IDarkSteelUpgrade {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         SpecialTooltipHandler.addCommonTooltipFromResources(list, getUnlocalizedName());
     }
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         list.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localizeExact(getUnlocalizedName() + ".name"));
     }
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         list.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localizeExact(getUnlocalizedName() + ".name"));
         SpecialTooltipHandler.addDetailedTooltipFromResources(list, getUnlocalizedName());
     }

src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java

@@ -17,8 +17,8 @@ import crazypants.enderio.EnderIO;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.item.darksteel.IDarkSteelItem;
 import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.material.Material;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class EnergyUpgrade extends AbstractUpgrade {
 
@@ -216,7 +216,7 @@ public class EnergyUpgrade extends AbstractUpgrade {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
 
         List<String> upgradeStr = new ArrayList<String>();
         upgradeStr.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localizeExact(getUnlocalizedName() + ".name"));

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

@@ -29,9 +29,8 @@ public class ItemEndermanSkull extends ItemBlockWithMetadata {
     }
 
     @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
         for (int j = 0; j < SkullType.values().length; ++j) {
             if (!SkullType.values()[j].showEyes) {
                 par3List.add(new ItemStack(par1, 1, j));

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

@@ -221,15 +221,12 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt
 
     protected int mergeItemResult(ItemStack item, List<ItemStack> outputStacks) {
 
-        int res = 0;
-
         ItemStack copy = item.copy();
         // try to add it to existing stacks first
         for (ItemStack outStack : outputStacks) {
             if (outStack != null && copy != null) {
                 int num = getNumCanMerge(outStack, copy);
                 outStack.stackSize += num;
-                res += num;
                 copy.stackSize -= num;
                 if (copy.stackSize <= 0) {
                     return item.stackSize;

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

@@ -28,7 +28,6 @@ import crazypants.enderio.item.skull.BlockEndermanSkull;
 import crazypants.enderio.machine.buffer.BlockItemBuffer.Type;
 import crazypants.enderio.machine.capbank.BlockItemCapBank;
 import crazypants.enderio.machine.capbank.CapBankType;
-import crazypants.enderio.machine.capbank.ConvertOldRecipe;
 import crazypants.enderio.machine.light.BlockItemElectricLight;
 import crazypants.enderio.material.FrankenSkull;
 import crazypants.enderio.material.MachinePart;
@@ -343,9 +342,6 @@ public class MachineRecipes {
                 .createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.VIBRANT), 0);
         RecipeUtil.addShaped(capBank3, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor3, 'm', vibCry);
 
-        ConvertOldRecipe convertRecipe = new ConvertOldRecipe();
-        GameRegistry.addRecipe(convertRecipe);
-
         GameRegistry.addRecipe(
                 new UpgradeCapBankRecipe(
                         capBank2,

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

@@ -25,7 +25,6 @@ public class OverlayRenderer implements IRenderFace {
         this.te = te;
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z,
             IIcon texture, List<Vertex> refVertices, boolean translateToXyz) {
@@ -41,6 +40,7 @@ public class OverlayRenderer implements IRenderFace {
             Tessellator.instance.addTranslation((float) offset.x, (float) offset.y, (float) offset.z);
 
             IoMode mode = te.getIoMode(face);
+            @SuppressWarnings("unchecked")
             IIcon tex = ((AbstractMachineBlock<AbstractMachineEntity>) par1Block).getOverlayIconForMode(te, face, mode);
             if (tex != null) {
                 ccr.getCustomRenderBlocks().setRenderBoundsFromBlock(par1Block);

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

@@ -47,10 +47,10 @@ public class TechneMachineRenderer<T extends AbstractMachineEntity> extends Tech
         super.renderInventoryBlock(block, metadata, modelId, renderer);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
             RenderBlocks renderer) {
+        @SuppressWarnings("unchecked")
         T te = (T) world.getTileEntity(x, y, z);
         if (te != null) {
             setFacingDir(te.getFacingDir());

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

@@ -38,14 +38,13 @@ public class GuiAlloySmelter extends GuiPoweredMachineBase<TileAlloySmelter> {
         vanillaFurnaceButton.setSize(BUTTON_SIZE, BUTTON_SIZE);
 
         vanillaFurnaceTooltip = new GuiToolTip(
-                new Rectangle(xSize - 5 - BUTTON_SIZE, 62, BUTTON_SIZE, BUTTON_SIZE),
+                new Rectangle(xSize - 5 - BUTTON_SIZE, 43, BUTTON_SIZE, BUTTON_SIZE),
                 (String[]) null);
 
         addProgressTooltip(55, 35, 14, 14);
         addProgressTooltip(103, 35, 14, 14);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public void initGui() {
         super.initGui();

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

@@ -102,7 +102,6 @@ public class VanillaSmeltingRecipe implements IMachineRecipe {
     @Override
     public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) {
         ItemStack output = null;
-        int inputCount = 0;
         for (MachineRecipeInput ri : inputs) {
             if (ri != null && ri.item != null && output == null) {
                 output = FurnaceRecipes.smelting().getSmeltingResult(ri.item);

src/main/java/crazypants/enderio/machine/buffer/BlockItemBuffer.java

@@ -53,10 +53,9 @@ public class BlockItemBuffer extends ItemBlockWithMetadata {
         super(block, block);
     }
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item item, CreativeTabs tab, List list) {
+    public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
         for (Type type : Type.values()) {
             list.add(new ItemStack(item, 1, type.ordinal()));
         }

src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java

@@ -11,8 +11,8 @@ import com.enderio.core.client.render.RenderUtil;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.machine.IoMode;
 import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.network.PacketHandler;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class GuiBuffer extends GuiPoweredMachineBase<TileBuffer> {
 
@@ -93,11 +93,6 @@ public class GuiBuffer extends GuiPoweredMachineBase<TileBuffer> {
         PacketHandler.INSTANCE.sendToServer(new PacketBufferIO(getTileEntity(), lastInput, lastOutput));
     }
 
-    @Override
-    protected boolean showRecipeButton() {
-        return false;
-    }
-
     @Override
     protected boolean renderPowerBar() {
         return getTileEntity().hasPower();

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

@@ -49,8 +49,8 @@ import crazypants.enderio.machine.capbank.packet.PacketNetworkIdRequest;
 import crazypants.enderio.machine.capbank.packet.PacketNetworkIdResponse;
 import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest;
 import crazypants.enderio.machine.capbank.packet.PacketNetworkStateResponse;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.network.PacketHandler;
+import crazypants.enderio.power.PowerDisplayUtil;
 import crazypants.enderio.power.PowerHandlerUtil;
 import crazypants.enderio.tool.ToolUtil;
 import crazypants.enderio.waila.IWailaInfoProvider;
@@ -142,7 +142,7 @@ public class BlockCapBank extends BlockEio
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List list) {
+    public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List<ItemStack> list) {
         int meta = 0;
         for (CapBankType type : CapBankType.types()) {
             if (type.isCreative()) {
@@ -162,11 +162,11 @@ public class BlockCapBank extends BlockEio
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {}
+    public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {}
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         list.add(
                 PowerDisplayUtil.formatStoredPower(
                         PowerHandlerUtil.getStoredEnergyForItem(itemstack),
@@ -180,7 +180,7 @@ public class BlockCapBank extends BlockEio
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
+    public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag) {
         SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack);
     }
 
@@ -523,20 +523,6 @@ public class BlockCapBank extends BlockEio
         return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z);
     }
 
-    @Override
-    public boolean hasComparatorInputOverride() {
-        return true;
-    }
-
-    @Override
-    public int getComparatorInputOverride(World w, int x, int y, int z, int side) {
-        TileEntity te = w.getTileEntity(x, y, z);
-        if (te instanceof TileCapBank) {
-            return ((TileCapBank) te).getComparatorOutput();
-        }
-        return 0;
-    }
-
     @Override
     public void getWailaInfo(List<String> tooltip, EntityPlayer player, World world, int x, int y, int z) {
         TileEntity te = world.getTileEntity(x, y, z);

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

@@ -89,7 +89,9 @@ public class ContainerCapBank extends ContainerEnderTileEntity<TileCapBank> {
         }
 
         if (hasBaublesSlots()) {
-            for (int i = 0; i < baubles.getSizeInventory(); i++) {
+            // for (int i = 0; i < baubles.getSizeInventory(); i++) {
+            // Capped since the sprite only has 4 slots
+            for (int i = 0; i < Math.min(baubles.getSizeInventory(), 4); i++) {
                 addSlotToContainer(new Slot(baubles, i, -15 + armorOffset, 84 + i * 18) {
 
                     @Override
@@ -122,7 +124,9 @@ public class ContainerCapBank extends ContainerEnderTileEntity<TileCapBank> {
         int startHotBarSlot = endPlayerSlot + 1;
         int endHotBarSlot = startHotBarSlot + 9;
         int startBaublesSlot = endHotBarSlot + 1;
-        int endBaublesSlot = baubles == null ? 0 : startBaublesSlot + baubles.getSizeInventory();
+        // int endBaublesSlot = baubles == null ? 0 : startBaublesSlot + baubles.getSizeInventory();
+        // Capped since the sprite only has 4 slots
+        int endBaublesSlot = baubles == null ? 0 : startBaublesSlot + Math.min(baubles.getSizeInventory(), 4);
 
         ItemStack copystack = null;
         Slot slot = (Slot) inventorySlots.get(slotIndex);

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

@@ -1,66 +0,0 @@
-package crazypants.enderio.machine.capbank;
-
-import net.minecraft.block.Block;
-import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.world.World;
-import net.minecraftforge.oredict.RecipeSorter;
-import net.minecraftforge.oredict.RecipeSorter.Category;
-
-import crazypants.enderio.EnderIO;
-import crazypants.enderio.power.PowerHandlerUtil;
-
-public class ConvertOldRecipe implements IRecipe {
-
-    static {
-        RecipeSorter.register(
-                "EnderIO:convertOldCapBankRecipe",
-                ConvertOldRecipe.class,
-                Category.SHAPELESS,
-                "after:minecraft:shapeless");
-    }
-
-    private ItemStack output;
-
-    @Override
-    public boolean matches(InventoryCrafting inv, World world) {
-        ItemStack input = null;
-        for (int i = 0; i < inv.getSizeInventory(); i++) {
-            ItemStack checkStack = inv.getStackInSlot(i);
-            if (checkStack != null) {
-                if (input != null) {
-                    return false;
-                }
-                if (Block.getBlockFromItem(checkStack.getItem()) == EnderIO.blockCapacitorBank) {
-                    input = checkStack;
-                } else {
-                    return false;
-                }
-            }
-        }
-
-        if (input == null) {
-            return false;
-        }
-
-        output = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.ACTIVATED));
-        PowerHandlerUtil.setStoredEnergyForItem(output, PowerHandlerUtil.getStoredEnergyForItem(input));
-        return true;
-    }
-
-    @Override
-    public ItemStack getCraftingResult(InventoryCrafting inv) {
-        return output.copy();
-    }
-
-    @Override
-    public int getRecipeSize() {
-        return 1;
-    }
-
-    @Override
-    public ItemStack getRecipeOutput() {
-        return output;
-    }
-}

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

@@ -30,8 +30,8 @@ import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest;
 import crazypants.enderio.machine.gui.GuiButtonIoConfig;
 import crazypants.enderio.machine.gui.GuiOverlayIoConfig;
 import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.network.PacketHandler;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class GuiCapBank extends GuiContainerBaseEIO {
 
@@ -291,9 +291,8 @@ public class GuiCapBank extends GuiContainerBaseEIO {
         super.drawGuiContainerBackgroundLayer(par1, par2, par3);
     }
 
-    @SuppressWarnings("rawtypes")
     @Override
-    public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) {
+    public void drawHoveringText(@SuppressWarnings("rawtypes") List par1List, int par2, int par3, FontRenderer font) {
         GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT);
         super.drawHoveringText(par1List, par2 + 24, par3, font);
         GL11.glPopAttrib();

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

@@ -18,6 +18,7 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import com.enderio.core.common.interfaces.IComparatorOutput;
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.EntityUtil;
 import com.enderio.core.common.util.Util;
@@ -46,7 +47,7 @@ import crazypants.enderio.power.IPowerStorage;
 import crazypants.enderio.power.PowerHandlerUtil;
 
 public class TileCapBank extends TileEntityEio
-        implements IInternalPowerReceiver, IInventory, IIoConfigurable, IPowerStorage {
+        implements IInternalPowerReceiver, IInventory, IIoConfigurable, IPowerStorage, IComparatorOutput {
 
     private Map<ForgeDirection, IoMode> faceModes;
     private Map<ForgeDirection, InfoDisplayType> faceDisplayTypes;
@@ -692,9 +693,10 @@ public class TileCapBank extends TileEntityEio
         return getIoMode(from) != IoMode.DISABLED;
     }
 
+    @Override
     public int getComparatorOutput() {
-        double stored = getEnergyStored();
-        return stored == 0 ? 0 : (int) (1 + stored / getMaxEnergyStored() * 14);
+        int stored = getEnergyStored();
+        return stored == 0 ? 0 : 1 + (stored * 14) / getMaxEnergyStored();
     }
 
     @Override
@@ -745,7 +747,7 @@ public class TileCapBank extends TileEntityEio
 
     @Override
     public String getInventoryName() {
-        return EnderIO.blockCapacitorBank.getUnlocalizedName() + ".name";
+        return EnderIO.blockCapBank.getUnlocalizedName() + ".name";
     }
 
     @Override

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

@@ -17,7 +17,6 @@ public class NetworkUtil {
 
     private static AtomicInteger nextID = new AtomicInteger(0);
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     public static void ensureValidNetwork(TileCapBank cap) {
         World world = cap.getWorldObj();
         Collection<TileCapBank> neighbours = getNeigbours(cap);

src/main/java/crazypants/enderio/machine/capbank/packet/PacketCapBank.java

@@ -11,7 +11,7 @@ import crazypants.enderio.EnderIO;
 import crazypants.enderio.machine.capbank.TileCapBank;
 import io.netty.buffer.ByteBuf;
 
-public abstract class PacketCapBank<T extends PacketCapBank, Q extends IMessage>
+public abstract class PacketCapBank<T extends PacketCapBank<T, Q>, Q extends IMessage>
         implements IMessage, IMessageHandler<T, Q> {
 
     private int x;

src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java

@@ -201,10 +201,8 @@ public class FillGauge implements IInfoRenderer, IResourceManagerReloadListener
     protected List<Vertex> createGaugeBoundForFace(GaugeKey key, IIcon icon) {
 
         ForgeDirection dir = key.dir;
-        Type type = key.type;
 
         double widthScale = 0.25;
-        double heightScale = 0.8;
 
         double xScale = dir.offsetX == 0 ? widthScale : 1;
         double yScale = 1;

src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java

@@ -17,7 +17,7 @@ import com.enderio.core.client.render.RenderUtil;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.machine.capbank.TileCapBank;
 import crazypants.enderio.machine.capbank.network.CapBankClientNetwork;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class IoDisplay implements IInfoRenderer {
 

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

@@ -17,8 +17,8 @@ import crazypants.enderio.config.Config;
 import crazypants.enderio.gui.IconEIO;
 import crazypants.enderio.machine.PacketItemBuffer;
 import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
-import crazypants.enderio.machine.power.PowerDisplayUtil;
 import crazypants.enderio.network.PacketHandler;
+import crazypants.enderio.power.PowerDisplayUtil;
 
 public class GuiCrafter extends GuiPoweredMachineBase<TileCrafter> {
 
@@ -67,11 +67,6 @@ public class GuiCrafter extends GuiPoweredMachineBase<TileCrafter> {
         }
     }
 
-    @Override
-    protected boolean showRecipeButton() {
-        return false;
-    }
-
     @Override
     public final int getXSize() {
         return 219;

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

@@ -14,7 +14,7 @@ import crazypants.enderio.ModObject;
 import crazypants.enderio.machine.AbstractMachineBlock;
 import crazypants.enderio.network.PacketHandler;
 
-public class BlockCrusher extends AbstractMachineBlock {
+public class BlockCrusher extends AbstractMachineBlock<TileCrusher> {
 
     public static BlockCrusher create() {
         PacketHandler.INSTANCE.registerMessage(

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

@@ -7,34 +7,23 @@ import net.minecraft.entity.player.InventoryPlayer;
 
 import org.lwjgl.opengl.GL11;
 
-import com.enderio.core.client.gui.button.IconButton;
-
-import crazypants.enderio.EnderIO;
 import crazypants.enderio.gui.GuiContainerBaseEIO;
-import crazypants.enderio.gui.IconEIO;
 
 public class GuiEnchanter extends GuiContainerBaseEIO {
 
     private TileEnchanter te;
     private ContainerEnchanter container;
-    private IconButton recipeButton;
 
     public GuiEnchanter(EntityPlayer player, InventoryPlayer inventory, TileEnchanter te) {
         super(new ContainerEnchanter(player, inventory, te), "enchanter");
         container = (ContainerEnchanter) inventorySlots;
         this.te = te;
-
-        recipeButton = new IconButton(this, 100, 154, 8, IconEIO.RECIPE);
-        recipeButton.visible = false;
-        recipeButton.setIconMargin(1, 1);
     }
 
     @Override
     public void initGui() {
         super.initGui();
-        recipeButton.onGuiInit();
-        recipeButton.visible = EnderIO.proxy.isNeiInstalled();
-        ((ContainerEnchanter) inventorySlots).createGhostSlots(getGhostSlots());
+        container.createGhostSlots(getGhostSlots());
     }
 
     @Override
@@ -45,10 +34,6 @@ public class GuiEnchanter extends GuiContainerBaseEIO {
         int sy = (height - ySize) / 2;
         drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize);
 
-        if (EnderIO.proxy.isNeiInstalled()) {
-            IconEIO.map.render(IconEIO.RECIPE, sx + 155, sy + 8, 16, 16, 0, true);
-        }
-
         int curCost = te.getCurrentEnchantmentCost();
         if (curCost > 0) {
             GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);

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

@@ -1,6 +1,5 @@
 package crazypants.enderio.machine.enchanter;
 
-import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentData;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
@@ -235,7 +234,6 @@ public class TileEnchanter extends TileEntityEio implements ISidedInventory {
         if (currentEnchantment == null) {
             return 0;
         }
-        Enchantment enchantment = currentEnchantment.getEnchantment();
         int level = currentEnchantment.getLevelForStackSize(item.stackSize);
         return getEnchantmentCost(currentEnchantment, level);
     }

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

@@ -121,11 +121,11 @@ public class FarmStationContainer extends AbstractMachineContainer<TileFarmStati
         }
     }
 
-    private static void clean(List list) {
-        Iterator iterator = list.iterator();
+    private static void clean(List<ItemStack> list) {
+        Iterator<ItemStack> iterator = list.iterator();
         while (iterator.hasNext()) {
-            final Object o = iterator.next();
-            if (o == null || (o instanceof ItemStack && ((ItemStack) o).getItem() == null)) {
+            final ItemStack o = iterator.next();
+            if (o == null || o.getItem() == null) {
                 iterator.remove();
             }
         }

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

@@ -62,7 +62,6 @@ public class GuiFarmStation extends GuiPoweredMachineBase<TileFarmStation> {
         return 184;
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public void initGui() {
         super.initGui();
@@ -139,11 +138,6 @@ public class GuiFarmStation extends GuiPoweredMachineBase<TileFarmStation> {
         super.actionPerformed(b);
     }
 
-    @Override
-    protected boolean showRecipeButton() {
-        return false;
-    }
-
     @Override
     protected String getPowerOutputLabel() {
         return EnderIO.lang.localize("farm.gui.baseUse");

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

@@ -100,7 +100,6 @@ public class CustomSeedFarmer implements IFarmerJoe {
             return false;
         }
         if (requiresFarmland()) {
-            World worldObj = farm.getWorldObj();
             if (isGroundTilled(farm, bc)) {
                 return plantFromInventory(farm, bc);
             }

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

@@ -4,8 +4,6 @@ import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.BlockCoord;
 
@@ -23,9 +21,6 @@ public class NetherWartFarmer extends CustomSeedFarmer {
         if (!farm.isOpen(bc)) {
             return false;
         }
-        World worldObj = farm.getWorldObj();
-        BlockCoord grn = bc.getLocation(ForgeDirection.DOWN);
-        Block blk = worldObj.getBlock(grn.x, grn.y, grn.z);
 
         return plantFromInventory(farm, bc);
     }

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

@@ -17,7 +17,9 @@ import net.minecraftforge.common.IPlantable;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.BlockCoord;
+import com.mitchej123.hodgepodge.mixins.interfaces.INetherSeed;
 
+import crazypants.enderio.EnderIO;
 import crazypants.enderio.machine.farm.TileFarmStation;
 
 public class PlantableFarmer implements IFarmerJoe {
@@ -109,7 +111,13 @@ public class PlantableFarmer implements IFarmerJoe {
 
     protected boolean plant(TileFarmStation farm, World worldObj, BlockCoord bc, IPlantable plantable) {
         worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2);
-        Block target = plantable.getPlant(null, 0, 0, 0);
+        Block target;
+        // needed for Pam's nether seeds
+        if (EnderIO.hasHP && plantable instanceof INetherSeed netherSeed) {
+            target = netherSeed.hodgepodge$getPlant(null, 0, 0, 0);
+        } else {
+            target = plantable.getPlant(null, 0, 0, 0);
+        }
         int meta = plantable.getPlantMetadata(null, 0, 0, 0);
         worldObj.setBlock(bc.x, bc.y, bc.z, target, meta, 1 | 2);
         farm.actionPerformed(false);
@@ -117,7 +125,13 @@ public class PlantableFarmer implements IFarmerJoe {
     }
 
     protected boolean canPlant(World worldObj, BlockCoord bc, IPlantable plantable) {
-        Block target = plantable.getPlant(null, 0, 0, 0);
+        Block target;
+        // needed for Pam's nether seeds
+        if (EnderIO.hasHP && plantable instanceof INetherSeed netherSeed) {
+            target = netherSeed.hodgepodge$getPlant(null, 0, 0, 0);
+        } else {
+            target = plantable.getPlant(null, 0, 0, 0);
+        }
         Block ground = worldObj.getBlock(bc.x, bc.y - 1, bc.z);
         if (target != null && target.canPlaceBlockAt(worldObj, bc.x, bc.y, bc.z)
                 && target.canBlockStay(worldObj, bc.x, bc.y, bc.z)
@@ -182,10 +196,14 @@ public class PlantableFarmer implements IFarmerJoe {
     }
 
     private boolean isPlantableForBlock(ItemStack stack, Block block) {
-        if (!(stack.getItem() instanceof IPlantable)) {
-            return false;
+        if (stack.getItem() instanceof IPlantable plantable) {
+            // needed for Pam's nether seeds
+            if (EnderIO.hasHP && plantable instanceof INetherSeed netherSeed) {
+                return netherSeed.hodgepodge$getPlant(null, 0, 0, 0) == block;
+            } else {
+                return plantable.getPlant(null, 0, 0, 0) == block;
+            }
         }
-        IPlantable plantable = (IPlantable) stack.getItem();
-        return plantable.getPlant(null, 0, 0, 0) == block;
+        return false;
     }
 }

src/main/java/crazypants/enderio/machine/generator/combustion/ContainerCombustionEngine.java

@@ -5,7 +5,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import crazypants.enderio.machine.AbstractMachineEntity;
 import crazypants.enderio.machine.gui.AbstractMachineContainer;
 
-public class ContainerCombustionEngine extends AbstractMachineContainer {
+public class ContainerCombustionEngine extends AbstractMachineContainer<AbstractMachineEntity> {
 
     public ContainerCombustionEngine(InventoryPlayer playerInv, AbstractMachineEntity te) {
         super(playerInv, te);