vistaslayer/LegacyRenouveau
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: neoapps dysfunctional build script

Browse Source
This commit is contained in:
Fireblade
2026-05-05 23:20:16 -04:00
parent 8ccb2b6741
commit f8e4f6376e
287 changed files with 4143 additions and 4710 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/RandomLevelSource.cpp
+12 -12
View File
@@ -326,7 +326,7 @@ void RandomLevelSource::prepareHeights(int xOffs, int zOffs, byteArray blocks)
}
else if (yc * CHUNK_HEIGHT + y < waterHeight)
{
tileId = static_cast<byte>(Tile::calmWater_Id);
tileId = static_cast<byte>(Tile::water_Id);
}
// 4J - more extra code to make sure that the column at the edge of the world is just water & rock, to match the infinite sea that
@@ -336,7 +336,7 @@ void RandomLevelSource::prepareHeights(int xOffs, int zOffs, byteArray blocks)
{
// This matches code in MultiPlayerChunkCache that makes the geometry which continues at the edge of the world
if( yc * CHUNK_HEIGHT + y <= ( level->getSeaLevel() - 10 ) ) tileId = Tile::stone_Id;
else if( yc * CHUNK_HEIGHT + y < level->getSeaLevel() ) tileId = Tile::calmWater_Id;
else if( yc * CHUNK_HEIGHT + y < level->getSeaLevel() ) tileId = Tile::water_Id;
}
blocks[offs += step] = tileId;
@@ -668,10 +668,10 @@ void RandomLevelSource::calcWaterDepths(ChunkSource *parent, int xt, int zt)
if (level->getHeightmap(xp - 1, zp) > 0 || level->getHeightmap(xp + 1, zp) > 0 || level->getHeightmap(xp, zp - 1) > 0 || level->getHeightmap(xp, zp + 1) > 0)
{
bool hadWater = false;
if (hadWater || (level->getTile(xp - 1, y, zp) == Tile::calmWater_Id && level->getData(xp - 1, y, zp) < 7)) hadWater = true;
if (hadWater || (level->getTile(xp + 1, y, zp) == Tile::calmWater_Id && level->getData(xp + 1, y, zp) < 7)) hadWater = true;
if (hadWater || (level->getTile(xp, y, zp - 1) == Tile::calmWater_Id && level->getData(xp, y, zp - 1) < 7)) hadWater = true;
if (hadWater || (level->getTile(xp, y, zp + 1) == Tile::calmWater_Id && level->getData(xp, y, zp + 1) < 7)) hadWater = true;
if (hadWater || (level->getTile(xp - 1, y, zp) == Tile::water_Id && level->getData(xp - 1, y, zp) < 7)) hadWater = true;
if (hadWater || (level->getTile(xp + 1, y, zp) == Tile::water_Id && level->getData(xp + 1, y, zp) < 7)) hadWater = true;
if (hadWater || (level->getTile(xp, y, zp - 1) == Tile::water_Id && level->getData(xp, y, zp - 1) < 7)) hadWater = true;
if (hadWater || (level->getTile(xp, y, zp + 1) == Tile::water_Id && level->getData(xp, y, zp + 1) < 7)) hadWater = true;
if (hadWater)
{
for (int x2 = -5; x2 <= 5; x2++)
@@ -683,7 +683,7 @@ void RandomLevelSource::calcWaterDepths(ChunkSource *parent, int xt, int zt)
if (d <= 5)
{
d = 6 - d;
if (level->getTile(xp + x2, y, zp + z2) == Tile::calmWater_Id)
if (level->getTile(xp + x2, y, zp + z2) == Tile::water_Id)
{
int od = level->getData(xp + x2, y, zp + z2);
if (od < 7 && od < d)
@@ -696,10 +696,10 @@ void RandomLevelSource::calcWaterDepths(ChunkSource *parent, int xt, int zt)
}
if (hadWater)
{
level->setTileAndData(xp, y, zp, Tile::calmWater_Id, 7, Tile::UPDATE_CLIENTS);
level->setTileAndData(xp, y, zp, Tile::water_Id, 7, Tile::UPDATE_CLIENTS);
for (int y2 = 0; y2 < y; y2++)
{
level->setTileAndData(xp, y2, zp, Tile::calmWater_Id, 8, Tile::UPDATE_CLIENTS);
level->setTileAndData(xp, y2, zp, Tile::water_Id, 8, Tile::UPDATE_CLIENTS);
}
}
}
@@ -751,7 +751,7 @@ void RandomLevelSource::postProcess(ChunkSource *parent, int xt, int zt)
int y = pprandom->nextInt(Level::genDepth);
int z = zo + pprandom->nextInt(16) + 8;
LakeFeature calmWater(Tile::calmWater_Id);
LakeFeature calmWater(Tile::water_Id);
calmWater.place(level, pprandom, x, y, z);
}
}
@@ -765,7 +765,7 @@ void RandomLevelSource::postProcess(ChunkSource *parent, int xt, int zt)
int z = zo + pprandom->nextInt(16) + 8;
if (y < level->seaLevel || pprandom->nextInt(10) == 0)
{
LakeFeature calmLava(Tile::calmLava_Id);
LakeFeature calmLava(Tile::lava_Id);
calmLava.place(level, pprandom, x, y, z);
}
}
@@ -810,7 +810,7 @@ void RandomLevelSource::postProcess(ChunkSource *parent, int xt, int zt)
}
if (level->shouldSnow(x + xo, y, z + zo))
{
level->setTileAndData(x + xo, y, z + zo, Tile::topSnow_Id, 0, Tile::UPDATE_CLIENTS);
level->setTileAndData(x + xo, y, z + zo, Tile::snow_layer_Id, 0, Tile::UPDATE_CLIENTS);
}
}
}