diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java index 65a3b1ef640..13503f50d71 100644 --- a/forge-core/src/main/java/forge/StaticData.java +++ b/forge-core/src/main/java/forge/StaticData.java @@ -1,6 +1,7 @@ package forge; import java.io.File; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -10,6 +11,7 @@ import forge.card.CardEdition; import forge.card.CardRules; import forge.card.PrintSheet; import forge.item.FatPack; +import forge.item.PaperCard; import forge.item.SealedProduct; import forge.util.storage.IStorage; import forge.util.storage.StorageBase; @@ -99,4 +101,10 @@ public class StaticData { public CardDb getVariantCards() { return variantCards; } + + public List getAllCards() { + List cards = new ArrayList(commonCards.getAllCards()); + cards.addAll(variantCards.getAllCards()); + return cards; + } } diff --git a/forge-gui/src/main/java/forge/gui/workshop/views/VWorkshopCatalog.java b/forge-gui/src/main/java/forge/gui/workshop/views/VWorkshopCatalog.java index cd827986ec1..39fa8fed7de 100644 --- a/forge-gui/src/main/java/forge/gui/workshop/views/VWorkshopCatalog.java +++ b/forge-gui/src/main/java/forge/gui/workshop/views/VWorkshopCatalog.java @@ -123,9 +123,9 @@ public enum VWorkshopCatalog implements IVDoc { _setupSpinner(upperBound); spinners.put(t, Pair.of(lowerBound, upperBound)); } - + this.cardManager = new CardManager(this.statLabels, true); - this.cardManager.setPool(ItemPool.createFrom(Singletons.getMagicDb().getCommonCards().getAllCards(), PaperCard.class), true); + this.cardManager.setPool(ItemPool.createFrom(Singletons.getMagicDb().getAllCards(), PaperCard.class), true); this.cardManagerContainer.setItemManager(this.cardManager); this.cardManager.addSelectionListener(new ListSelectionListener() {