Remove a lot of unused classes (#629)

24 files changed, 0 insertions, 1544 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index dd07d2b138..060285f551 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -113,13 +113,11 @@ import gtPlusPlus.core.material.nuclear.NUCLIDE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.StringUtils;
-import gtPlusPlus.core.util.debug.DEBUG_INIT;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.everglades.GTplusplus_Everglades;
-import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.xmod.cofh.HANDLER_COFH;
 import gtPlusPlus.xmod.eio.material.MaterialEIO;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -429,11 +427,6 @@ public final class ModItems {
         itemDummyResearch = new ItemDummyResearch();
         itemCustomSpawnEgg = new ItemCustomSpawnEgg();
 
-        // Debug Loading
-        if (CORE_Preloader.DEBUG_MODE) {
-            DEBUG_INIT.registerItems();
-        }
-
         itemDebugAreaClear = new ItemAreaClear();
 
         // Register meta item, because we need them for everything.
@@ -1025,9 +1018,6 @@ public final class ModItems {
         toolGregtechPump.registerPumpType(2, "Super Hand Pump", 128000, 2);
         toolGregtechPump.registerPumpType(3, "Ultimate Hand Pump", 512000, 3);
 
-        // Create Multi-tools
-        // ItemsMultiTools.load();
-
         // Xp Fluids - Dev
         if (!FluidRegistry.isFluidRegistered("mobessence")) {
             FluidUtils.generateFluidNoPrefix("mobessence", "mobessence", 0, new short[] { 125, 175, 125, 100 });
@@ -1153,11 +1143,6 @@ public final class ModItems {
         itemDetCable.setTextureName("string");
         itemBomb = new ItemThrowableBomb();
 
-        // Only used for debugging.
-        /*
-         * if (CORE.DEVENV) { new ConnectedBlockFinder(); }
-         */
-
         // Misc Items
         @SuppressWarnings("unused")
         Item tI;
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java
deleted file mode 100644
index cdf98b9547..0000000000
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package gtPlusPlus.core.item.base;
-
-import java.util.List;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.StatCollector;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-/*
- * Key Point: You can access the NBT compound data from the Item class (in those methods that pass an ItemStack), but
- * the NBT compound can only be set on an ItemStack. The steps to add NBT data to an ItemStack: Create or otherwise get
- * an ItemStack of the desired item Create an NBTTagCompound and fill it with the appropriate data Call
- * ItemStack#setTagCompound() method to set it.
- */
-
-public class BaseItemBrain extends Item {
-
-    // This is an array of all the types I am going to be adding.
-    String[] brainTypes = { "dead", "preserved", "fresh", "tasty" };
-
-    // This method allows us to have different language translation keys for
-    // each item we add.
-    @Override
-    public String getUnlocalizedName(final ItemStack stack) {
-        // This makes sure that the stack has a tag compound. This is how data
-        // is stored on items.
-        if (stack.hasTagCompound()) {
-            // This is the object holding all of the item data.
-            final NBTTagCompound itemData = stack.getTagCompound();
-            // This checks to see if the item has data stored under the
-            // brainType key.
-            if (itemData.hasKey("brainType")) {
-                // This retrieves data from the brainType key and uses it in
-                // the return value
-                return "item." + itemData.getString("brainType");
-            }
-        }
-        // This will be used if the item is obtained without nbt data on it.
-        return "item.nullBrain";
-    }
-
-    // This is a fun method which allows us to run some code when our item is
-    // shown in a creative tab. I am going to use it to add all the brain
-    // types.
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void getSubItems(final Item item, final CreativeTabs tab, final List itemList) {
-        // This creates a loop with a counter. It will go through once for
-        // every listing in brainTypes, and gives us a number associated
-        // with each listing.
-        for (int pos = 0; pos < this.brainTypes.length; pos++) {
-            // This creates a new ItemStack instance. The item parameter
-            // supplied is this item.
-            final ItemStack brainStack = new ItemStack(item);
-            // By default, a new ItemStack does not have any nbt compound data.
-            // We need to give it some.
-            brainStack.setTagCompound(new NBTTagCompound());
-            // Now we set the type of the item, brainType is the key, and
-            // brainTypes[pos] is grabbing a
-            // entry from the brainTypes array.
-            brainStack.getTagCompound().setString("brainType", this.brainTypes[pos]);
-            // And this adds it to the itemList, which is a list of all items
-            // in the creative tab.
-            itemList.add(brainStack);
-        }
-    }
-
-    // This code will allow us to tell the items apart in game. You can change
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    // texture based on nbt data, but I won't be covering that.
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void addInformation(final ItemStack stack, final EntityPlayer player, final List tooltip,
-            final boolean isAdvanced) {
-        if (stack.hasTagCompound() && stack.getTagCompound().hasKey("brainType")) {
-            // StatCollector is a class which allows us to handle string
-            // language translation. This requires that you fill out the
-            // translation in you language class.
-            tooltip.add(
-                    StatCollector.translateToLocal(
-                            "tooltip.yourmod." + stack.getTagCompound().getString("brainType") + ".desc"));
-        } else // If the brain does not have valid tag data, a default message
-        {
-            tooltip.add(StatCollector.translateToLocal("tooltip.yourmod.nullbrain.desc"));
-        }
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java
deleted file mode 100644
index eb75c1fe5d..0000000000
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package gtPlusPlus.core.item.base;
-
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import java.util.List;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-public class BaseItemGeneric extends Item {
-
-    public BaseItemGeneric(final String unlocalizedName, final CreativeTabs c, final int stackSize, final int maxDmg) {
-        this.setUnlocalizedName(GTPlusPlus.ID + "_" + unlocalizedName);
-        this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName);
-        this.setCreativeTab(c);
-        this.setMaxStackSize(stackSize);
-        this.setMaxDamage(maxDmg);
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Override
-    public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-        super.addInformation(stack, aPlayer, list, bool);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java
deleted file mode 100644
index 5f4795689d..0000000000
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package gtPlusPlus.core.item.base;
-
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import java.util.List;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-import gregtech.api.enums.Materials;
-import gtPlusPlus.api.enums.Quality;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-
-public class BaseItemLoot extends Item {
-
-    private final String materialName;
-    private final String unlocalName;
-    private final LootTypes lootTypes;
-    private Quality lootQuality;
-    private final Materials lootMaterial;
-
-    public BaseItemLoot(final LootTypes lootType, final Materials material) {
-        this.lootTypes = lootType;
-        this.lootMaterial = material;
-        this.materialName = material.mDefaultLocalName;
-        this.unlocalName = "item" + lootType.LOOT_TYPE + this.materialName;
-        this.setUnlocalizedName(this.unlocalName);
-        this.setMaxStackSize(1);
-        this.setTextureName(GTPlusPlus.ID + ":" + "item" + lootType.LOOT_TYPE);
-    }
-
-    public ItemStack generateLootStack() {
-        this.lootQuality = Quality.getRandomQuality();
-        return ItemUtils.getSimpleStack(this, 1);
-    }
-
-    @Override
-    public String getItemStackDisplayName(final ItemStack p_77653_1_) {
-        return (this.materialName + this.lootTypes.DISPLAY_SUFFIX);
-    }
-
-    public final String getMaterialName() {
-        return this.materialName;
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Override
-    public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-        list.add(this.lootQuality.getQuality());
-
-        /*
-         * if (componentMaterial.isRadioactive){ list.add(CORE.GT_Tooltip_Radioactive.get()); }
-         */
-
-        super.addInformation(stack, aPlayer, list, bool);
-    }
-
-    @Override
-    public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) {
-        final short[] temp = this.lootMaterial.mRGBa;
-        return Utils.rgbtoHexValue(temp[0], temp[1], temp[2]);
-    }
-
-    @Override
-    public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
-            final boolean p_77663_5_) {
-        // EntityUtils.applyRadiationDamageToEntity(lootQuality.vRadioationLevel, world, entityHolding);
-    }
-
-    public static enum LootTypes {
-
-        Sword("Sword", " Longsword", "sword"),
-        Shortsword("Sword", " Short Blade", "blade"),
-        Helmet("Helmet", " Medium Helm", "helmet"),
-        Chestplate("Platebody", " Chestplate", "platebody"),
-        Leggings("Platelegs", " Platelegs", "platelegs"),
-        Boots("Boots", " Boots", "boots");
-
-        private String LOOT_TYPE;
-        private String DISPLAY_SUFFIX;
-        private String OREDICT_NAME;
-
-        private LootTypes(final String LocalName, final String DisplayName, final String OreDictName) {
-            this.LOOT_TYPE = LocalName;
-            this.DISPLAY_SUFFIX = DisplayName;
-            this.OREDICT_NAME = OreDictName;
-        }
-
-        public String getLootType() {
-            return this.LOOT_TYPE;
-        }
-
-        public String getName() {
-            return this.DISPLAY_SUFFIX;
-        }
-
-        public String getOreDictName() {
-            return this.OREDICT_NAME;
-        }
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java
deleted file mode 100644
index a056b57852..0000000000
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package gtPlusPlus.core.item.base;
-
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import java.util.List;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-
-import gtPlusPlus.core.creative.AddToCreativeTab;
-
-public class BaseItemWithCharge extends Item {
-
-    public int int_Charge = 0;
-    public int int_Max_Charge = 0;
-
-    public BaseItemWithCharge(final String unlocalizedName, final int constructor_Charge,
-            final int constructor_Max_Charge) {
-        this.setUnlocalizedName(unlocalizedName);
-        this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName);
-        this.setMaxStackSize(1);
-        this.setCreativeTab(AddToCreativeTab.tabMachines);
-        this.int_Charge = constructor_Charge;
-        this.int_Max_Charge = constructor_Max_Charge;
-    }
-
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    @Override
-    public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-        int NBT_Charge = this.int_Charge;
-        int NBT_Max_Charge = this.int_Max_Charge;
-        if (stack.stackTagCompound != null) {
-            NBT_Charge = stack.stackTagCompound.getInteger("charge_Current");
-            NBT_Max_Charge = stack.stackTagCompound.getInteger("charge_Max");
-            final String tempX = String.valueOf(NBT_Charge);
-            final String tempY = String.valueOf(NBT_Max_Charge);
-            final String formattedX = EnumChatFormatting.RED + tempX + EnumChatFormatting.GRAY;
-            final String formattedY = EnumChatFormatting.DARK_RED + tempY + EnumChatFormatting.GRAY;
-            list.add(EnumChatFormatting.GRAY + "Charge:" + formattedX + "/" + formattedY + ".");
-            super.addInformation(stack, aPlayer, list, bool);
-        }
-    }
-
-    // Ticking and NBT Handling
-    /*
-     * Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and
-     * update it's contents. public int fuelRemaining = 0; public int maximumFuel = 0; public String fuelType = "";
-     * public float heat = 0; public float maxHeat = 5000;
-     */
-    @Override
-    public void onCreated(final ItemStack itemStack, final World world, final EntityPlayer player) {}
-
-    @Override
-    public void onUpdate(final ItemStack itemStack, final World par2World, final Entity par3Entity, final int par4,
-            final boolean par5) {}
-
-    @Override
-    public ItemStack onItemRightClick(final ItemStack itemStack, final World world, final EntityPlayer par3Entity) {
-        itemStack.stackTagCompound = new NBTTagCompound();
-        return super.onItemRightClick(itemStack, world, par3Entity);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/OilChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/OilChem.java
deleted file mode 100644
index b3c0842327..0000000000
--- a/src/main/java/gtPlusPlus/core/item/chemistry/OilChem.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package gtPlusPlus.core.item.chemistry;
-
-import gtPlusPlus.api.objects.minecraft.ItemPackage;
-
-public class OilChem extends ItemPackage {
-
-    /**
-     * Fluids
-     */
-
-    /**
-     * Items
-     */
-    @Override
-    public void items() {}
-
-    @Override
-    public void blocks() {
-        // None yet
-    }
-
-    @Override
-    public void fluids() {}
-
-    @Override
-    public String errorMessage() {
-        return "Failed to generate recipes for OilChem.";
-    }
-
-    @Override
-    public boolean generateRecipes() {
-
-        return true;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java b/src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java
deleted file mode 100644
index ac51c20a18..0000000000
--- a/src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package gtPlusPlus.core.item.effects;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-/*
- * This determines the name colour. EnumRarity can be: EnumRarity.common - the standard white colour.
- * EnumRarity.uncommon - a yellow colour. EnumRarity.rare - a light blue colour. This is used for enchanted items.
- * EnumRarity.epic - the purple colour used on the Golden Apple.
- * @SideOnly is an FML annotation. It marks the method below it for existing only on one side. Possible values are:
- * Side.CLIENT is probably the most common one. This marks the method as existing only on the client side. Side.SERVER
- * marks the method as existing only on the server side.
- */
-
-public class RarityEffect extends Item {
-
-    public RarityEffect(final int par1) {
-        super();
-        this.setCreativeTab(CreativeTabs.tabMaterials);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public EnumRarity getRarity(final ItemStack par1ItemStack) {
-        return EnumRarity.common;
-    }
-
-    @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
-        return true;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java b/src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java
deleted file mode 100644
index a8081615d7..0000000000
--- a/src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package gtPlusPlus.core.item.effects;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class RarityEpic extends Item {
-
-    public RarityEpic(final int par1) {
-        super();
-        this.setCreativeTab(CreativeTabs.tabMaterials);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public EnumRarity getRarity(final ItemStack par1ItemStack) {
-        return EnumRarity.epic;
-    }
-
-    @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
-        return true;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/effects/RarityRare.java b/src/main/java/gtPlusPlus/core/item/effects/RarityRare.java
deleted file mode 100644
index e448cfafe7..0000000000
--- a/src/main/java/gtPlusPlus/core/item/effects/RarityRare.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package gtPlusPlus.core.item.effects;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class RarityRare extends Item {
-
-    public RarityRare() {
-        super();
-        this.setCreativeTab(CreativeTabs.tabMaterials);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public EnumRarity getRarity(final ItemStack par1ItemStack) {
-        return EnumRarity.rare;
-    }
-
-    @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
-        return true;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java b/src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java
deleted file mode 100644
index 89764a718f..0000000000
--- a/src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package gtPlusPlus.core.item.effects;
-
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class RarityUncommon extends Item {
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public EnumRarity getRarity(final ItemStack par1ItemStack) {
-        return EnumRarity.uncommon;
-    }
-
-    @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
-        return true;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java b/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java
deleted file mode 100644
index 099347eb76..0000000000
--- a/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package gtPlusPlus.core.item.general;
-
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import java.util.List;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-
-import gtPlusPlus.core.creative.AddToCreativeTab;
-
-public class BedLocator_Base extends Item {
-
-    public int bed_X = 0;
-    public int bed_Y = 0;
-    public int bed_Z = 0;
-
-    public BedLocator_Base(final String unlocalizedName) {
-        this.setUnlocalizedName(unlocalizedName);
-        this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName);
-        this.setMaxStackSize(1);
-        this.setCreativeTab(AddToCreativeTab.tabMachines);
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Override
-    public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-
-        int NBT_X = this.bed_X;
-        int NBT_Y = this.bed_Y;
-        int NBT_Z = this.bed_Z;
-
-        if (stack.stackTagCompound != null) {
-            NBT_X = stack.stackTagCompound.getInteger("pos_x");
-            NBT_Y = stack.stackTagCompound.getInteger("pos_y");
-            NBT_Z = stack.stackTagCompound.getInteger("pos_z");
-
-            final String tempX = String.valueOf(NBT_X);
-            final String tempY = String.valueOf(NBT_Y);
-            final String tempZ = String.valueOf(NBT_Z);
-            final String formattedX = EnumChatFormatting.DARK_RED + tempX + EnumChatFormatting.GRAY;
-            final String formattedY = EnumChatFormatting.RED + tempY + EnumChatFormatting.GRAY;
-            final String formattedZ = EnumChatFormatting.RED + tempZ + EnumChatFormatting.GRAY;
-
-            list.add(EnumChatFormatting.GRAY + "X: " + formattedX + ".");
-            list.add(EnumChatFormatting.GRAY + "Y: " + formattedY + ".");
-            list.add(EnumChatFormatting.GRAY + "Z: " + formattedZ + ".");
-            super.addInformation(stack, aPlayer, list, bool);
-        }
-    }
-
-    // Ticking and NBT Handling
-    /*
-     * Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and
-     * update it's contents. public int fuelRemaining = 0; public int maximumFuel = 0; public String fuelType = "";
-     * public float heat = 0; public float maxHeat = 5000;
-     */
-    @Override
-    public void onCreated(final ItemStack itemStack, final World world, final EntityPlayer player) {
-        itemStack.stackTagCompound = new NBTTagCompound();
-        this.bed_X = 0;
-        this.bed_Y = 0;
-        this.bed_Z = 0;
-        itemStack.stackTagCompound.setInteger("pos_x", this.bed_X);
-        itemStack.stackTagCompound.setInteger("pos_y", this.bed_Y);
-        itemStack.stackTagCompound.setInteger("pos_z", this.bed_Z);
-    }
-
-    @Override
-    public void onUpdate(final ItemStack itemStack, final World par2World, final Entity par3Entity, final int par4,
-            final boolean par5) {}
-
-    @Override
-    public ItemStack onItemRightClick(final ItemStack itemStack, final World world, final EntityPlayer par3Entity) {
-        itemStack.stackTagCompound = new NBTTagCompound();
-        if (par3Entity.getBedLocation() != null) {
-            this.bed_X = par3Entity.getBedLocation().posX;
-            this.bed_Y = par3Entity.getBedLocation().posY;
-            this.bed_Z = par3Entity.getBedLocation().posZ;
-        } else {
-            this.bed_X = 0;
-            this.bed_Y = 0;
-            this.bed_Z = 0;
-        }
-        itemStack.stackTagCompound.setInteger("pos_x", this.bed_X);
-        itemStack.stackTagCompound.setInteger("pos_y", this.bed_Y);
-        itemStack.stackTagCompound.setInteger("pos_z", this.bed_Z);
-        return super.onItemRightClick(itemStack, world, par3Entity);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java b/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java
deleted file mode 100644
index 6decd29b06..0000000000
--- a/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package gtPlusPlus.core.item.general;
-
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import java.util.List;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
-
-public class ItemCreativeTab extends Item {
-
-    public IIcon[] icons = new IIcon[10];
-
-    public ItemCreativeTab() {
-        super();
-        this.setHasSubtypes(true);
-        String unlocalizedName = "itemCreativeTabs";
-        this.setUnlocalizedName(unlocalizedName);
-        this.setCreativeTab(GregTech_API.TAB_GREGTECH);
-        GameRegistry.registerItem(this, unlocalizedName);
-    }
-
-    @Override
-    public void registerIcons(IIconRegister reg) {
-        this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_0");
-        this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_1");
-        this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_2");
-        this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_3");
-        this.icons[4] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_4");
-        this.icons[5] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_5");
-        this.icons[6] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_6");
-        this.icons[7] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_7");
-        this.icons[8] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_8");
-        this.icons[9] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_9");
-    }
-
-    @Override
-    public IIcon getIconFromDamage(int meta) {
-        return this.icons[meta];
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Override
-    public void getSubItems(Item item, CreativeTabs tab, List list) {
-        for (int i = 0; i < 10; i++) {
-            list.add(new ItemStack(item, 1, i));
-        }
-    }
-
-    @Override
-    public String getUnlocalizedName(ItemStack stack) {
-        return this.getUnlocalizedName() + "_" + stack.getItemDamage();
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java b/src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java
deleted file mode 100644
index 92a5fafe20..0000000000
--- a/src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package gtPlusPlus.core.item.general;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.player.FillBucketEvent;
-
-import cpw.mods.fml.common.eventhandler.Event;
-
-public class NuclearFuelRodBase extends Item {
-
-    /** field for checking if the bucket has been filled. */
-    private final Block isFull;
-
-    public NuclearFuelRodBase(final Block p_i45331_1_) {
-        this.maxStackSize = 1;
-        this.isFull = p_i45331_1_;
-        this.setCreativeTab(CreativeTabs.tabMisc);
-    }
-
-    /**
-     * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
-     */
-    @Override
-    public ItemStack onItemRightClick(final ItemStack p_77659_1_, final World p_77659_2_,
-            final EntityPlayer p_77659_3_) {
-        final boolean flag = this.isFull == Blocks.air;
-        final MovingObjectPosition movingobjectposition = this
-                .getMovingObjectPositionFromPlayer(p_77659_2_, p_77659_3_, flag);
-
-        if (movingobjectposition == null) {
-            return p_77659_1_;
-        }
-        final FillBucketEvent event = new FillBucketEvent(p_77659_3_, p_77659_1_, p_77659_2_, movingobjectposition);
-        if (MinecraftForge.EVENT_BUS.post(event)) {
-            return p_77659_1_;
-        }
-
-        if (event.getResult() == Event.Result.ALLOW) {
-            if (p_77659_3_.capabilities.isCreativeMode) {
-                return p_77659_1_;
-            }
-
-            if (--p_77659_1_.stackSize <= 0) {
-                return event.result;
-            }
-
-            if (!p_77659_3_.inventory.addItemStackToInventory(event.result)) {
-                p_77659_3_.dropPlayerItemWithRandomChoice(event.result, false);
-            }
-
-            return p_77659_1_;
-        }
-        if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
-            int i = movingobjectposition.blockX;
-            int j = movingobjectposition.blockY;
-            int k = movingobjectposition.blockZ;
-
-            if (!p_77659_2_.canMineBlock(p_77659_3_, i, j, k)) {
-                return p_77659_1_;
-            }
-
-            if (flag) {
-                if (!p_77659_3_.canPlayerEdit(i, j, k, movingobjectposition.sideHit, p_77659_1_)) {
-                    return p_77659_1_;
-                }
-
-                final Material material = p_77659_2_.getBlock(i, j, k).getMaterial();
-                final int l = p_77659_2_.getBlockMetadata(i, j, k);
-
-                if ((material == Material.water) && (l == 0)) {
-                    p_77659_2_.setBlockToAir(i, j, k);
-                    return this.func_150910_a(p_77659_1_, p_77659_3_, Items.water_bucket);
-                }
-
-                if ((material == Material.lava) && (l == 0)) {
-                    p_77659_2_.setBlockToAir(i, j, k);
-                    return this.func_150910_a(p_77659_1_, p_77659_3_, Items.lava_bucket);
-                }
-            } else {
-                if (this.isFull == Blocks.air) {
-                    return new ItemStack(Items.bucket);
-                }
-
-                if (movingobjectposition.sideHit == 0) {
-                    --j;
-                }
-
-                if (movingobjectposition.sideHit == 1) {
-                    ++j;
-                }
-
-                if (movingobjectposition.sideHit == 2) {
-                    --k;
-                }
-
-                if (movingobjectposition.sideHit == 3) {
-                    ++k;
-                }
-
-                if (movingobjectposition.sideHit == 4) {
-                    --i;
-                }
-
-                if (movingobjectposition.sideHit == 5) {
-                    ++i;
-                }
-
-                if (!p_77659_3_.canPlayerEdit(i, j, k, movingobjectposition.sideHit, p_77659_1_)) {
-                    return p_77659_1_;
-                }
-
-                if (this.tryPlaceContainedLiquid(p_77659_2_, i, j, k) && !p_77659_3_.capabilities.isCreativeMode) {
-                    return new ItemStack(Items.bucket);
-                }
-            }
-        }
-
-        return p_77659_1_;
-    }
-
-    private ItemStack func_150910_a(final ItemStack p_150910_1_, final EntityPlayer p_150910_2_,
-            final Item p_150910_3_) {
-        if (p_150910_2_.capabilities.isCreativeMode) {
-            return p_150910_1_;
-        } else if (--p_150910_1_.stackSize <= 0) {
-            return new ItemStack(p_150910_3_);
-        } else {
-            if (!p_150910_2_.inventory.addItemStackToInventory(new ItemStack(p_150910_3_))) {
-                p_150910_2_.dropPlayerItemWithRandomChoice(new ItemStack(p_150910_3_, 1, 0), false);
-            }
-
-            return p_150910_1_;
-        }
-    }
-
-    /**
-     * Attempts to place the liquid contained inside the bucket.
-     */
-    public boolean tryPlaceContainedLiquid(final World p_77875_1_, final int p_77875_2_, final int p_77875_3_,
-            final int p_77875_4_) {
-        if (this.isFull == Blocks.air) {
-            return false;
-        }
-        final Material material = p_77875_1_.getBlock(p_77875_2_, p_77875_3_, p_77875_4_).getMaterial();
-        final boolean flag = !material.isSolid();
-
-        if (!p_77875_1_.isAirBlock(p_77875_2_, p_77875_3_, p_77875_4_) && !flag) {
-            return false;
-        }
-        if (p_77875_1_.provider.isHellWorld && (this.isFull == Blocks.flowing_water)) {
-            p_77875_1_.playSoundEffect(
-                    p_77875_2_ + 0.5F,
-                    p_77875_3_ + 0.5F,
-                    p_77875_4_ + 0.5F,
-                    "random.fizz",
-                    0.5F,
-                    2.6F + ((p_77875_1_.rand.nextFloat() - p_77875_1_.rand.nextFloat()) * 0.8F));
-
-            for (int l = 0; l < 8; ++l) {
-                p_77875_1_.spawnParticle(
-                        "largesmoke",
-                        p_77875_2_ + Math.random(),
-                        p_77875_3_ + Math.random(),
-                        p_77875_4_ + Math.random(),
-                        0.0D,
-                        0.0D,
-                        0.0D);
-            }
-        } else {
-            if (!p_77875_1_.isRemote && flag && !material.isLiquid()) {
-                p_77875_1_.func_147480_a(p_77875_2_, p_77875_3_, p_77875_4_, true);
-            }
-
-            p_77875_1_.setBlock(p_77875_2_, p_77875_3_, p_77875_4_, this.isFull, 0, 3);
-        }
-
-        return true;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java b/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java
deleted file mode 100644
index ff0b923ca4..0000000000
--- a/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package gtPlusPlus.core.item.general.fuelrods;
-
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import java.util.List;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-
-import gtPlusPlus.core.creative.AddToCreativeTab;
-
-public class FuelRod_Base extends Item {
-
-    public int fuelRemaining = 0;
-    public int maximumFuel = 0;
-    public String fuelType = "";
-    public float heat = 0;
-    public float maxHeat = this.getMaxHeat();
-
-    public FuelRod_Base(final String unlocalizedName, final String type, final int fuelLeft, final int maxFuel) {
-        this.setUnlocalizedName(unlocalizedName);
-        this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName);
-        this.setMaxStackSize(1);
-        this.setMaxDamage(maxFuel);
-        this.maximumFuel = maxFuel;
-        this.fuelRemaining = fuelLeft;
-        this.fuelType = type;
-        this.setCreativeTab(AddToCreativeTab.tabMachines);
-    }
-
-    private float getMaxHeat() {
-        float tempvar;
-        if (this.fuelType == "Thorium") {
-            tempvar = 2500;
-        } else if (this.fuelType == "Uranium") {
-            tempvar = 5000;
-        } else if (this.fuelType == "Plutonium") {
-            tempvar = 10000;
-        } else {
-            tempvar = 5000;
-        }
-        return tempvar;
-    }
-
-    private void updateVars(final ItemStack stack) {
-        if (stack.stackTagCompound != null) {
-            this.heat = stack.stackTagCompound.getFloat("heat");
-            this.fuelRemaining = stack.stackTagCompound.getInteger("fuelRemaining");
-        }
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Override
-    public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-
-        Float NBT_Heat = this.heat;
-        Float NBT_MaxHeat = this.maxHeat;
-        int NBT_Fuel = this.fuelRemaining;
-        String NBT_Type = this.fuelType;
-
-        if (stack.stackTagCompound != null) {
-            NBT_Heat = stack.stackTagCompound.getFloat("heat");
-            NBT_MaxHeat = stack.stackTagCompound.getFloat("maxHeat");
-            NBT_Fuel = stack.stackTagCompound.getInteger("fuelRemaining");
-            NBT_Type = stack.stackTagCompound.getString("fuelType");
-        }
-
-        final String tempHeat = String.valueOf(NBT_Heat);
-        final String tempMaxHeat = String.valueOf(NBT_MaxHeat);
-        final String tempFuel = String.valueOf(NBT_Fuel);
-        final String formattedType = EnumChatFormatting.DARK_RED + NBT_Type + EnumChatFormatting.GRAY;
-        String formattedHeat = EnumChatFormatting.RED + tempHeat + EnumChatFormatting.GRAY;
-        final String formattedMaxHeat = EnumChatFormatting.RED + tempMaxHeat + EnumChatFormatting.GRAY;
-        String formattedFuelLeft = tempFuel + EnumChatFormatting.GRAY;
-
-        final int tempMax = this.maximumFuel;
-        final float tempCurrentHeat = this.heat;
-        final int tempFuelLeft = this.fuelRemaining;
-
-        // Fuel Usage Formatting
-        if (tempFuelLeft <= (this.maximumFuel / 3)) {
-            formattedFuelLeft = EnumChatFormatting.RED + tempFuel + EnumChatFormatting.GRAY;
-        } else if ((tempFuelLeft >= (this.maximumFuel / 3)) && (tempFuelLeft <= ((this.maximumFuel / 3) * 2))) {
-            formattedFuelLeft = EnumChatFormatting.YELLOW + tempFuel + EnumChatFormatting.GRAY;
-        } else if ((tempFuelLeft >= ((this.maximumFuel / 3) * 2)) && (tempFuelLeft <= this.maximumFuel)) {
-            formattedFuelLeft = EnumChatFormatting.GREEN + tempFuel + EnumChatFormatting.GRAY;
-        } else {
-            formattedFuelLeft = EnumChatFormatting.GRAY + tempFuel + EnumChatFormatting.GRAY;
-        }
-
-        // Heat Formatting
-        if ((tempCurrentHeat <= 200) && (tempCurrentHeat >= 0)) {
-            formattedHeat = EnumChatFormatting.GRAY + tempHeat + EnumChatFormatting.GRAY;
-        } else if ((tempCurrentHeat <= (this.maxHeat / 3)) && (tempCurrentHeat > 200)) {
-            formattedHeat = EnumChatFormatting.YELLOW + tempHeat + EnumChatFormatting.GRAY;
-        } else if ((tempCurrentHeat >= (this.maxHeat / 3)) && (tempMax < ((this.maxHeat / 3) * 2))
-                && (tempCurrentHeat != 0)) {
-                    formattedHeat = EnumChatFormatting.GOLD + tempHeat + EnumChatFormatting.GRAY;
-                } else
-            if ((tempCurrentHeat >= ((this.maxHeat / 3) * 2)) && (tempMax <= this.maxHeat) && (tempCurrentHeat != 0)) {
-                formattedHeat = EnumChatFormatting.RED + tempHeat + EnumChatFormatting.GRAY;
-            } else {
-                formattedHeat = EnumChatFormatting.BLUE + tempHeat + EnumChatFormatting.GRAY;
-            }
-        list.add(EnumChatFormatting.GRAY + "A " + formattedType + " Fuel Rod.");
-        list.add(EnumChatFormatting.GRAY + "Running at " + formattedHeat + "/" + formattedMaxHeat + " Kelvin.");
-        list.add(EnumChatFormatting.GRAY + "Fuel Remaining: " + formattedFuelLeft + "L.");
-        super.addInformation(stack, aPlayer, list, bool);
-    }
-
-    public String getType(final ItemStack stack) {
-        if (stack.stackTagCompound != null) {
-            return stack.stackTagCompound.getString("fuelType");
-        }
-        return this.fuelType;
-    }
-
-    public int getFuelRemaining(final ItemStack stack) {
-        if (stack.stackTagCompound != null) {
-            return stack.stackTagCompound.getInteger("fuelRemaining");
-        }
-        return 0;
-    }
-
-    public int getMaxFuel() {
-        return this.maximumFuel;
-    }
-
-    public int getFuel(final ItemStack stack) {
-        if (stack != null) {
-            final int i = stack.getItemDamage();
-            final int r = this.maximumFuel - i;
-            return r;
-        }
-        return 0;
-    }
-
-    public boolean setFuelRemainingExplicitly(final int i) {
-        final int tempFuel = this.fuelRemaining;
-        this.fuelRemaining = i;
-        if (i != tempFuel) {
-            return true;
-        }
-        return false;
-    }
-
-    public boolean addFuel(final int i) {
-        final int tempFuel = this.fuelRemaining;
-        this.fuelRemaining = tempFuel + i;
-        if (this.fuelRemaining != tempFuel) {
-            return true;
-        }
-        return false;
-    }
-
-    public float getHeat(final ItemStack value) {
-        if (value.stackTagCompound != null) {
-            return value.stackTagCompound.getFloat("heat");
-        }
-        return 0f;
-    }
-
-    public boolean addHeat(final float i) {
-        final float tempFuel = this.heat;
-        this.heat = tempFuel + i;
-        if (this.heat != tempFuel) {
-            return true;
-        }
-        return false;
-    }
-
-    // Ticking and NBT Handling
-    /*
-     * Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and
-     * update it's contents. public int fuelRemaining = 0; public int maximumFuel = 0; public String fuelType = "";
-     * public float heat = 0; public float maxHeat = 5000;
-     */
-    @Override
-    public void onCreated(final ItemStack itemStack, final World world, final EntityPlayer player) {
-        itemStack.stackTagCompound = new NBTTagCompound();
-        itemStack.stackTagCompound.setInteger("fuelRemaining", this.getFuelRemaining(itemStack));
-        itemStack.stackTagCompound.setInteger("maximumFuel", this.maximumFuel);
-        itemStack.stackTagCompound.setFloat("heat", this.getHeat(itemStack));
-        itemStack.stackTagCompound.setFloat("maxHeat", this.getMaxHeat());
-        itemStack.stackTagCompound.setString("fuelType", this.getType(itemStack));
-        this.updateVars(itemStack);
-    }
-
-    @Override
-    public void onUpdate(final ItemStack itemStack, final World par2World, final Entity par3Entity, final int par4,
-            final boolean par5) {
-        itemStack.stackTagCompound = new NBTTagCompound();
-        itemStack.stackTagCompound.setInteger("fuelRemaining", this.getFuelRemaining(itemStack));
-        itemStack.stackTagCompound.setInteger("maximumFuel", this.maximumFuel);
-        itemStack.stackTagCompound.setFloat("heat", this.getHeat(itemStack));
-        itemStack.stackTagCompound.setFloat("maxHeat", this.getMaxHeat());
-        itemStack.stackTagCompound.setString("fuelType", this.getType(itemStack));
-        this.updateVars(itemStack);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java b/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java
deleted file mode 100644
index 4b25d0ae8b..0000000000
--- a/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package gtPlusPlus.core.item.general.fuelrods;
-
-public class FuelRod_Thorium extends FuelRod_Base {
-
-    public FuelRod_Thorium(final String unlocalizedName, final String type, final int fuelLeft, final int maxFuel) {
-        super(unlocalizedName, type, fuelLeft, maxFuel);
-        this.setMaxDamage(maxFuel);
-        this.maximumFuel = maxFuel;
-        this.fuelRemaining = fuelLeft;
-        this.fuelType = type;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java b/src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java
deleted file mode 100644
index 90dc554165..0000000000
--- a/src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package gtPlusPlus.core.item.general.rfchargingpack;
-
-import java.util.List;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-
-import cofh.api.energy.ItemEnergyContainer;
-import gtPlusPlus.core.util.math.MathUtils;
-
-public class ChargingPackBase extends ItemEnergyContainer {
-
-    protected final int mCapacityMax;
-    protected final byte mTier;
-
-    public ChargingPackBase(byte tier) {
-        this(
-                tier,
-                (tier == 1 ? 4000000 : tier == 2 ? 8000000 : tier == 3 ? 16000000 : tier == 4 ? 32000000 : 64000000));
-    }
-
-    private ChargingPackBase(byte tier, int maxStorage) {
-        super(maxStorage);
-        mTier = tier;
-        mCapacityMax = maxStorage;
-    }
-
-    public int getMaxEnergyInput(ItemStack container) {
-        return this.maxReceive;
-    }
-
-    public int getMaxEnergyExtracted(ItemStack container) {
-        return this.maxExtract;
-    }
-
-    @Override
-    public void onUpdate(ItemStack aStack, World aWorld, Entity aEnt, int p_77663_4_, boolean p_77663_5_) {
-        super.onUpdate(aStack, aWorld, aEnt, p_77663_4_, p_77663_5_);
-
-        ItemEnergyContainer current = this;
-        int currentStored = 0;
-        if (current != null) {
-            currentStored = current.getEnergyStored(aStack);
-        }
-        if (currentStored > 0) {
-            if (aEnt instanceof EntityPlayer) {
-                if (((EntityPlayer) aEnt).inventory != null) {
-                    for (ItemStack invStack : ((EntityPlayer) aEnt).inventory.mainInventory) {
-                        if (invStack != null) {
-                            if (invStack.getItem() instanceof ItemEnergyContainer) {
-                                if (current != null) {
-                                    currentStored = current.getEnergyStored(aStack);
-                                    if (currentStored > 0) {
-                                        int mTransLimit;
-                                        int mMaxStorage;
-                                        int mCurrent;
-                                        mTransLimit = getMaxEnergyInput(invStack);
-                                        mMaxStorage = current.getMaxEnergyStored(invStack);
-                                        mCurrent = current.getEnergyStored(invStack);
-                                        if (mCurrent + mTransLimit <= mMaxStorage) {
-                                            current.extractEnergy(
-                                                    aStack,
-                                                    current.receiveEnergy(invStack, mTransLimit, false),
-                                                    false);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public void addInformation(ItemStack stack, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) {
-        list.add(EnumChatFormatting.RED + "RF Information");
-        list.add(
-                EnumChatFormatting.GRAY + "Extraction Rate: ["
-                        + EnumChatFormatting.RED
-                        + this.maxExtract
-                        + EnumChatFormatting.GRAY
-                        + "Rf/t]"
-                        + " Insert Rate: ["
-                        + EnumChatFormatting.RED
-                        + this.maxReceive
-                        + EnumChatFormatting.GRAY
-                        + "Rf/t]");
-        list.add(
-                EnumChatFormatting.GRAY + "Current Charge: ["
-                        + EnumChatFormatting.RED
-                        + this.getEnergyStored(stack)
-                        + EnumChatFormatting.GRAY
-                        + "Rf / "
-                        + this.getMaxEnergyStored(stack)
-                        + "Rf] "
-                        + EnumChatFormatting.RED
-                        + MathUtils.findPercentage(this.getEnergyStored(stack), this.getMaxEnergyStored(stack))
-                        + EnumChatFormatting.GRAY
-                        + "%");
-        super.addInformation(stack, p_77624_2_, list, p_77624_4_);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java b/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java
deleted file mode 100644
index e8e4807747..0000000000
--- a/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package gtPlusPlus.core.item.init;
-
-import gregtech.api.enums.Materials;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-
-public class ItemsMultiTools {
-
-    public static void load() {
-        run();
-    }
-
-    private static void run() {
-
-        // Load Multitools
-        if (CORE.ConfigSwitches.enableMultiSizeTools) {
-
-            // GT Materials
-            final Materials[] rm = Materials.values();
-            for (final Materials m : rm) {
-                toolFactoryGT(m);
-            }
-
-            // GT++ Materials
-            toolFactory(ALLOY.HASTELLOY_C276);
-            toolFactory(ALLOY.HASTELLOY_N);
-            toolFactory(ALLOY.HASTELLOY_W);
-            toolFactory(ALLOY.HASTELLOY_X);
-            toolFactory(ALLOY.INCOLOY_020);
-            toolFactory(ALLOY.INCOLOY_DS);
-            toolFactory(ALLOY.INCOLOY_MA956);
-            toolFactory(ALLOY.INCONEL_625);
-            toolFactory(ALLOY.INCONEL_690);
-            toolFactory(ALLOY.INCONEL_792);
-            toolFactory(ALLOY.LEAGRISIUM);
-            toolFactory(ALLOY.TANTALLOY_60);
-            toolFactory(ALLOY.TANTALLOY_61);
-            toolFactory(ALLOY.STABALLOY);
-            toolFactory(ALLOY.QUANTUM);
-            // toolFactory(ALLOY.BEDROCKIUM);
-            toolFactory(ALLOY.POTIN);
-            toolFactory(ALLOY.TUMBAGA);
-            toolFactory(ALLOY.TALONITE);
-            toolFactory(ALLOY.STELLITE);
-            toolFactory(ALLOY.TUNGSTEN_CARBIDE);
-            toolFactory(ALLOY.TANTALUM_CARBIDE);
-        }
-    }
-
-    private static boolean toolFactoryGT(final Materials m) {
-        ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(true, m);
-        ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(true, m);
-        return true;
-    }
-
-    private static boolean toolFactory(final Material m) {
-        Logger.WARNING("Generating Multi-Tools for " + m.getLocalizedName());
-        ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(m);
-        ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(m);
-        return true;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/materials/MaterialHandler.java b/src/main/java/gtPlusPlus/core/item/materials/MaterialHandler.java
deleted file mode 100644
index 74c9115c3b..0000000000
--- a/src/main/java/gtPlusPlus/core/item/materials/MaterialHandler.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package gtPlusPlus.core.item.materials;
-
-public class MaterialHandler {
-
-    @SuppressWarnings("unused")
-    private String Staballoy;
-}
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java b/src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java
deleted file mode 100644
index 95dc7822c2..0000000000
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package gtPlusPlus.core.item.tool.misc;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.BaseItemWithDamageValue;
-
-public class ConnectedBlockFinder extends BaseItemWithDamageValue {
-
-    public ConnectedBlockFinder() {
-        super("item.test.connector");
-        this.setTextureName("stick");
-        this.setMaxStackSize(1);
-        this.setMaxDamage(10000);
-        setCreativeTab(AddToCreativeTab.tabTools);
-        GameRegistry.registerItem(this, getUnlocalizedName());
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Override
-    public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-        list.add(EnumChatFormatting.GRAY + "Finds connected blocks, turns them to Glass once found.");
-        super.addInformation(stack, aPlayer, list, bool);
-    }
-
-    @Override
-    public boolean doesContainerItemLeaveCraftingGrid(final ItemStack itemStack) {
-        return false;
-    }
-
-    @Override
-    public boolean getShareTag() {
-        return true;
-    }
-
-    @Override
-    public boolean hasContainerItem(final ItemStack itemStack) {
-        return true;
-    }
-
-    @Override
-    public ItemStack getContainerItem(final ItemStack itemStack) {
-        return itemStack;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public EnumRarity getRarity(final ItemStack par1ItemStack) {
-        return EnumRarity.uncommon;
-    }
-
-    @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
-        return false;
-    }
-
-    @Override
-    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
-            float hitX, float hitY, float hitZ) {
-
-        BlockPos mStartPoint = new BlockPos(x, y, z, world);
-        Block mBlockType = world.getBlock(x, y, z);
-        int mBlockMeta = mBlockType.getDamageValue(world, x, y, z);
-
-        // Return if Air.
-        if (world.isAirBlock(x, y, z)) {
-            return false;
-        }
-
-        int breaker = 0;
-        Set<BlockPos> mTotalIndex = new HashSet<BlockPos>();
-
-        Set<BlockPos> mFirstSearch = new HashSet<BlockPos>();
-        Set<BlockPos> mSearch_A = new HashSet<BlockPos>();
-
-        Set<BlockPos> mSearch_B = new HashSet<BlockPos>();
-        Set<BlockPos> mSearch_C = new HashSet<BlockPos>();
-        Set<BlockPos> mSearch_D = new HashSet<BlockPos>();
-
-        mFirstSearch.add(mStartPoint);
-        mTotalIndex.add(mStartPoint);
-
-        for (BlockPos G : mSearch_D) {
-            if (!world.isAirBlock(G.xPos, G.yPos, G.zPos)) {
-                world.setBlock(G.xPos, G.yPos, G.zPos, Blocks.diamond_ore);
-            }
-        }
-
-        return super.onItemUse(stack, player, world, x, y, z, side, hitX, hitY, hitZ);
-    }
-
-    public Set<BlockPos> getValidNeighboursForSet(Set<BlockPos> set) {
-        Set<BlockPos> results = set;
-        for (BlockPos F : set) {
-            results.addAll(F.getValidNeighboursAndSelf());
-        }
-        return results;
-    }
-
-    public Set<BlockPos> getExtraNeighboursForSet(Set<BlockPos> set) {
-        Set<BlockPos> results = set;
-        for (BlockPos F : set) {
-            results.addAll(F.getValidNeighboursAndSelf());
-        }
-        return results;
-    }
-
-    @Override
-    public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
-        // TODO Auto-generated method stub
-        return super.onItemRightClick(p_77659_1_, p_77659_2_, p_77659_3_);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java b/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java
deleted file mode 100644
index 3c7a131a1e..0000000000
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package gtPlusPlus.core.item.tool.misc;
-
-import static gregtech.api.enums.Mods.GregTech;
-
-import java.util.List;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-import gregtech.api.enums.Materials;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.CoreItem;
-import gtPlusPlus.core.util.Utils;
-
-public class FakeGregtechTool extends CoreItem {
-
-    public final int componentColour;
-    public Object extraData;
-
-    protected IIcon base[] = new IIcon[6];
-    protected IIcon overlay[] = new IIcon[6];
-
-    public FakeGregtechTool() {
-        super("GregeriousT's Display Tool", AddToCreativeTab.tabTools, 1);
-        short[] tempCol = Materials.TungstenSteel.getRGBA();
-        this.componentColour = Utils.rgbtoHexValue(tempCol[0], tempCol[1], tempCol[2]);
-    }
-
-    @Override
-    public void registerIcons(final IIconRegister i) {
-        // ScrewDriver
-        this.base[0] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadScrewdriver");
-        this.overlay[0] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "HANDLE_SCREWDRIVER");
-        // Soldering iron
-        this.base[1] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadSoldering");
-        this.overlay[1] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "HANDLE_SOLDERING");
-        // Mallet
-        this.base[2] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "handleMallet");
-        this.overlay[2] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadMallet");
-        // Hammer
-        this.base[3] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "stick");
-        this.overlay[3] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadHammer");
-        // Wrench
-        this.base[4] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "WRENCH");
-        this.overlay[4] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "WRENCH_OVERLAY");
-        // Crowbar
-        this.base[5] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "CROWBAR");
-        this.overlay[5] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "CROWBAR_OVERLAY");
-    }
-
-    @Override
-    public int getColorFromItemStack(final ItemStack stack, final int renderPass) {
-        if (renderPass == 1) {
-            return Utils.rgbtoHexValue(230, 230, 230);
-        }
-        return this.componentColour;
-    }
-
-    @Override
-    public boolean requiresMultipleRenderPasses() {
-        return true;
-    }
-
-    @Override
-    public void getSubItems(Item item, CreativeTabs tab, List list) {
-        for (int i = 0; i < 6; i++) {
-            list.add(new ItemStack(item, 1, i));
-        }
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourBoots.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourBoots.java
deleted file mode 100644
index 5191f9393c..0000000000
--- a/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourBoots.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package gtPlusPlus.core.item.wearable.armour.base;
-
-public abstract class BaseArmourBoots extends BaseArmour {
-
-    public BaseArmourBoots(ArmorMaterial material, int renderIndex) {
-        super(material, renderIndex, 3);
-        // TODO Auto-generated constructor stub
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourChest.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourChest.java
deleted file mode 100644
index eb55637ee4..0000000000
--- a/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourChest.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package gtPlusPlus.core.item.wearable.armour.base;
-
-public abstract class BaseArmourChest extends BaseArmour {
-
-    public BaseArmourChest(ArmorMaterial material, int renderIndex) {
-        super(material, renderIndex, 1);
-        // TODO Auto-generated constructor stub
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourLegs.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourLegs.java
deleted file mode 100644
index b376610427..0000000000
--- a/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourLegs.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package gtPlusPlus.core.item.wearable.armour.base;
-
-public abstract class BaseArmourLegs extends BaseArmour {
-
-    public BaseArmourLegs(ArmorMaterial material, int renderIndex) {
-        super(material, renderIndex, 2);
-        // TODO Auto-generated constructor stub
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java
deleted file mode 100644
index f3972fb400..0000000000
--- a/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package gtPlusPlus.core.item.wearable.armour.hazmat;
-
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import java.util.List;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.item.wearable.armour.ArmourLoader;
-import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm;
-
-public class ArmourHazmat extends BaseArmourHelm {
-
-    public IIcon iconHelm;
-
-    public ArmourHazmat() {
-        super(ArmourLoader.TinFoilArmour, 0);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerIcons(IIconRegister ir) {
-        this.iconHelm = ir.registerIcon(GTPlusPlus.ID + ":itemHatTinFoil");
-    }
-
-    @Override
-    public int getRenderIndex() {
-        return 0;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public IIcon getIconFromDamage(int par1) {
-        return this.iconHelm;
-    }
-
-    @Override
-    public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
-        return GTPlusPlus.ID + ":textures/models/TinFoil.png";
-    }
-
-    @Override
-    public EnumRarity getRarity(ItemStack itemstack) {
-        return EnumRarity.rare;
-    }
-
-    @Override
-    public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-        return false;
-    }
-
-    @Override
-    public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
-        return super.getArmorDisplay(player, armor, slot);
-    }
-
-    @Override
-    public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {}
-
-    @SuppressWarnings({ "unchecked" })
-    @Override
-    public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) {
-        aList.add("DoomSquirter's protection against cosmic radiation!");
-        aList.add("General paranoia makes the wearer unable to collect xp");
-        aList.add("Movement speed is also reduced, to keep you safe");
-        aList.add("This hat may also have other strange powers");
-    }
-
-    @Override
-    public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
-            int slot) {
-        return new ArmorProperties(0, 0, 0);
-    }
-
-    @Override
-    public boolean isDamageable() {
-        return false;
-    }
-
-    @Override
-    public boolean itemInteractionForEntity(ItemStack p_111207_1_, EntityPlayer p_111207_2_,
-            EntityLivingBase p_111207_3_) {
-        return super.itemInteractionForEntity(p_111207_1_, p_111207_2_, p_111207_3_);
-    }
-
-    @Override
-    public void onUpdate(ItemStack aStack, World aWorld, Entity aEntity, int p_77663_4_, boolean p_77663_5_) {
-        super.onUpdate(aStack, aWorld, aEntity, p_77663_4_, p_77663_5_);
-    }
-
-    @Override
-    public boolean onEntityItemUpdate(EntityItem entityItem) {
-        return super.onEntityItemUpdate(entityItem);
-    }
-
-    @Override
-    public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
-        if (itemStack != null && player != null && world != null && !world.isRemote) {
-            if (player instanceof EntityPlayer) {}
-        }
-        super.onArmorTick(world, player, itemStack);
-    }
-
-    @Override
-    public boolean showDurabilityBar(ItemStack stack) {
-        return false;
-    }
-}