Tropical
1767c3f6e9
chore: fmt
2026-03-30 09:37:24 -05: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
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
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
MatthewBeshay
a3f7f7d03c
perf(render): improve chunk scheduling and refine rebuild profiling
2026-03-29 20:55:59 -05:00
Tropical
485edf0679
clean up the diff further
2026-03-29 20:55:57 -05:00
Tropical
69e9db9edc
chore: undo some comments
2026-03-29 20:55:57 -05:00
Tropical
c60a71581d
revert ItemRenderer changes
2026-03-29 20:55:57 -05:00
Tropical
a4db31ee64
add back ItemRenderer comment
2026-03-29 20:55:57 -05:00
Tropical
dbd7ce40cd
fix: don't GL_NORMALIZE/GL_RESCALE_NORMAL when rendering items
2026-03-29 20:55:57 -05:00
Tropical
ca601c8205
restore original code for renderGuiItem
2026-03-29 20:55:57 -05:00
JuiceyDev
e71ff8699a
batch 2.1; entity lightfix
2026-03-29 20:55:56 -05:00
orng
7101d03c6a
refactor: remove heap-allocated AABBs
2026-03-28 02:58:56 -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
12ff12a263
cleanup: flatten dead branches in client render texture and runtime code
2026-03-26 20:29:59 +11:00
orng
bee10e55a8
refactor: remove calls to Vec3::newTemp when not returned
2026-03-26 04:19:04 -05:00
MatthewBeshay
1fecbf297a
cleanup: remove console branches from render texture and world helpers
2026-03-26 19:24:04 +11:00
orng
7b021bc99d
wip: removing vec3 tls
2026-03-26 01:10:27 -05:00
Tropical
ed726d291a
fix: properly bind minecart texture
...
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
Clang Format / clang-format (push) Has been cancelled
happened because of a bad merge
2026-03-24 23:17:47 -05:00
Sally Knight
5972c01ed4
fix: use original gui tile rendering (again) for proper lighting
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Clang Format / clang-format (push) Waiting to run
2026-03-25 00:07:11 +03:00
MatthewBeshay
fdb2a1098b
fix: restore block lightmap sampling
2026-03-24 08:21:19 +11:00
Tropical
e6e8db7ae9
add some missing nikita patches to TileRenderer
2026-03-22 17:06:52 -05:00
Tropical
03355211ca
more fixes
2026-03-22 03:13:45 -05:00
Tropical
ad5e8dd012
getting further
2026-03-22 02:52:30 -05:00
Tropical
ce57edff9d
fix strings, includes, the usual
2026-03-22 02:28:46 -05:00
Tropical
6c92bc0be8
more build fixes
2026-03-22 01:14:52 -05:00
Tropical
8f90088611
TU19: merge Minecraft.Client/Rendering
2026-03-21 22:28:58 -05:00
Sally Knight
97172039dd
Merge branch 'dev' into feat/restore-java-gui
2026-03-16 16:04:30 +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
Tropical
177ed6d176
Merge pull request #215 from 4jcraft/dev
...
just merging all of the dev branch stuff into the java gui branch
2026-03-13 12:11:37 -05:00
Tropical
8f10806f70
Merge branch 'dev' into feat/restore-java-gui
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
2026-03-13 01:02:17 -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
6cfc1efec2
Merge branch '4jcraft:dev' into fix-with-ubsan
2026-03-12 14:40:02 +01:00
Sally Knight
e66f279a5b
Merge branch 'dev' into feat/restore-java-gui
2026-03-12 16:01:31 +03:00
Sally Knight
4b8d65d5e6
fix: use original disabled transforms to fix hotbar block lighting
2026-03-12 03:50:34 +03:00
Nikita Edel
faa4a989ce
new blob
2026-03-11 18:49:36 +01:00
Nikita Edel
cc65f7ee29
FINALLY LOADS IN, crashes when clicking :(
2026-03-11 18:01:00 +01:00
notmatthewbeshay
a503336887
Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup
2026-03-11 16:02:48 +11:00
notmatthewbeshay
1bf50e2549
Use fixed-width language IDs in sign rendering
2026-03-11 15:38:52 +11:00
Tropical
cf3defee35
Merge branch 'dev' into feat/restore-java-gui
2026-03-10 21:02:58 -05:00
Nikita Edel
f9fc430c43
Merge branch '4jcraft:dev' into dev
2026-03-10 19:34:42 +01:00
