6 files changed, 108 insertions, 0 deletions

diff --git a/src/Items/ItemArmor.h b/src/Items/ItemArmor.h
index 08cddb1ad..f53100bb1 100644
--- a/src/Items/ItemArmor.h
+++ b/src/Items/ItemArmor.h
@@ -60,6 +60,49 @@ public:
 		return true;
 	}
 
+	virtual bool CanRepairWithItem(const cItem & a_Item) override
+	{
+		switch (m_ItemType)
+		{
+			case E_ITEM_CHAIN_BOOTS:
+			case E_ITEM_CHAIN_CHESTPLATE:
+			case E_ITEM_CHAIN_HELMET:
+			case E_ITEM_CHAIN_LEGGINGS:
+			{
+				return (a_Item.m_ItemType == E_ITEM_IRON);
+			}
+			case E_ITEM_DIAMOND_BOOTS:
+			case E_ITEM_DIAMOND_CHESTPLATE:
+			case E_ITEM_DIAMOND_HELMET:
+			case E_ITEM_DIAMOND_LEGGINGS:
+			{
+				return (a_Item.m_ItemType == E_ITEM_DIAMOND);
+			}
+			case E_ITEM_IRON_BOOTS:
+			case E_ITEM_IRON_CHESTPLATE:
+			case E_ITEM_IRON_HELMET:
+			case E_ITEM_IRON_LEGGINGS:
+			{
+				return (a_Item.m_ItemType == E_ITEM_IRON);
+			}
+			case E_ITEM_GOLD_BOOTS:
+			case E_ITEM_GOLD_CHESTPLATE:
+			case E_ITEM_GOLD_HELMET:
+			case E_ITEM_GOLD_LEGGINGS:
+			{
+				return (a_Item.m_ItemType == E_ITEM_GOLD);
+			}
+			case E_ITEM_LEATHER_BOOTS:
+			case E_ITEM_LEATHER_CAP:
+			case E_ITEM_LEATHER_PANTS:
+			case E_ITEM_LEATHER_TUNIC:
+			{
+				return (a_Item.m_ItemType == E_ITEM_LEATHER);
+			}
+		}
+		return false;
+	}
+
 } ;
 
 
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index ce9593a70..105def2ce 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -511,6 +511,25 @@ bool cItemHandler::IsPlaceable(void)
 
 
 
+
+bool cItemHandler::CanRepairWithItem(const cItem & a_Item)
+{
+	return false;
+}
+
+
+
+
+
+int cItemHandler::GetRepairCost(void)
+{
+	return 0;
+}
+
+
+
+
+
 bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
 {
 	UNUSED(a_BlockType);
diff --git a/src/Items/ItemHandler.h b/src/Items/ItemHandler.h
index 4993eac85..420eefcf1 100644
--- a/src/Items/ItemHandler.h
+++ b/src/Items/ItemHandler.h
@@ -85,6 +85,12 @@ public:
 	/** Blocks simply get placed */
 	virtual bool IsPlaceable(void);
 
+	/** Can the anvil repair this item, when a_Item is the second input? */
+	virtual bool CanRepairWithItem(const cItem & a_Item);
+
+	/** Get the repair cost from the item, or 0 if the item hasn't repair cost. */
+	virtual int GetRepairCost(void);
+
 	/** 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.
diff --git a/src/Items/ItemPickaxe.h b/src/Items/ItemPickaxe.h
index 2a8e40daa..46e68ec70 100644
--- a/src/Items/ItemPickaxe.h
+++ b/src/Items/ItemPickaxe.h
@@ -85,6 +85,19 @@ public:
 		}
 		return false;
 	}
+
+	virtual bool CanRepairWithItem(const cItem & a_Item) override
+	{
+		switch (m_ItemType)
+		{
+			case E_ITEM_WOODEN_PICKAXE:  return (a_Item.m_ItemType == E_BLOCK_PLANKS);
+			case E_ITEM_STONE_PICKAXE:   return (a_Item.m_ItemType == E_BLOCK_COBBLESTONE);
+			case E_ITEM_IRON_PICKAXE:    return (a_Item.m_ItemType == E_ITEM_IRON);
+			case E_ITEM_GOLD_PICKAXE:    return (a_Item.m_ItemType == E_ITEM_GOLD);
+			case E_ITEM_DIAMOND_PICKAXE: return (a_Item.m_ItemType == E_ITEM_DIAMOND);
+		}
+		return false;
+	}
 } ;
 
 
diff --git a/src/Items/ItemShovel.h b/src/Items/ItemShovel.h
index 873d5ae25..7659ccc54 100644
--- a/src/Items/ItemShovel.h
+++ b/src/Items/ItemShovel.h
@@ -41,4 +41,18 @@ public:
 	{
 		return (a_BlockType == E_BLOCK_SNOW);
 	}
+
+	virtual bool CanRepairWithItem(const cItem & a_Item) override
+	{
+		switch (m_ItemType)
+		{
+			case E_ITEM_WOODEN_SHOVEL:  return (a_Item.m_ItemType == E_BLOCK_PLANKS);
+			case E_ITEM_STONE_SHOVEL:   return (a_Item.m_ItemType == E_BLOCK_COBBLESTONE);
+			case E_ITEM_IRON_SHOVEL:    return (a_Item.m_ItemType == E_ITEM_IRON);
+			case E_ITEM_GOLD_SHOVEL:    return (a_Item.m_ItemType == E_ITEM_GOLD);
+			case E_ITEM_DIAMOND_SHOVEL: return (a_Item.m_ItemType == E_ITEM_DIAMOND);
+		}
+		return false;
+	}
+
 };
diff --git a/src/Items/ItemSword.h b/src/Items/ItemSword.h
index a7c1d2432..34656ff99 100644
--- a/src/Items/ItemSword.h
+++ b/src/Items/ItemSword.h
@@ -23,6 +23,19 @@ public:
 	{
 		return (a_BlockType == E_BLOCK_COBWEB);
 	}
+
+	virtual bool CanRepairWithItem(const cItem & a_Item) override
+	{
+		switch (m_ItemType)
+		{
+			case E_ITEM_WOODEN_SWORD:  return (a_Item.m_ItemType == E_BLOCK_PLANKS);
+			case E_ITEM_STONE_SWORD:   return (a_Item.m_ItemType == E_BLOCK_COBBLESTONE);
+			case E_ITEM_IRON_SWORD:    return (a_Item.m_ItemType == E_ITEM_IRON);
+			case E_ITEM_GOLD_SWORD:    return (a_Item.m_ItemType == E_ITEM_GOLD);
+			case E_ITEM_DIAMOND_SWORD: return (a_Item.m_ItemType == E_ITEM_DIAMOND);
+		}
+		return false;
+	}
 } ;