From 7074f35e4ba831e358117842b99ee35b87f85ae5 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 15:58:20 +0700 Subject: shared_ptr -> std::shared_ptr This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today. --- Minecraft.World/AbstractContainerMenu.h | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'Minecraft.World/AbstractContainerMenu.h') diff --git a/Minecraft.World/AbstractContainerMenu.h b/Minecraft.World/AbstractContainerMenu.h index f34e1afc..0875d65c 100644 --- a/Minecraft.World/AbstractContainerMenu.h +++ b/Minecraft.World/AbstractContainerMenu.h @@ -26,7 +26,7 @@ public: static const int CONTAINER_ID_INVENTORY = 0; static const int CONTAINER_ID_CREATIVE = -2; - vector > *lastSlots; + vector > *lastSlots; vector *slots; int containerId; @@ -46,34 +46,34 @@ protected: public: virtual ~AbstractContainerMenu(); virtual void addSlotListener(ContainerListener *listener); - vector > *getItems(); + vector > *getItems(); void sendData(int id, int value); virtual void broadcastChanges(); virtual bool needsRendered(); - virtual bool clickMenuButton(shared_ptr player, int buttonId); - Slot *getSlotFor(shared_ptr c, int index); + virtual bool clickMenuButton(std::shared_ptr player, int buttonId); + Slot *getSlotFor(std::shared_ptr c, int index); Slot *getSlot(int index); - virtual shared_ptr quickMoveStack(shared_ptr player, int slotIndex); - virtual shared_ptr clicked(int slotIndex, int buttonNum, int clickType, shared_ptr player); - virtual bool mayCombine(Slot *slot, shared_ptr item); + virtual std::shared_ptr quickMoveStack(std::shared_ptr player, int slotIndex); + virtual std::shared_ptr clicked(int slotIndex, int buttonNum, int clickType, std::shared_ptr player); + virtual bool mayCombine(Slot *slot, std::shared_ptr item); protected: - virtual void loopClick(int slotIndex, int buttonNum, bool quickKeyHeld, shared_ptr player); + virtual void loopClick(int slotIndex, int buttonNum, bool quickKeyHeld, std::shared_ptr player); public: - virtual void removed(shared_ptr player); - virtual void slotsChanged();// 4J used to take a shared_ptr container but wasn't using it, so removed to simplify things + virtual void removed(std::shared_ptr player); + virtual void slotsChanged();// 4J used to take a std::shared_ptr container but wasn't using it, so removed to simplify things bool isPauseScreen(); - void setItem(unsigned int slot, shared_ptr item); + void setItem(unsigned int slot, std::shared_ptr item); void setAll(ItemInstanceArray *items); virtual void setData(int id, int value); - short backup(shared_ptr inventory); + short backup(std::shared_ptr inventory); private: - unordered_set , PlayerKeyHash, PlayerKeyEq> unSynchedPlayers; + unordered_set , PlayerKeyHash, PlayerKeyEq> unSynchedPlayers; public: - bool isSynched(shared_ptr player); - void setSynched(shared_ptr player, bool synched); - virtual bool stillValid(shared_ptr player) = 0; + bool isSynched(std::shared_ptr player); + void setSynched(std::shared_ptr player, bool synched); + virtual bool stillValid(std::shared_ptr player) = 0; // 4J Stu Added for UI unsigned int getSize() { return (unsigned int)slots->size(); } @@ -81,7 +81,7 @@ public: protected: // 4J Stu - Changes to return bool brought forward from 1.2 - bool moveItemStackTo(shared_ptr itemStack, int startSlot, int endSlot, bool backwards); + bool moveItemStackTo(std::shared_ptr itemStack, int startSlot, int endSlot, bool backwards); public: virtual bool isOverrideResultClick(int slotNum, int buttonNum); -- cgit v1.2.3