summaryrefslogtreecommitdiffstats
path: root/logic/OneSixUpdate.h
diff options
context:
space:
mode:
Diffstat (limited to 'logic/OneSixUpdate.h')
-rw-r--r--logic/OneSixUpdate.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/logic/OneSixUpdate.h b/logic/OneSixUpdate.h
index eac882b5..00f7c135 100644
--- a/logic/OneSixUpdate.h
+++ b/logic/OneSixUpdate.h
@@ -21,6 +21,8 @@
#include "logic/net/NetJob.h"
#include "logic/tasks/Task.h"
+#include "logic/VersionFilterData.h"
+#include <quazip.h>
class MinecraftVersion;
class OneSixInstance;
@@ -42,6 +44,10 @@ slots:
void jarlibFinished();
void jarlibFailed();
+ void fmllibsStart();
+ void fmllibsFinished();
+ void fmllibsFailed();
+
void assetIndexStart();
void assetIndexFinished();
void assetIndexFailed();
@@ -49,11 +55,16 @@ slots:
void assetsFinished();
void assetsFailed();
+ void stripJar(QString origPath, QString newPath);
+ bool MergeZipFiles(QuaZip *into, QString from);
private:
NetJobPtr specificVersionDownloadJob;
NetJobPtr jarlibDownloadJob;
+ NetJobPtr legacyDownloadJob;
// target version, determined during this task
std::shared_ptr<MinecraftVersion> targetVersion;
OneSixInstance *m_inst = nullptr;
+ QString jarHashOnEntry;
+ QList<FMLlib> fmlLibsToProcess;
};