NOISSUE remove use of obsolete URL constants, simplify the rest

6 files changed, 11 insertions, 16 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));
     }
 
diff --git a/api/logic/net/URLConstants.cpp b/api/logic/net/URLConstants.cpp
index 10b72748..9a4d920b 100644
--- a/api/logic/net/URLConstants.cpp
+++ b/api/logic/net/URLConstants.cpp
@@ -4,7 +4,7 @@ namespace URLConstants {
 
 QString getLegacyJarUrl(QString version)
 {
-    return "https://" + AWS_DOWNLOAD_VERSIONS + getJarPath(version);
+    return AWS_DOWNLOAD_VERSIONS + getJarPath(version);
 }
 
 QString getJarPath(QString version)
diff --git a/api/logic/net/URLConstants.h b/api/logic/net/URLConstants.h
index 32ff38de..5365894b 100644
--- a/api/logic/net/URLConstants.h
+++ b/api/logic/net/URLConstants.h
@@ -19,17 +19,12 @@
 
 namespace URLConstants
 {
-const QString AWS_DOWNLOAD_VERSIONS("s3.amazonaws.com/Minecraft.Download/versions/");
-const QString RESOURCE_BASE("resources.download.minecraft.net/");
-const QString LIBRARY_BASE("libraries.minecraft.net/");
-//const QString SKINS_BASE("skins.minecraft.net/MinecraftSkins/");
-const QString SKINS_BASE("crafatar.com/skins/");
-const QString AUTH_BASE("authserver.mojang.com/");
-const QString FORGE_LEGACY_URL("https://files.minecraftforge.net/minecraftforge/json");
-const QString FORGE_GRADLE_URL("https://files.minecraftforge.net/maven/net/minecraftforge/forge/json");
+const QString AWS_DOWNLOAD_VERSIONS("https://s3.amazonaws.com/Minecraft.Download/versions/");
+const QString RESOURCE_BASE("https://resources.download.minecraft.net/");
+const QString LIBRARY_BASE("https://libraries.minecraft.net/");
+const QString SKINS_BASE("https://crafatar.com/skins/");
+const QString AUTH_BASE("https://authserver.mojang.com/");
 const QString MOJANG_STATUS_URL("https://status.mojang.com/check");
-const QString MOJANG_STATUS_NEWS_URL("https://status.mojang.com/news");
-const QString LITELOADER_URL("http://dl.liteloader.com/versions/versions.json");
 const QString IMGUR_BASE_URL("https://api.imgur.com/3/");
 const QString FMLLIBS_OUR_BASE_URL("https://files.multimc.org/fmllibs/");
 const QString FMLLIBS_FORGE_BASE_URL("https://files.minecraftforge.net/fmllibs/");