--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java	0000-00-00 00:00:00.000000000 -0000
@@ -1,13 +1,15 @@
 package net.minecraft.src;
 
+import net.minecraft.src.forge.ForgeHooks;
+
 public class ItemTool extends Item
 {
     /** Array of blocks the tool has extra effect against. */
     private Block[] blocksEffectiveAgainst;
-    protected float efficiencyOnProperMaterial = 4.0F;
+    public float efficiencyOnProperMaterial = 4.0F;
 
     /** Damage versus entities. */
-    private int damageVsEntity;
+    public int damageVsEntity;
 
     /** The material this tool is made from. */
     protected EnumToolMaterial toolMaterial;
@@ -71,4 +73,15 @@
     {
         return this.toolMaterial.getEnchantability();
     }
+    
+    /** FORGE: Overridden to allow custom tool effectiveness */
+    @Override
+    public float getStrVsBlock(ItemStack stack, Block block, int meta) 
+    {
+        if (ForgeHooks.isToolEffective(stack, block, meta))
+        {
+            return efficiencyOnProperMaterial;
+        }
+        return getStrVsBlock(stack, block);
+    }
 }