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

137 Commits

Author SHA1 Message Date
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
Samisafool
8201d1df02
Rename 
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
 2022-10-19 15:02:43 +05:30
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
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
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
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
icelimetea
dcc41ef885 Improve mpticket file parsing code 2022-05-05 07:14:32 +01:00
icelimetea
9a87ae575e More minor fixes 2022-05-03 03:19:26 +01:00
icelimetea
860a7af679 Fix method access modifier 2022-05-03 00:53:22 +01:00
icelimetea
4fdb21b414 Compile with Java 7 in mind 2022-05-03 00:27:14 +01:00
icelimetea
eeb5297284 Use only Java 7 features (in order to deal with #515) 2022-05-03 00:25:26 +01:00
icelimetea
8de63b60b1 Refactor some parts of NewLaunch (part 2) 2022-05-02 22:36:55 +01:00
icelimetea
884f772362 Clarify exception messages 2022-04-25 11:22:56 +01:00
icelimetea
b0a469baab Use java.util.logging instead of custom logging 2022-04-24 15:10:35 +01:00
icelimetea
c968c1be78 Refactor some parts of NewLaunch 2022-04-24 14:45:01 +01:00
Philipp David
c7c83a35fa
Enable LTO/IPO on release builds 2022-03-22 21:04:35 +01:00
Lenny McLennington
18a931eaa9
Merge remote-tracking branch 'upstream/develop' into develop 2021-12-20 03:01:41 +00:00
Petr Mrázek
6d3eace2a8 NOISSUE fix up java dependency to 1.7 so builds work again 
'7' is not a thing
 2021-12-19 19:11:08 +01:00
swirl
7912e0f32b
Apply patches 
Re-add lin-system, and fix Linux datadir

fix jar paths

allow for modern java
 2021-12-18 14:29:33 +00:00
Dāvis Mosāns
c29b616497 Update Java version to 7+ 
Otherwise currently it doesn't build with newer Java
 2021-12-10 03:15:01 +02:00
Petr Mrázek
5b3dffce62 NOISSUE continue debranding... 2021-10-21 00:47:53 +02:00
Janrupf
0ccd7223fd NOISSUE Make LauncherPart aware of server to join 2021-05-22 16:33:16 +02:00
AppleTheGolden
0de064eb35
NOISSUE Update Copyright Year 2021-01-18 08:28:54 +01:00
Moresteck
49126fa8e2
NOISSUE Corrected the fix for Classic saving, fixes Indev compatibility 2020-11-12 14:58:12 +00:00
Moresteck
1f9378af9f NOISSUE Fixed online saving in early Classic versions 2020-04-19 20:31:04 +01:00
AppleTheGolden
437dec91f9
Update Copyright Year 2019-01-16 21:14:24 +01:00
Petr Mrázek
59e2f52db7 GH-2238 fix issues with whitespace/newlines in folder and instance names 2018-11-01 00:18:49 +01:00
Petr Mrázek
bbb3b3e6f6 NOISSUE tabs -> spaces 2018-07-15 14:51:05 +02:00
Petr Mrázek
f259e9f727 NOISSUE update copyright dates 2018-02-11 00:40:01 +01:00
Petr Mrázek
166e5a03d6 NOISSUE rearrange build system 
* Added install commands to the libraries instead of force installing files
* Most of the application cmake stuff moved to top level
* RPATH should now be set/cleared correctly
* Contains a fix for GH-1780
 2018-01-27 02:00:20 +01:00
MinecraftZuriki
3470158943 Support for classic multiplayer via mpticket 2017-11-18 01:27:57 +11:00
Petr Mrázek
e6d734d9ac NOISSUE fix build some more 2017-10-29 12:28:26 +01:00
Petr Mrázek
1489720b90 NOISSUE fix build 2017-10-29 12:27:12 +01:00
Petr Mrázek
b76bdf9368 GH-2026 avoid using awt Dimension class to fix input issues on macOS 2017-10-29 12:24:49 +01:00
Petr Mrázek
7add9de1cf GH-2026 remove some macOS stuff from launcher part to fix input issues on 1.13 2017-10-29 10:02:01 +01:00
Petr Mrázek
464bc0f770 GH-1997 replace use of weird hacks with normal java arguments 
This affects classpath and java.library.path.

The catch is that if the strings cannot be expressed in system codepage
on Windows, it tries to use 8.3 paths.
 2017-09-27 04:04:19 +02:00
Petr Mrázek
c707042dd7 NOISSUE set haspaid parameter to true when launching old versions 2017-09-20 23:57:20 +02:00
Petr Mrázek
c19f6d4dcd NOISSUE allow running legacy without the applet wrapper 
Add 'noapplet' as a trait to do that.
 2017-07-14 08:43:35 +02:00
Petr Mrázek
f530aae9d3 NOISSUE update all the Copyright comments and texts to include 2017 2017-01-08 04:58:05 +01:00
Petr Mrázek
cee53f7f3c Revert "NOISSUE nuke builtin Minecraft versions" 
This reverts commit 5ae3b2c114.

We need those builtin versions for now.
 2016-10-26 18:23:39 +02:00
Petr Mrázek
1f2bed2ef1 NOISSUE implement direct java launch 
Just running the Java process and giving it params on the command line
 2016-08-01 21:15:08 +02:00
Petr Mrázek
b6d455a02b NOISSUE reorganize and document libraries 2016-05-01 00:00:14 +02:00