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

60
Minecraft.World/DoorTile.cpp
View File

@@ -12,8 +12,6 @@ const wstring DoorTile::TEXTURES[] = { L"doorWood_lower", L"doorWood_upper", L"d
DoorTile::DoorTile(int id, Material *material) : Tile(id, material,isSolidRender())
{
icons = NULL;
if (material == Material::metal)
{
texBase = 2;
@@ -30,12 +28,12 @@ DoorTile::DoorTile(int id, Material *material) : Tile(id, material,isSolidRender
Icon *DoorTile::getTexture(int face, int data)
{
return icons[texBase];
return iconBottom[TEXTURE_NORMAL];
}
Icon *DoorTile::getTexture(LevelSource *level, int x, int y, int z, int face)
{
if (face == Facing::UP || face == Facing::DOWN) return icons[texBase];
if (face == Facing::UP || face == Facing::DOWN) return iconBottom[TEXTURE_NORMAL];
int compositeData = getCompositeData(level, x, y, z);
int dir = compositeData & C_DIR_MASK;
@@ -59,18 +57,22 @@ Icon *DoorTile::getTexture(LevelSource *level, int x, int y, int z, int face)
if ((compositeData & C_RIGHT_HINGE_MASK) != 0) flip = !flip;
}
return icons[texBase + (flip ? DOOR_TILE_TEXTURE_COUNT : 0) + (upper ? 1 : 0)];
if (upper)
{
return iconTop[flip ? TEXTURE_FLIPPED : TEXTURE_NORMAL];
}
else
{
return iconBottom[flip ? TEXTURE_FLIPPED : TEXTURE_NORMAL];
}
}
void DoorTile::registerIcons(IconRegister *iconRegister)
{
icons = new Icon*[DOOR_TILE_TEXTURE_COUNT * 2];
for (int i = 0; i < DOOR_TILE_TEXTURE_COUNT; i++)
{
icons[i] = iconRegister->registerIcon(TEXTURES[i]);
icons[i + DOOR_TILE_TEXTURE_COUNT] = new FlippedIcon(icons[i], true, false);
}
iconTop[TEXTURE_NORMAL] = iconRegister->registerIcon(getIconName() + L"_upper");
iconBottom[TEXTURE_NORMAL] = iconRegister->registerIcon(getIconName() + L"_lower");
iconTop[TEXTURE_FLIPPED] = new FlippedIcon(iconTop[TEXTURE_NORMAL], true, false);
iconBottom[TEXTURE_FLIPPED] = new FlippedIcon(iconBottom[TEXTURE_NORMAL], true, false);
}
bool DoorTile::blocksLight()
@@ -177,12 +179,12 @@ void DoorTile::attack(Level *level, int x, int y, int z, shared_ptr<Player> play
// 4J-PB - Adding a TestUse for tooltip display
bool DoorTile::TestUse()
{
return true;
return id == Tile::door_wood_Id;
}
bool DoorTile::use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly/*=false*/) // 4J added soundOnly param
{
if(soundOnly)
if (soundOnly)
{
// 4J - added - just do enough to play the sound
if (material != Material::metal)
@@ -199,12 +201,12 @@ bool DoorTile::use(Level *level, int x, int y, int z, shared_ptr<Player> player,
lowerData ^= 4;
if ((compositeData & C_IS_UPPER_MASK) == 0)
{
level->setData(x, y, z, lowerData);//, Tile.UPDATE_CLIENTS);
level->setData(x, y, z, lowerData, Tile::UPDATE_CLIENTS);
level->setTilesDirty(x, y, z, x, y, z);
}
else
{
level->setData(x, y - 1, z, lowerData);//, Tile.UPDATE_CLIENTS);
level->setData(x, y - 1, z, lowerData, Tile::UPDATE_CLIENTS);
level->setTilesDirty(x, y - 1, z, x, y, z);
}
@@ -222,12 +224,12 @@ void DoorTile::setOpen(Level *level, int x, int y, int z, bool shouldOpen)
lowerData ^= 4;
if ((compositeData & C_IS_UPPER_MASK) == 0)
{
level->setData(x, y, z, lowerData);//, Tile.UPDATE_CLIENTS);
level->setData(x, y, z, lowerData, Tile::UPDATE_CLIENTS);
level->setTilesDirty(x, y, z, x, y, z);
}
else
{
level->setData(x, y - 1, z, lowerData);//, Tile.UPDATE_CLIENTS);
level->setData(x, y - 1, z, lowerData, Tile::UPDATE_CLIENTS);
level->setTilesDirty(x, y - 1, z, x, y, z);
}
@@ -242,16 +244,16 @@ void DoorTile::neighborChanged(Level *level, int x, int y, int z, int type)
bool spawn = false;
if (level->getTile(x, y + 1, z) != id)
{
level->setTile(x, y, z, 0);
level->removeTile(x, y, z);
spawn = true;
}
if (!level->isSolidBlockingTile(x, y - 1, z))
{
level->setTile(x, y, z, 0);
level->removeTile(x, y, z);
spawn = true;
if (level->getTile(x, y + 1, z) == id)
{
level->setTile(x, y + 1, z, 0);
level->removeTile(x, y + 1, z);
}
}
if (spawn)
@@ -274,7 +276,7 @@ void DoorTile::neighborChanged(Level *level, int x, int y, int z, int type)
{
if (level->getTile(x, y - 1, z) != id)
{
level->setTile(x, y, z, 0);
level->removeTile(x, y, z);
}
if (type > 0 && type != id)
{
@@ -339,3 +341,17 @@ int DoorTile::cloneTileId(Level *level, int x, int y, int z)
{
return material == Material::metal ? Item::door_iron_Id : Item::door_wood_Id;
}
void DoorTile::playerWillDestroy(Level *level, int x, int y, int z, int data, shared_ptr<Player> player)
{
if (player->abilities.instabuild)
{
if ((data & UPPER_BIT) != 0)
{
if (level->getTile(x, y - 1, z) == id)
{
level->removeTile(x, y - 1, z);
}
}
}
}