Remove a lot of unused classes (#629)

29 files changed, 0 insertions, 3279 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java
deleted file mode 100644
index 78b5cced08..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.energy;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-/**
- * Provides the ability to store energy on the implementing item.
- *
- * The item should have a maximum damage of 13.
- */
-public interface IC2ElectricItem {
-
-    /**
-     * Determine if the item can be used in a machine or as an armor part to supply energy.
-     *
-     * @return Whether the item can supply energy
-     */
-    boolean canProvideEnergy(ItemStack itemStack);
-
-    /**
-     * Get the item ID to use for a charge energy greater than 0.
-     *
-     * @return Item ID to use
-     */
-    Item getChargedItem(ItemStack itemStack);
-
-    /**
-     * Get the item ID to use for a charge energy of 0.
-     *
-     * @return Item ID to use
-     */
-    Item getEmptyItem(ItemStack itemStack);
-
-    /**
-     * Get the item's maximum charge energy in EU.
-     *
-     * @return Maximum charge energy
-     */
-    double getMaxCharge(ItemStack itemStack);
-
-    /**
-     * Get the item's tier, lower tiers can't send energy to higher ones. Batteries are Tier 1, Energy Crystals are Tier
-     * 2, Lapotron Crystals are Tier 3.
-     *
-     * @return Item's tier
-     */
-    int getTier(ItemStack itemStack);
-
-    /**
-     * Get the item's transfer limit in EU per transfer operation.
-     *
-     * @return Transfer limit
-     */
-    double getTransferLimit(ItemStack itemStack);
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java
deleted file mode 100644
index 007d66de66..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.energy;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-
-/**
- * This interface specifies a manager to handle the various tasks for electric items.
- *
- * The default implementation does the following: - store and retrieve the charge - handle charging, taking amount,
- * tier, transfer limit, canProvideEnergy and simulate into account - replace item IDs if appropriate
- * (getChargedItemId() and getEmptyItemId()) - update and manage the damage value for the visual charge indicator
- *
- * @note If you're implementing your own variant (ISpecialElectricItem), you can delegate to the default implementations
- *       through ElectricItem.rawManager. The default implementation is designed to minimize its dependency on its own
- *       constraints/structure and delegates most work back to the more atomic features in the gateway manager.
- */
-public interface IC2ElectricItemManager {
-
-    /**
-     * Charge an item with a specified amount of energy.
-     *
-     * @param itemStack           electric item's stack
-     * @param amount              amount of energy to charge in EU
-     * @param tier                tier of the charging device, has to be at least as high as the item to charge
-     * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit()
-     * @param simulate            don't actually change the item, just determine the return value
-     * @return Energy transferred into the electric item
-     */
-    double charge(ItemStack stack, double amount, int tier, boolean ignoreTransferLimit, boolean simulate);
-
-    /**
-     * Discharge an item by a specified amount of energy
-     *
-     * @param itemStack           electric item's stack
-     * @param amount              amount of energy to discharge in EU
-     * @param tier                tier of the discharging device, has to be at least as high as the item to discharge
-     * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit()
-     * @param externally          use the supplied item externally, i.e. to power something else as if it was a battery
-     * @param simulate            don't actually discharge the item, just determine the return value
-     * @return Energy retrieved from the electric item
-     */
-    double discharge(ItemStack stack, double amount, int tier, boolean ignoreTransferLimit, boolean externally,
-            boolean simulate);
-
-    /**
-     * Determine the charge level for the specified item.
-     *
-     * @param itemStack ItemStack containing the electric item
-     * @return charge level in EU
-     */
-    double getCharge(ItemStack stack);
-
-    /**
-     * Determine if the specified electric item has at least a specific amount of EU. This is supposed to be used in the
-     * item code during operation, for example if you want to implement your own electric item. BatPacks are not taken
-     * into account.
-     *
-     * @param itemStack electric item's stack
-     * @param amount    minimum amount of energy required
-     * @return true if there's enough energy
-     */
-    boolean canUse(ItemStack stack, double amount);
-
-    /**
-     * Try to retrieve a specific amount of energy from an Item, and if applicable, a BatPack. This is supposed to be
-     * used in the item code during operation, for example if you want to implement your own electric item.
-     *
-     * @param itemStack electric item's stack
-     * @param amount    amount of energy to discharge in EU
-     * @param entity    entity holding the item
-     * @return true if the operation succeeded
-     */
-    boolean use(ItemStack stack, double amount, EntityLivingBase entity);
-
-    /**
-     * Charge an item from the BatPack a player is wearing. This is supposed to be used in the item code during
-     * operation, for example if you want to implement your own electric item. use() already contains this
-     * functionality.
-     *
-     * @param itemStack electric item's stack
-     * @param entity    entity holding the item
-     */
-    void chargeFromArmor(ItemStack stack, EntityLivingBase entity);
-
-    /**
-     * Get the tool tip to display for electric items.
-     *
-     * @param itemStack ItemStack to determine the tooltip for
-     * @return tool tip string or null for none
-     */
-    String getToolTip(ItemStack stack);
-
-    // TODO: add tier getter
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
deleted file mode 100644
index 74c9d9ee5b..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.enums;
-
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.ResourceLocation;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_RenderedTexture;
-import gtPlusPlus.core.lib.CORE;
-
-public class CustomGtTextures {
-
-    public enum ItemIcons implements IIconContainer, Runnable {
-
-        VOID, // The Empty Texture
-        RENDERING_ERROR,
-        PUMP,
-        SKOOKUMCHOOCHER;
-
-        public static final ITexture[] ERROR_RENDERING = new ITexture[] { new GT_RenderedTexture(RENDERING_ERROR) };
-
-        protected IIcon mIcon, mOverlay;
-
-        private ItemIcons() {
-            GregTech_API.sGTItemIconload.add(this);
-        }
-
-        @Override
-        public IIcon getIcon() {
-            return this.mIcon;
-        }
-
-        @Override
-        public IIcon getOverlayIcon() {
-            return this.mOverlay;
-        }
-
-        @Override
-        public ResourceLocation getTextureFile() {
-            return TextureMap.locationItemsTexture;
-        }
-
-        @Override
-        public void run() {
-            this.mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this);
-            this.mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this + "_OVERLAY");
-        }
-
-        public static class CustomIcon implements IIconContainer, Runnable {
-
-            protected IIcon mIcon, mOverlay;
-            protected String mIconName;
-
-            public CustomIcon(final String aIconName) {
-                this.mIconName = aIconName;
-                GregTech_API.sGTItemIconload.add(this);
-            }
-
-            @Override
-            public IIcon getIcon() {
-                return this.mIcon;
-            }
-
-            @Override
-            public IIcon getOverlayIcon() {
-                return this.mOverlay;
-            }
-
-            @Override
-            public void run() {
-                this.mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + this.mIconName);
-                this.mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + this.mIconName + "_OVERLAY");
-            }
-
-            @Override
-            public ResourceLocation getTextureFile() {
-                return TextureMap.locationItemsTexture;
-            }
-        }
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java
deleted file mode 100644
index 87d85a578e..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.enums;
-
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.IIconContainer;
-
-public class GregtechTextureSet {
-
-    public static final GregtechTextureSet SET_NONE = new GregtechTextureSet("NONE"),
-            SET_DULL = new GregtechTextureSet("DULL"), SET_RUBY = new GregtechTextureSet("RUBY"),
-            SET_OPAL = new GregtechTextureSet("OPAL"), SET_LEAF = new GregtechTextureSet("LEAF"),
-            SET_WOOD = new GregtechTextureSet("WOOD"), SET_SAND = new GregtechTextureSet("SAND"),
-            SET_FINE = new GregtechTextureSet("FINE"), SET_FIERY = new GregtechTextureSet("FIERY"),
-            SET_FLUID = new GregtechTextureSet("FLUID"), SET_ROUGH = new GregtechTextureSet("ROUGH"),
-            SET_PAPER = new GregtechTextureSet("PAPER"), SET_GLASS = new GregtechTextureSet("GLASS"),
-            SET_FLINT = new GregtechTextureSet("FLINT"), SET_LAPIS = new GregtechTextureSet("LAPIS"),
-            SET_SHINY = new GregtechTextureSet("SHINY"), SET_SHARDS = new GregtechTextureSet("SHARDS"),
-            SET_POWDER = new GregtechTextureSet("POWDER"), SET_QUARTZ = new GregtechTextureSet("QUARTZ"),
-            SET_EMERALD = new GregtechTextureSet("EMERALD"), SET_DIAMOND = new GregtechTextureSet("DIAMOND"),
-            SET_LIGNITE = new GregtechTextureSet("LIGNITE"), SET_MAGNETIC = new GregtechTextureSet("MAGNETIC"),
-            SET_METALLIC = new GregtechTextureSet("METALLIC"), SET_NETHERSTAR = new GregtechTextureSet("NETHERSTAR"),
-            SET_GEM_VERTICAL = new GregtechTextureSet("GEM_VERTICAL"),
-            SET_GEM_HORIZONTAL = new GregtechTextureSet("GEM_HORIZONTAL");
-
-    public final IIconContainer[] mTextures = new IIconContainer[128];
-    public final String mSetName;
-
-    public GregtechTextureSet(final String aSetName) {
-        this.mSetName = aSetName;
-        this.mTextures[0] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/turbineBlade");
-        this.mTextures[1] = new Textures.ItemIcons.CustomIcon(
-                "materialicons/" + this.mSetName + "/toolHeadSkookumChoocher");
-        this.mTextures[2] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[3] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[4] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[5] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[6] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[7] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[8] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[9] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[10] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[11] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[12] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[13] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[14] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[15] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[16] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[17] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[18] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[19] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[20] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[21] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[22] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[23] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[24] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[25] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[26] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[27] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[28] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[29] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[30] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[31] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[32] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[33] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[34] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[35] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[36] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[37] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[38] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[39] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[40] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[41] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[42] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[43] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[44] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[45] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[46] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[47] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[48] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[49] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[50] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[51] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[52] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[53] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[54] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[55] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[56] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[57] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[58] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[59] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[60] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[61] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[62] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[63] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[64] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[65] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[66] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[67] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[68] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[69] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[70] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[71] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[72] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[73] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[74] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[75] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[76] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[77] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[78] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[79] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[80] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[81] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[82] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[83] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[84] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[85] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[86] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[87] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[88] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[89] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[90] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[91] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[92] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[93] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[94] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[95] = new Textures.BlockIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[96] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[97] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[98] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[99] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[100] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[101] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[102] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[103] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[104] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[105] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[106] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[107] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[108] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[109] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[110] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[111] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[112] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[113] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[114] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[115] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[116] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[117] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[118] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[119] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[120] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[121] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[122] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[123] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[124] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[125] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[126] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-        this.mTextures[127] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
deleted file mode 100644
index 1b9a88e230..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.enums;
-
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.ResourceLocation;
-
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_IconContainer;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_Texture;
-import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
-
-public class GregtechTextures {
-
-    public enum BlockIcons implements Interface_IconContainer, Runnable {
-
-        VOID,
-
-        LARGECENTRIFUGE1,
-        LARGECENTRIFUGE2,
-        LARGECENTRIFUGE3,
-        LARGECENTRIFUGE4,
-        LARGECENTRIFUGE5,
-        LARGECENTRIFUGE6,
-        LARGECENTRIFUGE7,
-        LARGECENTRIFUGE8,
-        LARGECENTRIFUGE9,
-        LARGECENTRIFUGE_ACTIVE1,
-        LARGECENTRIFUGE_ACTIVE2,
-        LARGECENTRIFUGE_ACTIVE3,
-        LARGECENTRIFUGE_ACTIVE4,
-        LARGECENTRIFUGE_ACTIVE5,
-        LARGECENTRIFUGE_ACTIVE6,
-        LARGECENTRIFUGE_ACTIVE7,
-        LARGECENTRIFUGE_ACTIVE8,
-        LARGECENTRIFUGE_ACTIVE9;
-
-        public static final Interface_IconContainer[] CENTRIFUGE = new Interface_IconContainer[] { LARGECENTRIFUGE1,
-                LARGECENTRIFUGE2, LARGECENTRIFUGE3, LARGECENTRIFUGE4, LARGECENTRIFUGE5, LARGECENTRIFUGE6,
-                LARGECENTRIFUGE7, LARGECENTRIFUGE8, LARGECENTRIFUGE9 },
-                CENTRIFUGE_ACTIVE = new Interface_IconContainer[] { LARGECENTRIFUGE_ACTIVE1, LARGECENTRIFUGE_ACTIVE2,
-                        LARGECENTRIFUGE_ACTIVE3, LARGECENTRIFUGE_ACTIVE4, LARGECENTRIFUGE_ACTIVE5,
-                        LARGECENTRIFUGE_ACTIVE6, LARGECENTRIFUGE_ACTIVE7, LARGECENTRIFUGE_ACTIVE8,
-                        LARGECENTRIFUGE_ACTIVE9 };
-
-        public static Interface_Texture[] GT_CASING_BLOCKS = new Interface_Texture[64];
-
-        protected IIcon mIcon;
-
-        private BlockIcons() {
-            Meta_GT_Proxy.GT_BlockIconload.add(this);
-        }
-
-        @Override
-        public IIcon getIcon() {
-            return this.mIcon;
-        }
-
-        @Override
-        public IIcon getOverlayIcon() {
-            return null;
-        }
-
-        @Override
-        public void run() {
-            this.mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(GTPlusPlus.ID + ":" + "iconsets/" + this);
-        }
-
-        @Override
-        public ResourceLocation getTextureFile() {
-            return TextureMap.locationBlocksTexture;
-        }
-
-        public static class CustomIcon implements Interface_IconContainer, Runnable {
-
-            protected IIcon mIcon;
-            protected String mIconName;
-
-            public CustomIcon(final String aIconName) {
-                this.mIconName = aIconName;
-                Meta_GT_Proxy.GT_BlockIconload.add(this);
-            }
-
-            @Override
-            public IIcon getIcon() {
-                return this.mIcon;
-            }
-
-            @Override
-            public IIcon getOverlayIcon() {
-                return null;
-            }
-
-            @Override
-            public void run() {
-                this.mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName);
-            }
-
-            @Override
-            public ResourceLocation getTextureFile() {
-                return TextureMap.locationBlocksTexture;
-            }
-        }
-    }
-
-    public enum ItemIcons implements Interface_IconContainer, Runnable {
-
-        VOID, // The Empty Texture
-        RENDERING_ERROR, // The Purple/Black Texture
-        SKOOKUMCHOOCHER, // The Skookum Tool Texture
-        PUMP, // The Hand Pump Texture
-        TURBINE_SMALL,
-        TURBINE_LARGE,
-        TURBINE_HUGE;
-
-        /*