mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-03-25 20:28:12 +05:00
feat: TU19 (Dec 2014) Features & Content (#155)
* 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:
@@ -33,17 +33,17 @@ bool DesertWellFeature::place(Level *level, Random *random, int x, int y, int z)
|
||||
{
|
||||
for (int oz = -2; oz <= 2; oz++)
|
||||
{
|
||||
level->setTileNoUpdate(x + ox, y + oy, z + oz, Tile::sandStone_Id);
|
||||
level->setTileAndData(x + ox, y + oy, z + oz, Tile::sandStone_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// place water cross
|
||||
level->setTileNoUpdate(x, y, z, Tile::water_Id);
|
||||
level->setTileNoUpdate(x - 1, y, z, Tile::water_Id);
|
||||
level->setTileNoUpdate(x + 1, y, z, Tile::water_Id);
|
||||
level->setTileNoUpdate(x, y, z - 1, Tile::water_Id);
|
||||
level->setTileNoUpdate(x, y, z + 1, Tile::water_Id);
|
||||
level->setTileAndData(x, y, z, Tile::water_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x - 1, y, z, Tile::water_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x + 1, y, z, Tile::water_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x, y, z - 1, Tile::water_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x, y, z + 1, Tile::water_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
|
||||
// place "fence"
|
||||
for (int ox = -2; ox <= 2; ox++)
|
||||
@@ -52,14 +52,14 @@ bool DesertWellFeature::place(Level *level, Random *random, int x, int y, int z)
|
||||
{
|
||||
if (ox == -2 || ox == 2 || oz == -2 || oz == 2)
|
||||
{
|
||||
level->setTileNoUpdate(x + ox, y + 1, z + oz, Tile::sandStone_Id);
|
||||
level->setTileAndData(x + ox, y + 1, z + oz, Tile::sandStone_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
}
|
||||
}
|
||||
}
|
||||
level->setTileAndDataNoUpdate(x + 2, y + 1, z, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB);
|
||||
level->setTileAndDataNoUpdate(x - 2, y + 1, z, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB);
|
||||
level->setTileAndDataNoUpdate(x, y + 1, z + 2, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB);
|
||||
level->setTileAndDataNoUpdate(x, y + 1, z - 2, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB);
|
||||
level->setTileAndData(x + 2, y + 1, z, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x - 2, y + 1, z, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x, y + 1, z + 2, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x, y + 1, z - 2, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS);
|
||||
|
||||
// place roof
|
||||
for (int ox = -1; ox <= 1; ox++)
|
||||
@@ -68,11 +68,11 @@ bool DesertWellFeature::place(Level *level, Random *random, int x, int y, int z)
|
||||
{
|
||||
if (ox == 0 && oz == 0)
|
||||
{
|
||||
level->setTileNoUpdate(x + ox, y + 4, z + oz, Tile::sandStone_Id);
|
||||
level->setTileAndData(x + ox, y + 4, z + oz, Tile::sandStone_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
}
|
||||
else
|
||||
{
|
||||
level->setTileAndDataNoUpdate(x + ox, y + 4, z + oz, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB);
|
||||
level->setTileAndData(x + ox, y + 4, z + oz, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -80,10 +80,10 @@ bool DesertWellFeature::place(Level *level, Random *random, int x, int y, int z)
|
||||
// place pillars
|
||||
for (int oy = 1; oy <= 3; oy++)
|
||||
{
|
||||
level->setTileNoUpdate(x - 1, y + oy, z - 1, Tile::sandStone_Id);
|
||||
level->setTileNoUpdate(x - 1, y + oy, z + 1, Tile::sandStone_Id);
|
||||
level->setTileNoUpdate(x + 1, y + oy, z - 1, Tile::sandStone_Id);
|
||||
level->setTileNoUpdate(x + 1, y + oy, z + 1, Tile::sandStone_Id);
|
||||
level->setTileAndData(x - 1, y + oy, z - 1, Tile::sandStone_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x - 1, y + oy, z + 1, Tile::sandStone_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x + 1, y + oy, z - 1, Tile::sandStone_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x + 1, y + oy, z + 1, Tile::sandStone_Id, 0, Tile::UPDATE_CLIENTS);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user