Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "shared_ptr -> std::shared_ptr"

Browse Source 
This reverts commit 7074f35e4b.
This commit is contained in:
void_17
2026-03-02 17:37:16 +07:00
parent 8a2a62ea1d
commit 119bff3514
1373 changed files with 12049 additions and 12049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Minecraft.World/MerchantMenu.cpp
View File

@@ -5,12 +5,12 @@
#include "net.minecraft.world.level.h"
#include "MerchantMenu.h"
MerchantMenu::MerchantMenu(std::shared_ptr<Inventory> inventory, std::shared_ptr<Merchant> merchant, Level *level)
MerchantMenu::MerchantMenu(shared_ptr<Inventory> inventory, shared_ptr<Merchant> merchant, Level *level)
{
trader = merchant;
this->level = level;
tradeContainer = std::shared_ptr<MerchantContainer>( new MerchantContainer(dynamic_pointer_cast<Player>(inventory->player->shared_from_this()), merchant) );
tradeContainer = shared_ptr<MerchantContainer>( new MerchantContainer(dynamic_pointer_cast<Player>(inventory->player->shared_from_this()), merchant) );
addSlot(new Slot(tradeContainer, PAYMENT1_SLOT, SELLSLOT1_X, ROW2_Y));
addSlot(new Slot(tradeContainer, PAYMENT2_SLOT, SELLSLOT2_X, ROW2_Y));
addSlot(new MerchantResultSlot(inventory->player, merchant, tradeContainer, RESULT_SLOT, BUYSLOT_X, ROW2_Y));
@@ -28,7 +28,7 @@ MerchantMenu::MerchantMenu(std::shared_ptr<Inventory> inventory, std::shared_ptr
}
}
std::shared_ptr<MerchantContainer> MerchantMenu::getTradeContainer()
shared_ptr<MerchantContainer> MerchantMenu::getTradeContainer()
{
return tradeContainer;
}
@@ -43,7 +43,7 @@ void MerchantMenu::broadcastChanges()
AbstractContainerMenu::broadcastChanges();
}
// 4J used to take a std::shared_ptr<Container> but wasn't using it, so removed to simplify things
// 4J used to take a shared_ptr<Container> but wasn't using it, so removed to simplify things
void MerchantMenu::slotsChanged()
{
tradeContainer->updateSellItem();
@@ -59,20 +59,20 @@ void MerchantMenu::setData(int id, int value)
{
}
bool MerchantMenu::stillValid(std::shared_ptr<Player> player)
bool MerchantMenu::stillValid(shared_ptr<Player> player)
{
return trader->getTradingPlayer() == player;
}
std::shared_ptr<ItemInstance> MerchantMenu::quickMoveStack(std::shared_ptr<Player> player, int slotIndex)
shared_ptr<ItemInstance> MerchantMenu::quickMoveStack(shared_ptr<Player> player, int slotIndex)
{
std::shared_ptr<ItemInstance> clicked = nullptr;
shared_ptr<ItemInstance> clicked = nullptr;
Slot *slot = NULL;
if(slotIndex < slots->size()) slot = slots->at(slotIndex);
if (slot != NULL && slot->hasItem())
{
std::shared_ptr<ItemInstance> stack = slot->getItem();
shared_ptr<ItemInstance> stack = slot->getItem();
clicked = stack->copy();
if (slotIndex == RESULT_SLOT)
@@ -124,7 +124,7 @@ std::shared_ptr<ItemInstance> MerchantMenu::quickMoveStack(std::shared_ptr<Playe
return clicked;
}
void MerchantMenu::removed(std::shared_ptr<Player> player)
void MerchantMenu::removed(shared_ptr<Player> player)
{
AbstractContainerMenu::removed(player);
trader->setTradingPlayer(nullptr);
@@ -132,7 +132,7 @@ void MerchantMenu::removed(std::shared_ptr<Player> player)
AbstractContainerMenu::removed(player);
if (level->isClientSide) return;
std::shared_ptr<ItemInstance> item = tradeContainer->removeItemNoUpdate(PAYMENT1_SLOT);
shared_ptr<ItemInstance> item = tradeContainer->removeItemNoUpdate(PAYMENT1_SLOT);
if (item)
{
player->drop(item);
@@ -144,7 +144,7 @@ void MerchantMenu::removed(std::shared_ptr<Player> player)
}
}
std::shared_ptr<Merchant> MerchantMenu::getMerchant()
shared_ptr<Merchant> MerchantMenu::getMerchant()
{
return trader;
}