CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,776 Commits 10 Branches 30 Tags 34 MiB
2e1c123c05
Commit Graph

264 Commits

Author SHA1 Message Date
TheKodeToad
2e1c123c05
Merge branch 'PrismLauncher:develop' into skinfix 2023-03-10 11:17:06 +00:00
TheKodeToad
83c5264598 Stupidly small skinfixfix as requested by DioEgizio 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-10 11:04:15 +00:00
Sefa Eyeoglu
b9dfcf6d2f
chore: bump ghc-filesystem 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-05 14:21:07 +01:00
kumquat-ir
01c4ed232e license stuff 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-24 15:01:59 -05:00
TheKodeToad
bb62c62a03 Fix cmark again 🤦 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-02-19 11:37:59 +00:00
TheKodeToad
9cc3d9d4ce Merge remote-tracking branch 'upstream/develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-02-19 11:35:26 +00:00
kumquat-ir
c07fff7503 switch to qdcss for parsing 
make it not horrible to look at

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-12 17:23:15 -05:00
DioEgizio
58239ff98f fix: update cmark to fix a CVE 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-01-24 15:05:13 +01:00
Sefa Eyeoglu
22a2b7ac46 refactor: support system and bundled cmark 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-12 10:08:52 -05:00
Joshua Goins
aa7c910e26 build: remove hoedown vendored source 
Signed-off-by: Joshua Goins <josh@redstrate.com>
 2023-01-12 10:08:52 -05:00
TheKodeToad
d4b346b7ae Fix oversights 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-01-09 10:48:46 +00:00
TheKodeToad
52b3a54e4b
Fix cloaks conflicting with join server endpoint 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-01-08 15:36:36 +00:00
TheKodeToad
be7f81421a Finishing touches 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-01-06 10:46:43 +00:00
TheKodeToad
17317ea308 Move legacy support classes to another jar 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-01-06 09:23:36 +00:00
TheKodeToad
cb32711077 Slim skin fix - thanks to @craftycodie and @DelofJ 
!

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-01-06 09:21:43 +00:00
Sefa Eyeoglu
f33f596584
refactor: use ECM logging categories instead 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-27 17:34:21 +01:00
Sefa Eyeoglu
c8d8046412
refactor: add logging category for credentials 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-27 17:04:42 +01:00
TheKodeToad
5c96b1c628
Remove MIT license from JsonParser 
I don't mind, and it's my code.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-25 09:45:42 +00:00
TheKodeToad
884bd85495 Skin fix -> online fixes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-23 09:35:29 +00:00
TheKodeToad
94067f34cf Try to make some of the suggested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-23 09:34:26 +00:00
TheKodeToad
87bcefd08a Automatically add add-opens if Java version >= 9 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 15:28:24 +00:00
TheKodeToad
8a6776731a Use reflection to access DatatypeConverter 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 14:59:39 +00:00
TheKodeToad
bfa5fe1598 Better skin fix error handling 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 14:59:39 +00:00
TheKodeToad
ead59c0246 Improve the skin fix code 
- Spoof 404 instead of keeping original URL.
- Move JsonParseException to the package.
- Pass proxy as null to reduce code duplication.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 14:59:39 +00:00
TheKodeToad
cfeadf858e Add workaround to warning 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 14:59:39 +00:00
TheKodeToad
7534eaf006 Only use DatatypeConverter as a fallback 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 14:59:39 +00:00
TheKodeToad
8a81aaaa0a Add separate util class 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 14:59:39 +00:00
TheKodeToad
b544661e81 Experimental skin fix, inspired by craftycodie's 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 14:59:38 +00:00
Sefa Eyeoglu
30607c34a1
Merge pull request #291 from TheKodeToad/betterjavalauncher 2022-11-19 18:45:15 +01:00
TheKodeToad
70fa92f22c Remove dirty printStackTrace hacks 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-19 13:59:22 +00:00
TheKodeToad
669eef92eb Make requested changes and utilise AssertionError 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-19 08:54:17 +00:00
Sefa Eyeoglu
ee096edfff
chore: bump tomlplusplus 
Should fix issues with builds on aarch64

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-15 20:58:07 +01:00
Sefa Eyeoglu
392452d422
Merge pull request #397 from flowln/windows_mod_updater_fixes_maybe 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/226
 2022-11-10 14:34:15 +01:00
TheKodeToad
32c2ad2bbd A lot more cleanup 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 17:51:18 +00:00
TheKodeToad
f2ca9a6b31 Revert switch to JUL for better colours 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 17:38:23 +00:00
TheKodeToad
50d40257fe Always use this for consistency 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 17:38:23 +00:00
TheKodeToad
d90eff64d0 Add StringUtils to CMakeLists.txt 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:37:27 +00:00
TheKodeToad
e6dc34fe10 More license fixing 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:37:27 +00:00
TheKodeToad
745c331311 Remove last case of printStackTrace 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:37:27 +00:00
TheKodeToad
1ea2e85415 Implicit is generally prefered 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:37:27 +00:00
TheKodeToad
4a2df30f92 Try to use more standard exit codes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:37:27 +00:00
TheKodeToad
922220c11e More consistent logging text 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:37:27 +00:00
TheKodeToad
56d5035c63 Fix the warnings properly 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:37:27 +00:00
TheKodeToad
4abf3a20c6 More standard code formatting profile 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:37:25 +00:00
TheKodeToad
5912ef3b45 Just ignore empty lines 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:37:00 +00:00
TheKodeToad
9931c9a286 Remove arguments being passed twice 
Passing the classpath into stdin has no effect. Java is already provided the classpath with -cp, which pretty much takes up the largest part of the arguments anyway, which leads me to wonder, what's the point of stdin arguments at all?

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:37:00 +00:00
TheKodeToad
1da834f650 *opinionated change* Remove LauncherFactory 
Factories in OOP are a classic example of over-enginneering. When you only have two launchers I personally think that it's not very useful.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:37:00 +00:00
TheKodeToad
fb677a7489 So turns out we can have nice things 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:36:55 +00:00
TheKodeToad
404796d4b2 Sorry for reverting a lot but copying a list just hurts me 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:36:35 +00:00
TheKodeToad
5b9bfe8891 Attempt to mimic clang-format 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:36:33 +00:00