LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-30 14:56:27 +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

16
Minecraft.Client/Textures/Stitching/TextureMap.cpp
View File

@@ -59,7 +59,7 @@ void TextureMap::stitch() {
Stitcher* stitcher = TextureManager::getInstance()->createStitcher(name);
for (AUTO_VAR(it, texturesByName.begin()); it != texturesByName.end();
for (auto it = texturesByName.begin(); it != texturesByName.end();
++it) {
delete it->second;
}
@@ -83,7 +83,7 @@ void TextureMap::stitch() {
// Extract frames from textures and add them to the stitchers
// for (final String name : texturesToRegister.keySet())
for (AUTO_VAR(it, texturesToRegister.begin());
for (auto it = texturesToRegister.begin();
it != texturesToRegister.end(); ++it) {
std::wstring name = it->first;
@@ -120,9 +120,9 @@ void TextureMap::stitch() {
stitchResult = stitcher->constructTexture(m_mipMap);
// Extract all the final positions and store them
AUTO_VAR(areas, stitcher->gatherAreas());
auto areas = stitcher->gatherAreas();
// for (StitchSlot slot : stitcher.gatherAreas())
for (AUTO_VAR(it, areas->begin()); it != areas->end(); ++it) {
for (auto it = areas->begin(); it != areas->end(); ++it) {
StitchSlot* slot = *it;
TextureHolder* textureHolder = slot->getHolder();
@@ -133,7 +133,7 @@ void TextureMap::stitch() {
StitchedTexture* stored = nullptr;
AUTO_VAR(itTex, texturesToRegister.find(textureName));
auto itTex = texturesToRegister.find(textureName);
if (itTex != texturesToRegister.end()) stored = itTex->second;
// [EB]: What is this code for? debug warnings for when during
@@ -194,7 +194,7 @@ void TextureMap::stitch() {
missingPosition = texturesByName.find(NAME_MISSING_TEXTURE)->second;
// for (StitchedTexture texture : texturesToRegister.values())
for (AUTO_VAR(it, texturesToRegister.begin());
for (auto it = texturesToRegister.begin();
it != texturesToRegister.end(); ++it) {
StitchedTexture* texture = it->second;
texture->replaceWith(missingPosition);
@@ -212,7 +212,7 @@ StitchedTexture* TextureMap::getTexture(const std::wstring& name) {
void TextureMap::cycleAnimationFrames() {
// for (StitchedTexture texture : animatedTextures)
for (AUTO_VAR(it, animatedTextures.begin()); it != animatedTextures.end();
for (auto it = animatedTextures.begin(); it != animatedTextures.end();
++it) {
StitchedTexture* texture = *it;
texture->cycleFrames();
@@ -233,7 +233,7 @@ Icon* TextureMap::registerIcon(const std::wstring& name) {
// TODO: [EB]: Why do we allow multiple registrations?
StitchedTexture* result = nullptr;
AUTO_VAR(it, texturesToRegister.find(name));
auto it = texturesToRegister.find(name);
if (it != texturesToRegister.end()) result = it->second;
if (result == nullptr) {