CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: include ^<optional^> updater doesn't need to know about mods

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2023-06-25 16:10:06 -07:00
parent 5b04a17730
commit 10266f65e4
No known key found for this signature in database
GPG Key ID: E10E321EB160949B
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/MMCZip.cpp
View File

@ -135,6 +135,7 @@ bool MMCZip::compressDirFiles(QString fileCompressed, QString dir, QFileInfoList
return result;
}
#if defined(LAUNCHER_APPLICATION)
// ours
bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod*>& mods)
{
@ -235,6 +236,7 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const
}
return true;
}
#endif
// ours
QString MMCZip::findFolderOfFileInZip(QuaZip* zip, const QString& what, const QStringList& ignore_paths, const QString& root)

5
launcher/MMCZip.h
View File

@ -38,7 +38,10 @@
#include <QString>
#include <QFileInfo>
#include <QSet>
#include <QUrl>
#if defined(LAUNCHER_APPLICATION)
#include "minecraft/mod/Mod.h"
#endif
#include <functional>
#include <quazip/JlCompress.h>
@ -74,10 +77,12 @@ namespace MMCZip
*/
bool compressDirFiles(QString fileCompressed, QString dir, QFileInfoList files, bool followSymlinks = false);
#if defined(LAUNCHER_APPLICATION)
/**
* take a source jar, add mods to it, resulting in target jar
*/
bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod*>& mods);
#endif
/**
* Find a single file in archive by file name (not path)

4
launcher/updater/prismupdater/PrismUpdater.cpp
View File

@ -72,7 +72,7 @@ namespace fs = std::filesystem;
namespace fs = ghc::filesystem;
#endif
#include <DesktopServices.h>
#include "DesktopServices.h"
#include "updater/prismupdater/UpdaterDialogs.h"
@ -83,7 +83,7 @@ namespace fs = ghc::filesystem;
#include "net/Download.h"
#include "net/RawHeaderProxy.h"
#include <MMCZip.h>
#include "MMCZip.h"
/** output to the log file */
void appDebugOutput(QtMsgType type, const QMessageLogContext& context, const QString& msg)

1
launcher/updater/prismupdater/PrismUpdater.h
View File

@ -35,6 +35,7 @@
#include <QNetworkReply>
#include <QUrl>
#include <memory>
#include <optional>
#include "QObjectPtr.h"
#include "net/Download.h"