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/FurnaceTileEntity.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'Minecraft.World/FurnaceTileEntity.cpp') diff --git a/Minecraft.World/FurnaceTileEntity.cpp b/Minecraft.World/FurnaceTileEntity.cpp index 0f18528c..a75b7344 100644 --- a/Minecraft.World/FurnaceTileEntity.cpp +++ b/Minecraft.World/FurnaceTileEntity.cpp @@ -39,13 +39,13 @@ unsigned int FurnaceTileEntity::getContainerSize() } -shared_ptr FurnaceTileEntity::getItem(unsigned int slot) +std::shared_ptr FurnaceTileEntity::getItem(unsigned int slot) { return (*items)[slot]; } -shared_ptr FurnaceTileEntity::removeItem(unsigned int slot, int count) +std::shared_ptr FurnaceTileEntity::removeItem(unsigned int slot, int count) { m_charcoalUsed = false; @@ -53,7 +53,7 @@ shared_ptr FurnaceTileEntity::removeItem(unsigned int slot, int co { if ((*items)[slot]->count <= count) { - shared_ptr item = (*items)[slot]; + std::shared_ptr item = (*items)[slot]; (*items)[slot] = nullptr; // 4J Stu - Fix for duplication glitch if(item->count <= 0) return nullptr; @@ -61,7 +61,7 @@ shared_ptr FurnaceTileEntity::removeItem(unsigned int slot, int co } else { - shared_ptr i = (*items)[slot]->remove(count); + std::shared_ptr i = (*items)[slot]->remove(count); if ((*items)[slot]->count == 0) (*items)[slot] = nullptr; // 4J Stu - Fix for duplication glitch if(i->count <= 0) return nullptr; @@ -71,13 +71,13 @@ shared_ptr FurnaceTileEntity::removeItem(unsigned int slot, int co return nullptr; } -shared_ptr FurnaceTileEntity::removeItemNoUpdate(int slot) +std::shared_ptr FurnaceTileEntity::removeItemNoUpdate(int slot) { m_charcoalUsed = false; if (items->data[slot] != NULL) { - shared_ptr item = items->data[slot]; + std::shared_ptr item = items->data[slot]; items->data[slot] = nullptr; return item; } @@ -85,7 +85,7 @@ shared_ptr FurnaceTileEntity::removeItemNoUpdate(int slot) } -void FurnaceTileEntity::setItem(unsigned int slot, shared_ptr item) +void FurnaceTileEntity::setItem(unsigned int slot, std::shared_ptr item) { (*items)[slot] = item; if (item != NULL && item->count > getMaxStackSize()) item->count = getMaxStackSize(); @@ -185,7 +185,7 @@ void FurnaceTileEntity::tick() if ((*items)[FUEL_SLOT] != NULL) { // 4J Added: Keep track of whether charcoal was used in production of current stack. - if ( (*items)[FUEL_SLOT]->getItem()->id == Item::coal_Id + if ( (*items)[FUEL_SLOT]->getItem()->id == Item::coal_Id && (*items)[FUEL_SLOT]->getAuxValue() == CoalItem::CHAR_COAL) { m_charcoalUsed = true; @@ -195,7 +195,7 @@ void FurnaceTileEntity::tick() if ((*items)[FUEL_SLOT]->count == 0) { Item *remaining = (*items)[FUEL_SLOT]->getItem()->getCraftingRemainingItem(); - (*items)[FUEL_SLOT] = remaining != NULL ? shared_ptr(new ItemInstance(remaining)) : nullptr; + (*items)[FUEL_SLOT] = remaining != NULL ? std::shared_ptr(new ItemInstance(remaining)) : nullptr; } } } @@ -253,7 +253,7 @@ void FurnaceTileEntity::burn() } -int FurnaceTileEntity::getBurnDuration(shared_ptr itemInstance) +int FurnaceTileEntity::getBurnDuration(std::shared_ptr itemInstance) { if (itemInstance == NULL) return 0; int id = itemInstance->getItem()->id; @@ -304,12 +304,12 @@ int FurnaceTileEntity::getBurnDuration(shared_ptr itemInstance) return 0; } -bool FurnaceTileEntity::isFuel(shared_ptr item) +bool FurnaceTileEntity::isFuel(std::shared_ptr item) { return getBurnDuration(item) > 0; } -bool FurnaceTileEntity::stillValid(shared_ptr player) +bool FurnaceTileEntity::stillValid(std::shared_ptr player) { if (level->getTileEntity(x, y, z) != shared_from_this() ) return false; if (player->distanceToSqr(x + 0.5, y + 0.5, z + 0.5) > 8 * 8) return false; @@ -330,9 +330,9 @@ void FurnaceTileEntity::stopOpen() } // 4J Added -shared_ptr FurnaceTileEntity::clone() +std::shared_ptr FurnaceTileEntity::clone() { - shared_ptr result = shared_ptr( new FurnaceTileEntity() ); + std::shared_ptr result = std::shared_ptr( new FurnaceTileEntity() ); TileEntity::clone(result); result->litTime = litTime; -- cgit v1.2.3