2011-10-10 23:47:30 +00:00
|
|
|
--- ../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
|
2012-03-05 04:46:15 +00:00
|
|
|
@@ -1,13 +1,15 @@
|
2011-10-09 04:21:29 +00:00
|
|
|
package net.minecraft.src;
|
|
|
|
|
|
|
|
+import net.minecraft.src.forge.ForgeHooks;
|
2012-01-15 19:16:08 +00:00
|
|
|
+
|
|
|
|
public class ItemTool extends Item
|
2011-11-30 19:00:43 +00:00
|
|
|
{
|
2012-03-05 04:46:15 +00:00
|
|
|
/** 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. */
|
2011-11-30 19:00:43 +00:00
|
|
|
- private int damageVsEntity;
|
|
|
|
+ public int damageVsEntity;
|
|
|
|
|
2012-03-05 04:46:15 +00:00
|
|
|
/** The material this tool is made from. */
|
|
|
|
protected EnumToolMaterial toolMaterial;
|
|
|
|
@@ -61,4 +63,15 @@
|
|
|
|
{
|
|
|
|
return this.toolMaterial.getEnchantability();
|
2011-10-09 04:21:29 +00:00
|
|
|
}
|
2012-03-05 04:46:15 +00:00
|
|
|
+
|
|
|
|
+ /** FORGE: Overridden to allow custom tool effectiveness */
|
2012-01-15 19:16:08 +00:00
|
|
|
+ @Override
|
2012-03-05 04:46:15 +00:00
|
|
|
+ public float getStrVsBlock(ItemStack stack, Block block, int meta)
|
2012-01-15 19:16:08 +00:00
|
|
|
+ {
|
2012-03-05 04:46:15 +00:00
|
|
|
+ if (ForgeHooks.isToolEffective(stack, block, meta))
|
2012-01-15 19:16:08 +00:00
|
|
|
+ {
|
|
|
|
+ return efficiencyOnProperMaterial;
|
|
|
|
+ }
|
2012-03-05 04:46:15 +00:00
|
|
|
+ return getStrVsBlock(stack, block);
|
2011-10-09 04:21:29 +00:00
|
|
|
+ }
|
2012-03-05 04:46:15 +00:00
|
|
|
}
|