mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-07-06 05:38:30 +00:00
TU19: merge Minecraft.World/Blocks
This commit is contained in:
@@ -7,19 +7,17 @@
|
||||
|
||||
#include "TreeTile.h"
|
||||
|
||||
const unsigned int TreeTile::TREE_NAMES[TREE_NAMES_LENGTH] = {
|
||||
const unsigned int TreeTile::TREE_NAMES[TreeTile::TREE_NAMES_LENGTH] = {
|
||||
IDS_TILE_LOG_OAK, IDS_TILE_LOG_SPRUCE, IDS_TILE_LOG_BIRCH,
|
||||
IDS_TILE_LOG_JUNGLE};
|
||||
|
||||
const std::wstring TreeTile::TREE_STRING_NAMES[TreeTile::TREE_NAMES_LENGTH] = {
|
||||
L"oak", L"spruce", L"birch", L"jungle"};
|
||||
|
||||
const std::wstring TreeTile::TREE_TEXTURES[] = {L"tree_side", L"tree_spruce",
|
||||
L"tree_birch", L"tree_jungle"};
|
||||
|
||||
TreeTile::TreeTile(int id) : Tile(id, Material::wood) {
|
||||
icons = NULL;
|
||||
iconTop = NULL;
|
||||
}
|
||||
|
||||
int TreeTile::getRenderShape() { return Tile::SHAPE_TREE; }
|
||||
TreeTile::TreeTile(int id) : RotatedPillarTile(id, Material::wood) {}
|
||||
|
||||
int TreeTile::getResourceCount(Random* random) { return 1; }
|
||||
|
||||
@@ -40,64 +38,25 @@ void TreeTile::onRemove(Level* level, int x, int y, int z, int id, int data) {
|
||||
int currentData =
|
||||
level->getData(x + xo, y + yo, z + zo);
|
||||
if ((currentData & LeafTile::UPDATE_LEAF_BIT) == 0) {
|
||||
level->setDataNoUpdate(
|
||||
level->setData(
|
||||
x + xo, y + yo, z + zo,
|
||||
currentData | LeafTile::UPDATE_LEAF_BIT);
|
||||
currentData | LeafTile::UPDATE_LEAF_BIT,
|
||||
Tile::UPDATE_NONE);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void TreeTile::setPlacedBy(Level* level, int x, int y, int z,
|
||||
std::shared_ptr<Mob> by) {
|
||||
int type = level->getData(x, y, z) & MASK_TYPE;
|
||||
int dir = PistonBaseTile::getNewFacing(
|
||||
level, x, y, z, std::dynamic_pointer_cast<Player>(by));
|
||||
int facing = 0;
|
||||
|
||||
switch (dir) {
|
||||
case Facing::NORTH:
|
||||
case Facing::SOUTH:
|
||||
facing = FACING_Z;
|
||||
break;
|
||||
case Facing::EAST:
|
||||
case Facing::WEST:
|
||||
facing = FACING_X;
|
||||
break;
|
||||
case Facing::UP:
|
||||
case Facing::DOWN:
|
||||
facing = FACING_Y;
|
||||
break;
|
||||
}
|
||||
|
||||
level->setData(x, y, z, type | facing);
|
||||
}
|
||||
|
||||
Icon* TreeTile::getTexture(int face, int data) {
|
||||
int dir = data & MASK_FACING;
|
||||
int type = data & MASK_TYPE;
|
||||
|
||||
if (dir == FACING_Y && (face == Facing::UP || face == Facing::DOWN)) {
|
||||
return iconTop;
|
||||
} else if (dir == FACING_X &&
|
||||
(face == Facing::EAST || face == Facing::WEST)) {
|
||||
return iconTop;
|
||||
} else if (dir == FACING_Z &&
|
||||
(face == Facing::NORTH || face == Facing::SOUTH)) {
|
||||
return iconTop;
|
||||
}
|
||||
|
||||
return icons[type];
|
||||
}
|
||||
|
||||
unsigned int TreeTile::getDescriptionId(int iData /*= -1*/) {
|
||||
int type = iData & MASK_TYPE;
|
||||
if (type < 0) type = 0;
|
||||
return TreeTile::TREE_NAMES[type];
|
||||
}
|
||||
|
||||
int TreeTile::getSpawnResourcesAuxValue(int data) { return data & MASK_TYPE; }
|
||||
Icon* TreeTile::getTypeTexture(int type) { return icons_side[type]; }
|
||||
|
||||
Icon* TreeTile::getTopTexture(int type) { return icons_top[type]; }
|
||||
|
||||
int TreeTile::getWoodType(int data) { return data & MASK_TYPE; }
|
||||
|
||||
@@ -108,10 +67,10 @@ std::shared_ptr<ItemInstance> TreeTile::getSilkTouchItemInstance(int data) {
|
||||
}
|
||||
|
||||
void TreeTile::registerIcons(IconRegister* iconRegister) {
|
||||
iconTop = iconRegister->registerIcon(L"tree_top");
|
||||
icons = new Icon*[TREE_NAMES_LENGTH];
|
||||
|
||||
for (int i = 0; i < TREE_NAMES_LENGTH; i++) {
|
||||
icons[i] = iconRegister->registerIcon(TREE_TEXTURES[i]);
|
||||
icons_side[i] = iconRegister->registerIcon(getIconName() + L"_" +
|
||||
TREE_STRING_NAMES[i]);
|
||||
icons_top[i] = iconRegister->registerIcon(
|
||||
getIconName() + L"_" + TREE_STRING_NAMES[i] + L"_top");
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user