diff --git a/forge-gui/res/lists/net-decks-brawl.txt b/forge-gui/res/lists/net-decks-brawl.txt index 1efc3436178..311a4b5f93a 100644 --- a/forge-gui/res/lists/net-decks-brawl.txt +++ b/forge-gui/res/lists/net-decks-brawl.txt @@ -1 +1,11 @@ +Card Preview | https://downloads.cardforge.org/decks/cardpreview-brawl.zip +Commander Clash | https://downloads.cardforge.org/decks/commanderclash-brawl.zip +Commander VS | https://downloads.cardforge.org/decks/commandervs-brawl.zip Current Brawl Metagame | https://downloads.cardforge.org/decks/currentbrawlmetagame.zip +Dear Azami | https://downloads.cardforge.org/decks/dearazami-brawl.zip +EDHREC Columms | https://downloads.cardforge.org/decks/edhrec-brawl.zip +Feature Article | https://downloads.cardforge.org/decks/feature-brawl.zip +How to Build | https://downloads.cardforge.org/decks/howtobuild-brawl.zip +Much Abrew About Nothing | https://downloads.cardforge.org/decks/muchabrewaboutnothing-brawl.zip +Ready to Brawl? | https://downloads.cardforge.org/decks/readytobrawl.zip +Ways to Play | https://downloads.cardforge.org/decks/waystoplay-brawl.zip \ No newline at end of file diff --git a/forge-gui/res/lists/net-decks-commander.txt b/forge-gui/res/lists/net-decks-commander.txt index 763dbd56399..7133d8ca8b3 100644 --- a/forge-gui/res/lists/net-decks-commander.txt +++ b/forge-gui/res/lists/net-decks-commander.txt @@ -1,15 +1,32 @@ -Commander Clash | https://downloads.cardforge.org/decks/commanderclash.zip -Much Abrew About Nothing | https://downloads.cardforge.org/decks/muchabrewaboutnothing-commander.zip -The Week That Was | https://downloads.cardforge.org/decks/theweekthatwas-commander.zip -WotC Preconstructed | https://downloads.cardforge.org/decks/precon-commander.zip -Serious Fun | https://downloads.cardforge.org/decks/seriousfun-commander.zip -ReConstructed | https://downloads.cardforge.org/decks/recon-commander.zip -Latest Developments | https://downloads.cardforge.org/decks/latestdevelopments-commander.zip -From the Lab | https://downloads.cardforge.org/decks/fromthelab-commander.zip -Feature Article | https://downloads.cardforge.org/decks/feature-commander.zip -Daily Deck List | https://downloads.cardforge.org/decks/dailydecks-commander.zip +99 Problems | https://downloads.cardforge.org/decks/99problems.zip +Budget Commander | https://downloads.cardforge.org/decks/budgetcommander.zip +Card Preview | https://downloads.cardforge.org/decks/cardpreview-commander.zip Command Tower | https://downloads.cardforge.org/decks/commandtower.zip -Going Rogue | https://downloads.cardforge.org/decks/goingrogue-commander.zip -Current Commander Metagame | https://downloads.cardforge.org/decks/currentcommandermetagame.zip +Commander Clash | https://downloads.cardforge.org/decks/commanderclash.zip +Commander On a Budget | https://downloads.cardforge.org/decks/commanderonabudget.zip +Commander VS | https://downloads.cardforge.org/decks/commandervs.zip Current Commander 1v1 Metagame | https://downloads.cardforge.org/decks/currentcommander1v1metagame.zip -Commander On a Budget | https://downloads.cardforge.org/decks/commanderonabudget.zip \ No newline at end of file +Current Commander Metagame | https://downloads.cardforge.org/decks/currentcommandermetagame.zip +Daily Deck List | https://downloads.cardforge.org/decks/dailydecks-commander.zip +Daily Magic Update | https://downloads.cardforge.org/decks/dailymagicupdate-commander.zip +Dear Azami | https://downloads.cardforge.org/decks/dearazami.zip +EDHREC Columms | https://downloads.cardforge.org/decks/edhrec.zip +Fat Stacks | https://downloads.cardforge.org/decks/fatstacks.zip +Feature Article | https://downloads.cardforge.org/decks/feature-commander.zip +From the Lab | https://downloads.cardforge.org/decks/fromthelab-commander.zip +Going Rogue | https://downloads.cardforge.org/decks/goingrogue-commander.zip +House of Cards | https://downloads.cardforge.org/decks/houseofcards-commander.zip +How to Build | https://downloads.cardforge.org/decks/howtobuild-commander.zip +Instant Deck Tech | https://downloads.cardforge.org/decks/instantdecktech-commander.zip +Latest Developments | https://downloads.cardforge.org/decks/latestdevelopments-commander.zip +Much Abrew About Nothing | https://downloads.cardforge.org/decks/muchabrewaboutnothing-commander.zip +Perilous Research | https://downloads.cardforge.org/decks/perilousresearch-commander.zip +ReConstructed | https://downloads.cardforge.org/decks/recon-commander.zip +Rhystic Study | https://downloads.cardforge.org/decks/rhysticstudy.zip +Serious Fun | https://downloads.cardforge.org/decks/seriousfun-commander.zip +The Command Center | https://downloads.cardforge.org/decks/commandcenter.zip +The Fish Tank | https://downloads.cardforge.org/decks/fishtank-commander.zip +The Week That Was | https://downloads.cardforge.org/decks/theweekthatwas-commander.zip +Top Decks | https://downloads.cardforge.org/decks/topdecks-commander.zip +Ways to Play | https://downloads.cardforge.org/decks/waystoplay-commander.zip +WotC Preconstructed | https://downloads.cardforge.org/decks/precon-commander.zip \ No newline at end of file diff --git a/forge-gui/res/lists/net-decks-oathbreaker.txt b/forge-gui/res/lists/net-decks-oathbreaker.txt new file mode 100644 index 00000000000..446713c4dac --- /dev/null +++ b/forge-gui/res/lists/net-decks-oathbreaker.txt @@ -0,0 +1,3 @@ +Commander Clash | https://downloads.cardforge.org/decks/commanderclash-oathbreaker.zip +Commander VS | https://downloads.cardforge.org/decks/commandervs-oathbreaker.zip +The Fish Tank | https://downloads.cardforge.org/decks/fishtank-oathbreaker.zip \ No newline at end of file diff --git a/forge-gui/res/lists/net-decks-tinyleaders.txt b/forge-gui/res/lists/net-decks-tinyleaders.txt new file mode 100644 index 00000000000..a41e6ee5980 --- /dev/null +++ b/forge-gui/res/lists/net-decks-tinyleaders.txt @@ -0,0 +1,3 @@ +Commander VS | https://downloads.cardforge.org/decks/commandervs-tinyleaders.zip +Dear Azami | https://downloads.cardforge.org/decks/dearazami-tinyleaders.zip +ReConstructed | https://downloads.cardforge.org/decks/recon-tinyleaders.zip \ No newline at end of file diff --git a/forge-gui/res/lists/net-decks.txt b/forge-gui/res/lists/net-decks.txt index a5e3159576c..23db7f9972c 100644 --- a/forge-gui/res/lists/net-decks.txt +++ b/forge-gui/res/lists/net-decks.txt @@ -1,41 +1,67 @@ Against the Odds | https://downloads.cardforge.org/decks/againsttheodds.zip -Much Abrew About Nothing | https://downloads.cardforge.org/decks/muchabrewaboutnothing.zip -MTG Deck Clusters | https://downloads.cardforge.org/decks/mtgdeckclusters.zip -Top Decks | https://downloads.cardforge.org/decks/topdecks.zip -World Championship | https://downloads.cardforge.org/decks/worldchampion.zip -The Week That Was | https://downloads.cardforge.org/decks/theweekthatwas.zip -Single Card Strategy | https://downloads.cardforge.org/decks/singlecardstrategy.zip -WotC Preconstructed | https://downloads.cardforge.org/decks/precon.zip -Serious Fun | https://downloads.cardforge.org/decks/seriousfun.zip -ReConstructed | https://downloads.cardforge.org/decks/recon.zip -Pro Tour | https://downloads.cardforge.org/decks/protour.zip -Perilous Research | https://downloads.cardforge.org/decks/perilousresearch.zip -Into the AEther | https://downloads.cardforge.org/decks/intotheaether.zip -Level One | https://downloads.cardforge.org/decks/levelone.zip -Latest Developments | https://downloads.cardforge.org/decks/latestdevelopments.zip -From the Lab | https://downloads.cardforge.org/decks/fromthelab.zip -Feature Article | https://downloads.cardforge.org/decks/feature.zip -Daily Deck List | https://downloads.cardforge.org/decks/dailydecks.zip -Building on a Budget | https://downloads.cardforge.org/decks/buildingonabudget.zip Breaking Through | https://downloads.cardforge.org/decks/breakingthrough.zip -Woo Brews | https://downloads.cardforge.org/decks/woobrews.zip -Swimming with Sharks | https://downloads.cardforge.org/decks/swimmingwithsharks.zip -Learning Curve | https://downloads.cardforge.org/decks/learningcurve.zip -Squandered Resources | https://downloads.cardforge.org/decks/squanderedresources.zip -Deconstructing Famous | https://downloads.cardforge.org/decks/dfd.zip -Going Rogue | https://downloads.cardforge.org/decks/goingrogue.zip -Uncommon Knowledge | https://downloads.cardforge.org/decks/uncommonknowledge.zip -MagicTheGathering.Combos | https://downloads.cardforge.org/decks/combos.zip -Players Championship 2012 | https://downloads.cardforge.org/decks/magicplayerschampionship.zip Brewing on a Budget | https://downloads.cardforge.org/decks/brewingonabudget.zip -Grand Prix Lincoln 2012 | https://downloads.cardforge.org/decks/gplincoln2012.zip -Genetic Algorithm AI Decks | https://downloads.cardforge.org/decks/geneticalgorithmdecks.zip -Current Standard Metagame | https://downloads.cardforge.org/decks/currentstandardmetagame.zip -Current Modern Metagame | https://downloads.cardforge.org/decks/currentmodernmetagame.zip -Current Legacy Metagame | https://downloads.cardforge.org/decks/currentlegacymetagame.zip -Current Pauper Metagame | https://downloads.cardforge.org/decks/currentpaupermetagame.zip -Current Pioneer Metagame | https://downloads.cardforge.org/decks/currentpioneermetagame.zip +Budget Magic | https://downloads.cardforge.org/decks/budgetmagic.zip +Budget Modern Metagame | https://downloads.cardforge.org/decks/budgetmodernmetagame.zip +Building on a Budget | https://downloads.cardforge.org/decks/buildingonabudget.zip +Card Preview | https://downloads.cardforge.org/decks/cardpreview.zip Current Historic Metagame | https://downloads.cardforge.org/decks/currenthistoricmetagame.zip +Current Legacy Metagame | https://downloads.cardforge.org/decks/currentlegacymetagame.zip +Current Modern Metagame | https://downloads.cardforge.org/decks/currentmodernmetagame.zip +Current Pauper Metagame | https://downloads.cardforge.org/decks/currentpaupermetagame.zip Current Penny Dreadful Metagame | https://downloads.cardforge.org/decks/currentpennydreadfulmetagame.zip +Current Pioneer Metagame | https://downloads.cardforge.org/decks/currentpioneermetagame.zip +Current Standard Metagame | https://downloads.cardforge.org/decks/currentstandardmetagame.zip Current Vintage Metagame | https://downloads.cardforge.org/decks/currentvintagemetagame.zip -Modern on a Budget | https://downloads.cardforge.org/decks/modernonabudget.zip \ No newline at end of file +Daily Deck List | https://downloads.cardforge.org/decks/dailydecks.zip +Daily Magic Update | https://downloads.cardforge.org/decks/dailymagicupdate.zip +Dear Azami | https://downloads.cardforge.org/decks/dearazami-standard.zip +Deconstructing Famous | https://downloads.cardforge.org/decks/dfd.zip +EDHREC Columms | https://downloads.cardforge.org/decks/edhrec-constructed.zip +Feature Article | https://downloads.cardforge.org/decks/feature.zip +Fish 5-0 | https://downloads.cardforge.org/decks/fish50.zip +From the Lab | https://downloads.cardforge.org/decks/fromthelab.zip +Genetic Algorithm AI Decks | https://downloads.cardforge.org/decks/geneticalgorithmdecks.zip +Going Rogue | https://downloads.cardforge.org/decks/goingrogue.zip +Grand Prix Lincoln 2012 | https://downloads.cardforge.org/decks/gplincoln2012.zip +Historic 101 | https://downloads.cardforge.org/decks/historic101.zip +House of Cards | https://downloads.cardforge.org/decks/houseofcards.zip +How to Build | https://downloads.cardforge.org/decks/howtobuild.zip +Instant Deck Tech | https://downloads.cardforge.org/decks/instantdecktech.zip +Into the AEther | https://downloads.cardforge.org/decks/intotheaether.zip +Latest Developments | https://downloads.cardforge.org/decks/latestdevelopments.zip +Learning Curve | https://downloads.cardforge.org/decks/learningcurve.zip +Level One | https://downloads.cardforge.org/decks/levelone.zip +MTG Deck Clusters | https://downloads.cardforge.org/decks/mtgdeckclusters.zip +Magic Invitational | https://downloads.cardforge.org/decks/invitational.zip +MagicTheGathering.Combos | https://downloads.cardforge.org/decks/combos.zip +Meme or Dream? | https://downloads.cardforge.org/decks/memeordream.zip +Modern Mayhem | https://downloads.cardforge.org/decks/modernmayhem.zip +Modern on a Budget | https://downloads.cardforge.org/decks/modernonabudget.zip +Much Abrew About Nothing | https://downloads.cardforge.org/decks/muchabrewaboutnothing.zip +Mythic Championship | https://downloads.cardforge.org/decks/mythicchampionship.zip +Mythic Invitational| https://downloads.cardforge.org/decks/mythicinvitational.zip +Online Tech | https://downloads.cardforge.org/decks/onlinetech.zip +Online and Enjoying It | https://downloads.cardforge.org/decks/onlineandenjoyingit.zip +Perilous Research | https://downloads.cardforge.org/decks/perilousresearch.zip +Pioneer Peak | https://downloads.cardforge.org/decks/pioneerpeak.zip +Play Design | https://downloads.cardforge.org/decks/playdesign.zip +Players Championship 2012 | https://downloads.cardforge.org/decks/magicplayerschampionship.zip +Playing Pauper | https://downloads.cardforge.org/decks/playingpauper.zip +Pro Tour | https://downloads.cardforge.org/decks/protour.zip +ReConstructed | https://downloads.cardforge.org/decks/recon.zip +Serious Fun | https://downloads.cardforge.org/decks/seriousfun.zip +Single Card Strategy | https://downloads.cardforge.org/decks/singlecardstrategy.zip +Single Scoop | https://downloads.cardforge.org/decks/singlescoop.zip +Squandered Resources | https://downloads.cardforge.org/decks/squanderedresources.zip +Swimming with Sharks | https://downloads.cardforge.org/decks/swimmingwithsharks.zip +The Fish Tank | https://downloads.cardforge.org/decks/fishtank.zip +The Week That Was | https://downloads.cardforge.org/decks/theweekthatwas.zip +Thirty Casual Decks under $20 | https://downloads.cardforge.org/decks/30casual20.zip +Top Decks | https://downloads.cardforge.org/decks/topdecks.zip +Uncommon Knowledge | https://downloads.cardforge.org/decks/uncommonknowledge.zip +Ways to Play | https://downloads.cardforge.org/decks/waystoplay.zip +Week in Review | https://downloads.cardforge.org/decks/weekinreview.zip +Woo Brews | https://downloads.cardforge.org/decks/woobrews.zip +World Championship | https://downloads.cardforge.org/decks/worldchampion.zip +WotC Preconstructed | https://downloads.cardforge.org/decks/precon.zip \ No newline at end of file diff --git a/forge-gui/src/main/java/forge/deck/NetDeckCategory.java b/forge-gui/src/main/java/forge/deck/NetDeckCategory.java index 2faddf428c3..cd465f7db7f 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckCategory.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckCategory.java @@ -21,7 +21,7 @@ import forge.util.storage.StorageBase; public class NetDeckCategory extends StorageBase { public static final String PREFIX = "NET_DECK_"; - private static Map constructed, commander, brawl; + private static Map constructed, commander, brawl, oathbreaker, tinyleaders; private static Map loadCategories(String filename) { Map categories = new TreeMap<>(); @@ -64,6 +64,18 @@ public class NetDeckCategory extends StorageBase { } categories = brawl; break; + case Oathbreaker: + if (oathbreaker == null) { + oathbreaker = loadCategories(ForgeConstants.NET_DECKS_OATHBREAKER_LIST_FILE); + } + categories = oathbreaker; + break; + case TinyLeaders: + if (tinyleaders == null) { + tinyleaders = loadCategories(ForgeConstants.NET_DECKS_TINYLEADERS_LIST_FILE); + } + categories = tinyleaders; + break; default: return null; } 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 d58d06a3090..1781cf91081 100644 --- a/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java +++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java @@ -48,6 +48,8 @@ public final class ForgeConstants { public static final String NET_DECKS_LIST_FILE = LISTS_DIR + "net-decks.txt"; 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 NET_DECKS_OATHBREAKER_LIST_FILE = LISTS_DIR + "net-decks-oathbreaker.txt"; + public static final String NET_DECKS_TINYLEADERS_LIST_FILE = LISTS_DIR + "net-decks-tinyleaders.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 CJK_FONTS_LIST_FILE = LISTS_DIR + "font-list.txt";