diff --git a/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java b/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java index 7990b0c8e39..982703970a3 100644 --- a/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java +++ b/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java @@ -6,7 +6,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import forge.LobbyPlayer; import forge.ai.LobbyPlayerAi; -import forge.card.CardStateName; import forge.game.*; import forge.game.card.*; import forge.game.card.token.TokenInfo; diff --git a/forge-core/src/main/java/forge/util/FileUtil.java b/forge-core/src/main/java/forge/util/FileUtil.java index 212748744b1..00af3693cb9 100644 --- a/forge-core/src/main/java/forge/util/FileUtil.java +++ b/forge-core/src/main/java/forge/util/FileUtil.java @@ -286,4 +286,11 @@ public final class FileUtil { }, 5000); //abort reading file if it takes longer than 5 seconds return lines; } + + public static String getParent(final String resourcePath) { + File f = new File(resourcePath); + if (f.getParentFile().getName() != null) + return f.getParentFile().getName(); + return ""; + } } diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuDownloaders.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuDownloaders.java index b3fd57d9a7f..beb3adaeed9 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuDownloaders.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuDownloaders.java @@ -60,6 +60,11 @@ public enum CSubmenuDownloaders implements ICDoc { new GuiDownloader(new GuiDownloadPrices()).show(); } }; + private final UiCommand cmdDownloadSkins = new UiCommand() { + @Override public void run() { + new GuiDownloader(new GuiDownloadSkins()).show(); + } + }; private final UiCommand cmdHowToPlay = new UiCommand() { @Override public void run() { VSubmenuDownloaders.SINGLETON_INSTANCE.showHowToPlay(); @@ -102,6 +107,7 @@ public enum CSubmenuDownloaders implements ICDoc { view.setImportPicturesCommand(cmdImportPictures); view.setHowToPlayCommand(cmdHowToPlay); view.setDownloadPricesCommand(cmdDownloadPrices); + view.setDownloadSkinsCommand(cmdDownloadSkins); view.setLicensingCommand(cmdLicensing); } diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java index 827218156ac..e379817f514 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java @@ -66,6 +66,7 @@ public enum VSubmenuDownloaders implements IVSubmenu { private final FLabel btnImportPictures = _makeButton(localizer.getMessage("btnImportPictures")); private final FLabel btnHowToPlay = _makeButton(localizer.getMessage("btnHowToPlay")); private final FLabel btnDownloadPrices = _makeButton(localizer.getMessage("btnDownloadPrices")); + private final FLabel btnDownloadSkins = _makeButton(localizer.getMessage("btnDownloadSkins")); private final FLabel btnLicensing = _makeButton(localizer.getMessage("btnLicensing")); /** @@ -102,6 +103,9 @@ public enum VSubmenuDownloaders implements IVSubmenu { pnlContent.add(btnDownloadPrices, constraintsBTN); pnlContent.add(_makeLabel(localizer.getMessage("lblDownloadPrices")), constraintsLBL); + pnlContent.add(btnDownloadSkins, constraintsBTN); + pnlContent.add(_makeLabel(localizer.getMessage("lblDownloadSkins")), constraintsLBL); + } else { String text = localizer.getMessage("lblYourVersionOfJavaIsTooOld"); @@ -178,6 +182,7 @@ public enum VSubmenuDownloaders implements IVSubmenu { public void setHowToPlayCommand(UiCommand command) { btnHowToPlay.setCommand(command); } public void setDownloadPricesCommand(UiCommand command) { btnDownloadPrices.setCommand(command); } public void setLicensingCommand(UiCommand command) { btnLicensing.setCommand(command); } + public void setDownloadSkinsCommand(UiCommand command) { btnDownloadSkins.setCommand(command); } public void focusTopButton() { btnDownloadPics.requestFocusInWindow(); diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java index d6c34819a06..92d38f61c10 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java @@ -1089,6 +1089,7 @@ public class FSkin { if (allSkins == null) { //initialize allSkins = new ArrayList<>(); + allSkins.add("Default");//init default final List skinDirectoryNames = getSkinDirectoryNames(); for (String skinDirectoryName : skinDirectoryNames) { allSkins.add(WordUtil.capitalize(skinDirectoryName.replace('_', ' '))); @@ -1101,7 +1102,7 @@ public class FSkin { // Non-default (preferred) skin name and dir. preferredName = skinName.toLowerCase().replace(' ', '_'); - preferredDir = ForgeConstants.SKINS_DIR + preferredName + "/"; + preferredDir = preferredName.equals("default") ? ForgeConstants.DEFAULT_SKINS_DIR : ForgeConstants.CACHE_SKINS_DIR + preferredName + "/"; if (onInit) { final File f = new File(preferredDir + ForgeConstants.SPLASH_BG_FILE); @@ -1371,7 +1372,7 @@ public class FSkin { public static List getSkinDirectoryNames() { final List mySkins = new ArrayList<>(); - final File dir = new File(ForgeConstants.SKINS_DIR); + final File dir = new File(ForgeConstants.CACHE_SKINS_DIR); final String[] children = dir.list(); if (children == null) { System.err.println("FSkin > can't find skins directory!"); diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java index 6f74fd30d77..553fef18239 100644 --- a/forge-gui-mobile/src/forge/assets/FSkin.java +++ b/forge-gui-mobile/src/forge/assets/FSkin.java @@ -97,7 +97,7 @@ public class FSkin { Forge.hdstart = false; //ensure skins directory exists - final FileHandle dir = Gdx.files.absolute(ForgeConstants.SKINS_DIR); + final FileHandle dir = Gdx.files.absolute(ForgeConstants.CACHE_SKINS_DIR); if (!dir.exists() || !dir.isDirectory()) { //if skins directory doesn't exist, point to internal assets/skin directory instead for the sake of the splash screen preferredDir = Gdx.files.internal("fallback_skin"); @@ -106,6 +106,7 @@ public class FSkin { if (splashScreen != null) { if (allSkins == null) { //initialize allSkins = new Array<>(); + allSkins.add("Default"); //init default final Array skinDirectoryNames = getSkinDirectoryNames(); for (final String skinDirectoryName : skinDirectoryNames) { allSkins.add(WordUtil.capitalize(skinDirectoryName.replace('_', ' '))); @@ -115,7 +116,7 @@ public class FSkin { } // Non-default (preferred) skin name and dir. - preferredDir = Gdx.files.absolute(ForgeConstants.SKINS_DIR + preferredName); + preferredDir = Gdx.files.absolute(preferredName.equals("default") ? ForgeConstants.BASE_SKINS_DIR + preferredName : ForgeConstants.CACHE_SKINS_DIR + preferredName); if (!preferredDir.exists() || !preferredDir.isDirectory()) { preferredDir.mkdirs(); } @@ -219,8 +220,12 @@ public class FSkin { try { textures.put(f1.path(), new Texture(f1)); - textures.put(f2.path(), new Texture(f2)); - Pixmap preferredIcons = new Pixmap(f2); + Pixmap preferredIcons = new Pixmap(f1); + if (f2.exists()) { + textures.put(f2.path(), new Texture(f2)); + preferredIcons = new Pixmap(f2); + } + textures.put(f3.path(), new Texture(f3)); if (f6.exists()) { textures.put(f6.path(), new Texture(f6)); @@ -429,7 +434,7 @@ public class FSkin { public static Array getSkinDirectoryNames() { final Array mySkins = new Array<>(); - final FileHandle dir = Gdx.files.absolute(ForgeConstants.SKINS_DIR); + final FileHandle dir = Gdx.files.absolute(ForgeConstants.CACHE_SKINS_DIR); for (FileHandle skinFile : dir.list()) { String skinName = skinFile.name(); if (skinName.equalsIgnoreCase(".svn")) { continue; } diff --git a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java index bb2ff928276..99f91e5986d 100644 --- a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java +++ b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java @@ -8,6 +8,7 @@ import forge.download.GuiDownloadQuestImages; import forge.download.GuiDownloadSetPicturesLQ; import forge.download.GuiDownloadService; +import forge.download.GuiDownloadSkins; import forge.util.Localizer; import org.apache.commons.lang3.StringUtils; @@ -76,7 +77,13 @@ public class FilesPage extends TabPage { return new GuiDownloadPrices(); } }, 0); - + lstItems.addItem(new ContentDownloader(localizer.getMessage("btnDownloadSkins"), + localizer.getMessage("lblDownloadSkins")) { + @Override + protected GuiDownloadService createService() { + return new GuiDownloadSkins(); + } + }, 0); //storage locations final StorageOption cardPicsOption = new StorageOption(localizer.getMessage("lblCardPicsLocation"), ForgeProfileProperties.getCardPicsDir()) { @Override diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java index 50c56f3e00d..c8a67e0f169 100644 --- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java +++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java @@ -510,8 +510,10 @@ public class SettingsPage extends TabPage { public CustomSelectSetting(FPref pref0, String label0, String description0, Iterable options0) { super(pref0, label0 + ":", description0); - for (String option : options0) { - options.add(option); + if (options0 != null) { + for (String option : options0) { + options.add(option); + } } } public > CustomSelectSetting(FPref pref0, String label0, String description0, Class enumData) { diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index a7ba3da8746..fa8cb9aeec5 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -206,6 +206,7 @@ lblListImageData=Prüfe auf von Forge nicht unterstütze Karten und fehlende Kar btnImportPictures=Daten importieren btnHowToPlay=Wie man spielt btnDownloadPrices=Kartenpreise herunterladen +btnDownloadSkins=Download Skins btnLicensing=Lizenzhinweis lblCheckForUpdates=Prüfe Server auf eine aktuellere Version lblDownloadPics=Lädt ein Standardbild pro Karte. @@ -214,6 +215,7 @@ lblDownloadSetPics=Lädt alle Bilder pro Karte. Eines für jedes Set, in welchem lblDownloadQuestImages=Lädt die Bilder für den Quest-Modus. lblDownloadAchievementImages=Lädt die Bilder zu den möglichen Erfolgen. Verschönert die Trophäensammlung. lblDownloadPrices=Lädt aktuelle Kartenpreise für den Kartenladen im Spiel. +lblDownloadSkins=Download available skins used in customizing forge appearance. lblYourVersionOfJavaIsTooOld=Deine Java-Version ist leider zu alt. lblPleaseUpdateToTheLatestVersionOfJava=Bitte aktualisiere auf die neueste Java-Version. lblYoureRunning=Du nutzt diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index 92814be2cf8..b15eb0405b7 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -206,6 +206,7 @@ lblListImageData=Audit cards not implemented by Forge and missing card images btnImportPictures=Import Data btnHowToPlay=How To Play btnDownloadPrices=Download Card Prices +btnDownloadSkins=Download Skins btnLicensing=License Details lblCheckForUpdates=Check Forge server to see if there''s a more recent release lblDownloadPics=Download default card picture for each card. @@ -214,6 +215,7 @@ lblDownloadSetPics=Download all pictures of each card (one for each set the card lblDownloadQuestImages=Download tokens and icons used in Quest mode. lblDownloadAchievementImages=Download achievement images to really make your trophies stand out. lblDownloadPrices=Download up-to-date price list for in-game card shops. +lblDownloadSkins=Download available skins used in customizing forge appearance. lblYourVersionOfJavaIsTooOld=Your version of Java is too old to use the content downloaders. lblPleaseUpdateToTheLatestVersionOfJava=Please update to the latest version of Java lblYoureRunning=You''re running diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties index 168b0c4b15d..c01e204f6a9 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -206,6 +206,7 @@ lblListImageData=Audita cartas no implementadas por Forge e imágenes de cartas btnImportPictures=Importar Datos btnHowToPlay=Cómo jugar (Inglés) btnDownloadPrices=Descargar precios de las cartas +btnDownloadSkins=Download Skins btnLicensing=Detalles de la licencia lblCheckForUpdates=Comprueba si en el servidor de Forge existe alguna versión más reciente lblDownloadPics=Descarga una única carta de la última edición donde apareció. @@ -214,6 +215,7 @@ lblDownloadSetPics=Descarga las cartas de todas las ediciones (una por cada edic lblDownloadQuestImages=Descarga fichas e íconos utilizados en el modo Aventura. lblDownloadAchievementImages=Descarga las imágenes de los trofeos para que destaquen. lblDownloadPrices=Descarga la lista de precios actualizada para la tienda de cartas del juego. +lblDownloadSkins=Download available skins used in customizing forge appearance. lblYourVersionOfJavaIsTooOld=Tu versión de Java es demasiado antigua para usar los descargadores de contenido. lblPleaseUpdateToTheLatestVersionOfJava=Por favor, actualiza a la última versión de Java lblYoureRunning=Estás ejecutando diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties index c185ccc905c..abb5cb41d82 100644 --- a/forge-gui/res/languages/it-IT.properties +++ b/forge-gui/res/languages/it-IT.properties @@ -206,6 +206,7 @@ lblListImageData=Carte di controllo non implementate da Forge e immagini di cart btnImportPictures=Importa dati btnHowToPlay=Come giocare btnDownloadPrices=Scarica i prezzi delle carte +btnDownloadSkins=Download Skins btnLicensing=Dettagli della licenza lblCheckForUpdates=Check Forge server to see if there''s a more recent release lblDownloadPics=Scarica l''immagine della carta predefinita per ogni carta. @@ -214,6 +215,7 @@ lblDownloadSetPics=Scarica tutte le immagini di ogni carta (una per ogni set in lblDownloadQuestImages=Scarica i token e le icone utilizzati nella modalità Quest. lblDownloadAchievementImages=Scarica le immagini degli obiettivi per far risaltare davvero i tuoi trofei. lblDownloadPrices=Scarica il listino aggiornato per i negozi di carte di gioco. +lblDownloadSkins=Download available skins used in customizing forge appearance. lblYourVersionOfJavaIsTooOld=La tua versione di Java è troppo vecchia per utilizzare i downloader di contenuti. lblPleaseUpdateToTheLatestVersionOfJava=Si prega di aggiornare all''ultima versione di Java lblYoureRunning=Stai correndo diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index 45833524a85..2e85f608ffc 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -206,6 +206,7 @@ lblListImageData=统计Forge实现且缺少的图片的牌 btnImportPictures=导入数据 btnHowToPlay=如何玩 btnDownloadPrices=下载卡牌价格 +btnDownloadSkins=Download Skins btnLicensing=许可证详情 lblCheckForUpdates=查看是否有新的版本 lblDownloadPics=下载缺省牌的图片 @@ -214,6 +215,7 @@ lblDownloadSetPics=下载每张牌的图片（每张牌出现一次） lblDownloadQuestImages=下载冒险之旅里使用的衍生物与图标 lblDownloadAchievementImages=下载成就图片，让你的奖杯更引人注目。 lblDownloadPrices=下载卡牌商店最新的价格表 +lblDownloadSkins=Download available skins used in customizing forge appearance. lblYourVersionOfJavaIsTooOld=你的Java版本太旧无法开始下载内容 lblPleaseUpdateToTheLatestVersionOfJava=请更新到最新版本的JRE lblYoureRunning=你在运行 diff --git a/forge-gui/res/lists/skinsList.txt b/forge-gui/res/lists/skinsList.txt new file mode 100644 index 00000000000..6b7cefbb947 --- /dev/null +++ b/forge-gui/res/lists/skinsList.txt @@ -0,0 +1,119 @@ +https://downloads.cardforge.org/skins/arabian_nights/bg_match.jpg +https://downloads.cardforge.org/skins/arabian_nights/bg_splash.png +https://downloads.cardforge.org/skins/arabian_nights/bg_texture.jpg +https://downloads.cardforge.org/skins/arabian_nights/font1.ttf +https://downloads.cardforge.org/skins/arabian_nights/sprite_icons.png +https://downloads.cardforge.org/skins/comic/bg_match.jpg +https://downloads.cardforge.org/skins/comic/bg_splash.png +https://downloads.cardforge.org/skins/comic/bg_texture.jpg +https://downloads.cardforge.org/skins/comic/font1.ttf +https://downloads.cardforge.org/skins/comic/sprite_icons.png +https://downloads.cardforge.org/skins/darkforge/bg_chaos_wheel.png +https://downloads.cardforge.org/skins/darkforge/bg_match.jpg +https://downloads.cardforge.org/skins/darkforge/bg_splash.png +https://downloads.cardforge.org/skins/darkforge/bg_splash_hd.png +https://downloads.cardforge.org/skins/darkforge/bg_texture.jpg +https://downloads.cardforge.org/skins/darkforge/font1.ttf +https://downloads.cardforge.org/skins/darkforge/hd_logo.png +https://downloads.cardforge.org/skins/darkforge/sprite_avatars.png +https://downloads.cardforge.org/skins/darkforge/sprite_buttons.png +https://downloads.cardforge.org/skins/darkforge/sprite_icons.png +https://downloads.cardforge.org/skins/darkforge/sprite_start.png +https://downloads.cardforge.org/skins/darkforge/sprite_trophies.png +https://downloads.cardforge.org/skins/darkred/bg_match.jpg +https://downloads.cardforge.org/skins/darkred/bg_splash.png +https://downloads.cardforge.org/skins/darkred/bg_texture.jpg +https://downloads.cardforge.org/skins/darkred/font1.ttf +https://downloads.cardforge.org/skins/darkred/sprite_icons.png +https://downloads.cardforge.org/skins/darky/bg_match.jpg +https://downloads.cardforge.org/skins/darky/bg_splash.png +https://downloads.cardforge.org/skins/darky/bg_texture.jpg +https://downloads.cardforge.org/skins/darky/font1.ttf +https://downloads.cardforge.org/skins/darky/sprite_icons.png +https://downloads.cardforge.org/skins/dark_ascension/bg_match.jpg +https://downloads.cardforge.org/skins/dark_ascension/bg_splash.png +https://downloads.cardforge.org/skins/dark_ascension/bg_texture.jpg +https://downloads.cardforge.org/skins/dark_ascension/font1.ttf +https://downloads.cardforge.org/skins/dark_ascension/sprite_icons.png +https://downloads.cardforge.org/skins/firebloom/bg_match.jpg +https://downloads.cardforge.org/skins/firebloom/bg_splash.png +https://downloads.cardforge.org/skins/firebloom/bg_texture.jpg +https://downloads.cardforge.org/skins/firebloom/font1.ttf +https://downloads.cardforge.org/skins/firebloom/sprite_icons.png +https://downloads.cardforge.org/skins/inferno/bg_match.jpg +https://downloads.cardforge.org/skins/inferno/bg_splash.png +https://downloads.cardforge.org/skins/inferno/bg_texture.jpg +https://downloads.cardforge.org/skins/inferno/font1.ttf +https://downloads.cardforge.org/skins/inferno/sprite_icons.png +https://downloads.cardforge.org/skins/innistrad/bg_match.jpg +https://downloads.cardforge.org/skins/innistrad/bg_splash.png +https://downloads.cardforge.org/skins/innistrad/bg_texture.jpg +https://downloads.cardforge.org/skins/innistrad/font1.ttf +https://downloads.cardforge.org/skins/innistrad/sprite_icons.png +https://downloads.cardforge.org/skins/journeyman/bg_match.jpg +https://downloads.cardforge.org/skins/journeyman/bg_splash.png +https://downloads.cardforge.org/skins/journeyman/bg_texture.jpg +https://downloads.cardforge.org/skins/journeyman/font1.ttf +https://downloads.cardforge.org/skins/journeyman/sprite_icons.png +https://downloads.cardforge.org/skins/kamigawa/bg_match.jpg +https://downloads.cardforge.org/skins/kamigawa/bg_splash.png +https://downloads.cardforge.org/skins/kamigawa/bg_texture.jpg +https://downloads.cardforge.org/skins/kamigawa/font1.ttf +https://downloads.cardforge.org/skins/kamigawa/sprite_icons.png +https://downloads.cardforge.org/skins/marble_blue/bg_match.jpg +https://downloads.cardforge.org/skins/marble_blue/bg_splash.png +https://downloads.cardforge.org/skins/marble_blue/bg_texture.jpg +https://downloads.cardforge.org/skins/marble_blue/font1.ttf +https://downloads.cardforge.org/skins/marble_blue/notes.txt +https://downloads.cardforge.org/skins/marble_blue/sprite_icons.png +https://downloads.cardforge.org/skins/metalcraft/bg_match.jpg +https://downloads.cardforge.org/skins/metalcraft/bg_splash.png +https://downloads.cardforge.org/skins/metalcraft/bg_texture.jpg +https://downloads.cardforge.org/skins/metalcraft/font1.ttf +https://downloads.cardforge.org/skins/metalcraft/sprite_icons.png +https://downloads.cardforge.org/skins/mythic_rare/bg_match.jpg +https://downloads.cardforge.org/skins/mythic_rare/bg_splash.png +https://downloads.cardforge.org/skins/mythic_rare/bg_texture.jpg +https://downloads.cardforge.org/skins/mythic_rare/font1.ttf +https://downloads.cardforge.org/skins/mythic_rare/sprite_icons.png +https://downloads.cardforge.org/skins/phyrexia/bg_match.jpg +https://downloads.cardforge.org/skins/phyrexia/bg_splash.png +https://downloads.cardforge.org/skins/phyrexia/bg_texture.jpg +https://downloads.cardforge.org/skins/phyrexia/font1.ttf +https://downloads.cardforge.org/skins/phyrexia/sprite_icons.png +https://downloads.cardforge.org/skins/ravnica/bg_match.jpg +https://downloads.cardforge.org/skins/ravnica/bg_splash.png +https://downloads.cardforge.org/skins/ravnica/bg_texture.jpg +https://downloads.cardforge.org/skins/ravnica/font1.ttf +https://downloads.cardforge.org/skins/ravnica/sprite_icons.png +https://downloads.cardforge.org/skins/rebel/bg_match.jpg +https://downloads.cardforge.org/skins/rebel/bg_splash.png +https://downloads.cardforge.org/skins/rebel/bg_texture.jpg +https://downloads.cardforge.org/skins/rebel/font1.ttf +https://downloads.cardforge.org/skins/rebel/sprite_icons.png +https://downloads.cardforge.org/skins/sleeping_forest/bg_match.jpg +https://downloads.cardforge.org/skins/sleeping_forest/bg_splash.png +https://downloads.cardforge.org/skins/sleeping_forest/bg_texture.jpg +https://downloads.cardforge.org/skins/sleeping_forest/font1.ttf +https://downloads.cardforge.org/skins/sleeping_forest/sprite_icons.png +https://downloads.cardforge.org/skins/smith/bg_match.jpg +https://downloads.cardforge.org/skins/smith/bg_splash.png +https://downloads.cardforge.org/skins/smith/bg_texture.jpg +https://downloads.cardforge.org/skins/smith/font1.ttf +https://downloads.cardforge.org/skins/smith/sprite_icons.png +https://downloads.cardforge.org/skins/the_dale/bg_match.jpg +https://downloads.cardforge.org/skins/the_dale/bg_splash.png +https://downloads.cardforge.org/skins/the_dale/bg_texture.jpg +https://downloads.cardforge.org/skins/the_dale/font1.ttf +https://downloads.cardforge.org/skins/the_dale/sprite_icons.png +https://downloads.cardforge.org/skins/the_simpsons/bg_match.jpg +https://downloads.cardforge.org/skins/the_simpsons/bg_splash.png +https://downloads.cardforge.org/skins/the_simpsons/bg_texture.jpg +https://downloads.cardforge.org/skins/the_simpsons/font1.ttf +https://downloads.cardforge.org/skins/the_simpsons/sprite_avatars.png +https://downloads.cardforge.org/skins/the_simpsons/sprite_icons.png +https://downloads.cardforge.org/skins/zendikar/bg_match.jpg +https://downloads.cardforge.org/skins/zendikar/bg_splash.png +https://downloads.cardforge.org/skins/zendikar/bg_texture.jpg +https://downloads.cardforge.org/skins/zendikar/font1.ttf +https://downloads.cardforge.org/skins/zendikar/sprite_icons.png diff --git a/forge-gui/res/skins/arabian_nights/bg_match.jpg b/forge-gui/res/skins/arabian_nights/bg_match.jpg deleted file mode 100644 index 1a85b274024..00000000000 Binary files a/forge-gui/res/skins/arabian_nights/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/arabian_nights/bg_splash.png b/forge-gui/res/skins/arabian_nights/bg_splash.png deleted file mode 100644 index 8b4e3041588..00000000000 Binary files a/forge-gui/res/skins/arabian_nights/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/arabian_nights/bg_texture.jpg b/forge-gui/res/skins/arabian_nights/bg_texture.jpg deleted file mode 100644 index da62521ec05..00000000000 Binary files a/forge-gui/res/skins/arabian_nights/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/arabian_nights/font1.ttf b/forge-gui/res/skins/arabian_nights/font1.ttf deleted file mode 100644 index 8b7a6c92e9f..00000000000 Binary files a/forge-gui/res/skins/arabian_nights/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/arabian_nights/sprite_icons.png b/forge-gui/res/skins/arabian_nights/sprite_icons.png deleted file mode 100644 index d50775e8f63..00000000000 Binary files a/forge-gui/res/skins/arabian_nights/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/comic/bg_match.jpg b/forge-gui/res/skins/comic/bg_match.jpg deleted file mode 100644 index 0e17ab40aa4..00000000000 Binary files a/forge-gui/res/skins/comic/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/comic/bg_splash.png b/forge-gui/res/skins/comic/bg_splash.png deleted file mode 100644 index 7b350627cd3..00000000000 Binary files a/forge-gui/res/skins/comic/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/comic/bg_texture.jpg b/forge-gui/res/skins/comic/bg_texture.jpg deleted file mode 100644 index 370f9b87cce..00000000000 Binary files a/forge-gui/res/skins/comic/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/comic/font1.ttf b/forge-gui/res/skins/comic/font1.ttf deleted file mode 100644 index dd68def3b49..00000000000 Binary files a/forge-gui/res/skins/comic/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/comic/sprite_icons.png b/forge-gui/res/skins/comic/sprite_icons.png deleted file mode 100644 index 322cc064b75..00000000000 Binary files a/forge-gui/res/skins/comic/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/dark_ascension/bg_match.jpg b/forge-gui/res/skins/dark_ascension/bg_match.jpg deleted file mode 100644 index bf1b0446826..00000000000 Binary files a/forge-gui/res/skins/dark_ascension/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/dark_ascension/bg_splash.png b/forge-gui/res/skins/dark_ascension/bg_splash.png deleted file mode 100644 index 262681917c1..00000000000 Binary files a/forge-gui/res/skins/dark_ascension/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/dark_ascension/bg_texture.jpg b/forge-gui/res/skins/dark_ascension/bg_texture.jpg deleted file mode 100644 index 3c43f341e68..00000000000 Binary files a/forge-gui/res/skins/dark_ascension/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/dark_ascension/font1.ttf b/forge-gui/res/skins/dark_ascension/font1.ttf deleted file mode 100644 index 8cd78415278..00000000000 Binary files a/forge-gui/res/skins/dark_ascension/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/dark_ascension/sprite_icons.png b/forge-gui/res/skins/dark_ascension/sprite_icons.png deleted file mode 100644 index 83ffee25ce5..00000000000 Binary files a/forge-gui/res/skins/dark_ascension/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/darkforge/bg_chaos_wheel.png b/forge-gui/res/skins/darkforge/bg_chaos_wheel.png deleted file mode 100644 index 9800f5aff45..00000000000 Binary files a/forge-gui/res/skins/darkforge/bg_chaos_wheel.png and /dev/null differ diff --git a/forge-gui/res/skins/darkforge/bg_match.jpg b/forge-gui/res/skins/darkforge/bg_match.jpg deleted file mode 100644 index 5fe8905fbb2..00000000000 Binary files a/forge-gui/res/skins/darkforge/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/darkforge/bg_splash.png b/forge-gui/res/skins/darkforge/bg_splash.png deleted file mode 100644 index 9f686363ca5..00000000000 Binary files a/forge-gui/res/skins/darkforge/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/darkforge/bg_splash_hd.png b/forge-gui/res/skins/darkforge/bg_splash_hd.png deleted file mode 100644 index ceb26f07d83..00000000000 Binary files a/forge-gui/res/skins/darkforge/bg_splash_hd.png and /dev/null differ diff --git a/forge-gui/res/skins/darkforge/bg_texture.jpg b/forge-gui/res/skins/darkforge/bg_texture.jpg deleted file mode 100644 index ab54820d1df..00000000000 Binary files a/forge-gui/res/skins/darkforge/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/darkforge/font1.ttf b/forge-gui/res/skins/darkforge/font1.ttf deleted file mode 100644 index 81aa8defb4b..00000000000 Binary files a/forge-gui/res/skins/darkforge/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/darkforge/hd_logo.png b/forge-gui/res/skins/darkforge/hd_logo.png deleted file mode 100644 index c4dcb5036cc..00000000000 Binary files a/forge-gui/res/skins/darkforge/hd_logo.png and /dev/null differ diff --git a/forge-gui/res/skins/darkforge/sprite_avatars.png b/forge-gui/res/skins/darkforge/sprite_avatars.png deleted file mode 100644 index 12dbcbb61ed..00000000000 Binary files a/forge-gui/res/skins/darkforge/sprite_avatars.png and /dev/null differ diff --git a/forge-gui/res/skins/darkforge/sprite_buttons.png b/forge-gui/res/skins/darkforge/sprite_buttons.png deleted file mode 100644 index 35deb772ef9..00000000000 Binary files a/forge-gui/res/skins/darkforge/sprite_buttons.png and /dev/null differ diff --git a/forge-gui/res/skins/darkforge/sprite_icons.png b/forge-gui/res/skins/darkforge/sprite_icons.png deleted file mode 100644 index 3f83d37da80..00000000000 Binary files a/forge-gui/res/skins/darkforge/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/darkforge/sprite_start.png b/forge-gui/res/skins/darkforge/sprite_start.png deleted file mode 100644 index 310eb073465..00000000000 Binary files a/forge-gui/res/skins/darkforge/sprite_start.png and /dev/null differ diff --git a/forge-gui/res/skins/darkforge/sprite_trophies.png b/forge-gui/res/skins/darkforge/sprite_trophies.png deleted file mode 100644 index a9bc240154f..00000000000 Binary files a/forge-gui/res/skins/darkforge/sprite_trophies.png and /dev/null differ diff --git a/forge-gui/res/skins/darkred/bg_match.jpg b/forge-gui/res/skins/darkred/bg_match.jpg deleted file mode 100644 index fb7c0298072..00000000000 Binary files a/forge-gui/res/skins/darkred/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/darkred/bg_splash.png b/forge-gui/res/skins/darkred/bg_splash.png deleted file mode 100644 index 880e3c2068d..00000000000 Binary files a/forge-gui/res/skins/darkred/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/darkred/bg_texture.jpg b/forge-gui/res/skins/darkred/bg_texture.jpg deleted file mode 100644 index 3c221294890..00000000000 Binary files a/forge-gui/res/skins/darkred/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/darkred/font1.ttf b/forge-gui/res/skins/darkred/font1.ttf deleted file mode 100644 index 1f5704ed579..00000000000 Binary files a/forge-gui/res/skins/darkred/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/darkred/sprite_icons.png b/forge-gui/res/skins/darkred/sprite_icons.png deleted file mode 100644 index b1e19b256e3..00000000000 Binary files a/forge-gui/res/skins/darkred/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/darky/bg_match.jpg b/forge-gui/res/skins/darky/bg_match.jpg deleted file mode 100644 index ace2bf45d10..00000000000 Binary files a/forge-gui/res/skins/darky/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/darky/bg_splash.png b/forge-gui/res/skins/darky/bg_splash.png deleted file mode 100644 index 549afedbb77..00000000000 Binary files a/forge-gui/res/skins/darky/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/darky/bg_texture.jpg b/forge-gui/res/skins/darky/bg_texture.jpg deleted file mode 100644 index 9b0da179073..00000000000 Binary files a/forge-gui/res/skins/darky/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/darky/font1.ttf b/forge-gui/res/skins/darky/font1.ttf deleted file mode 100644 index 4b4ecc66671..00000000000 Binary files a/forge-gui/res/skins/darky/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/darky/sprite_icons.png b/forge-gui/res/skins/darky/sprite_icons.png deleted file mode 100644 index 8ae0e68c4e9..00000000000 Binary files a/forge-gui/res/skins/darky/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/firebloom/bg_match.jpg b/forge-gui/res/skins/firebloom/bg_match.jpg deleted file mode 100644 index fa664d0c43e..00000000000 Binary files a/forge-gui/res/skins/firebloom/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/firebloom/bg_splash.png b/forge-gui/res/skins/firebloom/bg_splash.png deleted file mode 100644 index fd63b8ee9d2..00000000000 Binary files a/forge-gui/res/skins/firebloom/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/firebloom/bg_texture.jpg b/forge-gui/res/skins/firebloom/bg_texture.jpg deleted file mode 100644 index 479dea8c51b..00000000000 Binary files a/forge-gui/res/skins/firebloom/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/firebloom/font1.ttf b/forge-gui/res/skins/firebloom/font1.ttf deleted file mode 100644 index 59b14a2d2d4..00000000000 Binary files a/forge-gui/res/skins/firebloom/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/firebloom/sprite_icons.png b/forge-gui/res/skins/firebloom/sprite_icons.png deleted file mode 100644 index 346e8e59541..00000000000 Binary files a/forge-gui/res/skins/firebloom/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/inferno/bg_match.jpg b/forge-gui/res/skins/inferno/bg_match.jpg deleted file mode 100644 index 8d04ecf0d89..00000000000 Binary files a/forge-gui/res/skins/inferno/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/inferno/bg_splash.png b/forge-gui/res/skins/inferno/bg_splash.png deleted file mode 100644 index 2bfb99b6298..00000000000 Binary files a/forge-gui/res/skins/inferno/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/inferno/bg_texture.jpg b/forge-gui/res/skins/inferno/bg_texture.jpg deleted file mode 100644 index 6d3203a8317..00000000000 Binary files a/forge-gui/res/skins/inferno/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/inferno/font1.ttf b/forge-gui/res/skins/inferno/font1.ttf deleted file mode 100644 index 146ad3c0b5c..00000000000 Binary files a/forge-gui/res/skins/inferno/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/inferno/sprite_icons.png b/forge-gui/res/skins/inferno/sprite_icons.png deleted file mode 100644 index b6b0fb537ce..00000000000 Binary files a/forge-gui/res/skins/inferno/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/innistrad/bg_match.jpg b/forge-gui/res/skins/innistrad/bg_match.jpg deleted file mode 100644 index 862452f2d64..00000000000 Binary files a/forge-gui/res/skins/innistrad/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/innistrad/bg_splash.png b/forge-gui/res/skins/innistrad/bg_splash.png deleted file mode 100644 index dcd906879a9..00000000000 Binary files a/forge-gui/res/skins/innistrad/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/innistrad/bg_texture.jpg b/forge-gui/res/skins/innistrad/bg_texture.jpg deleted file mode 100644 index fd8c5332a8f..00000000000 Binary files a/forge-gui/res/skins/innistrad/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/innistrad/font1.ttf b/forge-gui/res/skins/innistrad/font1.ttf deleted file mode 100644 index d7154a17b10..00000000000 Binary files a/forge-gui/res/skins/innistrad/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/innistrad/sprite_icons.png b/forge-gui/res/skins/innistrad/sprite_icons.png deleted file mode 100644 index b89b9d3daac..00000000000 Binary files a/forge-gui/res/skins/innistrad/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/journeyman/bg_match.jpg b/forge-gui/res/skins/journeyman/bg_match.jpg deleted file mode 100644 index dbf6095de89..00000000000 Binary files a/forge-gui/res/skins/journeyman/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/journeyman/bg_splash.png b/forge-gui/res/skins/journeyman/bg_splash.png deleted file mode 100644 index 49691861150..00000000000 Binary files a/forge-gui/res/skins/journeyman/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/journeyman/bg_texture.jpg b/forge-gui/res/skins/journeyman/bg_texture.jpg deleted file mode 100644 index ba4fb24f997..00000000000 Binary files a/forge-gui/res/skins/journeyman/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/journeyman/font1.ttf b/forge-gui/res/skins/journeyman/font1.ttf deleted file mode 100644 index 4b4ecc66671..00000000000 Binary files a/forge-gui/res/skins/journeyman/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/journeyman/sprite_icons.png b/forge-gui/res/skins/journeyman/sprite_icons.png deleted file mode 100644 index 25376009531..00000000000 Binary files a/forge-gui/res/skins/journeyman/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/kamigawa/bg_match.jpg b/forge-gui/res/skins/kamigawa/bg_match.jpg deleted file mode 100644 index 6e5d3cef206..00000000000 Binary files a/forge-gui/res/skins/kamigawa/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/kamigawa/bg_splash.png b/forge-gui/res/skins/kamigawa/bg_splash.png deleted file mode 100644 index ea32f4c9e60..00000000000 Binary files a/forge-gui/res/skins/kamigawa/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/kamigawa/bg_texture.jpg b/forge-gui/res/skins/kamigawa/bg_texture.jpg deleted file mode 100644 index f4d397df962..00000000000 Binary files a/forge-gui/res/skins/kamigawa/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/kamigawa/font1.ttf b/forge-gui/res/skins/kamigawa/font1.ttf deleted file mode 100644 index ac0cedf41e2..00000000000 Binary files a/forge-gui/res/skins/kamigawa/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/kamigawa/sprite_icons.png b/forge-gui/res/skins/kamigawa/sprite_icons.png deleted file mode 100644 index 9672d171dd2..00000000000 Binary files a/forge-gui/res/skins/kamigawa/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/marble_blue/bg_match.jpg b/forge-gui/res/skins/marble_blue/bg_match.jpg deleted file mode 100644 index be7d73da0f8..00000000000 Binary files a/forge-gui/res/skins/marble_blue/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/marble_blue/bg_splash.png b/forge-gui/res/skins/marble_blue/bg_splash.png deleted file mode 100644 index 8f47dec7581..00000000000 Binary files a/forge-gui/res/skins/marble_blue/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/marble_blue/bg_texture.jpg b/forge-gui/res/skins/marble_blue/bg_texture.jpg deleted file mode 100644 index be7d73da0f8..00000000000 Binary files a/forge-gui/res/skins/marble_blue/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/marble_blue/font1.ttf b/forge-gui/res/skins/marble_blue/font1.ttf deleted file mode 100644 index 40e9c69dcc9..00000000000 Binary files a/forge-gui/res/skins/marble_blue/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/marble_blue/notes.txt b/forge-gui/res/skins/marble_blue/notes.txt deleted file mode 100644 index e702719c531..00000000000 --- a/forge-gui/res/skins/marble_blue/notes.txt +++ /dev/null @@ -1,3 +0,0 @@ -Abbadon font used for splash. -Aller font used as font1. -Marbles rendered using VRay. \ No newline at end of file diff --git a/forge-gui/res/skins/marble_blue/sprite_icons.png b/forge-gui/res/skins/marble_blue/sprite_icons.png deleted file mode 100644 index 9b9c0d85367..00000000000 Binary files a/forge-gui/res/skins/marble_blue/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/metalcraft/bg_match.jpg b/forge-gui/res/skins/metalcraft/bg_match.jpg deleted file mode 100644 index cac561fe8e5..00000000000 Binary files a/forge-gui/res/skins/metalcraft/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/metalcraft/bg_splash.png b/forge-gui/res/skins/metalcraft/bg_splash.png deleted file mode 100644 index f187bacb7c6..00000000000 Binary files a/forge-gui/res/skins/metalcraft/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/metalcraft/bg_texture.jpg b/forge-gui/res/skins/metalcraft/bg_texture.jpg deleted file mode 100644 index 4b950221381..00000000000 Binary files a/forge-gui/res/skins/metalcraft/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/metalcraft/font1.ttf b/forge-gui/res/skins/metalcraft/font1.ttf deleted file mode 100644 index e3ed150c0bd..00000000000 Binary files a/forge-gui/res/skins/metalcraft/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/metalcraft/sprite_icons.png b/forge-gui/res/skins/metalcraft/sprite_icons.png deleted file mode 100644 index 12ba864d475..00000000000 Binary files a/forge-gui/res/skins/metalcraft/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/mythic_rare/bg_match.jpg b/forge-gui/res/skins/mythic_rare/bg_match.jpg deleted file mode 100644 index d78fd20e2ae..00000000000 Binary files a/forge-gui/res/skins/mythic_rare/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/mythic_rare/bg_splash.png b/forge-gui/res/skins/mythic_rare/bg_splash.png deleted file mode 100644 index e9f28372aaf..00000000000 Binary files a/forge-gui/res/skins/mythic_rare/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/mythic_rare/bg_texture.jpg b/forge-gui/res/skins/mythic_rare/bg_texture.jpg deleted file mode 100644 index d61a406bb64..00000000000 Binary files a/forge-gui/res/skins/mythic_rare/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/mythic_rare/font1.ttf b/forge-gui/res/skins/mythic_rare/font1.ttf deleted file mode 100644 index 4b4ecc66671..00000000000 Binary files a/forge-gui/res/skins/mythic_rare/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/mythic_rare/sprite_icons.png b/forge-gui/res/skins/mythic_rare/sprite_icons.png deleted file mode 100644 index da6e209cbc7..00000000000 Binary files a/forge-gui/res/skins/mythic_rare/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/phyrexia/bg_match.jpg b/forge-gui/res/skins/phyrexia/bg_match.jpg deleted file mode 100644 index 5748e97388c..00000000000 Binary files a/forge-gui/res/skins/phyrexia/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/phyrexia/bg_splash.png b/forge-gui/res/skins/phyrexia/bg_splash.png deleted file mode 100644 index 21ba79de523..00000000000 Binary files a/forge-gui/res/skins/phyrexia/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/phyrexia/bg_texture.jpg b/forge-gui/res/skins/phyrexia/bg_texture.jpg deleted file mode 100644 index cf2181f30c4..00000000000 Binary files a/forge-gui/res/skins/phyrexia/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/phyrexia/font1.ttf b/forge-gui/res/skins/phyrexia/font1.ttf deleted file mode 100644 index b8d1cf1c926..00000000000 Binary files a/forge-gui/res/skins/phyrexia/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/phyrexia/sprite_icons.png b/forge-gui/res/skins/phyrexia/sprite_icons.png deleted file mode 100644 index 585928e6b04..00000000000 Binary files a/forge-gui/res/skins/phyrexia/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/ravnica/bg_match.jpg b/forge-gui/res/skins/ravnica/bg_match.jpg deleted file mode 100644 index ddc9940bb43..00000000000 Binary files a/forge-gui/res/skins/ravnica/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/ravnica/bg_splash.png b/forge-gui/res/skins/ravnica/bg_splash.png deleted file mode 100644 index 9b31e13f6f7..00000000000 Binary files a/forge-gui/res/skins/ravnica/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/ravnica/bg_texture.jpg b/forge-gui/res/skins/ravnica/bg_texture.jpg deleted file mode 100644 index 3ce7287d89a..00000000000 Binary files a/forge-gui/res/skins/ravnica/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/ravnica/font1.ttf b/forge-gui/res/skins/ravnica/font1.ttf deleted file mode 100644 index 9850a062906..00000000000 Binary files a/forge-gui/res/skins/ravnica/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/ravnica/sprite_icons.png b/forge-gui/res/skins/ravnica/sprite_icons.png deleted file mode 100644 index c5e73f97068..00000000000 Binary files a/forge-gui/res/skins/ravnica/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/rebel/bg_match.jpg b/forge-gui/res/skins/rebel/bg_match.jpg deleted file mode 100644 index f84722e6b0b..00000000000 Binary files a/forge-gui/res/skins/rebel/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/rebel/bg_splash.png b/forge-gui/res/skins/rebel/bg_splash.png deleted file mode 100644 index d89b7c4fd39..00000000000 Binary files a/forge-gui/res/skins/rebel/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/rebel/bg_texture.jpg b/forge-gui/res/skins/rebel/bg_texture.jpg deleted file mode 100644 index 43fa60ce9ef..00000000000 Binary files a/forge-gui/res/skins/rebel/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/rebel/font1.ttf b/forge-gui/res/skins/rebel/font1.ttf deleted file mode 100644 index 026d5331ea8..00000000000 Binary files a/forge-gui/res/skins/rebel/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/rebel/sprite_icons.png b/forge-gui/res/skins/rebel/sprite_icons.png deleted file mode 100644 index e3aa89c2e4e..00000000000 Binary files a/forge-gui/res/skins/rebel/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/sleeping_forest/bg_match.jpg b/forge-gui/res/skins/sleeping_forest/bg_match.jpg deleted file mode 100644 index c5b7e633940..00000000000 Binary files a/forge-gui/res/skins/sleeping_forest/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/sleeping_forest/bg_splash.png b/forge-gui/res/skins/sleeping_forest/bg_splash.png deleted file mode 100644 index 58433d0d0c3..00000000000 Binary files a/forge-gui/res/skins/sleeping_forest/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/sleeping_forest/bg_texture.jpg b/forge-gui/res/skins/sleeping_forest/bg_texture.jpg deleted file mode 100644 index 0f59326d633..00000000000 Binary files a/forge-gui/res/skins/sleeping_forest/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/sleeping_forest/font1.ttf b/forge-gui/res/skins/sleeping_forest/font1.ttf deleted file mode 100644 index 2047d41bc92..00000000000 Binary files a/forge-gui/res/skins/sleeping_forest/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/sleeping_forest/sprite_icons.png b/forge-gui/res/skins/sleeping_forest/sprite_icons.png deleted file mode 100644 index 2cb5abc5584..00000000000 Binary files a/forge-gui/res/skins/sleeping_forest/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/smith/bg_match.jpg b/forge-gui/res/skins/smith/bg_match.jpg deleted file mode 100644 index 3089f2a9350..00000000000 Binary files a/forge-gui/res/skins/smith/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/smith/bg_splash.png b/forge-gui/res/skins/smith/bg_splash.png deleted file mode 100644 index c31186e0c85..00000000000 Binary files a/forge-gui/res/skins/smith/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/smith/bg_texture.jpg b/forge-gui/res/skins/smith/bg_texture.jpg deleted file mode 100644 index 9bf4763c26c..00000000000 Binary files a/forge-gui/res/skins/smith/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/smith/font1.ttf b/forge-gui/res/skins/smith/font1.ttf deleted file mode 100644 index b07b620fcac..00000000000 Binary files a/forge-gui/res/skins/smith/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/smith/sprite_icons.png b/forge-gui/res/skins/smith/sprite_icons.png deleted file mode 100644 index b2dd5c2d111..00000000000 Binary files a/forge-gui/res/skins/smith/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/the_dale/bg_match.jpg b/forge-gui/res/skins/the_dale/bg_match.jpg deleted file mode 100644 index 594b6c8e9d0..00000000000 Binary files a/forge-gui/res/skins/the_dale/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/the_dale/bg_splash.png b/forge-gui/res/skins/the_dale/bg_splash.png deleted file mode 100644 index 812d1db8b62..00000000000 Binary files a/forge-gui/res/skins/the_dale/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/the_dale/bg_texture.jpg b/forge-gui/res/skins/the_dale/bg_texture.jpg deleted file mode 100644 index 97d18e4517d..00000000000 Binary files a/forge-gui/res/skins/the_dale/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/the_dale/font1.ttf b/forge-gui/res/skins/the_dale/font1.ttf deleted file mode 100644 index 4b4ecc66671..00000000000 Binary files a/forge-gui/res/skins/the_dale/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/the_dale/sprite_icons.png b/forge-gui/res/skins/the_dale/sprite_icons.png deleted file mode 100644 index c5c22872a8c..00000000000 Binary files a/forge-gui/res/skins/the_dale/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/the_simpsons/bg_match.jpg b/forge-gui/res/skins/the_simpsons/bg_match.jpg deleted file mode 100644 index 8153f912086..00000000000 Binary files a/forge-gui/res/skins/the_simpsons/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/the_simpsons/bg_splash.png b/forge-gui/res/skins/the_simpsons/bg_splash.png deleted file mode 100644 index 809526af311..00000000000 Binary files a/forge-gui/res/skins/the_simpsons/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/the_simpsons/bg_texture.jpg b/forge-gui/res/skins/the_simpsons/bg_texture.jpg deleted file mode 100644 index 4076d52bce5..00000000000 Binary files a/forge-gui/res/skins/the_simpsons/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/the_simpsons/font1.ttf b/forge-gui/res/skins/the_simpsons/font1.ttf deleted file mode 100644 index b6f9e5db4c1..00000000000 Binary files a/forge-gui/res/skins/the_simpsons/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/the_simpsons/sprite_avatars.png b/forge-gui/res/skins/the_simpsons/sprite_avatars.png deleted file mode 100644 index 0010663edb0..00000000000 Binary files a/forge-gui/res/skins/the_simpsons/sprite_avatars.png and /dev/null differ diff --git a/forge-gui/res/skins/the_simpsons/sprite_icons.png b/forge-gui/res/skins/the_simpsons/sprite_icons.png deleted file mode 100644 index 9ebfc15955a..00000000000 Binary files a/forge-gui/res/skins/the_simpsons/sprite_icons.png and /dev/null differ diff --git a/forge-gui/res/skins/zendikar/bg_match.jpg b/forge-gui/res/skins/zendikar/bg_match.jpg deleted file mode 100644 index 42d3873853c..00000000000 Binary files a/forge-gui/res/skins/zendikar/bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/skins/zendikar/bg_splash.png b/forge-gui/res/skins/zendikar/bg_splash.png deleted file mode 100644 index 72135afeb2d..00000000000 Binary files a/forge-gui/res/skins/zendikar/bg_splash.png and /dev/null differ diff --git a/forge-gui/res/skins/zendikar/bg_texture.jpg b/forge-gui/res/skins/zendikar/bg_texture.jpg deleted file mode 100644 index 7081f51c4eb..00000000000 Binary files a/forge-gui/res/skins/zendikar/bg_texture.jpg and /dev/null differ diff --git a/forge-gui/res/skins/zendikar/font1.ttf b/forge-gui/res/skins/zendikar/font1.ttf deleted file mode 100644 index 9868ce70e23..00000000000 Binary files a/forge-gui/res/skins/zendikar/font1.ttf and /dev/null differ diff --git a/forge-gui/res/skins/zendikar/sprite_icons.png b/forge-gui/res/skins/zendikar/sprite_icons.png deleted file mode 100644 index eb3e21379d8..00000000000 Binary files a/forge-gui/res/skins/zendikar/sprite_icons.png and /dev/null differ diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadService.java b/forge-gui/src/main/java/forge/download/GuiDownloadService.java index ecc29596c4f..07cdf8afa79 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadService.java +++ b/forge-gui/src/main/java/forge/download/GuiDownloadService.java @@ -270,7 +270,7 @@ public abstract class GuiDownloadService implements Runnable { String decodedKey = decodeURL(kv.getKey()); File fileDest = new File(decodedKey); final String filePath = fileDest.getPath(); - final String subLastIndex = filePath.contains("pics") ? "\\pics\\" : "\\db\\"; + final String subLastIndex = filePath.contains("pics") ? "\\pics\\" : filePath.contains("skins") ? "\\"+FileUtil.getParent(filePath)+"\\" : "\\db\\"; System.out.println(count + "/" + totalCount + " - .." + filePath.substring(filePath.lastIndexOf(subLastIndex)+1)); @@ -409,8 +409,11 @@ public abstract class GuiDownloadService implements Runnable { protected abstract Map getNeededFiles(); protected static void addMissingItems(Map list, String nameUrlFile, String dir) { + addMissingItems(list, nameUrlFile, dir, false); + } + protected static void addMissingItems(Map list, String nameUrlFile, String dir, boolean includeParent) { for (Pair nameUrlPair : FileUtil.readNameUrlFile(nameUrlFile)) { - File f = new File(dir, decodeURL(nameUrlPair.getLeft())); + File f = new File(includeParent? dir+FileUtil.getParent(nameUrlPair.getRight()) : dir , decodeURL(nameUrlPair.getLeft())); //System.out.println(f.getAbsolutePath()); if (!f.exists()) { list.put(f.getAbsolutePath(), nameUrlPair.getRight()); diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadSkins.java b/forge-gui/src/main/java/forge/download/GuiDownloadSkins.java new file mode 100644 index 00000000000..502c057f710 --- /dev/null +++ b/forge-gui/src/main/java/forge/download/GuiDownloadSkins.java @@ -0,0 +1,23 @@ +package forge.download; + +import forge.properties.ForgeConstants; + +import java.util.Map; +import java.util.TreeMap; + +public class GuiDownloadSkins extends GuiDownloadService { + @Override + public String getTitle() { + return "Download Skins"; + } + + @Override + protected final Map getNeededFiles() { + // read all card names and urls + final Map urls = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); + + addMissingItems(urls, ForgeConstants.SKINS_LIST_FILE, ForgeConstants.CACHE_SKINS_DIR, true); + + return urls; + } +} diff --git a/forge-gui/src/main/java/forge/properties/ForgeConstants.java b/forge-gui/src/main/java/forge/properties/ForgeConstants.java index 7834cdb58cf..db0919b535e 100644 --- a/forge-gui/src/main/java/forge/properties/ForgeConstants.java +++ b/forge-gui/src/main/java/forge/properties/ForgeConstants.java @@ -49,6 +49,7 @@ public final class ForgeConstants { public static final String NET_DECKS_COMMANDER_LIST_FILE = LISTS_DIR + "net-decks-commander.txt"; public static final String NET_DECKS_BRAWL_LIST_FILE = LISTS_DIR + "net-decks-brawl.txt"; public static final String BORDERLESS_CARD_LIST_FILE = LISTS_DIR + "borderlessCardList.txt"; + public static final String SKINS_LIST_FILE = LISTS_DIR + "skinsList.txt"; public static final String CHANGES_FILE = ASSETS_DIR + "README.txt"; @@ -89,9 +90,9 @@ public final class ForgeConstants { private static final String CONQUEST_DIR = RES_DIR + "conquest" + PATH_SEPARATOR; public static final String CONQUEST_PLANES_DIR = CONQUEST_DIR + "planes" + PATH_SEPARATOR; - public static final String SKINS_DIR = RES_DIR + "skins" + PATH_SEPARATOR; + public static final String BASE_SKINS_DIR = RES_DIR + "skins" + PATH_SEPARATOR; public static final String COMMON_FONTS_DIR = RES_DIR + "fonts" + PATH_SEPARATOR; - public static final String DEFAULT_SKINS_DIR = SKINS_DIR + "default" + PATH_SEPARATOR; + public static final String DEFAULT_SKINS_DIR = BASE_SKINS_DIR + "default" + PATH_SEPARATOR; //don't associate these skin files with a directory since skin directory will be determined later public static final String SPRITE_ICONS_FILE = "sprite_icons.png"; public static final String SPRITE_FOILS_FILE = "sprite_foils.png"; @@ -258,6 +259,7 @@ public final class ForgeConstants { private static final String PICS_DIR = CACHE_DIR + "pics" + PATH_SEPARATOR; public static final String DB_DIR = CACHE_DIR + "db" + PATH_SEPARATOR; public static final String FONTS_DIR = CACHE_DIR + "fonts" + PATH_SEPARATOR; + public static final String CACHE_SKINS_DIR = CACHE_DIR + "skins" + PATH_SEPARATOR; public static final String CACHE_TOKEN_PICS_DIR = PICS_DIR + "tokens" + PATH_SEPARATOR; public static final String CACHE_ICON_PICS_DIR = PICS_DIR + "icons" + PATH_SEPARATOR; public static final String CACHE_SYMBOLS_DIR = PICS_DIR + "symbols" + PATH_SEPARATOR;