Merge pull request #1033 from Scrumplex/multi-arch-support

32 files changed, 664 insertions, 319 deletions

diff --git a/launcher/BaseInstance.cpp b/launcher/BaseInstance.cpp
index 2995df6f..a0bd8823 100644
--- a/launcher/BaseInstance.cpp
+++ b/launcher/BaseInstance.cpp
@@ -368,3 +368,8 @@ shared_qobject_ptr<LaunchTask> BaseInstance::getLaunchTask()
 {
     return m_launchProcess;
 }
+
+void BaseInstance::updateRuntimeContext()
+{
+    // NOOP
+}
diff --git a/launcher/BaseInstance.h b/launcher/BaseInstance.h
index 21cc3413..307240e0 100644
--- a/launcher/BaseInstance.h
+++ b/launcher/BaseInstance.h
@@ -54,6 +54,7 @@
 #include "net/Mode.h"
 
 #include "minecraft/launch/MinecraftServerTarget.h"
+#include "RuntimeContext.h"
 
 class QDir;
 class Task;
@@ -220,6 +221,12 @@ public:
 
     virtual QString typeName() const = 0;
 
+    void updateRuntimeContext();
+    RuntimeContext runtimeContext() const
+    {
+        return m_runtimeContext;
+    }
+
     bool hasVersionBroken() const
     {
         return m_hasBrokenVersion;
@@ -305,6 +312,7 @@ protected: /* data */
     bool m_isRunning = false;
     shared_qobject_ptr<LaunchTask> m_launchProcess;
     QDateTime m_timeStarted;
+    RuntimeContext m_runtimeContext;
 
 private: /* data */
     Status m_status = Status::Present;
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 0bdfcd44..c5894268 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -26,6 +26,7 @@ set(CORE_SOURCES
     MMCZip.cpp
     MMCStrings.h
     MMCStrings.cpp
+    RuntimeContext.h
 
     # Basic instance manipulation tasks (derived from InstanceTask)
     InstanceCreationTask.h
@@ -288,8 +289,6 @@ set(MINECRAFT_SOURCES
     minecraft/Rule.h
     minecraft/OneSixVersionFormat.cpp
     minecraft/OneSixVersionFormat.h
-    minecraft/OpSys.cpp
-    minecraft/OpSys.h
     minecraft/ParseUtils.cpp
     minecraft/ParseUtils.h
     minecraft/ProfileUtils.cpp
diff --git a/launcher/NullInstance.h b/launcher/NullInstance.h
index 53e64a05..53edfa0b 100644
--- a/launcher/NullInstance.h
+++ b/launcher/NullInstance.h
@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  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.
+ *
+ *  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.
+ */
+
 #pragma once
 #include "BaseInstance.h"
 #include "launch/LaunchTask.h"
@@ -84,4 +119,8 @@ public:
     QString modsRoot() const override {
         return QString();
     }
+    void updateRuntimeContext()
+    {
+        // NOOP
+    }
 };
diff --git a/launcher/RuntimeContext.h b/launcher/RuntimeContext.h
new file mode 100644
index 00000000..c1b71318
--- /dev/null
+++ b/launcher/RuntimeContext.h
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QSet>
+#include <QString>
+#include "settings/SettingsObject.h"
+
+struct RuntimeContext {
+    QString javaArchitecture;
+    QString javaRealArchitecture;
+    QString javaPath;
+    QString system;
+
+    QString mappedJavaRealArchitecture() const {
+        if (javaRealArchitecture == "aarch64") {
+            return "arm64";
+        }
+        return javaRealArchitecture;
+    }
+
+    void updateFromInstanceSettings(SettingsObjectPtr instanceSettings) {
+        javaArchitecture = instanceSettings->get("JavaArchitecture").toString();
+        javaRealArchitecture = instanceSettings->get("JavaRealArchitecture").toString();
+        javaPath = instanceSettings->get("JavaPath").toString();
+        system = currentSystem();
+    }
+
+    QString getClassifier() const {
+        return system + "-" + mappedJavaRealArchitecture();
+    }
+
+    // "Legacy" refers to the fact that Mojang assumed that these are the only two architectures
+    bool isLegacyArch() const {
+        QSet<QString> legacyArchitectures{"amd64", "x86_64", "i386", "i686", "x86"};
+        return legacyArchitectures.contains(mappedJavaRealArchitecture());
+    }
+
+    bool classifierMatches(QString target) const {
+        // try to match precise classifier "[os]-[arch]"
+        bool x = target == getClassifier();
+        // try to match imprecise classifier on legacy architectures "[os]"
+        if (!x && isLegacyArch())
+            x = target == system;
+
+        return x;
+    }
+
+    static QString currentSystem() {
+#if defined(Q_OS_LINUX)
+        return "linux";
+#elif defined(Q_OS_MACOS)
+        return "osx";
+#elif defined(Q_OS_WINDOWS)
+        return "windows";
+#elif defined(Q_OS_FREEBSD)
+        return "freebsd";
+#elif defined(Q_OS_OPENBSD)
+        return "openbsd";
+#else
+        return "unknown";
+#endif
+    }
+};
diff --git a/launcher/launch/steps/CheckJava.cpp b/launcher/launch/steps/CheckJava.cpp
index db56b652..7aeb61bf 100644
--- a/launcher/launch/steps/CheckJava.cpp
+++ b/launcher/launch/steps/CheckJava.cpp
@@ -121,7 +121,6 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
             emit logLine(QString("Could not start java:"), MessageLevel::Error);
             emit logLines(result.errorLog.split('\n'), MessageLevel::Error);
             emit logLine(QString("\nCheck your Java settings."), MessageLevel::Launcher);
-            printSystemInfo(false, false);
             emitFailed(QString("Could not start java!"));
             return;
         }
@@ -130,7 +129,6 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
             emit logLine(QString("Java checker returned some invalid data we don't understand:"), MessageLevel::Error);
             emit logLines(result.outLog.split('\n'), MessageLevel::Warning);
             emit logLine("\nMinecraft might not start properly.", MessageLevel::Launcher);
-            printSystemInfo(false, false);
             emitSucceeded();
             return;
         }
