Merge branch 'develop'

1 files changed, 28 insertions, 21 deletions

diff --git a/logic/OneSixInstance.h b/logic/OneSixInstance.h
index a4c67ed1..d2276afc 100644
--- a/logic/OneSixInstance.h
+++ b/logic/OneSixInstance.h
@@ -10,43 +10,50 @@ class OneSixInstance : public BaseInstance
 {
 	Q_OBJECT
 public:
-	explicit OneSixInstance(const QString &rootDir, SettingsObject * settings, QObject *parent = 0);
-	
-	
+	explicit OneSixInstance(const QString &rootDir, SettingsObject *settings,
+							QObject *parent = 0);
+
 	//////  Mod Lists  //////
-	QSharedPointer<ModList> loaderModList();
-	QSharedPointer<ModList> resourcePackList();
-	
+	std::shared_ptr<ModList> loaderModList();
+	std::shared_ptr<ModList> resourcePackList();
+
 	////// Directories //////
 	QString resourcePacksDir() const;
 	QString loaderModsDir() const;
 	virtual QString instanceConfigFolder() const;
-	
-	virtual BaseUpdate* doUpdate();
-	virtual MinecraftProcess* prepareForLaunch ( QString user, QString session );
+
+	virtual BaseUpdate *doUpdate();
+	virtual MinecraftProcess *prepareForLaunch(LoginResponse response);
 	virtual void cleanupAfterRun();
-	
+
 	virtual QString intendedVersionId() const;
-	virtual bool setIntendedVersionId ( QString version );
-	
+	virtual bool setIntendedVersionId(QString version);
+
 	virtual QString currentVersionId() const;
 	// virtual void setCurrentVersionId ( QString val ) {};
-	
+
 	virtual bool shouldUpdate() const;
 	virtual void setShouldUpdate(bool val);
-	
-	virtual QDialog * createModEditDialog ( QWidget* parent );
-	
+
+	virtual QDialog *createModEditDialog(QWidget *parent);
+
 	/// reload the full version json file. return true on success!
 	bool reloadFullVersion();
 	/// get the current full version info
-	QSharedPointer<OneSixVersion> getFullVersion();
-	
+	std::shared_ptr<OneSixVersion> getFullVersion();
+	/// revert the current custom version back to base
+	bool revertCustomVersion();
+	/// customize the current base version
+	bool customizeVersion();
+	/// is the current version original, or custom?
+	virtual bool versionIsCustom() override;
+
 	virtual QString defaultBaseJar() const;
 	virtual QString defaultCustomBaseJar() const;
-	
-	virtual bool menuActionEnabled ( QString action_name ) const;
+
+	virtual bool menuActionEnabled(QString action_name) const;
 	virtual QString getStatusbarDescription();
+
 private:
-	QStringList processMinecraftArgs( QString user, QString session );
+	QStringList processMinecraftArgs(LoginResponse response);
 };
\ No newline at end of file