mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-06-24 07:15:31 +00:00
chore: format Minecraft.World
This commit is contained in:
Tropical
@@ -9,216 +9,176 @@
|
||||
#include "../../Headers/net.minecraft.world.item.h"
|
||||
#include "DispenserTileEntity.h"
|
||||
|
||||
|
||||
|
||||
DispenserTileEntity::DispenserTileEntity() : TileEntity()
|
||||
{
|
||||
items = new ItemInstanceArray(9);
|
||||
random = new Random();
|
||||
DispenserTileEntity::DispenserTileEntity() : TileEntity() {
|
||||
items = new ItemInstanceArray(9);
|
||||
random = new Random();
|
||||
}
|
||||
|
||||
DispenserTileEntity::~DispenserTileEntity()
|
||||
{
|
||||
delete[] items->data;
|
||||
delete items;
|
||||
DispenserTileEntity::~DispenserTileEntity() {
|
||||
delete[] items->data;
|
||||
delete items;
|
||||
|
||||
delete random;
|
||||
delete random;
|
||||
}
|
||||
|
||||
unsigned int DispenserTileEntity::getContainerSize()
|
||||
{
|
||||
return 9;
|
||||
unsigned int DispenserTileEntity::getContainerSize() { return 9; }
|
||||
|
||||
std::shared_ptr<ItemInstance> DispenserTileEntity::getItem(unsigned int slot) {
|
||||
return items->data[slot];
|
||||
}
|
||||
|
||||
std::shared_ptr<ItemInstance> DispenserTileEntity::getItem(unsigned int slot)
|
||||
{
|
||||
return items->data[slot];
|
||||
std::shared_ptr<ItemInstance> DispenserTileEntity::removeItem(unsigned int slot,
|
||||
int count) {
|
||||
if (items->data[slot] != NULL) {
|
||||
if (items->data[slot]->count <= count) {
|
||||
std::shared_ptr<ItemInstance> item = items->data[slot];
|
||||
items->data[slot] = nullptr;
|
||||
this->setChanged();
|
||||
// 4J Stu - Fix for duplication glitch
|
||||
if (item->count <= 0) return nullptr;
|
||||
return item;
|
||||
} else {
|
||||
std::shared_ptr<ItemInstance> i = items->data[slot]->remove(count);
|
||||
if (items->data[slot]->count == 0) items->data[slot] = nullptr;
|
||||
this->setChanged();
|
||||
// 4J Stu - Fix for duplication glitch
|
||||
if (i->count <= 0) return nullptr;
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
std::shared_ptr<ItemInstance> DispenserTileEntity::removeItem(unsigned int slot, int count)
|
||||
{
|
||||
if (items->data[slot] != NULL)
|
||||
{
|
||||
if (items->data[slot]->count <= count)
|
||||
{
|
||||
std::shared_ptr<ItemInstance> item = items->data[slot];
|
||||
items->data[slot] = nullptr;
|
||||
this->setChanged();
|
||||
// 4J Stu - Fix for duplication glitch
|
||||
if(item->count <= 0) return nullptr;
|
||||
return item;
|
||||
}
|
||||
else
|
||||
{
|
||||
std::shared_ptr<ItemInstance> i = items->data[slot]->remove(count);
|
||||
if (items->data[slot]->count == 0) items->data[slot] = nullptr;
|
||||
this->setChanged();
|
||||
// 4J Stu - Fix for duplication glitch
|
||||
if(i->count <= 0) return nullptr;
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
std::shared_ptr<ItemInstance> DispenserTileEntity::removeItemNoUpdate(
|
||||
int slot) {
|
||||
if (items->data[slot] != NULL) {
|
||||
std::shared_ptr<ItemInstance> item = items->data[slot];
|
||||
items->data[slot] = nullptr;
|
||||
return item;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
std::shared_ptr<ItemInstance> DispenserTileEntity::removeItemNoUpdate(int slot)
|
||||
{
|
||||
if (items->data[slot] != NULL)
|
||||
{
|
||||
std::shared_ptr<ItemInstance> item = items->data[slot];
|
||||
items->data[slot] = nullptr;
|
||||
return item;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// 4J-PB added for spawn eggs not being useable due to limits, so add them in again
|
||||
void DispenserTileEntity::AddItemBack(std::shared_ptr<ItemInstance>item, unsigned int slot)
|
||||
{
|
||||
if (items->data[slot] != NULL)
|
||||
{
|
||||
// just increment the count of the items
|
||||
if(item->id==items->data[slot]->id)
|
||||
{
|
||||
items->data[slot]->count++;
|
||||
this->setChanged();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
items->data[slot] = item;
|
||||
if (item != NULL && item->count > getMaxStackSize()) item->count = getMaxStackSize();
|
||||
this->setChanged();
|
||||
}
|
||||
// 4J-PB added for spawn eggs not being useable due to limits, so add them in
|
||||
// again
|
||||
void DispenserTileEntity::AddItemBack(std::shared_ptr<ItemInstance> item,
|
||||
unsigned int slot) {
|
||||
if (items->data[slot] != NULL) {
|
||||
// just increment the count of the items
|
||||
if (item->id == items->data[slot]->id) {
|
||||
items->data[slot]->count++;
|
||||
this->setChanged();
|
||||
}
|
||||
} else {
|
||||
items->data[slot] = item;
|
||||
if (item != NULL && item->count > getMaxStackSize())
|
||||
item->count = getMaxStackSize();
|
||||
this->setChanged();
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Removes an item with the given id and returns true if one was found.
|
||||
*
|
||||
* @param itemId
|
||||
* @return
|
||||
*/
|
||||
bool DispenserTileEntity::removeProjectile(int itemId)
|
||||
{
|
||||
for (unsigned int i = 0; i < items->length; i++)
|
||||
{
|
||||
if (items->data[i] != NULL && items->data[i]->id == itemId)
|
||||
{
|
||||
std::shared_ptr<ItemInstance> removedItem = removeItem(i, 1);
|
||||
return removedItem != NULL;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
* Removes an item with the given id and returns true if one was found.
|
||||
*
|
||||
* @param itemId
|
||||
* @return
|
||||
*/
|
||||
bool DispenserTileEntity::removeProjectile(int itemId) {
|
||||
for (unsigned int i = 0; i < items->length; i++) {
|
||||
if (items->data[i] != NULL && items->data[i]->id == itemId) {
|
||||
std::shared_ptr<ItemInstance> removedItem = removeItem(i, 1);
|
||||
return removedItem != NULL;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
int DispenserTileEntity::getRandomSlot()
|
||||
{
|
||||
int replaceSlot = -1;
|
||||
int replaceOdds = 1;
|
||||
for (unsigned int i = 0; i < items->length; i++)
|
||||
{
|
||||
if (items->data[i] != NULL && random->nextInt(replaceOdds++) == 0)
|
||||
{
|
||||
replaceSlot = i;
|
||||
}
|
||||
}
|
||||
int DispenserTileEntity::getRandomSlot() {
|
||||
int replaceSlot = -1;
|
||||
int replaceOdds = 1;
|
||||
for (unsigned int i = 0; i < items->length; i++) {
|
||||
if (items->data[i] != NULL && random->nextInt(replaceOdds++) == 0) {
|
||||
replaceSlot = i;
|
||||
}
|
||||
}
|
||||
|
||||
return replaceSlot;
|
||||
return replaceSlot;
|
||||
}
|
||||
|
||||
void DispenserTileEntity::setItem(unsigned int slot, std::shared_ptr<ItemInstance> item)
|
||||
{
|
||||
items->data[slot] = item;
|
||||
if (item != NULL && item->count > getMaxStackSize()) item->count = getMaxStackSize();
|
||||
this->setChanged();
|
||||
void DispenserTileEntity::setItem(unsigned int slot,
|
||||
std::shared_ptr<ItemInstance> item) {
|
||||
items->data[slot] = item;
|
||||
if (item != NULL && item->count > getMaxStackSize())
|
||||
item->count = getMaxStackSize();
|
||||
this->setChanged();
|
||||
}
|
||||
|
||||
int DispenserTileEntity::addItem(std::shared_ptr<ItemInstance> item)
|
||||
{
|
||||
for (int i = 0; i < items->length; i++)
|
||||
{
|
||||
if ((*items)[i] == NULL || (*items)[i]->id == 0)
|
||||
{
|
||||
(*items)[i] = item;
|
||||
return i;
|
||||
}
|
||||
}
|
||||
int DispenserTileEntity::addItem(std::shared_ptr<ItemInstance> item) {
|
||||
for (int i = 0; i < items->length; i++) {
|
||||
if ((*items)[i] == NULL || (*items)[i]->id == 0) {
|
||||
(*items)[i] = item;
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
return -1;
|
||||
}
|
||||
|
||||
int DispenserTileEntity::getName()
|
||||
{
|
||||
return IDS_TILE_DISPENSER;
|
||||
int DispenserTileEntity::getName() { return IDS_TILE_DISPENSER; }
|
||||
|
||||
void DispenserTileEntity::load(CompoundTag* base) {
|
||||
TileEntity::load(base);
|
||||
ListTag<CompoundTag>* inventoryList =
|
||||
(ListTag<CompoundTag>*)base->getList(L"Items");
|
||||
items = new ItemInstanceArray(getContainerSize());
|
||||
for (int i = 0; i < inventoryList->size(); i++) {
|
||||
CompoundTag* tag = inventoryList->get(i);
|
||||
unsigned int slot = tag->getByte(L"Slot") & 0xff;
|
||||
if (slot >= 0 && slot < items->length)
|
||||
(*items)[slot] = ItemInstance::fromTag(tag);
|
||||
}
|
||||
}
|
||||
|
||||
void DispenserTileEntity::load(CompoundTag *base)
|
||||
{
|
||||
TileEntity::load(base);
|
||||
ListTag<CompoundTag> *inventoryList = (ListTag<CompoundTag> *) base->getList(L"Items");
|
||||
items = new ItemInstanceArray(getContainerSize());
|
||||
for (int i = 0; i < inventoryList->size(); i++)
|
||||
{
|
||||
CompoundTag *tag = inventoryList->get(i);
|
||||
unsigned int slot = tag->getByte(L"Slot") & 0xff;
|
||||
if (slot >= 0 && slot < items->length) (*items)[slot] = ItemInstance::fromTag(tag);
|
||||
}
|
||||
void DispenserTileEntity::save(CompoundTag* base) {
|
||||
TileEntity::save(base);
|
||||
ListTag<CompoundTag>* listTag = new ListTag<CompoundTag>;
|
||||
|
||||
for (unsigned int i = 0; i < items->length; i++) {
|
||||
if (items->data[i] != NULL) {
|
||||
CompoundTag* tag = new CompoundTag();
|
||||
tag->putByte(L"Slot", (uint8_t)i);
|
||||
items->data[i]->save(tag);
|
||||
listTag->add(tag);
|
||||
}
|
||||
}
|
||||
base->put(L"Items", listTag);
|
||||
}
|
||||
|
||||
void DispenserTileEntity::save(CompoundTag *base)
|
||||
{
|
||||
TileEntity::save(base);
|
||||
ListTag<CompoundTag> *listTag = new ListTag<CompoundTag>;
|
||||
|
||||
for (unsigned int i = 0; i < items->length; i++)
|
||||
{
|
||||
if (items->data[i] != NULL)
|
||||
{
|
||||
CompoundTag *tag = new CompoundTag();
|
||||
tag->putByte(L"Slot", (uint8_t) i);
|
||||
items->data[i]->save(tag);
|
||||
listTag->add(tag);
|
||||
}
|
||||
}
|
||||
base->put(L"Items", listTag);
|
||||
int DispenserTileEntity::getMaxStackSize() {
|
||||
return Container::LARGE_MAX_STACK_SIZE;
|
||||
}
|
||||
|
||||
int DispenserTileEntity::getMaxStackSize()
|
||||
{
|
||||
return Container::LARGE_MAX_STACK_SIZE;
|
||||
bool DispenserTileEntity::stillValid(std::shared_ptr<Player> 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;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool DispenserTileEntity::stillValid(std::shared_ptr<Player> 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;
|
||||
return true;
|
||||
}
|
||||
void DispenserTileEntity::setChanged() { return TileEntity::setChanged(); }
|
||||
|
||||
void DispenserTileEntity::setChanged()
|
||||
{
|
||||
return TileEntity::setChanged();
|
||||
}
|
||||
void DispenserTileEntity::startOpen() {}
|
||||
|
||||
void DispenserTileEntity::startOpen()
|
||||
{
|
||||
}
|
||||
|
||||
void DispenserTileEntity::stopOpen()
|
||||
{
|
||||
}
|
||||
void DispenserTileEntity::stopOpen() {}
|
||||
|
||||
// 4J Added
|
||||
std::shared_ptr<TileEntity> DispenserTileEntity::clone()
|
||||
{
|
||||
std::shared_ptr<DispenserTileEntity> result = std::shared_ptr<DispenserTileEntity>( new DispenserTileEntity() );
|
||||
TileEntity::clone(result);
|
||||
std::shared_ptr<TileEntity> DispenserTileEntity::clone() {
|
||||
std::shared_ptr<DispenserTileEntity> result =
|
||||
std::shared_ptr<DispenserTileEntity>(new DispenserTileEntity());
|
||||
TileEntity::clone(result);
|
||||
|
||||
for (unsigned int i = 0; i < items->length; i++)
|
||||
{
|
||||
if (items->data[i] != NULL)
|
||||
{
|
||||
result->items->data[i] = ItemInstance::clone(items->data[i]);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
for (unsigned int i = 0; i < items->length; i++) {
|
||||
if (items->data[i] != NULL) {
|
||||
result->items->data[i] = ItemInstance::clone(items->data[i]);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
Reference in New Issue
Block a user