+ Materials handler now generates blocks and frames from each metal.

+ Static materials added are now added dynamically with no side effects.
+ Added some new Materials.

3 files changed, 22 insertions, 21 deletions

diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java
index e4010f1c95..a59ba21bc7 100644
--- a/src/Java/miscutil/core/block/ModBlocks.java
+++ b/src/Java/miscutil/core/block/ModBlocks.java
@@ -1,11 +1,8 @@
 package miscutil.core.block;
 
 import miscutil.core.block.base.BasicBlock;
-import miscutil.core.block.base.BasicBlock.BlockTypes;
-import miscutil.core.block.base.BlockBaseModular;
 import miscutil.core.block.general.LightGlass;
 import miscutil.core.block.general.fluids.FluidRegistryHandler;
-import miscutil.core.item.base.itemblock.ItemBlockGtFrameBox;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
 import miscutil.core.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
@@ -74,9 +71,9 @@ public final class ModBlocks {
 
 		//GtFrames
 		//GameRegistry.registerBlock(blockGtFrameSet1 = new BlockGtFrameBox("blockGtFrameSet1", Material.iron ,BlockTypes.FRAME, true, Utils.rgbtoHexValue(68, 75, 66), Utils.rgbtoHexValue(68, 75, 166), Utils.rgbtoHexValue(122, 135, 196)), "blockGtFrameSet1");
-		GameRegistry.registerBlock(blockGtFrameTantalloy60 = new BlockBaseModular("blockGtFrameStaballoy", "Staballoy", BlockTypes.FRAME, Utils.rgbtoHexValue(68, 75, 66)), ItemBlockGtFrameBox.class, "blockGtFrameStaballoy");
-		GameRegistry.registerBlock(blockGtFrameTantalloy60 = new BlockBaseModular("blockGtFrameTantalloy60", "Tantalloy-60", BlockTypes.FRAME, Utils.rgbtoHexValue(68, 75, 166)), ItemBlockGtFrameBox.class, "blockGtFrameTantalloy60");
-		GameRegistry.registerBlock(blockGtFrameTantalloy61 = new BlockBaseModular("blockGtFrameTantalloy61", "Tantalloy-61", BlockTypes.FRAME, Utils.rgbtoHexValue(122, 135, 196)), ItemBlockGtFrameBox.class, "blockGtFrameTantalloy61");
+		//GameRegistry.registerBlock(blockGtFrameTantalloy60 = new BlockBaseModular("blockGtFrameStaballoy", "Staballoy", BlockTypes.FRAME, Utils.rgbtoHexValue(68, 75, 66)), ItemBlockGtFrameBox.class, "blockGtFrameStaballoy");
+		//GameRegistry.registerBlock(blockGtFrameTantalloy60 = new BlockBaseModular("blockGtFrameTantalloy60", "Tantalloy-60", BlockTypes.FRAME, Utils.rgbtoHexValue(68, 75, 166)), ItemBlockGtFrameBox.class, "blockGtFrameTantalloy60");
+		//GameRegistry.registerBlock(blockGtFrameTantalloy61 = new BlockBaseModular("blockGtFrameTantalloy61", "Tantalloy-61", BlockTypes.FRAME, Utils.rgbtoHexValue(122, 135, 196)), ItemBlockGtFrameBox.class, "blockGtFrameTantalloy61");
 	}
 
 }
\ No newline at end of file
diff --git a/src/Java/miscutil/core/block/base/BasicBlock.java b/src/Java/miscutil/core/block/base/BasicBlock.java
index 284342b197..9fd57b510f 100644
--- a/src/Java/miscutil/core/block/base/BasicBlock.java
+++ b/src/Java/miscutil/core/block/base/BasicBlock.java
@@ -21,8 +21,8 @@ public class BasicBlock extends Block {
 
     
     public static enum BlockTypes {
-    	STANDARD("block", "pickaxe", soundTypeStone),
-    	FRAME("blockGtFrame", "wrench", soundTypeMetal);
+    	STANDARD("blockBlock", "pickaxe", soundTypeStone),
+    	FRAME("blockFrameGt", "wrench", soundTypeMetal);
     
     	private String TEXTURE_NAME;
     	private String HARVEST_TOOL;
diff --git a/src/Java/miscutil/core/block/base/BlockBaseModular.java b/src/Java/miscutil/core/block/base/BlockBaseModular.java
index 613320b801..fedfc1c391 100644
--- a/src/Java/miscutil/core/block/base/BlockBaseModular.java
+++ b/src/Java/miscutil/core/block/base/BlockBaseModular.java
@@ -1,13 +1,13 @@
 package miscutil.core.block.base;
 
-import gregtech.api.util.GT_OreDictUnificator;
+import miscutil.core.item.base.itemblock.ItemBlockGtBlock;
+import miscutil.core.item.base.itemblock.ItemBlockGtFrameBox;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.Item;
 import net.minecraft.world.IBlockAccess;
+import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -19,7 +19,7 @@ public class BlockBaseModular extends BasicBlock{
 	protected String thisBlockMaterial;
 
 	public BlockBaseModular(String unlocalizedName, String blockMaterial,  BlockTypes blockType, int colour) {
-		super(unlocalizedName, Material.iron);
+		super(blockType.getTexture()+unlocalizedName, Material.iron);
 		this.setHarvestLevel(blockType.getHarvestTool(), 2);
 		this.setBlockTextureName(CORE.MODID+":"+blockType.getTexture());
 		this.blockColour = colour;
@@ -27,7 +27,14 @@ public class BlockBaseModular extends BasicBlock{
 		this.thisBlockMaterial = blockMaterial;
 		this.setBlockName(getLocalizedName());
 		LanguageRegistry.addName(this, getLocalizedName());
-		setOreDict(unlocalizedName, blockType);
+		//setOreDict(unlocalizedName, blockType);
+		if (thisBlock == BlockTypes.STANDARD){
+			GameRegistry.registerBlock(this, ItemBlockGtBlock.class, blockType.getTexture()+unlocalizedName);			
+		}
+		else if (thisBlock == BlockTypes.FRAME){
+			GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, blockType.getTexture()+unlocalizedName);			
+		}
+		
 		
 	}
 
@@ -44,16 +51,13 @@ public class BlockBaseModular extends BasicBlock{
 		return 0;
 	}
 	
-	private void setOreDict(String unlocalizedName, BlockTypes blockType){
-		if (blockType == BlockTypes.FRAME){
-			GT_OreDictUnificator.registerOre(unlocalizedName.replace("BlockGtFrame", "frameGt"),UtilsItems.getSimpleStack(Item.getItemFromBlock(this)));
-		}
-	}
-	
 	@Override
 	public String getLocalizedName() {
-		String tempIngot = getUnlocalizedName().replace("tile.blockGtFrame", "");	
-		if (thisBlock == BlockTypes.FRAME){
+		String tempIngot;	
+		if (thisBlock == BlockTypes.STANDARD){
+			tempIngot = "Block of "+thisBlockMaterial;
+		}
+		else if (thisBlock == BlockTypes.FRAME){
 			tempIngot = thisBlockMaterial + " Frame Box";
 		}
 		else {