update

Small Cleanup (#195 )
update
2026-11-15 17:45:08 +00:00 · 2025-05-18 10:35:07 -05:00 · 2025-05-18 10:34:59 -05:00 · 2025-05-06 17:46:36 -05:00 · 2025-05-06 17:45:43 -05:00 · 2025-05-04 19:38:08 -04:00
174 changed files with 317 additions and 417 deletions
@@ -1,23 +1,23 @@
 // Add your dependencies here

 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.4.6:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.7:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.40-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.6.20:dev")
+    api('com.github.GTNewHorizons:EnderCore:0.4.8:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.8:dev')
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.44-GTNH:dev')
+    api("com.github.GTNewHorizons:GTNHLib:0.6.22:dev")
    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42: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.21-GTNH:dev")
+    api("com.github.GTNewHorizons:TinkersConstruct:1.13.28-GTNH:dev")

    compileOnly('com.github.GTNewHorizons:waila:1.8.4:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-586-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-608-GTNH:api') {transitive = false}
    compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.254:dev') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.7-1.7.10:dev") {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.16.21:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.291:dev') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.11-1.7.10:dev") {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.16.28: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:Chisel:2.16.4-GTNH:dev') {transitive = false}
    compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.13-GTNH:api') {transitive = false}
    compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
    compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
@@ -26,5 +26,5 @@ 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-beta42:api') {transitive = false}
 }
