ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

Merge pull request #56 from unmojang/evan-goode/feed-the-beast

Browse Source 
Use api.feed-the-beast.com, not modpacks.ch
This commit is contained in:
Evan Goode 2025-02-16 15:52:23 -05:00 committed by GitHub
commit 86903bfc7f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildconfig/BuildConfig.h
View File

@ -181,7 +181,7 @@ class Config {
QString FMLLIBS_BASE_URL; QString FMLLIBS_BASE_URL;
QString TRANSLATION_FILES_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/"; QString LEGACY_FTB_CDN_BASE_URL = "https://dist.creeper.host/FTB2/";

3
launcher/modplatform/modpacksch/FTBPackManifest.cpp
View File

@ -60,7 +60,6 @@ static void loadArt(ModpacksCH::Art& a, QJsonObject& obj)
a.height = Json::requireInteger(obj, "height"); a.height = Json::requireInteger(obj, "height");
a.compressed = Json::requireBoolean(obj, "compressed"); a.compressed = Json::requireBoolean(obj, "compressed");
a.sha1 = Json::requireString(obj, "sha1"); a.sha1 = Json::requireString(obj, "sha1");
a.size = Json::requireInteger(obj, "size");
a.updated = Json::requireInteger(obj, "updated"); 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.installs = Json::requireInteger(obj, "installs");
m.plays = Json::requireInteger(obj, "plays"); m.plays = Json::requireInteger(obj, "plays");
m.updated = Json::requireInteger(obj, "updated"); m.updated = Json::requireInteger(obj, "updated");
m.refreshed = Json::requireInteger(obj, "refreshed");
auto artArr = Json::requireArray(obj, "art"); auto artArr = Json::requireArray(obj, "art");
for (QJsonValueRef artRaw : artArr) { for (QJsonValueRef artRaw : artArr) {
auto artObj = Json::requireObject(artRaw); auto artObj = Json::requireObject(artRaw);
@ -163,7 +161,6 @@ void ModpacksCH::loadVersion(ModpacksCH::Version& m, QJsonObject& obj)
m.installs = Json::requireInteger(obj, "installs"); m.installs = Json::requireInteger(obj, "installs");
m.plays = Json::requireInteger(obj, "plays"); m.plays = Json::requireInteger(obj, "plays");
m.updated = Json::requireInteger(obj, "updated"); m.updated = Json::requireInteger(obj, "updated");
m.refreshed = Json::requireInteger(obj, "refreshed");
auto specs = Json::requireObject(obj, "specs"); auto specs = Json::requireObject(obj, "specs");
loadSpecs(m.specs, specs); loadSpecs(m.specs, specs);
auto targetArr = Json::requireArray(obj, "targets"); auto targetArr = Json::requireArray(obj, "targets");

2
launcher/modplatform/modpacksch/FTBPackManifest.h
View File

@ -63,7 +63,6 @@ struct Art {
int height; int height;
bool compressed; bool compressed;
QString sha1; QString sha1;
int size;
int64_t updated; int64_t updated;
}; };
@ -137,7 +136,6 @@ struct Version {
int installs; int installs;
int plays; int plays;
int64_t updated; int64_t updated;
int64_t refreshed;
Specs specs; Specs specs;
QVector<VersionTarget> targets; QVector<VersionTarget> targets;
QVector<VersionFile> files; QVector<VersionFile> files;