December 2014 files

2026-03-01 11:00:23 -06:00
parent b691c43c44
commit 8fd3ac6e37
2049 changed files with 260190 additions and 134787 deletions
--- a/Minecraft.World/MerchantContainer.h
+++ b/Minecraft.World/MerchantContainer.h
@@ -30,11 +30,14 @@ private:
 public:
 	shared_ptr<ItemInstance> removeItemNoUpdate(int slot);
 	void setItem(unsigned int slot, shared_ptr<ItemInstance> item);
-	int getName();
+	wstring getName();
+	wstring getCustomName();
+	bool hasCustomName();
 	int getMaxStackSize();
 	bool stillValid(shared_ptr<Player> player);
 	void startOpen();
 	void stopOpen();
+	bool canPlaceItem(int slot, shared_ptr<ItemInstance> item);
 	void setChanged();
 	void updateSellItem();
 	MerchantRecipe *getActiveRecipe();