3 files changed, 65 insertions, 0 deletions

diff --git a/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt b/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt
index fdce1bff5..fada3e662 100644
--- a/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt
+++ b/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt
@@ -7,6 +7,7 @@ set (HDRS
 	CommandBlockHandler.h
 	DoorHandler.h
 	DropSpenserHandler.h
+	HopperHandler.h
 	IncrementalRedstoneSimulator.h
 	RedstoneHandler.h
 	RedstoneSimulatorChunkData.h
diff --git a/src/Simulator/IncrementalRedstoneSimulator/HopperHandler.h b/src/Simulator/IncrementalRedstoneSimulator/HopperHandler.h
new file mode 100644
index 000000000..6012db1e1
--- /dev/null
+++ b/src/Simulator/IncrementalRedstoneSimulator/HopperHandler.h
@@ -0,0 +1,62 @@
+
+#pragma once
+
+#include "RedstoneHandler.h"
+#include "../../BlockEntities/HopperEntity.h"
+
+
+
+
+
+class cHopperHandler : public cRedstoneHandler
+{
+	typedef cRedstoneHandler super;
+public:
+
+	virtual unsigned char GetPowerDeliveredToPosition(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType) const override
+	{
+		UNUSED(a_World);
+		UNUSED(a_Position);
+		UNUSED(a_BlockType);
+		UNUSED(a_Meta);
+		UNUSED(a_QueryPosition);
+		UNUSED(a_QueryBlockType);
+		return 0;
+	}
+
+	virtual unsigned char GetPowerLevel(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta) const override
+	{
+		UNUSED(a_World);
+		UNUSED(a_Position);
+		UNUSED(a_BlockType);
+		UNUSED(a_Meta);
+		return 0;
+	}
+
+	virtual cVector3iArray Update(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, PoweringData a_PoweringData) const override
+	{
+		// LOGD("Evaluating commander the cmdblck (%d %d %d)", a_Position.x, a_Position.y, a_Position.z);
+
+		auto Previous = static_cast<cIncrementalRedstoneSimulator *>(a_World.GetRedstoneSimulator())->GetChunkData()->ExchangeUpdateOncePowerData(a_Position, a_PoweringData);
+		if (Previous.PowerLevel != a_PoweringData.PowerLevel)
+		{
+			return {};
+		}
+
+		a_World.DoWithHopperAt(a_Position.x, a_Position.y, a_Position.z, [a_PoweringData](cHopperEntity & a_Hopper)
+			{
+				a_Hopper.SetLocked(a_PoweringData.PowerLevel != 0);
+				return false;
+			}
+		);
+		return {};
+	}
+
+	virtual cVector3iArray GetValidSourcePositions(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta) const override
+	{
+		UNUSED(a_World);
+		UNUSED(a_BlockType);
+		UNUSED(a_Meta);
+		return GetAdjustedRelatives(a_Position, GetRelativeAdjacents());
+	}
+};
diff --git a/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp b/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp
index 2c56646fe..ddd682288 100644
--- a/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp
+++ b/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp
@@ -25,6 +25,7 @@
 #include "DropSpenserHandler.h"
 #include "RedstoneComparatorHandler.h"
 #include "TrappedChestHandler.h"
+#include "HopperHandler.h"
 
 
 
@@ -98,6 +99,7 @@ std::unique_ptr<cRedstoneHandler> cIncrementalRedstoneSimulator::CreateComponent
 
 		case E_BLOCK_BLOCK_OF_REDSTONE: return cpp14::make_unique<cRedstoneBlockHandler>();
 		case E_BLOCK_COMMAND_BLOCK: return cpp14::make_unique<cCommandBlockHandler>();
+		case E_BLOCK_HOPPER: return cpp14::make_unique<cHopperHandler>();
 		case E_BLOCK_NOTE_BLOCK: return cpp14::make_unique<cNoteBlockHandler>();
 		case E_BLOCK_REDSTONE_WIRE: return cpp14::make_unique<cRedstoneWireHandler>();
 		case E_BLOCK_TNT: return cpp14::make_unique<cTNTHandler>();