Commit Graph

1133 Commits

Author SHA1 Message Date
Blake Batson
e0c2fbbcde Force disable xrandr if it is unavailable
lwjgl2 optionally requires the xrandr command line utility on linux, but
does not check if the executable actually exists before trying to use
it. We can force it to fall back to the xf86videomode implementation
by checking for the executable ourselves, and force disabling xrandr
with this boolean [1] if it does not exist.

Link: 2df01dd762/src/java/org/lwjgl/opengl/LinuxDisplay.java (L214) [1]
Signed-off-by: Blake Batson <bbatson101@gmail.com>
2025-12-25 14:09:50 -05:00
Alexandru Ionut Tripon
c59db39e06 match disabled mods on uninstall (#4544) 2025-12-22 23:55:25 +02:00
Alexandru Ionut Tripon
8a84f5fc1d fix legacy skin model (#4511) 2025-12-22 19:32:25 +02:00
Alexandru Ionut Tripon
c723b3abe8 Update launcher/minecraft/skins/SkinModel.cpp
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2025-12-22 18:22:32 +02:00
Trial97
4b96c5736c add copyright for modrinth code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-12-22 18:20:06 +02:00
Trial97
08c45684de match disabled mods on uninstall
fixes #4537
This ensures that when looking to uninstall a resource prism will
consider the disabled ones to.
Right now we have a guard in place to prevent resources using the same
name so this check will allways match with the correct resouce.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-12-20 23:54:31 +02:00
Trial97
f4b22dae90 fix accounts crash
fixes #4541
introduced in
3c46d8a412
The original commit introduced m_name but never used it.
When the endActivity would be called with a count of 0 this would crash
the laucnher.
How to reproduce: try to switch your skin in quick succession until you
get 429 too many requests as response to the login.
I will also presume this is not the only crash caused by this(hopefully
it is as it was not catched for four years)

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-12-20 23:23:27 +02:00
Tayou
fcf201755c fix skin preview leg rendering
Signed-off-by: Tayou <git@tayou.org>
2025-12-20 08:50:49 +01:00
Dylan Schooner
51b47050f9 Check specifically for GarbageAtEnd error
- Out parameter for garbage data\n- Rename parseUntilMalformed to parseUntilGarbage

Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
2025-12-18 15:23:48 -05:00
Dylan Schooner
9c7fe72f9c Use Json::parseUntilMalformed in McClient::parseResponse
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
2025-12-18 14:14:29 -05:00
Dylan Schooner
e1eee6e3ca Add Json::parseUntilMalformed helper
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
2025-12-18 13:33:13 -05:00
Dylan Schooner
43fce3ae46 Trim unexpected info from pack.mcmeta
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
2025-12-18 12:34:41 -05:00
Trial97
f7111b6ec1 fix legacy skin model
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-12-17 00:03:19 +02:00
Alexandru Ionut Tripon
ed63a355b0 fix partial java download (#4472) 2025-12-14 00:55:05 +02:00
Trial97
0f7320ff1d fix partial java download
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-12-12 09:34:54 +02:00
Rachel Powers
d1b6d7c402 chore: Re-simplify IndexVersionType and MessageLevel with c++20
This sets our compiler requirements to gcc 11 and clang 13. If we
forgo the use of `using enum` we can drop to gcc 10 and clang 10 but
that means using `MessageLevel::Enum::Unknown` for direct enum access

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-12-11 09:59:33 -07:00
Alexandru Ionut Tripon
bc68192895 Expand variables in JVM args and add library_dir variable (#4427) 2025-12-09 21:09:03 +02:00
TheKodeToad
826da57944 Properly rename shader config on update/version change
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-12-08 22:43:29 +00:00
TheKodeToad
de5c7bac72 Simplify IndexedVersionType::VersionType -> IndexedVersionType
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-12-07 14:34:00 +00:00
TheKodeToad
fd3ae85d45 Simplify MessageLevel::Enum -> MessageLevel
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-12-07 13:15:22 +00:00
TheKodeToad
4ae0b3d898 Replace QDir("libraries/").absolutePath() with metacache solution
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-12-05 11:56:56 +00:00
TheKodeToad
cbf2f14b3f Add library_dir var
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-12-05 11:26:58 +00:00
TheKodeToad
069dacd464 Expand variables in JVM args
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-12-05 10:47:11 +00:00
Trial97
074846d72a remove qt5compat
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-11-27 22:37:31 +02:00
Trial97
7962e223ab fix merge conflicts
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-11-26 18:41:57 +02:00
Trial97
aa265a45ee fix nix build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-11-26 18:41:56 +02:00
Trial97
27259ff52d Improve mod parsing
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-11-26 18:41:22 +02:00
Trial97
8cace06df9 move libarchive outside bundle libs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-11-26 18:41:22 +02:00
Trial97
2a99bb534f add missing copyrights
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-11-26 18:41:22 +02:00
Trial97
30ef158716 finish moving all code to libarchive
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-11-26 18:40:41 +02:00
Trial97
f38a0c8f98 move more zip parsings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-11-26 18:40:40 +02:00
Trial97
60b2585711 move some functions from MMCZip to use libarchive
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-11-26 18:39:18 +02:00
Alexandru Ionut Tripon
f93e21fa2d deduplicate includes and reformat (#4228) 2025-11-16 18:12:52 +02:00
TheKodeToad
29bb9fe9f3 Revert some things caught in the crossfire
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-11-10 19:01:24 +00:00
TheKodeToad
51a1e3bfe0 Merge remote-tracking branch 'upstream/develop' into no-ensure
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-11-10 18:56:32 +00:00
TheKodeToad
6475ce6623 Remove some redundant default values
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-11-09 22:21:46 +00:00
TheKodeToad
e42c9d2a1d Remove ensure JSON helpers
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-11-09 21:35:11 +00:00
TheKodeToad
80db7437d0 Ensure correct image format when importing skin files (#4053) 2025-11-09 21:00:56 +00:00
Edgars Cīrulis
91a02a1dc6 style: run-run clang-format on launcher/*
Signed-off-by: Edgars Cīrulis <e.cirulis@proton.me>
2025-10-14 04:05:56 +03:00
Edgars Cīrulis
577f9ca94c style: remove duplicate #include headers
Signed-off-by: Edgars Cīrulis <e.cirulis@proton.me>
2025-10-14 04:03:02 +03:00
Gingeh
abc63e4432 fix: warn before double-click toggling resource while game is running
Closes #4119

Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
2025-10-07 16:17:43 +11:00
Kat Tschan
418b84a599 Fix typo in status message for asset files
Signed-off-by: Kat Tschan <kat@kattschan.co.uk>
2025-09-20 16:39:53 -04:00
TheKodeToad
d384970694 Merge remote-tracking branch 'upstream/develop' into unused-code
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-09-19 11:06:34 +01:00
Alexandru Ionut Tripon
51a444624d Replace getThemedIcon with QIcon::fromTheme/APPLICATION->logo() (#4156) 2025-09-19 12:20:50 +03:00
TheKodeToad
49b238f384 Properly remove gameoptions
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-09-19 09:42:13 +01:00
TheKodeToad
7789ba8608 Remove unused code
GameOptions.{h,cpp}, GameOptionsPage.{h,cpp}, ThemeWizardPage.cpp

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-09-19 09:04:29 +01:00
TheKodeToad
5d46f79f19 Fix crash in Rule::apply
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-09-19 00:25:26 +01:00
TheKodeToad
cd4f119e4b Replace getThemedIcon with APPLICATION->logo()
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-09-19 00:07:05 +01:00
TheKodeToad
24726ea621 Avoid const-cast in WorldList - subclass is unnecessary and result->formats() is correct
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-09-17 10:50:54 +01:00
Trial97
29cff14fd6 removed some duplicate code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-09-15 18:25:07 +03:00