mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-06-14 02:22:39 +00:00
TU19: merge Minecraft.World/Blocks
This commit is contained in:
@@ -13,15 +13,12 @@ int QuartzBlockTile::BLOCK_NAMES[QUARTZ_BLOCK_NAMES] = {
|
||||
IDS_TILE_QUARTZ_BLOCK_LINES, IDS_TILE_QUARTZ_BLOCK_LINES,
|
||||
IDS_TILE_QUARTZ_BLOCK_LINES};
|
||||
|
||||
const std::wstring QuartzBlockTile::TEXTURE_TOP = L"quartzblock_top";
|
||||
const std::wstring QuartzBlockTile::TEXTURE_CHISELED_TOP =
|
||||
L"quartzblock_chiseled_top";
|
||||
const std::wstring QuartzBlockTile::TEXTURE_LINES_TOP =
|
||||
L"quartzblock_lines_top";
|
||||
const std::wstring QuartzBlockTile::TEXTURE_BOTTOM = L"quartzblock_bottom";
|
||||
const std::wstring QuartzBlockTile::TEXTURE_TOP = L"top";
|
||||
const std::wstring QuartzBlockTile::TEXTURE_CHISELED_TOP = L"chiseled_top";
|
||||
const std::wstring QuartzBlockTile::TEXTURE_LINES_TOP = L"lines_top";
|
||||
const std::wstring QuartzBlockTile::TEXTURE_BOTTOM = L"bottom";
|
||||
const std::wstring QuartzBlockTile::TEXTURE_NAMES[QUARTZ_BLOCK_TEXTURES] = {
|
||||
L"quartzblock_side", L"quartzblock_chiseled", L"quartzblock_lines", L"",
|
||||
L""};
|
||||
L"side", L"chiseled", L"lines", L"", L""};
|
||||
|
||||
QuartzBlockTile::QuartzBlockTile(int id) : Tile(id, Material::stone) {}
|
||||
|
||||
@@ -99,12 +96,16 @@ void QuartzBlockTile::registerIcons(IconRegister* iconRegister) {
|
||||
if (TEXTURE_NAMES[i].empty()) {
|
||||
icons[i] = icons[i - 1];
|
||||
} 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);
|
||||
}
|
||||
Reference in New Issue
Block a user