8 files changed, 161 insertions, 152 deletions

diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index bf1d4e4cb..d36b5d663 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -328,15 +328,25 @@ void cItemHandler::OnBlockDestroyed(cWorld * a_World, cPlayer * a_Player, const
 
 	if (a_Player->IsGameModeSurvival())
 	{
-		if (!BlockRequiresSpecialTool(Block) || CanHarvestBlock(Block))
-		{
-			cChunkInterface ChunkInterface(a_World->GetChunkMap());
-			cBlockInServerPluginInterface PluginInterface(*a_World);
-			Handler->DropBlock(ChunkInterface, *a_World, PluginInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ);
-		}
+		cChunkInterface ChunkInterface(a_World->GetChunkMap());
+		cBlockInServerPluginInterface PluginInterface(*a_World);
+		Handler->DropBlock(ChunkInterface, *a_World, PluginInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, CanHarvestBlock(Block), a_Player->GetEquippedItem().m_Enchantments.GetLevel(cEnchantments::enchSilkTouch) > 0);
 	}
-	
-	a_Player->UseEquippedItem();
+
+	if (!cBlockInfo::IsOneHitDig(Block))
+	{
+		a_Player->UseEquippedItem(GetDurabilityLossByAction(dlaBreakBlock));
+	}
+}
+
+
+
+
+
+void cItemHandler::OnEntityAttack(cPlayer * a_Attacker, cEntity * a_AttackedEntity)
+{
+	UNUSED(a_AttackedEntity);
+	a_Attacker->UseEquippedItem(GetDurabilityLossByAction(dlaAttackEntity));
 }
 
 
@@ -354,6 +364,20 @@ void cItemHandler::OnFoodEaten(cWorld * a_World, cPlayer * a_Player, cItem * a_I
 
 
 
+short cItemHandler::GetDurabilityLossByAction(eDurabilityLostAction a_Action)
+{
+	switch ((int)a_Action)
+	{
+		case dlaAttackEntity: return 2;
+		case dlaBreakBlock:   return 1;
+	}
+	return 0;
+}
+
+
+
+
+
 char cItemHandler::GetMaxStackSize(void)
 {
 	if (m_ItemType < 256)
@@ -505,6 +529,7 @@ bool cItemHandler::IsPlaceable(void)
 
 bool cItemHandler::CanRepairWithRawMaterial(short a_ItemType)
 {
+	UNUSED(a_ItemType);
 	return false;
 }
 
@@ -514,9 +539,50 @@ bool cItemHandler::CanRepairWithRawMaterial(short a_ItemType)
 
 bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
 {
-	UNUSED(a_BlockType);
-	
-	return false;
+	switch (a_BlockType)
+	{
+		case E_BLOCK_ANVIL:
+		case E_BLOCK_ENCHANTMENT_TABLE:
+		case E_BLOCK_FURNACE:
+		case E_BLOCK_LIT_FURNACE:
+		case E_BLOCK_COAL_ORE:
+		case E_BLOCK_STONE:
+		case E_BLOCK_COBBLESTONE:
+		case E_BLOCK_END_STONE:
+		case E_BLOCK_MOSSY_COBBLESTONE:
+		case E_BLOCK_SANDSTONE_STAIRS:
+		case E_BLOCK_SANDSTONE:
+		case E_BLOCK_STONE_BRICKS:
+		case E_BLOCK_NETHER_BRICK:
+		case E_BLOCK_NETHERRACK:
+		case E_BLOCK_STONE_SLAB:
+		case E_BLOCK_DOUBLE_STONE_SLAB:
+		case E_BLOCK_STONE_PRESSURE_PLATE:
+		case E_BLOCK_BRICK:
+		case E_BLOCK_COBBLESTONE_STAIRS:
+		case E_BLOCK_COBBLESTONE_WALL:
+		case E_BLOCK_STONE_BRICK_STAIRS:
+		case E_BLOCK_NETHER_BRICK_STAIRS:
+		case E_BLOCK_CAULDRON:
+		case E_BLOCK_OBSIDIAN:
+		case E_BLOCK_DIAMOND_BLOCK:
+		case E_BLOCK_DIAMOND_ORE:
+		case E_BLOCK_GOLD_BLOCK:
+		case E_BLOCK_GOLD_ORE:
+		case E_BLOCK_REDSTONE_ORE:
+		case E_BLOCK_REDSTONE_ORE_GLOWING:
+		case E_BLOCK_EMERALD_ORE:
+		case E_BLOCK_IRON_BLOCK:
+		case E_BLOCK_IRON_ORE:
+		case E_BLOCK_LAPIS_ORE:
+		case E_BLOCK_LAPIS_BLOCK:
+		case E_BLOCK_SNOW:
+		case E_BLOCK_VINES:
+		{
+			return false;
+		}
+		default: return true;
+	}
 }
 
 
diff --git a/src/Items/ItemHandler.h b/src/Items/ItemHandler.h
index c7362c5f4..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 */
@@ -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);
 
diff --git a/src/Items/ItemHoe.h b/src/Items/ItemHoe.h
index 29f7c83d5..8d0b71478 100644
--- a/src/Items/ItemHoe.h
+++ b/src/Items/ItemHoe.h
@@ -16,7 +16,6 @@ public:
 	cItemHoeHandler(int a_ItemType)
 		: cItemHandler(a_ItemType)
 	{
-
 	}
 
 	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) override
