From 87d3bbdc98f2ca4174eb84140fa74469947cefde Mon Sep 17 00:00:00 2001 From: Eradev Date: Sat, 27 Jun 2026 08:16:46 -0400 Subject: [PATCH] Replace Scryfall's API with custom API using Scryfall data --- forge-core/src/main/java/forge/util/ImageUtil.java | 4 ++-- .../main/java/forge/gui/download/GuiDownloadPicturesHQ.java | 1 - .../java/forge/localinstance/properties/ForgeConstants.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/forge-core/src/main/java/forge/util/ImageUtil.java b/forge-core/src/main/java/forge/util/ImageUtil.java index 08cdf5d5bd9c..fb25205dc3b0 100644 --- a/forge-core/src/main/java/forge/util/ImageUtil.java +++ b/forge-core/src/main/java/forge/util/ImageUtil.java @@ -257,7 +257,7 @@ public static String getScryfallDownloadUrl(PaperCard cp, String face, String se cardCollectorNumber = cardCollectorNumber.substring(0, cardCollectorNumber.length() - 1); } - return String.format("%s/%s/%s?format=image&version=%s%s", editionCode, encodeUtf8(cardCollectorNumber), + return String.format("%s/%s/%s?version=%s%s", editionCode, encodeUtf8(cardCollectorNumber), langCode, versionParam, faceParam); } @@ -270,7 +270,7 @@ public static String getScryfallTokenDownloadUrl(String collectorNumber, String faceParam = "&face=back"; collectorNumber = collectorNumber.substring(0, collectorNumber.length() - 1); } - return String.format("%s/%s/%s?format=image&version=%s%s", setCode, encodeUtf8(collectorNumber), + return String.format("%s/%s/%s?version=%s%s", setCode, encodeUtf8(collectorNumber), langCode, versionParam, faceParam); } diff --git a/forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesHQ.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesHQ.java index c5816dce7028..3a63911552e6 100644 --- a/forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesHQ.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesHQ.java @@ -96,7 +96,6 @@ private void addDLObject(final PaperCard c, final String face) { String scryfallurl = ForgeConstants.URL_PIC_SCRYFALL_DOWNLOAD + "named?fuzzy=" + cardname; if(!setCode.equals(CardEdition.UNKNOWN_CODE)) scryfallurl += "&set=" + setCode.toLowerCase(); if(face.equals("back")) scryfallurl += "&face=back"; - scryfallurl += "&format=image"; downloads.put(destPath, scryfallurl); } diff --git a/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java index 8854c312ab03..7986e7239333 100644 --- a/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java +++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java @@ -343,7 +343,7 @@ public final class ForgeConstants { public static final String URL_PIC_DOWNLOAD = URL_CARDFORGE + "/images/cards/"; public static final String URL_TOKEN_DOWNLOAD = URL_CARDFORGE + "/images/tokens/"; public static final String URL_PRICE_DOWNLOAD = GITHUB_ASSETS_BASE + "all-prices.txt"; - private static final String URL_SCRYFALL = "https://api.scryfall.com"; + private static final String URL_SCRYFALL = "https://card-forge.net/api/v1"; public static final String URL_PIC_SCRYFALL_DOWNLOAD = URL_SCRYFALL + "/cards/"; // Constants for Display Card Identity game setting