1 files changed, 5 insertions, 51 deletions

diff --git a/logic/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp
index ae647bfe..d3ac80c2 100644
--- a/logic/OneSixUpdate.cpp
+++ b/logic/OneSixUpdate.cpp
@@ -35,8 +35,8 @@
 #include "pathutils.h"
 #include <JlCompress.h>
 
-OneSixUpdate::OneSixUpdate(BaseInstance *inst, bool only_prepare, QObject *parent)
-	: Task(parent), m_inst(inst), m_only_prepare(only_prepare)
+OneSixUpdate::OneSixUpdate(BaseInstance *inst, QObject *parent)
+	: Task(parent), m_inst(inst)
 {
 }
 
@@ -52,12 +52,6 @@ void OneSixUpdate::executeTask()
 		return;
 	}
 
-	if (m_only_prepare)
-	{
-		prepareForLaunch();
-		return;
-	}
-
 	if (m_inst->shouldUpdate())
 	{
 		// Get a pointer to the version object that corresponds to the instance's version.
@@ -137,7 +131,7 @@ void OneSixUpdate::versionFileFinished()
 	{
 		finfo.remove();
 	}
-	inst->reloadFullVersion();
+	inst->reloadVersion();
 
 	jarlibStart();
 }
@@ -222,7 +216,7 @@ void OneSixUpdate::assetIndexFailed()
 
 void OneSixUpdate::assetsFinished()
 {
-	prepareForLaunch();
+	emitSucceeded();
 }
 
 void OneSixUpdate::assetsFailed()
@@ -235,7 +229,7 @@ void OneSixUpdate::jarlibStart()
 	setStatus(tr("Getting the library files from Mojang..."));
 	QLOG_INFO() << m_inst->name() << ": downloading libraries";
 	OneSixInstance *inst = (OneSixInstance *)m_inst;
-	bool successful = inst->reloadFullVersion();
+	bool successful = inst->reloadVersion();
 	if (!successful)
 	{
 		emitFailed("Failed to load the version description file. It might be "
@@ -330,43 +324,3 @@ void OneSixUpdate::jarlibFailed()
 	emitFailed("Failed to download the following files:\n" + failed_all +
 			   "\n\nPlease try again.");
 }
-
-void OneSixUpdate::prepareForLaunch()
-{
-	setStatus(tr("Preparing for launch..."));
-	QLOG_INFO() << m_inst->name() << ": preparing for launch";
-	auto onesix_inst = (OneSixInstance *)m_inst;
-
-	// delete any leftovers, if they are present.
-	onesix_inst->cleanupAfterRun();
-
-	QString natives_dir_raw = PathCombine(onesix_inst->instanceRoot(), "natives/");
-	auto version = onesix_inst->getFullVersion();
-	if (!version)
-	{
-		emitFailed("The version information for this instance is not complete. Try re-creating "
-				   "it or changing the version.");
-		return;
-	}
-	/*
-	for (auto lib : version->getActiveNativeLibs())
-	{
-		if (!lib->filesExist())
-		{
-			emitFailed("Native library is missing some files:\n" + lib->storagePath() +
-					   "\n\nRun the instance at least once in online mode to get all the "
-					   "required files.");
-			return;
-		}
-		if (!lib->extractTo(natives_dir_raw))
-		{
-			emitFailed("Could not extract the native library:\n" + lib->storagePath() + " to " +
-					   natives_dir_raw +
-					   "\n\nMake sure MultiMC has appropriate permissions and there is enough "
-					   "space on the storage device.");
-			return;
-		}
-	}
-*/
-	emitSucceeded();
-}