Working 1.6 modding (currently only forge)

1 files changed, 45 insertions, 40 deletions

diff --git a/logic/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp
index 298ad28a..d0af8b93 100644
--- a/logic/OneSixUpdate.cpp
+++ b/logic/OneSixUpdate.cpp
@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ -26,20 +26,20 @@
 
 #include "BaseInstance.h"
 #include "lists/MinecraftVersionList.h"
-#include "VersionFactory.h"
 #include "OneSixVersion.h"
 #include "OneSixLibrary.h"
 #include "OneSixInstance.h"
 
 #include "pathutils.h"
 
-
-OneSixUpdate::OneSixUpdate(BaseInstance *inst, QObject *parent):BaseUpdate(inst, parent){}
+OneSixUpdate::OneSixUpdate(BaseInstance *inst, QObject *parent) : BaseUpdate(inst, parent)
+{
+}
 
 void OneSixUpdate::executeTask()
 {
 	QString intendedVersion = m_inst->intendedVersionId();
-	
+
 	// Make directories
 	QDir mcDir(m_inst->minecraftRoot());
 	if (!mcDir.exists() && !mcDir.mkpath("."))
@@ -47,17 +47,18 @@ void OneSixUpdate::executeTask()
 		emitFailed("Failed to create bin folder.");
 		return;
 	}
-	
+
 	// Get a pointer to the version object that corresponds to the instance's version.
-	targetVersion = MMC->minecraftlist()->findVersion(intendedVersion).dynamicCast<MinecraftVersion>();
-	if(targetVersion == nullptr)
+	targetVersion =
+		MMC->minecraftlist()->findVersion(intendedVersion).dynamicCast<MinecraftVersion>();
+	if (targetVersion == nullptr)
 	{
 		// don't do anything if it was invalid
 		emitSucceeded();
 		return;
 	}
-	
-	if(m_inst->shouldUpdate())
+
+	if (m_inst->shouldUpdate())
 	{
 		versionFileStart();
 	}
@@ -70,62 +71,65 @@ void OneSixUpdate::executeTask()
 void OneSixUpdate::versionFileStart()
 {
 	setStatus("Getting the version files from Mojang.");
-	
+
 	QString urlstr("http://s3.amazonaws.com/Minecraft.Download/versions/");
 	urlstr += targetVersion->descriptor() + "/" + targetVersion->descriptor() + ".json";
 	auto job = new DownloadJob("Version index");
 	job->add(QUrl(urlstr));
 	specificVersionDownloadJob.reset(job);
-	connect(specificVersionDownloadJob.data(), SIGNAL(succeeded()), SLOT(versionFileFinished()));
+	connect(specificVersionDownloadJob.data(), SIGNAL(succeeded()),
+			SLOT(versionFileFinished()));
 	connect(specificVersionDownloadJob.data(), SIGNAL(failed()), SLOT(versionFileFailed()));
-	connect(specificVersionDownloadJob.data(), SIGNAL(progress(qint64,qint64)), SIGNAL(progress(qint64,qint64)));
+	connect(specificVersionDownloadJob.data(), SIGNAL(progress(qint64, qint64)),
+			SIGNAL(progress(qint64, qint64)));
 	specificVersionDownloadJob->start();
 }
 
 void OneSixUpdate::versionFileFinished()
 {
 	DownloadPtr DlJob = specificVersionDownloadJob->first();
-	OneSixInstance * inst = (OneSixInstance *) m_inst;
-	
+	OneSixInstance *inst = (OneSixInstance *)m_inst;
+
 	QString version_id = targetVersion->descriptor();
 	QString inst_dir = m_inst->instanceRoot();
 	// save the version file in $instanceId/version.json
 	{
-		QString version1 =  PathCombine(inst_dir, "/version.json");
+		QString version1 = PathCombine(inst_dir, "/version.json");
 		ensureFilePathExists(version1);
 		// FIXME: detect errors here, download to a temp file, swap
-		QSaveFile vfile1 (version1);
-		if(!vfile1.open(QIODevice::Truncate | QIODevice::WriteOnly ))
+		QSaveFile vfile1(version1);
+		if (!vfile1.open(QIODevice::Truncate | QIODevice::WriteOnly))
 		{
 			emitFailed("Can't open " + version1 + " for writing.");
 			return;
 		}
 		auto data = DlJob.dynamicCast<ByteArrayDownload>()->m_data;
 		qint64 actual = 0;
-		if((actual = vfile1.write(data)) != data.size())
+		if ((actual = vfile1.write(data)) != data.size())
 		{
-			emitFailed("Failed to write into " + version1 + ". Written " + actual + " out of " + data.size() + '.');
+			emitFailed("Failed to write into " + version1 + ". Written " + actual + " out of " +
+					   data.size() + '.');
 			return;
 		}
-		if(!vfile1.commit())
+		if (!vfile1.commit())
 		{
 			emitFailed("Can't commit changes to " + version1);
 			return;
 		}
 	}
-	
+
 	// the version is downloaded safely. update is 'done' at this point
 	m_inst->setShouldUpdate(false);
-	
+
 	// delete any custom version inside the instance (it's no longer relevant, we did an update)
-	QString custom =  PathCombine(inst_dir, "/custom.json");
+	QString custom = PathCombine(inst_dir, "/custom.json");
 	QFile finfo(custom);
-	if(finfo.exists())
+	if (finfo.exists())
 	{
 		finfo.remove();
 	}
 	inst->reloadFullVersion();
-	
+
 	jarlibStart();
 }
 
