diff options
| author | Loki Rautio <lokirautio@gmail.com> | 2026-03-04 03:56:03 -0600 |
|---|---|---|
| committer | Loki Rautio <lokirautio@gmail.com> | 2026-03-04 03:56:03 -0600 |
| commit | 42aec6dac53dffa6afe072560a7e1d4986112538 (patch) | |
| tree | 0836426857391df1b6a83f6368a183f83ec9b104 /Minecraft.World/CraftingContainer.h | |
| parent | c9d58eeac7c72f0b3038e084667b4d89a6249fce (diff) | |
| parent | ef9b6fd500dfabd9463267b0dd9e29577eea8a2b (diff) | |
Merge branch 'main' into pr/win64-world-saves
# Conflicts:
# Minecraft.Client/MinecraftServer.cpp
# README.md
Diffstat (limited to 'Minecraft.World/CraftingContainer.h')
| -rw-r--r-- | Minecraft.World/CraftingContainer.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Minecraft.World/CraftingContainer.h b/Minecraft.World/CraftingContainer.h index 863249a2..489dc84d 100644 --- a/Minecraft.World/CraftingContainer.h +++ b/Minecraft.World/CraftingContainer.h @@ -18,15 +18,18 @@ public: virtual unsigned int getContainerSize(); virtual shared_ptr<ItemInstance> getItem(unsigned int slot); shared_ptr<ItemInstance> getItem(unsigned int x, unsigned int y); - virtual int getName(); + virtual wstring getName(); + virtual wstring getCustomName(); + virtual bool hasCustomName(); virtual shared_ptr<ItemInstance> removeItemNoUpdate(int slot); virtual shared_ptr<ItemInstance> removeItem(unsigned int slot, int count); virtual void setItem(unsigned int slot, shared_ptr<ItemInstance> item); - virtual int getMaxStackSize(); + virtual int getMaxStackSize() const; virtual void setChanged(); bool stillValid(shared_ptr<Player> player); void startOpen() { } // TODO Auto-generated method stub void stopOpen() { } // TODO Auto-generated method stub + virtual bool canPlaceItem(int slot, shared_ptr<ItemInstance> item); };
\ No newline at end of file |