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

947 commits

Author SHA1 Message Date
Sally Knight 08a87c432a fix: put jui-specific texture usage behind ifdefs 2026-03-29 15:50:34 -05:00
Sally Knight 65ff6a97f0 feat(jui): add horse inventory screen 2026-03-29 15:50:34 -05:00
Sally Knight 3f2c6e0012 feat(jui): add panorama and splashes to title screen 
Also moved the version string to the same height as the copyright message, matching Beta 1.8+
 2026-03-29 15:50:34 -05:00
Sally Knight 0728ac8731 fix(jui): tick screen even if not ingame 
required for title screen panorama
 2026-03-29 15:50:34 -05:00
aedanmills 740f1b5c64 Update 2026-03-28 22:53:15 -04:00
aedanmills 75d83a4556 Fixed broken quit game button again. 2026-03-28 21:01:28 -04:00
orng 659b9c32cb fix: OOB when iterating over all cube faces 2026-03-28 13:50:35 -05:00
orng f614e661d2 refactor: remove PolygonArray 2026-03-28 13:34:20 -05:00
orng 5ba20b155c refactor: remove VertexArray 2026-03-28 12:53:07 -05:00
Tropical eb7bb6e518
Merge pull request #330 from 4jcraft/meson-options-cleanup
Some checks are pending
Publish Documentation / build (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details 
refactor: rework meson options, fix ENABLE_VSYNC
 2026-03-28 11:12:24 -05:00
orng a0be2e2fb5 refactor: remove aabb tls 2026-03-28 03:05:06 -05:00
orng 7101d03c6a refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
Tropical 939310be64 refactor: rework meson options, fix ENABLE_VSYNC 2026-03-28 02:13:27 -05:00
orng ddfe9b3d48 refactor: make Tile::getTileAABB return AABB 2026-03-28 00:30:07 -05:00
orng 78b5255224 refactor: make AABBList own its values 2026-03-27 22:37:22 -05:00
orng d7d99db4c5 refactor: remove AABB::newTemp when not returned 2026-03-27 21:56:57 -05:00
orng 534879e2e7 refactor: replace AABB::newPermanent with new AABB 2026-03-27 21:17:55 -05:00
orng 79217ca8e3 refactor: modernize AABB class 2026-03-27 21:11:11 -05:00
ffqq 016a3ebfb4
Merge branch '4jcraft:dev' into dev 2026-03-28 03:48:04 +03:00
Sally Knight 40a3f90d89 fix: add null check to renderItemInHand 2026-03-28 03:47:49 +03:00
Tropical 9bed5431eb
Merge pull request #310 from 4jcraft/refactor/replace-winapi-stubs 
refactor: finish up removing `Tls*` functions from linux code
 2026-03-27 18:53:22 -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
Tropical 8b11eb7a3a
Merge branch 'dev' into refactor/replace-winapi-stubs
Some checks failed
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Details
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
Details
Clang Format / clang-format (push) Has been cancelled
Details
2026-03-27 18:35:12 -05:00
Tropical e38f162c10
Merge pull request #314 from Merc6/refactor/remove-vec3-tls 
refactor: remove vec3 tls
 2026-03-27 18:19:21 -05:00
JuiceyDev 6be5f627ef make consoles_app use pathhelper :)
Some checks failed
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Details
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
Details
Clang Format / clang-format (push) Has been cancelled
Details
2026-03-27 20:57:46 +01:00
JuiceyDev 21fc2166ff cleaned up, less hacky, more silly 2026-03-27 20:54:21 +01:00
JuiceyDev ca84ac0512 okay managed to do it, anyways hacky code land :3 
mainly rewrote a bit of the soundengine, made files now load without being mean and uh yeah it works
 2026-03-27 18:07:38 +01:00
