1 files changed, 29 insertions, 10 deletions

diff --git a/src/Items/ItemHandler.h b/src/Items/ItemHandler.h
index 4993eac85..1d5f59f3e 100644
--- a/src/Items/ItemHandler.h
+++ b/src/Items/ItemHandler.h
@@ -19,6 +19,13 @@ class cPlayer;
 class cItemHandler
 {
 public:
+
+	enum eDurabilityLostAction
+	{
+		dlaBreakBlock,
+		dlaAttackEntity,
+	};
+
 	cItemHandler(int a_ItemType);
 	
 	/** Force virtual destructor */
@@ -28,7 +35,7 @@ public:
 	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir);
 	
 	/** Called when the client sends the SHOOT status in the lclk packet */
-	virtual void OnItemShoot(cPlayer *, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) 
+	virtual void OnItemShoot(cPlayer *, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace)
 	{
 		UNUSED(a_BlockX);
 		UNUSED(a_BlockY);
@@ -48,11 +55,17 @@ public:
 	virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_HeldItem, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace);
 	
 	/** Called when the player destroys a block using this item. This also calls the drop function for the destroyed block */
-	virtual void OnBlockDestroyed(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_X, int a_Y, int a_Z);
+	virtual void OnBlockDestroyed(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ);
+
+	/** Called when a player attacks a other entity. */
+	virtual void OnEntityAttack(cPlayer * a_Attacker, cEntity * a_AttackedEntity);
 	
 	/** Called after the player has eaten this item. */
 	virtual void OnFoodEaten(cWorld *a_World, cPlayer *a_Player, cItem *a_Item);
-	
+
+	/** Get the durability lost which the item will get, when a specified action was performed. */
+	virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action);
+
 	/** Returns the maximum stack size for a given item */
 	virtual char GetMaxStackSize(void);
 
@@ -60,7 +73,7 @@ public:
 	{
 		double Saturation;
 		int    FoodLevel;
-		int    PoisonChance;	 // 0 - 100, in percent. 0 = no chance of poisoning, 100 = sure poisoning
+		int    PoisonChance;	  // 0 - 100, in percent. 0 = no chance of poisoning, 100 = sure poisoning
 
 		FoodInfo(int a_FoodLevel, double a_Saturation, int a_PoisonChance = 0) :
 			Saturation(a_Saturation),
@@ -82,21 +95,27 @@ public:
 	/** Indicates if this item is food */
 	virtual bool IsFood(void);
 	
+	/** Indicates if this item is drinkable */
+	virtual bool IsDrinkable(short a_ItemDamage);
+	
 	/** Blocks simply get placed */
 	virtual bool IsPlaceable(void);
 
-	/** Called before a block is placed	into a world.
+	/** Can the anvil repair this item, when a_Item is the second input? */
+	virtual bool CanRepairWithRawMaterial(short a_ItemType);
+
+	/** Called before a block is placed into a world.
 	The handler should return true to allow placement, false to refuse.
 	Also, the handler should set a_BlockType and a_BlockMeta to correct values for the newly placed block.
 	*/
 	virtual bool GetPlacementBlockTypeMeta(
 		cWorld * a_World, cPlayer * a_Player,
-		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, 
+		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
 	);
 	
-	/** Returns whether this tool/item can harvest a specific block (e.g. wooden pickaxe can harvest stone, but wood can�t) DEFAULT: False */
+	/** Returns whether this tool/item can harvest a specific block (e.g. wooden pickaxe can harvest stone, but wood can't) DEFAULT: False */
 	virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType);
 
 	static cItemHandler * GetItemHandler(int a_ItemType);
@@ -106,11 +125,11 @@ public:
 	
 protected:
 	int m_ItemType;
-	static cItemHandler *CreateItemHandler(int m_ItemType);
+	static cItemHandler * CreateItemHandler(int m_ItemType);
 
 	static cItemHandler * m_ItemHandler[E_ITEM_LAST + 1];
-	static bool m_HandlerInitialized;	//used to detect if the itemhandlers are initialized
+	static bool m_HandlerInitialized;  // used to detect if the itemhandlers are initialized
 };
 
-//Short function
+// Short function
 inline cItemHandler *ItemHandler(int a_ItemType) { return cItemHandler::GetItemHandler(a_ItemType); }