@@ -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.
@@ -182,12 +182,18 @@ 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:chisel;\
+        after:Railcraft@[9.16.7,)\
+        """, guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
 public class EnderIO {

    public static final String MODID = "EnderIO";
@@ -810,7 +816,6 @@ public class EnderIO {
        return Config.xpJuiceName;
    }

-    @SuppressWarnings("unchecked")
    private void addModIntegration() {

        if (Loader.isModLoaded("TConstruct")) {
@@ -821,6 +826,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");
@@ -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));
    }
@@ -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);
@@ -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));
        }
@@ -923,7 +923,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 +1261,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);
    }

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

@@ -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) {
@@ -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) {
@@ -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;
        }
@@ -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("");
@@ -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)) {
@@ -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;
@@ -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));
        }
    }
@@ -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() {
@@ -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(
@@ -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() {
@@ -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));
        }
@@ -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));
        }
@@ -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"));
@@ -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"));
@@ -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) {
@@ -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"));
@@ -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"));
@@ -308,7 +308,6 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit {
    }

    private void doExtract() {
-        BlockCoord loc = getLocation();
        if (!hasExtractableMode()) {
            return;
        }
@@ -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)) {
@@ -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;
@@ -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;

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

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

@@ -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);
                }
@@ -595,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);
@@ -2969,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() {
@@ -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();
    }

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

@@ -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) {
@@ -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());
        }
@@ -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))
@@ -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) {
@@ -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());
@@ -120,6 +120,7 @@ public class MagnetController {
        }
    }

+    @SuppressWarnings("unchecked")
    private List<Entity> selectEntitiesWithinAABB(World world, AxisAlignedBB bb) {
        List<Entity> arraylist = null;

@@ -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) {
@@ -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));
        }
@@ -96,7 +96,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);

@@ -287,17 +287,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 +328,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+
@@ -83,7 +83,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 +274,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));
        }
@@ -92,7 +92,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 +163,7 @@ public class ItemDarkSteelShears extends ItemShears
        }
    };

+    @SuppressWarnings("unchecked")
    @Override
    public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity) {
        if (entity.worldObj.isRemote) {
@@ -182,15 +183,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;
@@ -264,17 +265,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));
        }
@@ -96,7 +96,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);

@@ -354,17 +354,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));
        }
@@ -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);

@@ -40,7 +40,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);

@@ -40,7 +40,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);

@@ -45,7 +45,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);

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

@@ -40,7 +40,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);

@@ -40,7 +40,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);

@@ -45,7 +45,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);

@@ -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);
@@ -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());
    }
@@ -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"));
@@ -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));
@@ -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;
@@ -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);
@@ -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());
@@ -45,7 +45,6 @@ public class GuiAlloySmelter extends GuiPoweredMachineBase<TileAlloySmelter> {
        addProgressTooltip(103, 35, 14, 14);
    }

-    @SuppressWarnings("unchecked")
    @Override
    public void initGui() {
        super.initGui();
@@ -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);
@@ -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()));
        }
@@ -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);
    }

@@ -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();
@@ -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);
@@ -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;
@@ -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;
@@ -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(
@@ -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);
    }
@@ -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();
            }
        }
@@ -62,7 +62,6 @@ public class GuiFarmStation extends GuiPoweredMachineBase<TileFarmStation> {
        return 184;
    }

-    @SuppressWarnings("unchecked")
    @Override
    public void initGui() {
        super.initGui();
@@ -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);
            }
@@ -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);
    }
@@ -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);
@@ -68,6 +68,7 @@ public class BlockZombieGenerator extends AbstractMachineBlock<TileZombieGenerat
        this(ModObject.blockZombieGenerator, TileZombieGenerator.class);
    }

+    @SuppressWarnings("unchecked")
    protected BlockZombieGenerator(ModObject obj, Class<? extends TileZombieGenerator> clazz) {
        super(obj, (Class<TileZombieGenerator>) clazz, Material.anvil);
    }
@@ -5,7 +5,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import crazypants.enderio.machine.AbstractMachineEntity;
 import crazypants.enderio.machine.gui.AbstractMachineContainer;

-public class ContainerZombieGenerator extends AbstractMachineContainer {
+public class ContainerZombieGenerator extends AbstractMachineContainer<AbstractMachineEntity> {

    public ContainerZombieGenerator(InventoryPlayer playerInv, AbstractMachineEntity te) {
        super(playerInv, te);
@@ -72,7 +72,6 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement
            Vector3d absFac = ForgeDirectionOffsets.absolueOffset(facingDir);

            double scaleX = absFac.x == 0 ? 0.95 : 1 - facingOffset / 2;
-            double scaleY = 0.85 * fullness;
            double scaleZ = absFac.z == 0 ? 0.95 : 1 - facingOffset / 2;

            bb = bb.scale(scaleX, 0.85 * fullness, scaleZ);
@@ -40,7 +40,6 @@ public class HyperCubeRegister {
    }

    private void innerLoad() {
-        File f = DimensionManager.getCurrentSaveRootDirectory();
        conf = new HyperCubeConfig(
                new File(DimensionManager.getCurrentSaveRootDirectory(), "enderio/dimensionalTransceiver.cfg"));
        publicChannels.addAll(conf.getPublicChannels());
@@ -79,7 +79,7 @@ public class PacketClientState implements IMessage, IMessageHandler<PacketClient
        }

        modes = new ArrayList<TileHyperCube.IoMode>(SubChannel.values().length);
-        for (SubChannel sc : SubChannel.values()) {
+        for (int i = 0; i < SubChannel.values().length; i++) {
            short ordinal = buf.readShort();
            modes.add(IoMode.values()[ordinal]);
        }
@@ -31,6 +31,7 @@ import crazypants.enderio.TileEntityEio;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.IRedstoneModeControlable;
 import crazypants.enderio.machine.RedstoneControlMode;
+import crazypants.enderio.network.PacketHandler;
 import crazypants.enderio.power.BasicCapacitor;
 import crazypants.enderio.power.IInternalPowerHandler;
 import crazypants.enderio.power.IPowerInterface;
@@ -304,7 +305,7 @@ public class TileHyperCube extends TileEntityEio
        boolean powerChanged = lastSyncPowerStored != storedEnergyRF && shouldDoWorkThisTick(21);
        if (powerChanged) {
            lastSyncPowerStored = storedEnergyRF;
-            EnderIO.packetPipeline.sendToAllAround(new PacketStoredPower(this), this);
+            PacketHandler.sendToAllAround(new PacketStoredPower(this), this);
        }

        if (requiresClientSync) {
@@ -175,22 +175,18 @@ public class InventoryPanelContainer extends AbstractMachineContainer<TileInvent
        return slotFilter;
    }

-    @SuppressWarnings("unchecked")
    public List<Slot> getCraftingGridSlots() {
        return inventorySlots.subList(firstSlotCraftingGrid, endSlotCraftingGrid);
    }

-    @SuppressWarnings("unchecked")
    public List<Slot> getReturnAreaSlots() {
        return inventorySlots.subList(firstSlotReturn, endSlotReturn);
    }

-    @SuppressWarnings("unchecked")
    public List<Slot> getPlayerInventorySlots() {
        return inventorySlots.subList(startPlayerSlot, endPlayerSlot);
    }

-    @SuppressWarnings("unchecked")
    public List<Slot> getPlayerHotbarSlots() {
        return inventorySlots.subList(startHotBarSlot, endHotBarSlot);
    }
@@ -332,7 +328,6 @@ public class InventoryPanelContainer extends AbstractMachineContainer<TileInvent
        super.detectAndSendChanges();
    }

-    @SuppressWarnings("unchecked")
    private void sendReturnAreaSlots() {
        for (int slotIdx = firstSlotReturn; slotIdx < endSlotReturn; slotIdx++) {
            ItemStack stack = ((Slot) inventorySlots.get(slotIdx)).getStack();
@@ -212,7 +212,6 @@ public class TileKillerJoe extends AbstractMachineEntity
        return itemstack.getItem() == inventory[slot].getItem();
    }

-    @SuppressWarnings("unchecked")
    @Override
    protected boolean processTasks(boolean redstoneCheckPassed) {

@@ -56,9 +56,8 @@ public class BlockItemElectricLight extends ItemBlockWithMetadata implements IRe
    }

    @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 (Type type : Type.values()) {
            par3List.add(new ItemStack(this, 1, type.ordinal()));
        }
@@ -20,7 +20,6 @@ public class ElectricLightRenderer implements ISimpleBlockRenderingHandler {
    public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {

        BoundingBox bb = new BoundingBox(0, 0, 0, 1, 0.2, 1);
-        boolean doDraw = false;
        final Tessellator tessellator = Tessellator.instance;
        tessellator.startDrawingQuads();

@@ -171,10 +171,8 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange
        Set<EntityLiving> trackingThisTick = new HashSet<EntityLiving>();
        List<EntityLiving> entsInBounds = worldObj.getEntitiesWithinAABB(EntityLiving.class, attractorBounds);

-        int candidates = 0;
        for (EntityLiving ent : entsInBounds) {
            if (!ent.isDead && isMobInFilter(ent)) {
-                candidates++;
                if (tracking.contains(ent)) {
                    trackingThisTick.add(ent);
                    onEntityTick(ent);
@@ -283,9 +281,7 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange
    private boolean attractyUsingAITask(EntityLiving ent) {
        tracking.add(ent);
        List<EntityAITaskEntry> entries = ent.tasks.taskEntries;
-        boolean hasTask = false;
        EntityAIBase remove = null;
-        boolean isTracked;
        for (EntityAITaskEntry entry : entries) {
            if (entry.action instanceof AttractTask) {
                AttractTask at = (AttractTask) entry.action;
@@ -306,7 +302,7 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange
    }

    private void cancelCurrentTasks(EntityLiving ent) {
-        Iterator iterator = ent.tasks.taskEntries.iterator();
+        Iterator<EntityAITasks.EntityAITaskEntry> iterator = ent.tasks.taskEntries.iterator();

        List<EntityAITasks.EntityAITaskEntry> currentTasks = new ArrayList<EntityAITasks.EntityAITaskEntry>();
        while (iterator.hasNext()) {
@@ -351,8 +347,6 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange
            PathEntity pathentity = worldObj.getPathEntityToEntity(ent, getTarget(), range, true, false, false, true);
            sf.setPathToEntity(pathentity);
        } else if (ent instanceof EntityBlaze) {
-            EntityBlaze mob = (EntityBlaze) ent;
-
            double x = (xCoord + 0.5D - ent.posX);
            double y = (yCoord + 1D - ent.posY);
            double z = (zCoord + 0.5D - ent.posZ);
@@ -5,7 +5,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import crazypants.enderio.machine.AbstractMachineEntity;
 import crazypants.enderio.machine.gui.AbstractMachineContainer;

-public class ContainerInhibitorObelisk extends AbstractMachineContainer {
+public class ContainerInhibitorObelisk extends AbstractMachineContainer<AbstractMachineEntity> {

    public ContainerInhibitorObelisk(InventoryPlayer playerInv, AbstractMachineEntity te) {
        super(playerInv, te);
@@ -56,7 +56,7 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase<TileWeatherObelisk>
        int x_start = (xSize / 2) - (BUTTON_SIZE / 2);
        int y = 58;

-        buttonMode = new ToggleButton(this, 1, x_mode, y, IconEIO.ROUND_ROBIN_OFF, IconEIO.REDSTONE_MODE_WITH_SIGNAL);
+        buttonMode = new ToggleButton(this, 1, x_mode, y, IconEIO.TICK, IconEIO.REDSTONE_MODE_WITH_SIGNAL);

        buttonMode.setToolTip(EnderIO.lang.localize("gui.machine.weather.control"));
        buttonMode.setSelectedToolTip(EnderIO.lang.localize("gui.machine.weather.redstone"));
@@ -65,7 +65,7 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase<TileWeatherObelisk>
        addButton(buttonMode);
        buttonMode.onGuiInit();

-        buttonStart = new IconButton(this, 0, x_start, y, IconEIO.TICK);
+        buttonStart = new IconButton(this, 0, x_start, y, IconEIO.MINUS);
        buttonStart.setToolTip(EnderIO.lang.localize("gui.machine.weather.run"));

        addButton(buttonStart);
@@ -86,13 +86,31 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase<TileWeatherObelisk>
        boolean pulseControl = getTileEntity().getLaunchOnRedstone();
        pulseControlAction(pulseControl);

-        FluidStack fs = getTileEntity().getInputTank().getFluid();
-        if (fs == null) {
+        WeatherTask task = getCurrentTask();
+        if (task == null) {
+            buttonStart.setIcon(IconEIO.MINUS);
            buttonStart.enabled = false;
            return;
        }
-        WeatherTask task = WeatherTask.fromFluid(fs.getFluid());
-        buttonStart.enabled = getTileEntity().canStartTask(task);
+        switch (task) {
+            case CLEAR:
+                buttonStart.setIcon(IconEIO.SUN);
+                break;
+            case RAIN:
+                buttonStart.setIcon(IconEIO.RAIN);
+                break;
+            case STORM:
+                buttonStart.setIcon(IconEIO.THUNDER);
+                break;
+        }
+    }
+
+    protected WeatherTask getCurrentTask() {
+        FluidStack fs = getTileEntity().getInputTank().getFluid();
+        if (fs == null) {
+            return null;
+        }
+        return WeatherTask.fromFluid(fs.getFluid());
    }

    @Override
@@ -165,6 +183,7 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase<TileWeatherObelisk>
            // Start Button
            getTileEntity().startTask();
            PacketHandler.INSTANCE.sendToServer(new PacketActivateWeather(getTileEntity(), true));
+            buttonStart.setEnabled(false);
        } else if (b.id == 1) {
            // Control Mode Button
            boolean pulseControl = buttonMode.isSelected();
@@ -177,6 +196,6 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase<TileWeatherObelisk>

    protected void pulseControlAction(boolean pulseControl) {
        redstoneButton.setVisible(!pulseControl);
-        buttonStart.setVisible(!pulseControl);
+        buttonStart.setEnabled(!pulseControl && getTileEntity().canStartTask(getCurrentTask()));
    }
 }
@@ -168,6 +168,9 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity
    @Override
    public void doUpdate() {
        super.doUpdate();
+        if (cooldown > 0) {
+            cooldown--;
+        }
        if (worldObj.isRemote && isActive() && worldObj.getTotalWorldTime() % 2 == 0) {
            doLoadingParticles();
        }
@@ -232,20 +235,18 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity

    @Override
    protected boolean processTasks(boolean redstoneCheckPassed) {
-        boolean res = false;
-
        if (cooldown > 0) {
-            cooldown--;
-            res = true;
-            return res;
+            return true;
        }

+        boolean res = false;
+
        if (!redstoneCheckPassed && !launchOnRedstone) {
            if (canBeActive) {
                canBeActive = false;
-                res = true;
+                return true;
            }
-            return res;
+            return false;
        } else {
            canBeActive = true;

@@ -291,7 +292,8 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity
    public boolean canStartTask(WeatherTask task) {
        return getActiveTask() == null && !WeatherTask.worldIsState(task, worldObj)
                && getStackInSlot(0) != null
-                && inputTank.getFluidAmount() >= 1000;
+                && inputTank.getFluidAmount() >= 1000
+                && cooldown <= 0;
    }

    public void startTask() {
@@ -313,6 +315,7 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity
        if (getActiveTask() != null) {
            activeTask = null;
            fluidUsed = 0;
+            cooldown = 200;
            if (!worldObj.isRemote) {
                PacketHandler.INSTANCE
                        .sendToDimension(new PacketActivateWeather(this, false), worldObj.provider.dimensionId);
@@ -15,7 +15,6 @@ import com.enderio.core.api.client.gui.IResourceTooltipProvider;
 import com.enderio.core.common.util.Util;
 import com.enderio.core.common.vecmath.Vector3d;

-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -77,8 +76,7 @@ public class ItemXpTransfer extends Item implements IResourceTooltipProvider {
        double xP = player.posX + look.x;
        double yP = player.posY + 1.5;
        double zP = player.posZ + look.z;
-        TargetPoint tp = new TargetPoint(player.dimension, x, y, z, 32);
-        EnderIO.packetPipeline.INSTANCE.sendTo(new PacketXpTransferEffects(swing, xP, yP, zP), (EntityPlayerMP) player);
+        PacketHandler.INSTANCE.sendTo(new PacketXpTransferEffects(swing, xP, yP, zP), (EntityPlayerMP) player);
        world.playSoundEffect(
                x + 0.5,
                y + 0.5,
@@ -30,7 +30,7 @@ public class BlockItemPaintedCarpet extends ItemBlock {

    @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);
        list.add(PainterUtil.getTooltTipText(item));
    }
Author	SHA1	Message	Date
Maya	304fdef5ec	update	2025-05-18 10:35:07 -05:00
glowredman	1f05312ded	Small Cleanup (#195 )	2025-05-18 10:34:59 -05:00
Maya	eb88b1cfe0	update	2025-05-06 17:46:36 -05:00
glowredmanandMaya	d4256bda6e	Make Fused Quartz blast resistance configurable (#194 ) Co-authored-by: Maya <[email protected]>	2025-05-06 17:45:43 -05:00
dibbydoda Martin Robertz koolkrafter5	bda8902709	Feature: Automatable weather obelisk (#193 ) Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: koolkrafter5 <[email protected]>	2025-05-04 19:38:08 -04:00