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

534 commits

Author SHA1 Message Date
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
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
Tropical f820e73cf8 fix: a bunch of iggy string encoding UB and use simdutf 2026-03-22 22:56:08 -05:00
Sally Knight 1f8900f430 update buildver to 1.6.0560 2026-03-23 01:46:21 +03:00
MatthewBeshay e71af5ef46 fix: Missing includes 2026-03-23 08:45:24 +11: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 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 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 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 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 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
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
Sally Knight 009b17ef1b fix(gui): working pauses on iggy 2026-03-19 18:49:14 +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
Liriosha 9c0c4f5c81 fmt manually 2026-03-19 03:37:43 -04:00
Liriosha bc8b98223b clang-format 2026-03-19 03:31:12 -04:00
Liriosha ba75b39c3f Rewrite, format, fix shiggy bug 2026-03-19 03:21:19 -04:00
Liriosha 191634264f Shrink miniaudio.h and stb_vorbis.h 2026-03-18 22:31:24 -04:00
Liriosha efdc5deb88 Merge branch 'feat/unbinka' into dev 
Merge new audio features from unbinka
 2026-03-18 19:56:02 -04:00
Liriosha 898375b51e
Merge branch '4jcraft:dev' into dev 2026-03-18 23:50:06 +00:00
Liriosha 456ddff37e Add basic sound support 2026-03-18 19:47:05 -04:00
Liriosha f39aa2af90 chore : fmt 2026-03-18 12:12:44 -04:00
Liriosha 928e97e84e Add fix for skin selector 2026-03-18 00:51:56 -04:00
Liriosha 956dfd369c Change . to / 2026-03-17 22:39:46 -04:00
ViniciusCruzMoura 4f252c8615 languages: replace 'Return to Xbox Dashboard' to 'Return to Desktop' 
I just did a grep and replace, to update #277 pull request
git grep -rn "Return to Xbox Dashboard"

Signed-off-by: ViniciusCruzMoura <contato.cruz.moura@gmail.com>
 2026-03-17 07:05:50 -04:00
ViniciusCruzMoura 580b947c6e UIScene_MainMenu: Enable the Exit Game Button Behaviour 
i noticed that the exit game button on the menu screen wasn't working,
so i went ahead and enabled it and added the behavior to close the game.
i added a Close method in the 4J_Render class and made a tweak to the _xbox check.
the catch is that it uses the xbox text for the confirmation button,
so i’m not sure if it’s the best approach, but it does work fine for me

Signed-off-by: ViniciusCruzMoura <contato.cruz.moura@gmail.com>
 2026-03-17 02:08:16 -04:00
swedishsplidney 59c6cfa514 changed how the tutorial detects mouse input for the first task 2026-03-16 19:21:57 -06:00
ffqq f46e8b3941
Merge pull request #155 from 4jcraft/feat/restore-java-gui 
feat: restore unused java GUI
 2026-03-16 18:36:17 +03:00
Sally Knight 4937b92b1e fix: still skip intro scene in java gui 
so that the cursor isn't grabbed
 2026-03-16 18:34:06 +03:00
Sally Knight b947bc5c6c fix: incorrect conditionals 2026-03-16 18:16:21 +03:00
Sally Knight c1955fd208 chore: also add Java GUI conditionals against the intro autoskip 
unnecessary code that isn't used in any UI-ful case
 2026-03-16 17:55:35 +03:00
Sally Knight 4c01f7b317 refactor: combine iggy and Java GUI conditionals for trial auto-start 2026-03-16 17:41:22 +03:00
Sally Knight 97172039dd Merge branch 'dev' into feat/restore-java-gui 2026-03-16 16:04:30 +03:00
notmatthewbeshay 380471d0bf Stop Linux SAL macros from breaking C++26 CI 2026-03-16 22:26:27 +11:00
notmatthewbeshay a560826bad Fix the remaining C++26 build warnings 2026-03-16 22:17:17 +11:00
notmatthewbeshay 591dd48cf6 Upgrade the project default to C++26 2026-03-16 18:18:52 +11:00
lotaviods 6ad898877d fix: add dynamic window resize support 2026-03-16 01:11:29 -03:00
Sally Knight f03fb262bf fix: always run postInit() 
Resolves the segfault when iggy is disabled
 2026-03-16 01:37:51 +03:00
Tropical 61a3afcca3 fix: re-enable automatic LoadTrial when iggy is disabled, fmt 2026-03-15 16:32:33 -05:00
Tropical e076d76684 fix: provide fallback implementations of iggy GDraw functions 2026-03-15 16:19:27 -05:00
Tropical 731e7e05c9 fix: use Linux iggy headers in iggy_stubs 2026-03-15 16:16:46 -05:00
Tropical d1ac89c6ca fix: use iggy_stubs. if iggy is disbaled 2026-03-15 16:15:16 -05:00
Tropical 1bad0a3048 Merge branch 'dev' into feat/iggy-dev 2026-03-15 15:30:59 -05:00
notmatthewbeshay 4866a895dc Rename misleading DWORD-style count parameters 2026-03-16 05:30:42 +11:00
notmatthewbeshay 506964f2b4 Remove WinAPI byte allocation in common app 2026-03-16 04:52:17 +11:00
notmatthewbeshay 3a98ff640c Remove WinAPI primitives from common app helpers 2026-03-16 04:49:34 +11:00
notmatthewbeshay a0202d55c9 Remove WinAPI control types from DLC storage APIs 2026-03-16 04:46:00 +11:00
notmatthewbeshay 0605748543 Remove WinAPI primitive types from storage helpers 2026-03-16 04:40:39 +11:00
notmatthewbeshay 719b89c7b5 Remove WinAPI byte types from 4J.Storage 2026-03-16 04:34:28 +11:00
notmatthewbeshay 73a8cf8f8e Remove WinAPI primitive types from 4J.Profile 2026-03-16 04:27:49 +11:00
Tropical 97caf8ec9d
Merge pull request #247 from MatthewBeshay/fix/linux-dlc-install-callback 
Fix Linux DLC install callback flow on feat/iggy-dev
 2026-03-15 12:15:19 -05:00
