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

178 commits

Author SHA1 Message Date
MatthewBeshay e71af5ef46 fix: Missing includes 2026-03-23 08:45:24 +11: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 23493c4681 fix various missing methods, update StringTable implementation 2026-03-22 14:52:55 -05:00
Tropical ad9a28bcb7 make LoadSaveDataThumbnailReturned public again, fix bad DLCManager merge 2026-03-22 14:15:08 -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 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 be76c9cdb3 fix UIScene_HUD, UIScene_InGameInfoMenu 2026-03-22 12:52:44 -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 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 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
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
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
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 a560826bad Fix the remaining C++26 build warnings 2026-03-16 22:17:17 +11:00
lotaviods 6ad898877d fix: add dynamic window resize support 2026-03-16 01:11:29 -03:00
Tropical 61a3afcca3 fix: re-enable automatic LoadTrial when iggy is disabled, fmt 2026-03-15 16:32:33 -05:00
Tropical 7bef36fb2e Merge branch 'dev' into feat/iggy-dev 2026-03-15 00:49:59 -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 f66b293e33 Merge branch 'dev' into feat/iggy-dev 2026-03-14 03:25:09 -05: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
notmatthewbeshay a2ddb7c2f0 Remove WinAPI ints from network and save helpers 2026-03-14 06:52:03 +11:00
notmatthewbeshay 8a66847c65 Remove UINT from common resource ID arrays 2026-03-14 06:33:33 +11:00
notmatthewbeshay 0249bfd2bf Fix Linux build warnings 2026-03-14 04:37:55 +11:00
Echo J. 3ffb6413e2 UIStructs: Explicitly initialize all members of LaunchMoreOptions struct
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 
Fixes a "Texture Pack Not Present" message when trying to create a world
 2026-03-13 12:36:29 -05:00
Tropical b5882df411 refactor: less hacky hack 2026-03-13 12:34:51 -05:00
Tropical 669e75701b fix: hack around DLC loading to get ingame 2026-03-13 12:34:51 -05:00
Tropical f4445fd709 Revert "refactor: get rid of tutorial level autoload" 
This reverts commit 3c066dcff8.
 2026-03-13 12:34:29 -05:00
