1 files changed, 16 insertions, 17 deletions

diff --git a/logic/OneSixInstance.h b/logic/OneSixInstance.h
index f869e345..ae95eab1 100644
--- a/logic/OneSixInstance.h
+++ b/logic/OneSixInstance.h
@@ -15,21 +15,17 @@
 
 #pragma once
 
-#include <QStringList>
-#include <QDir>
-
 #include "BaseInstance.h"
 
-class OneSixVersion;
-class Task;
-class ModList;
+#include "OneSixVersion.h"
+#include "ModList.h"
 
 class OneSixInstance : public BaseInstance
 {
 	Q_OBJECT
 public:
 	explicit OneSixInstance(const QString &rootDir, SettingsObject *settings,
-							QObject *parent = 0);
+						  QObject *parent = 0);
 
 	//////  Mod Lists  //////
 	std::shared_ptr<ModList> loaderModList();
@@ -40,8 +36,8 @@ public:
 	QString loaderModsDir() const;
 	virtual QString instanceConfigFolder() const override;
 
-	virtual std::shared_ptr<Task> doUpdate(bool only_prepare) override;
-	virtual MinecraftProcess *prepareForLaunch(MojangAccountPtr account) override;
+	virtual std::shared_ptr<Task> doUpdate() override;
+	virtual MinecraftProcess *prepareForLaunch(AuthSessionPtr session) override;
 
 	virtual void cleanupAfterRun() override;
 
@@ -55,14 +51,14 @@ public:
 
 	virtual QDialog *createModEditDialog(QWidget *parent) override;
 
-	/// reload the full version json file. return true on success!
-	bool reloadFullVersion();
+	/// reload the full version json files. return true on success!
+	bool reloadVersion(QWidget *widgetParent = 0);
+	/// clears all version information in preparation for an update
+	void clearVersion();
 	/// get the current full version info
-	std::shared_ptr<OneSixVersion> getFullVersion();
-	/// revert the current custom version back to base
-	bool revertCustomVersion();
-	/// customize the current base version
-	bool customizeVersion();
+	std::shared_ptr<OneSixVersion> getFullVersion() const;
+	/// gets the current version info, but only for version.json
+	std::shared_ptr<OneSixVersion> getVanillaVersion() const;
 	/// is the current version original, or custom?
 	virtual bool versionIsCustom() override;
 
@@ -72,7 +68,10 @@ public:
 	virtual bool menuActionEnabled(QString action_name) const override;
 	virtual QString getStatusbarDescription() override;
 
+signals:
+	void versionReloaded();
+
 private:
-	QStringList processMinecraftArgs(MojangAccountPtr account);
+	QStringList processMinecraftArgs(AuthSessionPtr account);
 	QDir reconstructAssets(std::shared_ptr<OneSixVersion> version);
 };