huge refactor of recipe and block registration

31 files changed, 482 insertions, 355 deletions

diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java
new file mode 100644
index 0000000000..055b4bf0a9
--- /dev/null
+++ b/src/main/java/common/Blocks.java
@@ -0,0 +1,103 @@
+package common;
+
+import common.blocks.Block_ControlRod;
+import common.blocks.Block_GDCUnit;
+import common.blocks.Block_IchorJar;
+import common.blocks.Block_ItemProxyCable;
+import common.blocks.Block_ItemProxyEndpoint;
+import common.blocks.Block_ItemProxySource;
+import common.blocks.Block_ItemServerDrive;
+import common.blocks.Block_ItemServerIOPort;
+import common.blocks.Block_ItemServerRackCasing;
+import common.blocks.Block_ReactorChamber_OFF;
+import common.blocks.Block_ReactorChamber_ON;
+import common.blocks.Block_TFFTCasing;
+import common.blocks.Block_TFFTMultiHatch;
+import common.blocks.Block_TFFTStorageFieldBlockT1;
+import common.blocks.Block_TFFTStorageFieldBlockT2;
+import common.blocks.Block_TFFTStorageFieldBlockT3;
+import common.blocks.Block_TFFTStorageFieldBlockT4;
+import common.blocks.Block_TFFTStorageFieldBlockT5;
+import common.blocks.Block_ThaumiumReinforcedJar;
+import common.blocks.Block_YSZUnit;
+import net.minecraft.block.Block;
+
+public class Blocks {
+	
+	public static Block yszUnit;
+	public static Block gdcUnit;
+	
+	public static Block tfftCasing;
+	public static Block tfftStorageField1;
+	public static Block tfftStorageField2;
+	public static Block tfftStorageField3;
+	public static Block tfftStorageField4;
+	public static Block tfftStorageField5;
+	public static Block tfftMultiHatch;
+	
+	public static Block reactorChamberOFF;
+	public static Block reactorChamberON;
+	public static Block reactorControlRod;
+	
+	public static Block itemServerDrive;
+	public static Block itemServerRackCasing;
+	public static Block itemServerIOPort;
+	
+	public static Block itemProxyCable;
+	public static Block itemProxySource;
+	public static Block itemProxyEndpoint;
+	
+	public static Block jarThaumiumReinforced;
+	public static Block jarIchor;
+	
+	public static void init() {
+		System.out.println("Registering blocks...");
+		
+		registerBlocks_SOFC();
+		registerBlocks_TFFT();
+		registerBlocks_Nuclear();
+		//registerBlocks_ItemServer();
+		//registerBlocks_ItemProxy();
+		registerBlocks_Jars();
+		
+		System.out.println("Finished registering blocks");
+	}
+	
+	private static void registerBlocks_SOFC() {
+		yszUnit = Block_YSZUnit.registerBlock();
+		gdcUnit = Block_GDCUnit.registerBlock();
+	}
+	
+	private static void registerBlocks_TFFT() {
+		tfftCasing = Block_TFFTCasing.registerBlock();
+		tfftStorageField1 = Block_TFFTStorageFieldBlockT1.registerBlock();
+		tfftStorageField2 = Block_TFFTStorageFieldBlockT2.registerBlock();
+		tfftStorageField3 = Block_TFFTStorageFieldBlockT3.registerBlock();
+		tfftStorageField4 = Block_TFFTStorageFieldBlockT4.registerBlock();
+		tfftStorageField5 = Block_TFFTStorageFieldBlockT5.registerBlock();
+		tfftMultiHatch = Block_TFFTMultiHatch.registerBlock();
+	}
+	
+	private static void registerBlocks_Nuclear() {
+		reactorChamberOFF = Block_ReactorChamber_OFF.registerBlock();
+		reactorChamberON = Block_ReactorChamber_ON.registerBlock();
+		reactorControlRod = Block_ControlRod.registerBlock();
+	}
+	
+	private static void registerBlocks_ItemServer() {
+		itemServerDrive = Block_ItemServerDrive.registerBlock();
+		itemServerRackCasing = Block_ItemServerRackCasing.registerBlock();
+		itemServerIOPort = Block_ItemServerIOPort.registerBlock();
+	}
+	
+	private static void registerBlocks_ItemProxy() {
+		itemProxyCable = Block_ItemProxyCable.registerBlock();
+		itemProxySource = Block_ItemProxySource.registerBlock();
+		itemProxyEndpoint = Block_ItemProxyEndpoint.registerBlock();
+	}
+	
+	private static void registerBlocks_Jars() {
+		jarThaumiumReinforced = Block_ThaumiumReinforcedJar.registerBlock();
+		jarIchor = Block_IchorJar.registerBlock();
+	}
+}
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index 4a49ab54de..2ae94913e1 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -1,19 +1,5 @@
 package common;
 
-import common.blocks.Block_ControlRod;
-import common.blocks.Block_GDCUnit;
-import common.blocks.Block_ItemServerDrive;
-import common.blocks.Block_ItemServerIOPort;
-import common.blocks.Block_ItemServerRackCasing;
-import common.blocks.Block_ReactorChamber_OFF;
-import common.blocks.Block_TFFTCasing;
-import common.blocks.Block_TFFTMultiHatch;
-import common.blocks.Block_TFFTStorageFieldBlockT1;
-import common.blocks.Block_TFFTStorageFieldBlockT2;
-import common.blocks.Block_TFFTStorageFieldBlockT3;
-import common.blocks.Block_TFFTStorageFieldBlockT4;
-import common.blocks.Block_TFFTStorageFieldBlockT5;
-import common.blocks.Block_YSZUnit;
 import cpw.mods.fml.common.Loader;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
