Various tweaks to the Java component of the launcher
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad
@ -0,0 +1,95 @@
|
||||
/* 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 java.lang.invoke.MethodHandle;
|
||||
import java.lang.invoke.MethodHandles;
|
||||
import java.lang.invoke.MethodType;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import org.prismlauncher.Launcher;
|
||||
import org.prismlauncher.exception.ParseException;
|
||||
import org.prismlauncher.utils.Parameters;
|
||||
|
||||
public abstract class AbstractLauncher implements Launcher {
|
||||
|
||||
private static final int DEFAULT_WINDOW_WIDTH = 854;
|
||||
private static final int DEFAULT_WINDOW_HEIGHT = 480;
|
||||
|
||||
// parameters, separated from ParamBucket
|
||||
protected final List<String> mcParams;
|
||||
private final String mainClass;
|
||||
|
||||
// secondary parameters
|
||||
protected final int width;
|
||||
protected final int height;
|
||||
protected final boolean maximize;
|
||||
|
||||
protected final String serverAddress, serverPort;
|
||||
|
||||
protected final ClassLoader classLoader;
|
||||
|
||||
public AbstractLauncher(Parameters params) {
|
||||
classLoader = ClassLoader.getSystemClassLoader();
|
||||
|
||||
mcParams = params.allSafe("param", new ArrayList<String>());
|
||||
mainClass = params.firstSafe("mainClass", "net.minecraft.client.Minecraft");
|
||||
|
||||
serverAddress = params.firstSafe("serverAddress", null);
|
||||
serverPort = params.firstSafe("serverPort", null);
|
||||
|
||||
String windowParams = params.firstSafe("windowParams", null);
|
||||
|
||||
if ("max".equals(windowParams) || windowParams == null) {
|
||||
maximize = windowParams != null;
|
||||
|
||||
width = DEFAULT_WINDOW_WIDTH;
|
||||
height = DEFAULT_WINDOW_HEIGHT;
|
||||
} else {
|
||||
maximize = false;
|
||||
|
||||
int byIndex = windowParams.indexOf('x');
|
||||
|
||||
if (byIndex != -1) {
|
||||
try {
|
||||
width = Integer.parseInt(windowParams.substring(0, byIndex));
|
||||
height = Integer.parseInt(windowParams.substring(byIndex + 1));
|
||||
return;
|
||||
} catch(NumberFormatException pass) {
|
||||
}
|
||||
}
|
||||
|
||||
throw new ParseException("Invalid window size parameter value: " + windowParams);
|
||||
}
|
||||
}
|
||||
|
||||
protected Class<?> loadMain() throws ClassNotFoundException {
|
||||
return classLoader.loadClass(mainClass);
|
||||
}
|
||||
|
||||
protected void loadAndInvokeMain() throws Throwable, ClassNotFoundException {
|
||||
invokeMain(loadMain());
|
||||
}
|
||||
|
||||
protected void invokeMain(Class<?> mainClass) throws Throwable {
|
||||
MethodHandle method = MethodHandles.lookup().findStatic(mainClass, "main", MethodType.methodType(void.class, String[].class));
|
||||
|
||||
method.invokeExact(mcParams.toArray(new String[0]));
|
||||
}
|
||||
|
||||
}
|
||||
104
libraries/launcher/org/prismlauncher/impl/LegacyLauncher.java
Normal file
104
libraries/launcher/org/prismlauncher/impl/LegacyLauncher.java
Normal file
@ -0,0 +1,104 @@
|
||||
/* 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 java.applet.Applet;
|
||||
import java.io.File;
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.lang.invoke.MethodHandles;
|
||||
import java.lang.invoke.MethodType;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.prismlauncher.applet.LegacyFrame;
|
||||
import org.prismlauncher.utils.Parameters;
|
||||
import org.prismlauncher.utils.Utils;
|
||||
|
||||
@SuppressWarnings("removal")
|
||||
public final class LegacyLauncher extends AbstractLauncher {
|
||||
|
||||
private static final Logger LOGGER = Logger.getLogger("LegacyLauncher");
|
||||
|
||||
private final String user, session;
|
||||
private final String title;
|
||||
private final String appletClass;
|
||||
|
||||
private final boolean noApplet;
|
||||
private final String cwd;
|
||||
|
||||
public LegacyLauncher(Parameters params) {
|
||||
super(params);
|
||||
|
||||
user = params.first("userName");
|
||||
session = params.first("sessionId");
|
||||
title = params.firstSafe("windowTitle", "Minecraft");
|
||||
appletClass = params.firstSafe("appletClass", "net.minecraft.client.MinecraftApplet");
|
||||
|
||||
List<String> traits = params.allSafe("traits", Collections.<String>emptyList());
|
||||
noApplet = traits.contains("noapplet");
|
||||
|
||||
cwd = System.getProperty("user.dir");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void launch() throws Throwable {
|
||||
Class<?> main = loadMain();
|
||||
Field gameDirField = Utils.getMinecraftGameDirField(main);
|
||||
|
||||
if (gameDirField == null) {
|
||||
LOGGER.warning("Could not find Mineraft path field.");
|
||||
} else {
|
||||
gameDirField.setAccessible(true);
|
||||
gameDirField.set(null, new File(cwd));
|
||||
}
|
||||
|
||||
if (!noApplet) {
|
||||
LOGGER.info("Launching with applet wrapper...");
|
||||
|
||||
try {
|
||||
Class<?> appletClass = classLoader.loadClass(this.appletClass);
|
||||
|
||||
MethodHandle constructor = MethodHandles.lookup().findConstructor(appletClass, MethodType.methodType(void.class));
|
||||
Applet applet = (Applet) constructor.invoke();
|
||||
|
||||
LegacyFrame window = new LegacyFrame(title, applet);
|
||||
|
||||
window.start(
|
||||
user,
|
||||
session,
|
||||
width,
|
||||
height,
|
||||
maximize,
|
||||
serverAddress,
|
||||
serverPort,
|
||||
mcParams.contains("--demo")
|
||||
);
|
||||
|
||||
return;
|
||||
} catch (Throwable e) {
|
||||
LOGGER.log(Level.SEVERE, "Applet wrapper failed:", e);
|
||||
|
||||
LOGGER.warning("Falling back to using main class.");
|
||||
}
|
||||
}
|
||||
|
||||
invokeMain(main);
|
||||
}
|
||||
|
||||
}
|
||||
@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,51 @@
|
||||
/* 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.utils.Parameters;
|
||||
|
||||
public final class StandardLauncher extends AbstractLauncher {
|
||||
|
||||
public StandardLauncher(Parameters params) {
|
||||
super(params);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void launch() throws Throwable {
|
||||
// window size, title and state
|
||||
|
||||
// FIXME: there is no good way to maximize the minecraft window from here.
|
||||
// the following often breaks linux screen setups
|
||||
// mcparams.add("--fullscreen");
|
||||
|
||||
if (!maximize) {
|
||||
mcParams.add("--width");
|
||||
mcParams.add(Integer.toString(width));
|
||||
mcParams.add("--height");
|
||||
mcParams.add(Integer.toString(height));
|
||||
}
|
||||
|
||||
if (serverAddress != null) {
|
||||
mcParams.add("--server");
|
||||
mcParams.add(serverAddress);
|
||||
mcParams.add("--port");
|
||||
mcParams.add(serverPort);
|
||||
}
|
||||
|
||||
loadAndInvokeMain();
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user