+ Added some MultiPickaxes.

% Improved a few aspects of the Tunnel Digger pickaxe.
$ Tried fixing some bad names with spaces where they should be.

2 files changed, 23 insertions, 6 deletions

diff --git a/src/Java/miscutil/core/block/base/BasicBlock.java b/src/Java/miscutil/core/block/base/BasicBlock.java
index 9fd57b510f..385ba8d266 100644
--- a/src/Java/miscutil/core/block/base/BasicBlock.java
+++ b/src/Java/miscutil/core/block/base/BasicBlock.java
@@ -2,6 +2,7 @@ package miscutil.core.block.base;
 
 import miscutil.core.creative.AddToCreativeTab;
 import miscutil.core.lib.CORE;
+import miscutil.core.util.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 
@@ -9,7 +10,7 @@ public class BasicBlock extends Block {
 
     public BasicBlock(String unlocalizedName, Material material) {
         super(material);
-        this.setBlockName(unlocalizedName);
+        this.setBlockName(Utils.sanitizeString(unlocalizedName));
         this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
         this.setCreativeTab(AddToCreativeTab.tabBlock);
         this.setHardness(2.0F);
diff --git a/src/Java/miscutil/core/block/base/BlockBaseModular.java b/src/Java/miscutil/core/block/base/BlockBaseModular.java
index 79817d6759..311c34b2cc 100644
--- a/src/Java/miscutil/core/block/base/BlockBaseModular.java
+++ b/src/Java/miscutil/core/block/base/BlockBaseModular.java
@@ -3,6 +3,7 @@ package miscutil.core.block.base;
 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.math.MathUtils;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -27,7 +28,7 @@ public class BlockBaseModular extends BasicBlock{
 		this.thisBlock = blockType;
 		this.thisBlockMaterial = blockMaterial;
 		this.thisBlockType = blockType.name().toUpperCase();
-		this.setBlockName(getLocalizedName());
+		this.setBlockName(GetProperName());
 		
 		if (!CORE.DEBUG){
 			//Utils.LOG_INFO("=============Block Info Dump=============");
@@ -54,15 +55,15 @@ public class BlockBaseModular extends BasicBlock{
 		
 		//setOreDict(unlocalizedName, blockType);
 		if (thisBlockType == BlockTypes.STANDARD.name().toUpperCase()){
-			GameRegistry.registerBlock(this, ItemBlockGtBlock.class, blockType.getTexture()+unlocalizedName);	
+			GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName));	
 			//Utils.LOG_INFO("Registered Block in Block Registry as: "+"Block of "+blockMaterial);		
 		}
 		else if (thisBlockType == BlockTypes.FRAME.name().toUpperCase()){
-			GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, blockType.getTexture()+unlocalizedName);
+			GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName));
 			//Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box");			
 		}
 		else {
-			GameRegistry.registerBlock(this, ItemBlockGtBlock.class, blockType.getTexture()+unlocalizedName);
+			GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName));
 			//Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial);	
 		}
 		
@@ -82,7 +83,7 @@ public class BlockBaseModular extends BasicBlock{
 		return 0;
 	}
 	
-	@Override
+	/*@Override
 	public String getLocalizedName() {
 		String tempIngot;	
 		if (thisBlock == BlockTypes.STANDARD){
@@ -96,6 +97,21 @@ public class BlockBaseModular extends BasicBlock{
 			tempIngot = getUnlocalizedName().replace("tile.blockGt", "ingot");
 		}
 		return tempIngot;
+	}*/
+	
+	public String GetProperName() {
+		String tempIngot;	
+		if (thisBlock == BlockTypes.STANDARD){
+			tempIngot = "Block of "+thisBlockMaterial;
+		}
+		else if (thisBlock == BlockTypes.FRAME){
+			tempIngot = thisBlockMaterial + " Frame Box";
+		}
+		else {
+
+			tempIngot = getUnlocalizedName().replace("tile.blockGt", "ingot");
+		}
+		return tempIngot;
 	}
 
 	@Override