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

10
Minecraft.World/SkullItem.cpp
View File

@@ -9,7 +9,7 @@
const unsigned int SkullItem::NAMES[SKULL_COUNT] = {IDS_ITEM_SKULL_SKELETON, IDS_ITEM_SKULL_WITHER, IDS_ITEM_SKULL_ZOMBIE, IDS_ITEM_SKULL_CHARACTER, IDS_ITEM_SKULL_CREEPER};
wstring SkullItem::ICON_NAMES[SKULL_COUNT] = {L"skull_skeleton", L"skull_wither", L"skull_zombie", L"skull_char", L"skull_creeper"};
wstring SkullItem::ICON_NAMES[SKULL_COUNT] = {L"skeleton", L"wither", L"zombie", L"char", L"creeper"};
SkullItem::SkullItem(int id) : Item(id)
{
@@ -31,13 +31,13 @@ bool SkullItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player> play
if (face == 5) x++;
//if (!player->mayUseItemAt(x, y, z, face, instance)) return false;
if (!player->mayBuild(x, y, z)) return false;
if (!player->mayUseItemAt(x, y, z, face, instance)) return false;
if (!Tile::skull->mayPlace(level, x, y, z)) return false;
if(!bTestUseOnOnly)
{
level->setTileAndData(x, y, z, Tile::skull_Id, face) ;//, Tile.UPDATE_CLIENTS);
level->setTileAndData(x, y, z, Tile::skull_Id, face, Tile::UPDATE_CLIENTS);
int rot = 0;
if (face == Facing::UP)
@@ -82,7 +82,7 @@ bool SkullItem::mayPlace(Level *level, int x, int y, int z, int face, shared_ptr
if (face == 5) x++;
}
return level->mayPlace(Tile::skull_Id, x, y, z, false, face, nullptr) ;//, item);
return level->mayPlace(Tile::skull_Id, x, y, z, false, face, nullptr, item);
}
Icon *SkullItem::getIcon(int itemAuxValue)
@@ -136,6 +136,6 @@ void SkullItem::registerIcons(IconRegister *iconRegister)
{
for (int i = 0; i < SKULL_COUNT; i++)
{
icons[i] = iconRegister->registerIcon(ICON_NAMES[i]);
icons[i] = iconRegister->registerIcon(getIconName() + L"_" + ICON_NAMES[i]);
}
}