Tropical
1767c3f6e9
chore: fmt
2026-03-30 09:37:24 -05:00
MatthewBeshay
e911e07a58
Refactor C4JThread: modernise API naming and replace Windows constants
...
Rename all PascalCase methods to camelCase, replace Windows macro constants with C++ constexpr members, convert ThreadPriority to enum class, remove unused Sleep(), fix memory ordering on inline accessors, extract platform code into helpers.
2026-03-31 01:06:06 +11:00
MatthewBeshay
e4520df31f
Restore recursive locking for mutexes converted from CRITICAL_SECTION
...
CRITICAL_SECTION is reentrant; std::mutex is not. This caused deadlocks during world generation, post-processing, and saving.
2026-03-30 22:14:14 +11:00
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
Tropical
a518b51754
LONG64 -> int64_t
2026-03-30 00:38:52 -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
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
Tropical
e437a5f4be
fix build
2026-03-29 23:35:51 -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
Sally Knight
97c6704d82
feat(jui): add merchant screen
2026-03-29 15:52:19 -05:00
orng
7101d03c6a
refactor: remove heap-allocated AABBs
2026-03-28 02:58:56 -05:00
orng
79217ca8e3
refactor: modernize AABB class
2026-03-27 21:11:11 -05:00
Tropical
06c73c821c
Merge pull request #312 from 4jcraft/refactor/replace-sleep
...
refactor: replace win32 thread sleeping and yielding with `std::thread` primitives
2026-03-27 18:47:47 -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
orng
7b021bc99d
wip: removing vec3 tls
2026-03-26 01:10:27 -05:00
MatthewBeshay
2117a772d7
checkpoint: refresh supported-path portability baseline
2026-03-26 17:05:31 +11:00
Tropical
8e94b763a7
refactor: remove usage of win32 Sleep function for this_thread::sleep_for
2026-03-25 19:12:11 -05:00
orng
9ea379eb44
chore: fix formatting in files touched by
...
refactor/remove-BasicTypeContainers
2026-03-25 18:01:56 -05:00
orng
f1ae42c659
refactor: remove basic type containers
2026-03-25 17:51:27 -05:00
Tropical
4d1e34dab0
Merge branch 'dev' into tu19-take-2
2026-03-23 03:45:22 -05:00
Tropical
ce57edff9d
fix strings, includes, the usual
2026-03-22 02:28:46 -05:00
Tropical
3f143811e3
TU19: merge Minecraft.Client/Network
2026-03-21 21:54:07 -05:00
MatthewBeshay
91b13bccee
TU19: fix build fallout across Client, World, NBT and Network
2026-03-22 12:45:21 +11:00
Sally Knight
7c3ba79f83
feat(jui): (re-)add transitional screens
...
Adds a new MessageScreen class to display custom messages and restores areas where ReceivingLevelScreen was used
2026-03-19 03:37:39 +03:00
Tropical
e8424f2000
chore: format Minecraft.Client
2026-03-13 17:10:10 -05:00
notmatthewbeshay
0249bfd2bf
Fix Linux build warnings
2026-03-14 04:37:55 +11:00
notmatthewbeshay
a503336887
Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup
2026-03-11 16:02:48 +11:00
notmatthewbeshay
2256d0fadd
Remove legacy Win32 thread entry state
2026-03-11 15:38:53 +11:00
notmatthewbeshay
2b5574af95
Use standard types in client connection state
2026-03-11 15:38:51 +11:00
notmatthewbeshay
a1fdebbc3b
Use standard skin locals in player code
2026-03-11 15:38:51 +11:00
notmatthewbeshay
68661e1d44
Use standard pre-login indices in client connection
2026-03-11 15:38:50 +11:00
notmatthewbeshay
ab89d415a2
Use standard message option arrays in app flows
2026-03-11 15:38:50 +11:00
notmatthewbeshay
c8150b1338
Use standard small IDs in player colour tracking
2026-03-11 15:38:49 +11:00
notmatthewbeshay
268ae0388f
Use standard booleans in client connection checks
2026-03-11 15:38:48 +11:00
notmatthewbeshay
37aa3463be
Use standard buffer types for in-memory textures
2026-03-11 15:38:42 +11:00
notmatthewbeshay
0ab0fd9209
Standardise fixed-width integer usage in touched files
2026-03-11 15:38:42 +11:00
Nikita Edel
6be6aadf0e
another delete operator missmatch
2026-03-10 02:27:16 +01:00
notmatthewbeshay
b59ab4a4b8
Remove LPVOID from server chunk save threads
2026-03-10 10:14:01 +11:00
notmatthewbeshay
5d72f9214a
Remove DWORD from client connection user index
2026-03-10 10:14:01 +11:00
notmatthewbeshay
3aeb023869
Remove Win32 types from prelogin packets
2026-03-10 10:14:00 +11:00
notmatthewbeshay
d041044000
Remove BYTE from network player IDs
2026-03-10 10:14:00 +11:00
notmatthewbeshay
b1de3b9065
Remove DWORD player indices from player state
2026-03-10 10:14:00 +11:00
notmatthewbeshay
474d8b2896
Remove Win32 byte types from texture packets
2026-03-10 10:14:00 +11:00
