TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-16 08:05:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix[modpack-download]: fallback url

Browse Source
This commit is contained in:
Mathias Boulay 2023-08-13 12:13:22 +02:00 committed by ArtDev
parent 08f16f50cc
commit 5c556c1382
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/CurseforgeApi.java
View File

@ -190,11 +190,20 @@ public class CurseforgeApi implements ModpackApi{
} }
private String getDownloadUrl(long projectID, long fileID) { private String getDownloadUrl(long projectID, long fileID) {
// First try the official api endpoint
JsonObject response = mApiHandler.get("mods/"+projectID+"/files/"+fileID+"/download-url", JsonObject.class); JsonObject response = mApiHandler.get("mods/"+projectID+"/files/"+fileID+"/download-url", JsonObject.class);
if(response == null) return null; if (response != null && !response.get("data").isJsonNull())
JsonElement data = response.get("data"); return response.get("data").getAsString();
if(data == null || data.isJsonNull()) return null;
return data.getAsString(); // Otherwise, fallback to building an edge link
JsonObject fallbackResponse = mApiHandler.get(String.format("mods/%s/files/%s", projectID, fileID), JsonObject.class);
if (fallbackResponse != null && !fallbackResponse.get("data").isJsonNull()){
JsonObject modData = fallbackResponse.get("data").getAsJsonObject();
int id = modData.get("id").getAsInt();
return String.format("https://edge.forgecdn.net/files/%s/%s/%s", id/1000, id % 1000, modData.get("fileName").getAsString());
}
return null;
} }
private boolean verifyManifest(CurseManifest manifest) { private boolean verifyManifest(CurseManifest manifest) {