diff options
Diffstat (limited to 'api/logic/minecraft')
-rw-r--r-- | api/logic/minecraft/AssetsUtils.cpp | 3 | ||||
-rw-r--r-- | api/logic/minecraft/Library.cpp | 2 | ||||
-rw-r--r-- | api/logic/minecraft/auth/YggdrasilTask.cpp | 2 | ||||
-rw-r--r-- | api/logic/minecraft/update/FMLLibrariesTask.cpp | 3 |
4 files changed, 5 insertions, 5 deletions
diff --git a/api/logic/minecraft/AssetsUtils.cpp b/api/logic/minecraft/AssetsUtils.cpp index c6db2a40..522cf5d7 100644 --- a/api/logic/minecraft/AssetsUtils.cpp +++ b/api/logic/minecraft/AssetsUtils.cpp @@ -27,6 +27,7 @@ #include "FileSystem.h" #include "net/Download.h" #include "net/ChecksumValidator.h" +#include "net/URLConstants.h" namespace AssetsUtils @@ -212,7 +213,7 @@ QString AssetObject::getLocalPath() QUrl AssetObject::getUrl() { - return QUrl("https://resources.download.minecraft.net/" + getRelPath()); + return URLConstants::RESOURCE_BASE + getRelPath(); } QString AssetObject::getRelPath() diff --git a/api/logic/minecraft/Library.cpp b/api/logic/minecraft/Library.cpp index a6ec0301..8a0d8747 100644 --- a/api/logic/minecraft/Library.cpp +++ b/api/logic/minecraft/Library.cpp @@ -192,7 +192,7 @@ QList< std::shared_ptr< NetAction > > Library::getDownloads(OpSys system, class if (m_repositoryURL.isEmpty()) { - return QString("https://" + URLConstants::LIBRARY_BASE) + raw_storage; + return URLConstants::LIBRARY_BASE + raw_storage; } if(m_repositoryURL.endsWith('/')) diff --git a/api/logic/minecraft/auth/YggdrasilTask.cpp b/api/logic/minecraft/auth/YggdrasilTask.cpp index 4a63d9b1..54855565 100644 --- a/api/logic/minecraft/auth/YggdrasilTask.cpp +++ b/api/logic/minecraft/auth/YggdrasilTask.cpp @@ -42,7 +42,7 @@ void YggdrasilTask::executeTask() // Get the content of the request we're going to send to the server. QJsonDocument doc(getRequestContent()); - QUrl reqUrl("https://" + URLConstants::AUTH_BASE + getEndpoint()); + QUrl reqUrl(URLConstants::AUTH_BASE + getEndpoint()); QNetworkRequest netRequest(reqUrl); netRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); diff --git a/api/logic/minecraft/update/FMLLibrariesTask.cpp b/api/logic/minecraft/update/FMLLibrariesTask.cpp index 5b4975ab..52a8375b 100644 --- a/api/logic/minecraft/update/FMLLibrariesTask.cpp +++ b/api/logic/minecraft/update/FMLLibrariesTask.cpp @@ -63,8 +63,7 @@ void FMLLibrariesTask::executeTask() for (auto &lib : fmlLibsToProcess) { auto entry = metacache->resolveEntry("fmllibs", lib.filename); - QString urlString = lib.ours ? URLConstants::FMLLIBS_OUR_BASE_URL + lib.filename - : URLConstants::FMLLIBS_FORGE_BASE_URL + lib.filename; + QString urlString = (lib.ours ? URLConstants::FMLLIBS_OUR_BASE_URL : URLConstants::FMLLIBS_FORGE_BASE_URL) + lib.filename; dljob->addNetAction(Net::Download::makeCached(QUrl(urlString), entry)); } |