CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,244 Commits 10 Branches 30 Tags 34 MiB
54305397e4
Commit Graph

284 Commits

Author SHA1 Message Date
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
TheKodeToad
779bc2c63d Fix WrongMethodTypeException. Invoke exact don't work like that 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:35:46 +00:00
TheKodeToad
cae1ba7cd8 Less needless verbosity, and return fallback 
Needlessly verbose commit message ik.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:35:46 +00:00
TheKodeToad
8ce78dcc54 Try to improve consistency 
- Makes code formatting more consistent with the C++ codebase. Probably removes some trailing whitespace. Maybe it would be best to commit an Eclipse or IntelliJ code format preferences file?
- Removes obscure suppressions. I personally think it's better to only suppress warnings that javac complains about. Suppressing a lot of non-standardised warnings (many of them turned off by default even in IntelliJ) just creates needless clutter.
- Fixes some trivial warnings instead of suppressing them. serialVersionUID is sort of stupid, but I'd rather mentally ignore it or just fix it if it's really that annoying.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:35:43 +00:00
solonovamax
afe088dba1 Fix license headers 
- Update license headers in several files to remove multimc apache reference, when unneeded
  - LauncherFactory: we've entirely rewritten this class at this point, so it's fully under GPL code
  - Launcher: this interface contains zero logic, and only a single method named `launch`, so I doubt you can actually copyright that
  - LauncherProvider: same as above
  - ParseException, ParameterNotFoundException: same as above; this class contains almost no logic (And the logic that was added is under GPL)
  - ReflectionUtils, StringUtils: add license header
  - Everything else: modify the program name in the license header from "PolyMC - Minecraft Launcher" to "Prism Launcher"

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2022-11-08 16:25:09 +00:00
solonovamax
e899e31745 More informative exceptions in entrypoint 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2022-11-08 16:25:09 +00:00
solonovamax
dabb84f62a Cleanup launcher classes 
Cleanup a bunch of the code in launcher classes
- Migrate the majority of the reflection to ReflectionUtils
- Decrease logic in AbstractLauncher
- Add logging to launcher classes at FINE level
- make mcParams in AbstractLauncher an immutable list to prevent runtime manipulation
  - StandardLauncher instead copies the list to modify it

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2022-11-08 16:25:09 +00:00
solonovamax
9b8096c699 Get rid of gross HashMap being used by LauncherFactory and instead use *fancy* enum 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2022-11-08 16:25:09 +00:00
solonovamax
ac5b74301e Cleanup splitting string into a pair 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2022-11-08 16:25:09 +00:00
TheKodeToad
609b30110b Make main static 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

Inline local variable

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:25:09 +00:00
TheKodeToad
35d200356f Create launcher.impl.legacy 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:25:09 +00:00
TheKodeToad
0cd1d7aa7e Excessive safety 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:25:09 +00:00
TheKodeToad
ade7526f5f Remove the need for LegacyUtils 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:25:09 +00:00
TheKodeToad
a7b1700d42 Better variable naming 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:25:09 +00:00
TheKodeToad
c0b8c53e69 Attempt to sort out copyright headers 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:25:09 +00:00
TheKodeToad
e86fbc697f Fix formatting 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:25:09 +00:00
solonovamax
e5622ce824 Code cleanup to net.minecraft.Launcher 
No code logic has been changed, only:
- add @Override annotatons
- change setVisible(boolean b) -> setVisible(boolean visible)
- Change block commend on class -> javadoc comment

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2022-11-08 16:25:09 +00:00
solonovamax
99d9868116 Cleanup EntryPoint code 
- Don't return an int from listen(). An enum is preferred.
- Make parseLine() static, and pass Parameters to it.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2022-11-08 16:25:09 +00:00
solonovamax
107fa6b4f7 Code refactors 
- Refactor LauncherFactory.LauncherProvider to LauncherFactory
- Refactor all launcher related components to launcher package
- some basic code cleanup
- Rename all, allSafe -> getList and first, firstSafe -> getString
- Rename Utils -> LegacyUtils

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2022-11-08 16:25:09 +00:00
solonovamax
9062d28704 Get rid of singleton, and refactor LauncherFactory to be a static class 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2022-11-08 16:25:09 +00:00
TheKodeToad
e68dcea6bc Various tweaks to the Java component of the launcher 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:24:55 +00:00
flow
9f462dcc27
fix: update tomlplusplus submodule 
This fixes an issue with Windows TOML file parsing with non-latin
characters.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-05 16:28:54 -03:00
TheLastRar
79a728d7d2 Fix: Conflicting types for hoedown functions 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:39 +00:00
TheLastRar
1d38248194 Libraries: Add ECM 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:36 +00:00
TheLastRar
6d4efc0443 Libraries: Add zlib 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-03 21:35:28 +00:00
Bensuperpc
56ae4e5b6a
Change old style cast to C++ cast 
Change old style cast to C++ cast

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
 2022-10-22 13:04:48 +02:00
