LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-01 15:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: format Minecraft.World

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

90
Minecraft.World/WorldGen/Features/PineFeature.cpp
View File

@@ -3,8 +3,7 @@
#include "../../Headers/net.minecraft.world.level.tile.h"
#include "PineFeature.h"
bool PineFeature::place(Level *level, Random *random, int x, int y, int z)
{
bool PineFeature::place(Level* level, Random* random, int x, int y, int z) {
// pines can be quite tall
int treeHeight = random->nextInt(5) + 7;
int trunkHeight = treeHeight - random->nextInt(2) - 3;
@@ -13,47 +12,39 @@ bool PineFeature::place(Level *level, Random *random, int x, int y, int z)
bool free = true;
// may not be outside of y boundaries
if (y < 1 || y + treeHeight + 1 > Level::genDepth)
{
if (y < 1 || y + treeHeight + 1 > Level::genDepth) {
return false;
}
// 4J Stu Added to stop tree features generating areas previously place by game rule generation
if(app.getLevelGenerationOptions() != NULL)
{
LevelGenerationOptions *levelGenOptions = app.getLevelGenerationOptions();
bool intersects = levelGenOptions->checkIntersects(x - topRadius, y - 1, z - topRadius, x + topRadius, y + treeHeight, z + topRadius);
if(intersects)
{
//app.DebugPrintf("Skipping reeds feature generation as it overlaps a game rule structure\n");
return false;
}
}
// 4J Stu Added to stop tree features generating areas previously place by
// game rule generation
if (app.getLevelGenerationOptions() != NULL) {
LevelGenerationOptions* levelGenOptions =
app.getLevelGenerationOptions();
bool intersects = levelGenOptions->checkIntersects(
x - topRadius, y - 1, z - topRadius, x + topRadius, y + treeHeight,
z + topRadius);
if (intersects) {
// app.DebugPrintf("Skipping reeds feature generation as it overlaps
// a game rule structure\n");
return false;
}
}
// make sure there is enough space
for (int yy = y; yy <= y + 1 + treeHeight && free; yy++)
{
for (int yy = y; yy <= y + 1 + treeHeight && free; yy++) {
int r = 1;
if ((yy - y) < trunkHeight)
{
if ((yy - y) < trunkHeight) {
r = 0;
}
else
{
} else {
r = topRadius;
}
for (int xx = x - r; xx <= x + r && free; xx++)
{
for (int zz = z - r; zz <= z + r && free; zz++)
{
if (yy >= 0 && yy < Level::genDepth)
{
for (int xx = x - r; xx <= x + r && free; xx++) {
for (int zz = z - r; zz <= z + r && free; zz++) {
if (yy >= 0 && yy < Level::genDepth) {
int tt = level->getTile(xx, yy, zz);
if (tt != 0 && tt != Tile::leaves_Id) free = false;
}
else
{
} else {
free = false;
}
}
@@ -64,38 +55,39 @@ bool PineFeature::place(Level *level, Random *random, int x, int y, int z)
// must stand on ground
int belowTile = level->getTile(x, y - 1, z);
if ((belowTile != Tile::grass_Id && belowTile != Tile::dirt_Id) || y >= Level::genDepth - treeHeight - 1) return false;
if ((belowTile != Tile::grass_Id && belowTile != Tile::dirt_Id) ||
y >= Level::genDepth - treeHeight - 1)
return false;
placeBlock(level, x, y - 1, z, Tile::dirt_Id);
// place leaf top
int currentRadius = 0;
for (int yy = y + treeHeight; yy >= y + trunkHeight; yy--)
{
for (int xx = x - currentRadius; xx <= x + currentRadius; xx++)
{
for (int yy = y + treeHeight; yy >= y + trunkHeight; yy--) {
for (int xx = x - currentRadius; xx <= x + currentRadius; xx++) {
int xo = xx - (x);
for (int zz = z - currentRadius; zz <= z + currentRadius; zz++)
{
for (int zz = z - currentRadius; zz <= z + currentRadius; zz++) {
int zo = zz - (z);
if (abs(xo) == currentRadius && abs(zo) == currentRadius && currentRadius > 0) continue;
if (!Tile::solid[level->getTile(xx, yy, zz)]) placeBlock(level, xx, yy, zz, Tile::leaves_Id, LeafTile::EVERGREEN_LEAF);
if (abs(xo) == currentRadius && abs(zo) == currentRadius &&
currentRadius > 0)
continue;
if (!Tile::solid[level->getTile(xx, yy, zz)])
placeBlock(level, xx, yy, zz, Tile::leaves_Id,
LeafTile::EVERGREEN_LEAF);
}
}
if (currentRadius >= 1 && yy == (y + trunkHeight + 1))
{
if (currentRadius >= 1 && yy == (y + trunkHeight + 1)) {
currentRadius -= 1;
}
else if (currentRadius < topRadius)
{
} else if (currentRadius < topRadius) {
currentRadius += 1;
}
}
for (int hh = 0; hh < treeHeight - 1; hh++)
{
for (int hh = 0; hh < treeHeight - 1; hh++) {
int t = level->getTile(x, y + hh, z);
if (t == 0 || t == Tile::leaves_Id) placeBlock(level, x, y + hh, z, Tile::treeTrunk_Id, TreeTile::DARK_TRUNK);
if (t == 0 || t == Tile::leaves_Id)
placeBlock(level, x, y + hh, z, Tile::treeTrunk_Id,
TreeTile::DARK_TRUNK);
}
return true;