StevenSYS 396e819b9b
Made the Java creative inventory more complete. 2026-03-27 14:32:47 +00:00
JuiceyDev 256a809750 feat/bttr-cwd 2026-03-27 11:52:05 +01:00
orng 20982f11c1 chore: format files touched by refactor/remove-vec3-tls 2026-03-26 14:13:45 -05:00
orng 87e8078a65 refactor: remove new Vec3 2026-03-26 14:01:14 -05:00
orng 9fe3315112 refactor: remove vec3 tls 2026-03-26 13:37:01 -05:00
orng e887c8cf45 refactor: remove calls to Vec3::newTemp and Vec3::newPermanent 2026-03-26 13:29:05 -05:00
MatthewBeshay 039c2884ef fix: restore Linux/common build after dead-branch purge 2026-03-26 20:54:08 +11: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 f19563bbd7 cleanup: flatten dead branches in common app and ui code 2026-03-26 20:18:29 +11:00
MatthewBeshay 1fecbf297a cleanup: remove console branches from render texture and world helpers 2026-03-26 19:24:04 +11:00
MatthewBeshay 6ef7d05f7e cleanup: collapse common app and ui console branches 2026-03-26 18:49:24 +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 cbca0280b4 rust brainrot 2026-03-25 19:21:36 -05:00
Tropical b598aa9232 fix: only use InterlockedCompareExchangeRelease64 on LP64 systems 2026-03-25 19:20:18 -05:00
Tropical caf7128d58 refactor: remove Sleep from winapi_stubs 2026-03-25 19:14:53 -05:00
Tropical d9f03fdddf refactor: replace 0ms sleep with a proper yield 2026-03-25 19:13:12 -05: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 9fec342554 remove TlsAlloc, TlsFree, TlsGetValue, TlsSetValue 2026-03-25 16:32:06 -05:00
Tropical 7b18641f70 chore: clean up unused code from Linux_Minecraft.cpp 2026-03-25 16:24:45 -05:00
Tropical aff677a995 chore: fmt 2026-03-25 16:08:00 -05:00
Tropical 30170b8f9c adjust naming scheme of private TLS members 2026-03-25 14:46:16 -05:00
Tropical 9ff2fb4fef refactor: switch to thread_local in Chunk, PistonBaseTile, TheEndPortalTile, Compression 2026-03-25 14:41:08 -05:00
Tropical 625ce97385 refactor: use thread_local in OldChunkStorage, FireworksRecipe, Level, Entity 2026-03-25 14:13:00 -05:00
Tropical 03f62dcb9e refactor: FireworksRecipe thread-local storage 2026-03-25 12:59:15 -05:00
Tropical a82d76ca46 refactor: Tesselator thread-local storage 2026-03-25 12:43:41 -05:00
orng 1538074b4d refactor: remove integer caching 2026-03-25 02:47:51 -05:00
Tropical ed726d291a fix: properly bind minecart texture
Some checks failed
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Details
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
Details
Clang Format / clang-format (push) Has been cancelled
Details 
happened because of a bad merge
 2026-03-24 23:17:47 -05:00
Tropical 237eae2573 add back SoundEngine impls from merge 2026-03-24 19:17:00 -05:00
Tropical d4af59cf77 Merge branch 'dev' into tu19-take-2 2026-03-24 19:12:19 -05:00
Sally Knight 5972c01ed4 fix: use original gui tile rendering (again) for proper lighting
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details
2026-03-25 00:07:11 +03:00
Tropical e473825c76 fix: off-by-one in enchantment buttons 2026-03-24 15:45:59 -05:00
Tropical 69530dcccf Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-24 15:27:58 -05:00
Tropical 74252cc8d2 fix: slotId parsing in enchantment menu 2026-03-24 15:26:05 -05:00
Sally Knight d6070001d0 fix(jui): re-enable screen reinitialization on resize 2026-03-24 22:38:54 +03:00
Tropical ca533de1c3 Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-24 14:27:14 -05:00
Tropical a29b6ad45d refactor: cleanup UTF-16 digit parsing functionality 2026-03-24 14:27:07 -05:00
Sally Knight a604a5e803 fix: lock Gui.cpp HUD back behind java gui 2026-03-24 17:52:14 +03:00
Sally Knight 5806fea864 TU19: merge UI/Gui 2026-03-24 17:33:13 +03:00
Tropical 1fcd456c30 fix iggy skin selector (again)
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details
2026-03-24 00:55:24 -05:00
Sally Knight ba406c7e97 fix(jui): add null check for items to renderSlot()
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details
2026-03-24 07:08:37 +03:00
Sally Knight 98b9cf6147 fix(jui): cast the tileEntity in openTextEdit() as a sign 2026-03-24 07:01:17 +03:00
Sally Knight 135b403af1 set default gui scale to large 2026-03-24 07:00:42 +03:00
Sally Knight f6e151265c fix(jui): mouse unlocking while in a screen 2026-03-24 07:00:21 +03:00
Sally Knight 3310481ca3 fix(jui): use the same iggy scalings for java UI 2026-03-24 06:59:49 +03:00
Sally Knight 032e56a47a fix(jui): add missing screen assignment to setScreen() 2026-03-24 06:53:14 +03:00
Sally Knight e972d8095d fix(jui): use ResourceLocation for TN_GUI_GUI and TN_GUI_ICONS 2026-03-24 06:48:07 +03:00
Tropical 63a059c06d fix: use correct path for fall damage sound 2026-03-23 16:58:18 -05:00
JuiceyDev 587d685c5b faster texture loading 2026-03-23 22:31:03 +01:00
MatthewBeshay fdb2a1098b fix: restore block lightmap sampling 2026-03-24 08:21:19 +11:00
Tropical 1f32cfb206 fix(hack): temporarily restore tutorial world functionality using old GameRuleManager logic 2026-03-23 13:33:09 -05:00
Tropical 7e27377d46 fix: incorrect HtmlString formatting for colored text 2026-03-23 13:23:58 -05:00
Sally Knight 98eea45bb7 fix: restore entity lighting, use tesselated clouds for night-time lighting 2026-03-23 20:33:55 +03:00
Tropical 8094590e8d fix some bad sound paths
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details
2026-03-23 04:08:13 -05:00
Tropical ae15b32a0c Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-23 03:45:51 -05:00
Tropical 4d1e34dab0 Merge branch 'dev' into tu19-take-2 2026-03-23 03:45:22 -05:00
MatthewBeshay cc24fc996a fix: clean up sanitizer startup issues 2026-03-23 19:34:58 +11:00
MatthewBeshay fed9cf2d95 fix: resolve all build warnings and notes 2026-03-23 18:53:18 +11:00
Tropical 7a35d1caa2 fix: run Minecraft::init from the main thread only 
this was an orbis-specific hack seemingly that developed into a datarace after merging TU19 causing clang to segfault on startup
 2026-03-23 01:58:58 -05:00
