Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Project modernization (#630)

Browse Source 
* Fixed boats falling and a TP glitch #266

* Replaced every C-style cast with C++ ones

* Replaced every C-style cast with C++ ones

* Fixed boats falling and a TP glitch #266

* Updated NULL to nullptr and fixing some type issues

* Modernized and fixed a few bugs

- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.

* Fixing more conflicts

* Replace int loops with size_t and start work on overrides
This commit is contained in:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Minecraft.World/SimpleContainer.cpp
View File

@@ -13,12 +13,12 @@ SimpleContainer::SimpleContainer(int name, wstring stringName, bool customName,
this->size = size;
items = new ItemInstanceArray( size );
listeners = NULL;
listeners = nullptr;
}
void SimpleContainer::addListener(net_minecraft_world::ContainerListener *listener)
{
if (listeners == NULL) listeners = new vector<net_minecraft_world::ContainerListener *>();
if (listeners == nullptr) listeners = new vector<net_minecraft_world::ContainerListener *>();
listeners->push_back(listener);
}
@@ -43,7 +43,7 @@ shared_ptr<ItemInstance> SimpleContainer::getItem(unsigned int slot)
shared_ptr<ItemInstance> SimpleContainer::removeItem(unsigned int slot, int count)
{
if ((*items)[slot] != NULL) {
if ((*items)[slot] != nullptr) {
if ((*items)[slot]->count <= count)
{
shared_ptr<ItemInstance> item = (*items)[slot];
@@ -64,7 +64,7 @@ shared_ptr<ItemInstance> SimpleContainer::removeItem(unsigned int slot, int coun
shared_ptr<ItemInstance> SimpleContainer::removeItemNoUpdate(int slot)
{
if ((*items)[slot] != NULL)
if ((*items)[slot] != nullptr)
{
shared_ptr<ItemInstance> item = (*items)[slot];
(*items)[slot] = nullptr;
@@ -76,7 +76,7 @@ shared_ptr<ItemInstance> SimpleContainer::removeItemNoUpdate(int slot)
void SimpleContainer::setItem(unsigned int slot, shared_ptr<ItemInstance> item)
{
(*items)[slot] = item;
if (item != NULL && item->count > getMaxStackSize()) item->count = getMaxStackSize();
if (item != nullptr && item->count > getMaxStackSize()) item->count = getMaxStackSize();
setChanged();
}
@@ -113,7 +113,7 @@ int SimpleContainer::getMaxStackSize() const
void SimpleContainer::setChanged()
{
if (listeners != NULL) for (unsigned int i = 0; i < listeners->size(); i++)
if (listeners != nullptr) for (unsigned int i = 0; i < listeners->size(); i++)
{
listeners->at(i)->containerChanged();//shared_from_this());
}