NOISSUE stop relying on forge servers for old FML libs

4 files changed, 27 insertions, 29 deletions

diff --git a/api/logic/minecraft/VersionFilterData.cpp b/api/logic/minecraft/VersionFilterData.cpp
index 11f7eea9..a47fc0a0 100644
--- a/api/logic/minecraft/VersionFilterData.cpp
+++ b/api/logic/minecraft/VersionFilterData.cpp
@@ -7,18 +7,18 @@ VersionFilterData::VersionFilterData()
 {
     // 1.3.*
     auto libs13 =
-        QList<FMLlib>{{"argo-2.25.jar", "bb672829fde76cb163004752b86b0484bd0a7f4b", false},
-                      {"guava-12.0.1.jar", "b8e78b9af7bf45900e14c6f958486b6ca682195f", false},
-                      {"asm-all-4.0.jar", "98308890597acb64047f7e896638e0d98753ae82", false}};
+        QList<FMLlib>{{"argo-2.25.jar", "bb672829fde76cb163004752b86b0484bd0a7f4b"},
+                      {"guava-12.0.1.jar", "b8e78b9af7bf45900e14c6f958486b6ca682195f"},
+                      {"asm-all-4.0.jar", "98308890597acb64047f7e896638e0d98753ae82"}};
 
     fmlLibsMapping["1.3.2"] = libs13;
 
     // 1.4.*
     auto libs14 = QList<FMLlib>{
-        {"argo-2.25.jar", "bb672829fde76cb163004752b86b0484bd0a7f4b", false},
-        {"guava-12.0.1.jar", "b8e78b9af7bf45900e14c6f958486b6ca682195f", false},
-        {"asm-all-4.0.jar", "98308890597acb64047f7e896638e0d98753ae82", false},
-        {"bcprov-jdk15on-147.jar", "b6f5d9926b0afbde9f4dbe3db88c5247be7794bb", false}};
+        {"argo-2.25.jar", "bb672829fde76cb163004752b86b0484bd0a7f4b"},
+        {"guava-12.0.1.jar", "b8e78b9af7bf45900e14c6f958486b6ca682195f"},
+        {"asm-all-4.0.jar", "98308890597acb64047f7e896638e0d98753ae82"},
+        {"bcprov-jdk15on-147.jar", "b6f5d9926b0afbde9f4dbe3db88c5247be7794bb"}};
 
     fmlLibsMapping["1.4"] = libs14;
     fmlLibsMapping["1.4.1"] = libs14;
