Revert "Move classpath definition into NewLaunch itself"

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu 2022-09-05 17:21:58 +02:00
parent 2f167b1512
commit 1b559c7776
No known key found for this signature in database
GPG Key ID: C10411294912A422
3 changed files with 40 additions and 76 deletions

View File

@ -570,11 +570,6 @@ QString MinecraftInstance::createLaunchScript(AuthSessionPtr session, MinecraftS
if(!profile) if(!profile)
return QString(); return QString();
for (auto cp : getClassPath())
{
launchScript += "classPath " + cp + "\n";
}
auto mainClass = getMainClass(); auto mainClass = getMainClass();
if (!mainClass.isEmpty()) if (!mainClass.isEmpty())
{ {

View File

@ -95,8 +95,8 @@ bool fitsInLocal8bit(const QString & string)
void LauncherPartLaunch::executeTask() void LauncherPartLaunch::executeTask()
{ {
QString newLaunchJar = APPLICATION->getJarPath("NewLaunch.jar"); QString jarPath = APPLICATION->getJarPath("NewLaunch.jar");
if (newLaunchJar.isEmpty()) if (jarPath.isEmpty())
{ {
const char *reason = QT_TR_NOOP("Launcher library could not be found. Please check your installation."); const char *reason = QT_TR_NOOP("Launcher library could not be found. Please check your installation.");
emit logLine(tr(reason), MessageLevel::Fatal); emit logLine(tr(reason), MessageLevel::Fatal);
@ -119,6 +119,9 @@ void LauncherPartLaunch::executeTask()
// make detachable - this will keep the process running even if the object is destroyed // make detachable - this will keep the process running even if the object is destroyed
m_process.setDetachable(true); m_process.setDetachable(true);
auto classPath = minecraftInstance->getClassPath();
classPath.prepend(jarPath);
auto natPath = minecraftInstance->getNativePath(); auto natPath = minecraftInstance->getNativePath();
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
if (!fitsInLocal8bit(natPath)) if (!fitsInLocal8bit(natPath))
@ -134,7 +137,23 @@ void LauncherPartLaunch::executeTask()
#endif #endif
args << "-cp"; args << "-cp";
args << newLaunchJar; #ifdef Q_OS_WIN
QStringList processed;
for(auto & item: classPath)
{
if (!fitsInLocal8bit(item))
{
processed << shortPathName(item);
}
else
{
processed << item;
}
}
args << processed.join(';');
#else
args << classPath.join(':');
#endif
args << "org.polymc.EntryPoint"; args << "org.polymc.EntryPoint";
qDebug() << args.join(' '); qDebug() << args.join(' ');

View File

@ -1,41 +1,4 @@
// SPDX-License-Identifier: GPL-3.0-only /* Copyright 2012-2021 MultiMC Contributors
/*
* PolyMC - Minecraft Launcher
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -61,9 +24,6 @@ import java.applet.Applet;
import java.io.File; import java.io.File;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.file.Paths;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
@ -77,7 +37,6 @@ public final class OneSixLauncher implements Launcher {
private static final Logger LOGGER = Logger.getLogger("OneSixLauncher"); private static final Logger LOGGER = Logger.getLogger("OneSixLauncher");
// parameters, separated from ParamBucket // parameters, separated from ParamBucket
private final List<String> classPath;
private final List<String> mcParams; private final List<String> mcParams;
private final List<String> traits; private final List<String> traits;
private final String appletClass; private final String appletClass;
@ -94,8 +53,11 @@ public final class OneSixLauncher implements Launcher {
private final String serverAddress; private final String serverAddress;
private final String serverPort; private final String serverPort;
private final ClassLoader classLoader;
public OneSixLauncher(Parameters params) { public OneSixLauncher(Parameters params) {
classPath = params.allSafe("classPath", Collections.<String>emptyList()); classLoader = ClassLoader.getSystemClassLoader();
mcParams = params.allSafe("param", Collections.<String>emptyList()); mcParams = params.allSafe("param", Collections.<String>emptyList());
mainClass = params.firstSafe("mainClass", "net.minecraft.client.Minecraft"); mainClass = params.firstSafe("mainClass", "net.minecraft.client.Minecraft");
appletClass = params.firstSafe("appletClass", "net.minecraft.client.MinecraftApplet"); appletClass = params.firstSafe("appletClass", "net.minecraft.client.MinecraftApplet");
@ -142,7 +104,7 @@ public final class OneSixLauncher implements Launcher {
method.invoke(null, (Object) mcParams.toArray(new String[0])); method.invoke(null, (Object) mcParams.toArray(new String[0]));
} }
private void legacyLaunch(ClassLoader classLoader) throws Exception { private void legacyLaunch() throws Exception {
// Get the Minecraft Class and set the base folder // Get the Minecraft Class and set the base folder
Class<?> minecraftClass = classLoader.loadClass(mainClass); Class<?> minecraftClass = classLoader.loadClass(mainClass);
@ -189,7 +151,7 @@ public final class OneSixLauncher implements Launcher {
invokeMain(minecraftClass); invokeMain(minecraftClass);
} }
private void launchWithMainClass(ClassLoader classLoader) throws Exception { private void launchWithMainClass() throws Exception {
// window size, title and state, onesix // window size, title and state, onesix
// FIXME: there is no good way to maximize the minecraft window in onesix. // FIXME: there is no good way to maximize the minecraft window in onesix.
@ -215,24 +177,12 @@ public final class OneSixLauncher implements Launcher {
@Override @Override
public void launch() throws Exception { public void launch() throws Exception {
URL[] classPathURLs = new URL[classPath.size()];
for (int i = 0; i < classPath.size(); i++) {
File f = new File(classPath.get(i));
classPathURLs[i] = f.toURI().toURL();
}
// Some mod loaders (Fabric) read this property to determine the classpath.
String systemClassPath = System.getProperty("java.class.path");
systemClassPath += File.pathSeparator + String.join(File.pathSeparator, classPath);
System.setProperty("java.class.path", systemClassPath);
ClassLoader classLoader = new URLClassLoader(classPathURLs, getClass().getClassLoader());
if (traits.contains("legacyLaunch") || traits.contains("alphaLaunch")) { if (traits.contains("legacyLaunch") || traits.contains("alphaLaunch")) {
// legacy launch uses the applet wrapper // legacy launch uses the applet wrapper
legacyLaunch(classLoader); legacyLaunch();
} else { } else {
// normal launch just calls main() // normal launch just calls main()
launchWithMainClass(classLoader); launchWithMainClass();
} }
} }