Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 76 insertions, 0 deletions

diff --git a/Minecraft.World/HopperMenu.cpp b/Minecraft.World/HopperMenu.cpp
new file mode 100644
index 00000000..afc700c3
--- /dev/null
+++ b/Minecraft.World/HopperMenu.cpp
@@ -0,0 +1,76 @@
+#include "stdafx.h"
+#include "net.minecraft.world.inventory.h"
+#include "HopperMenu.h"
+
+HopperMenu::HopperMenu(shared_ptr<Container> inventory, shared_ptr<Container> hopper)
+{
+	this->hopper = hopper;
+	hopper->startOpen();
+	int yo = 51;
+
+	for (int x = 0; x < hopper->getContainerSize(); x++)
+	{
+		addSlot(new Slot(hopper, x, 44 + x * 18, 20));
+	}
+
+	for (int y = 0; y < 3; y++)
+	{
+		for (int x = 0; x < 9; x++)
+		{
+			addSlot(new Slot(inventory, x + y * 9 + 9, 8 + x * 18, y * 18 + yo));
+		}
+	}
+	for (int x = 0; x < 9; x++)
+	{
+		addSlot(new Slot(inventory, x, 8 + x * 18, 58 + yo));
+	}
+}
+
+bool HopperMenu::stillValid(shared_ptr<Player> player)
+{
+	return hopper->stillValid(player);
+}
+
+shared_ptr<ItemInstance> HopperMenu::quickMoveStack(shared_ptr<Player> player, int slotIndex)
+{
+	shared_ptr<ItemInstance> clicked = nullptr;
+	Slot *slot = slots.at(slotIndex);
+	if (slot != NULL && slot->hasItem())
+	{
+		shared_ptr<ItemInstance> stack = slot->getItem();
+		clicked = stack->copy();
+
+		if (slotIndex < hopper->getContainerSize())
+		{
+			if (!moveItemStackTo(stack, hopper->getContainerSize(), slots.size(), true))
+			{
+				return nullptr;
+			}
+		} else {
+			if (!moveItemStackTo(stack, 0, hopper->getContainerSize(), false))
+			{
+				return nullptr;
+			}
+		}
+		if (stack->count == 0)
+		{
+			slot->set(nullptr);
+		}
+		else
+		{
+			slot->setChanged();
+		}
+	}
+	return clicked;
+}
+
+void HopperMenu::removed(shared_ptr<Player> player)
+{
+	AbstractContainerMenu::removed(player);
+	hopper->stopOpen();
+}
+
+shared_ptr<Container> HopperMenu::getContainer()
+{
+	return hopper;
+}
\ No newline at end of file