1 files changed, 150 insertions, 0 deletions
diff --git a/Minecraft.World/MerchantMenu.cpp b/Minecraft.World/MerchantMenu.cpp
new file mode 100644
index 00000000..a6dfca1f
--- /dev/null
+++ b/Minecraft.World/MerchantMenu.cpp
@@ -0,0 +1,150 @@
+#include "stdafx.h"
+#include "net.minecraft.world.entity.player.h"
+#include "net.minecraft.world.inventory.h"
+#include "net.minecraft.world.item.trading.h"
+#include "net.minecraft.world.level.h"
+#include "MerchantMenu.h"
+
+MerchantMenu::MerchantMenu(shared_ptr<Inventory> inventory, shared_ptr<Merchant> merchant, Level *level)
+{
+	trader = merchant;
+	this->level = level;
+
+	tradeContainer = shared_ptr<MerchantContainer>( new MerchantContainer(dynamic_pointer_cast<Player>(inventory->player->shared_from_this()), merchant) );
+	addSlot(new Slot(tradeContainer, PAYMENT1_SLOT, SELLSLOT1_X, ROW2_Y));
+	addSlot(new Slot(tradeContainer, PAYMENT2_SLOT, SELLSLOT2_X, ROW2_Y));
+	addSlot(new MerchantResultSlot(inventory->player, merchant, tradeContainer, RESULT_SLOT, BUYSLOT_X, ROW2_Y));
+
+	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, 84 + y * 18));
+		}
+	}
+	for (int x = 0; x < 9; x++)
+	{
+		addSlot(new Slot(inventory, x, 8 + x * 18, 142));
+	}
+}
+
+shared_ptr<MerchantContainer> MerchantMenu::getTradeContainer()
+{
+	return tradeContainer;
+}
+
+void MerchantMenu::addSlotListener(ContainerListener *listener)
+{
+	AbstractContainerMenu::addSlotListener(listener);
+}
+
+void MerchantMenu::broadcastChanges()
+{
+	AbstractContainerMenu::broadcastChanges();
+}
+
+// 4J used to take a shared_ptr<Container> but wasn't using it, so removed to simplify things
+void MerchantMenu::slotsChanged()
+{
+	tradeContainer->updateSellItem();
+	AbstractContainerMenu::slotsChanged();
+}
+
+void MerchantMenu::setSelectionHint(int hint)
+{
+	tradeContainer->setSelectionHint(hint);
+}
+
+void MerchantMenu::setData(int id, int value)
+{
+}
+
+bool MerchantMenu::stillValid(shared_ptr<Player> player)
+{
+	return trader->getTradingPlayer() == player;
+}
+
+shared_ptr<ItemInstance> MerchantMenu::quickMoveStack(shared_ptr<Player> player, int slotIndex)
+{
+	shared_ptr<ItemInstance> clicked = nullptr;
+	Slot *slot = NULL;
+	
+	if(slotIndex < slots->size()) slot = slots->at(slotIndex);
+	if (slot != NULL && slot->hasItem())
+	{
+		shared_ptr<ItemInstance> stack = slot->getItem();
+		clicked = stack->copy();
+
+		if (slotIndex == RESULT_SLOT)
+		{
+			if (!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END, true))
+			{
+				return nullptr;
+			}
+			slot->onQuickCraft(stack, clicked);
+		}
+		else if (slotIndex == PAYMENT1_SLOT || slotIndex == PAYMENT2_SLOT)
+		{
+			if (!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END, false))
+			{
+				return nullptr;
+			}
+		}
+		else if (slotIndex >= INV_SLOT_START && slotIndex < INV_SLOT_END)
+		{
+			if (!moveItemStackTo(stack, USE_ROW_SLOT_START, USE_ROW_SLOT_END, false))
+			{
+				return nullptr;
+			}
+		}
+		else if (slotIndex >= USE_ROW_SLOT_START && slotIndex < USE_ROW_SLOT_END)
+		{
+			if (!moveItemStackTo(stack, INV_SLOT_START, INV_SLOT_END, false))
+			{
+				return nullptr;
+			}
+		}
+		if (stack->count == 0)
+		{
+			slot->set(nullptr);
+		}
+		else
+		{
+			slot->setChanged();
+		}
+		if (stack->count == clicked->count)
+		{
+			return nullptr;
+		}
+		else
+		{
+			slot->onTake(player, stack);
+		}
+	}
+	return clicked;
+}
+
+void MerchantMenu::removed(shared_ptr<Player> player)
+{
+	AbstractContainerMenu::removed(player);
+	trader->setTradingPlayer(nullptr);
+
+	AbstractContainerMenu::removed(player);
+	if (level->isClientSide) return;
+
+	shared_ptr<ItemInstance> item = tradeContainer->removeItemNoUpdate(PAYMENT1_SLOT);
+	if (item)
+	{
+		player->drop(item);
+	}
+	item = tradeContainer->removeItemNoUpdate(PAYMENT2_SLOT);
+	if (item != NULL)
+	{
+		player->drop(item);
+	}
+}
+
+shared_ptr<Merchant> MerchantMenu::getMerchant()
+{
+	return trader;
+}
+\ No newline at end of file