notmatthewbeshay fc2db1b1fe Fix Linux DLC install callback flow on feat/iggy-dev 2026-03-16 04:07:34 +11:00
Tropical 649bc00fe4 feat: allow disabling iggy from meson.options 2026-03-15 00:59:21 -05:00
Tropical 7bef36fb2e Merge branch 'dev' into feat/iggy-dev 2026-03-15 00:49:59 -05:00
Tropical 7dacd17e62 refactor: use uint8_t for m_rotateTick in XUI skin preview 2026-03-15 00:44:43 -05:00
Tropical 1928c8b662 chore: fmt, remove subprojects 2026-03-14 22:46:47 -05:00
Tropical ab0ad12521 feat: use shiggy 2026-03-14 22:40:31 -05:00
Sally Knight d6f5d2e28d fix(gui): resolve transparency, lighting, and culling issues in item rendering 
tile lighting is only really fully fixed in the hotbar at the moment, still looks weird everywhere else
 2026-03-15 04:59:55 +03:00
Tropical e45d3cb587
Merge pull request #236 from MatthewBeshay/fix/linux-iggy-ui-gl-state
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 
Restore Linux fixed-function GL state after Iggy UI
 2026-03-14 15:05:12 -05:00
notmatthewbeshay be3d53f101 Trim Linux Iggy GL reset from tropicaaal and ffqq feedback 2026-03-15 06:52:46 +11:00
notmatthewbeshay 307212f4cd Restore Linux fixed-function GL state after Iggy UI 2026-03-15 05:42:14 +11:00
Tropical 89e87d874b
Merge pull request #234 from MatthewBeshay/fix/linux-iggy-customdraw-matrix 
Fix Linux Iggy custom draw matrix layout
 2026-03-14 11:44:19 -05:00
notmatthewbeshay 646fb2ef30 Fix Linux Iggy custom draw matrix layout 2026-03-15 03:36:32 +11:00
notmatthewbeshay d2a14a4957 Drop ComboBox primitive cleanup from XUI ABI surface 2026-03-15 01:48:08 +11:00
notmatthewbeshay b0a39d7a3a Clear GDraw ID buffer before Linux intro UI 2026-03-15 00:55:48 +11:00
Tropical f66b293e33 Merge branch 'dev' into feat/iggy-dev 2026-03-14 03:25:09 -05:00
notmatthewbeshay 16ae05769d Merge upstream/dev into issue/64-remove-winapi-primitives 2026-03-14 19:20:09 +11:00
Tropical 2d0450e578 fix: remove all linux-specific hacks for iggy 
breaks title sequence, some menu rendering. need to do root-cause analysis to find out why
 2026-03-14 02:47:00 -05:00
Tropical b8759847a6 move LinuxGL.h to Platform/Linux 2026-03-13 17:15:44 -05:00
Tropical e8424f2000 chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
notmatthewbeshay 60790a86af Remove WinAPI types from console utility helpers 2026-03-14 07:32:45 +11:00
notmatthewbeshay ce4cb8ea70 Remove WinAPI locals from XUI scenes 2026-03-14 07:30:04 +11:00
notmatthewbeshay b6d3c0c6ee Use integer locator sizes in XUI scenes 2026-03-14 07:27:39 +11:00
notmatthewbeshay eb524ae9b8 Remove WinAPI object pointers from XUI scenes 2026-03-14 07:25:18 +11:00
notmatthewbeshay a76d416473 Remove WinAPI booleans from XUI scene helpers 2026-03-14 07:23:16 +11:00
notmatthewbeshay 20cd01a66d Remove WinAPI timer types from XUI scene base 2026-03-14 07:19:32 +11:00
notmatthewbeshay 4cc0bd5e25 Remove WinAPI helper types from XUI controls 2026-03-14 07:17:22 +11:00
notmatthewbeshay 7b39869e38 Remove WinAPI counts from XUI menu locals 2026-03-14 07:08:46 +11:00
notmatthewbeshay e45dfbeee6 Remove WinAPI booleans from XUI scene locals 2026-03-14 07:06:48 +11:00
notmatthewbeshay ad82b86701 Remove WinAPI state types from XUI controls 2026-03-14 07:04:09 +11:00
notmatthewbeshay 99d63ce7ec Remove WinAPI small-id types from XUI player flows 2026-03-14 07:02:16 +11:00
notmatthewbeshay 1e789f55a5 Remove WinAPI index types from XUI skin select 2026-03-14 07:00:17 +11:00
notmatthewbeshay 3e25aa58e5 Remove WinAPI types from XUI teleport 2026-03-14 06:58:33 +11:00
notmatthewbeshay 3e7a72c9d3 Remove remaining primitive locals from system helpers 2026-03-14 06:54:39 +11:00
notmatthewbeshay a2ddb7c2f0 Remove WinAPI ints from network and save helpers 2026-03-14 06:52:03 +11:00