From bdeb0dde66e61cc5383e1f33a341ba126ea6b867 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Fri, 20 Aug 2021 09:33:38 -0400 Subject: [PATCH] refactored TokenPredicate to contain its own inverse --- Mage.Sets/src/mage/cards/a/AbzanAscendancy.java | 3 +-- Mage.Sets/src/mage/cards/a/AkimTheSoaringWind.java | 2 +- .../src/mage/cards/a/AlharuSolemnRitualist.java | 3 +-- Mage.Sets/src/mage/cards/a/AlwaysWatching.java | 3 +-- .../src/mage/cards/a/AnafenzaKinTreeSpirit.java | 3 +-- .../src/mage/cards/a/AnaxHardenedInTheForge.java | 3 +-- Mage.Sets/src/mage/cards/a/AnointerPriest.java | 2 +- Mage.Sets/src/mage/cards/a/ApocalypseChime.java | 2 +- Mage.Sets/src/mage/cards/a/AshayaSoulOfTheWild.java | 3 +-- Mage.Sets/src/mage/cards/b/BagOfDevouring.java | 2 +- Mage.Sets/src/mage/cards/b/BasriKet.java | 3 +-- Mage.Sets/src/mage/cards/b/BattleForBretagard.java | 2 +- Mage.Sets/src/mage/cards/b/BazaarOfWonders.java | 3 +-- Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java | 3 +-- Mage.Sets/src/mage/cards/b/Bifurcate.java | 3 +-- Mage.Sets/src/mage/cards/b/BlessedSanctuary.java | 3 +-- Mage.Sets/src/mage/cards/b/BlightMound.java | 3 +-- Mage.Sets/src/mage/cards/b/BrambleSovereign.java | 3 +-- Mage.Sets/src/mage/cards/b/BridgeFromBelow.java | 3 +-- Mage.Sets/src/mage/cards/b/BroodingSaurian.java | 3 +-- .../src/mage/cards/b/BrudicladTelchorEngineer.java | 4 ++-- Mage.Sets/src/mage/cards/b/BrutalSuppression.java | 3 +-- Mage.Sets/src/mage/cards/b/BurdenedAerialist.java | 2 +- Mage.Sets/src/mage/cards/c/CaptainPhasma.java | 3 +-- Mage.Sets/src/mage/cards/c/CaribouRange.java | 2 +- .../src/mage/cards/c/ChainerNightmareAdept.java | 3 +-- Mage.Sets/src/mage/cards/c/Chitterspitter.java | 2 +- Mage.Sets/src/mage/cards/c/ChromeReplicator.java | 2 +- Mage.Sets/src/mage/cards/c/CityInABottle.java | 4 ++-- Mage.Sets/src/mage/cards/c/CombineChrysalis.java | 2 +- Mage.Sets/src/mage/cards/c/CommanderCody.java | 3 +-- Mage.Sets/src/mage/cards/c/CorneredMarket.java | 2 +- Mage.Sets/src/mage/cards/c/CuriosityCrafter.java | 2 +- Mage.Sets/src/mage/cards/d/DanceOfMany.java | 3 +-- Mage.Sets/src/mage/cards/d/DanseMacabre.java | 2 +- Mage.Sets/src/mage/cards/d/DeathsOasis.java | 3 +-- Mage.Sets/src/mage/cards/d/DecayingSoil.java | 5 ++--- Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java | 2 +- Mage.Sets/src/mage/cards/d/DoggedHunter.java | 2 +- Mage.Sets/src/mage/cards/d/DoomForetold.java | 3 +-- Mage.Sets/src/mage/cards/d/DramaticFinale.java | 3 +-- Mage.Sets/src/mage/cards/d/DreadhordeInvasion.java | 2 +- Mage.Sets/src/mage/cards/d/DreadhordeTwins.java | 2 +- Mage.Sets/src/mage/cards/d/DrudgeSpell.java | 2 +- Mage.Sets/src/mage/cards/d/DualNature.java | 5 ++--- Mage.Sets/src/mage/cards/d/Duplicant.java | 3 +-- Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java | 2 +- Mage.Sets/src/mage/cards/e/EmmaraTandris.java | 2 +- Mage.Sets/src/mage/cards/e/EsikasChariot.java | 2 +- Mage.Sets/src/mage/cards/e/EternalSkylord.java | 2 +- Mage.Sets/src/mage/cards/f/FaerieArtisans.java | 3 +-- Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java | 3 +-- Mage.Sets/src/mage/cards/f/FeedThePack.java | 3 +-- .../src/mage/cards/f/FelisaFangOfSilverquill.java | 3 +-- Mage.Sets/src/mage/cards/f/FieldOfSouls.java | 3 +-- Mage.Sets/src/mage/cards/f/Finn.java | 3 +-- .../src/mage/cards/f/FlameshadowConjuring.java | 3 +-- Mage.Sets/src/mage/cards/f/Flicker.java | 3 +-- Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java | 3 +-- Mage.Sets/src/mage/cards/g/GeneralHux.java | 3 +-- Mage.Sets/src/mage/cards/g/GenesisChamber.java | 3 +-- Mage.Sets/src/mage/cards/g/GleamingOverseer.java | 2 +- Mage.Sets/src/mage/cards/g/GlimmerBairn.java | 2 +- Mage.Sets/src/mage/cards/g/GolgariGermination.java | 3 +-- Mage.Sets/src/mage/cards/g/GolgothianSylex.java | 2 +- Mage.Sets/src/mage/cards/g/GrimHaruspex.java | 3 +-- .../src/mage/cards/g/GrismoldTheDreadsower.java | 2 +- Mage.Sets/src/mage/cards/g/GuardianProject.java | 2 +- Mage.Sets/src/mage/cards/h/HarvesterOfSouls.java | 3 +-- Mage.Sets/src/mage/cards/h/HofriGhostforge.java | 3 +-- Mage.Sets/src/mage/cards/h/HourOfReckoning.java | 3 +-- Mage.Sets/src/mage/cards/i/IdentityThief.java | 4 +--- Mage.Sets/src/mage/cards/i/IllnessInTheRanks.java | 2 +- Mage.Sets/src/mage/cards/i/ImperialMask.java | 3 +-- .../src/mage/cards/i/InallaArchmageRitualist.java | 3 +-- Mage.Sets/src/mage/cards/i/InfernalTribute.java | 3 +-- Mage.Sets/src/mage/cards/i/IntangibleVirtue.java | 2 +- Mage.Sets/src/mage/cards/i/ItThatBetrays.java | 3 +-- Mage.Sets/src/mage/cards/i/IvoryGuardians.java | 3 +-- Mage.Sets/src/mage/cards/i/Ixidron.java | 3 +-- Mage.Sets/src/mage/cards/j/Jihad.java | 5 ++--- Mage.Sets/src/mage/cards/j/JinxedRing.java | 4 ++-- .../src/mage/cards/j/JudithTheScourgeDiva.java | 3 +-- Mage.Sets/src/mage/cards/j/JunglePatrol.java | 2 +- Mage.Sets/src/mage/cards/j/JunkWinder.java | 2 +- Mage.Sets/src/mage/cards/k/KayaTheInexorable.java | 3 +-- .../src/mage/cards/k/KnightOfTheLastBreath.java | 3 +-- Mage.Sets/src/mage/cards/k/KollTheForgemaster.java | 4 ++-- Mage.Sets/src/mage/cards/k/KorozdaGuildmage.java | 3 +-- Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java | 3 +-- .../src/mage/cards/l/LenaSelflessChampion.java | 3 +-- Mage.Sets/src/mage/cards/l/Liability.java | 3 +-- Mage.Sets/src/mage/cards/l/Lich.java | 4 +--- Mage.Sets/src/mage/cards/l/LightningCoils.java | 3 +-- .../src/mage/cards/l/LilianaHereticalHealer.java | 3 +-- .../src/mage/cards/l/LonisCryptozoologist.java | 2 +- Mage.Sets/src/mage/cards/l/LumberingBattlement.java | 3 +-- Mage.Sets/src/mage/cards/m/MagusOfTheBridge.java | 3 +-- Mage.Sets/src/mage/cards/m/MarduAscendancy.java | 3 +-- Mage.Sets/src/mage/cards/m/MascotInterception.java | 2 +- Mage.Sets/src/mage/cards/m/MaskOfTheMimic.java | 3 +-- .../src/mage/cards/m/MavrenFeinDuskApostle.java | 3 +-- Mage.Sets/src/mage/cards/m/MercenaryInformer.java | 3 +-- Mage.Sets/src/mage/cards/m/MidnightReaper.java | 3 +-- Mage.Sets/src/mage/cards/m/MilitiasPride.java | 3 +-- Mage.Sets/src/mage/cards/m/MinionReflector.java | 3 +-- Mage.Sets/src/mage/cards/m/MirrorMarch.java | 3 +-- Mage.Sets/src/mage/cards/m/Mirrorworks.java | 3 +-- Mage.Sets/src/mage/cards/m/MoltenEchoes.java | 3 +-- .../src/mage/cards/n/NadierAgentOfTheDuskenel.java | 2 +- Mage.Sets/src/mage/cards/n/NadiersNightblade.java | 2 +- Mage.Sets/src/mage/cards/n/NamelessRace.java | 3 +-- Mage.Sets/src/mage/cards/n/NightmareShepherd.java | 3 +-- Mage.Sets/src/mage/cards/n/NobleStand.java | 3 +-- Mage.Sets/src/mage/cards/n/NuteGunray.java | 3 +-- Mage.Sets/src/mage/cards/o/OgreSlumlord.java | 3 +-- Mage.Sets/src/mage/cards/o/OpenTheGraves.java | 3 +-- Mage.Sets/src/mage/cards/o/Overburden.java | 3 +-- Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java | 3 +-- Mage.Sets/src/mage/cards/p/ParadoxicalOutcome.java | 2 +- Mage.Sets/src/mage/cards/p/ParallelEvolution.java | 2 +- Mage.Sets/src/mage/cards/p/PawnOfUlamog.java | 3 +-- Mage.Sets/src/mage/cards/p/PerplexingTest.java | 3 +-- Mage.Sets/src/mage/cards/p/PhantomGeneral.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianIngester.java | 3 +-- Mage.Sets/src/mage/cards/p/PiasRevolution.java | 3 +-- Mage.Sets/src/mage/cards/p/PoeDameron.java | 3 +-- .../src/mage/cards/p/PravaOfTheSteelLegion.java | 2 +- Mage.Sets/src/mage/cards/p/ProgenitorMimic.java | 3 +-- Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java | 3 +-- Mage.Sets/src/mage/cards/p/PsychicAllergy.java | 3 +-- Mage.Sets/src/mage/cards/r/RadiantSolar.java | 3 +-- Mage.Sets/src/mage/cards/r/RebelInformer.java | 3 +-- Mage.Sets/src/mage/cards/r/Remembrance.java | 3 +-- Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java | 2 +- Mage.Sets/src/mage/cards/r/RhythmOfTheWild.java | 3 +-- .../src/mage/cards/r/RikuOfTwoReflections.java | 2 +- Mage.Sets/src/mage/cards/r/RishadanPawnshop.java | 3 +-- Mage.Sets/src/mage/cards/r/RubblebeltRunner.java | 2 +- Mage.Sets/src/mage/cards/s/SanctuaryRaptor.java | 2 +- Mage.Sets/src/mage/cards/s/SecondHarvest.java | 2 +- Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java | 3 +-- Mage.Sets/src/mage/cards/s/SengirAutocrat.java | 2 +- .../src/mage/cards/s/SethronHurloonGeneral.java | 3 +-- Mage.Sets/src/mage/cards/s/SifterOfSkulls.java | 3 +-- Mage.Sets/src/mage/cards/s/SkemfarAvenger.java | 2 +- Mage.Sets/src/mage/cards/s/SkyclaveApparition.java | 3 +-- Mage.Sets/src/mage/cards/s/SlyRequisitioner.java | 3 +-- Mage.Sets/src/mage/cards/s/SoShiny.java | 2 +- Mage.Sets/src/mage/cards/s/SosukesSummons.java | 3 +-- Mage.Sets/src/mage/cards/s/SoulOfTheHarvest.java | 3 +-- Mage.Sets/src/mage/cards/s/SpecimenCollector.java | 2 +- Mage.Sets/src/mage/cards/s/SpectralBears.java | 4 +--- Mage.Sets/src/mage/cards/s/SpiritBonds.java | 2 +- Mage.Sets/src/mage/cards/s/SpiritMirror.java | 2 +- Mage.Sets/src/mage/cards/s/Sporogenesis.java | 3 +-- Mage.Sets/src/mage/cards/s/SquirrelSanctuary.java | 3 +-- Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java | 3 +-- Mage.Sets/src/mage/cards/t/TeamPennant.java | 2 +- Mage.Sets/src/mage/cards/t/TeferisRealm.java | 2 +- .../src/mage/cards/t/TemmetVizierOfNaktamun.java | 2 +- Mage.Sets/src/mage/cards/t/Tetravus.java | 2 +- .../src/mage/cards/t/TheBlackstaffOfWaterdeep.java | 3 +-- Mage.Sets/src/mage/cards/t/TheGreatHenge.java | 3 +-- Mage.Sets/src/mage/cards/t/ThievesAuction.java | 3 +-- Mage.Sets/src/mage/cards/t/ThopterFoundry.java | 3 +-- Mage.Sets/src/mage/cards/t/ThrabenWatcher.java | 3 +-- Mage.Sets/src/mage/cards/t/TwilightDrover.java | 2 +- Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java | 4 +--- Mage.Sets/src/mage/cards/v/VerdantSuccession.java | 3 +-- Mage.Sets/src/mage/cards/v/VeryCrypticCommandD.java | 3 +-- Mage.Sets/src/mage/cards/v/VirulentPlague.java | 2 +- Mage.Sets/src/mage/cards/v/VizierOfTheScorpion.java | 2 +- .../src/mage/cards/w/WhisperwoodElemental.java | 2 +- Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java | 3 +-- Mage.Sets/src/mage/cards/y/YedoraGraveGardener.java | 3 +-- .../abilities/effects/common/PopulateEffect.java | 2 +- Mage/src/main/java/mage/filter/StaticFilters.java | 4 ++-- .../filter/predicate/permanent/TokenPredicate.java | 13 +++++++++---- .../command/emblems/AurraSingBaneOfJediEmblem.java | 3 +-- 180 files changed, 196 insertions(+), 310 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java b/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java index c01e50f6f4c..f57aa456a5c 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java +++ b/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java @@ -11,7 +11,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SpiritWhiteToken; @@ -26,7 +25,7 @@ public final class AbzanAscendancy extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public AbzanAscendancy(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AkimTheSoaringWind.java b/Mage.Sets/src/mage/cards/a/AkimTheSoaringWind.java index 56c93f04c7f..e3dbb9a505a 100644 --- a/Mage.Sets/src/mage/cards/a/AkimTheSoaringWind.java +++ b/Mage.Sets/src/mage/cards/a/AkimTheSoaringWind.java @@ -37,7 +37,7 @@ public final class AkimTheSoaringWind extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creature tokens"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public AkimTheSoaringWind(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AlharuSolemnRitualist.java b/Mage.Sets/src/mage/cards/a/AlharuSolemnRitualist.java index 30ebc945e01..d3e24af287d 100644 --- a/Mage.Sets/src/mage/cards/a/AlharuSolemnRitualist.java +++ b/Mage.Sets/src/mage/cards/a/AlharuSolemnRitualist.java @@ -16,7 +16,6 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SpiritWhiteToken; @@ -36,7 +35,7 @@ public final class AlharuSolemnRitualist extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter2.add(Predicates.not(TokenPredicate.instance)); + filter2.add(TokenPredicate.FALSE); filter2.add(CounterType.P1P1.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/a/AlwaysWatching.java b/Mage.Sets/src/mage/cards/a/AlwaysWatching.java index 267ba3b3585..464b6f395c5 100644 --- a/Mage.Sets/src/mage/cards/a/AlwaysWatching.java +++ b/Mage.Sets/src/mage/cards/a/AlwaysWatching.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -26,7 +25,7 @@ public final class AlwaysWatching extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creatures"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public AlwaysWatching(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java b/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java index 7e081ac81fe..aed39543849 100644 --- a/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java +++ b/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; @@ -25,7 +24,7 @@ public final class AnafenzaKinTreeSpirit extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/a/AnaxHardenedInTheForge.java b/Mage.Sets/src/mage/cards/a/AnaxHardenedInTheForge.java index b55489b2c7d..ee4c1b1686f 100644 --- a/Mage.Sets/src/mage/cards/a/AnaxHardenedInTheForge.java +++ b/Mage.Sets/src/mage/cards/a/AnaxHardenedInTheForge.java @@ -17,7 +17,6 @@ import java.util.UUID; import mage.abilities.common.DiesThisOrAnotherCreatureTriggeredAbility; import mage.abilities.effects.Effect; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -29,7 +28,7 @@ public final class AnaxHardenedInTheForge extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public AnaxHardenedInTheForge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AnointerPriest.java b/Mage.Sets/src/mage/cards/a/AnointerPriest.java index 8f367d9d2f3..d27af458661 100644 --- a/Mage.Sets/src/mage/cards/a/AnointerPriest.java +++ b/Mage.Sets/src/mage/cards/a/AnointerPriest.java @@ -24,7 +24,7 @@ public final class AnointerPriest extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("a creature token"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public AnointerPriest(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ApocalypseChime.java b/Mage.Sets/src/mage/cards/a/ApocalypseChime.java index 1493ab75280..c9118a06e54 100644 --- a/Mage.Sets/src/mage/cards/a/ApocalypseChime.java +++ b/Mage.Sets/src/mage/cards/a/ApocalypseChime.java @@ -27,7 +27,7 @@ public final class ApocalypseChime extends CardImpl { static { filter.add(Predicates.and( - Predicates.not(TokenPredicate.instance), + TokenPredicate.FALSE, new ExpansionSetPredicate("HML") )); } diff --git a/Mage.Sets/src/mage/cards/a/AshayaSoulOfTheWild.java b/Mage.Sets/src/mage/cards/a/AshayaSoulOfTheWild.java index f19cb8a4a51..a0cb766eace 100644 --- a/Mage.Sets/src/mage/cards/a/AshayaSoulOfTheWild.java +++ b/Mage.Sets/src/mage/cards/a/AshayaSoulOfTheWild.java @@ -14,7 +14,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -63,7 +62,7 @@ class AshayaSoulOfTheWildEffect extends ContinuousEffectImpl { = new FilterControlledCreaturePermanent(); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public AshayaSoulOfTheWildEffect() { diff --git a/Mage.Sets/src/mage/cards/b/BagOfDevouring.java b/Mage.Sets/src/mage/cards/b/BagOfDevouring.java index c4351cb0b90..35ae6ebd417 100644 --- a/Mage.Sets/src/mage/cards/b/BagOfDevouring.java +++ b/Mage.Sets/src/mage/cards/b/BagOfDevouring.java @@ -42,7 +42,7 @@ public final class BagOfDevouring extends CardImpl { = new FilterControlledPermanent("another artifact or creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(AnotherPredicate.instance); filter.add(Predicates.or( CardType.ARTIFACT.getPredicate(), diff --git a/Mage.Sets/src/mage/cards/b/BasriKet.java b/Mage.Sets/src/mage/cards/b/BasriKet.java index ea8957545d8..2c4bd29ff94 100644 --- a/Mage.Sets/src/mage/cards/b/BasriKet.java +++ b/Mage.Sets/src/mage/cards/b/BasriKet.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.command.emblems.BasriKetEmblem; @@ -74,7 +73,7 @@ class BasriKetTriggeredAbility extends DelayedTriggeredAbility { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public BasriKetTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/b/BattleForBretagard.java b/Mage.Sets/src/mage/cards/b/BattleForBretagard.java index 555ba8e38b5..d0a9e664a87 100644 --- a/Mage.Sets/src/mage/cards/b/BattleForBretagard.java +++ b/Mage.Sets/src/mage/cards/b/BattleForBretagard.java @@ -110,7 +110,7 @@ class BattleForBretagardTarget extends TargetPermanent { CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate() )); - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } BattleForBretagardTarget() { diff --git a/Mage.Sets/src/mage/cards/b/BazaarOfWonders.java b/Mage.Sets/src/mage/cards/b/BazaarOfWonders.java index d13e7567d74..f2801df9c35 100644 --- a/Mage.Sets/src/mage/cards/b/BazaarOfWonders.java +++ b/Mage.Sets/src/mage/cards/b/BazaarOfWonders.java @@ -15,7 +15,6 @@ import mage.constants.SetTargetPointer; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -78,7 +77,7 @@ class BazaarOfWondersEffect extends OneShotEffect { String spellName = spell.getName(); FilterPermanent filter1 = new FilterPermanent(); filter1.add(new NamePredicate(spellName)); - filter1.add(Predicates.not(TokenPredicate.instance)); + filter1.add(TokenPredicate.FALSE); if (!game.getBattlefield().getActivePermanents(filter1, source.getControllerId(), game).isEmpty()) { game.getStack().counter(spell.getId(), source, game); diff --git a/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java b/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java index b4e30edee70..87210552f79 100644 --- a/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java +++ b/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TokenPredicate; @@ -30,7 +29,7 @@ public final class BeastsOfBogardan extends CardImpl { static { controlFilter.add(new ColorPredicate(ObjectColor.WHITE)); - controlFilter.add(Predicates.not(TokenPredicate.instance)); + controlFilter.add(TokenPredicate.FALSE); } public BeastsOfBogardan(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/Bifurcate.java b/Mage.Sets/src/mage/cards/b/Bifurcate.java index 23ecae9a437..eee67766003 100644 --- a/Mage.Sets/src/mage/cards/b/Bifurcate.java +++ b/Mage.Sets/src/mage/cards/b/Bifurcate.java @@ -11,7 +11,6 @@ import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -29,7 +28,7 @@ public final class Bifurcate extends CardImpl { private static FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creatures"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public Bifurcate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BlessedSanctuary.java b/Mage.Sets/src/mage/cards/b/BlessedSanctuary.java index a6a32892b29..d58819c8c11 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedSanctuary.java +++ b/Mage.Sets/src/mage/cards/b/BlessedSanctuary.java @@ -11,7 +11,6 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.UnicornToken; @@ -23,7 +22,7 @@ public class BlessedSanctuary extends CardImpl { private static final FilterControlledCreaturePermanent filterNontoken = new FilterControlledCreaturePermanent("a nontoken creature"); static { - filterNontoken.add(Predicates.not(TokenPredicate.instance)); + filterNontoken.add(TokenPredicate.FALSE); } public BlessedSanctuary(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BlightMound.java b/Mage.Sets/src/mage/cards/b/BlightMound.java index 273b0a5d920..7b91d5d0ca3 100644 --- a/Mage.Sets/src/mage/cards/b/BlightMound.java +++ b/Mage.Sets/src/mage/cards/b/BlightMound.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.Pest11GainLifeToken; @@ -34,7 +33,7 @@ public final class BlightMound extends CardImpl { static { filter.add(AttackingPredicate.instance); - filter2.add(Predicates.not(TokenPredicate.instance)); + filter2.add(TokenPredicate.FALSE); } public BlightMound(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BrambleSovereign.java b/Mage.Sets/src/mage/cards/b/BrambleSovereign.java index a76a4a5183a..796735e09a9 100644 --- a/Mage.Sets/src/mage/cards/b/BrambleSovereign.java +++ b/Mage.Sets/src/mage/cards/b/BrambleSovereign.java @@ -16,7 +16,6 @@ import mage.constants.SetTargetPointer; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -31,7 +30,7 @@ public final class BrambleSovereign extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java b/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java index fca26722323..7ec702193ba 100644 --- a/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java +++ b/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -31,7 +30,7 @@ public final class BridgeFromBelow extends CardImpl { static { filter1.add(TargetController.YOU.getOwnerPredicate()); - filter1.add(Predicates.not(TokenPredicate.instance)); + filter1.add(TokenPredicate.FALSE); filter2.add(TargetController.OPPONENT.getOwnerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/b/BroodingSaurian.java b/Mage.Sets/src/mage/cards/b/BroodingSaurian.java index 02dc1aa657c..65ac3b858b4 100644 --- a/Mage.Sets/src/mage/cards/b/BroodingSaurian.java +++ b/Mage.Sets/src/mage/cards/b/BroodingSaurian.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.card.OwnerIdPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -50,7 +49,7 @@ class BroodingSaurianControlEffect extends ContinuousEffectImpl { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public BroodingSaurianControlEffect() { diff --git a/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java b/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java index dfff1b8ab04..32540571ce7 100644 --- a/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java +++ b/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java @@ -31,7 +31,7 @@ public final class BrudicladTelchorEngineer extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature tokens you control"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public BrudicladTelchorEngineer(UUID ownerId, CardSetInfo setInfo) { @@ -65,7 +65,7 @@ class BrudicladTelchorEngineerEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("token you control"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public BrudicladTelchorEngineerEffect() { diff --git a/Mage.Sets/src/mage/cards/b/BrutalSuppression.java b/Mage.Sets/src/mage/cards/b/BrutalSuppression.java index 99b99b34ae8..8e321b4a07c 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalSuppression.java +++ b/Mage.Sets/src/mage/cards/b/BrutalSuppression.java @@ -17,7 +17,6 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -56,7 +55,7 @@ class BrutalSuppressionAdditionalCostEffect extends CostModificationEffectImpl { private static final FilterPermanent filter2 = new FilterPermanent("nontoken Rebels"); static{ filter2.add(SubType.REBEL.getPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } BrutalSuppressionAdditionalCostEffect() { diff --git a/Mage.Sets/src/mage/cards/b/BurdenedAerialist.java b/Mage.Sets/src/mage/cards/b/BurdenedAerialist.java index 70d3101c25d..200437d9e30 100644 --- a/Mage.Sets/src/mage/cards/b/BurdenedAerialist.java +++ b/Mage.Sets/src/mage/cards/b/BurdenedAerialist.java @@ -25,7 +25,7 @@ public final class BurdenedAerialist extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a token"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public BurdenedAerialist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CaptainPhasma.java b/Mage.Sets/src/mage/cards/c/CaptainPhasma.java index 8a20f71b409..93feb899758 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainPhasma.java +++ b/Mage.Sets/src/mage/cards/c/CaptainPhasma.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.TrooperToken; import mage.target.common.TargetCardInLibrary; @@ -31,7 +30,7 @@ public final class CaptainPhasma extends CardImpl { static { filter.add(SubType.TROOPER.getPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filterCard.add(SubType.TROOPER.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/CaribouRange.java b/Mage.Sets/src/mage/cards/c/CaribouRange.java index cdf4ea4ca94..d311af7d64d 100644 --- a/Mage.Sets/src/mage/cards/c/CaribouRange.java +++ b/Mage.Sets/src/mage/cards/c/CaribouRange.java @@ -33,7 +33,7 @@ public final class CaribouRange extends CardImpl { static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Caribou token"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); filter.add(SubType.CARIBOU.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/ChainerNightmareAdept.java b/Mage.Sets/src/mage/cards/c/ChainerNightmareAdept.java index 9af5de43ab9..ee2627a4821 100644 --- a/Mage.Sets/src/mage/cards/c/ChainerNightmareAdept.java +++ b/Mage.Sets/src/mage/cards/c/ChainerNightmareAdept.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -163,7 +162,7 @@ class ChainerNightmareAdeptTriggeredAbility extends EntersBattlefieldAllTriggere = new FilterControlledCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(TargetController.YOU.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/Chitterspitter.java b/Mage.Sets/src/mage/cards/c/Chitterspitter.java index 1fb9aeca25d..74924dd04ae 100644 --- a/Mage.Sets/src/mage/cards/c/Chitterspitter.java +++ b/Mage.Sets/src/mage/cards/c/Chitterspitter.java @@ -37,7 +37,7 @@ public final class Chitterspitter extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent(SubType.SQUIRREL, "Squirrels"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public Chitterspitter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChromeReplicator.java b/Mage.Sets/src/mage/cards/c/ChromeReplicator.java index fb331f61330..cc05f6e7bd8 100644 --- a/Mage.Sets/src/mage/cards/c/ChromeReplicator.java +++ b/Mage.Sets/src/mage/cards/c/ChromeReplicator.java @@ -60,7 +60,7 @@ enum ChromeReplicatorCondition implements Condition { static { filter.add(Predicates.not(CardType.LAND.getPredicate())); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } @Override diff --git a/Mage.Sets/src/mage/cards/c/CityInABottle.java b/Mage.Sets/src/mage/cards/c/CityInABottle.java index 10fdf2cf610..30d668281d3 100644 --- a/Mage.Sets/src/mage/cards/c/CityInABottle.java +++ b/Mage.Sets/src/mage/cards/c/CityInABottle.java @@ -138,7 +138,7 @@ class CityInABottleStateTriggeredAbility extends StateTriggeredAbility { private static final FilterPermanent filter = new FilterPermanent("a nontoken permanent originally printed in the Arabian Nights expansion other than City in a Bottle"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(Predicates.or(getArabianNightsNamePredicates())); } @@ -172,7 +172,7 @@ class CityInABottleSacrificeEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent("a nontoken permanent originally printed in the Arabian Nights expansion other than City in a Bottle"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(Predicates.or(getArabianNightsNamePredicates())); } diff --git a/Mage.Sets/src/mage/cards/c/CombineChrysalis.java b/Mage.Sets/src/mage/cards/c/CombineChrysalis.java index 8885528e5d5..de5ee3dba89 100644 --- a/Mage.Sets/src/mage/cards/c/CombineChrysalis.java +++ b/Mage.Sets/src/mage/cards/c/CombineChrysalis.java @@ -29,7 +29,7 @@ public final class CombineChrysalis extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a token"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public CombineChrysalis(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CommanderCody.java b/Mage.Sets/src/mage/cards/c/CommanderCody.java index 65a57392cf5..7bc7bf73dc7 100644 --- a/Mage.Sets/src/mage/cards/c/CommanderCody.java +++ b/Mage.Sets/src/mage/cards/c/CommanderCody.java @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.TrooperToken; @@ -23,7 +22,7 @@ public final class CommanderCody extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-token Trooper creatures"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(SubType.TROOPER.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/CorneredMarket.java b/Mage.Sets/src/mage/cards/c/CorneredMarket.java index 13d1d74c810..705aef8e529 100644 --- a/Mage.Sets/src/mage/cards/c/CorneredMarket.java +++ b/Mage.Sets/src/mage/cards/c/CorneredMarket.java @@ -49,7 +49,7 @@ class CorneredMarketReplacementEffect extends ContinuousRuleModifyingEffectImpl private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(mage.filter.predicate.Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public CorneredMarketReplacementEffect() { diff --git a/Mage.Sets/src/mage/cards/c/CuriosityCrafter.java b/Mage.Sets/src/mage/cards/c/CuriosityCrafter.java index 965825568df..2f02ebcdb9c 100644 --- a/Mage.Sets/src/mage/cards/c/CuriosityCrafter.java +++ b/Mage.Sets/src/mage/cards/c/CuriosityCrafter.java @@ -27,7 +27,7 @@ public final class CuriosityCrafter extends CardImpl { = new FilterControlledCreaturePermanent("a creature token you control"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public CuriosityCrafter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DanceOfMany.java b/Mage.Sets/src/mage/cards/d/DanceOfMany.java index 2e1ed518cd6..549c4c05b11 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfMany.java +++ b/Mage.Sets/src/mage/cards/d/DanceOfMany.java @@ -19,7 +19,6 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -38,7 +37,7 @@ public final class DanceOfMany extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public DanceOfMany(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DanseMacabre.java b/Mage.Sets/src/mage/cards/d/DanseMacabre.java index f62acfad286..5753679b2df 100644 --- a/Mage.Sets/src/mage/cards/d/DanseMacabre.java +++ b/Mage.Sets/src/mage/cards/d/DanseMacabre.java @@ -54,7 +54,7 @@ class DanseMacabreEffect extends OneShotEffect { = new FilterControlledCreaturePermanent("nontoken creature you control"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } DanseMacabreEffect() { diff --git a/Mage.Sets/src/mage/cards/d/DeathsOasis.java b/Mage.Sets/src/mage/cards/d/DeathsOasis.java index 473a45e4645..f2e9cab7512 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsOasis.java +++ b/Mage.Sets/src/mage/cards/d/DeathsOasis.java @@ -20,7 +20,6 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -69,7 +68,7 @@ class DeathsOasisTriggeredAbility extends DiesCreatureTriggeredAbility { private static final FilterPermanent defaultFilter = new FilterControlledCreaturePermanent(); static { - defaultFilter.add(Predicates.not(TokenPredicate.instance)); + defaultFilter.add(TokenPredicate.FALSE); } DeathsOasisTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/d/DecayingSoil.java b/Mage.Sets/src/mage/cards/d/DecayingSoil.java index 90f7f8b8fad..5e7a944b578 100644 --- a/Mage.Sets/src/mage/cards/d/DecayingSoil.java +++ b/Mage.Sets/src/mage/cards/d/DecayingSoil.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import java.util.UUID; @@ -32,7 +31,7 @@ public final class DecayingSoil extends CardImpl { static { filter.add(TargetController.YOU.getOwnerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } private static final Condition condition = new CardsInControllerGraveyardCondition(7); @@ -70,7 +69,7 @@ class DecayingSoilTriggeredAbility extends DiesCreatureTriggeredAbility { static { filter.add(TargetController.YOU.getOwnerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } DecayingSoilTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java b/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java index d6a485f7389..15d8a7bec30 100644 --- a/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java +++ b/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java @@ -28,7 +28,7 @@ public final class DiamondKaleidoscope extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Prism token"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); filter.add(SubType.PRISM.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/DoggedHunter.java b/Mage.Sets/src/mage/cards/d/DoggedHunter.java index b5e7a396023..ad7703d0113 100644 --- a/Mage.Sets/src/mage/cards/d/DoggedHunter.java +++ b/Mage.Sets/src/mage/cards/d/DoggedHunter.java @@ -24,7 +24,7 @@ public final class DoggedHunter extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature token"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public DoggedHunter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DoomForetold.java b/Mage.Sets/src/mage/cards/d/DoomForetold.java index 090c663cc4a..5ae9c226bbd 100644 --- a/Mage.Sets/src/mage/cards/d/DoomForetold.java +++ b/Mage.Sets/src/mage/cards/d/DoomForetold.java @@ -13,7 +13,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -53,7 +52,7 @@ class DoomForetoldEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterNonlandPermanent("nonland, nontoken permanent"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } private static final Effect effect1 = new CreateTokenEffect(new KnightToken()); diff --git a/Mage.Sets/src/mage/cards/d/DramaticFinale.java b/Mage.Sets/src/mage/cards/d/DramaticFinale.java index bdfa96118c8..94b482ba80e 100644 --- a/Mage.Sets/src/mage/cards/d/DramaticFinale.java +++ b/Mage.Sets/src/mage/cards/d/DramaticFinale.java @@ -11,7 +11,6 @@ import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.InklingToken; @@ -26,7 +25,7 @@ public final class DramaticFinale extends CardImpl { = new FilterControlledCreaturePermanent("one or more nontoken creatures you control"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public DramaticFinale(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DreadhordeInvasion.java b/Mage.Sets/src/mage/cards/d/DreadhordeInvasion.java index c34803e2448..19f14fd15a1 100644 --- a/Mage.Sets/src/mage/cards/d/DreadhordeInvasion.java +++ b/Mage.Sets/src/mage/cards/d/DreadhordeInvasion.java @@ -26,7 +26,7 @@ public final class DreadhordeInvasion extends CardImpl { static { filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 5)); - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); filter.add(TargetController.YOU.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/DreadhordeTwins.java b/Mage.Sets/src/mage/cards/d/DreadhordeTwins.java index ae9100b3426..4c83e8c65bd 100644 --- a/Mage.Sets/src/mage/cards/d/DreadhordeTwins.java +++ b/Mage.Sets/src/mage/cards/d/DreadhordeTwins.java @@ -24,7 +24,7 @@ public final class DreadhordeTwins extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(SubType.ZOMBIE, "Zombie tokens"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public DreadhordeTwins(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DrudgeSpell.java b/Mage.Sets/src/mage/cards/d/DrudgeSpell.java index 2d37ed140e7..d559bace2e7 100644 --- a/Mage.Sets/src/mage/cards/d/DrudgeSpell.java +++ b/Mage.Sets/src/mage/cards/d/DrudgeSpell.java @@ -31,7 +31,7 @@ public final class DrudgeSpell extends CardImpl { static { filter.add(SubType.SKELETON.getPredicate()); - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public DrudgeSpell(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DualNature.java b/Mage.Sets/src/mage/cards/d/DualNature.java index 50f76905df8..8da8ffbb1df 100644 --- a/Mage.Sets/src/mage/cards/d/DualNature.java +++ b/Mage.Sets/src/mage/cards/d/DualNature.java @@ -20,7 +20,6 @@ import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -37,7 +36,7 @@ public final class DualNature extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public DualNature(UUID ownerId, CardSetInfo setInfo) { @@ -130,7 +129,7 @@ class DualNatureCreatureLeavesEffect extends OneShotEffect { Permanent creature = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if (creature != null) { FilterPermanent filter = new FilterPermanent(); - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); filter.add(new NamePredicate(creature.getName())); new ExileAllEffect(filter).apply(game, source); return true; diff --git a/Mage.Sets/src/mage/cards/d/Duplicant.java b/Mage.Sets/src/mage/cards/d/Duplicant.java index ae384922d14..2467806469b 100644 --- a/Mage.Sets/src/mage/cards/d/Duplicant.java +++ b/Mage.Sets/src/mage/cards/d/Duplicant.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -30,7 +29,7 @@ public final class Duplicant extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public Duplicant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java b/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java index e4347744e67..c7ea9fe0d27 100644 --- a/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java +++ b/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java @@ -26,7 +26,7 @@ public final class EarlOfSquirrel extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Squirrels you control"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); filter.add(TargetController.YOU.getControllerPredicate()); filter2.add(SubType.SQUIRREL.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/e/EmmaraTandris.java b/Mage.Sets/src/mage/cards/e/EmmaraTandris.java index c7f55d991a9..741d72d248a 100644 --- a/Mage.Sets/src/mage/cards/e/EmmaraTandris.java +++ b/Mage.Sets/src/mage/cards/e/EmmaraTandris.java @@ -20,7 +20,7 @@ public final class EmmaraTandris extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature tokens you control"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); filter.add(TargetController.YOU.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/e/EsikasChariot.java b/Mage.Sets/src/mage/cards/e/EsikasChariot.java index c79febb4771..341fb215923 100644 --- a/Mage.Sets/src/mage/cards/e/EsikasChariot.java +++ b/Mage.Sets/src/mage/cards/e/EsikasChariot.java @@ -27,7 +27,7 @@ public final class EsikasChariot extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("token you control"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public EsikasChariot(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EternalSkylord.java b/Mage.Sets/src/mage/cards/e/EternalSkylord.java index a6f9bf7626d..8e6ae50149d 100644 --- a/Mage.Sets/src/mage/cards/e/EternalSkylord.java +++ b/Mage.Sets/src/mage/cards/e/EternalSkylord.java @@ -25,7 +25,7 @@ public final class EternalSkylord extends CardImpl { = new FilterPermanent(SubType.ZOMBIE, "Zombie tokens"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public EternalSkylord(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FaerieArtisans.java b/Mage.Sets/src/mage/cards/f/FaerieArtisans.java index 45c9c465c6d..7c7be3b9774 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieArtisans.java +++ b/Mage.Sets/src/mage/cards/f/FaerieArtisans.java @@ -14,7 +14,6 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class FaerieArtisans extends CardImpl { private static final FilterCreaturePermanent filterNontoken = new FilterCreaturePermanent("nontoken creature"); static { - filterNontoken.add(Predicates.not(TokenPredicate.instance)); + filterNontoken.add(TokenPredicate.FALSE); filterNontoken.add(TargetController.OPPONENT.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java b/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java index 6d309e00894..a63f325fd2b 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java +++ b/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.PirateToken; @@ -31,7 +30,7 @@ public final class FathomFleetCaptain extends CardImpl { static { filter.add(SubType.PIRATE.getPredicate()); filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public FathomFleetCaptain(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FeedThePack.java b/Mage.Sets/src/mage/cards/f/FeedThePack.java index 0a0eb45693b..4351254bb29 100644 --- a/Mage.Sets/src/mage/cards/f/FeedThePack.java +++ b/Mage.Sets/src/mage/cards/f/FeedThePack.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -48,7 +47,7 @@ class FeedThePackEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public FeedThePackEffect() { diff --git a/Mage.Sets/src/mage/cards/f/FelisaFangOfSilverquill.java b/Mage.Sets/src/mage/cards/f/FelisaFangOfSilverquill.java index c90584ed5ab..dd10f1afe6e 100644 --- a/Mage.Sets/src/mage/cards/f/FelisaFangOfSilverquill.java +++ b/Mage.Sets/src/mage/cards/f/FelisaFangOfSilverquill.java @@ -16,7 +16,6 @@ import mage.constants.SuperType; import mage.counters.Counter; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.CounterAnyPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -35,7 +34,7 @@ public final class FelisaFangOfSilverquill extends CardImpl { = new FilterControlledCreaturePermanent("a nontoken creature you control"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(CounterAnyPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/f/FieldOfSouls.java b/Mage.Sets/src/mage/cards/f/FieldOfSouls.java index 5bc43fe0f9e..197b4ebdb96 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfSouls.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfSouls.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SpiritWhiteToken; @@ -22,7 +21,7 @@ public final class FieldOfSouls extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public FieldOfSouls(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Finn.java b/Mage.Sets/src/mage/cards/f/Finn.java index a305bf92d72..4741a7fe19b 100644 --- a/Mage.Sets/src/mage/cards/f/Finn.java +++ b/Mage.Sets/src/mage/cards/f/Finn.java @@ -9,7 +9,6 @@ import mage.constants.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -22,7 +21,7 @@ public final class Finn extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public Finn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java b/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java index 44034f6b4d9..5f23c18d36d 100644 --- a/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java +++ b/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java @@ -18,7 +18,6 @@ import mage.constants.Outcome; import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -33,7 +32,7 @@ public final class FlameshadowConjuring extends CardImpl { private static final FilterControlledCreaturePermanent filterNontoken = new FilterControlledCreaturePermanent("nontoken creature"); static { - filterNontoken.add(Predicates.not(TokenPredicate.instance)); + filterNontoken.add(TokenPredicate.FALSE); } public FlameshadowConjuring(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Flicker.java b/Mage.Sets/src/mage/cards/f/Flicker.java index f07b10d617b..1af5c120e17 100644 --- a/Mage.Sets/src/mage/cards/f/Flicker.java +++ b/Mage.Sets/src/mage/cards/f/Flicker.java @@ -6,7 +6,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.target.TargetPermanent; @@ -20,7 +19,7 @@ public final class Flicker extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("nontoken permanent"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public Flicker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java b/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java index 4f357053d6a..e86e3ac9b72 100644 --- a/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java +++ b/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java @@ -22,7 +22,6 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -40,7 +39,7 @@ public final class GateToTheAfterlife extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public GateToTheAfterlife(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GeneralHux.java b/Mage.Sets/src/mage/cards/g/GeneralHux.java index e840867b274..5cb21a537c3 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralHux.java +++ b/Mage.Sets/src/mage/cards/g/GeneralHux.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -26,7 +25,7 @@ public final class GeneralHux extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public GeneralHux(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GenesisChamber.java b/Mage.Sets/src/mage/cards/g/GenesisChamber.java index 9691cafd421..0e82ae4ea35 100644 --- a/Mage.Sets/src/mage/cards/g/GenesisChamber.java +++ b/Mage.Sets/src/mage/cards/g/GenesisChamber.java @@ -13,7 +13,6 @@ import mage.constants.Outcome; import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class GenesisChamber extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public GenesisChamber(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GleamingOverseer.java b/Mage.Sets/src/mage/cards/g/GleamingOverseer.java index dd692395931..59e0905a43c 100644 --- a/Mage.Sets/src/mage/cards/g/GleamingOverseer.java +++ b/Mage.Sets/src/mage/cards/g/GleamingOverseer.java @@ -26,7 +26,7 @@ public final class GleamingOverseer extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(SubType.ZOMBIE, "Zombie tokens"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public GleamingOverseer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GlimmerBairn.java b/Mage.Sets/src/mage/cards/g/GlimmerBairn.java index 8985d02afc7..498d793ca66 100644 --- a/Mage.Sets/src/mage/cards/g/GlimmerBairn.java +++ b/Mage.Sets/src/mage/cards/g/GlimmerBairn.java @@ -23,7 +23,7 @@ public final class GlimmerBairn extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a token"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public GlimmerBairn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GolgariGermination.java b/Mage.Sets/src/mage/cards/g/GolgariGermination.java index a3269ab2cbe..81abbeda251 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariGermination.java +++ b/Mage.Sets/src/mage/cards/g/GolgariGermination.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SaprolingToken; @@ -23,7 +22,7 @@ public final class GolgariGermination extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public GolgariGermination(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GolgothianSylex.java b/Mage.Sets/src/mage/cards/g/GolgothianSylex.java index 0180d2f2edc..cdf4df4e66f 100644 --- a/Mage.Sets/src/mage/cards/g/GolgothianSylex.java +++ b/Mage.Sets/src/mage/cards/g/GolgothianSylex.java @@ -51,7 +51,7 @@ class GolgothianSylexEffect extends OneShotEffect { static { filter.add(Predicates.and( new ExpansionSetPredicate("ATQ"), - Predicates.not(TokenPredicate.instance) + TokenPredicate.FALSE )); } diff --git a/Mage.Sets/src/mage/cards/g/GrimHaruspex.java b/Mage.Sets/src/mage/cards/g/GrimHaruspex.java index 9fff4ca0b37..02d74b1d658 100644 --- a/Mage.Sets/src/mage/cards/g/GrimHaruspex.java +++ b/Mage.Sets/src/mage/cards/g/GrimHaruspex.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.ColoredManaSymbol; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; @@ -28,7 +27,7 @@ public final class GrimHaruspex extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public GrimHaruspex(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GrismoldTheDreadsower.java b/Mage.Sets/src/mage/cards/g/GrismoldTheDreadsower.java index e5d86bdfa57..48f322f38ba 100644 --- a/Mage.Sets/src/mage/cards/g/GrismoldTheDreadsower.java +++ b/Mage.Sets/src/mage/cards/g/GrismoldTheDreadsower.java @@ -30,7 +30,7 @@ public final class GrismoldTheDreadsower extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("a creature token"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public GrismoldTheDreadsower(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GuardianProject.java b/Mage.Sets/src/mage/cards/g/GuardianProject.java index 54face9a2e3..27f3158c6cc 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianProject.java +++ b/Mage.Sets/src/mage/cards/g/GuardianProject.java @@ -53,7 +53,7 @@ class GuardianProjectTriggeredAbility extends EntersBattlefieldAllTriggeredAbili public static final FilterPermanent filterNonTokenControlledCreature = new FilterControlledCreaturePermanent(); static { - filterNonTokenControlledCreature.add(Predicates.not(TokenPredicate.instance)); + filterNonTokenControlledCreature.add(TokenPredicate.FALSE); } GuardianProjectTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/h/HarvesterOfSouls.java b/Mage.Sets/src/mage/cards/h/HarvesterOfSouls.java index c6c05e0fe4c..a20906343d0 100644 --- a/Mage.Sets/src/mage/cards/h/HarvesterOfSouls.java +++ b/Mage.Sets/src/mage/cards/h/HarvesterOfSouls.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; @@ -23,7 +22,7 @@ public final class HarvesterOfSouls extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/h/HofriGhostforge.java b/Mage.Sets/src/mage/cards/h/HofriGhostforge.java index 09d3e8d9c7d..1f79cccd3d8 100644 --- a/Mage.Sets/src/mage/cards/h/HofriGhostforge.java +++ b/Mage.Sets/src/mage/cards/h/HofriGhostforge.java @@ -20,7 +20,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -43,7 +42,7 @@ public final class HofriGhostforge extends CardImpl { static { filter3.add(AnotherPredicate.instance); - filter3.add(Predicates.not(TokenPredicate.instance)); + filter3.add(TokenPredicate.FALSE); } public HofriGhostforge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HourOfReckoning.java b/Mage.Sets/src/mage/cards/h/HourOfReckoning.java index deb35be36c2..00d8092c025 100644 --- a/Mage.Sets/src/mage/cards/h/HourOfReckoning.java +++ b/Mage.Sets/src/mage/cards/h/HourOfReckoning.java @@ -8,7 +8,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -20,7 +19,7 @@ public final class HourOfReckoning extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creatures"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public HourOfReckoning(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IdentityThief.java b/Mage.Sets/src/mage/cards/i/IdentityThief.java index e83940e6fa2..54064b16fe4 100644 --- a/Mage.Sets/src/mage/cards/i/IdentityThief.java +++ b/Mage.Sets/src/mage/cards/i/IdentityThief.java @@ -11,11 +11,9 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; @@ -34,7 +32,7 @@ public final class IdentityThief extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("target nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public IdentityThief(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IllnessInTheRanks.java b/Mage.Sets/src/mage/cards/i/IllnessInTheRanks.java index a4e414fe0d5..5d798e221b5 100644 --- a/Mage.Sets/src/mage/cards/i/IllnessInTheRanks.java +++ b/Mage.Sets/src/mage/cards/i/IllnessInTheRanks.java @@ -20,7 +20,7 @@ public final class IllnessInTheRanks extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creature tokens"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public IllnessInTheRanks(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/ImperialMask.java b/Mage.Sets/src/mage/cards/i/ImperialMask.java index 3dea2e5798f..540d044feda 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialMask.java +++ b/Mage.Sets/src/mage/cards/i/ImperialMask.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -26,7 +25,7 @@ public final class ImperialMask extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public ImperialMask(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java index 61f0cc1a3ae..05aca9f23ea 100644 --- a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java +++ b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java @@ -27,7 +27,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.filter.predicate.permanent.TokenPredicate; @@ -48,7 +47,7 @@ public final class InallaArchmageRitualist extends CardImpl { static { filter.add(SubType.WIZARD.getPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(AnotherPredicate.instance); filter2.add(SubType.WIZARD.getPredicate()); filter2.add(TappedPredicate.UNTAPPED); diff --git a/Mage.Sets/src/mage/cards/i/InfernalTribute.java b/Mage.Sets/src/mage/cards/i/InfernalTribute.java index 2bf57cfe5ca..6eac256dfaf 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalTribute.java +++ b/Mage.Sets/src/mage/cards/i/InfernalTribute.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.target.common.TargetControlledPermanent; @@ -25,7 +24,7 @@ public final class InfernalTribute extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a nontoken permanent"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public InfernalTribute(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IntangibleVirtue.java b/Mage.Sets/src/mage/cards/i/IntangibleVirtue.java index 7f14796544b..c54c39d1f6a 100644 --- a/Mage.Sets/src/mage/cards/i/IntangibleVirtue.java +++ b/Mage.Sets/src/mage/cards/i/IntangibleVirtue.java @@ -23,7 +23,7 @@ public final class IntangibleVirtue extends CardImpl { = new FilterCreaturePermanent("creature tokens"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public IntangibleVirtue(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/ItThatBetrays.java b/Mage.Sets/src/mage/cards/i/ItThatBetrays.java index b16d90819f3..1ae54306a7e 100644 --- a/Mage.Sets/src/mage/cards/i/ItThatBetrays.java +++ b/Mage.Sets/src/mage/cards/i/ItThatBetrays.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -23,7 +22,7 @@ public final class ItThatBetrays extends CardImpl { private static final FilterPermanent FILTER = new FilterPermanent("nontoken permanent"); static { - FILTER.add(Predicates.not(TokenPredicate.instance)); + FILTER.add(TokenPredicate.FALSE); } public ItThatBetrays(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IvoryGuardians.java b/Mage.Sets/src/mage/cards/i/IvoryGuardians.java index 74a205ca12b..8a45da86bd1 100644 --- a/Mage.Sets/src/mage/cards/i/IvoryGuardians.java +++ b/Mage.Sets/src/mage/cards/i/IvoryGuardians.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.TokenPredicate; @@ -33,7 +32,7 @@ public final class IvoryGuardians extends CardImpl { static { controlFilter.add(new ColorPredicate(ObjectColor.RED)); - controlFilter.add(Predicates.not(TokenPredicate.instance)); + controlFilter.add(TokenPredicate.FALSE); boostFilter.add(new NamePredicate("Ivory Guardians")); } diff --git a/Mage.Sets/src/mage/cards/i/Ixidron.java b/Mage.Sets/src/mage/cards/i/Ixidron.java index ab4af589987..59698198cc2 100644 --- a/Mage.Sets/src/mage/cards/i/Ixidron.java +++ b/Mage.Sets/src/mage/cards/i/Ixidron.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.card.FaceDownPredicate; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; @@ -33,7 +32,7 @@ public final class Ixidron extends CardImpl { static { filter.add(FaceDownPredicate.instance); filterTurnFaceDown.add(AnotherPredicate.instance); - filterTurnFaceDown.add(Predicates.not(TokenPredicate.instance)); + filterTurnFaceDown.add(TokenPredicate.FALSE); } public Ixidron(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/Jihad.java b/Mage.Sets/src/mage/cards/j/Jihad.java index 50b09672953..f5c12b809b5 100644 --- a/Mage.Sets/src/mage/cards/j/Jihad.java +++ b/Mage.Sets/src/mage/cards/j/Jihad.java @@ -22,7 +22,6 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -84,7 +83,7 @@ class JihadTriggeredAbility extends StateTriggeredAbility { UUID chosenOpponent = (UUID) game.getState().getValue(getSourceId().toString() + ChooseOpponentEffect.VALUE_KEY); FilterPermanent filter = new FilterPermanent(); filter.add(new ColorPredicate((ObjectColor) game.getState().getValue(getSourceId() + "_color"))); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); return game.getBattlefield().countAll(filter, chosenOpponent, game) == 0; } @@ -101,7 +100,7 @@ class JihadOpponentCondition implements Condition { UUID chosenOpponent = (UUID) game.getState().getValue(source.getSourceId().toString() + ChooseOpponentEffect.VALUE_KEY); FilterPermanent filter = new FilterPermanent(); filter.add(new ColorPredicate((ObjectColor) game.getState().getValue(source.getSourceId() + "_color"))); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); return game.getBattlefield().countAll(filter, chosenOpponent, game) > 0; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/j/JinxedRing.java b/Mage.Sets/src/mage/cards/j/JinxedRing.java index 223851b7c95..2b769713e4d 100644 --- a/Mage.Sets/src/mage/cards/j/JinxedRing.java +++ b/Mage.Sets/src/mage/cards/j/JinxedRing.java @@ -18,7 +18,7 @@ import mage.constants.SubLayer; import mage.constants.Zone; import mage.filter.FilterPermanent; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; -import mage.filter.predicate.Predicates; + import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -34,7 +34,7 @@ public final class JinxedRing extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a nontoken permanent"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public JinxedRing(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java b/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java index 46f83e51048..2f79340d4a3 100644 --- a/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java +++ b/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.target.common.TargetAnyTarget; @@ -26,7 +25,7 @@ public final class JudithTheScourgeDiva extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public JudithTheScourgeDiva(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JunglePatrol.java b/Mage.Sets/src/mage/cards/j/JunglePatrol.java index 4f842959d18..cff02c48406 100644 --- a/Mage.Sets/src/mage/cards/j/JunglePatrol.java +++ b/Mage.Sets/src/mage/cards/j/JunglePatrol.java @@ -34,7 +34,7 @@ public final class JunglePatrol extends CardImpl { static { filter.add(new NamePredicate("Wood")); - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public JunglePatrol(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JunkWinder.java b/Mage.Sets/src/mage/cards/j/JunkWinder.java index 084155222ae..aca56968a4c 100644 --- a/Mage.Sets/src/mage/cards/j/JunkWinder.java +++ b/Mage.Sets/src/mage/cards/j/JunkWinder.java @@ -33,7 +33,7 @@ public final class JunkWinder extends CardImpl { private static final FilterPermanent filter2 = new FilterNonlandPermanent("nonland permanent an opponent controls"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); filter2.add(TargetController.OPPONENT.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/k/KayaTheInexorable.java b/Mage.Sets/src/mage/cards/k/KayaTheInexorable.java index 0f00bd2c62f..a5109c9bdd3 100644 --- a/Mage.Sets/src/mage/cards/k/KayaTheInexorable.java +++ b/Mage.Sets/src/mage/cards/k/KayaTheInexorable.java @@ -18,7 +18,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.command.emblems.KayaTheInexorableEmblem; @@ -40,7 +39,7 @@ public final class KayaTheInexorable extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public KayaTheInexorable(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KnightOfTheLastBreath.java b/Mage.Sets/src/mage/cards/k/KnightOfTheLastBreath.java index 78d7451f8ac..354a378fc90 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfTheLastBreath.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfTheLastBreath.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.WhiteBlackSpiritToken; @@ -31,7 +30,7 @@ public final class KnightOfTheLastBreath extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public KnightOfTheLastBreath(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KollTheForgemaster.java b/Mage.Sets/src/mage/cards/k/KollTheForgemaster.java index 74980457ea8..584f434785e 100644 --- a/Mage.Sets/src/mage/cards/k/KollTheForgemaster.java +++ b/Mage.Sets/src/mage/cards/k/KollTheForgemaster.java @@ -36,9 +36,9 @@ public final class KollTheForgemaster extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(Predicates.or(KollTheForgemasterEnchantedPredicate.instance, KollTheForgemasterEquippedPredicate.instance)); - filter2.add(TokenPredicate.instance); + filter2.add(TokenPredicate.TRUE); filter2.add(Predicates.or(EnchantedPredicate.instance, EquippedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/k/KorozdaGuildmage.java b/Mage.Sets/src/mage/cards/k/KorozdaGuildmage.java index 3da8f6316ae..64bcc640084 100644 --- a/Mage.Sets/src/mage/cards/k/KorozdaGuildmage.java +++ b/Mage.Sets/src/mage/cards/k/KorozdaGuildmage.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetControlledCreaturePermanent; @@ -34,7 +33,7 @@ public final class KorozdaGuildmage extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public KorozdaGuildmage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java b/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java index d032a5b4f7b..1d7828cb1ad 100644 --- a/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java +++ b/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.DragonToken2; @@ -33,7 +32,7 @@ public final class LathlissDragonQueen extends CardImpl { static { filter.add(SubType.DRAGON.getPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(AnotherPredicate.instance); filter2.add(SubType.DRAGON.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/l/LenaSelflessChampion.java b/Mage.Sets/src/mage/cards/l/LenaSelflessChampion.java index 233a0d7a494..d961e8bf794 100644 --- a/Mage.Sets/src/mage/cards/l/LenaSelflessChampion.java +++ b/Mage.Sets/src/mage/cards/l/LenaSelflessChampion.java @@ -21,7 +21,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.PowerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -38,7 +37,7 @@ public final class LenaSelflessChampion extends CardImpl { = new FilterControlledCreaturePermanent("nontoken creature you control"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public LenaSelflessChampion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/Liability.java b/Mage.Sets/src/mage/cards/l/Liability.java index a8441e67f9e..c70416c13f5 100644 --- a/Mage.Sets/src/mage/cards/l/Liability.java +++ b/Mage.Sets/src/mage/cards/l/Liability.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -25,7 +24,7 @@ public final class Liability extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a nontoken permanent"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public Liability(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/Lich.java b/Mage.Sets/src/mage/cards/l/Lich.java index f30724a9da8..e507b5eefed 100644 --- a/Mage.Sets/src/mage/cards/l/Lich.java +++ b/Mage.Sets/src/mage/cards/l/Lich.java @@ -21,11 +21,9 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; @@ -145,7 +143,7 @@ class LichDamageEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("nontoken permanent"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } private int amount = 0; diff --git a/Mage.Sets/src/mage/cards/l/LightningCoils.java b/Mage.Sets/src/mage/cards/l/LightningCoils.java index b7e789b8b9d..7e6f9867a57 100644 --- a/Mage.Sets/src/mage/cards/l/LightningCoils.java +++ b/Mage.Sets/src/mage/cards/l/LightningCoils.java @@ -13,7 +13,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -31,7 +30,7 @@ public final class LightningCoils extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public LightningCoils(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java b/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java index f6423ff4b86..fd5b07b1b8b 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java +++ b/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.ZombieToken; @@ -32,7 +31,7 @@ public final class LilianaHereticalHealer extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public LilianaHereticalHealer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LonisCryptozoologist.java b/Mage.Sets/src/mage/cards/l/LonisCryptozoologist.java index 32a8d29f7e9..160277e2647 100644 --- a/Mage.Sets/src/mage/cards/l/LonisCryptozoologist.java +++ b/Mage.Sets/src/mage/cards/l/LonisCryptozoologist.java @@ -35,7 +35,7 @@ public final class LonisCryptozoologist extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public LonisCryptozoologist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LumberingBattlement.java b/Mage.Sets/src/mage/cards/l/LumberingBattlement.java index 771737348ab..76767b99897 100644 --- a/Mage.Sets/src/mage/cards/l/LumberingBattlement.java +++ b/Mage.Sets/src/mage/cards/l/LumberingBattlement.java @@ -20,7 +20,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.ExileZone; @@ -81,7 +80,7 @@ class LumberingBattlementEffect extends OneShotEffect { = new FilterControlledCreaturePermanent("other nontoken creatures"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheBridge.java b/Mage.Sets/src/mage/cards/m/MagusOfTheBridge.java index 7d63905fa73..4362f3c26ee 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheBridge.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheBridge.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -30,7 +29,7 @@ public final class MagusOfTheBridge extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public MagusOfTheBridge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MarduAscendancy.java b/Mage.Sets/src/mage/cards/m/MarduAscendancy.java index cf4fcc0f155..7a7fec8498b 100644 --- a/Mage.Sets/src/mage/cards/m/MarduAscendancy.java +++ b/Mage.Sets/src/mage/cards/m/MarduAscendancy.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.GoblinToken; @@ -29,7 +28,7 @@ public final class MarduAscendancy extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); static { - attackFilter.add(Predicates.not(TokenPredicate.instance)); + attackFilter.add(TokenPredicate.FALSE); filter.add(TargetController.YOU.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/m/MascotInterception.java b/Mage.Sets/src/mage/cards/m/MascotInterception.java index 8ece1fda2d2..1576ce60c92 100644 --- a/Mage.Sets/src/mage/cards/m/MascotInterception.java +++ b/Mage.Sets/src/mage/cards/m/MascotInterception.java @@ -29,7 +29,7 @@ public final class MascotInterception extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("a creature token"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } private static final Condition condition = new SourceTargetsPermanentCondition(filter); diff --git a/Mage.Sets/src/mage/cards/m/MaskOfTheMimic.java b/Mage.Sets/src/mage/cards/m/MaskOfTheMimic.java index 33151c068f1..736a43f46b3 100644 --- a/Mage.Sets/src/mage/cards/m/MaskOfTheMimic.java +++ b/Mage.Sets/src/mage/cards/m/MaskOfTheMimic.java @@ -13,7 +13,6 @@ import mage.constants.Outcome; import mage.filter.FilterCard; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -31,7 +30,7 @@ public final class MaskOfTheMimic extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public MaskOfTheMimic(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MavrenFeinDuskApostle.java b/Mage.Sets/src/mage/cards/m/MavrenFeinDuskApostle.java index 7d95ce7bf22..cca6310558d 100644 --- a/Mage.Sets/src/mage/cards/m/MavrenFeinDuskApostle.java +++ b/Mage.Sets/src/mage/cards/m/MavrenFeinDuskApostle.java @@ -13,7 +13,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -55,7 +54,7 @@ class MavrenFeinDuskApostleTriggeredAbility extends TriggeredAbilityImpl { static { filter.add(SubType.VAMPIRE.getPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(TargetController.YOU.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/m/MercenaryInformer.java b/Mage.Sets/src/mage/cards/m/MercenaryInformer.java index bc63a4877db..eac785c0a9e 100644 --- a/Mage.Sets/src/mage/cards/m/MercenaryInformer.java +++ b/Mage.Sets/src/mage/cards/m/MercenaryInformer.java @@ -19,7 +19,6 @@ import mage.constants.Zone; import mage.filter.FilterObject; import mage.filter.FilterPermanent; import mage.filter.FilterStackObject; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.target.TargetPermanent; @@ -35,7 +34,7 @@ public final class MercenaryInformer extends CardImpl { static { filterBlack.add(new ColorPredicate(ObjectColor.BLACK)); - filterMercenary.add(Predicates.not(TokenPredicate.instance)); + filterMercenary.add(TokenPredicate.FALSE); filterMercenary.add(SubType.MERCENARY.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/m/MidnightReaper.java b/Mage.Sets/src/mage/cards/m/MidnightReaper.java index 6e29717da65..4e6ac688e67 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightReaper.java +++ b/Mage.Sets/src/mage/cards/m/MidnightReaper.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -26,7 +25,7 @@ public final class MidnightReaper extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public MidnightReaper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MilitiasPride.java b/Mage.Sets/src/mage/cards/m/MilitiasPride.java index 6f238f0c5cd..6a6723d8fbc 100644 --- a/Mage.Sets/src/mage/cards/m/MilitiasPride.java +++ b/Mage.Sets/src/mage/cards/m/MilitiasPride.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -61,7 +60,7 @@ class MilitiasPrideTriggerAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); Permanent permanent = game.getPermanent(event.getSourceId()); return permanent != null && filter.match(permanent, sourceId, controllerId, game); } diff --git a/Mage.Sets/src/mage/cards/m/MinionReflector.java b/Mage.Sets/src/mage/cards/m/MinionReflector.java index 84d3567aa0b..a438b6e2000 100644 --- a/Mage.Sets/src/mage/cards/m/MinionReflector.java +++ b/Mage.Sets/src/mage/cards/m/MinionReflector.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -31,7 +30,7 @@ public final class MinionReflector extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public MinionReflector(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MirrorMarch.java b/Mage.Sets/src/mage/cards/m/MirrorMarch.java index c68bf6b03ad..64e419eef8e 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorMarch.java +++ b/Mage.Sets/src/mage/cards/m/MirrorMarch.java @@ -12,7 +12,6 @@ import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.players.Player; @@ -27,7 +26,7 @@ public final class MirrorMarch extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public MirrorMarch(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Mirrorworks.java b/Mage.Sets/src/mage/cards/m/Mirrorworks.java index 79b440dc087..5744bc09073 100644 --- a/Mage.Sets/src/mage/cards/m/Mirrorworks.java +++ b/Mage.Sets/src/mage/cards/m/Mirrorworks.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; @@ -27,7 +26,7 @@ public final class Mirrorworks extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public Mirrorworks(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MoltenEchoes.java b/Mage.Sets/src/mage/cards/m/MoltenEchoes.java index eacbf3e9f3f..6125a7f4c79 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenEchoes.java +++ b/Mage.Sets/src/mage/cards/m/MoltenEchoes.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ChosenSubtypePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -39,7 +38,7 @@ public final class MoltenEchoes extends CardImpl { // Whenever a nontoken creature of the chosen type enters the battlefield under your control, create a token that's a copy of that creature. That token gains haste. Exile it at the beginning of the next end step. FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("nontoken creature of the chosen type"); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(ChosenSubtypePredicate.TRUE); Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new MoltenEchoesEffect(), diff --git a/Mage.Sets/src/mage/cards/n/NadierAgentOfTheDuskenel.java b/Mage.Sets/src/mage/cards/n/NadierAgentOfTheDuskenel.java index 30df05b6cae..ad2346c5b80 100644 --- a/Mage.Sets/src/mage/cards/n/NadierAgentOfTheDuskenel.java +++ b/Mage.Sets/src/mage/cards/n/NadierAgentOfTheDuskenel.java @@ -31,7 +31,7 @@ public final class NadierAgentOfTheDuskenel extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent("a token you control"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public NadierAgentOfTheDuskenel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NadiersNightblade.java b/Mage.Sets/src/mage/cards/n/NadiersNightblade.java index 07f209a4cda..ee67ab07751 100644 --- a/Mage.Sets/src/mage/cards/n/NadiersNightblade.java +++ b/Mage.Sets/src/mage/cards/n/NadiersNightblade.java @@ -23,7 +23,7 @@ public final class NadiersNightblade extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent("a token you control"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public NadiersNightblade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NamelessRace.java b/Mage.Sets/src/mage/cards/n/NamelessRace.java index 2bca8248e22..def2a34fd12 100644 --- a/Mage.Sets/src/mage/cards/n/NamelessRace.java +++ b/Mage.Sets/src/mage/cards/n/NamelessRace.java @@ -19,7 +19,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -68,7 +67,7 @@ class NamelessRaceEffect extends OneShotEffect { static { filter.add(new ColorPredicate(ObjectColor.WHITE)); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(TargetController.OPPONENT.getControllerPredicate()); filter2.add(new ColorPredicate(ObjectColor.WHITE)); filter2.add(TargetController.OPPONENT.getOwnerPredicate()); diff --git a/Mage.Sets/src/mage/cards/n/NightmareShepherd.java b/Mage.Sets/src/mage/cards/n/NightmareShepherd.java index adbd503fef6..b4de651cda7 100644 --- a/Mage.Sets/src/mage/cards/n/NightmareShepherd.java +++ b/Mage.Sets/src/mage/cards/n/NightmareShepherd.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -33,7 +32,7 @@ public final class NightmareShepherd extends CardImpl { = new FilterControlledCreaturePermanent("another nontoken creature you control"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/n/NobleStand.java b/Mage.Sets/src/mage/cards/n/NobleStand.java index 93b8b12199d..4070b715592 100644 --- a/Mage.Sets/src/mage/cards/n/NobleStand.java +++ b/Mage.Sets/src/mage/cards/n/NobleStand.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -56,7 +55,7 @@ class NobleStandAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); Permanent permanent = game.getPermanent(event.getSourceId()); return permanent != null && filter.match(permanent, sourceId, controllerId, game); } diff --git a/Mage.Sets/src/mage/cards/n/NuteGunray.java b/Mage.Sets/src/mage/cards/n/NuteGunray.java index 24966c0dbdd..231d4e49907 100644 --- a/Mage.Sets/src/mage/cards/n/NuteGunray.java +++ b/Mage.Sets/src/mage/cards/n/NuteGunray.java @@ -20,7 +20,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.DroidToken; import mage.target.common.TargetControlledPermanent; @@ -34,7 +33,7 @@ public final class NuteGunray extends CardImpl { private static final FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent("non-token artifact"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public NuteGunray(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OgreSlumlord.java b/Mage.Sets/src/mage/cards/o/OgreSlumlord.java index 3b9fe8553ee..79682ce7275 100644 --- a/Mage.Sets/src/mage/cards/o/OgreSlumlord.java +++ b/Mage.Sets/src/mage/cards/o/OgreSlumlord.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.RatToken; @@ -30,7 +29,7 @@ public final class OgreSlumlord extends CardImpl { private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("Rats you control"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(AnotherPredicate.instance); filter2.add(SubType.RAT.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/o/OpenTheGraves.java b/Mage.Sets/src/mage/cards/o/OpenTheGraves.java index 684c628f6a6..679aceeb298 100644 --- a/Mage.Sets/src/mage/cards/o/OpenTheGraves.java +++ b/Mage.Sets/src/mage/cards/o/OpenTheGraves.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.ZombieToken; @@ -22,7 +21,7 @@ public final class OpenTheGraves extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public OpenTheGraves(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/Overburden.java b/Mage.Sets/src/mage/cards/o/Overburden.java index b11a545d9a8..0f646bdec56 100644 --- a/Mage.Sets/src/mage/cards/o/Overburden.java +++ b/Mage.Sets/src/mage/cards/o/Overburden.java @@ -11,7 +11,6 @@ import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -25,7 +24,7 @@ public final class Overburden extends CardImpl { private static final FilterControlledLandPermanent RETURN_FILTER = new FilterControlledLandPermanent("a land"); static { - ENTERS_BATTLEFIELD_FILTER.add(Predicates.not(TokenPredicate.instance)); + ENTERS_BATTLEFIELD_FILTER.add(TokenPredicate.FALSE); } public Overburden(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java b/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java index 8b0f30d3747..00e1ddb654a 100644 --- a/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java +++ b/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.Token; import mage.game.permanent.token.ZombieToken; @@ -31,7 +30,7 @@ public final class OverseerOfTheDamned extends CardImpl { static { filter.add(TargetController.OPPONENT.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public OverseerOfTheDamned(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/ParadoxicalOutcome.java b/Mage.Sets/src/mage/cards/p/ParadoxicalOutcome.java index 7b7949980c7..df2ff3ad31d 100644 --- a/Mage.Sets/src/mage/cards/p/ParadoxicalOutcome.java +++ b/Mage.Sets/src/mage/cards/p/ParadoxicalOutcome.java @@ -33,7 +33,7 @@ public final class ParadoxicalOutcome extends CardImpl { static { filter.add(Predicates.not(CardType.LAND.getPredicate())); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public ParadoxicalOutcome(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/ParallelEvolution.java b/Mage.Sets/src/mage/cards/p/ParallelEvolution.java index c07d0a1a6c7..764fb263858 100644 --- a/Mage.Sets/src/mage/cards/p/ParallelEvolution.java +++ b/Mage.Sets/src/mage/cards/p/ParallelEvolution.java @@ -50,7 +50,7 @@ class ParallelEvolutionEffect extends OneShotEffect { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public ParallelEvolutionEffect() { diff --git a/Mage.Sets/src/mage/cards/p/PawnOfUlamog.java b/Mage.Sets/src/mage/cards/p/PawnOfUlamog.java index 2de04b81a76..7dc0991721b 100644 --- a/Mage.Sets/src/mage/cards/p/PawnOfUlamog.java +++ b/Mage.Sets/src/mage/cards/p/PawnOfUlamog.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.EldraziSpawnToken; @@ -24,7 +23,7 @@ public final class PawnOfUlamog extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public PawnOfUlamog(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PerplexingTest.java b/Mage.Sets/src/mage/cards/p/PerplexingTest.java index db40d316eda..e65939f6a70 100644 --- a/Mage.Sets/src/mage/cards/p/PerplexingTest.java +++ b/Mage.Sets/src/mage/cards/p/PerplexingTest.java @@ -8,7 +8,6 @@ import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import java.util.UUID; @@ -21,7 +20,7 @@ public final class PerplexingTest extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("nontoken creatures"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public PerplexingTest(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PhantomGeneral.java b/Mage.Sets/src/mage/cards/p/PhantomGeneral.java index ef6a0e74e08..d15214f8364 100644 --- a/Mage.Sets/src/mage/cards/p/PhantomGeneral.java +++ b/Mage.Sets/src/mage/cards/p/PhantomGeneral.java @@ -23,7 +23,7 @@ public final class PhantomGeneral extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creature tokens you control"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); filter.add(TargetController.YOU.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianIngester.java b/Mage.Sets/src/mage/cards/p/PhyrexianIngester.java index 770ced6731a..c3f3adf1f9f 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianIngester.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianIngester.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -30,7 +29,7 @@ public final class PhyrexianIngester extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public PhyrexianIngester(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PiasRevolution.java b/Mage.Sets/src/mage/cards/p/PiasRevolution.java index c59e430756d..9785a5a756e 100644 --- a/Mage.Sets/src/mage/cards/p/PiasRevolution.java +++ b/Mage.Sets/src/mage/cards/p/PiasRevolution.java @@ -11,7 +11,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -91,7 +90,7 @@ class PiasRevolutionTriggeredAbility extends TriggeredAbilityImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent(); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(TargetController.YOU.getOwnerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/p/PoeDameron.java b/Mage.Sets/src/mage/cards/p/PoeDameron.java index 594791dde51..2108f66be52 100644 --- a/Mage.Sets/src/mage/cards/p/PoeDameron.java +++ b/Mage.Sets/src/mage/cards/p/PoeDameron.java @@ -8,7 +8,6 @@ import mage.constants.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -22,7 +21,7 @@ public final class PoeDameron extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filterStarship.add(TargetController.YOU.getControllerPredicate()); filterStarship.add(SubType.STARSHIP.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/p/PravaOfTheSteelLegion.java b/Mage.Sets/src/mage/cards/p/PravaOfTheSteelLegion.java index f94a5c5c06f..020a8dd4d7b 100644 --- a/Mage.Sets/src/mage/cards/p/PravaOfTheSteelLegion.java +++ b/Mage.Sets/src/mage/cards/p/PravaOfTheSteelLegion.java @@ -29,7 +29,7 @@ public final class PravaOfTheSteelLegion extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public PravaOfTheSteelLegion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/ProgenitorMimic.java b/Mage.Sets/src/mage/cards/p/ProgenitorMimic.java index da73bccae1e..18ecfdc367a 100644 --- a/Mage.Sets/src/mage/cards/p/ProgenitorMimic.java +++ b/Mage.Sets/src/mage/cards/p/ProgenitorMimic.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.util.functions.AbilityCopyApplier; @@ -29,7 +28,7 @@ public final class ProgenitorMimic extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("no Token"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public ProgenitorMimic(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java b/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java index 7994ff3fb6c..7c770246b1d 100644 --- a/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java +++ b/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java @@ -7,7 +7,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.ElfWarriorToken; @@ -24,7 +23,7 @@ public final class ProwessOfTheFair extends CardImpl { static { filter.add(SubType.ELF.getPredicate()); filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public ProwessOfTheFair(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PsychicAllergy.java b/Mage.Sets/src/mage/cards/p/PsychicAllergy.java index 70378364c9f..02eb3ed9182 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicAllergy.java +++ b/Mage.Sets/src/mage/cards/p/PsychicAllergy.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -78,7 +77,7 @@ class PsychicAllergyEffect extends OneShotEffect { if (player != null) { FilterPermanent filter = new FilterPermanent(); filter.add(new ColorPredicate((ObjectColor) game.getState().getValue(source.getSourceId() + "_color"))); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); int damage = game.getBattlefield().countAll(filter, player.getId(), game); player.damage(damage, source.getSourceId(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/r/RadiantSolar.java b/Mage.Sets/src/mage/cards/r/RadiantSolar.java index 8dc11791493..30c7ebbefde 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantSolar.java +++ b/Mage.Sets/src/mage/cards/r/RadiantSolar.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import java.util.UUID; @@ -30,7 +29,7 @@ public final class RadiantSolar extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public RadiantSolar(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RebelInformer.java b/Mage.Sets/src/mage/cards/r/RebelInformer.java index b03be679910..2801819b2ed 100644 --- a/Mage.Sets/src/mage/cards/r/RebelInformer.java +++ b/Mage.Sets/src/mage/cards/r/RebelInformer.java @@ -19,7 +19,6 @@ import mage.constants.Zone; import mage.filter.FilterObject; import mage.filter.FilterPermanent; import mage.filter.FilterStackObject; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.target.TargetPermanent; @@ -35,7 +34,7 @@ public final class RebelInformer extends CardImpl { static { filterWhite.add(new ColorPredicate(ObjectColor.WHITE)); - filterRebel.add(Predicates.not(TokenPredicate.instance)); + filterRebel.add(TokenPredicate.FALSE); filterRebel.add(SubType.REBEL.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/r/Remembrance.java b/Mage.Sets/src/mage/cards/r/Remembrance.java index f957d3b46a5..5bf25d53825 100644 --- a/Mage.Sets/src/mage/cards/r/Remembrance.java +++ b/Mage.Sets/src/mage/cards/r/Remembrance.java @@ -10,7 +10,6 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -48,7 +47,7 @@ class RemembranceTriggeredAbility extends TriggeredAbilityImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } RemembranceTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java b/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java index ba2928d36f2..e69082506b1 100644 --- a/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java +++ b/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java @@ -69,7 +69,7 @@ class RhysTheRedeemedEffect extends OneShotEffect { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public RhysTheRedeemedEffect() { diff --git a/Mage.Sets/src/mage/cards/r/RhythmOfTheWild.java b/Mage.Sets/src/mage/cards/r/RhythmOfTheWild.java index 5ce861ef7d5..695b3fae703 100644 --- a/Mage.Sets/src/mage/cards/r/RhythmOfTheWild.java +++ b/Mage.Sets/src/mage/cards/r/RhythmOfTheWild.java @@ -20,7 +20,6 @@ import mage.filter.FilterPermanent; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureSpell; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; @@ -44,7 +43,7 @@ public final class RhythmOfTheWild extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter2.add(Predicates.not(TokenPredicate.instance)); + filter2.add(TokenPredicate.FALSE); } public RhythmOfTheWild(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java b/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java index f40932215de..402271c808b 100644 --- a/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java +++ b/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java @@ -31,7 +31,7 @@ public final class RikuOfTwoReflections extends CardImpl { filter.add(Predicates.or( CardType.INSTANT.getPredicate(), CardType.SORCERY.getPredicate())); - filterPermanent.add(Predicates.not(TokenPredicate.instance)); + filterPermanent.add(TokenPredicate.FALSE); filterPermanent.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java b/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java index 05a6f425ba0..8bb70a06a05 100644 --- a/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java +++ b/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -31,7 +30,7 @@ public final class RishadanPawnshop extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("nontoken permanent you control"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(TargetController.YOU.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/r/RubblebeltRunner.java b/Mage.Sets/src/mage/cards/r/RubblebeltRunner.java index 00dc85b47aa..7a600898792 100644 --- a/Mage.Sets/src/mage/cards/r/RubblebeltRunner.java +++ b/Mage.Sets/src/mage/cards/r/RubblebeltRunner.java @@ -22,7 +22,7 @@ public final class RubblebeltRunner extends CardImpl { = new FilterCreaturePermanent("creature tokens"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public RubblebeltRunner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SanctuaryRaptor.java b/Mage.Sets/src/mage/cards/s/SanctuaryRaptor.java index 7ef4fa3ed01..d42dffaa0b3 100644 --- a/Mage.Sets/src/mage/cards/s/SanctuaryRaptor.java +++ b/Mage.Sets/src/mage/cards/s/SanctuaryRaptor.java @@ -33,7 +33,7 @@ public final class SanctuaryRaptor extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent(); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } private static final Condition condition diff --git a/Mage.Sets/src/mage/cards/s/SecondHarvest.java b/Mage.Sets/src/mage/cards/s/SecondHarvest.java index aad894687af..de52921c995 100644 --- a/Mage.Sets/src/mage/cards/s/SecondHarvest.java +++ b/Mage.Sets/src/mage/cards/s/SecondHarvest.java @@ -60,7 +60,7 @@ class SecondHarvestEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { FilterControlledPermanent filter = new FilterControlledPermanent("each token you control"); - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); for (Permanent permanent : game.getBattlefield().getAllActivePermanents(filter, controller.getId(), game)) { if (permanent != null) { CreateTokenCopyTargetEffect effect = new CreateTokenCopyTargetEffect(); diff --git a/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java b/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java index 09e18e4ed23..f9f5e962e29 100644 --- a/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java +++ b/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SekKuarDeathkeeperGravebornToken; @@ -28,7 +27,7 @@ public final class SekKuarDeathkeeper extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public SekKuarDeathkeeper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SengirAutocrat.java b/Mage.Sets/src/mage/cards/s/SengirAutocrat.java index 4666a807eb2..7c8eb4ff544 100644 --- a/Mage.Sets/src/mage/cards/s/SengirAutocrat.java +++ b/Mage.Sets/src/mage/cards/s/SengirAutocrat.java @@ -24,7 +24,7 @@ public final class SengirAutocrat extends CardImpl { static { filter.add(SubType.SERF.getPredicate()); - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public SengirAutocrat(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SethronHurloonGeneral.java b/Mage.Sets/src/mage/cards/s/SethronHurloonGeneral.java index 596757a7dd0..81e26c2ff7d 100644 --- a/Mage.Sets/src/mage/cards/s/SethronHurloonGeneral.java +++ b/Mage.Sets/src/mage/cards/s/SethronHurloonGeneral.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.MinotaurToken; @@ -35,7 +34,7 @@ public final class SethronHurloonGeneral extends CardImpl { private static final FilterPermanent filter3 = new FilterPermanent(SubType.MINOTAUR, ""); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public SethronHurloonGeneral(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java b/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java index aef294ea7c5..9a0b3750bc6 100644 --- a/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java +++ b/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.EldraziScionToken; @@ -28,7 +27,7 @@ public final class SifterOfSkulls extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public SifterOfSkulls(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkemfarAvenger.java b/Mage.Sets/src/mage/cards/s/SkemfarAvenger.java index 1d275019af2..05c048cd6cc 100644 --- a/Mage.Sets/src/mage/cards/s/SkemfarAvenger.java +++ b/Mage.Sets/src/mage/cards/s/SkemfarAvenger.java @@ -31,7 +31,7 @@ public final class SkemfarAvenger extends CardImpl { SubType.BERSERKER.getPredicate() )); filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public SkemfarAvenger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkyclaveApparition.java b/Mage.Sets/src/mage/cards/s/SkyclaveApparition.java index 55e68f277ca..a4997e653f1 100644 --- a/Mage.Sets/src/mage/cards/s/SkyclaveApparition.java +++ b/Mage.Sets/src/mage/cards/s/SkyclaveApparition.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.ExileZone; @@ -37,7 +36,7 @@ public final class SkyclaveApparition extends CardImpl { ); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(TargetController.NOT_YOU.getControllerPredicate()); filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5)); } diff --git a/Mage.Sets/src/mage/cards/s/SlyRequisitioner.java b/Mage.Sets/src/mage/cards/s/SlyRequisitioner.java index 7e85755d68b..f1af9445e4b 100644 --- a/Mage.Sets/src/mage/cards/s/SlyRequisitioner.java +++ b/Mage.Sets/src/mage/cards/s/SlyRequisitioner.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.ServoToken; @@ -24,7 +23,7 @@ public final class SlyRequisitioner extends CardImpl { private static final FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent("a nontoken artifact you control"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public SlyRequisitioner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SoShiny.java b/Mage.Sets/src/mage/cards/s/SoShiny.java index 535474ff5c7..68927898687 100644 --- a/Mage.Sets/src/mage/cards/s/SoShiny.java +++ b/Mage.Sets/src/mage/cards/s/SoShiny.java @@ -34,7 +34,7 @@ public final class SoShiny extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent(); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } private static final Condition condition = new PermanentsOnTheBattlefieldCondition(filter); diff --git a/Mage.Sets/src/mage/cards/s/SosukesSummons.java b/Mage.Sets/src/mage/cards/s/SosukesSummons.java index 2252502caf7..65c242ee594 100644 --- a/Mage.Sets/src/mage/cards/s/SosukesSummons.java +++ b/Mage.Sets/src/mage/cards/s/SosukesSummons.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SnakeToken; @@ -25,7 +24,7 @@ public final class SosukesSummons extends CardImpl { static { filter.add(SubType.SNAKE.getPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public SosukesSummons(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SoulOfTheHarvest.java b/Mage.Sets/src/mage/cards/s/SoulOfTheHarvest.java index fbdbd033dd0..758815302e1 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfTheHarvest.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfTheHarvest.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; @@ -26,7 +25,7 @@ public final class SoulOfTheHarvest extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("another nontoken creature"); static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public SoulOfTheHarvest(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpecimenCollector.java b/Mage.Sets/src/mage/cards/s/SpecimenCollector.java index 91011f520ce..13c7b3affd5 100644 --- a/Mage.Sets/src/mage/cards/s/SpecimenCollector.java +++ b/Mage.Sets/src/mage/cards/s/SpecimenCollector.java @@ -27,7 +27,7 @@ public final class SpecimenCollector extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent("token you control"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public SpecimenCollector(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpectralBears.java b/Mage.Sets/src/mage/cards/s/SpectralBears.java index 02a72b86676..5a8914cf8f9 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralBears.java +++ b/Mage.Sets/src/mage/cards/s/SpectralBears.java @@ -12,12 +12,10 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; /** * @@ -52,7 +50,7 @@ class SpectralBearsTriggeredAbility extends TriggeredAbilityImpl { static { filter.add(new ColorPredicate(ObjectColor.BLACK)); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public SpectralBearsTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/s/SpiritBonds.java b/Mage.Sets/src/mage/cards/s/SpiritBonds.java index 7e894b30b17..885ccc27ebe 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritBonds.java +++ b/Mage.Sets/src/mage/cards/s/SpiritBonds.java @@ -37,7 +37,7 @@ public final class SpiritBonds extends CardImpl { static { filter.add(Predicates.not(SubType.SPIRIT.getPredicate())); filterSpirit.add(SubType.SPIRIT.getPredicate()); - filterNontoken.add(Predicates.not(TokenPredicate.instance)); + filterNontoken.add(TokenPredicate.FALSE); } public SpiritBonds(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpiritMirror.java b/Mage.Sets/src/mage/cards/s/SpiritMirror.java index 8c44cd6557e..b60efed5362 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritMirror.java +++ b/Mage.Sets/src/mage/cards/s/SpiritMirror.java @@ -28,7 +28,7 @@ public final class SpiritMirror extends CardImpl { static { filterToken.add(SubType.REFLECTION.getPredicate()); - filterToken.add(TokenPredicate.instance); + filterToken.add(TokenPredicate.TRUE); filter.add(SubType.REFLECTION.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/Sporogenesis.java b/Mage.Sets/src/mage/cards/s/Sporogenesis.java index b023c6b39b3..5d3f1461ca0 100644 --- a/Mage.Sets/src/mage/cards/s/Sporogenesis.java +++ b/Mage.Sets/src/mage/cards/s/Sporogenesis.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -38,7 +37,7 @@ public final class Sporogenesis extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public Sporogenesis(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SquirrelSanctuary.java b/Mage.Sets/src/mage/cards/s/SquirrelSanctuary.java index e71b691e182..4eeb37b5c41 100644 --- a/Mage.Sets/src/mage/cards/s/SquirrelSanctuary.java +++ b/Mage.Sets/src/mage/cards/s/SquirrelSanctuary.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SquirrelToken; @@ -26,7 +25,7 @@ public final class SquirrelSanctuary extends CardImpl { = new FilterControlledCreaturePermanent("a nontoken creature you control"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public SquirrelSanctuary(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java b/Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java index 27009e243dd..906a0d5c235 100644 --- a/Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java +++ b/Mage.Sets/src/mage/cards/t/TaboraxHopesDemise.java @@ -21,7 +21,6 @@ import mage.constants.SuperType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -41,7 +40,7 @@ public final class TaboraxHopesDemise extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public TaboraxHopesDemise(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TeamPennant.java b/Mage.Sets/src/mage/cards/t/TeamPennant.java index 2cf9b07a77a..d73cb69a456 100644 --- a/Mage.Sets/src/mage/cards/t/TeamPennant.java +++ b/Mage.Sets/src/mage/cards/t/TeamPennant.java @@ -29,7 +29,7 @@ public final class TeamPennant extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("creature token"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public TeamPennant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TeferisRealm.java b/Mage.Sets/src/mage/cards/t/TeferisRealm.java index 6f4e9f14977..0c8d25de0ac 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisRealm.java +++ b/Mage.Sets/src/mage/cards/t/TeferisRealm.java @@ -88,7 +88,7 @@ class TeferisRealmEffect extends OneShotEffect { } String choosenType = choiceImpl.getChoice(); FilterPermanent filter = new FilterPermanent(); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); switch (choosenType) { case ARTIFACT: filter.add(CardType.ARTIFACT.getPredicate()); diff --git a/Mage.Sets/src/mage/cards/t/TemmetVizierOfNaktamun.java b/Mage.Sets/src/mage/cards/t/TemmetVizierOfNaktamun.java index c771ec69965..9aed56cd6c7 100644 --- a/Mage.Sets/src/mage/cards/t/TemmetVizierOfNaktamun.java +++ b/Mage.Sets/src/mage/cards/t/TemmetVizierOfNaktamun.java @@ -30,7 +30,7 @@ public final class TemmetVizierOfNaktamun extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature token you control"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public TemmetVizierOfNaktamun(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/Tetravus.java b/Mage.Sets/src/mage/cards/t/Tetravus.java index 74c4cf53578..23698a0d59b 100644 --- a/Mage.Sets/src/mage/cards/t/Tetravus.java +++ b/Mage.Sets/src/mage/cards/t/Tetravus.java @@ -155,7 +155,7 @@ class TetravusAddCountersEffect extends OneShotEffect { } FilterControlledPermanent filter = new FilterControlledPermanent("tokens created with " + permanent.getName()); filter.add(new TetravusPredicate(new MageObjectReference(permanent, game))); - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); ExileTargetCost cost = new ExileTargetCost(new TargetControlledPermanent(0, Integer.MAX_VALUE, filter, true)); if (cost.pay(source, game, source, player.getId(), true)) { return new AddCountersSourceEffect(CounterType.P1P1.createInstance(cost.getPermanents().size())).apply(game, source); diff --git a/Mage.Sets/src/mage/cards/t/TheBlackstaffOfWaterdeep.java b/Mage.Sets/src/mage/cards/t/TheBlackstaffOfWaterdeep.java index 02c89bb4378..f4da6955cce 100644 --- a/Mage.Sets/src/mage/cards/t/TheBlackstaffOfWaterdeep.java +++ b/Mage.Sets/src/mage/cards/t/TheBlackstaffOfWaterdeep.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -30,7 +29,7 @@ public final class TheBlackstaffOfWaterdeep extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public TheBlackstaffOfWaterdeep(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TheGreatHenge.java b/Mage.Sets/src/mage/cards/t/TheGreatHenge.java index 3c81dc3e097..3354e81ccac 100644 --- a/Mage.Sets/src/mage/cards/t/TheGreatHenge.java +++ b/Mage.Sets/src/mage/cards/t/TheGreatHenge.java @@ -19,7 +19,6 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -35,7 +34,7 @@ public final class TheGreatHenge extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent(); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public TheGreatHenge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThievesAuction.java b/Mage.Sets/src/mage/cards/t/ThievesAuction.java index 08e2456eff2..8d19d0f9689 100644 --- a/Mage.Sets/src/mage/cards/t/ThievesAuction.java +++ b/Mage.Sets/src/mage/cards/t/ThievesAuction.java @@ -8,7 +8,6 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -47,7 +46,7 @@ class ThievesAuctionEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent("nontoken permanents"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } ThievesAuctionEffect() { diff --git a/Mage.Sets/src/mage/cards/t/ThopterFoundry.java b/Mage.Sets/src/mage/cards/t/ThopterFoundry.java index cd5d775cc5f..f17ac4ae2a6 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterFoundry.java +++ b/Mage.Sets/src/mage/cards/t/ThopterFoundry.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.ThopterToken; import mage.target.common.TargetControlledPermanent; @@ -28,7 +27,7 @@ public final class ThopterFoundry extends CardImpl { static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public ThopterFoundry(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThrabenWatcher.java b/Mage.Sets/src/mage/cards/t/ThrabenWatcher.java index ff86877b2b3..1ba7d9f4768 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenWatcher.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenWatcher.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import java.util.UUID; @@ -26,7 +25,7 @@ public final class ThrabenWatcher extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creatures"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public ThrabenWatcher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TwilightDrover.java b/Mage.Sets/src/mage/cards/t/TwilightDrover.java index b577fc2763d..0c061dce05e 100644 --- a/Mage.Sets/src/mage/cards/t/TwilightDrover.java +++ b/Mage.Sets/src/mage/cards/t/TwilightDrover.java @@ -28,7 +28,7 @@ public final class TwilightDrover extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature token"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public TwilightDrover(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java b/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java index 4d04b4bbf2f..6f2175bfb5f 100644 --- a/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java +++ b/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java @@ -14,11 +14,9 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.token.HumanSoldierToken; /** @@ -32,7 +30,7 @@ public final class UlvenwaldMysteries extends CardImpl { static { filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filterClue.add(SubType.CLUE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/v/VerdantSuccession.java b/Mage.Sets/src/mage/cards/v/VerdantSuccession.java index 6b60d0f2868..4f8bdf989df 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantSuccession.java +++ b/Mage.Sets/src/mage/cards/v/VerdantSuccession.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.TokenPredicate; @@ -56,7 +55,7 @@ class VerdantSuccessionTriggeredAbility extends TriggeredAbilityImpl { static { filter.add(new ColorPredicate(ObjectColor.GREEN)); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public VerdantSuccessionTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/v/VeryCrypticCommandD.java b/Mage.Sets/src/mage/cards/v/VeryCrypticCommandD.java index 898f3d12812..e81cac28413 100644 --- a/Mage.Sets/src/mage/cards/v/VeryCrypticCommandD.java +++ b/Mage.Sets/src/mage/cards/v/VeryCrypticCommandD.java @@ -20,7 +20,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.FilterStackObject; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.other.NumberOfTargetsPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -40,7 +39,7 @@ public final class VeryCrypticCommandD extends CardImpl { static { filter.add(new NumberOfTargetsPredicate(1)); - filter2.add(Predicates.not(TokenPredicate.instance)); + filter2.add(TokenPredicate.FALSE); } public VeryCrypticCommandD(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VirulentPlague.java b/Mage.Sets/src/mage/cards/v/VirulentPlague.java index 2c0ce5c10c8..f7f0e862dcc 100644 --- a/Mage.Sets/src/mage/cards/v/VirulentPlague.java +++ b/Mage.Sets/src/mage/cards/v/VirulentPlague.java @@ -20,7 +20,7 @@ public final class VirulentPlague extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creature tokens"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public VirulentPlague(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VizierOfTheScorpion.java b/Mage.Sets/src/mage/cards/v/VizierOfTheScorpion.java index fba4ca92698..1d01decf18b 100644 --- a/Mage.Sets/src/mage/cards/v/VizierOfTheScorpion.java +++ b/Mage.Sets/src/mage/cards/v/VizierOfTheScorpion.java @@ -24,7 +24,7 @@ public final class VizierOfTheScorpion extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(SubType.ZOMBIE, "Zombie tokens"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); } public VizierOfTheScorpion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java b/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java index 05e94095c1a..4f227dd64e3 100644 --- a/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java +++ b/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java @@ -33,7 +33,7 @@ public final class WhisperwoodElemental extends CardImpl { static { filter.add(Predicates.not(FaceDownPredicate.instance)); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public WhisperwoodElemental(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java b/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java index 50d849e6085..ff87979fa5c 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.InsectToken; @@ -26,7 +25,7 @@ public final class WirewoodHivemaster extends CardImpl { static { filter.add(SubType.ELF.getPredicate()); filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } public WirewoodHivemaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); diff --git a/Mage.Sets/src/mage/cards/y/YedoraGraveGardener.java b/Mage.Sets/src/mage/cards/y/YedoraGraveGardener.java index 9644ca3c4f2..f200c31960b 100644 --- a/Mage.Sets/src/mage/cards/y/YedoraGraveGardener.java +++ b/Mage.Sets/src/mage/cards/y/YedoraGraveGardener.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -31,7 +30,7 @@ public final class YedoraGraveGardener extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("another nontoken creature you control"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); filter.add(AnotherPredicate.instance); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java index 9da3f5b1451..bd47815c0ed 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java @@ -33,7 +33,7 @@ public class PopulateEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterCreaturePermanent("creature token for populate"); static { - filter.add(TokenPredicate.instance); + filter.add(TokenPredicate.TRUE); filter.add(TargetController.YOU.getControllerPredicate()); } diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java index ecf6add97c5..18abc034416 100644 --- a/Mage/src/main/java/mage/filter/StaticFilters.java +++ b/Mage/src/main/java/mage/filter/StaticFilters.java @@ -689,14 +689,14 @@ public final class StaticFilters { public static final FilterCreaturePermanent FILTER_CREATURE_TOKEN = new FilterCreaturePermanent("creature token"); static { - FILTER_CREATURE_TOKEN.add(TokenPredicate.instance); + FILTER_CREATURE_TOKEN.add(TokenPredicate.TRUE); FILTER_CREATURE_TOKEN.setLockedFilter(true); } public static final FilterCreaturePermanent FILTER_CREATURE_TOKENS = new FilterCreaturePermanent("creature tokens"); static { - FILTER_CREATURE_TOKENS.add(TokenPredicate.instance); + FILTER_CREATURE_TOKENS.add(TokenPredicate.TRUE); FILTER_CREATURE_TOKENS.setLockedFilter(true); } diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/TokenPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/TokenPredicate.java index 97e8f49f5e4..defc6f85648 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/TokenPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/TokenPredicate.java @@ -1,4 +1,3 @@ - package mage.filter.predicate.permanent; import mage.filter.predicate.Predicate; @@ -10,15 +9,21 @@ import mage.game.permanent.PermanentToken; * @author North */ public enum TokenPredicate implements Predicate { - instance; + TRUE(true), + FALSE(false); + private final boolean value; + + TokenPredicate(boolean value) { + this.value = value; + } @Override public boolean apply(Permanent input, Game game) { - return input instanceof PermanentToken; + return value == input instanceof PermanentToken; } @Override public String toString() { return "Token"; } -} \ No newline at end of file +} diff --git a/Mage/src/main/java/mage/game/command/emblems/AurraSingBaneOfJediEmblem.java b/Mage/src/main/java/mage/game/command/emblems/AurraSingBaneOfJediEmblem.java index 30763b68c2d..bff4156f3c5 100644 --- a/Mage/src/main/java/mage/game/command/emblems/AurraSingBaneOfJediEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/AurraSingBaneOfJediEmblem.java @@ -5,7 +5,6 @@ import mage.abilities.common.LeavesBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.command.Emblem; @@ -18,7 +17,7 @@ public final class AurraSingBaneOfJediEmblem extends Emblem { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a nontoken creature you control"); static { - filter.add(Predicates.not(TokenPredicate.instance)); + filter.add(TokenPredicate.FALSE); } // Whenever a nontoken creature you control leaves the battlefied, discard a card.