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

Cleanup unused stuff

33 files changed, 1 insertions, 2169 deletions

diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java
index f43482b909..4003e8e9e4 100644
--- a/src/main/java/common/Blocks.java
+++ b/src/main/java/common/Blocks.java
@@ -17,15 +17,9 @@ public class Blocks {
     public static Block yszUnit;
     public static Block gdcUnit;
     public static Block tfftStorageField;
-    public static Block reactorChamberOFF;
-    public static Block reactorChamberON;
-    public static Block reactorControlRod;
     public static Block jarThaumiumReinforced;
     public static Block jarIchor;
     public static Block lscLapotronicEnergyUnit;
-    public static Block spaceElevatorStructure;
-    public static Block spaceElevatorCapacitor;
-    public static Block spaceElevatorTether;
 
     public static Block largeHexPlate;
 
diff --git a/src/main/java/common/CommonProxy.java b/src/main/java/common/CommonProxy.java
index 3af1fd1671..540e6ced89 100644
--- a/src/main/java/common/CommonProxy.java
+++ b/src/main/java/common/CommonProxy.java
@@ -2,24 +2,18 @@ package common;
 
 import common.items.ErrorItem;
 import common.items.MetaItem_CraftingComponent;
-import common.items.MetaItem_ReactorComponent;
 import common.tileentities.GTMTE_TFFTHatch;
 
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import gregtech.api.GregTech_API;
-import kekztech.GuiHandler;
 import kekztech.Items;
-import kekztech.KekzCore;
 
 public class CommonProxy {
 
     public void preInit(final FMLPreInitializationEvent e) {
         // Items
         ErrorItem.getInstance().registerItem();
-        MetaItem_ReactorComponent.getInstance().registerItem();
         MetaItem_CraftingComponent.getInstance().registerItem();
         Items.registerOreDictNames();
         // Blocks
@@ -28,8 +22,6 @@ public class CommonProxy {
         TileEntities.preInit();
         // TC Research
         Researches.preInit();
-        // GUI Handler
-        NetworkRegistry.INSTANCE.registerGuiHandler(KekzCore.instance, new GuiHandler());
     }
 
     public void init(final FMLInitializationEvent e) {
@@ -43,6 +35,6 @@ public class CommonProxy {
         // Research
         Researches.postInit();
 
-        if (GregTech_API.mAE2) GTMTE_TFFTHatch.registerAEIntegration();
+        GTMTE_TFFTHatch.registerAEIntegration();
     }
 }
diff --git a/src/main/java/common/TileEntities.java b/src/main/java/common/TileEntities.java
index 9ad4fdb99f..31246ac5d8 100644
--- a/src/main/java/common/TileEntities.java
+++ b/src/main/java/common/TileEntities.java
@@ -3,7 +3,6 @@ package common;
 import common.tileentities.GTMTE_LapotronicSuperCapacitor;
 import common.tileentities.GTMTE_SOFuelCellMK1;
 import common.tileentities.GTMTE_SOFuelCellMK2;
-import common.tileentities.GTMTE_SpaceElevator;
 import common.tileentities.GTMTE_TFFT;
 import common.tileentities.GTMTE_TFFTHatch;
 import common.tileentities.TE_IchorJar;
@@ -18,10 +17,8 @@ public class TileEntities {
     // Multiblock controllers
     public static GTMTE_SOFuelCellMK1 sofc1;
     public static GTMTE_SOFuelCellMK2 sofc2;
-    // public static GTMTE_ModularNuclearReactor mdr;
     public static GTMTE_TFFT tfft;
     public static GTMTE_LapotronicSuperCapacitor lsc;
-    public static GTMTE_SpaceElevator se;
 
     // Singleblocks
     public static GTMTE_TFFTHatch tfftHatch;
diff --git a/src/main/java/common/blocks/Block_BeamTransmitter.java b/src/main/java/common/blocks/Block_BeamTransmitter.java
deleted file mode 100644
index 48bedd3b7f..0000000000
--- a/src/main/java/common/blocks/Block_BeamTransmitter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package common.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-import common.tileentities.TE_BeamTransmitter;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-
-public class Block_BeamTransmitter extends Block {
-
-    private static final Block_BeamTransmitter INSTANCE = new Block_BeamTransmitter();
-
-    private Block_BeamTransmitter() {
-        super(Material.glass);
-    }
-
-    public static Block registerBlock() {
-        final String blockName = "kekztech_beamtransmitter_block";
-        INSTANCE.setBlockName(blockName);
-        INSTANCE.setCreativeTab(CreativeTabs.tabMisc);
-        INSTANCE.setHardness(5.0f);
-        INSTANCE.setResistance(5.0f);
-        INSTANCE.setBlockTextureName(KekzCore.MODID + ":" + "Tether_top");
-        GameRegistry.registerBlock(INSTANCE, blockName);
-
-        return INSTANCE;
-    }
-
-    @Override
-    public TileEntity createTileEntity(World world, int meta) {
-        return new TE_BeamTransmitter();
-    }
-
-    @Override
-    public boolean hasTileEntity(int meta) {
-        return true;
-    }
-
-    @Override
-    public boolean isOpaqueCube() {
-        return false;
-    }
-
-    @Override
-    public boolean renderAsNormalBlock() {
-        return false;
-    }
-}
diff --git a/src/main/java/common/blocks/Block_ControlRod.java b/src/main/java/common/blocks/Block_ControlRod.java
deleted file mode 100644
index 7c86c9910f..0000000000
--- a/src/main/java/common/blocks/Block_ControlRod.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package common.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-
-public class Block_ControlRod extends BaseGTUpdateableBlock {
-
-    private static final Block_ControlRod instance = new Block_ControlRod();
-
-    private Block_ControlRod() {
-        super(Material.iron);
-    }
-
-    public static Block registerBlock() {
-        final String blockName = "kekztech_controlrod_block";
-        instance.setBlockName(blockName);
-        instance.setCreativeTab(CreativeTabs.tabMisc);
-        instance.setBlockTextureName(KekzCore.MODID + ":" + "ControlRod");
-        instance.setHardness(5.0f);
-        instance.setResistance(6.0f);
-        GameRegistry.registerBlock(instance, blockName);
-
-        return instance;
-    }
-}
diff --git a/src/main/java/common/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java
deleted file mode 100644
index cf9307dde0..0000000000
--- a/src/main/java/common/blocks/Block_ItemProxyCable.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package common.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-import common.itemBlocks.IB_ItemProxyCable;
-import common.tileentities.TE_ItemProxyCable;
-
-import client.renderer.ConduitRenderer;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import kekztech.KekzCore;
-
-public class Block_ItemProxyCable extends Block {
-
-    private static final Block_ItemProxyCable instance = new Block_ItemProxyCable();
-
-    private Block_ItemProxyCable() {
-        super(Material.glass);
-    }
-
-    public static Block registerBlock() {
-        final String blockName = "kekztech_itemproxycable_block";
-        instance.setBlockName(blockName);
-        instance.setCreativeTab(CreativeTabs.tabMisc);
-        instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing");
-        instance.setHardness(3.0f);
-        instance.setResistance(2.0f);
-        GameRegistry.registerBlock(instance, IB_ItemProxyCable.class, blockName);
-
-        return instance;
-    }
-
-    @Override
-    public boolean isOpaqueCube() {
-        return false;
-    }
-
-    @Override
-    public TileEntity createTileEntity(World world, int p_149915_2_) {
-        return new TE_ItemProxyCable();
-    }
-
-    @Override
-    public boolean hasTileEntity(int metadata) {
-        return true;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public int getRenderBlockPass() {
-        return 1;
-    }
-
-    @Override
-    public int getRenderType() {
-        return ConduitRenderer.RID;
-    }
-
-    @Override
-    public boolean renderAsNormalBlock() {
-        return false;
-    }
-}
diff --git a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
deleted file mode 100644
index 5f60eba040..0000000000
--- a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package common.blocks;
-
-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.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-import common.itemBlocks.IB_ItemProxyEndpoint;
-import common.tileentities.TE_ItemProxyEndpoint;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.GuiHandler;
-import kekztech.KekzCore;
-
-public class Block_ItemProxyEndpoint extends Block {
-
-    private static final Block_ItemProxyEndpoint instance = new Block_ItemProxyEndpoint();
-
-    private Block_ItemProxyEndpoint() {
-        super(Material.glass);
-    }
-
-    public static Block registerBlock() {
-        final String blockName = "kekztech_itemproxyendpoint_block";
-        instance.setBlockName(blockName);
-        instance.setCreativeTab(CreativeTabs.tabMisc);
-        instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxyEndpoint");
-        instance.setHardness(3.0f);
-        instance.setResistance(2.0f);
-        instance.setHarvestLevel("wrench", 2);
-        GameRegistry.registerBlock(instance, IB_ItemProxyEndpoint.class, blockName);
-
-        return instance;
-    }
-
-    @Override
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly,
-            float lz) {
-        if (world.isRemote) {
-            return true;
-        }
-
-        final TileEntity te = world.getTileEntity(x, y, z);
-        if (te instanceof TE_ItemProxyEndpoint) {
-            player.openGui(KekzCore.instance, GuiHandler.ITEM_PROXY_ENDPOINT, world, x, y, z);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public TileEntity createTileEntity(World world, int p_149915_2_) {
-        return new TE_ItemProxyEndpoint();
-    }
-
-    @Override
-    public boolean hasTileEntity(int metadata) {
-        return true;
-    }
-}
diff --git a/src/main/java/common/blocks/Block_ItemProxySource.java b/src/main/java/common/blocks/Block_ItemProxySource.java
deleted file mode 100644
index 7ab34ade52..0000000000
--- a/src/main/java/common/blocks/Block_ItemProxySource.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package common.blocks;
-
-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.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-import common.itemBlocks.IB_ItemProxySource;
-import common.tileentities.TE_ItemProxySource;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.GuiHandler;
-import kekztech.KekzCore;
-
-public class Block_ItemProxySource extends Block {
-
-    private static final Block_ItemProxySource instance = new Block_ItemProxySource();
-
-    private Block_ItemProxySource() {
-        super(Material.glass);
-    }
-
-    public static Block registerBlock() {
-        final String blockName = "kekztech_itemproxysource_block";
-        instance.setBlockName(blockName);
-        instance.setCreativeTab(CreativeTabs.tabMisc);
-        instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxySource");
-        instance.setHardness(3.0f);
-        instance.setResistance(2.0f);
-        instance.setHarvestLevel("wrench", 2);
-        GameRegistry.registerBlock(instance, IB_ItemProxySource.class, blockName);
-
-        return instance;
-    }
-
-    @Override
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly,
-            float lz) {
-        if (world.isRemote) {
-            return true;
-        }
-
-        final TileEntity te = world.getTileEntity(x, y, z);
-        if (te instanceof TE_ItemProxySource) {
-            player.openGui(KekzCore.instance, GuiHandler.ITEM_PROXY_SOURCE, world, x, y, z);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public TileEntity createTileEntity(World world, int p_149915_2_) {
-        return new TE_ItemProxySource();
-    }
-
-    @Override
-    public boolean hasTileEntity(int metadata) {
-        return true;
-    }
-}
diff --git a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
deleted file mode 100644
index 3c8b29c3cc..0000000000
--- a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package common.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-
-public class Block_ReactorChamber_OFF extends BaseGTUpdateableBlock {
-
-    private static final Block_ReactorChamber_OFF instance = new Block_ReactorChamber_OFF();
-
-    private Block_ReactorChamber_OFF() {
-        super(Material.iron);
-    }
-
-    public static Block registerBlock() {
-        final String blockName = "kekztech_reactorchamberoff_block";
-        instance.setBlockName(blockName);
-        instance.setCreativeTab(CreativeTabs.tabMisc);
-        instance.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_OFF");
-        instance.setHardness(10.0f);
-        instance.setResistance(16.0f);
-        GameRegistry.registerBlock(instance, blockName);
-
-        return instance;
-    }
-}
diff --git a/src/main/java/common/blocks/Block_ReactorChamber_ON.java b/src/main/java/common/blocks/Block_ReactorChamber_ON.java
deleted file mode 100644
index 7a894561ae..0000000000
--- a/src/main/java/common/blocks/Block_ReactorChamber_ON.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package common.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-
-public class Block_ReactorChamber_ON extends BaseGTUpdateableBlock {
-
-    private static final Block_ReactorChamber_ON instance = new Block_ReactorChamber_ON();
-
-    private Block_ReactorChamber_ON() {
-        super(Material.iron);
-    }
-
-    public static Block registerBlock() {
-        final String blockName = "kekztech_reactorchamberon_block";
-        instance.setBlockName(blockName);
-        instance.setCreativeTab(CreativeTabs.tabMisc);
-        instance.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_ON");
-        instance.setHardness(-1.0f);
-        instance.setResistance(16.0f);
-        GameRegistry.registerBlock(instance, blockName);
-
-        return instance;
-    }
-
-    @Override
-    public int getLightValue() {
-        return 15;
-    }
-}
diff --git a/src/main/java/common/blocks/Block_SpaceElevator.java b/src/main/java/common/blocks/Block_SpaceElevator.java
deleted file mode 100644
index 2f491db0a4..0000000000
--- a/src/main/java/common/blocks/Block_SpaceElevator.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package common.blocks;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-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 common.itemBlocks.IB_SpaceElevator;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public class Block_SpaceElevator extends BaseGTUpdateableBlock {
-
-    private static final Block_SpaceElevator INSTANCE = new Block_SpaceElevator();
-
-    private IIcon baseTop;
-    private IIcon baseSide;
-    private IIcon coilHolder;
-
-    private Block_SpaceElevator() {
-        super(Material.iron);
-    }
-
-    public static Block registerBlock() {
-        final String blockName = "kekztech_spaceelevator_block";
-        INSTANCE.setBlockName(blockName);
-        INSTANCE.setCreativeTab(CreativeTabs.tabMisc);
-        INSTANCE.setHardness(7.0f);
-        INSTANCE.setResistance(10.0f);
-        GameRegistry.registerBlock(INSTANCE, IB_SpaceElevator.class, blockName);
-
-        return INSTANCE;
-    }
-
-    @Override
-    public void registerBlockIcons(IIconRegister ir) {
-        baseTop = ir.registerIcon("kekztech:SpaceElevatorBase_top");
-        baseSide = ir.registerIcon("kekztech:SpaceElevatorBase_side");
-        coilHolder = ir.registerIcon("kekztech:CoilHolder");
-    }
-
-    @Override
-    @SuppressWarnings({ "unchecked" })
-    public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
-        par3List.add(new ItemStack(par1, 1, 0));
-        par3List.add(new ItemStack(par1, 1, 1));
-    }
-
-    @Override
-    public IIcon getIcon(int side, int meta) {
-        if (meta == 0) {
-            return (side < 2) ? baseTop : baseSide;
-        } else {
-            return coilHolder;
-        }
-    }
-}
diff --git a/src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java b/src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java
deleted file mode 100644
index b6816ba7e8..0000000000
--- a/src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package common.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-import common.itemBlocks.IB_SpaceElevatorCapacitor;
-import common.tileentities.TE_SpaceElevatorCapacitor;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class Block_SpaceElevatorCapacitor extends BaseGTUpdateableBlock {
-
-    private static final Block_SpaceElevatorCapacitor INSTANCE = new Block_SpaceElevatorCapacitor();
-
-    private IIcon top;
-    private IIcon side;
-
-    private Block_SpaceElevatorCapacitor() {
-        super(Material.iron);
-    }
-
-    public static Block registerBlock() {
-        final String blockName = "kekztech_spaceelevatorcapacitor_block";
-        INSTANCE.setBlockName(blockName);
-        INSTANCE.setCreativeTab(CreativeTabs.tabMisc);
-        INSTANCE.setHardness(5.0f);
-        INSTANCE.setResistance(3.0f);
-        GameRegistry.registerBlock(INSTANCE, IB_SpaceElevatorCapacitor.class, blockName);
-
-        return INSTANCE;
-    }
-
-    @Override
-    public void registerBlockIcons(IIconRegister ir) {
-        top = ir.registerIcon("kekztech:SpaceElevatorCapacitor_top_fullbase");
-        side = ir.registerIcon("kekztech:SpaceElevatorCapacitor_side_fullbase");
-    }
-
-    @Override
-    public IIcon getIcon(int side, int meta) {
-        return (side < 2) ? this.top : this.side;
-    }
-
-    @Override
-    public TileEntity createTileEntity(World world, int p_149915_2_) {
-        return new TE_SpaceElevatorCapacitor();
-    }
-
-    @Override
-    public boolean hasTileEntity(int metadata) {
-        return true;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public int getRenderBlockPass() {
-        return 0;
-    }
-
-    @Override
-    public boolean renderAsNormalBlock() {
-        return false;
-    }
-
-    @Override
-    public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) {
-        return false;
-    }
-
-    @Override
-    public int getLightValue() {
-        return 2;
-    }
-}
diff --git a/src/main/java/common/blocks/Block_SpaceElevatorTether.java b/src/main/java/common/blocks/Block_SpaceElevatorTether.java
deleted file mode 100644
index c6ed0f54b0..0000000000
--- a/src/main/java/common/blocks/Block_SpaceElevatorTether.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package common.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-
-import common.tileentities.TE_SpaceElevatorTether;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public class Block_SpaceElevatorTether extends BaseGTUpdateableBlock {
-
-    private static final Block_SpaceElevatorTether INSTANCE = new Block_SpaceElevatorTether();
-
-    private IIcon top;
-    private IIcon side;
-
-    private Block_SpaceElevatorTether() {
-        super(Material.glass);
-    }
-
-    public static Block registerBlock() {
-        final String blockName = "kekztech_spaceelevatortether_block";
-        INSTANCE.setBlockName(blockName);
-        INSTANCE.setCreativeTab(CreativeTabs.tabMisc);
-        INSTANCE.setHardness(15.0f);
-        INSTANCE.setResistance(15.0f);
-        GameRegistry.registerBlock(INSTANCE, blockName);
-
-        return INSTANCE;
-    }
-
-    @Override
-    public void registerBlockIcons(IIconRegister ir) {
-        top = ir.registerIcon("kekztech:Tether_top");
-        side = ir.registerIcon("kekztech:Tether_side");
-    }
-
-    @Override
-    public IIcon getIcon(int side, int meta) {
-        return (side < 2) ? this.top : this.side;
-    }
-
-    @Override
-    public TileEntity createTileEntity(World world, int p_149915_2_) {
-        return new TE_SpaceElevatorTether();
-    }
-
-    @Override
-    public boolean hasTileEntity(int metadata) {
-        return true;
-    }
-
-    @Override
-    public boolean isOpaqueCube() {
-        return false;
-    }
-
-    @Override
-    public boolean renderAsNormalBlock() {
-        return false;
-    }
-}
diff --git a/src/main/java/common/container/Container_ItemProxyEndpoint.java b/src/main/java/common/container/Container_ItemProxyEndpoint.java
deleted file mode 100644
index 8f509e789c..0000000000
--- a/src/main/java/common/container/Container_ItemProxyEndpoint.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package common.container;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-
-public class Container_ItemProxyEndpoint extends Container {
-
-    private final IInventory teInventory;
-
-    private int slotID = 0;
-
-    public Container_ItemProxyEndpoint(TileEntity te, EntityPlayer player) {
-        this.teInventory = (IInventory) te;
-
-        // Source Slot
-        addSlotToContainer(new Slot(teInventory, slotID++, 80, 35));
-        // Config slot
-        addSlotToContainer(new Slot(teInventory, slotID++, 100, 35));
-
-        // Inventory
-        for (int i = 0; i < 3; i++) {
-            for (int j = 0; j < 9; j++) {
-                addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
-            }
-        }
-        // Hotbar
-        for (int i = 0; i < 9; i++) {
-            addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142));
-        }
-    }
-
-    @Override
-    public ItemStack transferStackInSlot(EntityPlayer player, int slotRaw) {