LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-18 16:28:07 +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

8
Minecraft.Client/Textures/Stitching/StitchedTexture.cpp
View File

@@ -43,7 +43,7 @@ StitchedTexture::StitchedTexture(const std::wstring& name,
void StitchedTexture::freeFrameTextures() {
if (frames != nullptr) {
for (AUTO_VAR(it, frames->begin()); it != frames->end(); ++it) {
for (auto it = frames->begin(); it != frames->end(); ++it) {
TextureManager::getInstance()->unregisterTexture(L"", *it);
delete *it;
}
@@ -54,7 +54,7 @@ void StitchedTexture::freeFrameTextures() {
StitchedTexture::~StitchedTexture() {
if (frames != nullptr) {
for (AUTO_VAR(it, frames->begin()); it != frames->end(); ++it) {
for (auto it = frames->begin(); it != frames->end(); ++it) {
delete *it;
}
delete frames;
@@ -218,7 +218,7 @@ void StitchedTexture::loadAnimationFrames(BufferedReader* bufferedReader) {
if (line.length() > 0) {
std::vector<std::wstring> tokens = stringSplit(line, L',');
// for (String token : tokens)
for (AUTO_VAR(it, tokens.begin()); it != tokens.end(); ++it) {
for (auto it = tokens.begin(); it != tokens.end(); ++it) {
std::wstring token = *it;
int multiPos = token.find_first_of('*');
if (multiPos > 0) {
@@ -258,7 +258,7 @@ void StitchedTexture::loadAnimationFrames(const std::wstring& string) {
std::vector<std::wstring> tokens = stringSplit(trimString(string), L',');
// for (String token : tokens)
for (AUTO_VAR(it, tokens.begin()); it != tokens.end(); ++it) {
for (auto it = tokens.begin(); it != tokens.end(); ++it) {
std::wstring token = trimString(*it);
int multiPos = token.find_first_of('*');
if (multiPos > 0) {