Merge branch 'master' of https://github.com/WayofTime/BloodMagic

build.properties

@@ -1,5 +1,5 @@
 #
-#Sun Jul 19 14:39:17 EDT 2015
+#Mon Jul 20 20:59:46 EDT 2015
 mod_name=BloodMagic
 forge_version=10.13.4.1448-1.7.10
 ccc_version=1.0.4.29
@@ -9,5 +9,5 @@ guideapi_version=1.0.1-20
 package_group=com.wayoftime.bloodmagic
 mod_version=1.3.3
 minetweaker_version=Dev-1.7.10-3.0.9B
+build_number=12
 mc_version=1.7.10
-build_number=11

src/main/java/WayofTime/alchemicalWizardry/api/items/ItemSpellMultiTool.java

@@ -285,7 +285,12 @@ public class ItemSpellMultiTool extends Item
 
         if (toolClass == null || toolClass.equals(""))
         {
-            return 1.0f;
+        	toolClass = getToolClassOfMaterial(block.getMaterial());
+        	
+        	if(toolClass == "")
+        	{
+                return 1.0f;
+        	}
         }
         {
             if (stack.hasTagCompound())
@@ -301,6 +306,26 @@ public class ItemSpellMultiTool extends Item
 
         return 1.0f;
     }
+    
+    public String getToolClassOfMaterial(Material mat)
+    {
+        if(mat == Material.iron || mat == Material.anvil || mat == Material.rock)
+        {
+        	return "pickaxe";
+        }
+
+        if(mat == Material.wood || mat == Material.plants || mat == Material.vine)
+        {
+        	return "axe";
+        }
+        
+        if(mat == Material.ground || mat == Material.grass)
+        {
+        	return "shovel";
+        }
+    	
+    	return "";
+    }
 
     @Override
     public int getHarvestLevel(ItemStack stack, String toolClass)