Commit graph

54 commits

Author SHA1 Message Date
MatthewBeshay f1df21590b Merge dev and resolve formatting conflicts 2026-03-30 19:00:30 +11:00
MatthewBeshay bc6013ab70 Replace all CRITICAL_SECTION usage with std::mutex and std::lock_guard
Migrates 59 files from WinAPI CRITICAL_SECTION to portable C++ std::mutex/std::lock_guard/std::unique_lock. Removes Linux CRITICAL_SECTION shims from winapi_stubs.h.
2026-03-30 18:45:55 +11:00
Tropical c9b90cae2c chore: format everything 2026-03-30 02:17:54 -05:00
MatthewBeshay 28d68befd4 Replace remaining WinAPI types with standard C++ equivalents
DWORD→uint32_t, BYTE→uint8_t, HRESULT→int32_t, HANDLE→void*, UINT→uint32_t, INT→int32_t, WORD→uint16_t, LONG→int32_t, SHORT→int16_t, LONGLONG→int64_t, ULONG_PTR→uintptr_t, PBYTE→uint8_t*, LPWSTR/PWSTR→wchar_t*, FLOAT→float, CHAR→char, boolean→bool, CONST→const, TRUE→true, FALSE→false across 176 files (excluding vendor libs and Linux stubs).
2026-03-30 17:36:15 +11: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 51e61a12b4 refactor: replace some win32 typedefs 2026-03-30 00:16:26 -05:00
Tropical e45151ae64 refactor: expand AUTO_VAR macro 2026-03-29 23:59:05 -05:00
MatthewBeshay 6000900285 Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2
# Conflicts:
#	Minecraft.Client/Level/ServerLevel.cpp
#	Minecraft.Client/Minecraft.cpp
#	Minecraft.Client/MinecraftServer.cpp
#	Minecraft.Client/Network/ClientConnection.cpp
#	Minecraft.Client/Network/ServerChunkCache.cpp
#	Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp
#	Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.cpp
#	Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_EnchantingMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_Death.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_PauseMenu.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.cpp
#	Minecraft.Client/Platform/Durango/Durango_Minecraft.cpp
#	Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp
#	Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp
#	Minecraft.Client/Platform/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/lex/lexer/lexertl/lexer.hpp
#	Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp
#	Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp
#	Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
#	Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp
#	Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp
#	Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp
#	Minecraft.Client/Platform/stdafx.h
#	Minecraft.Client/Player/LocalPlayer.cpp
#	Minecraft.Client/Rendering/Chunk.cpp
#	Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp
#	Minecraft.Client/Rendering/GameRenderer.cpp
#	Minecraft.Client/Rendering/LevelRenderer.cpp
#	Minecraft.Client/Textures/BufferedImage.cpp
#	Minecraft.Client/UI/Screens/AchievementScreen.cpp
#	Minecraft.Client/UI/Screens/ContainerScreen.cpp
#	Minecraft.Client/UI/Screens/TrapScreen.cpp
#	Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
#	Minecraft.World/IO/Files/File.cpp
#	Minecraft.World/Player/Player.cpp
#	Minecraft.World/Util/C4JThread.cpp
2026-03-30 15:21:08 +11:00
orng d7d99db4c5 refactor: remove AABB::newTemp when not returned 2026-03-27 21:56:57 -05:00
orng 79217ca8e3 refactor: modernize AABB class 2026-03-27 21:11:11 -05:00
orng 20982f11c1 chore: format files touched by refactor/remove-vec3-tls 2026-03-26 14:13:45 -05:00
orng e887c8cf45 refactor: remove calls to Vec3::newTemp and Vec3::newPermanent 2026-03-26 13:29:05 -05:00
MatthewBeshay 8d3c504ee6 cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +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
orng f1ae42c659 refactor: remove basic type containers 2026-03-25 17:51:27 -05:00
orng 1538074b4d refactor: remove integer caching 2026-03-25 02:47:51 -05:00
MatthewBeshay fed9cf2d95 fix: resolve all build warnings and notes 2026-03-23 18:53:18 +11:00
Tropical d9aa793075 build fixes 2026-03-21 19:19:31 -05:00
Tropical 0f280b5ed3 TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
Tropical 357fca24aa refactor: nuke __int64/__uint64 in Minecraft.World 2026-03-21 17:10:36 -05:00
Nikita Edel b43f31d3b6 alloc dealloc missmatch 2026-03-16 21:46:19 +01:00
Echo J. 60be363e8e FixedBiomeSource: Make sure BiomeSource functions get overriden
Fixes a segfault when creating a superflat world
2026-03-16 07:37:01 +00:00
Liriosha 106552d969
Clang format 2026-03-15 00:56:09 -04:00
Liriosha db5f7fc246
Added back 4J notes and removed some unneeded text 2026-03-15 00:56:09 -04:00
Liriosha 345fe194f0
Getting this running again ow 2026-03-14 00:13:56 -04:00
Liriosha d57e2ae906
Added some docs to test 2026-03-13 23:46:54 -04:00
Tropical 33d0737d1d chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
notmatthewbeshay bcc765f3e7 Merge remote-tracking branch 'upstream/dev' into issue/51-phase-1-portable-win32-cleanup
# Conflicts:
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Rendering/Tesselator.cpp
2026-03-13 15:16:43 +11:00
Nikita Edel 6d952e24f5 revising everything 2026-03-12 16:42:36 +01:00
Nikita Edel ed13020cf3 s integer overflow, unsafe cast 2026-03-11 16:10:48 +01:00
Nikita Edel 8395277c0c shift of signed int, s int overflow 2026-03-11 13:36:44 +01:00
Nikita Edel 63e4b9b18a next little patch of ub, unallocated variable, s int overflow 2026-03-11 13:36:44 +01:00
notmatthewbeshay a503336887 Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup 2026-03-11 16:02:48 +11:00
notmatthewbeshay 9d41d3c359 Use fixed-width byte values in world data 2026-03-11 15:38:52 +11:00
Nikita Edel 021c2809f4 purged -Wdelete-non-abstract-non-virtual-dtor 2026-03-10 02:13:56 +01:00
notmatthewbeshay e1a66b0ad0 Modernise portable file and timing utilities 2026-03-10 10:13:58 +11:00
Nikita Edel 66b31669c3 new batch of delete operator missmatch 2026-03-09 22:48:36 +01:00
Tropical 54dab7708d refactor: rename Build -> Platform in Minecraft.World 2026-03-08 21:33:18 -05:00
Tropical ed551d8658 refactor: unglob std::dynamic_pointer_cast 2026-03-06 22:13:29 -06:00
Tropical e0479e90b4 fix: unglob everything else and make it build 2026-03-06 21:06:31 -06:00
Tropical 04ff82ba70 fix: unglob std::{min, max}, manual stuff 2026-03-06 20:47:11 -06:00
Tropical 967ffbb2a6 refactor: unglob std::deque 2026-03-06 20:41:22 -06:00
Tropical e506b8fe7a refactor: unglob std::pair 2026-03-06 20:37:41 -06:00
Tropical e918160231 refactor: unglob std::list 2026-03-06 20:37:02 -06:00
Tropical bc7d4ff1d8 refactor: byebye using namespace std
shoo
2026-03-06 12:16:41 -06:00
Tropical 7c95bfc0bd refactor: begin unglobbing std::vector 2026-03-06 11:58:11 -06:00
Tropical cdc08700e4 refactor: unglob std::wstring 2026-03-06 11:50:22 -06:00
Tropical ecf7fc7f61 refactor: unglob std::unordered_map 2026-03-06 11:29:36 -06:00