aboutsummaryrefslogtreecommitdiff
path: root/libraries/launcher/org
diff options
context:
space:
mode:
authorTheKodeToad <TheKodeToad@proton.me>2022-10-29 09:47:09 +0100
committerTheKodeToad <TheKodeToad@proton.me>2022-11-08 16:25:09 +0000
commite86fbc697f819345cd42db7008509e89cfdddd73 (patch)
treeffb965b07f545480f9d9266581d17f5a114c76f1 /libraries/launcher/org
parente5622ce824cf94074ced947ed7277886b2756ba9 (diff)
downloadPrismLauncher-e86fbc697f819345cd42db7008509e89cfdddd73.tar.gz
PrismLauncher-e86fbc697f819345cd42db7008509e89cfdddd73.tar.bz2
PrismLauncher-e86fbc697f819345cd42db7008509e89cfdddd73.zip
Fix formatting
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
Diffstat (limited to 'libraries/launcher/org')
-rw-r--r--libraries/launcher/org/prismlauncher/EntryPoint.java58
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/Launcher.java3
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/LauncherFactory.java13
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/LauncherProvider.java4
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java18
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/impl/LegacyLauncher.java7
-rw-r--r--libraries/launcher/org/prismlauncher/utils/LegacyUtils.java14
7 files changed, 55 insertions, 62 deletions
diff --git a/libraries/launcher/org/prismlauncher/EntryPoint.java b/libraries/launcher/org/prismlauncher/EntryPoint.java
index b1464f59..cb68b8fd 100644
--- a/libraries/launcher/org/prismlauncher/EntryPoint.java
+++ b/libraries/launcher/org/prismlauncher/EntryPoint.java
@@ -52,7 +52,6 @@
package org.prismlauncher;
-
import org.prismlauncher.exception.ParseException;
import org.prismlauncher.launcher.Launcher;
import org.prismlauncher.launcher.LauncherFactory;
@@ -65,37 +64,37 @@ import java.nio.charset.StandardCharsets;
import java.util.logging.Level;
import java.util.logging.Logger;
-
public final class EntryPoint {
+
private static final Logger LOGGER = Logger.getLogger("EntryPoint");
-
+
private final Parameters params = new Parameters();
-
+
public static void main(String[] args) {
EntryPoint listener = new EntryPoint();
-
+
ExitCode exitCode = listener.listen();
-
+
if (exitCode != ExitCode.NORMAL) {
LOGGER.warning("Exiting with " + exitCode);
-
+
System.exit(exitCode.numericalCode);
}
}
-
+
private static PreLaunchAction parseLine(String inData, Parameters params) throws ParseException {
if (inData.isEmpty())
throw new ParseException("Unexpected empty string!");
-
+
String first = inData;
String second = null;
int splitPoint = inData.indexOf(' ');
-
+
if (splitPoint != -1) {
first = first.substring(0, splitPoint);
second = inData.substring(splitPoint + 1);
}
-
+
switch (first) {
case "launch":
return PreLaunchAction.LAUNCH;
@@ -104,22 +103,22 @@ public final class EntryPoint {
default:
if (second == null || second.isEmpty())
throw new ParseException("Error while parsing:" + inData);
-
+
params.add(first, second);
-
+
return PreLaunchAction.PROCEED;
}
}
-
+
public ExitCode listen() {
PreLaunchAction preLaunchAction = PreLaunchAction.PROCEED;
-
+
try (BufferedReader reader = new BufferedReader(new InputStreamReader(
System.in,
StandardCharsets.UTF_8
))) {
String line;
-
+
while (preLaunchAction == PreLaunchAction.PROCEED) {
if ((line = reader.readLine()) != null) {
preLaunchAction = parseLine(line, this.params);
@@ -129,50 +128,49 @@ public final class EntryPoint {
}
} catch (IOException | ParseException e) {
LOGGER.log(Level.SEVERE, "Launcher abort due to exception:", e);
-
+
return ExitCode.ERROR;
}
-
+
// Main loop
if (preLaunchAction == PreLaunchAction.ABORT) {
LOGGER.info("Launch aborted by the launcher.");
-
+
return ExitCode.ERROR;
}
-
+
try {
Launcher launcher = LauncherFactory.createLauncher(params);
-
+
launcher.launch();
-
+
return ExitCode.NORMAL;
} catch (IllegalArgumentException e) {
LOGGER.log(Level.SEVERE, "Wrong argument.", e);
-
+
return ExitCode.ERROR;
} catch (Throwable e) {
LOGGER.log(Level.SEVERE, "Exception caught from launcher.", e);
-
+
return ExitCode.ERROR;
}
}
-
+
private enum PreLaunchAction {
PROCEED,
LAUNCH,
ABORT
}
-
-
+
private enum ExitCode {
NORMAL(0),
ERROR(1);
-
+
private final int numericalCode;
-
+
ExitCode(int numericalCode) {
this.numericalCode = numericalCode;
}
}
-
+
}
diff --git a/libraries/launcher/org/prismlauncher/launcher/Launcher.java b/libraries/launcher/org/prismlauncher/launcher/Launcher.java
index 1cea255c..6f5c17b8 100644
--- a/libraries/launcher/org/prismlauncher/launcher/Launcher.java
+++ b/libraries/launcher/org/prismlauncher/launcher/Launcher.java
@@ -16,7 +16,8 @@
package org.prismlauncher.launcher;
-
public interface Launcher {
+
void launch() throws Throwable;
+
}
diff --git a/libraries/launcher/org/prismlauncher/launcher/LauncherFactory.java b/libraries/launcher/org/prismlauncher/launcher/LauncherFactory.java
index 6c601171..761a4595 100644
--- a/libraries/launcher/org/prismlauncher/launcher/LauncherFactory.java
+++ b/libraries/launcher/org/prismlauncher/launcher/LauncherFactory.java
@@ -35,7 +35,6 @@
package org.prismlauncher.launcher;
-
import org.prismlauncher.launcher.impl.LegacyLauncher;
import org.prismlauncher.launcher.impl.StandardLauncher;
import org.prismlauncher.utils.Parameters;
@@ -43,10 +42,10 @@ import org.prismlauncher.utils.Parameters;
import java.util.HashMap;
import java.util.Map;
-
public final class LauncherFactory {
+
private static final Map<String, LauncherProvider> launcherRegistry = new HashMap<>();
-
+
static {
launcherRegistry.put("standard", new LauncherProvider() {
@Override
@@ -63,15 +62,15 @@ public final class LauncherFactory {
}
private LauncherFactory() {
}
-
+
public static Launcher createLauncher(Parameters parameters) {
String name = parameters.getString("launcher");
-
+
LauncherProvider launcherProvider = launcherRegistry.get(name);
-
+
if (launcherProvider == null)
throw new IllegalArgumentException("Invalid launcher type: " + name);
-
+
return launcherProvider.provide(parameters);
}
}
diff --git a/libraries/launcher/org/prismlauncher/launcher/LauncherProvider.java b/libraries/launcher/org/prismlauncher/launcher/LauncherProvider.java
index b6d1caab..9b453c7b 100644
--- a/libraries/launcher/org/prismlauncher/launcher/LauncherProvider.java
+++ b/libraries/launcher/org/prismlauncher/launcher/LauncherProvider.java
@@ -35,10 +35,10 @@
package org.prismlauncher.launcher;
-
import org.prismlauncher.utils.Parameters;
-
public interface LauncherProvider {
+
Launcher provide(Parameters parameters);
+
}
diff --git a/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java b/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java
index 637c5da7..5aab40ff 100644
--- a/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java
+++ b/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java
@@ -15,7 +15,6 @@
package org.prismlauncher.launcher.impl;
-
import org.prismlauncher.exception.ParseException;
import org.prismlauncher.launcher.Launcher;
import org.prismlauncher.utils.Parameters;
@@ -26,9 +25,8 @@ import java.lang.invoke.MethodType;
import java.util.ArrayList;
import java.util.List;
-
public abstract class AbstractLauncher implements Launcher {
-
+
private static final int DEFAULT_WINDOW_WIDTH = 854;
private static final int DEFAULT_WINDOW_HEIGHT = 480;
@@ -44,21 +42,21 @@ public abstract class AbstractLauncher implements Launcher {
protected final String serverAddress, serverPort;
protected final ClassLoader classLoader;
-
+
protected AbstractLauncher(Parameters params) {
classLoader = ClassLoader.getSystemClassLoader();
-
+
mcParams = params.getList("param", new ArrayList<String>());
mainClass = params.getString("mainClass", "net.minecraft.client.Minecraft");
-
+
serverAddress = params.getString("serverAddress", null);
serverPort = params.getString("serverPort", null);
-
+
String windowParams = params.getString("windowParams", null);
-
+
if ("max".equals(windowParams) || windowParams == null) {
maximize = windowParams != null;
-
+
width = DEFAULT_WINDOW_WIDTH;
height = DEFAULT_WINDOW_HEIGHT;
} else {
@@ -82,7 +80,7 @@ public abstract class AbstractLauncher implements Launcher {
protected Class<?> loadMain() throws ClassNotFoundException {
return classLoader.loadClass(mainClass);
}
-
+
protected void loadAndInvokeMain() throws Throwable {
invokeMain(loadMain());
}
diff --git a/libraries/launcher/org/prismlauncher/launcher/impl/LegacyLauncher.java b/libraries/launcher/org/prismlauncher/launcher/impl/LegacyLauncher.java
index 181156c6..57e29605 100644
--- a/libraries/launcher/org/prismlauncher/launcher/impl/LegacyLauncher.java
+++ b/libraries/launcher/org/prismlauncher/launcher/impl/LegacyLauncher.java
@@ -15,7 +15,6 @@
package org.prismlauncher.launcher.impl;
-
import org.prismlauncher.applet.LegacyFrame;
import org.prismlauncher.utils.LegacyUtils;
import org.prismlauncher.utils.Parameters;
@@ -45,15 +44,15 @@ public final class LegacyLauncher extends AbstractLauncher {
public LegacyLauncher(Parameters params) {
super(params);
-
+
user = params.getString("userName");
session = params.getString("sessionId");
title = params.getString("windowTitle", "Minecraft");
appletClass = params.getString("appletClass", "net.minecraft.client.MinecraftApplet");
-
+
List<String> traits = params.getList("traits", Collections.<String>emptyList());
noApplet = traits.contains("noapplet");
-
+
cwd = System.getProperty("user.dir");
}
diff --git a/libraries/launcher/org/prismlauncher/utils/LegacyUtils.java b/libraries/launcher/org/prismlauncher/utils/LegacyUtils.java
index 7607d731..ca648012 100644
--- a/libraries/launcher/org/prismlauncher/utils/LegacyUtils.java
+++ b/libraries/launcher/org/prismlauncher/utils/LegacyUtils.java
@@ -16,17 +16,15 @@
package org.prismlauncher.utils;
-
import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
-
public final class LegacyUtils {
-
+
private LegacyUtils() {
}
-
+
/**
* Finds a field that looks like a Minecraft base folder in a supplied class
*
@@ -39,16 +37,16 @@ public final class LegacyUtils {
// Has to be File
if (field.getType() != File.class)
continue;
-
+
// And Private Static.
if (!Modifier.isStatic(field.getModifiers()) || !Modifier.isPrivate(field.getModifiers()))
continue;
-
+
return field;
}
-
+
return null;
}
-
+
}