@@ -138,7 +136,6 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
         {
             auto instance = m_parent->instance();
             printJavaInfo(result.javaVersion.toString(), result.mojangPlatform, result.realPlatform, result.javaVendor);
-            printSystemInfo(true, result.is_64bit);
             instance->settings()->set("JavaVersion", result.javaVersion.toString());
             instance->settings()->set("JavaArchitecture", result.mojangPlatform);
             instance->settings()->set("JavaRealArchitecture", result.realPlatform);
@@ -155,20 +152,3 @@ void CheckJava::printJavaInfo(const QString& version, const QString& architectur
     emit logLine(QString("Java is version %1, using %2 (%3) architecture, from %4.\n\n")
                     .arg(version, architecture, realArchitecture, vendor), MessageLevel::Launcher);
 }
-
-void CheckJava::printSystemInfo(bool javaIsKnown, bool javaIs64bit)
-{
-    auto cpu64 = Sys::isCPU64bit();
-    auto system64 = Sys::isSystem64bit();
-    if(cpu64 != system64)
-    {
-        emit logLine(QString("Your CPU architecture is not matching your system architecture. You might want to install a 64bit Operating System.\n\n"), MessageLevel::Error);
-    }
-    if(javaIsKnown)
-    {
-        if(javaIs64bit != system64)
-        {
-            emit logLine(QString("Your Java architecture is not matching your system architecture. You might want to install a 64bit Java version.\n\n"), MessageLevel::Error);
-        }
-    }
-}
diff --git a/launcher/minecraft/Component.cpp b/launcher/minecraft/Component.cpp
index c7dd5e36..7e5b6058 100644
--- a/launcher/minecraft/Component.cpp
+++ b/launcher/minecraft/Component.cpp
@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  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.
+ *
+ *  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.
+ */
+
 #include <meta/VersionList.h>
 #include <meta/Index.h>
 #include "Component.h"
@@ -60,7 +95,7 @@ void Component::applyTo(LaunchProfile* profile)
     auto vfile = getVersionFile();
     if(vfile)
     {
-        vfile->applyTo(profile);
+        vfile->applyTo(profile, m_parent->runtimeContext());
     }
     else
     {
diff --git a/launcher/minecraft/LaunchProfile.cpp b/launcher/minecraft/LaunchProfile.cpp
index 39a342ca..9a6cea11 100644
--- a/launcher/minecraft/LaunchProfile.cpp
+++ b/launcher/minecraft/LaunchProfile.cpp
@@ -173,9 +173,9 @@ void LaunchProfile::applyCompatibleJavaMajors(QList<int>& javaMajor)
     m_compatibleJavaMajors.append(javaMajor);
 }
 
-void LaunchProfile::applyLibrary(LibraryPtr library)
+void LaunchProfile::applyLibrary(LibraryPtr library, const RuntimeContext & runtimeContext)
 {
-    if(!library->isActive())
+    if(!library->isActive(runtimeContext))
     {
         return;
     }
@@ -205,9 +205,9 @@ void LaunchProfile::applyLibrary(LibraryPtr library)
     }
 }
 
