4 files changed, 42 insertions, 88 deletions

diff --git a/source/Items/ItemComparator.h b/source/Items/ItemComparator.h
new file mode 100644
index 000000000..53dbd020d
--- /dev/null
+++ b/source/Items/ItemComparator.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "ItemHandler.h"
+#include "../Simulator/RedstoneSimulator.h"
+
+
+
+
+
+class cItemComparatorHandler :
+	public cItemHandler
+{
+public:
+	cItemComparatorHandler(int a_ItemType) :
+		cItemHandler(a_ItemType)
+	{
+	}
+
+	virtual bool IsPlaceable(void) override
+	{
+		return true;
+	}
+
+	virtual bool GetPlacementBlockTypeMeta(
+		cWorld * a_World, cPlayer * a_Player,
+		int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, 
+		int a_CursorX, int a_CursorY, int a_CursorZ,
+		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
+	) override
+	{
+		a_BlockType = E_BLOCK_INACTIVE_COMPARATOR;
+		a_BlockMeta = cRedstoneSimulator::RepeaterRotationToMetaData(a_Player->GetRotation());
+		return true;
+	}
+} ;
+
+
+
+
diff --git a/source/Items/ItemHandler.cpp b/source/Items/ItemHandler.cpp
index 08a7b661d..9d38e6f3a 100644
--- a/source/Items/ItemHandler.cpp
+++ b/source/Items/ItemHandler.cpp
@@ -14,6 +14,7 @@
 #include "ItemBucket.h"
 #include "ItemCauldron.h"
 #include "ItemCloth.h"
+#include "ItemComparator.h"
 #include "ItemDoor.h"
 #include "ItemDye.h"
 #include "ItemFlowerPot.h"
@@ -31,11 +32,9 @@
 #include "ItemShears.h"
 #include "ItemShovel.h"
 #include "ItemSign.h"
-#include "ItemSlab.h"
 #include "ItemSpawnEgg.h"
 #include "ItemSugarcane.h"
 #include "ItemSword.h"
-#include "ItemWood.h"
 
 #include "../Blocks/BlockHandler.h"
 
@@ -94,6 +93,7 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
 		case E_ITEM_BOW:               return new cItemBowHandler;
 		case E_ITEM_BREWING_STAND:     return new cItemBrewingStandHandler(a_ItemType);
 		case E_ITEM_CAULDRON:          return new cItemCauldronHandler(a_ItemType);
+		case E_ITEM_COMPARATOR:        return new cItemComparatorHandler(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();
@@ -143,18 +143,6 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
 			return new cItemSwordHandler(a_ItemType);
 		}
 		
-		case E_BLOCK_STONE_SLAB:
-		case E_BLOCK_WOODEN_SLAB:
-		{
-			return new cItemSlabHandler(a_ItemType);
-		}
-		
-		case E_BLOCK_LOG:
-		case E_BLOCK_PLANKS:
-		{
-			return new cItemWoodHandler(a_ItemType);
-		}
-		
 		case E_ITEM_BUCKET:
 		case E_ITEM_WATER_BUCKET:
 		case E_ITEM_LAVA_BUCKET:
diff --git a/source/Items/ItemSlab.h b/source/Items/ItemSlab.h
deleted file mode 100644
index 80de05eb5..000000000
--- a/source/Items/ItemSlab.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-#pragma once
-
-#include "ItemHandler.h"
-#include "../World.h"
-
-
-
-
-
-class cItemSlabHandler : public cItemHandler
-{
-public:
-	cItemSlabHandler(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, char a_Dir) override
-	{
-		BLOCKTYPE Block;
-		NIBBLETYPE Meta;
-		a_World->GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, Block, Meta);
-
-		if (
-			((a_Dir == 0) || (a_Dir == 1))  // Only when clicking on top or on bottom of the block
-			&& ((Block == E_BLOCK_WOODEN_SLAB) || (Block == E_BLOCK_STONE_SLAB))  // It is a slab
-			&& (Block == a_Item.m_ItemType)  // Same slab
-			&& ((Meta & 0x7) == (a_Item.m_ItemDamage & 0x7)))  // Same Texture
-		{
-			if (a_Player->GetGameMode() == eGameMode_Creative)
-			{
-				a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, Block - 1, Meta); // Block - 1 simple hack to save one if statement
-				return true;
-			}
-			else
-			{
-				if (a_Player->GetInventory().RemoveOneEquippedItem())
-				{
-					a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, Block - 1, Meta); // Block - 1 simple hack to save one if statement
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-} ;
-
-
-
-
diff --git a/source/Items/ItemWood.h b/source/Items/ItemWood.h
deleted file mode 100644
index 476256c5d..000000000
--- a/source/Items/ItemWood.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-#pragma once
-
-#include "ItemHandler.h"
-
-
-
-
-
-class cItemWoodHandler :
-	public cItemHandler
-{
-public:
-	cItemWoodHandler(int a_ItemType)
-		: cItemHandler(a_ItemType)
-	{
-	}
-} ;
-
-
-
-