From 881fdcaa0807a44e1431b8d14ef20d4cf5f283ba Mon Sep 17 00:00:00 2001 From: "Alex W. Jackson" Date: Fri, 24 Dec 2021 03:05:28 -0500 Subject: [PATCH] Remove no longer needed CardCriteria workaround --- Mage.Sets/src/mage/sets/AetherRevolt.java | 3 +-- Mage.Sets/src/mage/sets/Amonkhet.java | 3 +-- Mage.Sets/src/mage/sets/BattleForZendikar.java | 3 +-- Mage.Sets/src/mage/sets/Dominaria.java | 7 +++---- Mage.Sets/src/mage/sets/HourOfDevastation.java | 3 +-- Mage.Sets/src/mage/sets/Kaladesh.java | 3 +-- Mage.Sets/src/mage/sets/ModernHorizons2.java | 12 +++++------- Mage.Sets/src/mage/sets/OathOfTheGatewatch.java | 3 +-- .../src/mage/sets/StrixhavenSchoolOfMages.java | 4 ++-- Mage.Sets/src/mage/sets/WarOfTheSpark.java | 4 ++-- Mage/src/main/java/mage/cards/ExpansionSet.java | 15 ++++++++------- 11 files changed, 26 insertions(+), 34 deletions(-) diff --git a/Mage.Sets/src/mage/sets/AetherRevolt.java b/Mage.Sets/src/mage/sets/AetherRevolt.java index 138c72ce073..a45e397e5f2 100644 --- a/Mage.Sets/src/mage/sets/AetherRevolt.java +++ b/Mage.Sets/src/mage/sets/AetherRevolt.java @@ -237,8 +237,7 @@ public final class AetherRevolt extends ExpansionSet { protected List findCardsByRarity(Rarity rarity) { List cardInfos = super.findCardsByRarity(rarity); if (rarity == Rarity.SPECIAL) { - cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MPS"))); - cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() < 31); + cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MPS").minCardNumber(31))); } return cardInfos; } diff --git a/Mage.Sets/src/mage/sets/Amonkhet.java b/Mage.Sets/src/mage/sets/Amonkhet.java index 17787ed28b9..cf789396422 100644 --- a/Mage.Sets/src/mage/sets/Amonkhet.java +++ b/Mage.Sets/src/mage/sets/Amonkhet.java @@ -327,8 +327,7 @@ public final class Amonkhet extends ExpansionSet { protected List findCardsByRarity(Rarity rarity) { List cardInfos = super.findCardsByRarity(rarity); if (rarity == Rarity.SPECIAL) { - cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MP2"))); - cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() > 30); + cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MP2").maxCardNumber(30))); } return cardInfos; } diff --git a/Mage.Sets/src/mage/sets/BattleForZendikar.java b/Mage.Sets/src/mage/sets/BattleForZendikar.java index 186bf186067..dd2f24e11ee 100644 --- a/Mage.Sets/src/mage/sets/BattleForZendikar.java +++ b/Mage.Sets/src/mage/sets/BattleForZendikar.java @@ -340,8 +340,7 @@ public final class BattleForZendikar extends ExpansionSet { // only the full-art basic lands are found in boosters cardInfos.removeIf(cardInfo -> cardInfo.getCardNumber().contains("a")); } else if (rarity == Rarity.SPECIAL) { - cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("EXP"))); - cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() > 25); + cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("EXP").maxCardNumber(25))); } return cardInfos; } diff --git a/Mage.Sets/src/mage/sets/Dominaria.java b/Mage.Sets/src/mage/sets/Dominaria.java index c17f730bd99..486edd12311 100644 --- a/Mage.Sets/src/mage/sets/Dominaria.java +++ b/Mage.Sets/src/mage/sets/Dominaria.java @@ -335,10 +335,9 @@ public final class Dominaria extends ExpansionSet { .setCodes(this.code) .rarities(rarity) .supertypes(SuperType.LEGENDARY) - .types(CardType.CREATURE))); - cardInfos.removeIf(cardInfo -> ( - cardInfo.getCardNumberAsInt() > maxCardNumberInBooster - || nonSpecialLegends.contains(cardInfo.getName()))); + .types(CardType.CREATURE) + .maxCardNumber(maxCardNumberInBooster))); + cardInfos.removeIf(cardInfo -> nonSpecialLegends.contains(cardInfo.getName())); return cardInfos; } diff --git a/Mage.Sets/src/mage/sets/HourOfDevastation.java b/Mage.Sets/src/mage/sets/HourOfDevastation.java index 95172107e2c..5ce3c74642f 100644 --- a/Mage.Sets/src/mage/sets/HourOfDevastation.java +++ b/Mage.Sets/src/mage/sets/HourOfDevastation.java @@ -249,8 +249,7 @@ public final class HourOfDevastation extends ExpansionSet { protected List findCardsByRarity(Rarity rarity) { List cardInfos = super.findCardsByRarity(rarity); if (rarity == Rarity.SPECIAL) { - cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MP2"))); - cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() < 31); + cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MP2").minCardNumber(31))); } return cardInfos; } diff --git a/Mage.Sets/src/mage/sets/Kaladesh.java b/Mage.Sets/src/mage/sets/Kaladesh.java index b393ad22dc6..6ab5e802747 100644 --- a/Mage.Sets/src/mage/sets/Kaladesh.java +++ b/Mage.Sets/src/mage/sets/Kaladesh.java @@ -317,8 +317,7 @@ public final class Kaladesh extends ExpansionSet { protected List findCardsByRarity(Rarity rarity) { List cardInfos = super.findCardsByRarity(rarity); if (rarity == Rarity.SPECIAL) { - cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MPS"))); - cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() > 30); + cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MPS").maxCardNumber(30))); } return cardInfos; } diff --git a/Mage.Sets/src/mage/sets/ModernHorizons2.java b/Mage.Sets/src/mage/sets/ModernHorizons2.java index 168baee9aba..93949352acc 100644 --- a/Mage.Sets/src/mage/sets/ModernHorizons2.java +++ b/Mage.Sets/src/mage/sets/ModernHorizons2.java @@ -552,13 +552,11 @@ public final class ModernHorizons2 extends ExpansionSet { @Override protected List findSpecialCardsByRarity(Rarity rarity) { - List cardInfos = CardRepository - .instance - .findCards(new CardCriteria().setCodes(this.code).rarities(rarity)); - cardInfos.removeIf(cardInfo -> ( - cardInfo.getCardNumberAsInt() < 262 - || cardInfo.getCardNumberAsInt() > maxCardNumberInBooster)); - return cardInfos; + return CardRepository.instance.findCards(new CardCriteria() + .setCodes(this.code) + .rarities(rarity) + .minCardNumber(262) + .maxCardNumber(maxCardNumberInBooster)); } @Override diff --git a/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java b/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java index b09fea67610..215ebf391cc 100644 --- a/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java +++ b/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java @@ -229,8 +229,7 @@ public final class OathOfTheGatewatch extends ExpansionSet { // only the full-art versions of Wastes are found in boosters cardInfos.removeIf(cardInfo -> cardInfo.getCardNumber().contains("a")); } else if (rarity == Rarity.SPECIAL) { - cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("EXP"))); - cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() < 26); + cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("EXP").minCardNumber(26))); } return cardInfos; } diff --git a/Mage.Sets/src/mage/sets/StrixhavenSchoolOfMages.java b/Mage.Sets/src/mage/sets/StrixhavenSchoolOfMages.java index ef2d836f3b1..2b1f1d0edc1 100644 --- a/Mage.Sets/src/mage/sets/StrixhavenSchoolOfMages.java +++ b/Mage.Sets/src/mage/sets/StrixhavenSchoolOfMages.java @@ -458,8 +458,8 @@ public final class StrixhavenSchoolOfMages extends ExpansionSet { cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria() .setCodes(this.code) .rarities(rarity) - .subtypes(SubType.LESSON))); - cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() > maxCardNumberInBooster); + .subtypes(SubType.LESSON) + .maxCardNumber(maxCardNumberInBooster))); } return cardInfos; } diff --git a/Mage.Sets/src/mage/sets/WarOfTheSpark.java b/Mage.Sets/src/mage/sets/WarOfTheSpark.java index bb486b5cbb9..39683297740 100644 --- a/Mage.Sets/src/mage/sets/WarOfTheSpark.java +++ b/Mage.Sets/src/mage/sets/WarOfTheSpark.java @@ -355,8 +355,8 @@ public final class WarOfTheSpark extends ExpansionSet { cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria() .setCodes(this.code) .rarities(rarity) - .types(CardType.PLANESWALKER))); - cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() > maxCardNumberInBooster); + .types(CardType.PLANESWALKER) + .maxCardNumber(maxCardNumberInBooster))); return cardInfos; } diff --git a/Mage/src/main/java/mage/cards/ExpansionSet.java b/Mage/src/main/java/mage/cards/ExpansionSet.java index 8c1d4df6846..d053f843127 100644 --- a/Mage/src/main/java/mage/cards/ExpansionSet.java +++ b/Mage/src/main/java/mage/cards/ExpansionSet.java @@ -519,11 +519,11 @@ public abstract class ExpansionSet implements Serializable { List cardInfos = CardRepository.instance.findCards(new CardCriteria() .setCodes(this.code) - .rarities(rarity)); + .rarities(rarity) + .maxCardNumber(maxCardNumberInBooster)); cardInfos.removeIf(next -> ( - next.getCardNumberAsInt() > maxCardNumberInBooster - || next.getCardNumber().contains("*") + next.getCardNumber().contains("*") || next.getCardNumber().contains("+"))); // special slot cards must not also appear in regular slots of their rarity @@ -557,7 +557,8 @@ public abstract class ExpansionSet implements Serializable { cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria() .setCodes(this.code) .rarities(Rarity.COMMON) - .types(CardType.LAND))); + .types(CardType.LAND) + .maxCardNumber(maxCardNumberInBooster))); } // if set has special slot(s) for DFCs, they are special cards @@ -565,12 +566,12 @@ public abstract class ExpansionSet implements Serializable { cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria() .setCodes(this.code) .rarities(rarity) - .doubleFaced(true))); + .doubleFaced(true) + .maxCardNumber(maxCardNumberInBooster))); } cardInfos.removeIf(next -> ( - next.getCardNumberAsInt() > maxCardNumberInBooster - || next.getCardNumber().contains("*") + next.getCardNumber().contains("*") || next.getCardNumber().contains("+"))); return cardInfos;