@@ -33,10 +19,14 @@ import util.Util;
 public class Recipes {
 	
 	public static void init() {
+		System.out.println("Registering recipes...");
+		
 		registerRecipes_TFFT();
 		registerRecipes_SOFC();
 		registerRecipes_Nuclear();
 		//registerRecipes_ItemServer();
+		
+		System.out.println("Finished registering recipes");
 	}
 	
 	private static void registerRecipes_TFFT() {
@@ -62,7 +52,7 @@ public class Recipes {
 			GT_Values.RA.addAssemblerRecipe(
 					tfftcasing, 
 					FluidRegistry.getFluidStack("molten.polytetrafluoroethylene", 144),
-					new ItemStack(Block_TFFTCasing.getInstance(), 1), 
+					new ItemStack(Blocks.tfftCasing, 1), 
 					200, 256);
 			final ItemStack[] tfftstoragefield1 = {
 				GT_Utility.getIntegratedCircuit(6),
@@ -74,7 +64,7 @@ public class Recipes {
 			GT_Values.RA.addAssemblerRecipe(
 					tfftstoragefield1, 
 					FluidRegistry.getFluidStack("molten.glass", 144),
-					new ItemStack(Block_TFFTStorageFieldBlockT1.getInstance(), 1), 
+					new ItemStack(Blocks.tfftStorageField1, 1), 
 					200, 256);
 			final ItemStack[] tfftstoragefield2 = {
 					GT_Utility.getIntegratedCircuit(6),
@@ -86,7 +76,7 @@ public class Recipes {
 			GT_Values.RA.addAssemblerRecipe(
 					tfftstoragefield2, 
 					FluidRegistry.getFluidStack("molten.plastic", 576),
-					new ItemStack(Block_TFFTStorageFieldBlockT2.getInstance(), 1), 
+					new ItemStack(Blocks.tfftStorageField2, 1), 
 					200, 480);
 			final ItemStack[] tfftstoragefield3 = {
 					GT_Utility.getIntegratedCircuit(6),
@@ -99,7 +89,7 @@ public class Recipes {
 			GT_Values.RA.addAssemblerRecipe(
 					tfftstoragefield3, 
 					FluidRegistry.getFluidStack("molten.epoxid", 576),
-					new ItemStack(Block_TFFTStorageFieldBlockT3.getInstance(), 1), 
+					new ItemStack(Blocks.tfftStorageField3, 1), 
 					300, 1920);
 			final ItemStack[] tfftstoragefield4 = {
 					GT_Utility.getIntegratedCircuit(6),
@@ -112,7 +102,7 @@ public class Recipes {
 			GT_Values.RA.addAssemblerRecipe(
 					tfftstoragefield4, 
 					FluidRegistry.getFluidStack("molten.epoxid", 1152),
-					new ItemStack(Block_TFFTStorageFieldBlockT4.getInstance(), 1), 
+					new ItemStack(Blocks.tfftStorageField4, 1), 
 					400, 4098);
 			final ItemStack[] tfftstoragefield5 = {
 					GT_Utility.getIntegratedCircuit(6),
@@ -125,7 +115,7 @@ public class Recipes {
 			GT_Values.RA.addAssemblerRecipe(
 					tfftstoragefield5, 
 					FluidRegistry.getFluidStack("molten.epoxid", 1152),
-					new ItemStack(Block_TFFTStorageFieldBlockT5.getInstance(), 1), 
+					new ItemStack(Blocks.tfftStorageField5, 1), 
 					400, 6147);
 			final Object[] multi_hatch = {
 					"PRP", "UFU", "PRP",
@@ -134,7 +124,7 @@ public class Recipes {
 					'U', ItemList.Electric_Pump_IV.get(1L),
 					'F', ItemList.Field_Generator_HV.get(1L)
 			};		
-			GT_ModHandler.addCraftingRecipe(new ItemStack(Block_TFFTMultiHatch.getInstance()), multi_hatch);
+			GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.tfftMultiHatch), multi_hatch);
 	}
 	
 	private static void registerRecipes_SOFC() {
@@ -174,7 +164,7 @@ public class Recipes {
 		GT_Values.RA.addAssemblerRecipe(
 				yszUnit, 
 				Materials.Hydrogen.getGas(4000), 
-				new ItemStack(Block_YSZUnit.getInstance(), 1), 
+				new ItemStack(Blocks.yszUnit, 1), 
 				1200, 480);
 		final ItemStack[] gdcUnit = {
 				GT_Utility.getIntegratedCircuit(6),
@@ -186,7 +176,7 @@ public class Recipes {
 		GT_Values.RA.addAssemblerRecipe(
 				gdcUnit, 
 				Materials.Hydrogen.getGas(16000), 
-				new ItemStack(Block_GDCUnit.getInstance(), 1), 
+				new ItemStack(Blocks.gdcUnit, 1), 
 				2400, 1920);
 		
 		// Items
@@ -246,7 +236,7 @@ public class Recipes {
 		GT_Values.RA.addAssemblerRecipe(
 				controlrod, 
 				null,
-				new ItemStack(Block_ControlRod.getInstance(), 1), 
+				new ItemStack(Blocks.reactorControlRod, 1), 
 				800, 480);
 		final ItemStack[] reactorchamber = {
 				GT_Utility.getIntegratedCircuit(6),
@@ -258,7 +248,7 @@ public class Recipes {
 		GT_Values.RA.addAssemblerRecipe(
 				reactorchamber, 
 				FluidRegistry.getFluidStack("wet.concrete", 144),
-				new ItemStack(Block_ReactorChamber_OFF.getInstance(), 1), 
+				new ItemStack(Blocks.reactorChamberOFF, 1), 
 				1600, 480);
 		
 		// Items
@@ -332,10 +322,10 @@ public class Recipes {
 				'C', GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Platinum, 1),
 				'F', GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1),
 		};
-		GT_ModHandler.addCraftingRecipe(new ItemStack(Block_ItemServerRackCasing.getInstance()), is_rack_recipe);
+		GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.itemServerRackCasing), is_rack_recipe);
 		final ItemStack[] is_ioport = {
 				GT_Utility.getIntegratedCircuit(6),
-				new ItemStack(Block_ItemServerRackCasing.getInstance()),
+				new ItemStack(Blocks.itemServerRackCasing),
 				GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Platinum, 16),
 				GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Platinum, 2),
 				ItemList.Field_Generator_HV.get(1L),
@@ -344,7 +334,7 @@ public class Recipes {
 			GT_Values.RA.addAssemblerRecipe(
 					is_ioport, 
 					FluidRegistry.getFluidStack("molten.polytetrafluoroethylene", 144),
-					new ItemStack(Block_ItemServerIOPort.getInstance(), 1), 
+					new ItemStack(Blocks.itemServerIOPort, 1), 
 					200, 7680);
 		final Object[] is_blade = {
 				"CRC", "CMC", "HPH",
@@ -365,7 +355,7 @@ public class Recipes {
 			GT_Values.RA.addAssemblerRecipe(
 					is_drive, 
 					FluidRegistry.getFluidStack("molten.polyethylene", 1152),
-					new ItemStack(Block_ItemServerDrive.getInstance(), 1), 
+					new ItemStack(Blocks.itemServerDrive, 1), 
 					200, 7680);
 	}
 }
diff --git a/src/main/java/common/blocks/Block_ControlRod.java b/src/main/java/common/blocks/Block_ControlRod.java
index abb9254f15..f588e9113b 100644
--- a/src/main/java/common/blocks/Block_ControlRod.java
+++ b/src/main/java/common/blocks/Block_ControlRod.java
@@ -2,28 +2,31 @@ package common.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 BaseGTUpdateableBlock {
 	
-	private static Block_ControlRod instance = new Block_ControlRod();
+	private static Block_ControlRod instance;
 	
 	private Block_ControlRod() {
 		super(Material.iron);
 	}
 	
-	public static Block_ControlRod getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
+	public static Block registerBlock() {
+		if(instance == null) {
+			instance = new Block_ControlRod();
+		}
+		
 		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);
+		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_GDCUnit.java b/src/main/java/common/blocks/Block_GDCUnit.java
index ec493eba90..0857572121 100644
--- a/src/main/java/common/blocks/Block_GDCUnit.java
+++ b/src/main/java/common/blocks/Block_GDCUnit.java
@@ -2,29 +2,31 @@ package common.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 BaseGTUpdateableBlock {

 	

-	private static Block_GDCUnit instance = new Block_GDCUnit();

+	private static Block_GDCUnit instance;

 	

 	private Block_GDCUnit() {

-		// I am a singleton

 		super(Material.iron);

 	}

 	

-	public static Block_GDCUnit getInstance() {

-		return instance;

-	}

-	

-	public void registerBlock() {

+	public static Block registerBlock() {

+		if(instance == null) {

+			instance = new Block_GDCUnit();

+		}

+		

 		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);

+		instance.setBlockName(blockName);

+		instance.setCreativeTab(CreativeTabs.tabMisc);

+		instance.setBlockTextureName(KekzCore.MODID + ":" + "GDCCeramicElectrolyteUnit");

+		instance.setHardness(5.0f);

+		instance.setResistance(6.0f);

+		GameRegistry.registerBlock(instance, blockName);

+		

+		return instance;

 	}

 }

diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java
index 7b795d2401..cd3df9aa04 100644
--- a/src/main/java/common/blocks/Block_IchorJar.java
+++ b/src/main/java/common/blocks/Block_IchorJar.java
@@ -9,6 +9,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import items.Item_IchorJarFilled;
+import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
@@ -21,20 +22,22 @@ import thaumcraft.common.blocks.BlockJar;
 
 public class Block_IchorJar extends BlockJar {
 	
-	private static Block_IchorJar instance = new Block_IchorJar();
+	private static Block_IchorJar instance;
 	
 	private Block_IchorJar() {
 		super();
 	}
 	
-	public static Block_IchorJar getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
+	public static Block registerBlock() {
+		if(instance == null) {
+			instance = new Block_IchorJar();
+		}
+		
 		final String blockName = "kekztech_ichorjar_block";
-		super.setBlockName(blockName);
-		GameRegistry.registerBlock(getInstance(), blockName);
+		instance.setBlockName(blockName);
+		GameRegistry.registerBlock(instance, blockName);
+		
+		return instance;
 	}
 	
 	@Override
diff --git a/src/main/java/common/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java
index 5dffc4d60d..d7a4a2dcb2 100644
--- a/src/main/java/common/blocks/Block_ItemProxyCable.java
+++ b/src/main/java/common/blocks/Block_ItemProxyCable.java
@@ -4,32 +4,34 @@ import common.tileentities.TE_ItemProxyCable;
 import cpw.mods.fml.common.registry.GameRegistry;
 import itemBlocks.IB_ItemProxyCable;
 import kekztech.KekzCore;
-import net.minecraft.block.BlockContainer;
+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;
 
-public class Block_ItemProxyCable extends BlockContainer {
+public class Block_ItemProxyCable extends Block {
 	
-	private static Block_ItemProxyCable instance = new Block_ItemProxyCable();
+	private static Block_ItemProxyCable instance;
 	
 	private Block_ItemProxyCable() {
 		super(Material.glass);
 	}
 	
-	public static Block_ItemProxyCable getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
+	public static Block registerBlock() {
+		if(instance == null) {
+			instance = new Block_ItemProxyCable();
+		}
+		
 		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);
+		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
@@ -38,8 +40,13 @@ public class Block_ItemProxyCable extends BlockContainer {
 	}
 	
 	@Override
-	public TileEntity createNewTileEntity(World world, int p_149915_2_) {
+	public TileEntity createTileEntity(World world, int p_149915_2_) {
 		return new TE_ItemProxyCable();
 	}
 
+	@Override
+	public boolean hasTileEntity(int metadata) {
+		return true;
+	}
+
 }
diff --git a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
index 91d4ef5d29..d2fdea8029 100644
--- a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
+++ b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
@@ -8,7 +8,7 @@ import itemBlocks.IB_ItemProxyEndpoint;
 import items.Item_Configurator;
 import kekztech.GuiHandler;
 import kekztech.KekzCore;
-import net.minecraft.block.BlockContainer;
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -16,26 +16,28 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
-public class Block_ItemProxyEndpoint extends BlockContainer {
+public class Block_ItemProxyEndpoint extends Block {
 	
-	private static Block_ItemProxyEndpoint instance = new Block_ItemProxyEndpoint();
+	private static Block_ItemProxyEndpoint instance;
 	
 	private Block_ItemProxyEndpoint() {
 		super(Material.glass);
 	}
 	
-	public static Block_ItemProxyEndpoint getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
+	public static Block registerBlock() {
+		if(instance == null) {
+			instance = new Block_ItemProxyEndpoint();
+		}
+		
 		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);
+		instance.setBlockName(blockName);
+		instance.setCreativeTab(CreativeTabs.tabMisc);
+		instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxyEndpoint");
+		instance.setHardness(3.0f);
+		instance.setResistance(2.0f);
+		GameRegistry.registerBlock(instance, IB_ItemProxyEndpoint.class, blockName);
+		
+		return instance;
 	}
 	
 	@Override
@@ -62,8 +64,13 @@ public class Block_ItemProxyEndpoint extends BlockContainer {
 	}
 	
 	@Override
-	public TileEntity createNewTileEntity(World world, int p_149915_2_) {
+	public TileEntity createTileEntity(World world, int p_149915_2_) {
 		return new TE_ItemProxyEndpoint();
 	}
 
+	@Override
+	public boolean hasTileEntity(int metadata) {
+		return true;
+	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/common/blocks/Block_ItemProxySource.java b/src/main/java/common/blocks/Block_ItemProxySource.java
index 0158ae57e9..715a6e2bdf 100644
--- a/src/main/java/common/blocks/Block_ItemProxySource.java
+++ b/src/main/java/common/blocks/Block_ItemProxySource.java
@@ -6,7 +6,7 @@ import itemBlocks.IB_ItemProxySource;
 import items.Item_Configurator;
 import kekztech.GuiHandler;
 import kekztech.KekzCore;
-import net.minecraft.block.BlockContainer;
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -15,26 +15,28 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
-public class Block_ItemProxySource extends BlockContainer {
+public class Block_ItemProxySource extends Block {
 	
-	private static Block_ItemProxySource instance = new Block_ItemProxySource();
+	private static Block_ItemProxySource instance;
 	
 	private Block_ItemProxySource() {
 		super(Material.glass);
 	}
 	
-	public static Block_ItemProxySource getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
+	public static Block registerBlock() {
+		if(instance == null) {
+			instance = new Block_ItemProxySource();
+		}
+		
 		final String blockName = "kekztech_itemproxysource_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxySource");
-		super.setHardness(3.0f);
-		super.setResistance(2.0f);
-		GameRegistry.registerBlock(getInstance(), IB_ItemProxySource.class, blockName);
+		instance.setBlockName(blockName);
+		instance.setCreativeTab(CreativeTabs.tabMisc);
+		instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxySource");
+		instance.setHardness(3.0f);
+		instance.setResistance(2.0f);
+		GameRegistry.registerBlock(instance, IB_ItemProxySource.class, blockName);
+		
+		return instance;
 	}
 	
 	@Override
@@ -62,8 +64,13 @@ public class Block_ItemProxySource extends BlockContainer {
 	}
 	
 	@Override
-	public TileEntity createNewTileEntity(World world, int p_149915_2_) {
+	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_ItemServerDrive.java b/src/main/java/common/blocks/Block_ItemServerDrive.java
index e35cc220db..38b54da41a 100644
--- a/src/main/java/common/blocks/Block_ItemServerDrive.java
+++ b/src/main/java/common/blocks/Block_ItemServerDrive.java
@@ -3,6 +3,7 @@ package common.blocks;
 import cpw.mods.fml.common.registry.GameRegistry;
 import itemBlocks.IB_ItemServerDrive;
 import kekztech.KekzCore;
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -10,26 +11,27 @@ import net.minecraft.util.IIcon;
 
 public class Block_ItemServerDrive extends BaseGTUpdateableBlock{
 
-	private static Block_ItemServerDrive instance = new Block_ItemServerDrive();
+	private static Block_ItemServerDrive instance;
 	
 	private IIcon[] faces = new IIcon[6];
 	
 	private Block_ItemServerDrive() {
-		// I am a singleton
 		super(Material.iron);
 	}
 	
-	public static Block_ItemServerDrive getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
+	public static Block registerBlock() {
+		if(instance == null) {
+			instance = new Block_ItemServerDrive();
+		}
+		
 		final String blockName = "kekztech_itemserverdrive_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setHardness(5.0f);
-		super.setResistance(6.0f);
-		GameRegistry.registerBlock(getInstance(), IB_ItemServerDrive.class, blockName);
+		instance.setBlockName(blockName);
+		instance.setCreativeTab(CreativeTabs.tabMisc);
+		instance.setHardness(5.0f);
+		instance.setResistance(6.0f);
+		GameRegistry.registerBlock(instance, IB_ItemServerDrive.class, blockName);
+		
+		return instance;
 	}
 	
 	@Override
diff --git a/src/main/java/common/blocks/Block_ItemServerIOPort.java b/src/main/java/common/blocks/Block_ItemServerIOPort.java
index c7a3f4dce5..1b40ae89a3 100644
--- a/src/main/java/common/blocks/Block_ItemServerIOPort.java
+++ b/src/main/java/common/blocks/Block_ItemServerIOPort.java
@@ -4,6 +4,7 @@ import common.tileentities.TE_ItemServerIOPort;
 import cpw.mods.fml.common.registry.GameRegistry;
 import itemBlocks.IB_ItemServerIOPort;
 import kekztech.KekzCore;
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.tileentity.TileEntity;
@@ -11,25 +12,26 @@ import net.minecraft.world.World;
 
 public class Block_ItemServerIOPort extends BaseGTUpdateableBlock {
 
-	private static Block_ItemServerIOPort instance = new Block_ItemServerIOPort();
+	private static Block_ItemServerIOPort instance;
 		
 	private Block_ItemServerIOPort() {
-		// I am a singleton
 		super(Material.iron);
 	}
 	
-	public static Block_ItemServerIOPort getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
+	public static Block registerBlock() {
+		if(instance == null) {
+			instance = new Block_ItemServerIOPort();
+		}
+		
 		final String blockName = "kekztech_itemserverioport_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "ItemServerIOPort");
-		super.setHardness(5.0f);
-		super.setResistance(6.0f);
-		GameRegistry.registerBlock(getInstance(), IB_ItemServerIOPort.class, blockName);
+		instance.setBlockName(blockName);
+		instance.setCreativeTab(CreativeTabs.tabMisc);
+		instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemServerIOPort");
+		instance.setHardness(5.0f);
+		instance.setResistance(6.0f);
+		GameRegistry.registerBlock(instance, IB_ItemServerIOPort.class, blockName);
+		
+		return instance;
 	}
 
 	@Override
diff --git a/src/main/java/common/blocks/Block_ItemServerRackCasing.java b/src/main/java/common/blocks/Block_ItemServerRackCasing.java
index e12262538b..fbddd34315 100644
--- a/src/main/java/common/blocks/Block_ItemServerRackCasing.java
+++ b/src/main/java/common/blocks/Block_ItemServerRackCasing.java
@@ -3,30 +3,32 @@ package common.blocks;
 import cpw.mods.fml.common.registry.GameRegistry;
 import itemBlocks.IB_ItemServerRackCasing;
 import kekztech.KekzCore;
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 
 public class Block_ItemServerRackCasing extends BaseGTUpdateableBlock {
 
-	private static Block_ItemServerRackCasing instance = new Block_ItemServerRackCasing();
+	private static Block_ItemServerRackCasing instance;
 		
 	private Block_ItemServerRackCasing() {
-		// I am a singleton
 		super(Material.iron);
 	}
 	
-	public static Block_ItemServerRackCasing getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
+	public static Block registerBlock() {
+		if(instance == null) {
+			instance = new Block_ItemServerRackCasing();
+		}
+		
 		final String blockName = "kekztech_itemserverrackcasing_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "ItemServerRackCasing");
-		super.setHardness(5.0f);
-		super.setResistance(6.0f);
-		GameRegistry.registerBlock(getInstance(), IB_ItemServerRackCasing.class, blockName);
+		instance.setBlockName(blockName);
+		instance.setCreativeTab(CreativeTabs.tabMisc);
+		instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemServerRackCasing");
+		instance.setHardness(5.0f);
+		instance.setResistance(6.0f);
+		GameRegistry.registerBlock(instance, IB_ItemServerRackCasing.class, blockName);
+		
+		return instance;
 	}
 	
 }
diff --git a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
index ab14e1d56c..21f3c698e0 100644
--- a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
+++ b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
@@ -2,29 +2,32 @@ package common.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_ReactorChamber_OFF extends BaseGTUpdateableBlock {
 	
-	private static Block_ReactorChamber_OFF instance = new Block_ReactorChamber_OFF();
+	private static Block_ReactorChamber_OFF instance;
 	
 	private Block_ReactorChamber_OFF() {
 		super(Material.iron);
 	}
 	
-	public static Block_ReactorChamber_OFF getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
+	public static Block registerBlock() {
+		if(instance == null) {
+			instance = new Block_ReactorChamber_OFF();
+		}
+		
 		final String blockName = "kekztech_reactorchamberoff_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_OFF");
-		super.setHardness(10.0f);
-		super.setResistance(16.0f);
-		GameRegistry.registerBlock(getInstance(), blockName);
+		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
index fa6db02c8e..4eb7fdadae 100644
--- a/src/main/java/common/blocks/Block_ReactorChamber_ON.java
+++ b/src/main/java/common/blocks/Block_ReactorChamber_ON.java
@@ -2,29 +2,32 @@ package common.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_ReactorChamber_ON extends BaseGTUpdateableBlock {
 	
-	private static Block_ReactorChamber_ON instance = new Block_ReactorChamber_ON();
+	private static Block_ReactorChamber_ON instance;
 	
 	private Block_ReactorChamber_ON() {
 		super(Material.iron);
 	}
 	
-	public static Block_ReactorChamber_ON getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
+	public static Block registerBlock() {
+		if(instance == null) {
+			instance = new Block_ReactorChamber_ON();
+		}
+		
 		final String blockName = "kekztech_reactorchamberon_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_ON");
-		super.setHardness(-1.0f);
-		super.setResistance(16.0f);
-		GameRegistry.registerBlock(getInstance(), blockName);
+		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
diff --git a/src/main/java/common/blocks/Block_TFFTCasing.java b/src/main/java/common/blocks/Block_TFFTCasing.java
index 86d4ed6182..96696c2ee9 100644
--- a/src/main/java/common/blocks/Block_TFFTCasing.java
+++ b/src/main/java/common/blocks/Block_TFFTCasing.java
@@ -2,29 +2,31 @@ package common.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_TFFTCasing extends BaseGTUpdateableBlock {

 	

-	private static Block_TFFTCasing instance = new Block_TFFTCasing();

+	private static Block_TFFTCasing instance;

 	

 	private Block_TFFTCasing() {

-		// I am a singleton

 		super(Material.iron);

 	}

 	

-	public static Block_TFFTCasing getInstance() {

-		return instance;

-	}

-	

-	public void registerBlock() {

+	public static Block registerBlock() {

+		if(instance == null) {

+			instance = new Block_TFFTCasing();

+		}

+		

 		final String blockName = "kekztech_tfftcasingblock_block";

-		super.setBlockName(blockName);

-		super.setCreativeTab(CreativeTabs.tabMisc);

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

-		super.setHardness(5.0f);

-		super.setResistance(6.0f);

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

+		instance.setBlockName(blockName);

+		instance.setCreativeTab(CreativeTabs.tabMisc);

+		instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing");

+		instance.setHardness(5.0f);

+		instance.setResistance(6.0f);

+		GameRegistry.registerBlock(instance, blockName);

+		

+		return instance;

 	} 

 }

diff --git a/src/main/java/common/blocks/Block_TFFTMultiHatch.java b/src/main/java/common/blocks/Block_TFFTMultiHatch.java
index c0cfab7777..0f26e7dc66 100644
--- a/src/main/java/common/blocks/Block_TFFTMultiHatch.java
+++ b/src/main/java/common/blocks/Block_TFFTMultiHatch.java
@@ -7,6 +7,7 @@ import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import itemBlocks.IB_TFFTMultiHatch;
 import kekztech.KekzCore;
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -15,24 +16,26 @@ import net.minecraft.world.World;
 
 public class Block_TFFTMultiHatch extends BaseGTUpdateableBlock {
 	
-	private static Block_TFFTMultiHatch instance = new Block_TFFTMultiHatch();
+	private static Block_TFFTMultiHatch instance;
 	
 	private Block_TFFTMultiHatch() {
 		super(Material.iron);
 	}
 	
-	public static Block_TFFTMultiHatch getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
+	public static Block registerBlock() {
+		if(instance == null) {
+			instance = new Block_TFFTMultiHatch();
+		}
+		
 		final String blockName = "kekztech_tfftmultihatch_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTMultiHatch");
-		super.setHardness(5.0f);
-		super.setResistance(6.0f);
-		GameRegistry.registerBlock(getInstance(), IB_TFFTMultiHatch.class, blockName);
+		instance.setBlockName(blockName);
+		instance.setCreativeTab(CreativeTabs.tabMisc);
+		instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTMultiHatch");
+		instance.setHardness(5.0f);
+		instance.setResistance(6.0f);
+		GameRegistry.registerBlock(instance, IB_TFFTMultiHatch.class, blockName);
+		
+		return instance;
 	}
 
 	@Override
diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java
index 3bc390ce91..e8e69d2850 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java
@@ -3,34 +3,36 @@ package common.blocks;
 import cpw.mods.fml.common.registry.GameRegistry;

 import itemBlocks.IB_TFFTStorageFieldBlockT1;

 import kekztech.KekzCore;

+import net.minecraft.block.Block;

 import net.minecraft.block.material.Material;

 import net.minecraft.creativetab.CreativeTabs;

 

 public class Block_TFFTStorageFieldBlockT1 extends BaseGTUpdateableBlock {

 	

-	private static Block_TFFTStorageFieldBlockT1 instance = new Block_TFFTStorageFieldBlockT1();

+	private static Block_TFFTStorageFieldBlockT1 instance;

 	

 	private Block_TFFTStorageFieldBlockT1() {

-		// I am a singleton

 		super(Material.iron);

 	}

 	

-	public static Block_TFFTStorageFieldBlockT1 getInstance() {

-		return instance;

-	}

-	

 	public static int getCapacity() {

 		return 500000;

 	}

 	

-	public void registerBlock() {

+	public static Block registerBlock() {

+		if(instance == null) {

+			instance = new Block_TFFTStorageFieldBlockT1();

+		}

+		

 		final String blockName = "kekztech_tfftstoragefieldblock1_block";

-		super.setBlockName(blockName);

-		super.setCreativeTab(CreativeTabs.tabMisc);

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

-		super.setHardness(5.0f);

-		super.setResistance(6.0f);

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

+		instance.setBlockName(blockName);

+		instance.setCreativeTab(CreativeTabs.tabMisc);

+		instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock1");

+		instance.setHardness(5.0f);

+		instance.setResistance(6.0f);

+		GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT1.class, blockName);

+		

+		return instance;

 	}

 	

 }

diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java
index 7ba7f25a88..747c2cd1a9 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java
@@ -3,33 +3,35 @@ package common.blocks;
 import cpw.mods.fml.common.registry.GameRegistry;

 import itemBlocks.IB_TFFTStorageFieldBlockT2;

 import kekztech.KekzCore;

+import net.minecraft.block.Block;

 import net.minecraft.block.material.Material;

 import net.minecraft.creativetab.CreativeTabs;

 

 public class Block_TFFTStorageFieldBlockT2 extends BaseGTUpdateableBlock {

 	

-	private static Block_TFFTStorageFieldBlockT2 instance = new Block_TFFTStorageFieldBlockT2();

+	private static Block_TFFTStorageFieldBlockT2 instance;

 	

 	private Block_TFFTStorageFieldBlockT2() {

-		// I am a singleton

 		super(Material.iron);

 	}

 	

-	public static Block_TFFTStorageFieldBlockT2 getInstance() {

-		return instance;

-	}

-	

 	public static int getCapacity() {

 		return 4000000;

 	}

 	

-	public void registerBlock() {

+	public static Block registerBlock() {

+		if(instance == null) {

+			instance = new Block_TFFTStorageFieldBlockT2();

+		}

+		

 		final String blockName = "kekztech_tfftstoragefieldblock2_block";

-		super.setBlockName(blockName);

-		super.setCreativeTab(CreativeTabs.tabMisc);

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

-		super.setHardness(5.0f);

-		super.setResistance(6.0f);

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

+		instance.setBlockName(blockName);

+		instance.setCreativeTab(CreativeTabs.tabMisc);

+		instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock2");

+		instance.setHardness(5.0f);

+		instance.setResistance(6.0f);

+		GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT2.class, blockName);

+		

+		return instance;

 	} 

 }

diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java
index 51741dc4fa..6b163d2b24 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java
@@ -3,33 +3,35 @@ package common.blocks;
 import cpw.mods.fml.common.registry.GameRegistry;

 import itemBlocks.IB_TFFTStorageFieldBlockT3;

 import kekztech.KekzCore;

+import net.minecraft.block.Block;

 import net.minecraft.block.material.Material;

 import net.minecraft.creativetab.CreativeTabs;

 

 public class Block_TFFTStorageFieldBlockT3 extends BaseGTUpdateableBlock {

 	

-	private static Block_TFFTStorageFieldBlockT3 instance = new Block_TFFTStorageFieldBlockT3();

+	private static Block_TFFTStorageFieldBlockT3 instance;

 	

 	private Block_TFFTStorageFieldBlockT3() {

-		// I am a singleton

 		super(Material.iron);

 	}

 	

-	public static Block_TFFTStorageFieldBlockT3 getInstance() {

-		return instance;

-	}

-	

 	public static int getCapacity() {

 		return 16000000;

 	}

 	

-	public void registerBlock() {

+	public static Block registerBlock() {

+		if(instance == null) {

+			instance = new Block_TFFTStorageFieldBlockT3();

+		}

+		

 		final String blockName = "kekztech_tfftstoragefieldblock3_block";

-		super.setBlockName(blockName);

-		super.setCreativeTab(CreativeTabs.tabMisc);

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

-		super.setHardness(5.0f);

-		super.setResistance(6.0f);

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

+		instance.setBlockName(blockName);

+		instance.setCreativeTab(CreativeTabs.tabMisc);

+		instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock3");

+		instance.setHardness(5.0f);

+		instance.setResistance(6.0f);

+		GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT3.class, blockName);

+		

+		return instance;

 	} 

 }

diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java
index 9a2bb9e3be..e46686a86a 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java
@@ -3,33 +3,35 @@ package common.blocks;
 import cpw.mods.fml.common.registry.GameRegistry;

 import itemBlocks.IB_TFFTStorageFieldBlockT4;

 import kekztech.KekzCore;

+import net.minecraft.block.Block;

 import net.minecraft.block.material.Material;

 import net.minecraft.creativetab.CreativeTabs;

 

 public class Block_TFFTStorageFieldBlockT4 extends BaseGTUpdateableBlock {

 	

-	private static Block_TFFTStorageFieldBlockT4 instance = new Block_TFFTStorageFieldBlockT4();

+	private static Block_TFFTStorageFieldBlockT4 instance;

 	

 	private Block_TFFTStorageFieldBlockT4() {

-		// I am a singleton

 		super(Material.iron);

 	}

 	

-	public static Block_TFFTStorageFieldBlockT4 getInstance() {

-		return instance;

-	}

-	

 	public static int getCapacity() {

 		return 64000000;

 	}

 	

-	public void registerBlock() {

+	public static Block registerBlock() {

+		if(instance == null) {

+			instance = new Block_TFFTStorageFieldBlockT4();

+		}

+		

 		final String blockName = "kekztech_tfftstoragefieldblock4_block";

-		super.setBlockName(blockName);

-		super.setCreativeTab(CreativeTabs.tabMisc);

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

-		super.setHardness(5.0f);

-		super.setResistance(6.0f);

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

+		instance.setBlockName(blockName);

+		instance.setCreativeTab(CreativeTabs.tabMisc);

+		instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock4");

+		instance.setHardness(5.0f);

+		instance.setResistance(6.0f);

+		GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT4.class, blockName);

+		

+		return instance;

 	} 

 }

diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java
index 437e0454f8..b53de1dc8a 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java
@@ -3,33 +3,35 @@ package common.blocks;
 import cpw.mods.fml.common.registry.GameRegistry;
 import itemBlocks.IB_TFFTStorageFieldBlockT5;
 import kekztech.KekzCore;
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 
 public class Block_TFFTStorageFieldBlockT5 extends BaseGTUpdateableBlock {
 	
-	private static Block_TFFTStorageFieldBlockT5 instance = new Block_TFFTStorageFieldBlockT5();
+	private static Block_TFFTStorageFieldBlockT5 instance;
 	
 	private Block_TFFTStorageFieldBlockT5() {
-		// I am a singleton
 		super(Material.iron);
 	}
 	
-	public static Block_TFFTStorageFieldBlockT5 getInstance() {
-		return instance;
-	}
-	
 	public static int getCapacity() {
 		return 256000000;
 	}
 	
-	public void registerBlock() {
+	public static Block registerBlock() {
+		if(instance == null) {
+			instance = new Block_TFFTStorageFieldBlockT5();
+		}
+		
 		final String blockName = "kekztech_tfftstoragefieldblock5_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock5");
-		super.setHardness(5.0f);
-		super.setResistance(6.0f);
-		GameRegistry.registerBlock(getInstance(), IB_TFFTStorageFieldBlockT5.class, blockName);
+		instance.setBlockName(blockName);
+		instance.setCreativeTab(CreativeTabs.tabMisc);
+		instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock5");
+		instance.setHardness(5.0f);
+		instance.setResistance(6.0f);
+		GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT5.class, blockName);
+		
+		return instance;
 	} 
 }
\ No newline at end of file
diff --git a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
index 7811b67233..421e1d2c2b 100644
--- a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
+++ b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
@@ -9,6 +9,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import items.Item_ThaumiumReinforcedJarFilled;
+import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
@@ -21,20 +22,22 @@ import thaumcraft.common.blocks.BlockJar;
 
 public class Block_ThaumiumReinforcedJar extends BlockJar {
 	
-	private static Block_ThaumiumReinforcedJar instance = new Block_ThaumiumReinforcedJar();
+	private static Block_ThaumiumReinforcedJar instance;
 	
 	private Block_ThaumiumReinforcedJar() {
 		super();
 	}
 	
-	public static Block_ThaumiumReinforcedJar getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
+	public static Block registerBlock() {
+		if(instance == null) {
+			instance = new Block_ThaumiumReinforcedJar();
+		}
+		
 		final String blockName = "kekztech_thaumiumreinforcedjar_block";
-		super.setBlockName(blockName);
-		GameRegistry.registerBlock(getInstance(), blockName);
+		instance.setBlockName(blockName);
+		GameRegistry.registerBlock(instance, blockName);
+		
+		return instance;
 	}
 	
 	@Override
diff --git a/src/main/java/common/blocks/Block_YSZUnit.java b/src/main/java/common/blocks/Block_YSZUnit.java
index 60b5603a3e..760ebf3d48 100644
--- a/src/main/java/common/blocks/Block_YSZUnit.java
+++ b/src/main/java/common/blocks/Block_YSZUnit.java
@@ -2,29 +2,31 @@ package common.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_YSZUnit extends BaseGTUpdateableBlock {

 	

-	private static Block_YSZUnit instance = new Block_YSZUnit();

+	private static Block_YSZUnit instance;

 	

 	private Block_YSZUnit() {

-		// I am a singleton

 		super(Material.iron);

 	}

 	

-	public static Block_YSZUnit getInstance() {

-		return instance;

-	}

-	

-	public void registerBlock() {

+	public static Block registerBlock() {

+		if(instance == null) {

+			instance = new Block_YSZUnit();

+		}

+		

 		final String blockName = "kekztech_yszceramicelectrolyteunit_block";

-		super.setBlockName(blockName);

-		super.setCreativeTab(CreativeTabs.tabMisc);

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

-		super.setHardness(5.0f);

-		super.setResistance(6.0f);

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

+		instance.setBlockName(blockName);

+		instance.setCreativeTab(CreativeTabs.tabMisc);

+		instance.setBlockTextureName(KekzCore.MODID + ":" + "YSZCeramicElectrolyteUnit");

+		instance.setHardness(5.0f);

+		instance.setResistance(6.0f);

+		GameRegistry.registerBlock(instance, blockName);

+		

+		return instance;

 	}

 }

diff --git a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java
index d362342366..98e0fabe80 100644
--- a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java
+++ b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java
@@ -21,6 +21,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;

 import org.lwjgl.input.Keyboard;

 

+import common.Blocks;

 import common.blocks.*;

 import util.MultiBlockTooltipBuilder;

 import util.Vector3i;

@@ -33,13 +34,13 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase {
 

 	private final static String glassNameAE2 = "tile.appliedenergistics2.BlockQuartzGlass";

 	private final static String glassNameStained = "tile.stainedGlass";

-	private final static Block CASING = Block_TFFTCasing.getInstance();

-	private final static Block_TFFTStorageFieldBlockT1 STORAGE_FIELD1 = Block_TFFTStorageFieldBlockT1.getInstance();

-	private final static Block_TFFTStorageFieldBlockT2 STORAGE_FIELD2 = Block_TFFTStorageFieldBlockT2.getInstance();

-	private final static Block_TFFTStorageFieldBlockT3 STORAGE_FIELD3 = Block_TFFTStorageFieldBlockT3.getInstance();

-	private final static Block_TFFTStorageFieldBlockT4 STORAGE_FIELD4 = Block_TFFTStorageFieldBlockT4.getInstance();

-	private final static Block_TFFTStorageFieldBlockT5 STORAGE_FIELD5 = Block_TFFTStorageFieldBlockT5.getInstance();

-	private final static Block MULTI_HATCH = Block_TFFTMultiHatch.getInstance();

+	private final static Block CASING = Blocks.tfftCasing;

+	private final static Block_TFFTStorageFieldBlockT1 STORAGE_FIELD1 = (Block_TFFTStorageFieldBlockT1) Blocks.tfftStorageField1;

+	private final static Block_TFFTStorageFieldBlockT2 STORAGE_FIELD2 = (Block_TFFTStorageFieldBlockT2) Blocks.tfftStorageField2;

+	private final static Block_TFFTStorageFieldBlockT3 STORAGE_FIELD3 = (Block_TFFTStorageFieldBlockT3) Blocks.tfftStorageField3;

+	private final static Block_TFFTStorageFieldBlockT4 STORAGE_FIELD4 = (Block_TFFTStorageFieldBlockT4) Blocks.tfftStorageField4;

+	private final static Block_TFFTStorageFieldBlockT5 STORAGE_FIELD5 = (Block_TFFTStorageFieldBlockT5) Blocks.tfftStorageField5;

+	private final static Block MULTI_HATCH = Blocks.tfftMultiHatch;

 	private final static int CASING_TEXTURE_ID = 176;

 

 	private MultiFluidHandler mfh;

diff --git a/src/main/java/common/tileentities/GTMTE_ItemServer.java b/src/main/java/common/tileentities/GTMTE_ItemServer.java
index 2dabe19d3d..cfff360ce4 100644
--- a/src/main/java/common/tileentities/GTMTE_ItemServer.java
+++ b/src/main/java/common/tileentities/GTMTE_ItemServer.java
@@ -5,6 +5,7 @@ import java.util.HashSet;
 
 import org.lwjgl.input.Keyboard;
 
+import common.Blocks;
 import common.blocks.Block_ItemServerDrive;
 import common.blocks.Block_ItemServerIOPort;
 import common.blocks.Block_ItemServerRackCasing;
@@ -31,9 +32,9 @@ public class GTMTE_ItemServer extends GT_MetaTileEntity_MultiBlockBase {
 	private static final int BASE_PER_ITEM_CAPACITY = 1024;
 	private static final int BASE_ITEM_TYPES_PER_SEGMENT = 4;
 	
-	private final Block_ItemServerDrive DRIVE = Block_ItemServerDrive.getInstance();
-	private final Block_ItemServerRackCasing CASING = Block_ItemServerRackCasing.getInstance();
-	private final Block_ItemServerIOPort IO_PORT = Block_ItemServerIOPort.getInstance();
+	private final Block_ItemServerDrive DRIVE = (Block_ItemServerDrive) Blocks.itemServerDrive;
+	private final Block_ItemServerRackCasing CASING = (Block_ItemServerRackCasing) Blocks.itemServerRackCasing;
+	private final Block_ItemServerIOPort IO_PORT = (Block_ItemServerIOPort) Blocks.itemServerIOPort;
 	private final String ALU_FRAME_BOX_NAME = "gt.blockmachines";
 	private final int ALU_FRAME_BOX_META = 6;
 	private final int CASING_TEXTURE_ID = 176;
diff --git a/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java b/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java
index e08c383997..dd912c0d04 100644
--- a/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java
+++ b/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java
@@ -3,13 +3,10 @@ package common.tileentities;
 import org.joml.Vector3i;

 import org.lwjgl.input.Keyboard;

 

-import common.blocks.Block_ControlRod;

-import common.blocks.Block_ReactorChamber_OFF;

-import common.blocks.Block_ReactorChamber_ON;

+import common.Blocks;

 import container.GUIContainer_ModularNuclearReactor;

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.Textures;

-import gregtech.api.gui.GT_GUIContainer_MultiMachine;

 import gregtech.api.interfaces.ITexture;

 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

@@ -27,9 +24,9 @@ public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBas
 	private final int CASING_META = 12;

 	private final int CASING_TEXTURE_ID = 44;

 	

-	private final Block CHAMBER_OFF = Block_ReactorChamber_OFF.getInstance();

-	private final Block CHAMBER_ON = Block_ReactorChamber_ON.getInstance();

-	private final Block CONTROL_ROD = Block_ControlRod.getInstance();

+	private final Block CHAMBER_OFF = Blocks.reactorChamberOFF;

+	private final Block CHAMBER_ON = Blocks.reactorChamberON;

+	private final Block CONTROL_ROD = Blocks.reactorControlRod;

 	

 	private boolean euMode = true;

 	

diff --git a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
index ee8fb9352f..76536f0e50 100644
--- a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
+++ b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
@@ -6,7 +6,7 @@ import java.util.Iterator;
 

 import org.lwjgl.input.Keyboard;

 

-import common.blocks.Block_YSZUnit;

+import common.Blocks;

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.Materials;

 import gregtech.api.enums.Textures;

@@ -230,7 +230,7 @@ public class GTMTE_SOFuelCellMK1  extends GT_MetaTileEntity_MultiBlockBase {
 					final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, Z);

 					if(X == 0 && Y == 0) {

 						if(!thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()

-								.equals(Block_YSZUnit.getInstance().getUnlocalizedName())) {

+								.equals(Blocks.yszUnit.getUnlocalizedName())) {

 							formationChecklist = false;

 						}

 						continue;

diff --git a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
index b9ca6aa25b..fb3fb7e9c7 100644
--- a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
+++ b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
@@ -6,7 +6,7 @@ import java.util.Iterator;
 

 import org.lwjgl.input.Keyboard;

 

-import common.blocks.Block_GDCUnit;

+import common.Blocks;

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.Materials;

 import gregtech.api.enums.Textures;

@@ -230,7 +230,7 @@ public class GTMTE_SOFuelCellMK2  extends GT_MetaTileEntity_MultiBlockBase {
 					final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, Z);

 					if(X == 0 && Y == 0) {

 						if(!thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()

-								.equals(Block_GDCUnit.getInstance().getUnlocalizedName())) {

+								.equals(Blocks.gdcUnit.getUnlocalizedName())) {

 							formationChecklist = false;

 						}

 						continue;

diff --git a/src/main/java/common/tileentities/TE_TFFTMultiHatch.java b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java
index 217ff2ad8f..74f5d7d2d2 100644
--- a/src/main/java/common/tileentities/TE_TFFTMultiHatch.java
+++ b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java
@@ -3,11 +3,7 @@ package common.tileentities;
 import java.util.Iterator;
 import java.util.List;
 
-import common.blocks.Block_TFFTStorageFieldBlockT1;
-import common.blocks.Block_TFFTStorageFieldBlockT2;
-import common.blocks.Block_TFFTStorageFieldBlockT3;
-import common.blocks.Block_TFFTStorageFieldBlockT4;
-import common.blocks.Block_TFFTStorageFieldBlockT5;
+import common.Blocks;
 import kekztech.MultiFluidHandler;
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
@@ -101,11 +97,11 @@ public class TE_TFFTMultiHatch extends TileEntity implements IFluidHandler {
 			
 			final Block b = this.getWorldObj().getBlock(this.xCoord + direction.offsetX, this.yCoord + direction.offsetY, this.zCoord + direction.offsetZ);
 			if(b != null && (
-					b.equals(Block_TFFTStorageFieldBlockT1.getInstance())
-					|| b.equals(Block_TFFTStorageFieldBlockT2.getInstance())
-					|| b.equals(Block_TFFTStorageFieldBlockT3.getInstance())
-					|| b.equals(Block_TFFTStorageFieldBlockT4.getInstance())
-					|| b.equals(Block_TFFTStorageFieldBlockT5.getInstance()))) {
+					b.equals(Blocks.tfftStorageField1)
+					|| b.equals(Blocks.tfftStorageField2)
+					|| b.equals(Blocks.tfftStorageField3)
+					|| b.equals(Blocks.tfftStorageField4)
+					|| b.equals(Blocks.tfftStorageField5))) {
 				return direction.getOpposite();
 			}
 		}
diff --git a/src/main/java/items/Item_IchorJarFilled.java b/src/main/java/items/Item_IchorJarFilled.java
index f6072eee7f..1b62c3f29f 100644
--- a/src/main/java/items/Item_IchorJarFilled.java
+++ b/src/main/java/items/Item_IchorJarFilled.java
@@ -1,11 +1,10 @@
 package items;
 
-import common.blocks.Block_IchorJar;
+import common.Blocks;
 import common.tileentities.TE_IchorJar;
 import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
@@ -37,10 +36,10 @@ public class Item_IchorJarFilled extends ItemJarFilled {
 			float par8, float par9, float par10) {
 		
 		final Block block = world.getBlock(x, y, z);
-		if(block == Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) {
+		if(block == net.minecraft.init.Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) {
 			side = 1;
-		} else if(block != Blocks.vine && block != Blocks.tallgrass 
-				&& block != Blocks.deadbush && !block.isReplaceable(world, x, y, z)) {
+		} else if(block != net.minecraft.init.Blocks.vine && block != net.minecraft.init.Blocks.tallgrass 
+				&& block != net.minecraft.init.Blocks.deadbush && !block.isReplaceable(world, x, y, z)) {
 			// Displace target location if original target can't be replaced
 			if(side == 0) {
 				y--;
@@ -66,10 +65,10 @@ public class Item_IchorJarFilled extends ItemJarFilled {
 			return false;
 		} else if(!player.canPlayerEdit(x, y, z, side, stack)) {
 			return false;
-		} else if(world.canPlaceEntityOnSide(Block_IchorJar.getInstance(), x, y, z, 
+		} else if(world.canPlaceEntityOnSide(Blocks.jarIchor, x, y, z, 
 				false, side, player, stack)) {
 			
-			final Block jar = Block_IchorJar.getInstance();
+			final Block jar = Blocks.jarIchor;
 			final int meta = this.getMetadata(stack.getItemDamage());
 			final int idk = block.onBlockPlaced(world, x, y, z, side, par8, par9, par10, meta);
 			
@@ -105,12 +104,12 @@ public class Item_IchorJarFilled extends ItemJarFilled {
 	@Override
 	public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
 			float hitX, float hitY, float hitZ, int metadata) {
-		if (!world.setBlock(x, y, z, Block_IchorJar.getInstance(), metadata, 3)) {
+		if (!world.setBlock(x, y, z, Blocks.jarIchor, metadata, 3)) {
 			return false;
 		} else {
-			if (world.getBlock(x, y, z) == Block_IchorJar.getInstance()) {
-				Block_IchorJar.getInstance().onBlockPlacedBy(world, x, y, z, player, stack);
-				Block_IchorJar.getInstance().onPostBlockPlaced(world, x, y, z, metadata);
+			if (world.getBlock(x, y, z) == Blocks.jarIchor) {
+				Blocks.jarIchor.onBlockPlacedBy(world, x, y, z, player, stack);
+				Blocks.jarIchor.onPostBlockPlaced(world, x, y, z, metadata);
 			}
 
 			return true;
diff --git a/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java b/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java
index 4f8775b714..47b37837b7 100644
--- a/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java
+++ b/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java
@@ -1,11 +1,10 @@
 package items;
 
-import common.blocks.Block_ThaumiumReinforcedJar;
+import common.Blocks;
 import common.tileentities.TE_ThaumiumReinforcedJar;
 import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
@@ -37,10 +36,10 @@ public class Item_ThaumiumReinforcedJarFilled extends ItemJarFilled {
 			float par8, float par9, float par10) {
 		
 		final Block block = world.getBlock(x, y, z);
-		if(block == Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) {
+		if(block == net.minecraft.init.Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) {
 			side = 1;
-		} else if(block != Blocks.vine && block != Blocks.tallgrass 
-				&& block != Blocks.deadbush && !block.isReplaceable(world, x, y, z)) {
+		} else if(block != net.minecraft.init.Blocks.vine && block != net.minecraft.init.Blocks.tallgrass 
+				&& block != net.minecraft.init.Blocks.deadbush && !block.isReplaceable(world, x, y, z)) {
 			// Displace target location if original target can't be replaced
 			if(side == 0) {
 				y--;
@@ -66,10 +65,10 @@ public class Item_ThaumiumReinforcedJarFilled extends ItemJarFilled {
 			return false;
 		} else if(!player.canPlayerEdit(x, y, z, side, stack)) {
 			return false;
-		} else if(world.canPlaceEntityOnSide(Block_ThaumiumReinforcedJar.getInstance(), x, y, z, 
+		} else if(world.canPlaceEntityOnSide(Blocks.jarThaumiumReinforced, x, y, z, 
 				false, side, player, stack)) {
 			
-			final Block jar = Block_ThaumiumReinforcedJar.getInstance();
+			final Block jar = Blocks.jarThaumiumReinforced;
 			final int meta = this.getMetadata(stack.getItemDamage());
 			final int idk = block.onBlockPlaced(world, x, y, z, side, par8, par9, par10, meta);
 			
@@ -105,12 +104,12 @@ public class Item_ThaumiumReinforcedJarFilled extends ItemJarFilled {
 	@Override
 	public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
 			float hitX, float hitY, float hitZ, int metadata) {
-		if (!world.setBlock(x, y, z, Block_ThaumiumReinforcedJar.getInstance(), metadata, 3)) {
+		if (!world.setBlock(x, y, z, Blocks.jarThaumiumReinforced, metadata, 3)) {
 			return false;
 		} else {
-			if (world.getBlock(x, y, z) == Block_ThaumiumReinforcedJar.getInstance()) {
-				Block_ThaumiumReinforcedJar.getInstance().onBlockPlacedBy(world, x, y, z, player, stack);
-				Block_ThaumiumReinforcedJar.getInstance().onPostBlockPlaced(world, x, y, z, metadata);
+			if (world.getBlock(x, y, z) == Blocks.jarThaumiumReinforced) {
+				Blocks.jarThaumiumReinforced.onBlockPlacedBy(world, x, y, z, player, stack);
+				Blocks.jarThaumiumReinforced.onPostBlockPlaced(world, x, y, z, metadata);
 			}
 
 			return true;
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 4d05961490..8605d4f5b9 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -1,5 +1,6 @@
 package kekztech;

 

+import common.Blocks;

 import common.Recipes;

 import common.blocks.Block_ControlRod;

 import common.blocks.Block_GDCUnit;

@@ -73,28 +74,7 @@ public class KekzCore {
 		

 		Item_ThaumiumReinforcedJarFilled.getInstance().registerItem();

 		

-		// Blocks

-		Block_YSZUnit.getInstance().registerBlock();

-		Block_GDCUnit.getInstance().registerBlock();

-		Block_TFFTCasing.getInstance().registerBlock();

-		Block_TFFTStorageFieldBlockT1.getInstance().registerBlock();

-		Block_TFFTStorageFieldBlockT2.getInstance().registerBlock();

-		Block_TFFTStorageFieldBlockT3.getInstance().registerBlock();

-		Block_TFFTStorageFieldBlockT4.getInstance().registerBlock();

-		Block_TFFTStorageFieldBlockT5.getInstance().registerBlock();

-		Block_TFFTMultiHatch.getInstance().registerBlock();

-		Block_ReactorChamber_OFF.getInstance().registerBlock();

-		Block_ReactorChamber_ON.getInstance().registerBlock();

-		Block_ControlRod.getInstance().registerBlock();

-		//Block_ItemServerDrive.getInstance().registerBlock();

-		//Block_ItemServerRackCasing.getInstance().registerBlock();

-		//Block_ItemServerIOPort.getInstance().registerBlock();

-		//Block_ItemProxyCable.getInstance().registerBlock();

-		//Block_ItemProxySource.getInstance().registerBlock();

-		//Block_ItemProxyEndpoint.getInstance().registerBlock();

-		

-		Block_ThaumiumReinforcedJar.getInstance().registerBlock();

-		Block_IchorJar.getInstance().registerBlock();

+		Blocks.init();

 		

 		// Register TileEntities

 		GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile");