Fix assets URL (expected to change... again)
This commit is contained in:
		@@ -22,6 +22,8 @@
 | 
				
			|||||||
#include "net/S3ListBucket.h"
 | 
					#include "net/S3ListBucket.h"
 | 
				
			||||||
#include "MultiMC.h"
 | 
					#include "MultiMC.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define ASSETS_URL "http://resources.download.minecraft.net/"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class ThreadedDeleter : public QThread
 | 
					class ThreadedDeleter : public QThread
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	Q_OBJECT
 | 
						Q_OBJECT
 | 
				
			||||||
@@ -69,7 +71,7 @@ void OneSixAssets::downloadFinished()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void OneSixAssets::S3BucketFinished()
 | 
					void OneSixAssets::S3BucketFinished()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	QString prefix("http://s3.amazonaws.com/Minecraft.Resources/");
 | 
						QString prefix(ASSETS_URL);
 | 
				
			||||||
	nuke_whitelist.clear();
 | 
						nuke_whitelist.clear();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	emit filesStarted();
 | 
						emit filesStarted();
 | 
				
			||||||
@@ -114,7 +116,7 @@ void OneSixAssets::S3BucketFinished()
 | 
				
			|||||||
void OneSixAssets::start()
 | 
					void OneSixAssets::start()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	auto job = new NetJob("Assets index");
 | 
						auto job = new NetJob("Assets index");
 | 
				
			||||||
	job->addNetAction(S3ListBucket::make(QUrl("http://s3.amazonaws.com/Minecraft.Resources/")));
 | 
						job->addNetAction(S3ListBucket::make(QUrl(ASSETS_URL)));
 | 
				
			||||||
	connect(job, SIGNAL(succeeded()), SLOT(S3BucketFinished()));
 | 
						connect(job, SIGNAL(succeeded()), SLOT(S3BucketFinished()));
 | 
				
			||||||
	connect(job, SIGNAL(failed()), SIGNAL(failed()));
 | 
						connect(job, SIGNAL(failed()), SIGNAL(failed()));
 | 
				
			||||||
	emit indexStarted();
 | 
						emit indexStarted();
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user