@@ -136,42 +140,44 @@ void OneSixUpdate::versionFileFailed()
 
 void OneSixUpdate::jarlibStart()
 {
-	OneSixInstance * inst = (OneSixInstance *) m_inst;
+	OneSixInstance *inst = (OneSixInstance *)m_inst;
 	bool successful = inst->reloadFullVersion();
-	if(!successful)
+	if (!successful)
 	{
-		emitFailed("Failed to load the version description file (version.json). It might be corrupted, missing or simply too new.");
+		emitFailed("Failed to load the version description file (version.json). It might be "
+				   "corrupted, missing or simply too new.");
 		return;
 	}
-	
+
 	QSharedPointer<OneSixVersion> version = inst->getFullVersion();
-	
+
 	// download the right jar, save it in versions/$version/$version.jar
 	QString urlstr("http://s3.amazonaws.com/Minecraft.Download/versions/");
 	urlstr += version->id + "/" + version->id + ".jar";
-	QString targetstr ("versions/");
+	QString targetstr("versions/");
 	targetstr += version->id + "/" + version->id + ".jar";
-	
+
 	auto job = new DownloadJob("Libraries for instance " + inst->name());
 	job->add(QUrl(urlstr), targetstr);
 	jarlibDownloadJob.reset(job);
-	
+
 	auto libs = version->getActiveNativeLibs();
 	libs.append(version->getActiveNormalLibs());
-	
+
 	auto metacache = MMC->metacache();
-	for(auto lib: libs)
+	for (auto lib : libs)
 	{
-		QString download_path = lib->downloadPath();
+		QString download_path = lib->downloadUrl();
 		auto entry = metacache->resolveEntry("libraries", lib->storagePath());
-		if(entry->stale)
+		if (entry->stale)
 		{
 			jarlibDownloadJob->add(download_path, entry);
 		}
 	}
 	connect(jarlibDownloadJob.data(), SIGNAL(succeeded()), SLOT(jarlibFinished()));
 	connect(jarlibDownloadJob.data(), SIGNAL(failed()), SLOT(jarlibFailed()));
-	connect(jarlibDownloadJob.data(), SIGNAL(progress(qint64,qint64)), SIGNAL(progress(qint64,qint64)));
+	connect(jarlibDownloadJob.data(), SIGNAL(progress(qint64, qint64)),
+			SIGNAL(progress(qint64, qint64)));
 
 	jarlibDownloadJob->start();
 }
@@ -185,4 +191,3 @@ void OneSixUpdate::jarlibFailed()
 {
 	emitFailed("Failed to download the binary garbage. Try again. Maybe. IF YOU DARE");
 }
-