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

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Minecraft.World/TilePlanterItem.cpp
View File

@@ -12,40 +12,40 @@
TilePlanterItem::TilePlanterItem(int id, Tile *tile) : Item(id)
{
this->tileId = tile->id;
this->tileId = tile->id;
}
bool TilePlanterItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly)
{
// 4J-PB - Adding a test only version to allow tooltips to be displayed
int currentTile = level->getTile(x, y, z);
if (currentTile == Tile::topSnow_Id)
if (currentTile == Tile::topSnow_Id && (level->getData(x, y, z) & TopSnowTile::HEIGHT_MASK) < 1)
{
face = Facing::UP;
}
face = Facing::UP;
}
else if (currentTile == Tile::vine_Id || currentTile == Tile::tallgrass_Id || currentTile == Tile::deadBush_Id)
{
}
else
{
if (face == 0) y--;
if (face == 1) y++;
if (face == 2) z--;
if (face == 3) z++;
if (face == 4) x--;
if (face == 5) x++;
}
if (face == 0) y--;
if (face == 1) y++;
if (face == 2) z--;
if (face == 3) z++;
if (face == 4) x--;
if (face == 5) x++;
}
if (!player->mayBuild(x, y, z)) return false;
if (instance->count == 0) return false;
if (!player->mayUseItemAt(x, y, z, face, instance)) return false;
if (instance->count == 0) return false;
if (level->mayPlace(tileId, x, y, z, false, face, nullptr))
if (level->mayPlace(tileId, x, y, z, false, face, nullptr, instance))
{
if(!bTestUseOnOnly)
{
Tile *tile = Tile::tiles[tileId];
int dataValue = tile->getPlacedOnFaceDataValue(level, x, y, z, face, clickX, clickY, clickZ, 0);
if (level->setTileAndData(x, y, z, tileId, dataValue))
if (level->setTileAndData(x, y, z, tileId, dataValue, Tile::UPDATE_ALL))
{
// 4J-JEV: Hook for durango 'BlockPlaced' event.
player->awardStat(GenericStats::blocksPlaced(tileId),GenericStats::param_blocksPlaced(tileId,instance->getAuxValue(),1));
@@ -56,14 +56,14 @@ bool TilePlanterItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player
// are called
if (level->getTile(x, y, z) == tileId)
{
Tile::tiles[tileId]->setPlacedBy(level, x, y, z, player);
Tile::tiles[tileId]->setPlacedBy(level, x, y, z, player, instance);
Tile::tiles[tileId]->finalizePlacement(level, x, y, z, dataValue);
}
level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, tile->soundType->getStepSound(), (tile->soundType->getVolume() + 1) / 2, tile->soundType->getPitch() * 0.8f);
level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, tile->soundType->getPlaceSound(), (tile->soundType->getVolume() + 1) / 2, tile->soundType->getPitch() * 0.8f);
// 4J-PB - If we have the debug option on, don't reduce the number of this item
#ifndef _FINAL_BUILD
#ifndef _FINAL_BUILD
if(!(app.DebugSettingsOn() && app.GetGameSettingsDebugMask()&(1L<<eDebugSetting_CraftAnything)))
#endif
#endif
{
instance->count--;
}
@@ -76,5 +76,5 @@ bool TilePlanterItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player
// Can't place, so return false
if(bTestUseOnOnly) return false;
}
return true;
return true;
}