chore: format Minecraft.World

This commit is contained in:
Tropical
2026-03-13 17:06:56 -05:00
parent bd6284025d
commit 33d0737d1d
1511 changed files with 108661 additions and 115521 deletions

View File

@@ -3,181 +3,139 @@
#include "MerchantMenu.h"
#include "MerchantContainer.h"
MerchantContainer::MerchantContainer(std::shared_ptr<Player> player, std::shared_ptr<Merchant> villager)
{
this->player = player;
merchant = villager;
items = ItemInstanceArray(3);
items[0] = nullptr;
items[1] = nullptr;
items[2] = nullptr;
activeRecipe = NULL;
selectionHint = 0;
MerchantContainer::MerchantContainer(std::shared_ptr<Player> player,
std::shared_ptr<Merchant> villager) {
this->player = player;
merchant = villager;
items = ItemInstanceArray(3);
items[0] = nullptr;
items[1] = nullptr;
items[2] = nullptr;
activeRecipe = NULL;
selectionHint = 0;
}
MerchantContainer::~MerchantContainer()
{
delete [] items.data;
MerchantContainer::~MerchantContainer() { delete[] items.data; }
unsigned int MerchantContainer::getContainerSize() { return items.length; }
std::shared_ptr<ItemInstance> MerchantContainer::getItem(unsigned int slot) {
return items[slot];
}
unsigned int MerchantContainer::getContainerSize()
{
return items.length;
std::shared_ptr<ItemInstance> MerchantContainer::removeItem(unsigned int slot,
int count) {
if (items[slot] != NULL) {
if (slot == MerchantMenu::RESULT_SLOT) {
std::shared_ptr<ItemInstance> item = items[slot];
items[slot] = nullptr;
return item;
}
if (items[slot]->count <= count) {
std::shared_ptr<ItemInstance> item = items[slot];
items[slot] = nullptr;
if (isPaymentSlot(slot)) {
updateSellItem();
}
return item;
} else {
std::shared_ptr<ItemInstance> i = items[slot]->remove(count);
if (items[slot]->count == 0) items[slot] = nullptr;
if (isPaymentSlot(slot)) {
updateSellItem();
}
return i;
}
}
return nullptr;
}
std::shared_ptr<ItemInstance> MerchantContainer::getItem(unsigned int slot)
{
return items[slot];
bool MerchantContainer::isPaymentSlot(int slot) {
return slot == MerchantMenu::PAYMENT1_SLOT ||
slot == MerchantMenu::PAYMENT2_SLOT;
}
std::shared_ptr<ItemInstance> MerchantContainer::removeItem(unsigned int slot, int count)
{
if (items[slot] != NULL)
{
if (slot == MerchantMenu::RESULT_SLOT)
{
std::shared_ptr<ItemInstance> item = items[slot];
items[slot] = nullptr;
return item;
}
if (items[slot]->count <= count)
{
std::shared_ptr<ItemInstance> item = items[slot];
items[slot] = nullptr;
if (isPaymentSlot(slot))
{
updateSellItem();
}
return item;
}
else
{
std::shared_ptr<ItemInstance> i = items[slot]->remove(count);
if (items[slot]->count == 0) items[slot] = nullptr;
if (isPaymentSlot(slot))
{
updateSellItem();
}
return i;
}
}
return nullptr;
std::shared_ptr<ItemInstance> MerchantContainer::removeItemNoUpdate(int slot) {
if (items[slot] != NULL) {
std::shared_ptr<ItemInstance> item = items[slot];
items[slot] = nullptr;
return item;
}
return nullptr;
}
bool MerchantContainer::isPaymentSlot(int slot)
{
return slot == MerchantMenu::PAYMENT1_SLOT || slot == MerchantMenu::PAYMENT2_SLOT;
void MerchantContainer::setItem(unsigned int slot,
std::shared_ptr<ItemInstance> item) {
items[slot] = item;
if (item != NULL && item->count > getMaxStackSize())
item->count = getMaxStackSize();
if (isPaymentSlot(slot)) {
updateSellItem();
}
}
std::shared_ptr<ItemInstance> MerchantContainer::removeItemNoUpdate(int slot)
{
if (items[slot] != NULL)
{
std::shared_ptr<ItemInstance> item = items[slot];
items[slot] = nullptr;
return item;
}
return nullptr;
int MerchantContainer::getName() { return merchant->getDisplayName(); }
int MerchantContainer::getMaxStackSize() {
return Container::LARGE_MAX_STACK_SIZE;
}
void MerchantContainer::setItem(unsigned int slot, std::shared_ptr<ItemInstance> item)
{
items[slot] = item;
if (item != NULL && item->count > getMaxStackSize()) item->count = getMaxStackSize();
if (isPaymentSlot(slot))
{
updateSellItem();
}
bool MerchantContainer::stillValid(std::shared_ptr<Player> player) {
return merchant->getTradingPlayer() == player;
}
int MerchantContainer::getName()
{
return merchant->getDisplayName();
void MerchantContainer::startOpen() {}
void MerchantContainer::stopOpen() {}
void MerchantContainer::setChanged() { updateSellItem(); }
void MerchantContainer::updateSellItem() {
activeRecipe = NULL;
std::shared_ptr<ItemInstance> buyItem1 = items[MerchantMenu::PAYMENT1_SLOT];
std::shared_ptr<ItemInstance> buyItem2 = items[MerchantMenu::PAYMENT2_SLOT];
if (buyItem1 == NULL) {
buyItem1 = buyItem2;
buyItem2 = nullptr;
}
if (buyItem1 == NULL) {
setItem(MerchantMenu::RESULT_SLOT, nullptr);
} else {
MerchantRecipeList* offers = merchant->getOffers(player);
if (offers != NULL) {
MerchantRecipe* recipeFor =
offers->getRecipeFor(buyItem1, buyItem2, selectionHint);
if (recipeFor != NULL && !recipeFor->isDeprecated()) {
activeRecipe = recipeFor;
setItem(MerchantMenu::RESULT_SLOT,
recipeFor->getSellItem()->copy());
} else if (buyItem2 != NULL) {
// try to switch
recipeFor =
offers->getRecipeFor(buyItem2, buyItem1, selectionHint);
if (recipeFor != NULL && !recipeFor->isDeprecated()) {
activeRecipe = recipeFor;
setItem(MerchantMenu::RESULT_SLOT,
recipeFor->getSellItem()->copy());
} else {
setItem(MerchantMenu::RESULT_SLOT, nullptr);
}
} else {
setItem(MerchantMenu::RESULT_SLOT, nullptr);
}
}
}
merchant->notifyTradeUpdated(getItem(MerchantMenu::RESULT_SLOT));
}
int MerchantContainer::getMaxStackSize()
{
return Container::LARGE_MAX_STACK_SIZE;
}
MerchantRecipe* MerchantContainer::getActiveRecipe() { return activeRecipe; }
bool MerchantContainer::stillValid(std::shared_ptr<Player> player)
{
return merchant->getTradingPlayer() == player;
}
void MerchantContainer::startOpen()
{
}
void MerchantContainer::stopOpen()
{
}
void MerchantContainer::setChanged()
{
updateSellItem();
}
void MerchantContainer::updateSellItem()
{
activeRecipe = NULL;
std::shared_ptr<ItemInstance> buyItem1 = items[MerchantMenu::PAYMENT1_SLOT];
std::shared_ptr<ItemInstance> buyItem2 = items[MerchantMenu::PAYMENT2_SLOT];
if (buyItem1 == NULL)
{
buyItem1 = buyItem2;
buyItem2 = nullptr;
}
if (buyItem1 == NULL)
{
setItem(MerchantMenu::RESULT_SLOT, nullptr);
}
else
{
MerchantRecipeList *offers = merchant->getOffers(player);
if (offers != NULL)
{
MerchantRecipe *recipeFor = offers->getRecipeFor(buyItem1, buyItem2, selectionHint);
if (recipeFor != NULL && !recipeFor->isDeprecated())
{
activeRecipe = recipeFor;
setItem(MerchantMenu::RESULT_SLOT, recipeFor->getSellItem()->copy());
}
else if (buyItem2 != NULL)
{
// try to switch
recipeFor = offers->getRecipeFor(buyItem2, buyItem1, selectionHint);
if (recipeFor != NULL && !recipeFor->isDeprecated())
{
activeRecipe = recipeFor;
setItem(MerchantMenu::RESULT_SLOT, recipeFor->getSellItem()->copy());
}
else
{
setItem(MerchantMenu::RESULT_SLOT, nullptr);
}
}
else
{
setItem(MerchantMenu::RESULT_SLOT, nullptr);
}
}
}
merchant->notifyTradeUpdated(getItem(MerchantMenu::RESULT_SLOT));
}
MerchantRecipe *MerchantContainer::getActiveRecipe()
{
return activeRecipe;
}
void MerchantContainer::setSelectionHint(int selectionHint)
{
this->selectionHint = selectionHint;
updateSellItem();
void MerchantContainer::setSelectionHint(int selectionHint) {
this->selectionHint = selectionHint;
updateSellItem();
}