LegacyConsole/4jcraft
2
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-24 02:46:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: format Minecraft.World

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

138
Minecraft.World/Containers/SimpleContainer.cpp
View File

@@ -5,97 +5,86 @@
#include "SimpleContainer.h"
SimpleContainer::SimpleContainer(int name, int size)
{
this->name = name;
this->size = size;
items = new ItemInstanceArray( size );
SimpleContainer::SimpleContainer(int name, int size) {
this->name = name;
this->size = size;
items = new ItemInstanceArray(size);
listeners = NULL;
listeners = NULL;
}
void SimpleContainer::addListener(net_minecraft_world::ContainerListener *listener)
{
if (listeners == NULL) listeners = new std::vector<net_minecraft_world::ContainerListener *>();
listeners->push_back(listener);
void SimpleContainer::addListener(
net_minecraft_world::ContainerListener* listener) {
if (listeners == NULL)
listeners = new std::vector<net_minecraft_world::ContainerListener*>();
listeners->push_back(listener);
}
void SimpleContainer::removeListener(net_minecraft_world::ContainerListener *listener)
{
// 4J Java has a remove function on lists that will find the first occurence of
// an object and remove it. We need to replicate that ourselves
void SimpleContainer::removeListener(
net_minecraft_world::ContainerListener* listener) {
// 4J Java has a remove function on lists that will find the first occurence
// of an object and remove it. We need to replicate that ourselves
std::vector<net_minecraft_world::ContainerListener *>::iterator it = listeners->begin();
std::vector<net_minecraft_world::ContainerListener *>::iterator itEnd = listeners->end();
while( it != itEnd && *it != listener )
it++;
std::vector<net_minecraft_world::ContainerListener*>::iterator it =
listeners->begin();
std::vector<net_minecraft_world::ContainerListener*>::iterator itEnd =
listeners->end();
while (it != itEnd && *it != listener) it++;
if( it != itEnd )
listeners->erase( it );
if (it != itEnd) listeners->erase(it);
}
std::shared_ptr<ItemInstance> SimpleContainer::getItem(unsigned int slot)
{
return (*items)[slot];
std::shared_ptr<ItemInstance> SimpleContainer::getItem(unsigned int slot) {
return (*items)[slot];
}
std::shared_ptr<ItemInstance> SimpleContainer::removeItem(unsigned int slot, int count)
{
if ((*items)[slot] != NULL) {
if ((*items)[slot]->count <= count)
{
std::shared_ptr<ItemInstance> item = (*items)[slot];
(*items)[slot] = nullptr;
this->setChanged();
return item;
}
else
{
std::shared_ptr<ItemInstance> i = (*items)[slot]->remove(count);
if ((*items)[slot]->count == 0) (*items)[slot] = nullptr;
this->setChanged();
return i;
}
}
return nullptr;
std::shared_ptr<ItemInstance> SimpleContainer::removeItem(unsigned int slot,
int count) {
if ((*items)[slot] != NULL) {
if ((*items)[slot]->count <= count) {
std::shared_ptr<ItemInstance> item = (*items)[slot];
(*items)[slot] = nullptr;
this->setChanged();
return item;
} else {
std::shared_ptr<ItemInstance> i = (*items)[slot]->remove(count);
if ((*items)[slot]->count == 0) (*items)[slot] = nullptr;
this->setChanged();
return i;
}
}
return nullptr;
}
std::shared_ptr<ItemInstance> SimpleContainer::removeItemNoUpdate(int slot)
{
if ((*items)[slot] != NULL)
{
std::shared_ptr<ItemInstance> item = (*items)[slot];
(*items)[slot] = nullptr;
return item;
}
return nullptr;
std::shared_ptr<ItemInstance> SimpleContainer::removeItemNoUpdate(int slot) {
if ((*items)[slot] != NULL) {
std::shared_ptr<ItemInstance> item = (*items)[slot];
(*items)[slot] = nullptr;
return item;
}
return nullptr;
}
void SimpleContainer::setItem(unsigned int slot, std::shared_ptr<ItemInstance> item)
{
(*items)[slot] = item;
if (item != NULL && item->count > getMaxStackSize()) item->count = getMaxStackSize();
this->setChanged();
void SimpleContainer::setItem(unsigned int slot,
std::shared_ptr<ItemInstance> item) {
(*items)[slot] = item;
if (item != NULL && item->count > getMaxStackSize())
item->count = getMaxStackSize();
this->setChanged();
}
unsigned int SimpleContainer::getContainerSize()
{
return size;
unsigned int SimpleContainer::getContainerSize() { return size; }
int SimpleContainer::getName() { return name; }
int SimpleContainer::getMaxStackSize() {
return Container::LARGE_MAX_STACK_SIZE;
}
int SimpleContainer::getName()
{
return name;
}
int SimpleContainer::getMaxStackSize()
{
return Container::LARGE_MAX_STACK_SIZE;
}
void SimpleContainer::setChanged()
{
// 4J - removing this as we don't seem to have any implementation of a listener containerChanged function, and shared_from_this is proving tricky to add to containers
void SimpleContainer::setChanged() {
// 4J - removing this as we don't seem to have any implementation of a
// listener containerChanged function, and shared_from_this is proving
// tricky to add to containers
#if 0
if (listeners != NULL) for (unsigned int i = 0; i < listeners->size(); i++)
{
@@ -104,7 +93,6 @@ void SimpleContainer::setChanged()
#endif
}
bool SimpleContainer::stillValid(std::shared_ptr<Player> player)
{
return true;
bool SimpleContainer::stillValid(std::shared_ptr<Player> player) {
return true;
}