@@ -26,13 +25,18 @@ public:
 		if ((Block == E_BLOCK_DIRT) || (Block == E_BLOCK_GRASS))
 		{
 			a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_FARMLAND, 0);
-
 			a_Player->UseEquippedItem();
 			return true;
-		
 		}
+
 		return false;
 	}
+
+
+	virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) override
+	{
+		return 0;
+	}
 } ;
 
 
diff --git a/src/Items/ItemPickaxe.h b/src/Items/ItemPickaxe.h
index 647d59b5c..17fd96822 100644
--- a/src/Items/ItemPickaxe.h
+++ b/src/Items/ItemPickaxe.h
@@ -8,6 +8,7 @@
 class cItemPickaxeHandler :
 	public cItemHandler
 {
+	typedef cItemHandler super;
 public:
 	cItemPickaxeHandler(int a_ItemType)
 	: cItemHandler(a_ItemType)
@@ -84,7 +85,7 @@ public:
 				return PickaxeLevel() >= 1;
 			}
 		}
-		return false;
+		return super::CanHarvestBlock(a_BlockType);
 	}
 
 	virtual bool CanRepairWithRawMaterial(short a_ItemType) override
diff --git a/src/Items/ItemPotion.h b/src/Items/ItemPotion.h
index f16d89b39..24614cd8a 100644
--- a/src/Items/ItemPotion.h
+++ b/src/Items/ItemPotion.h
@@ -17,126 +17,12 @@ public:
 	}
 	
 
