0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1067 from Scrumplex/classpath-epicness

Browse Source 
Move classpath definition into NewLaunch itself
This commit is contained in:
flow 2022-08-31 18:28:29 -03:00 committed by GitHub
commit ba3ac85356
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 76 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
launcher/minecraft/MinecraftInstance.cpp
View File

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

25
launcher/minecraft/launch/LauncherPartLaunch.cpp
View File

@ -95,8 +95,8 @@ bool fitsInLocal8bit(const QString & string)
void LauncherPartLaunch::executeTask()
{
QString jarPath = APPLICATION->getJarPath("NewLaunch.jar");
if (jarPath.isEmpty())
QString newLaunchJar = APPLICATION->getJarPath("NewLaunch.jar");
if (newLaunchJar.isEmpty())
{
const char *reason = QT_TR_NOOP("Launcher library could not be found. Please check your installation.");
emit logLine(tr(reason), MessageLevel::Fatal);
@ -119,9 +119,6 @@ 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))
@ -137,23 +134,7 @@ void LauncherPartLaunch::executeTask()
#endif
args << "-cp";
#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 << newLaunchJar;
args << "org.polymc.EntryPoint";
qDebug() << args.join(' ');

86
libraries/launcher/org/polymc/impl/OneSixLauncher.java
View File

@ -1,16 +1,53 @@
/* Copyright 2012-2021 MultiMC Contributors
// SPDX-License-Identifier: GPL-3.0-only
/*
* PolyMC - Minecraft Launcher
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
*
* 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/>.
*
* 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.polymc.impl;
@ -24,6 +61,9 @@ 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;
@ -37,6 +77,7 @@ public final class OneSixLauncher implements Launcher {
private static final Logger LOGGER = Logger.getLogger("OneSixLauncher");
// parameters, separated from ParamBucket
private final List<String> classPath;
private final List<String> mcParams;
private final List<String> traits;
private final String appletClass;
@ -53,11 +94,8 @@ public final class OneSixLauncher implements Launcher {
private final String serverAddress;
private final String serverPort;
private final ClassLoader classLoader;
public OneSixLauncher(Parameters params) {
classLoader = ClassLoader.getSystemClassLoader();
classPath = params.allSafe("classPath", Collections.<String>emptyList());
mcParams = params.allSafe("param", Collections.<String>emptyList());
mainClass = params.firstSafe("mainClass", "net.minecraft.client.Minecraft");
appletClass = params.firstSafe("appletClass", "net.minecraft.client.MinecraftApplet");
@ -104,7 +142,7 @@ public final class OneSixLauncher implements Launcher {
method.invoke(null, (Object) mcParams.toArray(new String[0]));
}
private void legacyLaunch() throws Exception {
private void legacyLaunch(ClassLoader classLoader) throws Exception {
// Get the Minecraft Class and set the base folder
Class<?> minecraftClass = classLoader.loadClass(mainClass);
@ -151,7 +189,7 @@ public final class OneSixLauncher implements Launcher {
invokeMain(minecraftClass);
}
private void launchWithMainClass() throws Exception {
private void launchWithMainClass(ClassLoader classLoader) throws Exception {
// window size, title and state, onesix
// FIXME: there is no good way to maximize the minecraft window in onesix.
@ -177,12 +215,24 @@ 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();
legacyLaunch(classLoader);
} else {
// normal launch just calls main()
launchWithMainClass();
launchWithMainClass(classLoader);
}
}