Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Minecraft.World/Layer.cpp
View File

@@ -21,16 +21,16 @@ LayerArray Layer::getDefaultLayers(int64_t seed, LevelType *levelType)
// 4J - Some changes moved here from 1.2.3. Temperature & downfall layers are no longer created & returned, and a debug layer is isn't.
// For reference with regard to future merging, things NOT brought forward from the 1.2.3 version are new layer types that we
// don't have yet (shores, swamprivers, region hills etc.)
shared_ptr<Layer>islandLayer = std::make_shared<IslandLayer>(1);
islandLayer = std::make_shared<FuzzyZoomLayer>(2000, islandLayer);
islandLayer = std::make_shared<AddIslandLayer>(1, islandLayer);
islandLayer = std::make_shared<ZoomLayer>(2001, islandLayer);
islandLayer = std::make_shared<AddIslandLayer>(2, islandLayer);
islandLayer = std::make_shared<AddSnowLayer>(2, islandLayer);
islandLayer = std::make_shared<ZoomLayer>(2002, islandLayer);
islandLayer = std::make_shared<AddIslandLayer>(3, islandLayer);
islandLayer = std::make_shared<ZoomLayer>(2003, islandLayer);
islandLayer = std::make_shared<AddIslandLayer>(4, islandLayer);
shared_ptr<Layer>islandLayer = shared_ptr<Layer>(new IslandLayer(1));
islandLayer = shared_ptr<Layer>(new FuzzyZoomLayer(2000, islandLayer));
islandLayer = shared_ptr<Layer>(new AddIslandLayer(1, islandLayer));
islandLayer = shared_ptr<Layer>(new ZoomLayer(2001, islandLayer));
islandLayer = shared_ptr<Layer>(new AddIslandLayer(2, islandLayer));
islandLayer = shared_ptr<Layer>(new AddSnowLayer(2, islandLayer));
islandLayer = shared_ptr<Layer>(new ZoomLayer(2002, islandLayer));
islandLayer = shared_ptr<Layer>(new AddIslandLayer(3, islandLayer));
islandLayer = shared_ptr<Layer>(new ZoomLayer(2003, islandLayer));
islandLayer = shared_ptr<Layer>(new AddIslandLayer(4, islandLayer));
// islandLayer = shared_ptr<Layer>(new AddMushroomIslandLayer(5, islandLayer)); // 4J - old position of mushroom island layer
int zoomLevel = 4;
@@ -41,30 +41,30 @@ LayerArray Layer::getDefaultLayers(int64_t seed, LevelType *levelType)
shared_ptr<Layer> riverLayer = islandLayer;
riverLayer = ZoomLayer::zoom(1000, riverLayer, 0);
riverLayer = std::make_shared<RiverInitLayer>(100, riverLayer);
riverLayer = shared_ptr<Layer>(new RiverInitLayer(100, riverLayer));
riverLayer = ZoomLayer::zoom(1000, riverLayer, zoomLevel + 2);
riverLayer = std::make_shared<RiverLayer>(1, riverLayer);
riverLayer = std::make_shared<SmoothLayer>(1000, riverLayer);
riverLayer = shared_ptr<Layer>(new RiverLayer(1, riverLayer));
riverLayer = shared_ptr<Layer>(new SmoothLayer(1000, riverLayer));
shared_ptr<Layer> biomeLayer = islandLayer;
biomeLayer = ZoomLayer::zoom(1000, biomeLayer, 0);
biomeLayer = std::make_shared<BiomeInitLayer>(200, biomeLayer, levelType);
biomeLayer = shared_ptr<Layer>(new BiomeInitLayer(200, biomeLayer, levelType));
biomeLayer = ZoomLayer::zoom(1000, biomeLayer, 2);
biomeLayer = std::make_shared<RegionHillsLayer>(1000, biomeLayer);
biomeLayer = shared_ptr<Layer>(new RegionHillsLayer(1000, biomeLayer));
for (int i = 0; i < zoomLevel; i++)
{
biomeLayer = std::make_shared<ZoomLayer>(1000 + i, biomeLayer);
biomeLayer = shared_ptr<Layer>(new ZoomLayer(1000 + i, biomeLayer));
if (i == 0) biomeLayer = std::make_shared<AddIslandLayer>(3, biomeLayer);
if (i == 0) biomeLayer = shared_ptr<Layer>(new AddIslandLayer(3, biomeLayer));
if (i == 0)
{
// 4J - moved mushroom islands to here. This skips 3 zooms that the old location of the add was, making them about 1/8 of the original size. Adding
// them at this scale actually lets us place them near enough other land, if we add them at the same scale as java then they have to be too far out to see for
// the scale of our maps
biomeLayer = std::make_shared<AddMushroomIslandLayer>(5, biomeLayer);
biomeLayer = shared_ptr<Layer>(new AddMushroomIslandLayer(5, biomeLayer));
}
if (i == 1 )
@@ -72,30 +72,30 @@ LayerArray Layer::getDefaultLayers(int64_t seed, LevelType *levelType)
// 4J - now expand mushroom islands up again. This does a simple region grow to add a new mushroom island element when any of the neighbours are also mushroom islands.
// This helps make the islands into nice compact shapes of the type that are actually likely to be able to make an island out of the sea in a small space. Also
// helps the shore layer from doing too much damage in shrinking the islands we are making
biomeLayer = std::make_shared<GrowMushroomIslandLayer>(5, biomeLayer);
biomeLayer = shared_ptr<Layer>(new GrowMushroomIslandLayer(5, biomeLayer));
// Note - this reduces the size of mushroom islands by turning their edges into shores. We are doing this at i == 1 rather than i == 0 as the original does
biomeLayer = std::make_shared<ShoreLayer>(1000, biomeLayer);
biomeLayer = shared_ptr<Layer>(new ShoreLayer(1000, biomeLayer));
biomeLayer = std::make_shared<SwampRiversLayer>(1000, biomeLayer);
biomeLayer = shared_ptr<Layer>(new SwampRiversLayer(1000, biomeLayer));
}
}
biomeLayer = std::make_shared<SmoothLayer>(1000, biomeLayer);
biomeLayer = shared_ptr<Layer>(new SmoothLayer(1000, biomeLayer));
biomeLayer = std::make_shared<RiverMixerLayer>(100, biomeLayer, riverLayer);
biomeLayer = shared_ptr<Layer>(new RiverMixerLayer(100, biomeLayer, riverLayer));
#ifndef _CONTENT_PACKAGE
#ifdef _BIOME_OVERRIDE
if(app.DebugSettingsOn() && app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_EnableBiomeOverride))
{
biomeLayer = std::make_shared<BiomeOverrideLayer>(1);
biomeLayer = shared_ptr<BiomeOverrideLayer>(new BiomeOverrideLayer(1));
}
#endif
#endif
shared_ptr<Layer> debugLayer = biomeLayer;
shared_ptr<Layer>zoomedLayer = std::make_shared<VoronoiZoom>(10, biomeLayer);
shared_ptr<Layer>zoomedLayer = shared_ptr<Layer>(new VoronoiZoom(10, biomeLayer));
biomeLayer->init(seed);
zoomedLayer->init(seed);
@@ -123,7 +123,7 @@ Layer::Layer(int64_t seedMixup)
void Layer::init(int64_t seed)
{
this->seed = seed;
if (parent != nullptr) parent->init(seed);
if (parent != NULL) parent->init(seed);
this->seed *= this->seed * 6364136223846793005l + 1442695040888963407l;
this->seed += seedMixup;
this->seed *= this->seed * 6364136223846793005l + 1442695040888963407l;
@@ -189,7 +189,7 @@ int Layer::nextRandom(int max)
}
#else
int result = static_cast<int>((rval >> 24) % max);
int result = (int) ((rval >> 24) % max);
#endif
if (result < 0) result += max;