chore: format Minecraft.World

2026-07-16 23:49:33 +00:00 · 2026-03-13 17:06:56 -05:00
parent bd6284025d
commit 33d0737d1d
1511 changed files with 108661 additions and 115521 deletions
--- a/Minecraft.World/Level/Dimensions/Dimension.cpp
+++ b/Minecraft.World/Level/Dimensions/Dimension.cpp
@@ -13,92 +13,85 @@
 #include "../../../Minecraft.Client/Minecraft.h"
 #include "../../../Minecraft.Client/Platform/Common/Colours/ColourTable.h"

-void Dimension::init(Level *level)
-{
+void Dimension::init(Level* level) {
    this->level = level;
-	this->levelType = level->getLevelData()->getGenerator();
+    this->levelType = level->getLevelData()->getGenerator();
    init();
    updateLightRamp();
 }

-void Dimension::updateLightRamp()
-{
+void Dimension::updateLightRamp() {
    float ambientLight = 0.00f;
-    for (int i = 0; i <= Level::MAX_BRIGHTNESS; i++)
-	{
-        float v = (1 - i / (float) (Level::MAX_BRIGHTNESS));
-        brightnessRamp[i] = ((1 - v) / (v * 3 + 1)) * (1 - ambientLight) + ambientLight;
+    for (int i = 0; i <= Level::MAX_BRIGHTNESS; i++) {
+        float v = (1 - i / (float)(Level::MAX_BRIGHTNESS));
+        brightnessRamp[i] =
+            ((1 - v) / (v * 3 + 1)) * (1 - ambientLight) + ambientLight;
    }
 }

-void Dimension::init()
-{
+void Dimension::init() {
 #ifdef _OVERRIDE_HEIGHTMAP
-	// 4J Stu - Added to enable overriding the heightmap from a loaded in data file
-	if(app.DebugSettingsOn() && app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_EnableHeightWaterBiomeOverride))
-	{
-		biomeSource = new BiomeSource(level);
-	}
-	else
+    // 4J Stu - Added to enable overriding the heightmap from a loaded in data
+    // file
+    if (app.DebugSettingsOn() &&
+        app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad()) &
+            (1L << eDebugSetting_EnableHeightWaterBiomeOverride)) {
+        biomeSource = new BiomeSource(level);
+    } else
 #endif
-	if (level->getLevelData()->getGenerator() == LevelType::lvl_flat) 
-	{
-		biomeSource = new FixedBiomeSource(Biome::plains, 0.5f, 0.5f);
-	}
-	else 
-	{
-		biomeSource = new BiomeSource(level);
-	}
+        if (level->getLevelData()->getGenerator() == LevelType::lvl_flat) {
+        biomeSource = new FixedBiomeSource(Biome::plains, 0.5f, 0.5f);
+    } else {
+        biomeSource = new BiomeSource(level);
+    }
 }

-Dimension::Dimension()
-{
-	ultraWarm = false;
-	hasCeiling = false;
-	brightnessRamp = new float[Level::MAX_BRIGHTNESS + 1];
-	id = 0;
+Dimension::Dimension() {
+    ultraWarm = false;
+    hasCeiling = false;
+    brightnessRamp = new float[Level::MAX_BRIGHTNESS + 1];
+    id = 0;
 }

-Dimension::~Dimension()
-{
-	delete[] brightnessRamp;
+Dimension::~Dimension() {
+    delete[] brightnessRamp;

-	if(biomeSource != NULL)
-		delete biomeSource;
+    if (biomeSource != NULL) delete biomeSource;
 }

-ChunkSource *Dimension::createRandomLevelSource() const
-{
+ChunkSource* Dimension::createRandomLevelSource() const {
 #ifdef _OVERRIDE_HEIGHTMAP
-	// 4J Stu - Added to enable overriding the heightmap from a loaded in data file
-	if(app.DebugSettingsOn() && app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_EnableHeightWaterBiomeOverride))
-	{
-		return new CustomLevelSource(level, level->getSeed(), level->getLevelData()->isGenerateMapFeatures());
-	}
-	else
+    // 4J Stu - Added to enable overriding the heightmap from a loaded in data
+    // file
+    if (app.DebugSettingsOn() &&
+        app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad()) &
+            (1L << eDebugSetting_EnableHeightWaterBiomeOverride)) {
+        return new CustomLevelSource(
+            level, level->getSeed(),
+            level->getLevelData()->isGenerateMapFeatures());
+    } else
 #endif
-	if (levelType == LevelType::lvl_flat) 
-	{
-		return new FlatLevelSource(level, level->getSeed(), level->getLevelData()->isGenerateMapFeatures());
-	} 
-	else 
-	{
-		return new RandomLevelSource(level, level->getSeed(), level->getLevelData()->isGenerateMapFeatures());
-	}
+        if (levelType == LevelType::lvl_flat) {
+        return new FlatLevelSource(
+            level, level->getSeed(),
+            level->getLevelData()->isGenerateMapFeatures());
+    } else {
+        return new RandomLevelSource(
+            level, level->getSeed(),
+            level->getLevelData()->isGenerateMapFeatures());
+    }
 }

-ChunkSource *Dimension::createFlatLevelSource() const
-{
-	return new FlatLevelSource(level, level->getSeed(), level->getLevelData()->isGenerateMapFeatures());
+ChunkSource* Dimension::createFlatLevelSource() const {
+    return new FlatLevelSource(level, level->getSeed(),
+                               level->getLevelData()->isGenerateMapFeatures());
 }

-ChunkStorage *Dimension::createStorage(File dir)
-{
-	return new OldChunkStorage(dir, true);
+ChunkStorage* Dimension::createStorage(File dir) {
+    return new OldChunkStorage(dir, true);
 }

-bool Dimension::isValidSpawn(int x, int z) const
-{
+bool Dimension::isValidSpawn(int x, int z) const {
    int topTile = level->getTopTile(x, z);

    if (topTile != Tile::grass_Id) return false;
@@ -106,50 +99,47 @@ bool Dimension::isValidSpawn(int x, int z) const
    return true;
 }

-float Dimension::getTimeOfDay(__int64 time, float a) const
-{
-    int dayStep = (int) (time % Level::TICKS_PER_DAY);
+float Dimension::getTimeOfDay(__int64 time, float a) const {
+    int dayStep = (int)(time % Level::TICKS_PER_DAY);
    float td = (dayStep + a) / Level::TICKS_PER_DAY - 0.25f;
    if (td < 0) td += 1;
    if (td > 1) td -= 1;
    float tdo = td;
-    td = 1 - (float) ((cos(td * PI) + 1) / 2);
+    td = 1 - (float)((cos(td * PI) + 1) / 2);
    td = tdo + (td - tdo) / 3.0f;
    return td;
 }

-int Dimension::getMoonPhase(__int64 time, float a) const
-{
-    return ((int) (time / Level::TICKS_PER_DAY)) % 8;
+int Dimension::getMoonPhase(__int64 time, float a) const {
+    return ((int)(time / Level::TICKS_PER_DAY)) % 8;
 }

-bool Dimension::isNaturalDimension()
-{
-	return true;
-}
+bool Dimension::isNaturalDimension() { return true; }

-float *Dimension::getSunriseColor(float td, float a)
-{
-	unsigned int clr1 = Minecraft::GetInstance()->getColourTable()->getColor( eMinecraftColour_Sky_Dawn_Dark ); // 0xB23333
-	double r1 = ( (clr1>>16)&0xFF )/255.0f, g1 = ( (clr1>>8)&0xFF )/255.0, b1 = ( clr1&0xFF )/255.0;
+float* Dimension::getSunriseColor(float td, float a) {
+    unsigned int clr1 = Minecraft::GetInstance()->getColourTable()->getColor(
+        eMinecraftColour_Sky_Dawn_Dark);  // 0xB23333
+    double r1 = ((clr1 >> 16) & 0xFF) / 255.0f,
+           g1 = ((clr1 >> 8) & 0xFF) / 255.0, b1 = (clr1 & 0xFF) / 255.0;

-	unsigned int clr2 = Minecraft::GetInstance()->getColourTable()->getColor( eMinecraftColour_Sky_Dawn_Bright ); // 0xFFE533
-	double r2 = ( (clr2>>16)&0xFF )/255.0f, g2 = ( (clr2>>8)&0xFF )/255.0, b2 = ( clr2&0xFF )/255.0;
+    unsigned int clr2 = Minecraft::GetInstance()->getColourTable()->getColor(
+        eMinecraftColour_Sky_Dawn_Bright);  // 0xFFE533
+    double r2 = ((clr2 >> 16) & 0xFF) / 255.0f,
+           g2 = ((clr2 >> 8) & 0xFF) / 255.0, b2 = (clr2 & 0xFF) / 255.0;

    float span = 0.4f;
    float tt = Mth::cos(td * PI * 2) - 0.0f;
    float mid = -0.0f;
-    if (tt >= mid - span && tt <= mid + span)
-	{
+    if (tt >= mid - span && tt <= mid + span) {
        float aa = ((tt - mid) / span) * 0.5f + 0.5f;
        float mix = 1 - (((1 - sin(aa * PI))) * 0.99f);
        mix = mix * mix;
-        //sunriseCol[0] = (aa * 0.3f + 0.7f);
-        //sunriseCol[1] = (aa * aa * 0.7f + 0.2f);
-        //sunriseCol[2] = (aa * aa * 0.0f + 0.2f);
-		sunriseCol[0] = (aa * (r2-r1) + r1);
-		sunriseCol[1] = (aa * (g2-g1) + g1);
-		sunriseCol[2] = (aa * (b2-b1) + b1);
+        // sunriseCol[0] = (aa * 0.3f + 0.7f);
+        // sunriseCol[1] = (aa * aa * 0.7f + 0.2f);
+        // sunriseCol[2] = (aa * aa * 0.0f + 0.2f);
+        sunriseCol[0] = (aa * (r2 - r1) + r1);
+        sunriseCol[1] = (aa * (g2 - g1) + g1);
+        sunriseCol[2] = (aa * (b2 - b1) + b1);
        sunriseCol[3] = mix;
        return sunriseCol;
    }
@@ -157,13 +147,14 @@ float *Dimension::getSunriseColor(float td, float a)
    return NULL;
 }

-Vec3 *Dimension::getFogColor(float td, float a) const
-{
+Vec3* Dimension::getFogColor(float td, float a) const {
    float br = Mth::cos(td * PI * 2) * 2 + 0.5f;
    if (br < 0.0f) br = 0.0f;
    if (br > 1.0f) br = 1.0f;
-	
-	unsigned int baseFogColour = Minecraft::GetInstance()->getColourTable()->getColor( eMinecraftColour_Default_Fog_Colour );
+
+    unsigned int baseFogColour =
+        Minecraft::GetInstance()->getColourTable()->getColor(
+            eMinecraftColour_Default_Fog_Colour);
    float r = ((baseFogColour >> 16) & 0xff) / 255.0f;
    float g = ((baseFogColour >> 8) & 0xff) / 255.0f;
    float b = ((baseFogColour) & 0xff) / 255.0f;
@@ -174,13 +165,9 @@ Vec3 *Dimension::getFogColor(float td, float a) const
    return Vec3::newTemp(r, g, b);
 }

-bool Dimension::mayRespawn() const
-{
-	return true;
-}
+bool Dimension::mayRespawn() const { return true; }

-Dimension *Dimension::getNew(int id)
-{
+Dimension* Dimension::getNew(int id) {
    if (id == -1) return new HellDimension();
    if (id == 0) return new NormalDimension();
    if (id == 1) return new TheEndDimension();
@@ -188,56 +175,35 @@ Dimension *Dimension::getNew(int id)
    return NULL;
 }

-float Dimension::getCloudHeight()
-{
-	return (float)Level::genDepth;
+float Dimension::getCloudHeight() { return (float)Level::genDepth; }
+
+bool Dimension::hasGround() { return true; }
+
+Pos* Dimension::getSpawnPos() { return NULL; }
+
+int Dimension::getSpawnYPosition() {
+    if (levelType == LevelType::lvl_flat) {
+        return 4;
+    }
+    return Level::genDepth / 2;
 }

-bool Dimension::hasGround()
-{
-	return true;
+bool Dimension::hasBedrockFog() {
+    // 4J-PB - turn off bedrock fog if the host player doesn't want it
+    if (app.GetGameHostOption(eGameHostOption_BedrockFog) == 0) {
+        return false;
+    }
+
+    return (levelType != LevelType::lvl_flat && !hasCeiling);
 }

-Pos *Dimension::getSpawnPos()
-{
-	return NULL;
+double Dimension::getClearColorScale() {
+    if (levelType == LevelType::lvl_flat) {
+        return 1.0;
+    }
+    return 1.0 / 32.0;
 }

-int Dimension::getSpawnYPosition() 
-{
-	if (levelType == LevelType::lvl_flat) 
-	{
-		return 4;
-	}
-	return Level::genDepth / 2;
-}
+bool Dimension::isFoggyAt(int x, int z) { return false; }

-bool Dimension::hasBedrockFog() 
-{
-	// 4J-PB - turn off bedrock fog if the host player doesn't want it
-	if(app.GetGameHostOption(eGameHostOption_BedrockFog)==0)
-	{
-		return false;
-	}
-
-	return (levelType != LevelType::lvl_flat && !hasCeiling);
-}
-
-double Dimension::getClearColorScale() 
-{
-	if (levelType == LevelType::lvl_flat) 
-	{
-		return 1.0;
-	}
-	return 1.0 / 32.0;
-}
-
-bool Dimension::isFoggyAt(int x, int z)
-{
-	return false;
-}
-
-int Dimension::getXZSize()
-{
-	return level->getLevelData()->getXZSize();
-}
+int Dimension::getXZSize() { return level->getLevelData()->getXZSize(); }