diff options
| -rw-r--r-- | launcher/minecraft/ComponentUpdateTask.cpp | 3 | ||||
| -rw-r--r-- | launcher/minecraft/ComponentUpdateTask.h | 2 | ||||
| -rw-r--r-- | launcher/ui/pages/instance/ModFolderPage.cpp | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/launcher/minecraft/ComponentUpdateTask.cpp b/launcher/minecraft/ComponentUpdateTask.cpp index 0095c613..ff7ed0af 100644 --- a/launcher/minecraft/ComponentUpdateTask.cpp +++ b/launcher/minecraft/ComponentUpdateTask.cpp @@ -2,6 +2,7 @@ #include "PackProfile_p.h" #include "PackProfile.h" +#include "Component.h" #include "meta/Index.h" #include "meta/VersionList.h" #include "meta/Version.h" @@ -599,9 +600,9 @@ void ComponentUpdateTask::resolveDependencies(bool checkOnly) component->m_version = (*minecraft)->getVersion(); } } + } // HACK HACK HACK HACK FIXME: this is a placeholder for deciding what version to use. For now, it is hardcoded. // ############################################################################################################ - } } component->m_dependencyOnly = true; // FIXME: this should not work directly with the component list diff --git a/launcher/minecraft/ComponentUpdateTask.h b/launcher/minecraft/ComponentUpdateTask.h index 4fcbbca8..4274cabb 100644 --- a/launcher/minecraft/ComponentUpdateTask.h +++ b/launcher/minecraft/ComponentUpdateTask.h @@ -2,7 +2,6 @@ #include "tasks/Task.h" #include "net/Mode.h" -#include "Component.h" #include <memory> class PackProfile; @@ -27,7 +26,6 @@ protected: private: void loadComponents(); - QString findBestComponentVersion(ComponentPtr component); void resolveDependencies(bool checkOnly); void remoteLoadSucceeded(size_t index); diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp index 6acf94c7..46235462 100644 --- a/launcher/ui/pages/instance/ModFolderPage.cpp +++ b/launcher/ui/pages/instance/ModFolderPage.cpp @@ -390,7 +390,6 @@ void ModFolderPage::on_actionInstall_mods_triggered() if(m_inst->typeName() != "Minecraft"){ return; //this is a null instance or a legacy instance } - QStringList modLoaders = {"net.minecraftforge", "net.fabricmc.fabric-loader", "org.quiltmc.quilt-loader"}; auto profile = ((MinecraftInstance *)m_inst)->getPackProfile(); if (profile->getModLoader() == ModAPI::Any) { QMessageBox::critical(this,tr("Error"),tr("Please install a mod loader first!")); |