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

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Minecraft.World/HopperTile.cpp
View File

@@ -47,7 +47,7 @@ int HopperTile::getPlacedOnFaceDataValue(Level *level, int x, int y, int z, int
shared_ptr<TileEntity> HopperTile::newTileEntity(Level *level)
{
return std::make_shared<HopperTileEntity>();
return shared_ptr<HopperTileEntity>( new HopperTileEntity() );
}
void HopperTile::setPlacedBy(Level *level, int x, int y, int z, shared_ptr<LivingEntity> by, shared_ptr<ItemInstance> itemInstance)
@@ -74,7 +74,7 @@ bool HopperTile::use(Level *level, int x, int y, int z, shared_ptr<Player> playe
return true;
}
shared_ptr<HopperTileEntity> hopper = getHopper(level, x, y, z);
if (hopper != nullptr) player->openHopper(hopper);
if (hopper != NULL) player->openHopper(hopper);
return true;
}
@@ -99,12 +99,12 @@ void HopperTile::checkPoweredState(Level *level, int x, int y, int z)
void HopperTile::onRemove(Level *level, int x, int y, int z, int id, int data)
{
shared_ptr<Container> container = dynamic_pointer_cast<HopperTileEntity>( level->getTileEntity(x, y, z) );
if (container != nullptr)
if (container != NULL)
{
for (int i = 0; i < container->getContainerSize(); i++)
{
shared_ptr<ItemInstance> item = container->getItem(i);
if (item != nullptr)
if (item != NULL)
{
float xo = random.nextFloat() * 0.8f + 0.1f;
float yo = random.nextFloat() * 0.8f + 0.1f;
@@ -116,17 +116,17 @@ void HopperTile::onRemove(Level *level, int x, int y, int z, int id, int data)
if (count > item->count) count = item->count;
item->count -= count;
shared_ptr<ItemEntity> itemEntity = std::make_shared<ItemEntity>(level, x + xo, y + yo, z + zo, shared_ptr<ItemInstance>(new ItemInstance(item->id, count, item->getAuxValue())));
shared_ptr<ItemEntity> itemEntity = shared_ptr<ItemEntity>( new ItemEntity(level, x + xo, y + yo, z + zo, shared_ptr<ItemInstance>( new ItemInstance(item->id, count, item->getAuxValue()))));
if (item->hasTag())
{
itemEntity->getItem()->setTag(static_cast<CompoundTag *>(item->getTag()->copy()));
itemEntity->getItem()->setTag((CompoundTag *) item->getTag()->copy());
}
float pow = 0.05f;
itemEntity->xd = static_cast<float>(random.nextGaussian()) * pow;
itemEntity->yd = static_cast<float>(random.nextGaussian()) * pow + 0.2f;
itemEntity->zd = static_cast<float>(random.nextGaussian()) * pow;
itemEntity->xd = (float) random.nextGaussian() * pow;
itemEntity->yd = (float) random.nextGaussian() * pow + 0.2f;
itemEntity->zd = (float) random.nextGaussian() * pow;
level->addEntity(itemEntity);
}
}
@@ -197,7 +197,7 @@ Icon *HopperTile::getTexture(const wstring &name)
{
if (name.compare(TEXTURE_OUTSIDE) == 0) return Tile::hopper->hopperIcon;
if (name.compare(TEXTURE_INSIDE) == 0) return Tile::hopper->hopperInnerIcon;
return nullptr;
return NULL;
}
wstring HopperTile::getTileItemIconName()