backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-06 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1574 commits 11 branches 1 tag 1.7 GiB
Commit graph

58 commits

Author SHA1 Message Date
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 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
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 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
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 f1ae42c659 refactor: remove basic type containers 2026-03-25 17:51:27 -05:00
Tropical e5414bf871 refactor: remove unneeded TlsKey typedefs 2026-03-25 15:55:37 -05:00
Tropical 28816876a1 chore: remove unneeded pthread includes 2026-03-25 15:52:37 -05:00
Tropical 30170b8f9c adjust naming scheme of private TLS members 2026-03-25 14:46:16 -05:00
Tropical 625ce97385 refactor: use thread_local in OldChunkStorage, FireworksRecipe, Level, Entity 2026-03-25 14:13:00 -05:00
Tropical 6c92bc0be8 more build fixes 2026-03-22 01:14:52 -05:00
Tropical 330ce54cda build fixes 2026-03-22 00:10:15 -05:00
Tropical e7bafb17d0 missed some 2026-03-21 17:12:22 -05:00
Tropical 357fca24aa refactor: nuke __int64/__uint64 in Minecraft.World 2026-03-21 17:10:36 -05:00
Tropical 8036565022 missed these two 2026-03-21 17:08:54 -05:00
Tropical 86e08af338 TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
Nikita Edel b43f31d3b6 alloc dealloc missmatch 2026-03-16 21:46:19 +01:00
notmatthewbeshay 16ae05769d Merge upstream/dev into issue/64-remove-winapi-primitives 2026-03-14 19:20:09 +11:00
Tropical 33d0737d1d chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
notmatthewbeshay 2180aaa4bc Remove DWORD from shared TLS keys 2026-03-14 06:28:46 +11: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 ee33f0663f Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-12 17:17:38 +01:00
Tropical ae84186d3a chore: remove #pragma warning directives 
These are only recognized by MSVC and will throw *additional* warnings on other compilers.
 2026-03-11 16:49:12 -05: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
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 78fdd89f9d Use platform TLS keys in old chunk storage 2026-03-11 15:38:53 +11:00
notmatthewbeshay c2b3537c62 Remove dead Win32 error state from compressed storage 2026-03-11 15:38:53 +11:00
notmatthewbeshay ee7945ea54 Use standard locals in storage and connection 2026-03-11 15:38:52 +11:00
notmatthewbeshay 0ab0fd9209 Standardise fixed-width integer usage in touched files 2026-03-11 15:38:42 +11:00
notmatthewbeshay 83ba8d8384 Use a portable seek origin for save files 2026-03-11 15:38:41 +11:00
Nikita Edel 021c2809f4 purged -Wdelete-non-abstract-non-virtual-dtor 2026-03-10 02:13:56 +01:00
notmatthewbeshay d1b2b8cedb Use standard byte counts in save file IO 2026-03-10 10:20:17 +11:00
notmatthewbeshay 22757b4b51 Remove HANDLE from zoned chunk storage headers 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 43a28fc490
Merge pull request #71 from 4jcraft/refactor/no-std-wildcard 
refactor: remove `using namespace std`
 2026-03-08 10:09:33 -05:00
Tropical ed551d8658 refactor: unglob std::dynamic_pointer_cast 2026-03-06 22:13:29 -06:00
ThePixelMoon 87c9733e09
Merge pull request #80 from zukrmn/fix/linux-compiler-warnings 
fix: resolve high-severity Linux compiler warnings
 2026-03-07 03:23:05 +02:00
zukrmn e3fc6ebe52 fix: resolve high-severity Linux compiler warnings 2026-03-06 22:57:02 +00:00
Tropical bc7d4ff1d8 refactor: byebye using namespace std 
shoo
 2026-03-06 12:16:41 -06:00
Tropical 2ed4b1fe9e refactor: unglob std::type_info 2026-03-06 12:14:56 -06:00
Tropical 49d02788c0 refactor: unglob std::enable_shared_from_this 2026-03-06 12:04:16 -06:00