aboutsummaryrefslogtreecommitdiff
path: root/libraries/launcher/org
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/launcher/org')
-rw-r--r--libraries/launcher/org/prismlauncher/EntryPoint.java160
-rw-r--r--libraries/launcher/org/prismlauncher/Launcher.java23
-rw-r--r--libraries/launcher/org/prismlauncher/applet/LegacyFrame.java163
-rw-r--r--libraries/launcher/org/prismlauncher/exception/ParameterNotFoundException.java45
-rw-r--r--libraries/launcher/org/prismlauncher/exception/ParseException.java47
-rw-r--r--libraries/launcher/org/prismlauncher/impl/OneSixLauncher.java190
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/Launcher.java44
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java110
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/impl/StandardLauncher.java91
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/impl/legacy/LegacyFrame.java190
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/impl/legacy/LegacyLauncher.java126
-rw-r--r--libraries/launcher/org/prismlauncher/utils/Parameters.java84
-rw-r--r--libraries/launcher/org/prismlauncher/utils/ReflectionUtils.java154
-rw-r--r--libraries/launcher/org/prismlauncher/utils/Utils.java49
-rw-r--r--libraries/launcher/org/prismlauncher/utils/logging/Level.java (renamed from libraries/launcher/org/prismlauncher/LauncherFactory.java)57
-rw-r--r--libraries/launcher/org/prismlauncher/utils/logging/Log.java104
16 files changed, 1054 insertions, 583 deletions
diff --git a/libraries/launcher/org/prismlauncher/EntryPoint.java b/libraries/launcher/org/prismlauncher/EntryPoint.java
index 9144e1f1..78804b3e 100644
--- a/libraries/launcher/org/prismlauncher/EntryPoint.java
+++ b/libraries/launcher/org/prismlauncher/EntryPoint.java
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
- * PolyMC - Minecraft Launcher
- * Copyright (C) 2022 icelimetea, <fr3shtea@outlook.com>
+ * Prism Launcher - Minecraft Launcher
+ * Copyright (C) 2022 icelimetea <fr3shtea@outlook.com>
+ * Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ * Copyright (C) 2022 solonovamax <solonovamax@12oclockpoint.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -52,113 +54,125 @@
package org.prismlauncher;
-import org.prismlauncher.exception.ParseException;
-import org.prismlauncher.utils.Parameters;
-
import java.io.BufferedReader;
-import java.io.IOException;
import java.io.InputStreamReader;
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");
+import org.prismlauncher.exception.ParseException;
+import org.prismlauncher.launcher.Launcher;
+import org.prismlauncher.launcher.impl.StandardLauncher;
+import org.prismlauncher.launcher.impl.legacy.LegacyLauncher;
+import org.prismlauncher.utils.Parameters;
+import org.prismlauncher.utils.logging.Log;
- private final Parameters params = new Parameters();
+public final class EntryPoint {
public static void main(String[] args) {
- EntryPoint listener = new EntryPoint();
-
- int retCode = listener.listen();
+ ExitCode code = listen();
- if (retCode != 0) {
- LOGGER.info("Exiting with " + retCode);
+ if (code != ExitCode.NORMAL) {
+ Log.fatal("Exiting with " + code);
- System.exit(retCode);
+ System.exit(code.numeric);
}
}
- private Action parseLine(String inData) throws ParseException {
- String[] tokens = inData.split("\\s+", 2);
+ private static ExitCode listen() {
+ Parameters params = new Parameters();
+ PreLaunchAction action = PreLaunchAction.PROCEED;
- if (tokens.length == 0)
- throw new ParseException("Unexpected empty string!");
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8))) {
+ String line;
- switch (tokens[0]) {
- case "launch": {
- return Action.Launch;
+ while (action == PreLaunchAction.PROCEED) {
+ if ((line = reader.readLine()) != null)
+ action = parseLine(line, params);
+ else
+ action = PreLaunchAction.ABORT;
}
+ } catch (IllegalArgumentException e) {
+ Log.fatal("Aborting due to wrong argument", e);
- case "abort": {
- return Action.Abort;
- }
+ return ExitCode.ILLEGAL_ARGUMENT;
+ } catch (Throwable e) {
+ Log.fatal("Aborting due to exception", e);
- default: {
- if (tokens.length != 2)
- throw new ParseException("Error while parsing:" + inData);
+ return ExitCode.ABORT;
+ }
- params.add(tokens[0], tokens[1]);
+ if (action == PreLaunchAction.ABORT) {
+ Log.fatal("Launch aborted by the launcher");
- return Action.Proceed;
- }
+ return ExitCode.ABORT;
}
- }
- public int listen() {
- Action action = Action.Proceed;
+ try {
+ Launcher launcher;
+ String type = params.getString("launcher");
- try (BufferedReader reader = new BufferedReader(new InputStreamReader(
- System.in,
- StandardCharsets.UTF_8
- ))) {
- String line;
+ switch (type) {
+ case "standard":
+ launcher = new StandardLauncher(params);
+ break;
- while (action == Action.Proceed) {
- if ((line = reader.readLine()) != null) {
- action = parseLine(line);
- } else {
- action = Action.Abort;
- }
+ case "legacy":
+ launcher = new LegacyLauncher(params);
+ break;
+
+ default:
+ throw new IllegalArgumentException("Invalid launcher type: " + type);
}
- } catch (IOException | ParseException e) {
- LOGGER.log(Level.SEVERE, "Launcher ABORT due to exception:", e);
- return 1;
- }
+ launcher.launch();
+
+ return ExitCode.NORMAL;
+ } catch (IllegalArgumentException e) {
+ Log.fatal("Illegal argument", e);
- // Main loop
- if (action == Action.Abort) {
- LOGGER.info("Launch aborted by the launcher.");
+ return ExitCode.ILLEGAL_ARGUMENT;
+ } catch (Throwable e) {
+ Log.fatal("Exception caught from launcher", e);
- return 1;
+ return ExitCode.ERROR;
}
+ }
- try {
- Launcher launcher =
- LauncherFactory
- .getInstance()
- .createLauncher(params);
+ private static PreLaunchAction parseLine(String input, Parameters params) throws ParseException {
+ switch (input) {
+ case "":
+ break;
- launcher.launch();
+ case "launch":
+ return PreLaunchAction.LAUNCH;
- return 0;
- } catch (IllegalArgumentException e) {
- LOGGER.log(Level.SEVERE, "Wrong argument.", e);
+ case "abort":
+ return PreLaunchAction.ABORT;
- return 1;
- } catch (Exception e) {
- LOGGER.log(Level.SEVERE, "Exception caught from launcher.", e);
+ default:
+ String[] pair = input.split(" ", 2);
- return 1;
+ if (pair.length != 2)
+ throw new ParseException(input, "[key] [value]");
+
+ params.add(pair[0], pair[1]);
}
+
+ return PreLaunchAction.PROCEED;
+ }
+
+ private enum PreLaunchAction {
+ PROCEED, LAUNCH, ABORT
}
- private enum Action {
- Proceed,
- Launch,
- Abort
+ private enum ExitCode {
+ NORMAL(0), ABORT(1), ERROR(2), ILLEGAL_ARGUMENT(65);
+
+ private final int numeric;
+
+ ExitCode(int numeric) {
+ this.numeric = numeric;
+ }
+
}
}
diff --git a/libraries/launcher/org/prismlauncher/Launcher.java b/libraries/launcher/org/prismlauncher/Launcher.java
deleted file mode 100644
index 7f25717b..00000000
--- a/libraries/launcher/org/prismlauncher/Launcher.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2012-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.prismlauncher;
-
-public interface Launcher {
-
- void launch() throws Exception;
-
-}
diff --git a/libraries/launcher/org/prismlauncher/applet/LegacyFrame.java b/libraries/launcher/org/prismlauncher/applet/LegacyFrame.java
deleted file mode 100644
index 4413efa8..00000000
--- a/libraries/launcher/org/prismlauncher/applet/LegacyFrame.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2012-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.prismlauncher.applet;
-
-import net.minecraft.Launcher;
-
-import javax.imageio.ImageIO;
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public final class LegacyFrame extends Frame {
-
- private static final Logger LOGGER = Logger.getLogger("LegacyFrame");
-
- private final Launcher appletWrap;
-
- public LegacyFrame(String title, Applet mcApplet) {
- super(title);
-
- appletWrap = new Launcher(mcApplet);
-
- mcApplet.setStub(appletWrap);
-
- try {
- setIconImage(ImageIO.read(new File("icon.png")));
- } catch (IOException e) {
- LOGGER.log(Level.WARNING, "Unable to read Minecraft icon!", e);
- }
-
- addWindowListener(new ForceExitHandler());
- }
-
- public void start (
- String user,
- String session,
- int winSizeW,
- int winSizeH,
- boolean maximize,
- String serverAddress,
- String serverPort,
- boolean isDemo
- ) {
- // Implements support for launching in to multiplayer on classic servers using a mpticket
- // file generated by an external program and stored in the instance's root folder.
-
- Path mpticketFile =
- Paths.get(System.getProperty("user.dir"), "..", "mpticket");
-
- Path mpticketFileCorrupt =
- Paths.get(System.getProperty("user.dir"), "..", "mpticket.corrupt");
-
- if (Files.exists(mpticketFile)) {
- try {
- List<String> lines = Files.readAllLines(mpticketFile, StandardCharsets.UTF_8);
-
- if (lines.size() < 3) {
- Files.move(
- mpticketFile,
- mpticketFileCorrupt,
- StandardCopyOption.REPLACE_EXISTING
- );
-
- LOGGER.warning("Mpticket file is corrupted!");
- } else {
- // Assumes parameters are valid and in the correct order
- appletWrap.setParameter("server", lines.get(0));
- appletWrap.setParameter("port", lines.get(1));
- appletWrap.setParameter("mppass", lines.get(2));
- }
- } catch (IOException e) {
- LOGGER.log(Level.WARNING, "Unable to read mpticket file!", e);
- }
- }
-
- if (serverAddress != null) {
- appletWrap.setParameter("server", serverAddress);
- appletWrap.setParameter("port", serverPort);
- }
-
- appletWrap.setParameter("username", user);
- appletWrap.setParameter("sessionid", session);
- appletWrap.setParameter("stand-alone", "true"); // Show the quit button.
- appletWrap.setParameter("haspaid", "true"); // Some old versions need this for world saves to work.
- appletWrap.setParameter("demo", isDemo ? "true" : "false");
- appletWrap.setParameter("fullscreen", "false");
-
- add(appletWrap);
-
- appletWrap.setPreferredSize(new Dimension(winSizeW, winSizeH));
-
- pack();
-
- setLocationRelativeTo(null);
- setResizable(true);
-
- if (maximize)
- this.setExtendedState(MAXIMIZED_BOTH);
-
- validate();
-
- appletWrap.init();
- appletWrap.start();
-
- setVisible(true);
- }
-
- private final class ForceExitHandler extends WindowAdapter {
-
- @Override
- public void windowClosing(WindowEvent e) {
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- Thread.sleep(30000L);
- } catch (InterruptedException localInterruptedException) {
- localInterruptedException.printStackTrace();
- }
-
- LOGGER.info("Forcing exit!");
-
- System.exit(0);
- }
- }).start();
-
- if (appletWrap != null) {
- appletWrap.stop();
- appletWrap.destroy();
- }
-
- // old minecraft versions can hang without this >_<
- System.exit(0);
- }
-
- }
-
-}
diff --git a/libraries/launcher/org/prismlauncher/exception/ParameterNotFoundException.java b/libraries/launcher/org/prismlauncher/exception/ParameterNotFoundException.java
index 641e0c99..524076ff 100644
--- a/libraries/launcher/org/prismlauncher/exception/ParameterNotFoundException.java
+++ b/libraries/launcher/org/prismlauncher/exception/ParameterNotFoundException.java
@@ -1,25 +1,48 @@
+// SPDX-License-Identifier: GPL-3.0-only
/*
- * Copyright 2012-2021 MultiMC Contributors
+ * Prism Launcher - Minecraft Launcher
+ * Copyright (C) 2022 icelimetea <fr3shtea@outlook.com>
+ * Copyright (C) 2022 solonovamax <solonovamax@12oclockpoint.com>
+ * Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Linking this library statically or dynamically with other modules is
+ * making a combined work based on this library. Thus, the terms and
+ * conditions of the GNU General Public License cover the whole
+ * combination.
+ *
+ * As a special exception, the copyright holders of this library give
+ * you permission to link this library with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also meet,
+ * for each linked independent module, the terms and conditions of the
+ * license of that module. An independent module is a module which is
+ * not derived from or based on this library. If you modify this
+ * library, you may extend this exception to your version of the
+ * library, but you are not obliged to do so. If you do not wish to do
+ * so, delete this exception statement from your version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.prismlauncher.exception;
public final class ParameterNotFoundException extends IllegalArgumentException {
+ private static final long serialVersionUID = 1L;
+
public ParameterNotFoundException(String key) {
- super("Unknown parameter name: " + key);
+ super(String.format("Required parameter '%s' was not found", key));
}
}
diff --git a/libraries/launcher/org/prismlauncher/exception/ParseException.java b/libraries/launcher/org/prismlauncher/exception/ParseException.java
index 51d25a62..4608fdd1 100644
--- a/libraries/launcher/org/prismlauncher/exception/ParseException.java
+++ b/libraries/launcher/org/prismlauncher/exception/ParseException.java
@@ -1,25 +1,48 @@
+// SPDX-License-Identifier: GPL-3.0-only
/*
- * Copyright 2012-2021 MultiMC Contributors
+ * Prism Launcher - Minecraft Launcher
+ * Copyright (C) 2022 icelimetea <fr3shtea@outlook.com>
+ * Copyright (C) 2022 solonovamax <solonovamax@12oclockpoint.com>
+ * Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Linking this library statically or dynamically with other modules is
+ * making a combined work based on this library. Thus, the terms and
+ * conditions of the GNU General Public License cover the whole
+ * combination.
+ *
+ * As a special exception, the copyright holders of this library give
+ * you permission to link this library with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also meet,
+ * for each linked independent module, the terms and conditions of the
+ * license of that module. An independent module is a module which is
+ * not derived from or based on this library. If you modify this
+ * library, you may extend this exception to your version of the
+ * library, but you are not obliged to do so. If you do not wish to do
+ * so, delete this exception statement from your version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.prismlauncher.exception;
public final class ParseException extends IllegalArgumentException {
- public ParseException(String message) {
- super(message);
+ private static final long serialVersionUID = 1L;
+
+ public ParseException(String input, String format) {
+ super(String.format("For input '%s' - should match '%s'", input, format));
}
}
diff --git a/libraries/launcher/org/prismlauncher/impl/OneSixLauncher.java b/libraries/launcher/org/prismlauncher/impl/OneSixLauncher.java
deleted file mode 100644
index d6443826..00000000
--- a/libraries/launcher/org/prismlauncher/impl/OneSixLauncher.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/* Copyright 2012-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.prismlauncher.impl;
-
-import org.prismlauncher.Launcher;
-import org.prismlauncher.applet.LegacyFrame;
-import org.prismlauncher.utils.Parameters;
-import org.prismlauncher.utils.Utils;
-
-import java.applet.Applet;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public final class OneSixLauncher implements Launcher {
-
- private static final int DEFAULT_WINDOW_WIDTH = 854;
- private static final int DEFAULT_WINDOW_HEIGHT = 480;
-
- private static final Logger LOGGER = Logger.getLogger("OneSixLauncher");
-
- // parameters, separated from ParamBucket
- private final List<String> mcParams;
- private final List<String> traits;
- private final String appletClass;
- private final String mainClass;
- private final String userName, sessionId;
- private final String windowTitle;
-
- // secondary parameters
- private final int winSizeW;
- private final int winSizeH;
- private final boolean maximize;
- private final String cwd;
-
- private final String serverAddress;
- private final String serverPort;
-
- private final ClassLoader classLoader;
-
- public OneSixLauncher(Parameters params) {
- classLoader = ClassLoader.getSystemClassLoader();
-
- mcParams = params.allSafe("param", new ArrayList<String>());
- mainClass = params.firstSafe("mainClass", "net.minecraft.client.Minecraft");
- appletClass = params.firstSafe("appletClass", "net.minecraft.client.MinecraftApplet");
- traits = params.allSafe("traits", new ArrayList<String>());
-
- userName = params.first("userName");
- sessionId = params.first("sessionId");
- windowTitle = params.firstSafe("windowTitle", "Minecraft");
-
- serverAddress = params.firstSafe("serverAddress", null);
- serverPort = params.firstSafe("serverPort", null);
-
- cwd = System.getProperty("user.dir");
-
- String windowParams = params.firstSafe("windowParams", null);
-
- if (windowParams != null) {
- String[] dimStrings = windowParams.split("x");
-
- if (windowParams.equalsIgnoreCase("max")) {
- maximize = true;
-
- winSizeW = DEFAULT_WINDOW_WIDTH;
- winSizeH = DEFAULT_WINDOW_HEIGHT;
- } else if (dimStrings.length == 2) {
- maximize = false;
-
- winSizeW = Integer.parseInt(dimStrings[0]);
- winSizeH = Integer.parseInt(dimStrings[1]);
- } else {
- throw new IllegalArgumentException("Unexpected window size parameter value: " + windowParams);
- }
- } else {
- maximize = false;
-
- winSizeW = DEFAULT_WINDOW_WIDTH;
- winSizeH = DEFAULT_WINDOW_HEIGHT;
- }
- }
-
- private void invokeMain(Class<?> mainClass) throws Exception {
- Method method = mainClass.getMethod("main", String[].class);
-
- method.invoke(null, (Object) mcParams.toArray(new String[0]));
- }
-
- private void legacyLaunch() throws Exception {
- // Get the Minecraft Class and set the base folder
- Class<?> minecraftClass = classLoader.loadClass(mainClass);
-
- Field baseDirField = Utils.getMinecraftBaseDirField(minecraftClass);
-
- if (baseDirField == null) {
- LOGGER.warning("Could not find Minecraft path field.");
- } else {
- baseDirField.setAccessible(true);
-
- baseDirField.set(null, new File(cwd));
- }
-
- System.setProperty("minecraft.applet.TargetDirectory", cwd);
-
- if (!traits.contains("noapplet")) {
- LOGGER.info("Launching with applet wrapper...");
-
- try {
- Class<?> mcAppletClass = classLoader.loadClass(appletClass);
-
- Applet mcApplet = (Applet) mcAppletClass.getConstructor().newInstance();
-
- LegacyFrame mcWindow = new LegacyFrame(windowTitle, mcApplet);
-
- mcWindow.start(
- userName,
- sessionId,
- winSizeW,
- winSizeH,
- maximize,
- serverAddress,
- serverPort,
- mcParams.contains("--demo")
- );
-
- return;
- } catch (Exception e) {
- LOGGER.log(Level.SEVERE, "Applet wrapper failed: ", e);
-
- LOGGER.warning("Falling back to using main class.");
- }
- }
-
- invokeMain(minecraftClass);
- }
-
- private void launchWithMainClass() throws Exception {
- // window size, title and state, onesix
-
- // FIXME: there is no good way to maximize the minecraft window in onesix.
- // the following often breaks linux screen setups
- // mcparams.add("--fullscreen");
-
- if (!maximize) {
- mcParams.add("--width");
- mcParams.add(Integer.toString(winSizeW));
- mcParams.add("--height");
- mcParams.add(Integer.toString(winSizeH));
- }
-
- if (serverAddress != null) {
- mcParams.add("--server");
- mcParams.add(serverAddress);
- mcParams.add("--port");
- mcParams.add(serverPort);
- }
-
- invokeMain(classLoader.loadClass(mainClass));
- }
-
- @Override
- public void launch() throws Exception {
- if (traits.contains("legacyLaunch") || traits.contains("alphaLaunch")) {
- // legacy launch uses the applet wrapper
- legacyLaunch();
- } else {
- // normal launch just calls main()
- launchWithMainClass();
- }
- }
-
-}
diff --git a/libraries/launcher/org/prismlauncher/launcher/Launcher.java b/libraries/launcher/org/prismlauncher/launcher/Launcher.java
new file mode 100644
index 00000000..049a83d8
--- /dev/null
+++ b/libraries/launcher/org/prismlauncher/launcher/Launcher.java
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ * Prism Launcher - Minecraft Launcher
+ * Copyright (C) 2022 icelimetea <fr3shtea@outlook.com>
+ * Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ * Copyright (C) 2022 solonovamax <solonovamax@12oclockpoint.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Linking this library statically or dynamically with other modules is
+ * making a combined work based on this library. Thus, the terms and
+ * conditions of the GNU General Public License cover the whole
+ * combination.
+ *
+ * As a special exception, the copyright holders of this library give
+ * you permission to link this library with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also meet,
+ * for each linked independent module, the terms and conditions of the
+ * license of that module. An independent module is a module which is
+ * not derived from or based on this library. If you modify this
+ * library, you may extend this exception to your version of the
+ * library, but you are not obliged to do so. If you do not wish to do
+ * so, delete this exception statement from your version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.prismlauncher.launcher;
+
+public interface Launcher {
+
+ void launch() throws Throwable;
+
+}
diff --git a/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java b/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java
new file mode 100644
index 00000000..0c2153a9
--- /dev/null
+++ b/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ * Prism Launcher - Minecraft Launcher
+ * Copyright (C) 2022 icelimetea <fr3shtea@outlook.com>
+ * Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ * Copyright (C) 2022 solonovamax <solonovamax@12oclockpoint.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Linking this library statically or dynamically with other modules is
+ * making a combined work based on this library. Thus, the terms and
+ * conditions of the GNU General Public License cover the whole
+ * combination.
+ *
+ * As a special exception, the copyright holders of this library give
+ * you permission to link this library with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also meet,
+ * for each linked independent module, the terms and conditions of the
+ * license of that module. An independent module is a module which is
+ * not derived from or based on this library. If you modify this
+ * library, you may extend this exception to your version of the
+ * library, but you are not obliged to do so. If you do not wish to do
+ * so, delete this exception statement from your version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ * Copyright 2013-2021 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.prismlauncher.launcher.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.prismlauncher.exception.ParseException;
+import org.prismlauncher.launcher.Launcher;
+import org.prismlauncher.utils.Parameters;
+
+public abstract class AbstractLau