CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code refactors

Browse Source 
- 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>
This commit is contained in:
solonovamax
2022-10-27 19:52:09 -04:00
committed by TheKodeToad
parent 9062d28704
commit 107fa6b4f7
11 changed files with 227 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java Normal file
View File

@ -0,0 +1,96 @@
/* 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.launcher.impl;
import org.prismlauncher.exception.ParseException;
import org.prismlauncher.launcher.Launcher;
import org.prismlauncher.utils.Parameters;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
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;
// 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;
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 {
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 ignored) {
}
}
throw new ParseException("Invalid window size parameter value: " + windowParams);
}
}
protected Class<?> loadMain() throws ClassNotFoundException {
return classLoader.loadClass(mainClass);
}
protected void loadAndInvokeMain() throws Throwable {
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]));
}
}

105
libraries/launcher/org/prismlauncher/launcher/impl/LegacyLauncher.java Normal file
View File

@ -0,0 +1,105 @@
/* 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.launcher.impl;
import org.prismlauncher.applet.LegacyFrame;
import org.prismlauncher.utils.LegacyUtils;
import org.prismlauncher.utils.Parameters;
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;
@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.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");
}
@Override
public void launch() throws Throwable {
Class<?> main = loadMain();
Field gameDirField = LegacyUtils.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);
}
}

51
libraries/launcher/org/prismlauncher/launcher/impl/StandardLauncher.java Normal file
View File

@ -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.launcher.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();
}
}