+ Added Frameboxes with Colours and Names.

+ Added config option for the Division Sigil.

2 files changed, 48 insertions, 9 deletions

diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java
index 392579eb99..e4010f1c95 100644
--- a/src/Java/miscutil/core/block/ModBlocks.java
+++ b/src/Java/miscutil/core/block/ModBlocks.java
@@ -2,9 +2,10 @@ 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.block.machine.BlockGtFrameBox;
+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;
@@ -29,7 +30,7 @@ public final class ModBlocks {
 
 	public static Fluid fluidJackDaniels = new Fluid("fluidJackDaniels");
 	public static Block blockFluidJackDaniels; 
-	public static Block blockGtFrameSet1;
+	public static Block blockGtFrameStaballoy;
 	public static Block blockGtFrameTantalloy60;
 	public static Block blockGtFrameTantalloy61;
 
@@ -72,10 +73,10 @@ public final class ModBlocks {
 		//GameRegistry.registerBlock(blockGriefSaver, "blockGriefSaver");
 
 		//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("blockGtFrameTantalloy60", BlockTypes.FRAME, Utils.rgbtoHexValue(68, 75, 166)), "blockGtFrameTantalloy60");
-		//GameRegistry.registerBlock(blockGtFrameTantalloy61 = new BlockBaseModular("blockGtFrameTantalloy61", BlockTypes.FRAME, Utils.rgbtoHexValue(122, 135, 196)), "blockGtFrameTantalloy61");
-
+		//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");
 	}
 
 }
\ No newline at end of file
diff --git a/src/Java/miscutil/core/block/base/BlockBaseModular.java b/src/Java/miscutil/core/block/base/BlockBaseModular.java
index f8d965f6d7..19f40c4ef0 100644
--- a/src/Java/miscutil/core/block/base/BlockBaseModular.java
+++ b/src/Java/miscutil/core/block/base/BlockBaseModular.java
@@ -1,9 +1,11 @@
 package miscutil.core.block.base;
 
 import miscutil.core.lib.CORE;
+import miscutil.core.util.Utils;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.world.IBlockAccess;
+import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -11,13 +13,17 @@ public class BlockBaseModular extends BasicBlock{
 
 	protected int blockColour;
 	protected BlockTypes thisBlock;
+	protected String thisBlockMaterial;
 
-	public BlockBaseModular(String unlocalizedName, BlockTypes blockType, int colour) {
+	public BlockBaseModular(String unlocalizedName, String blockMaterial,  BlockTypes blockType, int colour) {
 		super(unlocalizedName, Material.iron);
 		this.setHarvestLevel(blockType.getHarvestTool(), 2);
 		this.setBlockTextureName(CORE.MODID+":"+blockType.getTexture());
 		this.blockColour = colour;
 		this.thisBlock = blockType;
+		this.thisBlockMaterial = blockMaterial;
+		this.setBlockName(getLocalizedName());
+		LanguageRegistry.addName(this, getLocalizedName());
 	}
 
 	/**
@@ -27,13 +33,26 @@ public class BlockBaseModular extends BasicBlock{
 	@SideOnly(Side.CLIENT)
 	public int getRenderBlockPass()
 	{
-		if (thisBlock.name() == BlockTypes.FRAME.name()){
+		if (thisBlock == BlockTypes.FRAME){
 			return 1;			
 		}
 		return 0;
 	}
 	
 	@Override
+	public String getLocalizedName() {
+		String tempIngot = getUnlocalizedName().replace("tile.blockGtFrame", "");	
+		if (thisBlock == BlockTypes.FRAME){
+			tempIngot = thisBlockMaterial + " Frame Box";
+		}
+		else {
+
+			tempIngot = getUnlocalizedName().replace("tile.blockGt", "ingot");
+		}
+		return tempIngot;
+	}
+
+	@Override
 	public boolean isOpaqueCube()
     {
 	    return false;
@@ -47,7 +66,26 @@ public class BlockBaseModular extends BasicBlock{
 	}
 
 	@Override
-	public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4){
+	public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4){		
+		
+		if (this.blockColour == 0){
+			return Utils.generateSingularRandomHexValue();
+		}
+		
+		return this.blockColour;
+	}
+	
+    @Override
+	public int getRenderColor(int aMeta) {
+    	if (this.blockColour == 0){
+			return Utils.generateSingularRandomHexValue();
+		}
+		
+		return this.blockColour;
+    }
+
+	@Override
+	public int getBlockColor() {
 		return this.blockColour;
 	}