LegacyConsole/4jcraft
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-24 09:35:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-dev' into cleanup/nullptr-replacement

Browse Source 
# Conflicts:
#	Minecraft.Client/Network/PlayerChunkMap.cpp
#	Minecraft.Client/Network/PlayerList.cpp
#	Minecraft.Client/Network/ServerChunkCache.cpp
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
#	Minecraft.Client/Platform/Common/GameRules/LevelRuleset.cpp
#	Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp
#	Minecraft.Client/Platform/Common/Tutorial/TutorialTask.cpp
#	Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.h
#	Minecraft.Client/Platform/Extrax64Stubs.cpp
#	Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h
#	Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h
#	Minecraft.Client/Player/EntityTracker.cpp
#	Minecraft.Client/Player/ServerPlayer.cpp
#	Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp
#	Minecraft.Client/Textures/Packs/DLCTexturePack.cpp
#	Minecraft.Client/Textures/Stitching/StitchedTexture.cpp
#	Minecraft.Client/Textures/Stitching/TextureMap.cpp
#	Minecraft.Client/Textures/Textures.cpp
#	Minecraft.World/Blocks/NotGateTile.cpp
#	Minecraft.World/Blocks/PressurePlateTile.cpp
#	Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp
#	Minecraft.World/Enchantments/EnchantmentHelper.cpp
#	Minecraft.World/Entities/HangingEntity.cpp
#	Minecraft.World/Entities/LeashFenceKnotEntity.cpp
#	Minecraft.World/Entities/LivingEntity.cpp
#	Minecraft.World/Entities/Mobs/Boat.cpp
#	Minecraft.World/Entities/Mobs/Minecart.cpp
#	Minecraft.World/Entities/Mobs/Witch.cpp
#	Minecraft.World/Entities/SyncedEntityData.cpp
#	Minecraft.World/Items/LeashItem.cpp
#	Minecraft.World/Items/PotionItem.cpp
#	Minecraft.World/Level/BaseMobSpawner.cpp
#	Minecraft.World/Level/CustomLevelSource.cpp
#	Minecraft.World/Level/Level.cpp
#	Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp
#	Minecraft.World/Level/Storage/McRegionLevelStorage.cpp
#	Minecraft.World/Level/Storage/RegionFileCache.cpp
#	Minecraft.World/Player/Player.cpp
#	Minecraft.World/WorldGen/Biomes/BiomeCache.cpp
#	Minecraft.World/WorldGen/Features/RandomScatteredLargeFeature.cpp
#	Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp
This commit is contained in:
MatthewBeshay
2026-03-30 16:28:40 +11:00
parent dfb0e3b03e 00cd713cc8
commit a0fdc643d1
265 changed files with 1408 additions and 1426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Minecraft.World/WorldGen/Features/StructureFeature.cpp
View File

@@ -14,7 +14,7 @@ StructureFeature::StructureFeature() {
}
StructureFeature::~StructureFeature() {
for (AUTO_VAR(it, cachedStructures.begin()); it != cachedStructures.end();
for (auto it = cachedStructures.begin(); it != cachedStructures.end();
it++) {
delete it->second;
}
@@ -62,7 +62,7 @@ bool StructureFeature::postProcess(Level* level, Random* random, int chunkX,
int cz = ((unsigned)chunkZ << 4); // + 8;
bool intersection = false;
for (AUTO_VAR(it, cachedStructures.begin()); it != cachedStructures.end();
for (auto it = cachedStructures.begin(); it != cachedStructures.end();
it++) {
StructureStart* structureStart = it->second;
@@ -88,13 +88,13 @@ bool StructureFeature::postProcess(Level* level, Random* random, int chunkX,
bool StructureFeature::isIntersection(int cellX, int cellZ) {
restoreSavedData(level);
for (AUTO_VAR(it, cachedStructures.begin()); it != cachedStructures.end();
for (auto it = cachedStructures.begin(); it != cachedStructures.end();
it++) {
StructureStart* structureStart = it->second;
if (structureStart->isValid()) {
if (structureStart->getBoundingBox()->intersects(cellX, cellZ,
cellX, cellZ)) {
AUTO_VAR(it2, structureStart->getPieces()->begin());
auto it2 = structureStart->getPieces()->begin();
while (it2 != structureStart->getPieces()->end()) {
StructurePiece* next = *it2++;
if (next->getBoundingBox()->intersects(cellX, cellZ, cellX,
@@ -116,7 +116,7 @@ bool StructureFeature::isInsideFeature(int cellX, int cellY, int cellZ) {
StructureStart* StructureFeature::getStructureAt(int cellX, int cellY,
int cellZ) {
// for (StructureStart structureStart : cachedStructures.values())
for (AUTO_VAR(it, cachedStructures.begin()); it != cachedStructures.end();
for (auto it = cachedStructures.begin(); it != cachedStructures.end();
++it) {
StructureStart* pStructureStart = it->second;
@@ -134,7 +134,7 @@ StructureStart* StructureFeature::getStructureAt(int cellX, int cellY,
std::list<StructurePiece*>* pieces =
pStructureStart->getPieces();
for (AUTO_VAR(it2, pieces->begin()); it2 != pieces->end();
for (auto it2 = pieces->begin(); it2 != pieces->end();
it2++) {
StructurePiece* piece = *it2;
if (piece->getBoundingBox()->isInside(cellX, cellY,
@@ -152,7 +152,7 @@ bool StructureFeature::isInsideBoundingFeature(int cellX, int cellY,
int cellZ) {
restoreSavedData(level);
for (AUTO_VAR(it, cachedStructures.begin()); it != cachedStructures.end();
for (auto it = cachedStructures.begin(); it != cachedStructures.end();
++it) {
StructureStart* structureStart = it->second;
if (structureStart->isValid()) {
@@ -183,7 +183,7 @@ TilePos* StructureFeature::getNearestGeneratedFeature(Level* level, int cellX,
double minDistance = DBL_MAX;
TilePos* selected = nullptr;
for (AUTO_VAR(it, cachedStructures.begin()); it != cachedStructures.end();
for (auto it = cachedStructures.begin(); it != cachedStructures.end();
++it) {
StructureStart* pStructureStart = it->second;
@@ -213,7 +213,7 @@ TilePos* StructureFeature::getNearestGeneratedFeature(Level* level, int cellX,
if (guesstimatedFeaturePositions != nullptr) {
TilePos* pSelectedPos = new TilePos(0, 0, 0);
for (AUTO_VAR(it, guesstimatedFeaturePositions->begin());
for (auto it = guesstimatedFeaturePositions->begin();
it != guesstimatedFeaturePositions->end(); ++it) {
int dx = (*it).x - cellX;
int dy = (*it).y - cellY;
@@ -253,7 +253,7 @@ void StructureFeature::restoreSavedData(Level* level) {
CompoundTag* fullTag = savedData->getFullTag();
std::vector<Tag*>* allTags = fullTag->getAllTags();
for (AUTO_VAR(it, allTags->begin()); it != allTags->end(); ++it) {
for (auto it = allTags->begin(); it != allTags->end(); ++it) {
Tag* featureTag = *it;
if (featureTag->getId() == Tag::TAG_Compound) {
CompoundTag* ct = (CompoundTag*)featureTag;