From 61892f857fffd479f6436122455aeb7fca7c3ff1 Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Sat, 15 Feb 2025 19:44:43 -0500
Subject: [PATCH] Use api.feed-the-beast.com, not modpacks.ch

---
 buildconfig/BuildConfig.h                           | 2 +-
 launcher/modplatform/modpacksch/FTBPackManifest.cpp | 3 ---
 launcher/modplatform/modpacksch/FTBPackManifest.h   | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h
index f4f21b031..36b0f9fe5 100644
--- a/buildconfig/BuildConfig.h
+++ b/buildconfig/BuildConfig.h
@@ -181,7 +181,7 @@ class Config {
     QString FMLLIBS_BASE_URL;
     QString TRANSLATION_FILES_URL;
 
-    QString MODPACKSCH_API_BASE_URL = "https://api.modpacks.ch/";
+    QString MODPACKSCH_API_BASE_URL = "https://api.feed-the-beast.com/v1/modpacks/";
 
     QString LEGACY_FTB_CDN_BASE_URL = "https://dist.creeper.host/FTB2/";
 
diff --git a/launcher/modplatform/modpacksch/FTBPackManifest.cpp b/launcher/modplatform/modpacksch/FTBPackManifest.cpp
index 90142a125..a38eed409 100644
--- a/launcher/modplatform/modpacksch/FTBPackManifest.cpp
+++ b/launcher/modplatform/modpacksch/FTBPackManifest.cpp
@@ -60,7 +60,6 @@ static void loadArt(ModpacksCH::Art& a, QJsonObject& obj)
     a.height = Json::requireInteger(obj, "height");
     a.compressed = Json::requireBoolean(obj, "compressed");
     a.sha1 = Json::requireString(obj, "sha1");
-    a.size = Json::requireInteger(obj, "size");
     a.updated = Json::requireInteger(obj, "updated");
 }
 
@@ -94,7 +93,6 @@ void ModpacksCH::loadModpack(ModpacksCH::Modpack& m, QJsonObject& obj)
     m.installs = Json::requireInteger(obj, "installs");
     m.plays = Json::requireInteger(obj, "plays");
     m.updated = Json::requireInteger(obj, "updated");
-    m.refreshed = Json::requireInteger(obj, "refreshed");
     auto artArr = Json::requireArray(obj, "art");
     for (QJsonValueRef artRaw : artArr) {
         auto artObj = Json::requireObject(artRaw);
@@ -163,7 +161,6 @@ void ModpacksCH::loadVersion(ModpacksCH::Version& m, QJsonObject& obj)
     m.installs = Json::requireInteger(obj, "installs");
     m.plays = Json::requireInteger(obj, "plays");
     m.updated = Json::requireInteger(obj, "updated");
-    m.refreshed = Json::requireInteger(obj, "refreshed");
     auto specs = Json::requireObject(obj, "specs");
     loadSpecs(m.specs, specs);
     auto targetArr = Json::requireArray(obj, "targets");
diff --git a/launcher/modplatform/modpacksch/FTBPackManifest.h b/launcher/modplatform/modpacksch/FTBPackManifest.h
index 48a7531c3..29c4ed739 100644
--- a/launcher/modplatform/modpacksch/FTBPackManifest.h
+++ b/launcher/modplatform/modpacksch/FTBPackManifest.h
@@ -63,7 +63,6 @@ struct Art {
     int height;
     bool compressed;
     QString sha1;
-    int size;
     int64_t updated;
 };
 
@@ -137,7 +136,6 @@ struct Version {
     int installs;
     int plays;
     int64_t updated;
-    int64_t refreshed;
     Specs specs;
     QVector<VersionTarget> targets;
     QVector<VersionFile> files;