Commit Graph

233 Commits

Author SHA1 Message Date
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 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 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
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 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
Trial97 29cff14fd6 removed some duplicate code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-09-15 18:25:07 +03:00
Trial97 8c9b504382 fix: datapack/resourcepack parsing
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-08-21 15:00:00 +03:00
Alexandru Ionut Tripon 078de50951 make universal resource type (#3541) 2025-07-22 13:31:05 +03:00
Trial97 9a51cd55df make universal resource type
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-07-18 16:17:22 +03:00
TheKodeToad 29d73a474f Reduce usage of [[nodiscard]] attributes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-07-07 20:56:29 +01:00
Tayou f17e443b12 chore: fix some codeql warnings (#3838) 2025-06-06 15:20:07 +02:00
Yihe Li c57ba911cf Remove unnecessary QObject::
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-05 21:41:06 +08:00
Trial97 4f5db2e49f chore: fixe some codeql warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-05 00:34:45 +03:00
TheKodeToad fadbcf2d04 Merge remote-tracking branch 'upstream/develop' into data-packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-29 09:15:11 +01:00
Trial97 c5fd5e6ac1 chore: make all the regexes static const
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-28 22:37:29 +03:00
TheKodeToad e22930fabf Fix build
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-03-26 01:08:05 +00:00
TheKodeToad 6ab4fef0c5 Merge remote-tracking branch 'upstream/develop' into data-packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-03-24 21:11:46 +00:00
TheKodeToad 9a57fddaaf Refactor ResourcePack (#2616) 2025-03-24 20:12:41 +00:00
Alexandru Ionut Tripon 1a1bc14a73 Fix crash with invalid quilt mod info (#3496) 2025-03-15 00:00:46 +02:00
Alexandru Ionut Tripon 88bdb6541e Update launcher/minecraft/mod/tasks/LocalModParseTask.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2025-03-12 00:14:53 +02:00
Trial97 0626e354a0 Fix crash with invalid quilt mod info
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-03-12 00:01:45 +02:00
Trial97 8f8c8394dc remove some QEventLoops
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-03-02 08:36:48 +02:00
Trial97 23ffc4d8b9 Refactor ResourcePack
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-12-19 10:42:42 +02:00
Kationor b40a1973bf Improve MANIFEST.MF parsing
Previously, we would only properly parse LF-encoded manifests, and even
those only if they used the recommended casing.

This commit allows the parser to recognise CR and CRLF newlines, and
also makes the name comparison case insensitive to align with the
specification. (Though not completely: we still don't support multiline
values)

Signed-off-by: Kationor <n96211028@gmail.com>
2024-11-24 19:30:59 +01:00
timoreo 736ecf266d Merge pull request #3019 from Trial97/task_parent
fixed double deletion for tasks
2024-11-15 06:19:40 +01:00
Alexandru Ionut Tripon 7d03cb114d Merge pull request #3031 from Trial97/lambda
do not capture by default all values in lambdas
2024-11-07 23:45:31 +02:00
Trial97 2b590f24ed remove task parent from constuctor
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-11-01 00:11:45 +02:00
TheKodeToad 9ae16921bc Remove BasicFolderLoadTask
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-30 21:10:43 +00:00
Trial97 0e80aae1b8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into lambda 2024-10-30 19:35:25 +02:00
Trial97 82bffabb69 do not capture by default all values in lambdas
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-30 18:16:43 +02:00
TheKodeToad 89a327d363 Merge remote-tracking branch 'upstream/develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-23 14:19:07 +01:00
Trial97 562c301326 skip QSaveFile temprary files
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-22 01:22:31 +03:00
Rachel Powers 09c9da268f fix: prevent inf recursion when mod icon load fails; cut max pixmapcache to 1/4 previous value
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2024-10-11 13:26:20 -07:00
TheKodeToad 3fae659b30 Merge remote-tracking branch 'upstream/develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-08 17:15:42 +01:00
TheKodeToad e2f3641395 Merge branch 'develop' into data-packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-22 20:00:49 +01:00
Trial97 2c0b17d107 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-07-24 11:40:23 +03:00
Alexandru Ionut Tripon 69c55d90ce Merge pull request #2558 from Trial97/update_filters
Resolve issue with multiple loaders during mod update
2024-07-19 15:46:15 +03:00
Trial97 ddf1ea014c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2024-06-28 20:39:37 +03:00
Trial97 09d258670a create mod meta information when importing curseforge pack
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-28 19:26:11 +03:00
Trial97 00b83efb9a fix build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-24 20:12:40 +03:00
Trial97 d2510b851b mark files as duplicate
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 22:45:15 +03:00
Trial97 2d51008304 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2024-06-14 21:05:11 +03:00