ViniciusCruzMoura 94cabbe01b fix(SelectWorldScreen): open Select World instead of Create New World 
i restored the Select World scene so it no longer immediately opens
"Create New World"

i wrapped the not used code in if (0) so its ignored at runtime
but still compiled to catch build breaks. fixing the Select World scene
also fixed the Cancel button so you can go back to the previous scene
(before it was stuck on Create New World)

i didnt remove the weird code because i dont know why its there
left it disabled for now

Signed-off-by: ViniciusCruzMoura <contato.cruz.moura@gmail.com>
 2026-03-23 02:03:38 -04:00
Tropical f820e73cf8 fix: a bunch of iggy string encoding UB and use simdutf 2026-03-22 22:56:08 -05:00
Sally Knight 009279bb1b fix(render): don't explicitly set texture parameter settings 2026-03-23 02:42:09 +03:00
Sally Knight 0cd062833c fix: UB bit shift in Texture.cpp 2026-03-23 02:10:29 +03:00
Sally Knight 1f8900f430 update buildver to 1.6.0560 2026-03-23 01:46:21 +03:00
MatthewBeshay b6efb6265d fix(textures): guard StitchedTexture frame cleanup for SimpleIcon instances 2026-03-23 09:27:28 +11:00
Tropical e6e8db7ae9 add some missing nikita patches to TileRenderer 2026-03-22 17:06:52 -05:00
MatthewBeshay e71af5ef46 fix: Missing includes 2026-03-23 08:45:24 +11:00
Tropical 5afe516e99 TU19: fix merge issues with AbstractTexturePack 2026-03-22 16:31:34 -05:00
Tropical 5de59f25bc TU19: merge ColourTable 2026-03-22 15:46:03 -05:00
Tropical 76dfefad6a fmt ColourTable 2026-03-22 15:45:40 -05:00
Tropical 861b54588b Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-22 15:33:00 -05:00
Tropical 904141116f implement DLCManager::removeAllPacks, DLCManager::LanguageChanged 2026-03-22 15:32:28 -05:00
Sally Knight 7ea3e11373 fix: add HopperTileEntity.h include to Consoles_App 2026-03-22 23:31:10 +03:00
Tropical 0bc99ae881 Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-22 15:27:57 -05:00
Tropical 59243889ad fix a bunch of undefined refs 2026-03-22 15:27:46 -05:00
Sally Knight f36f66aed8 fix: add UIScene.h include to IUIScene_PauseMenu
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details
2026-03-22 23:23:22 +03:00
Tropical 9978311241 fix: missing Entity::RIDING_TAG, exclude demo mode 2026-03-22 15:20:04 -05:00
Tropical e1a31d1b3e fix: Minecraft.World compiles 2026-03-22 15:10:27 -05:00
Tropical bef236a1f1 fix: unmatched brace in DLCSkinFile 2026-03-22 14:57:04 -05:00
Tropical 23493c4681 fix various missing methods, update StringTable implementation 2026-03-22 14:52:55 -05:00
Sally Knight 4ed8fbd852 fix: use linux sentientmanager include instead of orbis 2026-03-22 22:37:01 +03:00
Tropical ad9a28bcb7 make LoadSaveDataThumbnailReturned public again, fix bad DLCManager merge 2026-03-22 14:15:08 -05:00
Tropical eb9c932b73 merge App_structs.h 2026-03-22 14:05:46 -05:00
Tropical 847b9b2887 fmt App_structs 2026-03-22 14:05:17 -05:00
Tropical dccac7487a fix missing bNotInGame 2026-03-22 14:02:50 -05:00
Tropical 547a3f3962 bad std::string replacement 2026-03-22 14:01:52 -05:00
Tropical 2005b23133 Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-22 14:00:52 -05:00
Tropical 855597d1bc exclude UIScene_InGameSaveManagementMenu, include fixes 2026-03-22 14:00:25 -05:00
Sally Knight 82d9fdffaf fix: correct even more minecraft.h includes 2026-03-22 21:59:49 +03:00
Tropical b0feb8ae57 Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-22 13:51:03 -05:00
Tropical c17408b34d fix includes, broken UIScene_TradingMenu method 2026-03-22 13:50:42 -05:00
Sally Knight 1c7b4c0add fix: correct Minecraft and (Multiplayer)LocalPlayer includes 2026-03-22 21:48:07 +03:00
Tropical 4191d04455 missed one 2026-03-22 13:43:43 -05:00
Tropical b9059a7607 fix remaining orbis telemetry includes on linux 2026-03-22 13:41:38 -05:00
Tropical 4c193cb36f whoopsfile got pasted twice somehow 2026-03-22 13:37:41 -05:00
Tropical 6341e660dc add a linux-specific folder for Sentient 2026-03-22 13:36:15 -05:00
Tropical 2475252ffe merge Telemetry folder 2026-03-22 13:33:10 -05:00
Tropical 638e5f72e2 fix UIControl_Base, exclude sony leaderboard shit 2026-03-22 13:28:20 -05:00
Tropical 429a085daf fix UITTFFont constructor 2026-03-22 13:15:41 -05:00
Tropical 3640c97575 more strings, UIScene fixes 2026-03-22 13:14:16 -05:00
Tropical 852d3aa1b8 fix UIScene_CreateWorldMenu 2026-03-22 13:07:33 -05:00
Tropical 09f91426b3 fix UIScene_JoinMenu 2026-03-22 13:02:27 -05:00
Tropical fb8aff30aa fix UIScene_InGameInfoMenu 2026-03-22 12:58:32 -05:00
Tropical 8ecc837cfa merge Platform/Common/DLC 2026-03-22 12:56:07 -05:00
Tropical be76c9cdb3 fix UIScene_HUD, UIScene_InGameInfoMenu 2026-03-22 12:52:44 -05:00
Tropical 3b77d6d806 update NetworkPlayerXbox, SimpleContainer fixes 2026-03-22 12:50:01 -05:00
Tropical 4b2f614326 format XUI 2026-03-22 12:40:22 -05:00
Tropical a403bf5a4a various iggy UI build fixes, format DLC folder 2026-03-22 12:36:33 -05:00
Tropical cf54e2bd0b add some missing UIScenes 2026-03-22 12:19:34 -05:00
Tropical fbd9449a31 wrong base64.cpp but whatever 2026-03-22 12:16:29 -05:00
Tropical 4eda6e89fd fix UIStructsmerge Platform/Common/Leaderboards 2026-03-22 12:13:53 -05:00
Tropical b9d18bf641 TU19: merge Minecraft.Client/Platform/Common/UI 2026-03-22 11:44:26 -05:00
Tropical 4dd9b683bf format Platform/Common/UI 2026-03-22 04:25:54 -05:00
Tropical 90bdcd47d4 TU19: Merge Minecraft.Client/Platform/Common/Network
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details
2026-03-22 04:21:50 -05:00
Tropical 5f22cd8093 format Platform/Common/Network 2026-03-22 04:16:54 -05:00
Tropical 1c5311f058 fixes to java UI and Minecraft.cpp 2026-03-22 04:14:58 -05:00
Tropical 58cdba39f3 TU19: merge Minecraft.Client/Platform/Common/Tutorial 2026-03-22 03:51:48 -05:00
Tropical 86c3e12e7b TU19: merge UIController and friends 2026-03-22 03:40:11 -05:00
Tropical 4486fc7ab4 format UIController 2026-03-22 03:15:07 -05:00