vistaslayer/LegacyRenouveau
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pr-3' into TU43

Browse Source
This commit is contained in:
Fireblade
2026-05-24 22:29:54 -04:00
parent d9a2776e21 2490c235fa
commit 8676650294
389 changed files with 7389 additions and 4207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/FlowerPotTile.cpp
+32 -6
View File
@@ -12,6 +12,32 @@ FlowerPotTile::FlowerPotTile(int id) : Tile(id, Material::decoration, isSolidRen
sendTileData();
}
void FlowerPotTile::createBlockStateDefinition()
{
if (!m_blockStateDefinition)
m_blockStateDefinition = new BlockStateDefinition(this);
}
int FlowerPotTile::defaultBlockState()
{
return 0;
}
int FlowerPotTile::convertBlockStateToLegacyData(BlockState *state)
{
return state ? (state->value & 0xF) : 0;
}
Tile::BlockState FlowerPotTile::getBlockState(int data)
{
return Tile::BlockState(data & 0xF);
}
Tile::BlockState FlowerPotTile::getBlockState(LevelSource *level, int x, int y, int z)
{
return Tile::BlockState(level->getData(x, y, z) & 0xF);
}
void FlowerPotTile::updateDefaultShape()
{
float size = 6.0f / 16.0f;
@@ -65,7 +91,7 @@ int FlowerPotTile::cloneTileId(Level *level, int x, int y, int z)
if (item == nullptr)
{
return Item::flowerPot_Id;
return Item::flower_pot_Id;
}
else
{
@@ -79,7 +105,7 @@ int FlowerPotTile::cloneTileData(Level *level, int x, int y, int z)
if (item == nullptr)
{
return Item::flowerPot_Id;
return Item::flower_pot_Id;
}
else
{
@@ -120,7 +146,7 @@ void FlowerPotTile::spawnResources(Level *level, int x, int y, int z, int data,
int FlowerPotTile::getResource(int data, Random *random, int playerBonusLevel)
{
return Item::flowerPot_Id;
return Item::flower_pot_Id;
}
shared_ptr<ItemInstance> FlowerPotTile::getItemFromType(int type)
@@ -158,12 +184,12 @@ int FlowerPotTile::getTypeFromItem(shared_ptr<ItemInstance> item)
{
int id = item->getItem()->id;
if (id == Tile::rose_Id) return TYPE_FLOWER_RED;
if (id == Tile::flower_Id) return TYPE_FLOWER_YELLOW;
if (id == Tile::red_flower_Id) return TYPE_FLOWER_RED;
if (id == Tile::yellow_flower_Id) return TYPE_FLOWER_YELLOW;
if (id == Tile::cactus_Id) return TYPE_CACTUS;
if (id == Tile::mushroom_brown_Id) return TYPE_MUSHROOM_BROWN;
if (id == Tile::mushroom_red_Id) return TYPE_MUSHROOM_RED;
if (id == Tile::deadBush_Id) return TYPE_DEAD_BUSH;
if (id == Tile::deadbush_Id) return TYPE_DEAD_BUSH;
if (id == Tile::sapling_Id)
{