-	/** Returns the potion color (used by the client for visuals), based on the potion's damage value */
-	static int GetPotionColor(short a_ItemDamage)
-	{
-		// Lowest six bits
-		return (a_ItemDamage & 0x3f);
-	}
-	
-	
-	/** Translates the potion's damage value into the entity effect that the potion gives */
-	static cEntityEffect::eType GetEntityEffectType(short a_ItemDamage)
-	{
-		// Lowest four bits
-		// Potion effect bits are different from entity effect values
-		// For reference: http://minecraft.gamepedia.com/Data_values#.22Potion_effect.22_bits
-		switch (a_ItemDamage & 0x0f)
-		{
-			case 0x01: return cEntityEffect::effRegeneration;
-			case 0x02: return cEntityEffect::effSpeed;
-			case 0x03: return cEntityEffect::effFireResistance;
-			case 0x04: return cEntityEffect::effPoison;
-			case 0x05: return cEntityEffect::effInstantHealth;
-			case 0x06: return cEntityEffect::effNightVision;
-			case 0x08: return cEntityEffect::effWeakness;
-			case 0x09: return cEntityEffect::effStrength;
-			case 0x0a: return cEntityEffect::effSlowness;
-			case 0x0c: return cEntityEffect::effInstantDamage;
-			case 0x0d: return cEntityEffect::effWaterBreathing;
-			case 0x0e: return cEntityEffect::effInvisibility;
-			
-			// No effect potions
-			case 0x00:
-			case 0x07:
-			case 0x0b:  // Will be potion of leaping in 1.8
-			case 0x0f:
-			{
-				break;
-			}
-		}
-		return cEntityEffect::effNoEffect;
-	}
-
-
-	/** Retrieves the intensity level from the potion's damage value.
-	Returns 0 for level I potions, 1 for level II potions. */
-	static short GetEntityEffectIntensity(short a_ItemDamage)
-	{
-		// Level II potion if the fifth lowest bit is set
-		return ((a_ItemDamage & 0x20) != 0) ? 1 : 0;
-	}
-	
-	
-	/** Returns the effect duration, in ticks, based on the potion's damage value */
-	static int GetEntityEffectDuration(short a_ItemDamage)
-	{
-		// Base duration in ticks
-		int base = 0;
-		double TierCoeff = 1, ExtCoeff = 1, SplashCoeff = 1;
-		
-		switch (GetEntityEffectType(a_ItemDamage))
-		{
-			case cEntityEffect::effRegeneration:
-			case cEntityEffect::effPoison:
-			{
-				base = 900;
-				break;
-			}
-				
-			case cEntityEffect::effSpeed:
-			case cEntityEffect::effFireResistance:
-			case cEntityEffect::effNightVision:
-			case cEntityEffect::effStrength:
-			case cEntityEffect::effWaterBreathing:
-			case cEntityEffect::effInvisibility:
-			{
-				base = 3600;
-				break;
-			}
-				
-			case cEntityEffect::effWeakness:
-			case cEntityEffect::effSlowness:
-			{
-				base = 1800;
-				break;
-			}
-		}
-		
-		// If potion is level II, half the duration. If not, stays the same
-		TierCoeff = (GetEntityEffectIntensity(a_ItemDamage) > 0) ? 0.5 : 1;
-		
-		// If potion is extended, multiply duration by 8/3. If not, stays the same
-		// Extended potion if sixth lowest bit is set
-		ExtCoeff = (a_ItemDamage & 0x40) ? (8.0 / 3.0) : 1;
-		
-		// If potion is splash potion, multiply duration by 3/4. If not, stays the same
-		SplashCoeff = IsPotionDrinkable(a_ItemDamage) ? 1 : 0.75;
-		
-		// Ref.:
-		//   http://minecraft.gamepedia.com/Data_values#.22Tier.22_bit
-		//   http://minecraft.gamepedia.com/Data_values#.22Extended_duration.22_bit
-		//   http://minecraft.gamepedia.com/Data_values#.22Splash_potion.22_bit
-		
-		return (int)(base * TierCoeff * ExtCoeff * SplashCoeff);
-	}
-
-
-	/** Returns true if the potion with the given damage is drinkable */
-	static bool IsPotionDrinkable(short a_ItemDamage)
-	{
-		// Drinkable potion if 13th lowest bit is set
-		// Ref.: http://minecraft.gamepedia.com/Potions#Data_value_table
-		return ((a_ItemDamage & 0x2000) != 0);
-	}
-	
-
 	// cItemHandler overrides:
 	virtual bool IsDrinkable(short a_ItemDamage) override
 	{
 		// Drinkable potion if 13th lowest bit is set
 		// Ref.: http://minecraft.gamepedia.com/Potions#Data_value_table
-		return IsPotionDrinkable(a_ItemDamage);
+		return cEntityEffect::IsPotionDrinkable(a_ItemDamage);
 	}
 
 	
@@ -145,7 +31,7 @@ public:
 		short PotionDamage = a_Item.m_ItemDamage;
 		
 		// Do not throw non-splash potions:
-		if (IsPotionDrinkable(PotionDamage))
+		if (cEntityEffect::IsPotionDrinkable(PotionDamage))
 		{
 			return false;
 		}
@@ -153,20 +39,10 @@ public:
 		Vector3d Pos = a_Player->GetThrowStartPos();
 		Vector3d Speed = a_Player->GetLookVector() * 7;
 		
-		cSplashPotionEntity * Projectile = new cSplashPotionEntity(
-			a_Player, Pos.x, Pos.y, Pos.z, Speed,
-			GetEntityEffectType(PotionDamage), cEntityEffect(GetEntityEffectDuration(PotionDamage),
-			GetEntityEffectIntensity(PotionDamage)), GetPotionColor(PotionDamage)
-		);
-		if (Projectile == NULL)
+		if (a_World->CreateProjectile(Pos.x, Pos.y, Pos.z, cProjectileEntity::pkSplashPotion, a_Player, &a_Player->GetEquippedItem(), &Speed) < 0)
 		{
 			return false;
 		}