Tropical e3ce583f11 refactor: get rid of tutorial level autoload 2026-03-13 12:34:28 -05:00
Tropical 253fce563f fix: accidentally declared static in the implementation 2026-03-13 12:34:28 -05:00
Tropical 3a44eab5c0 fix: UB due to assuming wchar_t is utf16 2026-03-13 12:34:28 -05:00
Tropical 49721095f6 fix: const-correctness, remove manual UTF16 conversion 2026-03-13 12:34:28 -05:00
niansa db5cb0afc0 Remove explicit casts when passing strings to Iggy 2026-03-13 12:34:28 -05:00
niansa b11da90cbb Added string conversion for Iggy everywhere where needed 2026-03-13 12:34:28 -05:00
niansa 2b88d096d6 Fixed more inconsistencies around win64 macro and iggy 2026-03-13 12:34:28 -05:00
niansa/tuxifan 5c5f533cdd Add Linux version of Iggy [Please Squash into feat branch] (#182) 
* Added Linux version of Iggy

* Expose audio functionality

* Reimplemented IggyAudioOutParamExtendedInformation more carefully

* Link to .o files directly

* Allow required SWF files to be loaded on Linux

* Some other misc ifdef WINDOWS64 fixes

* Another ifdef windows64 fix
 2026-03-13 12:34:27 -05: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
lotaviods 66fb0f1a96 feat: Implement creative inventory 2026-03-13 03:22:42 -03:00
Tropical 8f10806f70 Merge branch 'dev' into feat/restore-java-gui
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
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 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 faa4a989ce new blob 2026-03-11 18:49:36 +01:00
notmatthewbeshay 50693bfc20 Use unique thumbnail callback thunks in UI scenes 2026-03-11 18:20:13 +11:00
notmatthewbeshay f187f89dc3 Use standard thumbnail callbacks in storage 2026-03-11 16:29:02 +11:00
notmatthewbeshay d2156d417c Use standard types in profile content helpers 2026-03-11 16:23:57 +11:00
notmatthewbeshay 1265358aec Use standard dialog ID arrays in common UI 2026-03-11 15:38:52 +11:00
notmatthewbeshay d285f41969 Use standard types in keyboard request APIs 2026-03-11 15:38:47 +11:00
notmatthewbeshay b82e0af700 Use portable file reads for debug save transfer 2026-03-11 15:38:47 +11:00
notmatthewbeshay fdf2a6fa78 Remove DWORD from UI thumbnail callback headers 2026-03-11 15:38:47 +11:00
notmatthewbeshay 02d3bba5f0 Use standard buffer types in load or join save transfer 2026-03-11 15:38:46 +11:00
notmatthewbeshay bd5b092357 Remove Win32 local state from common UI helpers 2026-03-11 15:38:46 +11:00
notmatthewbeshay dc342c092d Remove Win32 wide char aliases from DLC UI flows 2026-03-11 15:38:46 +11:00
notmatthewbeshay c17c613692 Remove Win32 wide char aliases from debug UI scenes 2026-03-11 15:38:46 +11:00
notmatthewbeshay 6b149fdc38 Remove Win32 wide char aliases from world load menus 2026-03-11 15:38:46 +11:00
notmatthewbeshay 124b3becb6 Remove Win32 wide char aliases from settings menus 2026-03-11 15:38:46 +11:00
notmatthewbeshay cf1670579f Remove Win32 exit code types from fullscreen progress 2026-03-11 15:38:46 +11:00
notmatthewbeshay 4e102e1391 Remove Win32 local state types from create world menu 2026-03-11 15:38:46 +11:00
notmatthewbeshay e2bbccf7eb Remove Win32 local state types from join and load menus 2026-03-11 15:38:46 +11:00
notmatthewbeshay 7f29aa5d99 Remove Win32 local types from UI controller 2026-03-11 15:38:46 +11:00
notmatthewbeshay 015cdd3824 Remove Win32 string aliases from UI menus 2026-03-11 15:38:46 +11:00
notmatthewbeshay 986dbd60ef Remove Win32 callback types from pause menu helpers 2026-03-11 15:38:45 +11:00
notmatthewbeshay 35035cfe4d Remove Win32 wide char types from leaderboard UI 2026-03-11 15:38:45 +11:00
notmatthewbeshay 56f6bb8da6 Remove Win32 wide char aliases from skin select menu 2026-03-11 15:38:45 +11:00
notmatthewbeshay 4506a204f9 Remove Win32 preview state types from skin select menu 2026-03-11 15:38:45 +11:00
notmatthewbeshay 86c900239b Remove Win32 index types from skin select menu 2026-03-11 15:38:45 +11:00
notmatthewbeshay e20cd0acd0 Remove Win32 callback types from load or join transfers 2026-03-11 15:38:45 +11:00
notmatthewbeshay 470fc532f8 Remove Win32 count types from leaderboard UI 2026-03-11 15:38:45 +11:00
notmatthewbeshay 147ce20bc5 Remove Win32 wide string aliases from common UI 2026-03-11 15:38:45 +11:00
notmatthewbeshay 3b199b9ba2 Remove Win32 input types from abstract container menus 2026-03-11 15:38:45 +11:00
notmatthewbeshay 12bc5aa597 Remove Win32 state types from player skin preview 2026-03-11 15:38:45 +11:00
notmatthewbeshay 305d5f0812 Use standard player IDs in kick confirmation callbacks 2026-03-11 15:38:44 +11:00
notmatthewbeshay b40e716b2c Remove Win32 player ID types from in-game info menu 2026-03-11 15:38:44 +11:00
notmatthewbeshay 4306e80068 Remove Win32 player ID types from teleport menu 2026-03-11 15:38:44 +11:00
notmatthewbeshay 7f917af01c Use standard save image buffers in load or join menu 2026-03-11 15:38:44 +11:00
notmatthewbeshay a55fddf270 Use standard image buffers in UI scenes 2026-03-11 15:38:44 +11:00
notmatthewbeshay b9b2e51bc8 Remove Win32 callback types from UI helper scenes 2026-03-11 15:38:44 +11:00