1 files changed, 16 insertions, 5 deletions
diff --git a/logic/OneSixUpdate.h b/logic/OneSixUpdate.h
index eac882b5..139143db 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;
@@ -34,14 +36,16 @@ public:
 
 private
 slots:
-	void versionFileStart();
-	void versionFileFinished();
-	void versionFileFailed();
+	void versionUpdateFailed(QString reason);
 
 	void jarlibStart();
 	void jarlibFinished();
 	void jarlibFailed();
 
+	void fmllibsStart();
+	void fmllibsFinished();
+	void fmllibsFailed();
+
 	void assetIndexStart();
 	void assetIndexFinished();
 	void assetIndexFailed();
@@ -49,11 +53,18 @@ 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
+	/// target version, determined during this task
 	std::shared_ptr<MinecraftVersion> targetVersion;
+	/// the task that is spawned for version updates
+	std::shared_ptr<Task> versionUpdateTask;
+	
 	OneSixInstance *m_inst = nullptr;
+	QString jarHashOnEntry;
+	QList<FMLlib> fmlLibsToProcess;
 };