-		if (!Projectile->Initialize(*a_World))
-		{
-			delete Projectile;
-			return false;
-		}
 		
 		if (!a_Player->IsGameModeCreative())
 		{
@@ -182,12 +58,16 @@ public:
 		short PotionDamage = a_Item->m_ItemDamage;
 		
 		// Do not drink undrinkable potions:
-		if (!IsDrinkable(a_Item->m_ItemDamage))
+		if (!cEntityEffect::IsPotionDrinkable(a_Item->m_ItemDamage))
 		{
 			return false;
 		}
 		
-		a_Player->AddEntityEffect(GetEntityEffectType(PotionDamage), GetEntityEffectDuration(PotionDamage), GetEntityEffectIntensity(PotionDamage));
+		a_Player->AddEntityEffect(
+			cEntityEffect::GetPotionEffectType(PotionDamage),
+			cEntityEffect::GetPotionEffectDuration(PotionDamage),
+			cEntityEffect::GetPotionEffectIntensity(PotionDamage)
+		);
 		a_Player->GetInventory().RemoveOneEquippedItem();
 		a_Player->GetInventory().AddItem(E_ITEM_GLASS_BOTTLE);
 		return true;
diff --git a/src/Items/ItemShears.h b/src/Items/ItemShears.h
index 39d2776fa..fa2794df2 100644
--- a/src/Items/ItemShears.h
+++ b/src/Items/ItemShears.h
@@ -12,6 +12,7 @@
 class cItemShearsHandler :
 	public cItemHandler
 {
+	typedef cItemHandler super;
 public:
 	cItemShearsHandler(int a_ItemType) :
 		cItemHandler(a_ItemType)
@@ -30,8 +31,12 @@ public:
 		BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
 		if ((Block == E_BLOCK_LEAVES) || (Block == E_BLOCK_NEW_LEAVES))
 		{
+			NIBBLETYPE Meta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
+			cBlockHandler * Handler = cBlockInfo::GetHandler(Block);
+
 			cItems Drops;
-			Drops.push_back(cItem(Block, 1, a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) & 0x03));
+			Handler->ConvertToPickups(Drops, Meta);
+			Drops.push_back(cItem(Block, 1, Meta & 3));
 			a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ);
 
 			a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);
@@ -54,7 +59,25 @@ public:
 				return true;
 			}
 		}  // switch (a_BlockType)
-		return false;
+		return super::CanHarvestBlock(a_BlockType);
+	}
+
+
+	virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) override
+	{
+		return 0;
+	}
+
+
+	virtual void OnBlockDestroyed(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ) override
+	{
+		super::OnBlockDestroyed(a_World, a_Player, a_Item, a_BlockX, a_BlockY, a_BlockZ);
+
+		BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
+		if ((Block == E_BLOCK_TRIPWIRE) || (Block == E_BLOCK_VINES))
+		{
+			a_Player->UseEquippedItem();
+		}
 	}
 } ;
 
diff --git a/src/Items/ItemShovel.h b/src/Items/ItemShovel.h
index 78cfe26fe..7d5760fa9 100644
--- a/src/Items/ItemShovel.h
+++ b/src/Items/ItemShovel.h
@@ -14,6 +14,7 @@
 
 class cItemShovelHandler : public cItemHandler
 {
+	typedef cItemHandler super;
 public:
 	cItemShovelHandler(int a_ItemType)
 		: cItemHandler(a_ItemType)
@@ -39,7 +40,11 @@ public:
 	
 	virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) override
 	{
-		return (a_BlockType == E_BLOCK_SNOW);
+		if (a_BlockType == E_BLOCK_SNOW)
+		{
+			return true;
+		}
+		return super::CanHarvestBlock(a_BlockType);
 	}
 
 	virtual bool CanRepairWithRawMaterial(short a_ItemType) override
diff --git a/src/Items/ItemSword.h b/src/Items/ItemSword.h
index 44feb2d83..2b2dbfc0d 100644
--- a/src/Items/ItemSword.h
+++ b/src/Items/ItemSword.h
@@ -12,18 +12,24 @@
 class cItemSwordHandler :
 	public cItemHandler
 {
+	typedef cItemHandler super;
 public:
 	cItemSwordHandler(int a_ItemType)
 	: cItemHandler(a_ItemType)
 	{
-
 	}
-	
+
+
 	virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) override
 	{
-		return (a_BlockType == E_BLOCK_COBWEB);
+		if (a_BlockType == E_BLOCK_COBWEB)
+		{
+			return true;
+		}
+		return super::CanHarvestBlock(a_BlockType);
 	}
 
+
 	virtual bool CanRepairWithRawMaterial(short a_ItemType) override
 	{
 		switch (m_ItemType)
@@ -36,6 +42,17 @@ public:
 		}
 		return false;
 	}
+
+
+	virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) override
+	{
+		switch ((int)a_Action)
+		{
+			case dlaAttackEntity: return 1;
+			case dlaBreakBlock:   return 2;
+		}
+		return 0;
+	}
 } ;