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/MinecartFurnace.cpp
View File

@@ -37,7 +37,7 @@ int MinecartFurnace::getType()
void MinecartFurnace::defineSynchedData()
{
Minecart::defineSynchedData();
entityData->define(DATA_ID_FUEL, (byte) 0);
entityData->define(DATA_ID_FUEL, static_cast<byte>(0));
}
void MinecartFurnace::tick()
@@ -66,7 +66,7 @@ void MinecartFurnace::destroy(DamageSource *source)
if (!source->isExplosion())
{
spawnAtLocation(shared_ptr<ItemInstance>(new ItemInstance(Tile::furnace, 1)), 0);
spawnAtLocation(std::make_shared<ItemInstance>(Tile::furnace, 1), 0);
}
}
@@ -123,7 +123,7 @@ void MinecartFurnace::applyNaturalSlowdown()
bool MinecartFurnace::interact(shared_ptr<Player> player)
{
shared_ptr<ItemInstance> selected = player->inventory->getSelected();
if (selected != NULL && selected->id == Item::coal_Id)
if (selected != nullptr && selected->id == Item::coal_Id)
{
if (!player->abilities.instabuild && --selected->count == 0) player->inventory->setItem(player->inventory->selected, nullptr);
fuel += SharedConstants::TICKS_PER_SECOND * 180;
@@ -140,7 +140,7 @@ void MinecartFurnace::addAdditonalSaveData(CompoundTag *base)
Minecart::addAdditonalSaveData(base);
base->putDouble(L"PushX", xPush);
base->putDouble(L"PushZ", zPush);
base->putShort(L"Fuel", (short) fuel);
base->putShort(L"Fuel", static_cast<short>(fuel));
}
void MinecartFurnace::readAdditionalSaveData(CompoundTag *base)
@@ -160,11 +160,11 @@ void MinecartFurnace::setHasFuel(bool fuel)
{
if (fuel)
{
entityData->set(DATA_ID_FUEL, (byte) (entityData->getByte(DATA_ID_FUEL) | 1));
entityData->set(DATA_ID_FUEL, static_cast<byte>(entityData->getByte(DATA_ID_FUEL) | 1));
}
else
{
entityData->set(DATA_ID_FUEL, (byte) (entityData->getByte(DATA_ID_FUEL) & ~1));
entityData->set(DATA_ID_FUEL, static_cast<byte>(entityData->getByte(DATA_ID_FUEL) & ~1));
}
}