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

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

1 files changed, 21 insertions, 26 deletions

diff --git a/Minecraft.World/SimpleContainer.h b/Minecraft.World/SimpleContainer.h
index 98c193d3..bb22d141 100644
--- a/Minecraft.World/SimpleContainer.h
+++ b/Minecraft.World/SimpleContainer.h
@@ -8,35 +8,30 @@ class SimpleContainer : public Container
 {
 private:
 	int name;
+	wstring stringName;
 	int size;
 	ItemInstanceArray *items;
 	vector<net_minecraft_world::ContainerListener *> *listeners;
+	bool customName;
 
 public:
-	SimpleContainer(int name, int size);
-
-	void addListener(net_minecraft_world::ContainerListener *listener);
-
-	void removeListener(net_minecraft_world::ContainerListener *listener);
-
-	shared_ptr<ItemInstance> getItem(unsigned int slot);
-
-	shared_ptr<ItemInstance> removeItem(unsigned int slot, int count);
-	shared_ptr<ItemInstance> removeItemNoUpdate(int slot);
-
-	void setItem(unsigned int slot, shared_ptr<ItemInstance> item);
-
-	unsigned int getContainerSize();
-
-	int getName();
-
-	int getMaxStackSize();
-
-	void setChanged();
-
-	bool stillValid(shared_ptr<Player> player);
-
-	void startOpen() { } // TODO Auto-generated method stub
-	void stopOpen() { } // TODO Auto-generated method stub
-
+	SimpleContainer(int name, wstring stringName, bool customName, int size);
+
+	virtual void addListener(net_minecraft_world::ContainerListener *listener);
+	virtual void removeListener(net_minecraft_world::ContainerListener *listener);
+	virtual shared_ptr<ItemInstance> getItem(unsigned int slot);
+	virtual shared_ptr<ItemInstance> removeItem(unsigned int slot, int count);
+	virtual shared_ptr<ItemInstance> removeItemNoUpdate(int slot);
+	virtual void setItem(unsigned int slot, shared_ptr<ItemInstance> item);
+	virtual unsigned int getContainerSize();
+	virtual wstring getName();
+	virtual wstring getCustomName();
+	virtual bool hasCustomName();
+	virtual void setCustomName(const wstring &name);
+	virtual int getMaxStackSize() const;
+	virtual void setChanged();
+	virtual bool stillValid(shared_ptr<Player> player);
+	virtual void startOpen() { } // TODO Auto-generated method stub
+	virtual void stopOpen() { } // TODO Auto-generated method stub
+	virtual bool canPlaceItem(int slot, shared_ptr<ItemInstance> item);
 };
\ No newline at end of file