TU19: merge Minecraft.World/Containers

keeping virtual destructors where possible
This commit is contained in:
Tropical
2026-03-21 15:18:52 -05:00
parent db0a6b2e6a
commit f25cd66f4d
56 changed files with 1412 additions and 373 deletions

View File

@@ -2,32 +2,34 @@
#include "../Headers/net.minecraft.world.entity.player.h"
#include "ResultContainer.h"
ResultContainer::ResultContainer() : Container() {
items = new ItemInstanceArray(1);
}
ResultContainer::ResultContainer() : Container() {}
unsigned int ResultContainer::getContainerSize() { return 1; }
std::shared_ptr<ItemInstance> ResultContainer::getItem(unsigned int slot) {
return (*items)[0];
return items[0];
}
int ResultContainer::getName() { return 0; }
std::wstring ResultContainer::getName() { return L""; }
std::wstring ResultContainer::getCustomName() { return L""; }
bool ResultContainer::hasCustomName() { return false; }
std::shared_ptr<ItemInstance> ResultContainer::removeItem(unsigned int slot,
int count) {
if ((*items)[0] != NULL) {
std::shared_ptr<ItemInstance> item = (*items)[0];
(*items)[0] = nullptr;
if (items[0] != NULL) {
std::shared_ptr<ItemInstance> item = items[0];
items[0] = nullptr;
return item;
}
return nullptr;
}
std::shared_ptr<ItemInstance> ResultContainer::removeItemNoUpdate(int slot) {
if ((*items)[0] != NULL) {
std::shared_ptr<ItemInstance> item = (*items)[0];
(*items)[0] = nullptr;
if (items[0] != NULL) {
std::shared_ptr<ItemInstance> item = items[0];
items[0] = nullptr;
return item;
}
return nullptr;
@@ -35,7 +37,7 @@ std::shared_ptr<ItemInstance> ResultContainer::removeItemNoUpdate(int slot) {
void ResultContainer::setItem(unsigned int slot,
std::shared_ptr<ItemInstance> item) {
(*items)[0] = item;
items[0] = item;
}
int ResultContainer::getMaxStackSize() {
@@ -46,4 +48,9 @@ void ResultContainer::setChanged() {}
bool ResultContainer::stillValid(std::shared_ptr<Player> player) {
return true;
}
bool ResultContainer::canPlaceItem(int slot,
std::shared_ptr<ItemInstance> item) {
return true;
}