Merge pull request #76 from GTNewHorizons/cleanup/unused-stuff

Cleanup unused stuff

2 files changed, 3 insertions, 73 deletions

diff --git a/src/main/java/kekztech/GuiHandler.java b/src/main/java/kekztech/GuiHandler.java
deleted file mode 100644
index 9708b89d24..0000000000
--- a/src/main/java/kekztech/GuiHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package kekztech;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-import common.container.Container_ItemProxyEndpoint;
-import common.container.Container_ItemProxySource;
-
-import client.gui.Gui_ItemProxyEndpoint;
-import client.gui.Gui_ItemProxySource;
-import cpw.mods.fml.common.network.IGuiHandler;
-
-public class GuiHandler implements IGuiHandler {
-
-    public static final int ITEM_PROXY_SOURCE = 0;
-    public static final int ITEM_PROXY_ENDPOINT = 1;
-
-    @Override
-    public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
-        final TileEntity te = world.getTileEntity(x, y, z);
-        if (te != null) {
-            switch (ID) {
-                case ITEM_PROXY_SOURCE:
-                    return new Container_ItemProxySource(te, player);
-                case ITEM_PROXY_ENDPOINT:
-                    return new Container_ItemProxyEndpoint(te, player);
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
-        final TileEntity te = world.getTileEntity(x, y, z);
-        if (te != null) {
-            switch (ID) {
-                case ITEM_PROXY_SOURCE:
-                    return new Gui_ItemProxySource(te, player);
-                case ITEM_PROXY_ENDPOINT:
-                    return new Gui_ItemProxyEndpoint(te, player);
-            }
-        }
-        return null;
-    }
-}
diff --git a/src/main/java/kekztech/Items.java b/src/main/java/kekztech/Items.java
index e1243820b4..747f8c903f 100644
--- a/src/main/java/kekztech/Items.java
+++ b/src/main/java/kekztech/Items.java
@@ -6,31 +6,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import common.items.MetaItem_CraftingComponent;
-import common.items.MetaItem_ReactorComponent;
 
 import util.Util;
 
 public enum Items {
 
-    /*
-     * // Heat Vents T1HeatVent(0,0), T2HeatVent(1,0), T3HeatVent(2,0), T4HeatVent(3,0), T1ComponentHeatVent(4,0),
-     * T2ComponentHeatVent(5,0), T3ComponentHeatVent(6,0), T4ComponentHeatVent(7,0), T1OverclockedHeatVent(8,0),
-     * T2OverclockedHeatVent(9,0), T3OverclockedHeatVent(10,0), T4OverclockedHeatVent(11,0), // Heat Exchanger
-     * T1HeatExchanger(12,0), T2HeatExchanger(13,0), T3HeatExchanger(14,0), T4HeatExchanger(15,0), // Fuel Rods
-     * UraniumFuelRod(16,0), UraniumDualFuelRod(17,0), UraniumQuadFuelRod(18,0), ThoriumFuelRod(19,0),
-     * ThoriumDualFuelRod(20,0), ThoriumQuadFuelRod(21,0), MOXFuelRod(22,0), MOXDualFuelRod(23,0), MOXQuadFuelRod(24,0),
-     * NaquadahFuelRod(25,0), NaquadahDualFuelRod(26,0), NaquadahQuadFuelRod(27,0), Th_MOXFuelRod(28,0),
-     * Th_MOXDualFuelRod(29,0), Th_MOXQuadFuelRod(30,0), // Depleted Fuel Rods DepletedUraniumFuelRod(31,0),
-     * DepletedUraniumDualFuelRod(32,0), DepletedUraniumQuadFuelRod(33,0), DepletedThoriumFuelRod(34,0),
-     * DepletedThoriumDualFuelRod(35,0), DepletedThoriumQuadFuelRod(36,0), DepletedMOXFuelRod(37,0),
-     * DepletedMOXDualFuelRod(38,0), DepletedMOXQuadFuelRod(39,0), DepletedNaquadahFuelRod(40,0),
-     * DepletedNaquadahDualFuelRod(41,0), DepletedNaquadahQuadFuelRod(42,0), Th_DepletedMOXFuelRod(43,0),
-     * Th_DepletedMOXDualFuelRod(44,0), Th_DepletedMOXQuadFuelRod(45,0), // Neutron Reflectors T1NeutronReflector(46,0),
-     * T2NeutronReflector(47,0), // Coolant Cells HeliumCoolantCell360k(48,0), NaKCoolantCell360k(49,0), // Heat Pipes
-     * CopperHeatPipe(0,1), SilverHeatPipe(1,1), BoronArsenideHeatPipe(2,1), DiamondHeatPipe(3,1),
-     * BoronArsenideDust(4,1), IsotopicallyPureDiamondDust(5,1), AmineCarbamiteDust(6,1), BoronArsenideCrystal(7,1),
-     * IsotopicallyPureDiamondCrystal(8,1),
-     */
     // Ceramics
     YSZCeramicDust(9, 1),
     GDCCeramicDust(10, 1),
@@ -40,9 +20,7 @@ public enum Items {
     YSZCeramicPlate(14, 1),
     GDCCeramicPlate(15, 1),
     // Error Item
-    Error(0, 1),
-    // Configurator
-    Configurator(0, 1);
+    Error(0, 1);
 
     static {
         YttriaDust.setOreDictName("dustYttriumOxide");
@@ -72,14 +50,12 @@ public enum Items {
     }
 
     public ItemStack getNonOreDictedItemStack(int amount) {
-        return identifier == 0 ? new ItemStack(MetaItem_ReactorComponent.getInstance(), amount, this.getMetaID())
-                : new ItemStack(MetaItem_CraftingComponent.getInstance(), amount, this.getMetaID());
+        return new ItemStack(MetaItem_CraftingComponent.getInstance(), amount, this.getMetaID());
     }
 
     public ItemStack getOreDictedItemStack(int amount) {
         return this.getOreDictName() != null ? Util.getStackofAmountFromOreDict(this.getOreDictName(), amount)
-                : identifier == 0 ? new ItemStack(MetaItem_ReactorComponent.getInstance(), amount, this.getMetaID())
-                        : new ItemStack(MetaItem_CraftingComponent.getInstance(), amount, this.getMetaID());
+                : new ItemStack(MetaItem_CraftingComponent.getInstance(), amount, this.getMetaID());
     }
 
     public String getOreDictName() {