diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-04-17 22:51:30 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-04-17 22:51:30 +0200 |
| commit | c4c8e99681e14e5d0e82a13cb0631107dedf96ff (patch) | |
| tree | a40279027b7530b5b8ddf0bbc286d0a33dc18951 /api/logic/minecraft/onesix/OneSixInstance.cpp | |
| parent | fc28aacdea3e7331b0f5f4436e0dac2fd361c390 (diff) | |
| download | MultiMC-c4c8e99681e14e5d0e82a13cb0631107dedf96ff.tar MultiMC-c4c8e99681e14e5d0e82a13cb0631107dedf96ff.tar.gz MultiMC-c4c8e99681e14e5d0e82a13cb0631107dedf96ff.tar.lz MultiMC-c4c8e99681e14e5d0e82a13cb0631107dedf96ff.tar.xz MultiMC-c4c8e99681e14e5d0e82a13cb0631107dedf96ff.zip | |
NOISSUE jar mods as libraries, fix for customizing net.minecraft
Diffstat (limited to 'api/logic/minecraft/onesix/OneSixInstance.cpp')
| -rw-r--r-- | api/logic/minecraft/onesix/OneSixInstance.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/api/logic/minecraft/onesix/OneSixInstance.cpp b/api/logic/minecraft/onesix/OneSixInstance.cpp index 0061be08..7e4e97b7 100644 --- a/api/logic/minecraft/onesix/OneSixInstance.cpp +++ b/api/logic/minecraft/onesix/OneSixInstance.cpp @@ -314,7 +314,16 @@ QStringList OneSixInstance::verboseDescription(AuthSessionPtr session) out << "Jar Mods:"; for(auto & jarmod: jarMods) { - out << " " + jarmod->originalName + " (" + jarmod->name + ")"; + auto displayname = jarmod->displayName(currentSystem); + auto realname = jarmod->filename(currentSystem); + if(displayname != realname) + { + out << " " + displayname + " (" + realname + ")"; + } + else + { + out << " " + realname; + } } out << ""; } @@ -521,8 +530,10 @@ QList< Mod > OneSixInstance::getJarMods() const QList<Mod> mods; for (auto jarmod : m_profile->getJarMods()) { - QString filePath = jarmodsPath().absoluteFilePath(jarmod->name); - mods.push_back(Mod(QFileInfo(filePath))); + QStringList jar, temp1, temp2, temp3; + jarmod->getApplicableFiles(currentSystem, jar, temp1, temp2, temp3, jarmodsPath().absolutePath()); + // QString filePath = jarmodsPath().absoluteFilePath(jarmod->filename(currentSystem)); + mods.push_back(Mod(QFileInfo(jar[0]))); } return mods; } |