Merge remote-tracking branch 'upstream/develop' into skinfix

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad
2023-09-02 22:13:50 +01:00
765 changed files with 21366 additions and 19387 deletions

View File

@ -54,10 +54,6 @@
package org.prismlauncher;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import org.prismlauncher.exception.ParseException;
import org.prismlauncher.launcher.Launcher;
import org.prismlauncher.launcher.impl.StandardLauncher;
@ -65,8 +61,11 @@ import org.prismlauncher.legacy.LegacyProxy;
import org.prismlauncher.utils.Parameters;
import org.prismlauncher.utils.logging.Log;
public final class EntryPoint {
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
public final class EntryPoint {
public static void main(String[] args) {
ExitCode code = listen();
@ -162,19 +161,18 @@ public final class EntryPoint {
return PreLaunchAction.PROCEED;
}
private enum PreLaunchAction {
PROCEED, LAUNCH, ABORT
}
private enum PreLaunchAction { PROCEED, LAUNCH, ABORT }
private enum ExitCode {
NORMAL(0), ABORT(1), ERROR(2), ILLEGAL_ARGUMENT(65);
NORMAL(0),
ABORT(1),
ERROR(2),
ILLEGAL_ARGUMENT(65);
private final int numeric;
ExitCode(int numeric) {
this.numeric = numeric;
}
}
}