Commit graph

969 commits

Author SHA1 Message Date
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
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Clang Format / clang-format (push) Waiting to run
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
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
Sally Knight 7c3ba79f83 feat(jui): (re-)add transitional screens
Adds a new MessageScreen class to display custom messages and restores areas where ReceivingLevelScreen was used
2026-03-19 03:37:39 +03: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
ffqq 01fabdf2a3
Merge pull request #277 from ViniciusCruzMoura/exit_btn_behaviour
UIScene_MainMenu: Enable the Exit Game Button Behaviour
2026-03-18 22:59:50 +03:00
Sally Knight 221c6ccad1 fix: re-enable death screen on java gui
was removed accidentally
2026-03-18 22:24:12 +03: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
Liriosha c55443b5be
Merge branch '4jcraft:dev' into dev 2026-03-17 04:13:35 +00:00
swedishsplidney 59c6cfa514 changed how the tutorial detects mouse input for the first task 2026-03-16 19:21:57 -06:00
Sally Knight 938999b707 fix(lighting): use gamma value from java UI options for brightness 2026-03-16 19:37:12 +03: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 2e1d4bbaca build: prevent enabling both iggy and java GUIs at the same time 2026-03-16 17:46:30 +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 ecc6f0d549 fix(achievements): restore achievement popup display
Was removed by the dev merge
2026-03-16 17:25:06 +03:00
Sally Knight 6d0d4b2ed1 fix(textures): remove ENABLE_JAVA_GUIS conditionals
Fixes entities not using the correct textures when java GUI is enabled
2026-03-16 17:24:11 +03:00
Liriosha d2a2ca09e4
Fix delete mismatches 2026-03-16 10:03:19 -04: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
Tropical 9748827f72
Merge pull request #257 from TheComputerGuy96/fix/iggy-check
Some checks are pending
Publish Documentation / build (push) Waiting to run
Publish Documentation / deploy (push) Blocked by required conditions
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Clang Format / clang-format (push) Waiting to run
Minecraft::run_middle: Don't use non-Iggy codepath on Iggy
2026-03-15 23:50:14 -05:00
Echo J. 32affed49d Minecraft::run_middle: Don't use non-Iggy codepath on Iggy 2026-03-16 04:18:16 +00: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 ec87b5c424 chore: add back emergencySave 2026-03-15 16:35:57 -05: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
Tropical 0835dcb768
Merge pull request #244 from jerryjhird/staging
Some checks failed
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
added brightness and FOV sliders to graphics settings
2026-03-15 15:30:14 -05:00
jerryjhird 0c5a300b1c added brightness and FOV sliders to grahpic settings as well as changed weird text in PauseScreen
(also adds sliding logic to sliders so you can drag them with your mouse)
2026-03-15 19:54:35 +00: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 d5d507ae1f Remove FLOAT aliases from timing paths 2026-03-16 04:37:56 +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
Sally Knight fae7ebe7fa feat(jui): new multiline container item tooltips
Backported from Java Edition 1.3.x
This replaces the old non-functional tooltips
2026-03-15 18:29:09 +03:00
Tropical 09ac8336a3 fix: only link libshiggy if enable_shiggy is true
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Clang Format / clang-format (push) Waiting to run
2026-03-15 01:02:42 -05: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 816cdcc312
Merge pull request #230 from MatthewBeshay/issue/64-remove-winapi-primitives
Issue/64 remove winapi primitives
2026-03-15 00:45:22 -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
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Clang Format / clang-format (push) Waiting to run
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
notmatthewbeshay 6a49f3a83e Fix broken renderDebug block in run_middle 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
Liriosha 07ab03d812
Added Doxygen + GitHub Pages 2026-03-13 23:00:35 -04: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
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
Sally Knight 1c5184e316 fix: add more null checks to options 2026-03-13 21:43:26 +03:00
Tropical f4d8815285
Merge pull request #209 from Acemany/fix-file-delimeter
fix File class' delimeter and homepath detection
2026-03-13 13:36:17 -05:00
Sally Knight bb668d136a fix: add level null check to advanced opengl toggle 2026-03-13 21:34:39 +03:00
Sally Knight 04b76893ca feat: re-enable boss health bar 2026-03-13 20:53:41 +03: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
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
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
Tropical 996c731d77 fix: type alias IggyUTF16 to char16_t to fix cast issues 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
Tropical 00a5fba311 fix: comment IggyGDrawMallocAnnotated
prevents a symbol redefinition linker error
2026-03-13 12:34:28 -05:00
Tropical 6a88c43d94 fix: comment out duplicated symbols for the time-being 2026-03-13 12:34:28 -05:00
JuiceyDev 6fd48242ae GDraw_glfw trans ition to GDraw_sdl :) (#188)
Co-authored-by: Tropical <42101043+tropicaaal@users.noreply.github.com>
2026-03-13 12:34:28 -05:00
Tropical b63f4171d7 chore: set RENDER_HUD to 0 for now 2026-03-13 12:34:27 -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
Tropical 44ade1f2b2
Merge pull request #149 from MatthewBeshay/issue/51-phase-1-portable-win32-cleanup
Draft: remove Win32 types from portable code
2026-03-13 11:58:09 -05:00
Sally Knight 7fe14f92bb fix: unconditionally enable GL_ALPHA_TEST in renderLevel
Fixes a similar issue to #200 but for the Nether
2026-03-13 19:09:21 +03:00
Leah Anderson 2fd1a136df
Merge pull request #210 from lotaviods/creative_java_gui
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
(java gui) Implement Creative Inventory screen and container
2026-03-13 09:23:28 -06:00
Sally Knight e4428a983a feat: backport more advanced world creation screen from 1.3.2
Main reference used was MCP 7.1
This allows players to toggle:
Gamemodes
Structure generation
Flat/normal world generation
Cheats (needs chat fully implemented to work however)
2026-03-13 16:52:34 +03:00
notmatthewbeshay 00d65b8487 Address remaining review feedback on buffer reads 2026-03-13 20:11:00 +11:00
notmatthewbeshay 883e98bde0 Address review feedback on protocol types 2026-03-13 19:47:32 +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
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
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
notmatthewbeshay e3d910c6a1 Merge remote-tracking branch 'origin/issue/51-phase-1-portable-win32-cleanup' into issue/51-phase-1-portable-win32-cleanup 2026-03-13 15:12:53 +11:00
notmatthewbeshay 85208b12b7 Keep network player limit as an int constant 2026-03-13 15:12:25 +11:00
Acemany 3cbd496186
Fix File class' delimeter and homepath detection
meow :3
deleted Minecraft::OS enum because we have #ifdef
mrrrp
changed save directory name to not mess with minecraft java
2026-03-13 06:10:44 +03:00
Tropical 807af92321
Merge pull request #169 from nikita-edel/fix-with-ubsan
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
enhancement: make LCE runnable with UBSan and fix: alot of UB
2026-03-12 21:14:17 -05:00
Sally Knight e41abdb9da fix: make sure to enable alpha test for short/tiny view distances 2026-03-13 00:36:39 +03:00
Sally Knight 8e26b471ea fix: remove unused GLFW include
was causing CI failure
2026-03-12 22:13:08 +03: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
Leah Anderson a386bcfbfd
Merge pull request #191 from 4jcraft/chore/remove-pragma-warning
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
chore: remove `#pragma warning` directives
2026-03-12 08:17:48 -06:00
Nikita Edel 6cfc1efec2
Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-12 14:40:02 +01:00
Sally Knight 5525aac9d5 fix: reorder and correct lighting for blocks in container screens 2026-03-12 16:07:16 +03:00
Sally Knight e66f279a5b Merge branch 'dev' into feat/restore-java-gui 2026-03-12 16:01:31 +03:00
Sally Knight 4b8d65d5e6 fix: use original disabled transforms to fix hotbar block lighting 2026-03-12 03:50:34 +03:00
MatthewBeshay dbdf4fdd22
Merge branch 'dev' into issue/51-phase-1-portable-win32-cleanup 2026-03-12 10:21:19 +11:00
Sally Knight 10a1095ab2 fix: add proper head movement to player inventory preview 2026-03-12 02:07:36 +03:00
Sally Knight 3031f64401 fix: restore rainfall visibility by removing top edge transparency 2026-03-12 00:53:50 +03: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
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
2026-03-11 15:21:48 -05:00
ffqq d83f10c648
fix: correct cloud day/night coloring using disabled tesselator method (#189) 2026-03-11 15:16:19 -05:00
Nikita Edel b47ee34a61
Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-11 19:25:14 +01:00
Nikita Edel ec82ee1ea1 final commit 2026-03-11 19:22:28 +01:00
Nikita Edel faa4a989ce new blob 2026-03-11 18:49:36 +01:00
Nikita Edel cc65f7ee29 FINALLY LOADS IN, crashes when clicking :( 2026-03-11 18:01:00 +01:00
Nikita Edel 69a8ce84b9 giant batch BOOOOM 2026-03-11 17:28:13 +01:00
Nikita Edel ed13020cf3 s integer overflow, unsafe cast 2026-03-11 16:10:48 +01:00
Sally Knight 798781c10a fix: use proper pixel format for the minimap
fixes pink maps
2026-03-11 17:37:27 +03: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 a9d1322a6e
Merge branch '4jcraft:dev' into issue/51-phase-1-portable-win32-cleanup 2026-03-11 19:53:03 +11:00
Echo J. e9fe7fee4d LevelRenderer: Add missing namespace for player variable
This caused compile errors on my GitHub Actions instance
2026-03-11 08:18:29 +00: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 9acefd2cc6 fix: hotbar selection indicator being chopped off at the bottom
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
2026-03-11 01:27:02 -05:00
notmatthewbeshay 5f8c9c8a25 Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup 2026-03-11 17:09:16 +11: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
Tropical 2c3a816e4b
Merge pull request #175 from realffqq/dev
fix: restore and fix entity, block and hand lighting
2026-03-10 23:59:42 -05:00
notmatthewbeshay 082dc2033d Use standard DLC mount callback types 2026-03-11 15:46:23 +11:00
notmatthewbeshay 2256d0fadd Remove legacy Win32 thread entry state 2026-03-11 15:38:53 +11:00
notmatthewbeshay e18941ced7 Use fixed-width pixel data in stitched textures 2026-03-11 15:38:53 +11:00
notmatthewbeshay e5d5fb07be Use standard sizes in texture pack locators 2026-03-11 15:38:52 +11:00
notmatthewbeshay 1bf50e2549 Use fixed-width language IDs in sign rendering 2026-03-11 15:38:52 +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 2975a43ad2 Use standard RTT types in server player 2026-03-11 15:38:52 +11:00
notmatthewbeshay e055d8d121 Use standard types in stats state 2026-03-11 15:38:52 +11:00
notmatthewbeshay 2b5574af95 Use standard types in client connection state 2026-03-11 15:38:51 +11:00
notmatthewbeshay 4460bca43f Use standard types in minecraft state 2026-03-11 15:38:51 +11:00
notmatthewbeshay a3ea98d3ad Use standard types in server implementation 2026-03-11 15:38:51 +11:00
notmatthewbeshay c0f890b323 Use fixed-width casts in skin bitmask macros 2026-03-11 15:38:51 +11:00
notmatthewbeshay 4b5ca6d496 Use standard colour table lengths in texture packs 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 e5504399ca Use fixed-width texture channel casts 2026-03-11 15:38:51 +11:00
notmatthewbeshay a1fdebbc3b Use standard skin locals in player code 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
notmatthewbeshay 6556b316dc Use standard counters in DLC manager 2026-03-11 15:38:50 +11:00
notmatthewbeshay 68661e1d44 Use standard pre-login indices in client connection 2026-03-11 15:38:50 +11:00
notmatthewbeshay ab89d415a2 Use standard message option arrays in app flows 2026-03-11 15:38:50 +11:00
notmatthewbeshay fba6dd8275 Use standard temporary counters in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay b7886c46d7 Use standard locale IDs in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay 1b6447a3ca Use standard DLC content types in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay 1ba21c1250 Use standard DLC image buffers in app structs 2026-03-11 15:38:49 +11:00
notmatthewbeshay 09b12e287c Use standard notification data in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay c1594579a2 Use standard banned list buffers in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay 7ae8c7c373 Use standard TMSPP buffers in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay 05f47282da Use standard DLC file buffers in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay 64322c07a3 Use standard tip IDs in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay c8150b1338 Use standard small IDs in player colour tracking 2026-03-11 15:38:49 +11:00
notmatthewbeshay bdb3341a99 Use standard launch data buffers in common app 2026-03-11 15:38:48 +11:00
notmatthewbeshay c0e59f652e Use standard banned list buffers in app structs 2026-03-11 15:38:48 +11:00
notmatthewbeshay 3f8374bc45 Use standard skin IDs in common app helpers 2026-03-11 15:38:48 +11:00
notmatthewbeshay 09d56dc853 Use standard skin and cape IDs in common app 2026-03-11 15:38:48 +11:00
notmatthewbeshay 1bd031eacb Use standard invite types in common app 2026-03-11 15:38:48 +11:00
notmatthewbeshay 268ae0388f Use standard booleans in client connection checks 2026-03-11 15:38:48 +11:00
notmatthewbeshay 015fce0b3a Use standard wide strings in credit text 2026-03-11 15:38:48 +11:00
notmatthewbeshay 828ab5e277 Use standard types in invite join flow 2026-03-11 15:38:48 +11:00
notmatthewbeshay c9f96cae17 Use standard callback params in network session updates 2026-03-11 15:38:48 +11:00
notmatthewbeshay 8302870fec Use standard wide string returns for tutorial messages 2026-03-11 15:38:48 +11:00
notmatthewbeshay 09896918cd Use standard wide string returns in game rules 2026-03-11 15:38:47 +11:00
notmatthewbeshay dd726f8ba1 Use standard callback params in common app 2026-03-11 15:38:47 +11:00
notmatthewbeshay d0a741544c Use standard action helper types in common app 2026-03-11 15:38:47 +11:00
notmatthewbeshay f7e6b02835 Use standard callback types in 4J input headers 2026-03-11 15:38:47 +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