mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-06-27 04:55:34 +00:00
TU19: merge Minecraft.World/Containers
keeping virtual destructors where possible
This commit is contained in:
@@ -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;
|
||||
}
|
||||
Reference in New Issue
Block a user