Merge pull request #1 from kekzdealer/master

5/22

97 files changed, 4692 insertions, 1934 deletions

diff --git a/src/main/java/blocks/Block_ControlRod.java b/src/main/java/blocks/Block_ControlRod.java
deleted file mode 100644
index 4e407a5ed1..0000000000
--- a/src/main/java/blocks/Block_ControlRod.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package blocks;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-
-public class Block_ControlRod extends Block {
-	
-	private static Block_ControlRod instance = new Block_ControlRod();
-	
-	private Block_ControlRod() {
-		super(Material.iron);
-	}
-	
-	public static Block_ControlRod getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
-		final String blockName = "kekztech_controlrod_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "ControlRod");
-		super.setHardness(5.0f);
-		super.setResistance(6.0f);
-		GameRegistry.registerBlock(getInstance(), blockName);
-	}
-}
diff --git a/src/main/java/blocks/Block_GDCUnit.java b/src/main/java/blocks/Block_GDCUnit.java
deleted file mode 100644
index ed778b5e8d..0000000000
--- a/src/main/java/blocks/Block_GDCUnit.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package blocks;

-

-import cpw.mods.fml.common.registry.GameRegistry;

-import kekztech.KekzCore;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.creativetab.CreativeTabs;

-

-public class Block_GDCUnit extends Block {

-	

-	private static Block_GDCUnit instance = new Block_GDCUnit();

-	

-	private Block_GDCUnit() {

-		// I am a singleton

-		super(Material.iron);

-	}

-	

-	public static Block_GDCUnit getInstance() {

-		return instance;

-	}

-	

-	public void registerBlock() {

-		final String blockName = "kekztech_gdcceramicelectrolyteunit_block";

-		super.setBlockName(blockName);

-		super.setCreativeTab(CreativeTabs.tabMisc);

-		super.setBlockTextureName(KekzCore.MODID + ":" + "GDCCeramicElectrolyteUnit");

-		super.setHardness(5.0f);

-		super.setResistance(6.0f);

-		GameRegistry.registerBlock(getInstance(), blockName);

-	}

-}

diff --git a/src/main/java/blocks/Block_ItemProxyCable.java b/src/main/java/blocks/Block_ItemProxyCable.java
deleted file mode 100644
index dee566bab7..0000000000
--- a/src/main/java/blocks/Block_ItemProxyCable.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package blocks;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemProxyCable;
-import kekztech.KekzCore;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import tileentities.TE_ItemProxyCable;
-
-public class Block_ItemProxyCable extends BlockContainer {
-	
-	private static Block_ItemProxyCable instance = new Block_ItemProxyCable();
-	
-	private Block_ItemProxyCable() {
-		super(Material.glass);
-	}
-	
-	public static Block_ItemProxyCable getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
-		final String blockName = "kekztech_itemproxycable_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing");
-		super.setHardness(3.0f);
-		super.setResistance(2.0f);
-		GameRegistry.registerBlock(getInstance(), IB_ItemProxyCable.class, blockName);
-	}
-	
-	@Override
-	public boolean isOpaqueCube() {
-		return false;
-	}
-	
-	@Override
-	public TileEntity createNewTileEntity(World world, int p_149915_2_) {
-		return new TE_ItemProxyCable();
-	}
-
-}
diff --git a/src/main/java/blocks/Block_ItemProxyEndpoint.java b/src/main/java/blocks/Block_ItemProxyEndpoint.java
deleted file mode 100644
index 762880c877..0000000000
--- a/src/main/java/blocks/Block_ItemProxyEndpoint.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package blocks;
-
-import java.util.UUID;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemProxyEndpoint;
-import items.Item_Configurator;
-import kekztech.GuiHandler;
-import kekztech.KekzCore;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import tileentities.TE_ItemProxyEndpoint;
-
-public class Block_ItemProxyEndpoint extends BlockContainer {
-	
-	private static Block_ItemProxyEndpoint instance = new Block_ItemProxyEndpoint();
-	
-	private Block_ItemProxyEndpoint() {
-		super(Material.glass);
-	}
-	
-	public static Block_ItemProxyEndpoint getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
-		final String blockName = "kekztech_itemproxyendpoint_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxyEndpoint");
-		super.setHardness(3.0f);
-		super.setResistance(2.0f);
-		GameRegistry.registerBlock(getInstance(), IB_ItemProxyEndpoint.class, blockName);
-	}