diff options
| author | TheKodeToad <TheKodeToad@proton.me> | 2023-08-02 20:27:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-02 20:27:37 +0100 |
| commit | afaf6f894c797fc0aa7eb329b661b533be469005 (patch) | |
| tree | 0be358a0b616010aa5a022dbd3336a15cb791638 /launcher/minecraft/mod/tasks | |
| parent | 8b3c465a50e6be2a09c3968f1fd1e91b0428cbb0 (diff) | |
| parent | ac36a2289faf331af17b51e2c9ebb78d005f9bfa (diff) | |
| download | PrismLauncher-afaf6f894c797fc0aa7eb329b661b533be469005.tar.gz PrismLauncher-afaf6f894c797fc0aa7eb329b661b533be469005.tar.bz2 PrismLauncher-afaf6f894c797fc0aa7eb329b661b533be469005.zip | |
Merge branch 'PrismLauncher:develop' into better-component-installation
Diffstat (limited to 'launcher/minecraft/mod/tasks')
| -rw-r--r-- | launcher/minecraft/mod/tasks/LocalModParseTask.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp index 264019f8..60389753 100644 --- a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp +++ b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp @@ -1,9 +1,9 @@ #include "LocalModParseTask.h" +#include <qdcss.h> #include <quazip/quazip.h> #include <quazip/quazipfile.h> #include <toml++/toml.h> -#include <qdcss.h> #include <QJsonArray> #include <QJsonDocument> #include <QJsonObject> @@ -369,12 +369,11 @@ ModDetails ReadQuiltModInfo(QByteArray contents) details.icon_file = icon.toString(); } } - } return details; } -ModDetails ReadForgeInfo(QString fileName) +ModDetails ReadForgeInfo(QByteArray contents) { ModDetails details; // Read the data @@ -382,7 +381,7 @@ ModDetails ReadForgeInfo(QString fileName) details.mod_id = "Forge"; details.homeurl = "http://www.minecraftforge.net/forum/"; INIFile ini; - if (!ini.loadFile(fileName)) + if (!ini.loadFile(contents)) return details; QString major = ini.get("forge.major.number", "0").toString(); @@ -554,7 +553,7 @@ bool processZIP(Mod& mod, ProcessingLevel level) return false; } - details = ReadForgeInfo(file.getFileName()); + details = ReadForgeInfo(file.readAll()); file.close(); zip.close(); |