ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
9,305 Commits 4 Branches 5 Tags 40 MiB
0e943b4bb1
Commit Graph

1030 Commits

Author SHA1 Message Date
Evan Goode
0e943b4bb1 Add back AuthlibInjectorMetadataStep 
Apparently this was forgotten during the 9.0 merging.
 2025-03-24 13:15:00 -04:00
Evan Goode
a108c8678e Remove irrelevant FIXME comment 2025-01-13 11:51:33 -05:00
Evan Goode
a5fcdd03bf Only send selectedProfile when selecting a profile 
Some authentication servers (Blessing Skin) care when selectedProfile is
sent on POST /refresh but the clientToken is already bound to a profile.
We should only include selectedProfile in POST /refresh during the
initial "Add authlib-injector account" process when selecting a profile
from multiple availableProfiles.

For https://github.com/unmojang/FjordLauncher/issues/50
 2025-01-12 22:54:25 -05:00
Evan Goode
594fa981ea Merge remote-tracking branch 'prismlauncher/release-9.x' into develop 2025-01-11 19:05:25 -05:00
Evan Goode
8f44b6513f Add dialog to select profile if multiple availableProfiles 
Resolves https://github.com/unmojang/FjordLauncher/issues/29 and
obsoletes https://github.com/unmojang/FjordLauncher/pull/34.

This implementation follows the authlib-injector specification:
https://github.com/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83#%E8%B4%A6%E6%88%B7%E7%9A%84%E6%B7%BB%E5%8A%A0
([Google translate to English](https://github-com.translate.goog/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83?_x_tr_sl=auto&_x_tr_tl=en&_x_tr_hl=en-US))
 2024-11-25 17:42:38 -05:00
Kationor
a914747416 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>
(cherry picked from commit b40a1973bfe590fb21b486419a8d223b2c6aae7f)
 2024-11-25 10:05:19 +00:00
Trial97
4c4017d7ca remove task parent from constuctor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-15 09:35:36 +02:00
Trial97
76602391f4 Fix crash caused by invalid resource pointer 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-14 16:26:21 +02:00
Trial97
40af3cf3d2 use isPortable to determine if the MSAStep should check for url handler 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 99cfb6237030f03c148e531da78b8da8f7d4c2f1)
 2024-11-03 09:56:08 +00:00
Ben Westover
d105d76f2a Fix some typos 
Signed-off-by: Ben Westover <me@benthetechguy.net>
(cherry picked from commit f6511c601e1fd63a864f1681beef0f85adfe6f7e)
 2024-10-29 22:06:15 +00:00
Evan Goode
04703d83ee Delete remaining Mojang cruft 2024-10-28 22:07:15 -04:00
Evan Goode
5c8bdf99cd Gray out "Manage Skins" button for authlib-injector accounts 
Support for this is blocked by
https://github.com/unmojang/FjordLauncher/issues/37, which we can get to
after the 9.0 release.
 2024-10-27 13:19:38 -04:00
Evan Goode
fab399c094 Remove extra code comment 2024-10-26 19:36:26 -04:00
Evan Goode
da9c085a06 Clean up some lingering differences from upstream 2024-10-26 17:52:25 -04:00
Evan Goode
c15afbda4a Fix build? 2024-10-26 16:12:01 -04:00
Evan Goode
7f52d57454 Fix MSA login 2024-10-26 14:56:55 -04:00
Evan Goode
d40b6d8eb3 Error handling for Yggdrasil accounts 2024-10-26 13:40:09 -04:00
Evan Goode
c32aaf244d It compiles, Yggdrasil login working except error handling 2024-10-26 00:17:24 -04:00
Evan Goode
7dbaa896a6 Merge tag '9.0' into develop 
This is an intermediate/halfway commit, more refactoring is needed to
get this to build.
 2024-10-25 15:34:57 -04:00
TheKodeToad
27c6596bcb Use Launcher log level in AutoInstallJava 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit d8702e1357d36423a0d40b916d49fd937284a204)
 2024-10-25 06:42:32 +00:00
Rachel Powers
729cec5f45 fix don't hang the ui for a full version load 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit 7bd04ae928527b065174021fba98dc78d0d119a3)
 2024-10-24 10:24:53 +00:00
Trial97
51a71d0471 skip QSaveFile temprary files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 562c3013269dbb9cad411f58ded333dee1aea158)
 2024-10-22 14:41:34 +00:00
Alexandru Ionut Tripon
9a161a0335
Merge pull request #2930 from Trial97/fixes 
Fix tests segfault
 2024-10-19 22:32:51 +03:00
Trial97
2030041fcc
Fix tests segfault 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 21:42:14 +03:00
Trial97
7519c63f2e
Replace http with https on skins 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 01:11:27 +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
98adcc60a3
Use UTF-8 to decode logs on Java 18 or newer 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-09 17:15:53 +01:00
TheKodeToad
909114bf2a
Change LaunchTask to only accept MinecraftInstance 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-09 15:07:09 +01:00
Evan Goode
dffe14bdab clang-format 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-09-19 13:50:30 -04:00
timoreo
dc67807894
Merge pull request #2825 from Trial97/skin_fix 2024-09-17 08:50:19 +02:00
Alexandru Ionut Tripon
926a6bc72a
Merge pull request #2583 from Trial97/metadata2 
Generate updater metadata for mods added/updated using modpack updater/installer
 2024-09-17 08:45:09 +03:00
Alexandru Ionut Tripon
53c3d99bdd
Merge pull request #2828 from Trial97/cmake_fields 
Allow configuring more URLs through CMake
 2024-09-17 08:44:24 +03:00
Trial97
3ca67cc388
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 2024-09-16 20:08:43 +03:00
Trial97
b4ecb38ae5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cmake_fields 2024-09-16 20:06:18 +03:00
Trial97
f36cfaf878
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_fix 2024-09-16 20:05:44 +03:00
Trial97
aab82705cd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mac_java 2024-09-16 20:05:18 +03:00
seth
8faebe320e
Merge pull request #2807 from Trial97/fix_server_launch 
fix server launch
 2024-09-16 09:42:54 -04:00
Alexandru Ionut Tripon
db3c7d01fd
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-16 16:36:05 +03:00
Trial97
ca6b62c773
move some URLs in cmake 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 15:51:51 +03:00
Trial97
d38e7fa142
Add more null protection for skin management 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 12:41:33 +03:00
Trial97
0afdce8a31
Add extra step to macos java install 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-14 21:18:20 +03:00
ZhiYi
5d803ccc86 MultiProfile Login issue workaround for now 
Signed-off-by: ZhiYi <RobertBernard.c01@gmail.com>
 2024-09-14 17:48:37 +08:00
ZhiYi
2113df5d8d MultiProfile Login issue workaround for now 2024-09-14 17:44:20 +08:00
Trial97
22ebf7e961
fix download java abort being stuck 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-14 00:13:16 +03:00
Trial97
e18e9b0509
fix server launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 22:57:08 +03:00
Trial97
e34ebc1a0d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 2024-09-13 21:14:48 +03:00
Trial97
2622d3daa9
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_mc_launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-09 08:11:11 +03:00
Trial97
14fb54afd9
Fix launch when no java is loaded 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-08 09:10:29 +03:00
Rachel Powers
c2a2e95183
fix: Forge and neoforge conflict with quilt, not fabric twice 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-09-07 21:35:01 -07:00
Trial97
2a86ceb5d6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 2024-08-23 08:34:15 +03:00