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

20
Minecraft.World/QuartzBlockTile.cpp
View File

@@ -12,11 +12,11 @@ int QuartzBlockTile::BLOCK_NAMES[QUARTZ_BLOCK_NAMES] = {
IDS_TILE_QUARTZ_BLOCK, IDS_TILE_QUARTZ_BLOCK_CHISELED, IDS_TILE_QUARTZ_BLOCK_LINES, IDS_TILE_QUARTZ_BLOCK_LINES, IDS_TILE_QUARTZ_BLOCK_LINES
};
const wstring QuartzBlockTile::TEXTURE_TOP = L"quartzblock_top";
const wstring QuartzBlockTile::TEXTURE_CHISELED_TOP = L"quartzblock_chiseled_top";
const wstring QuartzBlockTile::TEXTURE_LINES_TOP = L"quartzblock_lines_top";
const wstring QuartzBlockTile::TEXTURE_BOTTOM = L"quartzblock_bottom";
const wstring QuartzBlockTile::TEXTURE_NAMES[QUARTZ_BLOCK_TEXTURES] = { L"quartzblock_side", L"quartzblock_chiseled", L"quartzblock_lines", L"", L""};
const wstring QuartzBlockTile::TEXTURE_TOP = L"top";
const wstring QuartzBlockTile::TEXTURE_CHISELED_TOP = L"chiseled_top";
const wstring QuartzBlockTile::TEXTURE_LINES_TOP = L"lines_top";
const wstring QuartzBlockTile::TEXTURE_BOTTOM = L"bottom";
const wstring QuartzBlockTile::TEXTURE_NAMES[QUARTZ_BLOCK_TEXTURES] = { L"side", L"chiseled", L"lines", L"", L""};
QuartzBlockTile::QuartzBlockTile(int id) : Tile(id, Material::stone)
{
@@ -111,12 +111,12 @@ void QuartzBlockTile::registerIcons(IconRegister *iconRegister)
}
else
{
icons[i] = iconRegister->registerIcon(TEXTURE_NAMES[i]);
icons[i] = iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_NAMES[i]);
}
}
iconTop = iconRegister->registerIcon(TEXTURE_TOP);
iconChiseledTop = iconRegister->registerIcon(TEXTURE_CHISELED_TOP);
iconLinesTop = iconRegister->registerIcon(TEXTURE_LINES_TOP);
iconBottom = iconRegister->registerIcon(TEXTURE_BOTTOM);
iconTop = iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_TOP);
iconChiseledTop = iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_CHISELED_TOP);
iconLinesTop = iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_LINES_TOP);
iconBottom = iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_BOTTOM);
}