From 1b559c777680278bfcf78eda6ee2870a852a7833 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 5 Sep 2022 17:21:58 +0200 Subject: [PATCH] Revert "Move classpath definition into NewLaunch itself" Signed-off-by: Sefa Eyeoglu --- launcher/minecraft/MinecraftInstance.cpp | 5 -- .../minecraft/launch/LauncherPartLaunch.cpp | 25 +++++- .../org/polymc/impl/OneSixLauncher.java | 86 ++++--------------- 3 files changed, 40 insertions(+), 76 deletions(-) diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index cf127525..94b4776e 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -570,11 +570,6 @@ QString MinecraftInstance::createLaunchScript(AuthSessionPtr session, MinecraftS if(!profile) return QString(); - for (auto cp : getClassPath()) - { - launchScript += "classPath " + cp + "\n"; - } - auto mainClass = getMainClass(); if (!mainClass.isEmpty()) { diff --git a/launcher/minecraft/launch/LauncherPartLaunch.cpp b/launcher/minecraft/launch/LauncherPartLaunch.cpp index 3b905bf5..63e4d90f 100644 --- a/launcher/minecraft/launch/LauncherPartLaunch.cpp +++ b/launcher/minecraft/launch/LauncherPartLaunch.cpp @@ -95,8 +95,8 @@ bool fitsInLocal8bit(const QString & string) void LauncherPartLaunch::executeTask() { - QString newLaunchJar = APPLICATION->getJarPath("NewLaunch.jar"); - if (newLaunchJar.isEmpty()) + QString jarPath = APPLICATION->getJarPath("NewLaunch.jar"); + if (jarPath.isEmpty()) { const char *reason = QT_TR_NOOP("Launcher library could not be found. Please check your installation."); 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 m_process.setDetachable(true); + auto classPath = minecraftInstance->getClassPath(); + classPath.prepend(jarPath); + auto natPath = minecraftInstance->getNativePath(); #ifdef Q_OS_WIN if (!fitsInLocal8bit(natPath)) @@ -134,7 +137,23 @@ void LauncherPartLaunch::executeTask() #endif 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"; qDebug() << args.join(' '); diff --git a/libraries/launcher/org/polymc/impl/OneSixLauncher.java b/libraries/launcher/org/polymc/impl/OneSixLauncher.java index 250fe0f2..362ff8d6 100644 --- a/libraries/launcher/org/polymc/impl/OneSixLauncher.java +++ b/libraries/launcher/org/polymc/impl/OneSixLauncher.java @@ -1,53 +1,16 @@ -// SPDX-License-Identifier: GPL-3.0-only -/* - * PolyMC - Minecraft Launcher - * Copyright (C) 2022 Sefa Eyeoglu +/* Copyright 2012-2021 MultiMC Contributors * - * 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. + * 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 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * 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 . - * - * 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. + * 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.polymc.impl; @@ -61,9 +24,6 @@ import java.applet.Applet; import java.io.File; import java.lang.reflect.Field; 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.List; import java.util.logging.Level; @@ -77,7 +37,6 @@ public final class OneSixLauncher implements Launcher { private static final Logger LOGGER = Logger.getLogger("OneSixLauncher"); // parameters, separated from ParamBucket - private final List classPath; private final List mcParams; private final List traits; private final String appletClass; @@ -94,8 +53,11 @@ public final class OneSixLauncher implements Launcher { private final String serverAddress; private final String serverPort; + private final ClassLoader classLoader; + public OneSixLauncher(Parameters params) { - classPath = params.allSafe("classPath", Collections.emptyList()); + classLoader = ClassLoader.getSystemClassLoader(); + mcParams = params.allSafe("param", Collections.emptyList()); mainClass = params.firstSafe("mainClass", "net.minecraft.client.Minecraft"); 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])); } - private void legacyLaunch(ClassLoader classLoader) throws Exception { + private void legacyLaunch() throws Exception { // Get the Minecraft Class and set the base folder Class minecraftClass = classLoader.loadClass(mainClass); @@ -189,7 +151,7 @@ public final class OneSixLauncher implements Launcher { invokeMain(minecraftClass); } - private void launchWithMainClass(ClassLoader classLoader) throws Exception { + private void launchWithMainClass() throws Exception { // window size, title and state, 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 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")) { // legacy launch uses the applet wrapper - legacyLaunch(classLoader); + legacyLaunch(); } else { // normal launch just calls main() - launchWithMainClass(classLoader); + launchWithMainClass(); } }