Commit graph

24 commits

Author SHA1 Message Date
Tropical c9b90cae2c chore: format everything 2026-03-30 02:17:54 -05:00
Tropical f03c7163f4 WCHAR -> wchar_t 2026-03-30 00:42:26 -05:00
MatthewBeshay a0fdc643d1 Merge branch 'upstream-dev' into cleanup/nullptr-replacement
# 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
2026-03-30 16:28:40 +11:00
MatthewBeshay dfb0e3b03e refactor: replace NULL with nullptr across C++ codebase
Excludes vendored C libs (zlib, Miles, DirectXMath, boost, Iggy).
2026-03-30 16:25:52 +11:00
Tropical 6ed953a3c3 refactor: replace double-underscore MSVC integer types with stdint 2026-03-30 00:08:25 -05:00
MatthewBeshay 12ff12a263 cleanup: flatten dead branches in client render texture and runtime code 2026-03-26 20:29:59 +11:00
MatthewBeshay 1fecbf297a cleanup: remove console branches from render texture and world helpers 2026-03-26 19:24:04 +11:00
MatthewBeshay ad5da38321 cleanup: remove console platform code from shared includes and build paths 2026-03-26 17:53:37 +11:00
Tropical 362a43ddee TU19: merge Minecraft.Client/Textures 2026-03-21 22:46:45 -05:00
Tropical e8424f2000 chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
notmatthewbeshay 883e98bde0 Address review feedback on protocol types 2026-03-13 19:47:32 +11:00
notmatthewbeshay 082dc2033d Use standard DLC mount callback types 2026-03-11 15:46:23 +11:00
notmatthewbeshay e5d5fb07be Use standard sizes in texture pack locators 2026-03-11 15:38:52 +11:00
notmatthewbeshay 6556b316dc Use standard counters in DLC manager 2026-03-11 15:38:50 +11:00
notmatthewbeshay 0437fb921f Use standard byte counts for base save data 2026-03-11 15:38:42 +11:00
notmatthewbeshay 2dbce494d1 Remove DWORD texture pack IDs from pack interfaces 2026-03-10 10:13:59 +11:00
notmatthewbeshay c10b1a1706 Remove DWORD sizes from DLC payload APIs 2026-03-10 10:13:59 +11:00
notmatthewbeshay 7bdf4c8ced Remove Win32 byte counts from texture pack images 2026-03-10 10:13:59 +11:00
notmatthewbeshay 65dc775e84 Remove Win32 byte aliases from DLC texture loading 2026-03-10 10:13:58 +11:00
notmatthewbeshay 62a5c364f2 Use portable file reads for DLC texture data 2026-03-10 10:13:58 +11:00
Tropical 5a36950239 fix: shuffle around remaining paths to get everything building again/home/tropical/Documents/GitHub/4jcraft-real/Minecraft.World/Level/../../Minecraft.Client/Textures/Packs/TexturePack.h 2026-03-09 00:34:09 -05:00
Tropical cff2fc5f44 refactor: unglob std::wstring 2026-03-08 22:43:43 +01:00
JuiceyDev 417ea73050 painful update 2026-03-06 18:31:46 +01:00
ella love 2383fcee6e feat: move script & folder refactor 2026-03-05 03:29:23 -05:00
Renamed from Minecraft.Client/DLCTexturePack.cpp (Browse further)