@@ -31,30 +31,30 @@ VersionFilterData::VersionFilterData()
 
     // 1.5
     fmlLibsMapping["1.5"] = QList<FMLlib>{
-        {"argo-small-3.2.jar", "58912ea2858d168c50781f956fa5b59f0f7c6b51", false},
-        {"guava-14.0-rc3.jar", "931ae21fa8014c3ce686aaa621eae565fefb1a6a", false},
-        {"asm-all-4.1.jar", "054986e962b88d8660ae4566475658469595ef58", false},
-        {"bcprov-jdk15on-148.jar", "960dea7c9181ba0b17e8bab0c06a43f0a5f04e65", true},
-        {"deobfuscation_data_1.5.zip", "5f7c142d53776f16304c0bbe10542014abad6af8", false},
-        {"scala-library.jar", "458d046151ad179c85429ed7420ffb1eaf6ddf85", true}};
+        {"argo-small-3.2.jar", "58912ea2858d168c50781f956fa5b59f0f7c6b51"},
+        {"guava-14.0-rc3.jar", "931ae21fa8014c3ce686aaa621eae565fefb1a6a"},
+        {"asm-all-4.1.jar", "054986e962b88d8660ae4566475658469595ef58"},
+        {"bcprov-jdk15on-148.jar", "960dea7c9181ba0b17e8bab0c06a43f0a5f04e65"},
+        {"deobfuscation_data_1.5.zip", "5f7c142d53776f16304c0bbe10542014abad6af8"},
+        {"scala-library.jar", "458d046151ad179c85429ed7420ffb1eaf6ddf85"}};
 
     // 1.5.1
     fmlLibsMapping["1.5.1"] = QList<FMLlib>{
-        {"argo-small-3.2.jar", "58912ea2858d168c50781f956fa5b59f0f7c6b51", false},
-        {"guava-14.0-rc3.jar", "931ae21fa8014c3ce686aaa621eae565fefb1a6a", false},
-        {"asm-all-4.1.jar", "054986e962b88d8660ae4566475658469595ef58", false},
-        {"bcprov-jdk15on-148.jar", "960dea7c9181ba0b17e8bab0c06a43f0a5f04e65", true},
-        {"deobfuscation_data_1.5.1.zip", "22e221a0d89516c1f721d6cab056a7e37471d0a6", false},
-        {"scala-library.jar", "458d046151ad179c85429ed7420ffb1eaf6ddf85", true}};
+        {"argo-small-3.2.jar", "58912ea2858d168c50781f956fa5b59f0f7c6b51"},
+        {"guava-14.0-rc3.jar", "931ae21fa8014c3ce686aaa621eae565fefb1a6a"},
+        {"asm-all-4.1.jar", "054986e962b88d8660ae4566475658469595ef58"},
+        {"bcprov-jdk15on-148.jar", "960dea7c9181ba0b17e8bab0c06a43f0a5f04e65"},
+        {"deobfuscation_data_1.5.1.zip", "22e221a0d89516c1f721d6cab056a7e37471d0a6"},
+        {"scala-library.jar", "458d046151ad179c85429ed7420ffb1eaf6ddf85"}};
 
     // 1.5.2
     fmlLibsMapping["1.5.2"] = QList<FMLlib>{
-        {"argo-small-3.2.jar", "58912ea2858d168c50781f956fa5b59f0f7c6b51", false},
-        {"guava-14.0-rc3.jar", "931ae21fa8014c3ce686aaa621eae565fefb1a6a", false},
-        {"asm-all-4.1.jar", "054986e962b88d8660ae4566475658469595ef58", false},
-        {"bcprov-jdk15on-148.jar", "960dea7c9181ba0b17e8bab0c06a43f0a5f04e65", true},
-        {"deobfuscation_data_1.5.2.zip", "446e55cd986582c70fcf12cb27bc00114c5adfd9", false},
-        {"scala-library.jar", "458d046151ad179c85429ed7420ffb1eaf6ddf85", true}};
+        {"argo-small-3.2.jar", "58912ea2858d168c50781f956fa5b59f0f7c6b51"},
+        {"guava-14.0-rc3.jar", "931ae21fa8014c3ce686aaa621eae565fefb1a6a"},
+        {"asm-all-4.1.jar", "054986e962b88d8660ae4566475658469595ef58"},
+        {"bcprov-jdk15on-148.jar", "960dea7c9181ba0b17e8bab0c06a43f0a5f04e65"},
+        {"deobfuscation_data_1.5.2.zip", "446e55cd986582c70fcf12cb27bc00114c5adfd9"},
+        {"scala-library.jar", "458d046151ad179c85429ed7420ffb1eaf6ddf85"}};
 
     // don't use installers for those.
     forgeInstallerBlacklist = QSet<QString>({"1.5.2"});
diff --git a/api/logic/minecraft/VersionFilterData.h b/api/logic/minecraft/VersionFilterData.h
index 88e91f11..afd4502b 100644
--- a/api/logic/minecraft/VersionFilterData.h
+++ b/api/logic/minecraft/VersionFilterData.h
@@ -10,7 +10,6 @@ struct FMLlib
 {
     QString filename;
     QString checksum;
-    bool ours;
 };
 
 struct VersionFilterData
diff --git a/api/logic/minecraft/update/FMLLibrariesTask.cpp b/api/logic/minecraft/update/FMLLibrariesTask.cpp
index 85993e81..a05a7c2a 100644
--- a/api/logic/minecraft/update/FMLLibrariesTask.cpp
+++ b/api/logic/minecraft/update/FMLLibrariesTask.cpp
@@ -64,7 +64,7 @@ void FMLLibrariesTask::executeTask()
     for (auto &lib : fmlLibsToProcess)
     {
         auto entry = metacache->resolveEntry("fmllibs", lib.filename);
-        QString urlString = (lib.ours ? BuildConfig.FMLLIBS_OUR_BASE_URL : BuildConfig.FMLLIBS_FORGE_BASE_URL) + lib.filename;
+        QString urlString = BuildConfig.FMLLIBS_BASE_URL + lib.filename;
         dljob->addNetAction(Net::Download::makeCached(QUrl(urlString), entry));
     }
 
diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h
index 02a9297a..9feb7786 100644
--- a/buildconfig/BuildConfig.h
+++ b/buildconfig/BuildConfig.h
@@ -71,8 +71,7 @@ public:
     QString AUTH_BASE = "https://authserver.mojang.com/";
     QString MOJANG_STATUS_URL = "https://status.mojang.com/check";
     QString IMGUR_BASE_URL = "https://api.imgur.com/3/";
-    QString FMLLIBS_OUR_BASE_URL = "https://files.multimc.org/fmllibs/";
-    QString FMLLIBS_FORGE_BASE_URL = "https://files.minecraftforge.net/fmllibs/";
+    QString FMLLIBS_BASE_URL = "https://files.multimc.org/fmllibs/";
     QString TRANSLATIONS_BASE_URL = "https://files.multimc.org/translations/";
 
     QString MODPACKSCH_API_BASE_URL = "https://api.modpacks.ch/";