summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-11-18 20:12:24 +0100
committerPetr Mrázek <peterix@gmail.com>2013-11-18 20:12:24 +0100
commit294c2d122f221fba2de0285d2a05ec944dbabbba (patch)
tree41a0602191ed6f79b52bfd20f255573aea4b3d7f
parent30b3395770506092c7d096e02f4ab3a77bbf8e9d (diff)
downloadMultiMC-294c2d122f221fba2de0285d2a05ec944dbabbba.tar
MultiMC-294c2d122f221fba2de0285d2a05ec944dbabbba.tar.gz
MultiMC-294c2d122f221fba2de0285d2a05ec944dbabbba.tar.lz
MultiMC-294c2d122f221fba2de0285d2a05ec944dbabbba.tar.xz
MultiMC-294c2d122f221fba2de0285d2a05ec944dbabbba.zip
Fix assets URL (expected to change... again)
-rw-r--r--logic/OneSixAssets.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/logic/OneSixAssets.cpp b/logic/OneSixAssets.cpp
index dbc42262..400aff2c 100644
--- a/logic/OneSixAssets.cpp
+++ b/logic/OneSixAssets.cpp
@@ -22,6 +22,8 @@
#include "net/S3ListBucket.h"
#include "MultiMC.h"
+#define ASSETS_URL "http://resources.download.minecraft.net/"
+
class ThreadedDeleter : public QThread
{
Q_OBJECT
@@ -69,7 +71,7 @@ void OneSixAssets::downloadFinished()
void OneSixAssets::S3BucketFinished()
{
- QString prefix("http://s3.amazonaws.com/Minecraft.Resources/");
+ QString prefix(ASSETS_URL);
nuke_whitelist.clear();
emit filesStarted();
@@ -114,7 +116,7 @@ void OneSixAssets::S3BucketFinished()
void OneSixAssets::start()
{
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(failed()), SIGNAL(failed()));
emit indexStarted();