CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE remove use of obsolete URL constants, simplify the rest

Browse Source
This commit is contained in:
Petr Mrázek
2018-11-04 13:18:35 +01:00
parent 16cc20aefd
commit 58260da861
8 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/logic/minecraft/AssetsUtils.cpp
View File

@ -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()

2
api/logic/minecraft/Library.cpp
View File

@ -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('/'))

2
api/logic/minecraft/auth/YggdrasilTask.cpp
View File

@ -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");

3
api/logic/minecraft/update/FMLLibrariesTask.cpp
View File

@ -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));
}