chore: format Minecraft.World

This commit is contained in:
Tropical
2026-03-13 17:06:56 -05:00
parent bd6284025d
commit 33d0737d1d
1511 changed files with 108661 additions and 115521 deletions

View File

@@ -4,51 +4,45 @@
#include "../../Headers/net.minecraft.world.level.tile.h"
#include "../../Headers/net.minecraft.world.level.biome.h"
LakeFeature::LakeFeature(int tile)
{
this->tile = tile;
}
LakeFeature::LakeFeature(int tile) { this->tile = tile; }
bool LakeFeature::place(Level *level, Random *random, int x, int y, int z)
{
bool LakeFeature::place(Level* level, Random* random, int x, int y, int z) {
x -= 8;
z -= 8;
while (y > 5 && level->isEmptyTile(x, y, z)) {
y--;
}
if (y <= 4)
{
return false;
}
if (y <= 4) {
return false;
}
y -= 4;
bool grid[16*16*8] = {0};
bool grid[16 * 16 * 8] = {0};
LevelGenerationOptions *levelGenOptions = NULL;
if( app.getLevelGenerationOptions() != NULL )
{
levelGenOptions = app.getLevelGenerationOptions();
LevelGenerationOptions* levelGenOptions = NULL;
if (app.getLevelGenerationOptions() != NULL) {
levelGenOptions = app.getLevelGenerationOptions();
int minX = x;
int minY = y;
int minZ = z;
int maxX = x + 16;
int maxY = y + 8;
int maxZ = z + 16;
int minX = x;
int minY = y;
int minZ = z;
bool intersects = levelGenOptions->checkIntersects(minX, minY, minZ, maxX, maxY, maxZ);
if(intersects)
{
//app.DebugPrintf("Skipping reeds feature generation as it overlaps a game rule structure\n");
return false;
}
}
int maxX = x + 16;
int maxY = y + 8;
int maxZ = z + 16;
bool intersects = levelGenOptions->checkIntersects(minX, minY, minZ,
maxX, maxY, maxZ);
if (intersects) {
// app.DebugPrintf("Skipping reeds feature generation as it overlaps
// a game rule structure\n");
return false;
}
}
int spots = random->nextInt(4) + 4;
for (int i = 0; i < spots; i++)
{
for (int i = 0; i < spots; i++) {
double xr = random->nextDouble() * 6 + 3;
double yr = random->nextDouble() * 4 + 2;
double zr = random->nextDouble() * 6 + 3;
@@ -57,12 +51,9 @@ bool LakeFeature::place(Level *level, Random *random, int x, int y, int z)
double yp = random->nextDouble() * (8 - yr - 4) + 2 + yr / 2;
double zp = random->nextDouble() * (16 - zr - 2) + 1 + zr / 2;
for (int xx = 1; xx < 15; xx++)
{
for (int zz = 1; zz < 15; zz++)
{
for (int yy = 1; yy < 7; yy++)
{
for (int xx = 1; xx < 15; xx++) {
for (int zz = 1; zz < 15; zz++) {
for (int yy = 1; yy < 7; yy++) {
double xd = ((xx - xp) / (xr / 2));
double yd = ((yy - yp) / (yr / 2));
double zd = ((zz - zp) / (zr / 2));
@@ -73,85 +64,86 @@ bool LakeFeature::place(Level *level, Random *random, int x, int y, int z)
}
}
for (int xx = 0; xx < 16; xx++)
{
for (int zz = 0; zz < 16; zz++)
{
for (int yy = 0; yy < 8; yy++)
{
bool check = !grid[((xx) * 16 + (zz)) * 8 + (yy)] && (
(xx < 15 && grid[((xx + 1) * 16 + (zz)) * 8 + (yy)])
|| (xx > 0 && grid[((xx - 1) * 16 + (zz)) * 8 + (yy)])
|| (zz < 15 && grid[((xx) * 16 + (zz + 1)) * 8 + (yy)])
|| (zz > 0 && grid[((xx) * 16 + (zz - 1)) * 8 + (yy)])
|| (yy < 7 && grid[((xx) * 16 + (zz)) * 8 + (yy + 1)])
|| (yy > 0 && grid[((xx) * 16 + (zz)) * 8 + (yy - 1)]));
for (int xx = 0; xx < 16; xx++) {
for (int zz = 0; zz < 16; zz++) {
for (int yy = 0; yy < 8; yy++) {
bool check =
!grid[((xx) * 16 + (zz)) * 8 + (yy)] &&
((xx < 15 && grid[((xx + 1) * 16 + (zz)) * 8 + (yy)]) ||
(xx > 0 && grid[((xx - 1) * 16 + (zz)) * 8 + (yy)]) ||
(zz < 15 && grid[((xx) * 16 + (zz + 1)) * 8 + (yy)]) ||
(zz > 0 && grid[((xx) * 16 + (zz - 1)) * 8 + (yy)]) ||
(yy < 7 && grid[((xx) * 16 + (zz)) * 8 + (yy + 1)]) ||
(yy > 0 && grid[((xx) * 16 + (zz)) * 8 + (yy - 1)]));
if (check)
{
Material *m = level->getMaterial(x + xx, y + yy, z + zz);
if (check) {
Material* m = level->getMaterial(x + xx, y + yy, z + zz);
if (yy >= 4 && m->isLiquid()) return false;
if (yy < 4 && (!m->isSolid() && level->getTile(x + xx, y + yy, z + zz) != tile)) return false;
if (yy < 4 &&
(!m->isSolid() &&
level->getTile(x + xx, y + yy, z + zz) != tile))
return false;
}
}
}
}
for (int xx = 0; xx < 16; xx++)
{
for (int zz = 0; zz < 16; zz++)
{
for (int yy = 0; yy < 8; yy++)
{
if (grid[((xx) * 16 + (zz)) * 8 + (yy)])
{
level->setTileNoUpdate(x + xx, y + yy, z + zz, yy >= 4 ? 0 : tile);
for (int xx = 0; xx < 16; xx++) {
for (int zz = 0; zz < 16; zz++) {
for (int yy = 0; yy < 8; yy++) {
if (grid[((xx) * 16 + (zz)) * 8 + (yy)]) {
level->setTileNoUpdate(x + xx, y + yy, z + zz,
yy >= 4 ? 0 : tile);
}
}
}
}
for (int xx = 0; xx < 16; xx++)
{
for (int zz = 0; zz < 16; zz++)
{
for (int yy = 4; yy < 8; yy++)
{
if (grid[((xx) * 16 + (zz)) * 8 + (yy)])
{
if (level->getTile(x + xx, y + yy - 1, z + zz) == Tile::dirt_Id && level->getBrightness(LightLayer::Sky, x + xx, y + yy, z + zz) > 0)
{
Biome *b = level->getBiome(x + xx, z + zz);
if (b->topMaterial == Tile::mycel_Id) level->setTileNoUpdate(x + xx, y + yy - 1, z + zz, Tile::mycel_Id);
else level->setTileNoUpdate(x + xx, y + yy - 1, z + zz, Tile::grass_Id);
for (int xx = 0; xx < 16; xx++) {
for (int zz = 0; zz < 16; zz++) {
for (int yy = 4; yy < 8; yy++) {
if (grid[((xx) * 16 + (zz)) * 8 + (yy)]) {
if (level->getTile(x + xx, y + yy - 1, z + zz) ==
Tile::dirt_Id &&
level->getBrightness(LightLayer::Sky, x + xx, y + yy,
z + zz) > 0) {
Biome* b = level->getBiome(x + xx, z + zz);
if (b->topMaterial == Tile::mycel_Id)
level->setTileNoUpdate(x + xx, y + yy - 1, z + zz,
Tile::mycel_Id);
else
level->setTileNoUpdate(x + xx, y + yy - 1, z + zz,
Tile::grass_Id);
}
}
}
}
}
if (Tile::tiles[tile]->material == Material::lava)
{
for (int xx = 0; xx < 16; xx++)
{
for (int zz = 0; zz < 16; zz++)
{
for (int yy = 0; yy < 8; yy++)
{
bool check = !grid[((xx) * 16 + (zz)) * 8 + (yy)] && (
(xx < 15 && grid[(((xx + 1) * 16 + (zz)) * 8 + (yy))])
|| (xx > 0 && grid[(((xx - 1) * 16 + (zz)) * 8 + (yy))])
|| (zz < 15 && grid[(((xx) * 16 + (zz + 1)) * 8 + (yy))])
|| (zz > 0 && grid[(((xx) * 16 + (zz - 1)) * 8 + (yy))])
|| (yy < 7 && grid[(((xx) * 16 + (zz)) * 8 + (yy + 1))])
|| (yy > 0 && grid[(((xx) * 16 + (zz)) * 8 + (yy - 1))]));
if (Tile::tiles[tile]->material == Material::lava) {
for (int xx = 0; xx < 16; xx++) {
for (int zz = 0; zz < 16; zz++) {
for (int yy = 0; yy < 8; yy++) {
bool check =
!grid[((xx) * 16 + (zz)) * 8 + (yy)] &&
((xx < 15 &&
grid[(((xx + 1) * 16 + (zz)) * 8 + (yy))]) ||
(xx > 0 &&
grid[(((xx - 1) * 16 + (zz)) * 8 + (yy))]) ||
(zz < 15 &&
grid[(((xx) * 16 + (zz + 1)) * 8 + (yy))]) ||
(zz > 0 &&
grid[(((xx) * 16 + (zz - 1)) * 8 + (yy))]) ||
(yy < 7 &&
grid[(((xx) * 16 + (zz)) * 8 + (yy + 1))]) ||
(yy > 0 && grid[(((xx) * 16 + (zz)) * 8 + (yy - 1))]));
if (check)
{
if ((yy<4 || random->nextInt(2)!=0) && level->getMaterial(x + xx, y + yy, z + zz)->isSolid())
{
level->setTileNoUpdate(x + xx, y + yy, z + zz, Tile::rock_Id);
if (check) {
if ((yy < 4 || random->nextInt(2) != 0) &&
level->getMaterial(x + xx, y + yy, z + zz)
->isSolid()) {
level->setTileNoUpdate(x + xx, y + yy, z + zz,
Tile::rock_Id);
}
}
}
@@ -159,15 +151,14 @@ bool LakeFeature::place(Level *level, Random *random, int x, int y, int z)
}
}
// 4J - brought forward from 1.8.2
if (Tile::tiles[tile]->material == Material::water)
{
for (int xx = 0; xx < 16; xx++)
{
for (int zz = 0; zz < 16; zz++)
{
// 4J - brought forward from 1.8.2
if (Tile::tiles[tile]->material == Material::water) {
for (int xx = 0; xx < 16; xx++) {
for (int zz = 0; zz < 16; zz++) {
int yy = 4;
if (level->shouldFreezeIgnoreNeighbors(x + xx, y + yy, z + zz)) level->setTileNoUpdate(x + xx, y + yy, z + zz, Tile::ice_Id);
if (level->shouldFreezeIgnoreNeighbors(x + xx, y + yy, z + zz))
level->setTileNoUpdate(x + xx, y + yy, z + zz,
Tile::ice_Id);
}
}
}