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

370 commits

Author SHA1 Message Date
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 b9059a7607 fix remaining orbis telemetry includes on linux 2026-03-22 13:41:38 -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 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 d54e365d1a Add suggested changes 2026-03-20 11:59:37 -04: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 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 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
Tropical 61a3afcca3 fix: re-enable automatic LoadTrial when iggy is disabled, fmt 2026-03-15 16:32:33 -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
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 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
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
notmatthewbeshay d2a14a4957 Drop ComboBox primitive cleanup from XUI ABI surface 2026-03-15 01:48:08 +11: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 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
notmatthewbeshay 9abfbb0c67 Remove WinAPI types from common telemetry helpers 2026-03-14 06:46:51 +11:00
notmatthewbeshay ff592ca6a1 Remove WinAPI types from tutorial helpers 2026-03-14 06:44:08 +11:00
notmatthewbeshay 6e2f40f581 Remove LPVOID from Sony commerce callbacks 2026-03-14 06:41:42 +11:00
notmatthewbeshay d3ce6b3334 Remove LPVOID from Sony remote storage callbacks 2026-03-14 06:38:11 +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
notmatthewbeshay 00d65b8487 Address remaining review feedback on buffer reads 2026-03-13 20:11:00 +11: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 99c763e68a typo 2026-03-12 17:34:17 +01:00
Nikita Edel ee33f0663f Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-12 17:17:38 +01:00
Nikita Edel 6d952e24f5 revising everything 2026-03-12 16:42:36 +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
Tropical 0577d994f3 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-11 15:21:48 -05:00
Nikita Edel faa4a989ce new blob 2026-03-11 18:49:36 +01:00
Nikita Edel 69a8ce84b9 giant batch BOOOOM 2026-03-11 17:28:13 +01:00
Nikita Edel a24f9f5a5e better rounding and s int overflow 2026-03-11 14:21:04 +01:00
Nikita Edel 5aef20e37e fixed rounding, mb 2026-03-11 14:13:32 +01:00
Nikita Edel 8395277c0c shift of signed int, s int overflow 2026-03-11 13:36:44 +01:00
Nikita Edel 63e4b9b18a next little patch of ub, unallocated variable, s int overflow 2026-03-11 13:36:44 +01:00
Nikita Edel 11aa08aece
Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-11 11:57:46 +01:00
MatthewBeshay 42508c8399
Merge branch '4jcraft:dev' into issue/51-phase-1-portable-win32-cleanup 2026-03-11 18:27:03 +11:00
notmatthewbeshay 50693bfc20 Use unique thumbnail callback thunks in UI scenes 2026-03-11 18:20:13 +11:00
JuiceyDev 8085703dbc
Merge pull request #176 from 4jcraft/feat/sprint-key 
feat(input): add sprint keys
 2026-03-11 08:11:21 +01:00
Tropical 0c1ae27810 Merge branch 'dev' into feat/restore-java-gui 2026-03-11 00:44:30 -05: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 1490d0b067 Use standard callback cookies in profile manager 2026-03-11 16:21:14 +11:00
notmatthewbeshay 2b638adf93 Use standard types in storage callbacks 2026-03-11 16:12:53 +11:00
notmatthewbeshay a503336887 Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup 2026-03-11 16:02:48 +11:00
notmatthewbeshay 082dc2033d Use standard DLC mount callback types 2026-03-11 15:46:23 +11:00
notmatthewbeshay 52eb80c3eb Use fixed-width tick counts in tutorial timing 2026-03-11 15:38:52 +11:00
notmatthewbeshay 1265358aec Use standard dialog ID arrays in common UI 2026-03-11 15:38:52 +11:00
notmatthewbeshay fa90fa45e7 Remove unused Win32 timestamp from tutorial messages 2026-03-11 15:38:52 +11:00
notmatthewbeshay 36b0e1efbf Use bool for system music state 2026-03-11 15:38:52 +11:00
notmatthewbeshay c0f890b323 Use fixed-width casts in skin bitmask macros 2026-03-11 15:38:51 +11:00
notmatthewbeshay 9c9fff7366 Use standard message option arrays in network flows 2026-03-11 15:38:51 +11:00
notmatthewbeshay 1ab9750fd6 Use standard byte buffers in schematic saves 2026-03-11 15:38:51 +11:00
notmatthewbeshay 025d8184d8 Use standard byte types in game rule manager 2026-03-11 15:38:51 +11:00
notmatthewbeshay bfa2fd6715 Remove UINT from game rule manager sizes 2026-03-11 15:38:51 +11:00
notmatthewbeshay 29edda1cc7 Remove UINT from game rule attribute writers 2026-03-11 15:38:50 +11:00
notmatthewbeshay 7a0d3f709e Remove DWORD from DLC audio parsing 2026-03-11 15:38:50 +11:00
notmatthewbeshay 491783c301 Use fixed-width skin IDs in DLC files 2026-03-11 15:38:50 +11:00
notmatthewbeshay a798d0f174 Use standard mount and licence types in DLC packs 2026-03-11 15:38:50 +11:00
notmatthewbeshay 86002c2f18 Use standard counts in DLC packs 2026-03-11 15:38:50 +11:00
notmatthewbeshay 3c2669b2a7 Use fixed-width pack IDs in DLC packs 2026-03-11 15:38:50 +11:00
notmatthewbeshay 80d035d137 Use portable file reads in DLC manager 2026-03-11 15:38:50 +11:00