diff --git a/.gitattributes b/.gitattributes index dab1cead0d7..ff643c4faf5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14301,6 +14301,7 @@ src/main/java/forge/model/BuildInfo.java -text src/main/java/forge/model/FModel.java svneol=native#text/plain src/main/java/forge/model/MultipleForgeJarsFoundError.java -text src/main/java/forge/model/package-info.java svneol=native#text/plain +src/main/java/forge/net/package-info.java -text src/main/java/forge/package-info.java svneol=native#text/plain src/main/java/forge/properties/ForgePreferences.java svneol=native#text/plain src/main/java/forge/properties/ForgeProps.java svneol=native#text/plain diff --git a/src/main/java/forge/card/MetaSet.java b/src/main/java/forge/card/MetaSet.java index a6f3ece64a3..33c0652279d 100644 --- a/src/main/java/forge/card/MetaSet.java +++ b/src/main/java/forge/card/MetaSet.java @@ -218,7 +218,7 @@ public class MetaSet { return new UnOpenedProduct(fnPick, bpCustom); } else if ("full".equalsIgnoreCase(type)) { - final BoosterGenerator bpFull = new BoosterGenerator(CardDb.instance().getAllUniqueCards()); + final BoosterGenerator bpFull = new BoosterGenerator(CardDb.instance().getUniqueCards()); return new UnOpenedProduct(BoosterGenerator.IDENTITY_PICK, bpFull); } else if ("meta".equalsIgnoreCase(type)) { @@ -276,7 +276,7 @@ public class MetaSet { System.out.println("WARNING - MetaSet type '" + typeTest[0] + "' ignored in pool creation."); } else if (typeTest[0].equalsIgnoreCase("full")) { - for (CardPrinted aCard : CardDb.instance().getAllUniqueCards()) { + for (CardPrinted aCard : CardDb.instance().getUniqueCards()) { cardPool.add(aCard); } return cardPool; diff --git a/src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java b/src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java index 49fe5e5b6eb..b1a91732a17 100644 --- a/src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java +++ b/src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java @@ -61,7 +61,7 @@ public class ChooseCardNameEffect extends SpellEffect { final String message = validDesc.equals("card") ? "Name a card" : "Name a " + validDesc + " card."; - List cards = Lists.newArrayList(CardDb.instance().getAllUniqueCards()); + List cards = Lists.newArrayList(CardDb.instance().getUniqueCards()); if ( StringUtils.containsIgnoreCase(valid, "nonland") ) { Predicate cpp = Predicates.compose(CardRulesPredicates.Presets.IS_NON_LAND, CardPrinted.FN_GET_RULES); diff --git a/src/main/java/forge/game/limited/BoosterDraft.java b/src/main/java/forge/game/limited/BoosterDraft.java index a90f90b22fa..1cedd520cfa 100644 --- a/src/main/java/forge/game/limited/BoosterDraft.java +++ b/src/main/java/forge/game/limited/BoosterDraft.java @@ -83,7 +83,7 @@ public final class BoosterDraft implements IBoosterDraft { switch (draftType) { case Full: // Draft from all cards in Forge - final BoosterGenerator bpFull = new BoosterGenerator(CardDb.instance().getAllUniqueCards()); + final BoosterGenerator bpFull = new BoosterGenerator(CardDb.instance().getUniqueCards()); for (int i = 0; i < 3; i++) { this.product.add(new UnOpenedProduct(BoosterGenerator.IDENTITY_PICK, bpFull)); } diff --git a/src/main/java/forge/game/limited/CustomLimited.java b/src/main/java/forge/game/limited/CustomLimited.java index 5b902cd3bc4..a3223b4ced1 100644 --- a/src/main/java/forge/game/limited/CustomLimited.java +++ b/src/main/java/forge/game/limited/CustomLimited.java @@ -110,7 +110,7 @@ public class CustomLimited extends DeckBase { final String deckName = data.get("DeckFile"); final Deck deckCube = cubes.get(deckName); cd.cardPool = deckCube == null ? ItemPool.createFrom( - CardDb.instance().getAllUniqueCards(), CardPrinted.class) + CardDb.instance().getUniqueCards(), CardPrinted.class) : deckCube.getMain(); return cd; diff --git a/src/main/java/forge/game/limited/SealedDeckFormat.java b/src/main/java/forge/game/limited/SealedDeckFormat.java index a6f63c7e349..86df2c913be 100644 --- a/src/main/java/forge/game/limited/SealedDeckFormat.java +++ b/src/main/java/forge/game/limited/SealedDeckFormat.java @@ -66,7 +66,7 @@ public class SealedDeckFormat { if (sealedType.equals("Full")) { - final BoosterGenerator bpFull = new BoosterGenerator(CardDb.instance().getAllUniqueCards()); + final BoosterGenerator bpFull = new BoosterGenerator(CardDb.instance().getUniqueCards()); // Choose number of boosters final Integer[] integers = new Integer[10]; diff --git a/src/main/java/forge/gui/GuiDisplayUtil.java b/src/main/java/forge/gui/GuiDisplayUtil.java index fefb1a1d729..6f7ef29b8a5 100644 --- a/src/main/java/forge/gui/GuiDisplayUtil.java +++ b/src/main/java/forge/gui/GuiDisplayUtil.java @@ -757,7 +757,7 @@ public final class GuiDisplayUtil { return; } - final List cards = Lists.newArrayList(CardDb.instance().getAllUniqueCards()); + final List cards = Lists.newArrayList(CardDb.instance().getUniqueCards()); Collections.sort(cards); // use standard forge's list selection dialog @@ -778,7 +778,7 @@ public final class GuiDisplayUtil { return; } - final List cards = Lists.newArrayList(CardDb.instance().getAllUniqueCards()); + final List cards = Lists.newArrayList(CardDb.instance().getUniqueCards()); Collections.sort(cards); // use standard forge's list selection dialog diff --git a/src/main/java/forge/gui/deckeditor/controllers/CDeckgen.java b/src/main/java/forge/gui/deckeditor/controllers/CDeckgen.java index 6e302714bea..9ee2a0026de 100644 --- a/src/main/java/forge/gui/deckeditor/controllers/CDeckgen.java +++ b/src/main/java/forge/gui/deckeditor/controllers/CDeckgen.java @@ -81,7 +81,7 @@ public enum CDeckgen implements ICDoc { final Deck randomDeck = new Deck(); Predicate notBasicLand = Predicates.not(Predicates.compose(CardRulesPredicates.Presets.IS_BASIC_LAND, CardPrinted.FN_GET_RULES)); - Iterable source = Iterables.filter(CardDb.instance().getAllUniqueCards(), notBasicLand); + Iterable source = Iterables.filter(CardDb.instance().getUniqueCards(), notBasicLand); randomDeck.getMain().addAllFlat(Aggregates.random(source, 15 * 5)); randomDeck.getMain().add("Plains"); diff --git a/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java b/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java index 1400ac34a2d..3390e89e5a6 100644 --- a/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java +++ b/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java @@ -62,7 +62,7 @@ public class GuiDownloadPicturesLQ extends GuiDownloader { baseFolder = ForgeProps.getFile(NewConstants.IMAGE_BASE).getPath(); downloads = new ArrayList(); - for (final CardPrinted c : CardDb.instance().getAllUniqueCards()) { + for (final CardPrinted c : CardDb.instance().getUniqueCards()) { //System.out.println(c.getName()); CardRules firstSide = c.getCard(); this.createDLObjects(firstSide); diff --git a/src/main/java/forge/item/CardDb.java b/src/main/java/forge/item/CardDb.java index 3719ef7e72f..be28584736e 100644 --- a/src/main/java/forge/item/CardDb.java +++ b/src/main/java/forge/item/CardDb.java @@ -273,7 +273,7 @@ public final class CardDb { * * @return the all unique cards */ - public Collection getAllUniqueCards() { + public Collection getUniqueCards() { return this.uniqueCards.values(); } diff --git a/src/main/java/forge/net/package-info.java b/src/main/java/forge/net/package-info.java new file mode 100644 index 00000000000..d5ae07490ec --- /dev/null +++ b/src/main/java/forge/net/package-info.java @@ -0,0 +1,3 @@ +/** Model (as in model-view-controller) for Forge. */ +package forge.net; +