From 09098893e61ad5a9656e94266e484899f56ddc8d Mon Sep 17 00:00:00 2001 From: valfieri Date: Sun, 8 Sep 2019 09:57:00 +0200 Subject: [PATCH] Removed dependencies from java.nio package and decreased target android version from 29 to 13 --- projects/mtg/Android/default.properties | 2 +- projects/mtg/Android/jni/Application.mk | 2 +- projects/mtg/Android/project.properties | 2 +- .../src/net/wagic/utils/ImgDownloader.java | 312 ++++++++---------- 4 files changed, 148 insertions(+), 170 deletions(-) diff --git a/projects/mtg/Android/default.properties b/projects/mtg/Android/default.properties index 8010039f3..b15c4d80c 100644 --- a/projects/mtg/Android/default.properties +++ b/projects/mtg/Android/default.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=android-10 +target=android-13 diff --git a/projects/mtg/Android/jni/Application.mk b/projects/mtg/Android/jni/Application.mk index 0e52c04f9..53a2e0f9d 100644 --- a/projects/mtg/Android/jni/Application.mk +++ b/projects/mtg/Android/jni/Application.mk @@ -1,6 +1,6 @@ APP_PROJECT_PATH := $(call my-dir)/.. APP_CPPFLAGS += -frtti -fexceptions -APP_ABI := armeabi-v7a +APP_ABI := armeabi armeabi-v7a #APP_ABI := x86 # mainly for emulators APP_STL := gnustl_static APP_MODULES := libpng libjpeg main SDL diff --git a/projects/mtg/Android/project.properties b/projects/mtg/Android/project.properties index 82181932d..c052cd8f8 100644 --- a/projects/mtg/Android/project.properties +++ b/projects/mtg/Android/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-29 +target=android-13 diff --git a/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java b/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java index be5b071f9..1057cf374 100644 --- a/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java +++ b/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java @@ -16,9 +16,6 @@ import net.lingala.zip4j.model.enums.CompressionMethod; import java.io.*; import java.net.URL; import java.net.HttpURLConnection; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; import java.util.ArrayList; @@ -32,23 +29,6 @@ import org.libsdl.app.SDLActivity; public class ImgDownloader { - private static String convertStreamToString(java.io.InputStream inputStream) { - final int bufferSize = 1024; - final char[] buffer = new char[bufferSize]; - final StringBuilder out = new StringBuilder(); - try { - Reader in = new InputStreamReader(inputStream, StandardCharsets.ISO_8859_1); - for (; ; ) { - int rsz = in.read(buffer, 0, buffer.length); - if (rsz < 0) - break; - out.append(buffer, 0, rsz); - } - } catch (Exception e) { - } - return out.toString(); - } - private static String readLineByLineJava8(String filePath) { StringBuilder contentBuilder = new StringBuilder(); @@ -393,7 +373,7 @@ public class ImgDownloader { File[] listOfFile = resFolder.listFiles(); ZipFile zipFile = null; InputStream stream = null; - java.nio.file.Path filePath = null; + File filePath = null; try { for (int i = 0; i < listOfFile.length; i++) { if (listOfFile[i].getName().contains(".zip")) { @@ -413,10 +393,9 @@ public class ImgDownloader { if (setName.equalsIgnoreCase(names[1])) { stream = zipFile.getInputStream(entry); byte[] buffer = new byte[1]; - java.nio.file.Path outDir = Paths.get(path + File.separator); - filePath = outDir.resolve("_cards.dat"); + filePath = new File(path + File.separator + "_cards.dat"); try { - FileOutputStream fos = new FileOutputStream(filePath.toFile()); + FileOutputStream fos = new FileOutputStream(filePath); BufferedOutputStream bos = new BufferedOutputStream(fos, buffer.length); int len; while ((len = stream.read(buffer)) != -1) { @@ -424,7 +403,7 @@ public class ImgDownloader { } fos.close(); bos.close(); - cardsfilepath = filePath.toString(); + cardsfilepath = filePath.getAbsolutePath(); todelete = true; } catch (Exception ex) { } @@ -465,59 +444,59 @@ public class ImgDownloader { public static String getSpecialCardUrl(String id) { String cardurl = ""; - if(id.equals("15208711t")) + if (id.equals("15208711t")) cardurl = "https://img.scryfall.com/cards/large/front/9/c/9c138bf9-8be6-4f1a-a82c-a84938ab84f5.jpg?1562279137"; - else if(id.equals("15208712t")) + else if (id.equals("15208712t")) cardurl = "https://img.scryfall.com/cards/large/front/d/4/d453ee89-6122-4d51-989c-e78b046a9de3.jpg?1561758141"; - else if(id.equals("2050321t")) + else if (id.equals("2050321t")) cardurl = "https://img.scryfall.com/cards/large/front/1/8/18b9c83d-4422-4b95-9fc2-070ed6b5bdf6.jpg?1562701921"; - else if(id.equals("22010012t")) + else if (id.equals("22010012t")) cardurl = "https://img.scryfall.com/cards/large/front/8/4/84dc847c-7a37-4c7f-b02c-30b3e4c91fb6.jpg?1561757490"; - else if(id.equals("8759611")) + else if (id.equals("8759611")) cardurl = "https://img.scryfall.com/cards/large/front/4/1/41004bdf-8e09-4b2c-9e9c-26c25eac9854.jpg?1562493483"; - else if(id.equals("8759911")) + else if (id.equals("8759911")) cardurl = "https://img.scryfall.com/cards/large/front/0/b/0b61d772-2d8b-4acf-9dd2-b2e8b03538c8.jpg?1562492461"; - else if(id.equals("8759511")) + else if (id.equals("8759511")) cardurl = "https://img.scryfall.com/cards/large/front/d/2/d224c50f-8146-4c91-9401-04e5bd306d02.jpg?1562496100"; - else if(id.equals("8471611")) + else if (id.equals("8471611")) cardurl = "https://img.scryfall.com/cards/large/front/8/4/84920a21-ee2a-41ac-a369-347633d10371.jpg?1562494702"; - else if(id.equals("8760011")) + else if (id.equals("8760011")) cardurl = "https://img.scryfall.com/cards/large/front/4/2/42ba0e13-d20f-47f9-9c86-2b0b13c39ada.jpg?1562493487"; - else if(id.equals("7448911")) + else if (id.equals("7448911")) cardurl = "https://img.scryfall.com/cards/large/front/c/a/ca03131a-9bd4-4fba-b95c-90f1831e86e7.jpg?1562879774"; - else if(id.equals("7453611")) + else if (id.equals("7453611")) cardurl = "https://img.scryfall.com/cards/large/front/7/3/73636ca0-2309-4bb3-9300-8bd0c0bb5b31.jpg?1562877808"; - else if(id.equals("7447611")) + else if (id.equals("7447611")) cardurl = "https://img.scryfall.com/cards/large/front/2/8/28f72260-c8f9-4c44-92b5-23cef6690fdd.jpg?1562876119"; - else if(id.equals("7467111")) + else if (id.equals("7467111")) cardurl = "https://img.scryfall.com/cards/large/front/1/f/1fe2b76f-ddb7-49d5-933b-ccb06be5d46f.jpg?1562875903"; - else if(id.equals("7409311")) + else if (id.equals("7409311")) cardurl = "https://img.scryfall.com/cards/large/front/7/5/758abd53-6ad2-406e-8615-8e48678405b4.jpg?1562877848"; - else if(id.equals("3896122t")) + else if (id.equals("3896122t")) cardurl = "https://img.scryfall.com/cards/large/front/5/9/59a00cac-53ae-46ad-8468-e6d1db40b266.jpg?1562542382"; - else if(id.equals("11492113t")) + else if (id.equals("11492113t")) cardurl = "https://img.scryfall.com/cards/large/front/5/b/5b9f471a-1822-4981-95a9-8923d83ddcbf.jpg?1562702075"; - else if(id.equals("3896523t")) + else if (id.equals("3896523t")) cardurl = "https://img.scryfall.com/cards/large/front/d/0/d0cd85cc-ad22-446b-8378-5eb69fee1959.jpg?1562840712"; - else if(id.equals("7897511")) + else if (id.equals("7897511")) cardurl = "https://img.scryfall.com/cards/large/front/a/4/a4f4aa3b-c64a-4430-b1a2-a7fca87d0a22.jpg?1562763433"; - else if(id.equals("7868811")) + else if (id.equals("7868811")) cardurl = "https://img.scryfall.com/cards/large/front/b/3/b3523b8e-065f-427c-8d5b-eb731ca91ede.jpg?1562763691"; - else if(id.equals("7868711")) + else if (id.equals("7868711")) cardurl = "https://img.scryfall.com/cards/large/front/5/8/58164521-aeec-43fc-9db9-d595432dea6f.jpg?1564694999"; - else if(id.equals("7868611")) + else if (id.equals("7868611")) cardurl = "https://img.scryfall.com/cards/large/front/3/3/33a8e5b9-6bfb-4ff2-a16d-3168a5412807.jpg?1562758927"; - else if(id.equals("7869111")) + else if (id.equals("7869111")) cardurl = "https://img.scryfall.com/cards/large/front/9/d/9de1eebf-5725-438c-bcf0-f3a4d8a89fb0.jpg?1562762993"; - else if(id.equals("7860011")) + else if (id.equals("7860011")) cardurl = "https://img.scryfall.com/cards/large/front/8/6/864ad989-19a6-4930-8efc-bbc077a18c32.jpg?1562762069"; - else if(id.equals("7867911")) + else if (id.equals("7867911")) cardurl = "https://img.scryfall.com/cards/large/front/c/8/c8265c39-d287-4c5a-baba-f2f09dd80a1c.jpg?1562764226"; - else if(id.equals("7867811")) + else if (id.equals("7867811")) cardurl = "https://img.scryfall.com/cards/large/front/a/0/a00a7180-49bd-4ead-852a-67b6b5e4b933.jpg?1564694995"; - else if(id.equals("7869511")) + else if (id.equals("7869511")) cardurl = "https://img.scryfall.com/cards/large/front/f/2/f2ddf1a3-e6fa-4dd0-b80d-1a585b51b934.jpg?1562765664"; - else if(id.equals("7869411")) + else if (id.equals("7869411")) cardurl = "https://img.scryfall.com/cards/large/front/6/e/6ee6cd34-c117-4d7e-97d1-8f8464bfaac8.jpg?1562761096"; else if (id.equals("209163t")) cardurl = "https://img.scryfall.com/cards/large/front/a/3/a3ea39a8-48d1-4a58-8662-88841eabec92.jpg?1562925559"; @@ -573,9 +552,9 @@ public class ImgDownloader { cardurl = "https://deckmaster.info/images/cards/M15/-108-hr.jpg"; else if (id.equals("74272")) cardurl = "https://img.scryfall.com/cards/large/front/4/5/45af7f55-9a69-43dd-969f-65411711b13e.jpg?1562487939"; - else if(id.equals("378445t")) + else if (id.equals("378445t")) cardurl = "https://deckmaster.info/images/cards/BNG/-11-hr.jpg"; - else if(id.equals("378521t")) + else if (id.equals("378521t")) cardurl = "https://deckmaster.info/images/cards/DDO/394383-hr.jpg"; else if (id.equals("687701")) cardurl = "https://deckmaster.info/images/cards/DKM/-2437-hr.jpg"; @@ -812,239 +791,239 @@ public class ImgDownloader { public static String getSpecialTokenUrl(String id) { String tokenurl = ""; - if(id.equals("380486t")) + if (id.equals("380486t")) tokenurl = "https://deckmaster.info/images/cards/BNG/-5-hr.jpg"; - else if(id.equals("380482t")) + else if (id.equals("380482t")) tokenurl = "https://deckmaster.info/images/cards/THS/-21-hr.jpg"; - else if(id.equals("184589t")) + else if (id.equals("184589t")) tokenurl = "https://deckmaster.info/images/cards/M14/-28-hr.jpg"; - else if(id.equals("368951t") || id.equals("426025t")) + else if (id.equals("368951t") || id.equals("426025t")) tokenurl = "https://deckmaster.info/images/cards/DGM/-39-hr.jpg"; - else if(id.equals("380487t") || id.equals("414506t")) + else if (id.equals("380487t") || id.equals("414506t")) tokenurl = "https://deckmaster.info/images/cards/JOU/-41-hr.jpg"; - else if(id.equals("114917t")) + else if (id.equals("114917t")) tokenurl = "https://deckmaster.info/images/cards/JOU/-43-hr.jpg"; - else if(id.equals("234849t") || id.equals("366401t") || id.equals("366340t") || id.equals("366375t")) + else if (id.equals("234849t") || id.equals("366401t") || id.equals("366340t") || id.equals("366375t")) tokenurl = "https://deckmaster.info/images/cards/RTR/-61-hr.jpg"; - else if(id.equals("48096t")) + else if (id.equals("48096t")) tokenurl = "https://deckmaster.info/images/cards/CNS/-89-hr.jpg"; - else if(id.equals("423817t") || id.equals("423700t") || id.equals("183017t") || id.equals("6164t")) + else if (id.equals("423817t") || id.equals("423700t") || id.equals("183017t") || id.equals("6164t")) tokenurl = "https://deckmaster.info/images/cards/MBS/-216-hr.jpg"; - else if(id.equals("140233t") || id.equals("191239t") || id.equals("205957t") || id.equals("423797t")) + else if (id.equals("140233t") || id.equals("191239t") || id.equals("205957t") || id.equals("423797t")) tokenurl = "https://deckmaster.info/images/cards/M11/-234-hr.jpg"; else if (id.equals("271227t")) tokenurl = "https://deckmaster.info/images/cards/WWK/-265-hr.jpg"; - else if(id.equals("185704t")) + else if (id.equals("185704t")) tokenurl = "https://deckmaster.info/images/cards/ZEN/-277-hr.jpg"; - else if(id.equals("175105t")) + else if (id.equals("175105t")) tokenurl = "https://deckmaster.info/images/cards/ALA/-325-hr.jpg"; - else if(id.equals("376496t") || id.equals("376549t")) + else if (id.equals("376496t") || id.equals("376549t")) tokenurl = "https://deckmaster.info/images/cards/ALA/-327-hr.jpg"; - else if(id.equals("247202t")) + else if (id.equals("247202t")) tokenurl = "https://deckmaster.info/images/cards/EVE/-338-hr.jpg"; - else if(id.equals("376546t")) + else if (id.equals("376546t")) tokenurl = "https://deckmaster.info/images/cards/SHM/-352-hr.jpg"; - else if(id.equals("244668t")) + else if (id.equals("244668t")) tokenurl = "https://deckmaster.info/images/cards/SHM/-356-hr.jpg"; - else if(id.equals("457111t")) + else if (id.equals("457111t")) tokenurl = "https://deckmaster.info/images/cards/MOR/-362-hr.jpg"; - else if(id.equals("376578t") || id.equals("152553t")) + else if (id.equals("376578t") || id.equals("152553t")) tokenurl = "https://deckmaster.info/images/cards/LRW/-365-hr.jpg"; - else if(id.equals("153166t")) + else if (id.equals("153166t")) tokenurl = "https://deckmaster.info/images/cards/LRW/-367-hr.jpg"; - else if(id.equals("83236t") || id.equals("45390t") || id.equals("965t") || id.equals("966t")) + else if (id.equals("83236t") || id.equals("45390t") || id.equals("965t") || id.equals("966t")) tokenurl = "https://deckmaster.info/images/cards/8ED/-391-hr.jpg"; - else if(id.equals("19878t")) + else if (id.equals("19878t")) tokenurl = "https://deckmaster.info/images/cards/C14/-482-hr.jpg"; - else if(id.equals("126166t")) + else if (id.equals("126166t")) tokenurl = "https://deckmaster.info/images/cards/C14/-487-hr.jpg"; - else if(id.equals("202474t") || id.equals("1098t") || id.equals("2024t") || id.equals("3766t") || id.equals("11183t") || id.equals("902t")) + else if (id.equals("202474t") || id.equals("1098t") || id.equals("2024t") || id.equals("3766t") || id.equals("11183t") || id.equals("902t")) tokenurl = "https://deckmaster.info/images/cards/AST/-884-hr.jpg"; - else if(id.equals("202590t") || id.equals("2073t") || id.equals("1027t")) + else if (id.equals("202590t") || id.equals("2073t") || id.equals("1027t")) tokenurl = "https://deckmaster.info/images/cards/AST/-892-hr.jpg"; - else if(id.equals("3809t") || id.equals("2792t") || id.equals("1422t")) + else if (id.equals("3809t") || id.equals("2792t") || id.equals("1422t")) tokenurl = "https://deckmaster.info/images/cards/AST/-886-hr.jpg"; - else if(id.equals("407540t") || id.equals("407672t") || id.equals("407525t")) + else if (id.equals("407540t") || id.equals("407672t") || id.equals("407525t")) tokenurl = "https://deckmaster.info/images/cards/BFZ/-944-hr.jpg"; - else if(id.equals("460768t")) + else if (id.equals("460768t")) tokenurl = "https://deckmaster.info/images/cards/C15/-2009-hr.jpg"; - else if(id.equals("201124t") || id.equals("3118t")) + else if (id.equals("201124t") || id.equals("3118t")) tokenurl = "https://deckmaster.info/images/cards/AL/-2029-hr.jpg"; - else if(id.equals("184730t") || id.equals("3192t") || id.equals("3193t")) + else if (id.equals("184730t") || id.equals("3192t") || id.equals("3193t")) tokenurl = "https://deckmaster.info/images/cards/AL/-2028-hr.jpg"; - else if(id.equals("25910t")) + else if (id.equals("25910t")) tokenurl = "https://deckmaster.info/images/cards/AP/-2032-hr.jpg"; - else if(id.equals("6142t")) + else if (id.equals("6142t")) tokenurl = "https://deckmaster.info/images/cards/EX/-2035-hr.jpg"; - else if(id.equals("34929t")) + else if (id.equals("34929t")) tokenurl = "https://deckmaster.info/images/cards/JUD/-2043-hr.jpg"; - else if(id.equals("1649t") || id.equals("201182t")) + else if (id.equals("1649t") || id.equals("201182t")) tokenurl = "https://deckmaster.info/images/cards/LE/-2046-hr.jpg"; - else if(id.equals("4854t") || id.equals("376556t")) + else if (id.equals("4854t") || id.equals("376556t")) tokenurl = "https://deckmaster.info/images/cards/TE/-2059-hr.jpg"; - else if(id.equals("4771t")) + else if (id.equals("4771t")) tokenurl = "https://deckmaster.info/images/cards/TE/-2060-hr.jpg"; - else if(id.equals("9667t")) + else if (id.equals("9667t")) tokenurl = "https://deckmaster.info/images/cards/UG/-2062-hr.jpg"; else if (id.equals("74265t")) tokenurl = "https://deckmaster.info/images/cards/UNH/-2064-hr.jpg"; else if (id.equals("73953t")) tokenurl = "https://deckmaster.info/images/cards/UNH/-2065-hr.jpg"; - else if(id.equals("25956t")) + else if (id.equals("25956t")) tokenurl = "https://deckmaster.info/images/cards/AP/-2069-hr.jpg"; - else if(id.equals("184598t") || id.equals("2959t")) + else if (id.equals("184598t") || id.equals("2959t")) tokenurl = "https://deckmaster.info/images/cards/HM/-2070-hr.jpg"; else if (id.equals("111046t")) tokenurl = "https://deckmaster.info/images/cards/PLC/-2071-hr.jpg"; - else if(id.equals("27634t") || id.equals("3227t")) + else if (id.equals("27634t") || id.equals("3227t")) tokenurl = "https://deckmaster.info/images/cards/PS/-2072-hr.jpg"; - else if(id.equals("3148t")) + else if (id.equals("3148t")) tokenurl = "https://deckmaster.info/images/cards/AL/-2156-hr.jpg"; - else if(id.equals("26815t")) + else if (id.equals("26815t")) tokenurl = "https://deckmaster.info/images/cards/AP/-2163-hr.jpg"; - else if(id.equals("1534t")) + else if (id.equals("1534t")) tokenurl = "https://deckmaster.info/images/cards/LE/-2165-hr.jpg"; - else if(id.equals("130314t")) + else if (id.equals("130314t")) tokenurl = "https://deckmaster.info/images/cards/FUT/-2168-hr.jpg"; - else if(id.equals("116383t")) + else if (id.equals("116383t")) tokenurl = "https://deckmaster.info/images/cards/TSP/-2170-hr.jpg"; - else if(id.equals("124344t")) + else if (id.equals("124344t")) tokenurl = "https://deckmaster.info/images/cards/PLC/-2172-hr.jpg"; - else if(id.equals("376404t")) + else if (id.equals("376404t")) tokenurl = "https://deckmaster.info/images/cards/OGW/-2189-hr.jpg"; - else if(id.equals("409810t") || id.equals("409805t") || id.equals("409953t") || id.equals("409997t") || id.equals("410032t")) + else if (id.equals("409810t") || id.equals("409805t") || id.equals("409953t") || id.equals("409997t") || id.equals("410032t")) tokenurl = "https://deckmaster.info/images/cards/SOI/-2404-hr.jpg"; - else if(id.equals("3242t")) + else if (id.equals("3242t")) tokenurl = "https://deckmaster.info/images/cards/MI/-2828-hr.jpg"; else if (id.equals("21382t")) tokenurl = "https://deckmaster.info/images/cards/PR/-2835-hr.jpg"; - else if(id.equals("46168t")) + else if (id.equals("46168t")) tokenurl = "https://deckmaster.info/images/cards/KLD/-3287-hr.jpg"; - else if(id.equals("423843t") || id.equals("423739t") || id.equals("423718t") || id.equals("423736t") || + else if (id.equals("423843t") || id.equals("423739t") || id.equals("423718t") || id.equals("423736t") || id.equals("423691t") || id.equals("423743t") || id.equals("423769t") || id.equals("423670t") || id.equals("423796t") || id.equals("423680t") || id.equals("423693t")) tokenurl = "https://deckmaster.info/images/cards/KLD/-3289-hr.jpg"; - else if(id.equals("265141t")) + else if (id.equals("265141t")) tokenurl = "https://deckmaster.info/images/cards/VMA/-4465-hr.jpg"; - else if(id.equals("401697t") || id.equals("401692t") || id.equals("401701t")) + else if (id.equals("401697t") || id.equals("401692t") || id.equals("401701t")) tokenurl = "https://deckmaster.info/images/cards/C17/-5050-hr.jpg"; - else if(id.equals("376397t") || id.equals("107557t")) + else if (id.equals("376397t") || id.equals("107557t")) tokenurl = "https://deckmaster.info/images/cards/CMA/-5709-hr.jpg"; else if (id.equals("435411t") || id.equals("435410t")) tokenurl = "https://deckmaster.info/images/cards/XLN/-5173-hr.jpg"; - else if(id.equals("1686t") || id.equals("2881t") || id.equals("201231t")) + else if (id.equals("1686t") || id.equals("2881t") || id.equals("201231t")) tokenurl = "https://deckmaster.info/images/cards/A25/-5648-hr.jpg"; - else if(id.equals("439843t")) + else if (id.equals("439843t")) tokenurl = "https://deckmaster.info/images/cards/RIX/-5473-hr.jpg"; - else if(id.equals("452760t")) + else if (id.equals("452760t")) tokenurl = "https://deckmaster.info/images/cards/M19/-6036.jpg"; - else if(id.equals("89110t")) + else if (id.equals("89110t")) tokenurl = "https://deckmaster.info/images/cards/GK1_SELESN/-6550-hr.jpg"; - else if(id.equals("3832t")) + else if (id.equals("3832t")) tokenurl = "https://deckmaster.info/images/cards/GK1_DIMIR/-6541-hr.jpg"; - else if(id.equals("116384t") || id.equals("376564t")) + else if (id.equals("116384t") || id.equals("376564t")) tokenurl = "https://deckmaster.info/images/cards/TSP/-114916-hr.jpg"; - else if(id.equals("5610t")) + else if (id.equals("5610t")) tokenurl = "https://deckmaster.info/images/cards/DDE/207998-hr.jpg"; - else if(id.equals("5173t")) + else if (id.equals("5173t")) tokenurl = "https://deckmaster.info/images/cards/DDE/209163-hr.jpg"; - else if(id.equals("271158t") || id.equals("401703t")) + else if (id.equals("271158t") || id.equals("401703t")) tokenurl = "https://deckmaster.info/images/cards/DDP/401721-hr.jpg"; else if (id.equals("88973t") || id.equals("368549t")) tokenurl = "https://deckmaster.info/images/cards/DDQ/409655-hr.jpg"; - else if(id.equals("3392t") || id.equals("220535t") || id.equals("376253t") || id.equals("376390t") || id.equals("401643t")) + else if (id.equals("3392t") || id.equals("220535t") || id.equals("376253t") || id.equals("376390t") || id.equals("401643t")) tokenurl = "https://deckmaster.info/images/cards/DDR/417498-hr.jpg"; - else if(id.equals("21381t") || id.equals("40198t")) + else if (id.equals("21381t") || id.equals("40198t")) tokenurl = "https://img.scryfall.com/cards/large/back/8/c/8ce60642-e207-46e6-b198-d803ff3b47f4.jpg?1562921132"; - else if(id.equals("461099t")) + else if (id.equals("461099t")) tokenurl = "https://img.scryfall.com/cards/large/front/d/e/de7ba875-f77b-404f-8b75-4ba6f81da410.jpg?1557575978"; - else if(id.equals("426909t") || id.equals("426705t")) + else if (id.equals("426909t") || id.equals("426705t")) tokenurl = "https://img.scryfall.com/cards/large/front/9/8/98956e73-04e4-4d7f-bda5-cfa78eb71350.jpg?1562844807"; - else if(id.equals("426897t")) + else if (id.equals("426897t")) tokenurl = "https://img.scryfall.com/cards/large/front/a/8/a8f339c6-2c0d-4631-849b-44d4360b5131.jpg?1562844814"; - else if(id.equals("457139t")) + else if (id.equals("457139t")) tokenurl = "https://img.scryfall.com/cards/large/front/1/0/105e687e-7196-4010-a6b7-cfa42d998fa4.jpg?1560096976"; - else if(id.equals("470549t")) + else if (id.equals("470549t")) tokenurl = "https://img.scryfall.com/cards/large/front/7/7/7711a586-37f9-4560-b25d-4fb339d9cd55.jpg?1565299650"; - else if(id.equals("113527t") || id.equals("376321t")) + else if (id.equals("113527t") || id.equals("376321t")) tokenurl = "https://img.scryfall.com/cards/large/front/5/b/5b9f471a-1822-4981-95a9-8923d83ddcbf.jpg?1562702075"; - else if(id.equals("114919t") || id.equals("247519t")) + else if (id.equals("114919t") || id.equals("247519t")) tokenurl = "https://img.scryfall.com/cards/large/front/b/5/b5ddb67c-82fb-42d6-a4c2-11cd38eb128d.jpg?1562702281"; - else if(id.equals("8862t")) + else if (id.equals("8862t")) tokenurl = "https://img.scryfall.com/cards/large/front/d/b/dbf33cc3-254f-4c5c-be22-3a2d96f29b80.jpg?1562936030"; - else if(id.equals("213757t") || id.equals("213734t") || id.equals("221554t") || id.equals("48049t") || + else if (id.equals("213757t") || id.equals("213734t") || id.equals("221554t") || id.equals("48049t") || id.equals("46160t") || id.equals("47450t") || id.equals("376421t") || id.equals("213725t")) tokenurl = "https://img.scryfall.com/cards/large/front/f/3/f32ad93f-3fd5-465c-ac6a-6f8fb57c19bd.jpg?1561758422"; - else if(id.equals("247393t") || id.equals("247399t")) + else if (id.equals("247393t") || id.equals("247399t")) tokenurl = "https://img.scryfall.com/cards/large/front/1/f/1feaa879-ceb3-4b20-8021-ae41d8be9005.jpg?1562636755"; - else if(id.equals("152998t") || id.equals("152963t")) + else if (id.equals("152998t") || id.equals("152963t")) tokenurl = "https://img.scryfall.com/cards/large/front/9/5/959ed4bf-b276-45ed-b44d-c757e9c25846.jpg?1562702204"; - else if(id.equals("46703t") || id.equals("227151t") || id.equals("205298t")) + else if (id.equals("46703t") || id.equals("227151t") || id.equals("205298t")) tokenurl = "https://img.scryfall.com/cards/large/front/0/a/0a9a25fd-1a4c-4d63-bbfa-296ef53feb8b.jpg?1562541933"; - else if(id.equals("394380t")) + else if (id.equals("394380t")) tokenurl = "https://img.scryfall.com/cards/large/front/6/2/622397a1-6513-44b9-928a-388be06d4022.jpg?1562702085"; - else if(id.equals("1138t") || id.equals("2074t") || id.equals("640t") || id.equals("3814t") || id.equals("11530t") || - id.equals("43t") || id.equals("338t")) + else if (id.equals("1138t") || id.equals("2074t") || id.equals("640t") || id.equals("3814t") || id.equals("11530t") || + id.equals("43t") || id.equals("338t")) tokenurl = "https://img.scryfall.com/cards/large/front/c/7/c75b81b5-5c84-45d4-832a-20c038372bc6.jpg?1561758040"; - else if(id.equals("275261t") || id.equals("271156t")) + else if (id.equals("275261t") || id.equals("271156t")) tokenurl = "https://img.scryfall.com/cards/large/front/1/f/1feaa879-ceb3-4b20-8021-ae41d8be9005.jpg?1562636755"; - else if(id.equals("376455t")) + else if (id.equals("376455t")) tokenurl = "https://img.scryfall.com/cards/large/front/9/e/9e0eeebf-7c4a-436b-8cb4-292e53783ff2.jpg?1562926847"; - else if(id.equals("74492t")) + else if (id.equals("74492t")) tokenurl = "https://media.mtgsalvation.com/attachments/94/295/635032496473215708.jpg"; - else if(id.equals("3280t")) + else if (id.equals("3280t")) tokenurl = "https://media.mtgsalvation.com/attachments/54/421/635032484680831888.jpg"; - else if(id.equals("107091t")) + else if (id.equals("107091t")) tokenurl = "https://media.mtgsalvation.com/attachments/13/534/635032476540667501.jpg"; - else if(id.equals("184735t") || id.equals("376488t") || id.equals("3066t") || id.equals("121261t")) + else if (id.equals("184735t") || id.equals("376488t") || id.equals("3066t") || id.equals("121261t")) tokenurl = "https://i.pinimg.com/originals/a9/fb/37/a9fb37bdfa8f8013b7eb854d155838e2.jpg"; - else if(id.equals("205297t") || id.equals("50104t")) + else if (id.equals("205297t") || id.equals("50104t")) tokenurl = "https://i.pinimg.com/564x/cc/96/e3/cc96e3bdbe7e0f4bf1c0c1f942c073a9.jpg"; - else if(id.equals("3591t")) + else if (id.equals("3591t")) tokenurl = "https://i.pinimg.com/564x/6e/8d/fe/6e8dfeee2919a3efff210df56ab7b85d.jpg"; - else if(id.equals("136155t")) + else if (id.equals("136155t")) tokenurl = "https://i.pinimg.com/564x/5d/68/d6/5d68d67bef76bf90588a4afdc39dc60e.jpg"; - else if(id.equals("439538t")) + else if (id.equals("439538t")) tokenurl = "https://i.pinimg.com/originals/da/e3/31/dae3312aa1f15f876ebd363898847e23.jpg"; - else if(id.equals("3421t") || id.equals("15434t")) + else if (id.equals("3421t") || id.equals("15434t")) tokenurl = "https://www.mtg.onl/static/3c152b4fc1c64e3ce21022f53ec16559/4d406/PROXY_Cat_G_1_1.jpg"; - else if(id.equals("73976t")) + else if (id.equals("73976t")) tokenurl = "https://www.mtg.onl/static/8bbca3c195e798ca92b4a112275072e2/4d406/PROXY_Ape_G_1_1.jpg"; - else if(id.equals("49026t")) + else if (id.equals("49026t")) tokenurl = "https://www.mtg.onl/static/a9d81341e62e39e75075b573739f39d6/4d406/PROXY_Wirefly_2_2.jpg"; - else if(id.equals("3449t")) + else if (id.equals("3449t")) tokenurl = "https://www.mtg.onl/static/8c7fed1a0b8edd97c0fb0ceab24a654f/4d406/PROXY_Goblin_Scout_R_1_1.jpg"; - else if(id.equals("24624t")) + else if (id.equals("24624t")) tokenurl = "https://www.mtg.onl/static/6d717cba653ea9e3f6bd1419741671cb/4d406/PROXY_Minion_B_1_1.jpg"; - else if(id.equals("89051t")) + else if (id.equals("89051t")) tokenurl = "https://www.mtg.onl/static/b7625a256e10bcec251a1a0abbf17bd4/4d406/PROXY_Horror_B_4_4.jpg"; - else if(id.equals("72858t")) + else if (id.equals("72858t")) tokenurl = "https://www.mtg.onl/static/348314ede9097dd8f6dd018a6502d125/4d406/PROXY_Pincher_2_2.jpg"; - else if(id.equals("3113t")) + else if (id.equals("3113t")) tokenurl = "https://www.mtg.onl/static/fca7508d78c26e3daea78fd4640faf9a/4d406/PROXY_Orb_U_X_X.jpg"; - else if(id.equals("74027t")) + else if (id.equals("74027t")) tokenurl = "https://www.mtg.onl/static/48515f01d0fda15dd9308d3a528dae7b/4d406/PROXY_Spirit_W_3_3.jpg"; - else if(id.equals("23319t")) + else if (id.equals("23319t")) tokenurl = "https://www.mtg.onl/static/0f8b0552293c03a3a29614cc83024337/4d406/PROXY_Reflection_W_X_X.jpg"; - else if(id.equals("130638t")) + else if (id.equals("130638t")) tokenurl = "https://www.mtg.onl/static/20b01e1378e7b8e8b47066c52761fde2/4d406/PROXY_Giant_R_4_4.jpg"; - else if(id.equals("74411t")) + else if (id.equals("74411t")) tokenurl = "https://www.mtg.onl/static/5f65ea90850736160a28f3a5bd56744a/4d406/PROXY_Warrior_R_1_1.jpg"; else if (id.equals("121156t")) tokenurl = "https://www.mtg.onl/static/3db04e8bdd45aac4bb25bb85cdb05ac0/4d406/PROXY_Wolf_G_1_1.jpg"; - else if(id.equals("126816t")) + else if (id.equals("126816t")) tokenurl = "https://www.mtg.onl/static/e25f8b900e6238d0047039da4690f1c4/4d406/PROXY_Knight_B_2_2.jpg"; - else if(id.equals("75291t")) + else if (id.equals("75291t")) tokenurl = "http://4.bp.blogspot.com/-y5Fanm3qvrU/Vmd4gGnl2DI/AAAAAAAAAWY/FCrS9FTgOJk/s1600/Tatsumasa%2BToken.jpg"; else if (id.equals("26732t")) tokenurl = "http://1.bp.blogspot.com/-0-mLvfUVgNk/VmdZWXWxikI/AAAAAAAAAUM/TVCIiZ_c67g/s1600/Spawn%2BToken.jpg"; - else if(id.equals("47449t")) + else if (id.equals("47449t")) tokenurl = "https://1.bp.blogspot.com/-vrgXPWqThMw/XTyInczwobI/AAAAAAAADW4/SEceF3nunBkiCmHWfx6UxEUMF_gqdrvUQCLcBGAs/s1600/Kaldra%2BToken%2BUpdate.jpg"; - else if(id.equals("5261t")) + else if (id.equals("5261t")) tokenurl = "https://static.cardmarket.com/img/5a0199344cad68eebeefca6fa24e52c3/items/1/MH1/376905.jpg"; - else if(id.equals("430686t")) + else if (id.equals("430686t")) tokenurl = "https://cdn.shopify.com/s/files/1/1601/3103/products/Token_45_2000x.jpg?v=1528922847"; - else if(id.equals("405191t")) + else if (id.equals("405191t")) tokenurl = "https://6d4be195623157e28848-7697ece4918e0a73861de0eb37d08968.ssl.cf1.rackcdn.com/108181_200w.jpg"; return tokenurl; @@ -1304,7 +1283,7 @@ public class ImgDownloader { Map mappa = new HashMap(); ZipFile zipFile = null; InputStream stream = null; - java.nio.file.Path filePath = null; + File filePath = null; try { zipFile = new ZipFile(basePath + File.separator + listOfFiles[0].getName()); Enumeration e = zipFile.entries(); @@ -1317,10 +1296,9 @@ public class ImgDownloader { if (set.equalsIgnoreCase(names[1])) { stream = zipFile.getInputStream(entry); byte[] buffer = new byte[1]; - java.nio.file.Path outDir = Paths.get(basePath); - filePath = outDir.resolve("_cards.dat"); + filePath = new File(basePath + File.separator + "_cards.dat"); try { - FileOutputStream fos = new FileOutputStream(filePath.toFile()); + FileOutputStream fos = new FileOutputStream(filePath); BufferedOutputStream bos = new BufferedOutputStream(fos, buffer.length); int len; while ((len = stream.read(buffer)) != -1) { @@ -1382,7 +1360,7 @@ public class ImgDownloader { set.equals("UNH") || set.equals("XLN") || set.equals("SOI") || set.equals("SOK") || set.equals("BOK") || set.equals("CHK")) rarity = ""; - if(id != null && (id.equals("209162") || id.equals("209163") || id.equals("401721") || id.equals("401722"))) + if (id != null && (id.equals("209162") || id.equals("209163") || id.equals("401721") || id.equals("401722"))) rarity = "t"; int c = lines.indexOf("[/card]", lastIndex); if (c > 0) @@ -1592,7 +1570,7 @@ public class ImgDownloader { } continue; } - if(id.endsWith("t")) + if (id.endsWith("t")) continue; Document doc = null; try {