-void LaunchProfile::applyMavenFile(LibraryPtr mavenFile)
+void LaunchProfile::applyMavenFile(LibraryPtr mavenFile, const RuntimeContext & runtimeContext)
 {
-    if(!mavenFile->isActive())
+    if(!mavenFile->isActive(runtimeContext))
     {
         return;
     }
@@ -221,10 +221,10 @@ void LaunchProfile::applyMavenFile(LibraryPtr mavenFile)
     m_mavenFiles.append(Library::limitedCopy(mavenFile));
 }
 
-void LaunchProfile::applyAgent(AgentPtr agent)
+void LaunchProfile::applyAgent(AgentPtr agent, const RuntimeContext & runtimeContext)
 {
     auto lib = agent->library();
-    if(!lib->isActive())
+    if(!lib->isActive(runtimeContext))
     {
         return;
     }
@@ -354,7 +354,7 @@ const QList<int> & LaunchProfile::getCompatibleJavaMajors() const
 }
 
 void LaunchProfile::getLibraryFiles(
-    const QString& architecture,
+    const RuntimeContext & runtimeContext,
     QStringList& jars,
     QStringList& nativeJars,
     const QString& overridePath,
@@ -366,7 +366,7 @@ void LaunchProfile::getLibraryFiles(
     nativeJars.clear();
     for (auto lib : getLibraries())
     {
-        lib->getApplicableFiles(currentSystem, jars, nativeJars, native32, native64, overridePath);
+        lib->getApplicableFiles(runtimeContext, jars, nativeJars, native32, native64, overridePath);
     }
     // NOTE: order is important here, add main jar last to the lists
     if(m_mainJar)
@@ -379,18 +379,18 @@ void LaunchProfile::getLibraryFiles(
         }
         else
         {
-            m_mainJar->getApplicableFiles(currentSystem, jars, nativeJars, native32, native64, overridePath);
+            m_mainJar->getApplicableFiles(runtimeContext, jars, nativeJars, native32, native64, overridePath);
         }
     }
     for (auto lib : getNativeLibraries())
     {
-        lib->getApplicableFiles(currentSystem, jars, nativeJars, native32, native64, overridePath);
+        lib->getApplicableFiles(runtimeContext, jars, nativeJars, native32, native64, overridePath);
     }
-    if(architecture == "32")
+    if(runtimeContext.javaArchitecture == "32")
     {
         nativeJars.append(native32);
     }
-    else if(architecture == "64")
+    else if(runtimeContext.javaArchitecture == "64")
     {
         nativeJars.append(native64);
     }
diff --git a/launcher/minecraft/LaunchProfile.h b/launcher/minecraft/LaunchProfile.h
index b55cf661..49c1217d 100644
--- a/launcher/minecraft/LaunchProfile.h
+++ b/launcher/minecraft/LaunchProfile.h
@@ -56,9 +56,9 @@ public: /* application of profile variables from patches */
     void applyTweakers(const QStringList &tweakers);
     void applyJarMods(const QList<LibraryPtr> &jarMods);
     void applyMods(const QList<LibraryPtr> &jarMods);
-    void applyLibrary(LibraryPtr library);
-    void applyMavenFile(LibraryPtr library);
-    void applyAgent(AgentPtr agent);
+    void applyLibrary(LibraryPtr library, const RuntimeContext & runtimeContext);
+    void applyMavenFile(LibraryPtr library, const RuntimeContext & runtimeContext);
+    void applyAgent(AgentPtr agent, const RuntimeContext & runtimeContext);
     void applyCompatibleJavaMajors(QList<int>& javaMajor);
     void applyMainJar(LibraryPtr jar);
     void applyProblemSeverity(ProblemSeverity severity);
@@ -83,7 +83,7 @@ public: /* getters for profile variables */
     const QList<int> & getCompatibleJavaMajors() const;
     const LibraryPtr getMainJar() const;
     void getLibraryFiles(
-        const QString & architecture,
+        const RuntimeContext & runtimeContext,
         QStringList & jars,
         QStringList & nativeJars,
         const QString & overridePath,
diff --git a/launcher/minecraft/Library.cpp b/launcher/minecraft/Library.cpp
index ba7aed4b..cb2b5254 100644
--- a/launcher/minecraft/Library.cpp
+++ b/launcher/minecraft/Library.cpp
@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  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.
+ *
+ *  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.
+ */
+
 #include "Library.h"
 #include "MinecraftInstance.h"
 
@@ -7,7 +42,7 @@
 #include <BuildConfig.h>
 
 
-void Library::getApplicableFiles(OpSys system, QStringList& jar, QStringList& native, QStringList& native32,
+void Library::getApplicableFiles(const RuntimeContext & runtimeContext, QStringList& jar, QStringList& native, QStringList& native32,
                                  QStringList& native64, const QString &overridePath) const
 {
     bool local = isLocal();
@@ -21,7 +56,7 @@ void Library::getApplicableFiles(OpSys system, QStringList& jar, QStringList& na
         }
         return out.absoluteFilePath();
     };
-    QString raw_storage = storageSuffix(system);
+    QString raw_storage = storageSuffix(runtimeContext);
     if(isNative())
     {
         if (raw_storage.contains("${arch}"))
@@ -45,7 +80,7 @@ void Library::getApplicableFiles(OpSys system, QStringList& jar, QStringList& na
 }
 
 QList<NetAction::Ptr> Library::getDownloads(
-    OpSys system,
+    const RuntimeContext & runtimeContext,
     class HttpMetaCache* cache,
     QStringList& failedLocalFiles,
     const QString & overridePath
@@ -107,14 +142,14 @@ QList<NetAction::Ptr> Library::getDownloads(
         return true;
     };
 
-    QString raw_storage = storageSuffix(system);
+    QString raw_storage = storageSuffix(runtimeContext);
     if(m_mojangDownloads)
     {
         if(isNative())
         {
-            if(m_nativeClassifiers.contains(system))
+            auto nativeClassifier = getCompatibleNative(runtimeContext);
+            if(!nativeClassifier.isNull())
             {
-                auto nativeClassifier = m_nativeClassifiers[system];
                 if(nativeClassifier.contains("${arch}"))
                 {
                     auto nat32Classifier = nativeClassifier;
@@ -203,7 +238,7 @@ QList<NetAction::Ptr> Library::getDownloads(
     return out;
 }
 
-bool Library::isActive() const
+bool Library::isActive(const RuntimeContext & runtimeContext) const
 {
     bool result = true;
     if (m_rules.empty())
@@ -215,7 +250,7 @@ bool Library::isActive() const
         RuleAction ruleResult = Disallow;
         for (auto rule : m_rules)
         {
-            RuleAction temp = rule->apply(this);
+            RuleAction temp = rule->apply(this, runtimeContext);
             if (temp != Defer)
                 ruleResult = temp;
         }
@@ -223,7 +258,7 @@ bool Library::isActive() const
     }
     if (isNative())
     {
-        result = result && m_nativeClassifiers.contains(currentSystem);
+        result = result && !getCompatibleNative(runtimeContext).isNull();
     }
     return result;
 }
@@ -238,6 +273,19 @@ bool Library::isAlwaysStale() const
     return m_hint == "always-stale";
 }
 
+QString Library::getCompatibleNative(const RuntimeContext & runtimeContext) const {
+    // try to match precise classifier "[os]-[arch]"
+    auto entry = m_nativeClassifiers.constFind(runtimeContext.getClassifier());
+    // try to match imprecise classifier on legacy architectures "[os]"
+    if (entry == m_nativeClassifiers.constEnd() && runtimeContext.isLegacyArch())
+        entry = m_nativeClassifiers.constFind(runtimeContext.system);
+
+    if (entry == m_nativeClassifiers.constEnd())
+        return QString();
+
+    return entry.value();
+}
+
 void Library::setStoragePrefix(QString prefix)
 {
     m_storagePrefix = prefix;
@@ -257,7 +305,7 @@ QString Library::storagePrefix() const
     return m_storagePrefix;
 }
 
-QString Library::filename(OpSys system) const
+QString Library::filename(const RuntimeContext & runtimeContext) const
 {
     if(!m_filename.isEmpty())
     {
@@ -271,9 +319,10 @@ QString Library::filename(OpSys system) const
 
     // otherwise native, override classifiers. Mojang HACK!
     GradleSpecifier nativeSpec = m_name;
-    if (m_nativeClassifiers.contains(system))
+    QString nativeClassifier = getCompatibleNative(runtimeContext);
+    if (!nativeClassifier.isNull())
     {
-        nativeSpec.setClassifier(m_nativeClassifiers[system]);
+        nativeSpec.setClassifier(nativeClassifier);
     }
     else
     {
@@ -282,14 +331,14 @@ QString Library::filename(OpSys system) const
     return nativeSpec.getFileName();
 }
 
-QString Library::displayName(OpSys system) const
+QString Library::displayName(const RuntimeContext & runtimeContext) const
 {
     if(!m_displayname.isEmpty())
         return m_displayname;
-    return filename(system);
+    return filename(runtimeContext);
 }
 
-QString Library::storageSuffix(OpSys system) const
+QString Library::storageSuffix(const RuntimeContext & runtimeContext) const
 {
     // non-native? use only the gradle specifier
     if (!isNative())
@@ -299,9 +348,10 @@ QString Library::storageSuffix(OpSys system) const
 
     // otherwise native, override classifiers. Mojang HACK!
     GradleSpecifier nativeSpec = m_name;
-    if (m_nativeClassifiers.contains(system))
+    QString nativeClassifier = getCompatibleNative(runtimeContext);
+    if (!nativeClassifier.isNull())
     {
-        nativeSpec.setClassifier(m_nativeClassifiers[system]);
+        nativeSpec.setClassifier(nativeClassifier);
     }
     else
     {
diff --git a/launcher/minecraft/Library.h b/launcher/minecraft/Library.h
index 0740a7ca..950aec9d 100644
--- a/launcher/minecraft/Library.h
+++ b/launcher/minecraft/Library.h
@@ -1,8 +1,44 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  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.
+ *
+ *  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.
+ */
+
 #pragma once
 #include <QString>
 #include <net/NetAction.h>
 #include <QPair>
 #include <QList>
+#include <QString>
 #include <QStringList>
 #include <QMap>
 #include <QDir>
@@ -10,9 +46,9 @@
 #include <memory>
 
 #include "Rule.h"
-#include "minecraft/OpSys.h"
 #include "GradleSpecifier.h"
 #include "MojangDownloadInfo.h"
+#include "RuntimeContext.h"
 
 class Library;
 class MinecraftInstance;
@@ -98,7 +134,7 @@ public: /* methods */
         m_repositoryURL = base_url;
     }
 
-    void getApplicableFiles(OpSys system, QStringList & jar, QStringList & native,
+    void getApplicableFiles(const RuntimeContext & runtimeContext, QStringList & jar, QStringList & native,
                             QStringList & native32, QStringList & native64, const QString & overridePath) const;
 
     void setAbsoluteUrl(const QString &absolute_url)
@@ -112,7 +148,7 @@ public: /* methods */
     }
 
     /// Get the file name of the library
-    QString filename(OpSys system) const;
+    QString filename(const RuntimeContext & runtimeContext) const;
 
     // DEPRECATED: set a display name, used by jar mods only
     void setDisplayName(const QString & displayName)
@@ -121,7 +157,7 @@ public: /* methods */
     }
 
     /// Get the file name of the library
-    QString displayName(OpSys system) const;
+    QString displayName(const RuntimeContext & runtimeContext) const;
 
     void setMojangDownloadInfo(MojangLibraryDownloadInfo::Ptr info)
     {
@@ -140,7 +176,7 @@ public: /* methods */
     }
 
     /// Returns true if the library should be loaded (or extracted, in case of natives)
-    bool isActive() const;
+    bool isActive(const RuntimeContext & runtimeContext) const;
 
     /// Returns true if the library is contained in an instance and false if it is shared
     bool isLocal() const;
@@ -152,9 +188,11 @@ public: /* methods */
     bool isForge() const;
 
     // Get a list of downloads for this library
-    QList<NetAction::Ptr> getDownloads(OpSys system, class HttpMetaCache * cache,
+    QList<NetAction::Ptr> getDownloads(const RuntimeContext & runtimeContext, class HttpMetaCache * cache,
                                      QStringList & failedLocalFiles, const QString & overridePath) const;
 
+    QString getCompatibleNative(const RuntimeContext & runtimeContext) const;
+
 private: /* methods */
     /// the default storage prefix used by PolyMC
     static QString defaultStoragePrefix();
@@ -163,7 +201,7 @@ private: /* methods */
     QString storagePrefix() const;
 
     ///