2 files changed, 94 insertions, 0 deletions

diff --git a/source/Items/ItemHandler.cpp b/source/Items/ItemHandler.cpp
index c0de4a6ec..2ae193d52 100644
--- a/source/Items/ItemHandler.cpp
+++ b/source/Items/ItemHandler.cpp
@@ -22,6 +22,7 @@
 #include "ItemLighter.h"
 #include "ItemMinecart.h"
 #include "ItemPickaxe.h"
+#include "ItemThrowable.h"
 #include "ItemRedstoneDust.h"
 #include "ItemRedstoneRepeater.h"
 #include "ItemSapling.h"
@@ -88,12 +89,15 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
 		case E_ITEM_BREWING_STAND:     return new cItemBrewingStandHandler(a_ItemType);
 		case E_ITEM_CAULDRON:          return new cItemCauldronHandler(a_ItemType);
 		case E_ITEM_DYE:               return new cItemDyeHandler(a_ItemType);
+		case E_ITEM_EGG:               return new cItemEggHandler();
+		case E_ITEM_ENDER_PEARL:       return new cItemEnderPearlHandler();
 		case E_ITEM_FLINT_AND_STEEL:   return new cItemLighterHandler(a_ItemType);
 		case E_ITEM_FLOWER_POT:        return new cItemFlowerPotHandler(a_ItemType);
 		case E_ITEM_REDSTONE_DUST:     return new cItemRedstoneDustHandler(a_ItemType);
 		case E_ITEM_REDSTONE_REPEATER: return new cItemRedstoneRepeaterHandler(a_ItemType);
 		case E_ITEM_SHEARS:            return new cItemShearsHandler(a_ItemType);
 		case E_ITEM_SIGN:              return new cItemSignHandler(a_ItemType);
+		case E_ITEM_SNOWBALL:          return new cItemSnowballHandler();
 		case E_ITEM_SPAWN_EGG:         return new cItemSpawnEggHandler(a_ItemType);
 		case E_ITEM_SUGARCANE:         return new cItemSugarcaneHandler(a_ItemType);
 		
diff --git a/source/Items/ItemThrowable.h b/source/Items/ItemThrowable.h
new file mode 100644
index 000000000..dacdb6157
--- /dev/null
+++ b/source/Items/ItemThrowable.h
@@ -0,0 +1,90 @@
+
+// ItemThrowable.h
+
+// Declares the itemhandlers for throwable items: eggs, snowballs and ender pearls
+
+
+
+
+
+#pragma once
+
+
+
+
+
+class cItemThrowableHandler :
+	public cItemHandler
+{
+	typedef cItemHandler super;
+public:
+	cItemThrowableHandler(int a_ItemType, cProjectileEntity::eKind a_ProjectileKind, double a_SpeedCoeff) :
+		super(a_ItemType),
+		m_ProjectileKind(a_ProjectileKind),
+		m_SpeedCoeff(a_SpeedCoeff)
+	{
+	}
+	
+
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override
+	{
+		Vector3d Pos = a_Player->GetThrowStartPos();
+		Vector3d Speed = a_Player->GetLookVector() * m_SpeedCoeff;
+		a_World->CreateProjectile(Pos.x, Pos.y, Pos.z, m_ProjectileKind, a_Player, &Speed);
+		return true;
+	}
+	
+protected:
+	cProjectileEntity::eKind m_ProjectileKind;
+	double m_SpeedCoeff;
+} ;
+
+
+
+
+
+class cItemEggHandler :
+	public cItemThrowableHandler
+{
+	typedef cItemThrowableHandler super;
+public:
+	cItemEggHandler(void) :
+		super(E_ITEM_EGG, cProjectileEntity::pkEgg, 30)
+	{
+	}
+} ;
+
+
+
+
+class cItemSnowballHandler :
+	public cItemThrowableHandler
+{
+	typedef cItemThrowableHandler super;
+	
+public:
+	cItemSnowballHandler(void) :
+		super(E_ITEM_SNOWBALL, cProjectileEntity::pkSnowball, 30)
+	{
+	}
+} ;
+
+
+
+
+
+class cItemEnderPearlHandler :
+	public cItemThrowableHandler
+{
+	typedef cItemThrowableHandler super;
+	
+public:
+	cItemEnderPearlHandler(void) :
+		super(E_ITEM_ENDER_PEARL, cProjectileEntity::pkEnderPearl, 30)
+	{
+	}
+} ;
+
+
+
+