backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-28 13:02:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1504 commits 11 branches 1 tag 1.7 GiB
Commit graph

900 commits

Author SHA1 Message Date
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
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 d6bdbb39ae TU19: merge Minecraft.Client/Platform/Common/Audio 2026-03-22 02:31:05 -05:00
Tropical da3d403b29 format common sound engine folder 2026-03-22 02:29:12 -05:00
Tropical ce57edff9d fix strings, includes, the usual 2026-03-22 02:28:46 -05:00
Tropical a30330f1d0 exclude unused GameMode implementations, format Platform/Common/Tutorial 2026-03-22 02:11:47 -05:00
Tropical 3fa28df4da TU19: merge Minecraft.Client/Platform/Common/GameRules 2026-03-22 01:27:23 -05:00
Tropical 87b4af678b format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
Tropical 6c92bc0be8 more build fixes 2026-03-22 01:14:52 -05:00
Tropical 195d82340a merge Consoles_App.h 2026-03-22 01:03:39 -05:00
Tropical fb2faecf33 format Consoles_app 2026-03-22 00:12:31 -05:00
Tropical 330ce54cda build fixes 2026-03-22 00:10:15 -05:00
Tropical ab2efa87e4 merge App_enums.h 2026-03-22 00:00:40 -05:00
Tropical e444bef081 implement DebugArtToolsOn, fix strings and includes 2026-03-21 23:50:56 -05:00
Tropical fa4eb9cdf9 fix missing include and Minecraft.h errors 2026-03-21 23:33:30 -05:00
Tropical 371c734719 merge toplevel Minecraft.Client folders 2026-03-21 23:21:19 -05:00
Tropical 6e09aa7600 add BossMobGuiInfo to UI 2026-03-21 22:58:00 -05:00
Tropical 362a43ddee TU19: merge Minecraft.Client/Textures 2026-03-21 22:46:45 -05:00
Tropical 8f90088611 TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
Tropical a493e42532 TU19: merge Minecraft.Client/Player 2026-03-21 22:03:18 -05:00
Tropical 3f143811e3 TU19: merge Minecraft.Client/Network 2026-03-21 21:54:07 -05:00
Tropical 2e9cdf773b Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-21 20:50:37 -05:00
MatthewBeshay 91b13bccee TU19: fix build fallout across Client, World, NBT and Network 2026-03-22 12:45:21 +11:00
Tropical b319cb3cea TU19: merge Minecraft.Client/Level 2026-03-21 20:29:13 -05:00
Tropical 1c12bedc86 TU19: merge Minecraft.Client/GameState 2026-03-21 20:25:32 -05:00
Vinícius Moura 7775c59e3c
Merge branch '4jcraft:dev' into java_exit_btn_behaviour 2026-03-21 16:25:07 -04:00
ViniciusCruzMoura cbfdef7ba5 fix(TitleScreen): handle Exit Game properly with ENABLE_JAVA_GUIS 
i noticed the main menu had the same problem as #277 and applied
the same fix
tested with java gui and shiggy, both close correctly now

Signed-off-by: ViniciusCruzMoura <contato.cruz.moura@gmail.com>
 2026-03-21 16:23:48 -04:00
Tropical 4cdea50a5a
Merge pull request #290 from Liriosha/dev 
Miniaudio Integration
 2026-03-21 15:03:31 -05:00
Sally Knight 7f39d575a4 fix(jui): ensure serverside unpausing in all scenarios 2026-03-21 03:05:42 +03:00
Sally Knight 24512f44ad feat(jui): remap creative inventory to C 
This will allow players to open their survival inventory in Creative mode on the java UI
 2026-03-21 03:02:11 +03:00
Liriosha a73bdbdd13 Fix conflicts 2026-03-20 12:22:53 -04:00
Liriosha d54e365d1a Add suggested changes 2026-03-20 11:59:37 -04:00
MatthewBeshay e0f4194bfb Delete in-tree 4J libraries after extraction 2026-03-21 00:38:32 +11:00
Liriosha be37a40a1a Fix meson version 2026-03-19 16:24:49 -04:00
Liriosha 901f7f9cb1 Add miniaudio and stb as dependencies 2026-03-19 16:15:20 -04:00
Liriosha c63491ab81
Merge branch '4jcraft:dev' into dev 2026-03-19 17:14:46 +00:00
Liriosha 5007466c80 Format Minecraft.Client/MinecraftServer.cpp (to make clang-format actually run correctly 2026-03-19 12:19:56 -04:00
Liriosha c4897f46e1 clang-format 2026-03-19 12:08:12 -04:00
Sally Knight d968855cc4 fix(jui): correctly check if host or not for disconnect text 2026-03-19 18:57:19 +03:00
Sally Knight e6585a6732 i18n(jui): localize disconnect button text 2026-03-19 18:56:24 +03:00
Sally Knight 009b17ef1b fix(gui): working pauses on iggy 2026-03-19 18:49:14 +03:00
Liriosha 4b4cda41f4 Make 'assigning field to itself' shut up 2026-03-19 09:55:10 -04:00
Sally Knight 32fee4334d fix(jui): call eXuiServerAction_PauseServer to pause server-side too 2026-03-19 15:41:55 +03:00
Sally Knight 0fbbac1cde feat(jui): add world leaving 
You will now be able to leave the world from all places where you'd usually be able to (Pause screen, death screen)
Should be identical to the way it's done on Iggy/XUI
 2026-03-19 15:05:32 +03:00
Sally Knight 6d50ac4771 feat(jui): add dirt background rendering to selectworldscreen 2026-03-19 14:57:06 +03:00
Sally Knight 55bc1e17b7 fix(jui): remove tick method from MessageScreen 2026-03-19 14:52:56 +03:00
Liriosha 9c0c4f5c81 fmt manually 2026-03-19 03:37:43 -04:00