Samisafool
8201d1df02
Rename 
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
 2022-10-19 15:02:43 +05:30
DioEgizio
87d35f0d16 fix: remove some unused libs 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-10-15 20:16:15 +02:00
flow
c520faed6d feat: add gulrak/filesystem submodule 
... for old macs that don't have std::filesystem in their stdlib.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-14 14:08:42 +02:00
Sefa Eyeoglu
fafc9cf9ca
Merge pull request #1033 from Scrumplex/multi-arch-support 2022-10-08 20:12:40 +02:00
Sefa Eyeoglu
62841c5b23
fix: pin tomlplusplus to latest release 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-26 13:44:28 +02:00
Trial97
600c49f7f0
Replaced tomlc99 with tomlplusplus 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2022-09-24 00:10:27 +03:00
Sefa Eyeoglu
7e280de361
refactor: drop 64-bit check 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 16:01:08 +02:00
Sefa Eyeoglu
098327f128
Merge pull request #903 from jopejoe1/demo-launch 2022-09-18 14:41:25 +02:00
flow
5765a1fdf1 fix: allow demo for older versions 
We were not propagating the '--demo' flag in the legacy launcher,
unconditionally setting the 'demo' parameter to false.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-15 18:44:18 -03:00
Sefa Eyeoglu
684b8f24f3
fix: allow starting rd- versions 
Using `Collections.emptyList()` doesn't allow us to later append stuff
into that list. Use an empty `ArrayList` instead.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-15 09:29:48 +02:00
Sefa Eyeoglu
1b559c7776
Revert "Move classpath definition into NewLaunch itself" 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-05 17:37:10 +02:00
flow
ba3ac85356
Merge pull request #1067 from Scrumplex/classpath-epicness 
Move classpath definition into NewLaunch itself
 2022-08-31 18:28:29 -03:00
Sefa Eyeoglu
afcd669d2f
Merge pull request #965 from flowln/fat_files_in_memory 
Refactor a bit EnsureMetadataTask and calculate hashes in a incremental manner
 2022-08-28 11:03:12 +02:00
DioEgizio
6b6a095b91 fix(COPYING): fix COPYING.md by adding some missing copyright notices 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-08-19 18:42:26 +02:00
Sefa Eyeoglu
01505910f4
refactor: move classpath definition into NewLaunch itself 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-08-18 18:14:01 +02:00
txtsd
78dc0cfdf3
chore(markdown): MD001 Heading levels should only increment by one level at a time 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 13:00:57 +05:30
txtsd
123d1864f4
chore(markdown): MD037 Spaces inside emphasis markers 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 13:00:57 +05:30
txtsd
96a91e988d
chore(markdown): MD010 Hard tabs 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 13:00:56 +05:30
txtsd
19ecb1701e
chore(markdown): MD031 Fenced code blocks should be surrounded by blank lines 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 13:00:56 +05:30
txtsd
8085b2728d
chore(markdown): MD032 Lists should be surrounded by blank lines 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 13:00:56 +05:30
txtsd
3275bc4e93
chore(markdown): MD009 Trailing spaces 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 12:57:30 +05:30
txtsd
8963378039
chore(markdown): MD007 Unordered list indentation 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 12:57:30 +05:30
txtsd
c7d435bb7a
chore(markdown): MD025 Multiple top-level headings in the same document 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 12:57:11 +05:30
txtsd
fba20e2cfb
chore(markdown): MD040 Fenced code blocks should have a language specified 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 12:55:11 +05:30
txtsd
358f080c76
chore(markdown): MD012 Multiple consecutive blank lines 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 12:55:11 +05:30
txtsd
8cea57ff0f
chore(markdown): MD022 Headings should be surrounded by blank lines 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 12:53:50 +05:30
DioEgizio
abd090bd48
fix: remove iconfix from libraries/README.MD 
someone forgor (💀) to remove it

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-08-01 20:21:19 +02:00
flow
24c034ff6a
change(libs): use a 4MiB buffer by default in murmur2 hashing 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-24 17:46:54 -03:00
flow
f95bcf45ad
feat(libs): add incremental version of murmurhash2 calculation 
This does two passes for a given file, which is kinda slow, but I don't
know how else to get the size excluding the filtered ones :<

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-24 17:46:53 -03:00
Sefa Eyeoglu
c666c3e251
refactor!: bump to C++17 and C17 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-20 14:22:10 +02:00
flow
32a9545360
libs: add murmur2 library 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:41 -03:00
Sefa Eyeoglu
e58158c3cd
feat: add Qt 6 support to CMake 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:14 +02:00
Sefa Eyeoglu
984692dc62
refactor: fix deprecation up to Qt 5.15 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:17:52 +02:00
Sefa Eyeoglu
e6fe701727
Merge pull request #808 from Scrumplex/fix-lgtm-warnings 2022-07-09 01:10:59 +02:00
Sefa Eyeoglu
04b865adae
Merge pull request #707 from Jan200101/PR/gamemode 
Add Performance related settings
 2022-07-06 17:11:43 +02:00
txtsd
00df092a99
chore(readme): Reword and place entry in alphabetical order 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-07-06 09:34:17 +02:00
Jan200101
cad581388f
Add Performance related settings 
Integrates support for Feral Gamemode, discrete GPU support for Mesa and the proprietary Nvidia driver and MangoHud support

Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2022-07-06 09:34:14 +02:00
flow
fb75c23f4e
Merge pull request #784 from Scrumplex/refactor-cmake 
Refactor tests
 2022-07-02 17:50:08 -03:00
flow
bf9888099c
Merge pull request #800 from Scrumplex/refactor-newlaunch-package 
Rename NewLaunch package
 2022-07-01 10:05:07 -03:00
Sefa Eyeoglu
9ec260619b
fix: fix warnings reported by LGTM.com 2022-06-17 16:34:32 +02:00
Sefa Eyeoglu
08fc3ea2e0
fix: add classpath exception to launcher library 
Signed-off-by: icelimetea <fr3shtea@outlook.com>
 2022-06-16 17:58:38 +02:00
Sefa Eyeoglu
8b9ac63657
chore: update COPYING.md 2022-06-15 10:15:35 +02:00
Sefa Eyeoglu
0ba02f0830
refactor: rename NewLaunch package 2022-06-15 10:05:35 +02:00
Sefa Eyeoglu
effe46db86
refactor: move away from UnitTest.cmake 2022-06-14 14:44:49 +02:00
icelimetea
8e43190984
Compile JavaCheck for Java 7 2022-06-12 17:46:40 +01:00
icelimetea
63b69c0b0c
Change formatting of JavaCheck 2022-06-12 16:29:39 +01:00
icelimetea
dd6d8e0002
Make Launcher class to look more like original 2022-06-05 02:43:14 +01:00
icelimetea
cd49406bfe
Fix launching process for some legacy Forge versions 2022-06-05 01:18:59 +01:00
icelimetea
3f259eb97a Refactor script parsing 2022-05-14 16:48:14 +01:00
icelimetea
fac0b027b3 Fix the license header 2022-05-14 16:46:57 +01:00
icelimetea
c3336251e0 Add the license header to EntryPoint 2022-05-13 18:10:11 +01:00
icelimetea
c054d0f329 Add the license header to LauncherFactory 2022-05-13 17:21:35 +01:00
icelimetea
067484a6a8 Fix formatting 2022-05-13 16:59:00 +01:00
icelimetea
113528e1f2 Make line count check more lenient 2022-05-05 07:20:33 +01:00
icelimetea
6bffa06063 Fix typo 2022-05-05 07:16:16 +01:00