refactored TappedPredicate to use single enum for both conditions

Mage.Sets/src/mage/cards/a/AerialAssault.java

@@ -28,7 +28,7 @@ public final class AerialAssault extends CardImpl {
             = new FilterControlledCreaturePermanent("creature you control with flying");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
         filter2.add(new AbilityPredicate(FlyingAbility.class));
     }
 

Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java

@@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
 import mage.cards.Cards;
 import mage.constants.*;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.players.Player;
@@ -29,7 +28,7 @@ public final class AkoumFlameseeker extends CardImpl {
 
     static {
         filter.add(SubType.ALLY.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public AkoumFlameseeker(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/a/AlibouAncientWitness.java

@@ -67,7 +67,7 @@ class AlibouAncientWitnessEffect extends OneShotEffect {
     private static final FilterPermanent filter = new FilterControlledArtifactPermanent();
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     private static final Hint hint = new ValueHint(

Mage.Sets/src/mage/cards/a/AltarGolem.java

@@ -20,7 +20,6 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledCreaturePermanent;
 
@@ -34,7 +33,7 @@ public final class AltarGolem extends CardImpl {
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public AltarGolem(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/a/AnaBattlemage.java

@@ -15,7 +15,6 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -33,7 +32,7 @@ public final class AnaBattlemage extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public AnaBattlemage(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java

@@ -34,7 +34,7 @@ public final class AnafenzaTheForemost extends CardImpl {
 
     static {
         filter.add(AnotherPredicate.instance);
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     public AnafenzaTheForemost(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/a/AncestorsProphet.java

@@ -12,7 +12,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 
@@ -26,7 +25,7 @@ public final class AncestorsProphet extends CardImpl {
     
     static {
         filter.add(SubType.CLERIC.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }    
     
     public AncestorsProphet(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/a/AngelicFavor.java

@@ -17,7 +17,6 @@ import mage.constants.SubType;
 import mage.constants.TurnPhase;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.game.permanent.token.AngelToken;
@@ -37,7 +36,7 @@ public final class AngelicFavor extends CardImpl {
     private static final FilterControlledCreaturePermanent untappedCreatureYouControl = new FilterControlledCreaturePermanent("untapped creature you control");
 
     static {
-        untappedCreatureYouControl.add(Predicates.not(TappedPredicate.instance));
+        untappedCreatureYouControl.add(TappedPredicate.UNTAPPED);
     }
 
     public AngelicFavor(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/a/AphettoGrifter.java

@@ -13,7 +13,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetControlledPermanent;
@@ -27,7 +26,7 @@ public final class AphettoGrifter extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Wizards you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.WIZARD.getPredicate());
     }
 

Mage.Sets/src/mage/cards/a/ArachnusSpinner.java

@@ -17,7 +17,6 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
 import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.NamePredicate;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
@@ -38,7 +37,7 @@ public final class ArachnusSpinner extends CardImpl {
 
     static {
         filter.add(SubType.SPIDER.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public ArachnusSpinner(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/a/ArcadesSabboth.java

@@ -28,7 +28,7 @@ public final class ArcadesSabboth extends CardImpl {
 
     static {
         filter.add(TargetController.YOU.getControllerPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(Predicates.not(AttackingPredicate.instance));
     }
 

Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java

@@ -22,7 +22,6 @@ import mage.constants.SuperType;
 import mage.constants.Zone;
 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.TappedPredicate;
 import mage.game.Game;
@@ -79,7 +78,7 @@ class AryelTapXTargetCost extends VariableCostImpl {
     static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Knights you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.KNIGHT.getPredicate());
     }
 

Mage.Sets/src/mage/cards/a/Asphyxiate.java

@@ -7,7 +7,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.TappedPredicate;
 import mage.target.common.TargetCreaturePermanent;
 
@@ -20,7 +19,7 @@ public final class Asphyxiate extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature");
     
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
     
     public Asphyxiate(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/a/Assassinate.java

@@ -20,7 +20,7 @@ public final class Assassinate extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     public Assassinate(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/a/AuraOfDominion.java

@@ -17,7 +17,6 @@ import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetControlledCreaturePermanent;
@@ -31,7 +30,7 @@ public final class AuraOfDominion extends CardImpl {
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
 

Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java

@@ -14,7 +14,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.permanent.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 
@@ -26,7 +25,7 @@ public final class AzamiLadyOfScrolls extends CardImpl {
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Wizard you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.WIZARD.getPredicate());
     }
 

Mage.Sets/src/mage/cards/b/Backlash.java

@@ -7,7 +7,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -24,7 +23,7 @@ public final class Backlash extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public Backlash(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java

@@ -18,7 +18,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetAttackingCreature;
 import mage.target.common.TargetControlledPermanent;
@@ -33,7 +32,7 @@ public final class BalduvianTradingPost extends CardImpl {
 
     static {
         filter.add(SubType.MOUNTAIN.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public BalduvianTradingPost(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/b/BattleScreech.java

@@ -11,7 +11,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.TimingRule;
 import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.permanent.token.BirdToken;
@@ -27,7 +26,7 @@ public final class BattleScreech extends CardImpl {
 
     static {
         filter.add(new ColorPredicate(ObjectColor.WHITE));
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public BattleScreech(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java

@@ -15,7 +15,6 @@ import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.constants.Zone;
 import mage.filter.common.FilterLandPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetAttackingCreature;
 
@@ -29,7 +28,7 @@ public final class BenBenAkkiHermit extends CardImpl {
     private static final FilterLandPermanent filter = new FilterLandPermanent("untapped Mountain you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.MOUNTAIN.getPredicate());
     }
 

Mage.Sets/src/mage/cards/b/BenthicExplorers.java

@@ -36,7 +36,7 @@ public final class BenthicExplorers extends CardImpl {
 
     static {
         filter.add(TargetController.OPPONENT.getControllerPredicate());
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     public BenthicExplorers(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/b/Benthicore.java

@@ -18,7 +18,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.permanent.token.MerfolkWizardToken;
 import mage.target.common.TargetControlledPermanent;
@@ -32,7 +31,7 @@ public final class Benthicore extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.MERFOLK.getPredicate());
     }
 

Mage.Sets/src/mage/cards/b/BetrothedOfFire.java

@@ -16,7 +16,6 @@ import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetControlledPermanent;
@@ -32,7 +31,7 @@ public final class BetrothedOfFire extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledCreaturePermanent("an untapped creature");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public BetrothedOfFire(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/b/BirchloreRangers.java

@@ -18,7 +18,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.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.target.common.TargetControlledCreaturePermanent;
@@ -38,7 +37,7 @@ public final class BirchloreRangers extends CardImpl {
 
         // Tap two untapped Elves you control: Add one mana of any color.
         FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Elves you control");
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.ELF.getPredicate());
         this.addAbility(new SimpleManaAbility(
                 Zone.BATTLEFIELD,

Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java

@@ -16,7 +16,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 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.TappedPredicate;
 import mage.target.common.TargetControlledCreaturePermanent;
@@ -31,7 +30,7 @@ public final class BlackOakOfOdunos extends CardImpl {
 
     static {
         filter.add(AnotherPredicate.instance);
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
     
     public BlackOakOfOdunos(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/b/Blockbuster.java

@@ -23,7 +23,7 @@ public final class Blockbuster extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     public Blockbuster(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/b/BloodTribute.java

@@ -14,7 +14,6 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.TextPartSubtypePredicate;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
@@ -36,7 +35,7 @@ public final class BloodTribute extends CardImpl {
         TextPartSubType textPartVampire = (TextPartSubType) addTextPart(new TextPartSubType(SubType.VAMPIRE));
         FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an untapped Vampire you control");
         filter.add(new TextPartSubtypePredicate(textPartVampire));
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         this.addAbility(new KickerAbility(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))));
 
         // Target opponent loses half their life, rounded up.

Mage.Sets/src/mage/cards/b/Borrowing100000Arrows.java

@@ -62,7 +62,7 @@ class Borrowing100000ArrowsEffect extends OneShotEffect {
         Player opponent = game.getPlayer(this.getTargetPointer().getFirst(game, source));
             if (opponent != null) {
             FilterCreaturePermanent filter = new FilterCreaturePermanent();
-            filter.add(TappedPredicate.instance);
+            filter.add(TappedPredicate.TAPPED);
             filter.add(new ControllerIdPredicate(opponent.getId()));
             return new DrawCardSourceControllerEffect(game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game)).apply(game, source);
         }

Mage.Sets/src/mage/cards/b/BrandedBrawlers.java

@@ -13,7 +13,6 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterLandPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -29,7 +28,7 @@ public final class BrandedBrawlers extends CardImpl {
     static final private FilterLandPermanent filter = new FilterLandPermanent("an untapped land");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     static final private String rule = "{this} can't block if you control an untapped land";

Mage.Sets/src/mage/cards/b/BurdenOfGreed.java

@@ -48,7 +48,7 @@ class BurdenOfGreedCount implements DynamicValue {
             return 0;
         }
         FilterArtifactPermanent filter = new FilterArtifactPermanent();
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
         filter.add(new ControllerIdPredicate(sourceAbility.getFirstTarget()));
         return game.getBattlefield().count(filter, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game);
     }

Mage.Sets/src/mage/cards/b/BurnAtTheStake.java

@@ -9,7 +9,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.TappedPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -26,7 +25,7 @@ public final class BurnAtTheStake extends CardImpl {
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public BurnAtTheStake(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/c/CalmingVerse.java

@@ -12,7 +12,6 @@ import mage.constants.TargetController;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledEnchantmentPermanent;
 import mage.filter.common.FilterEnchantmentPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -48,7 +47,7 @@ class CalmingVerseEffect extends OneShotEffect {
 
     static {
         untappedLandFilter.add(CardType.LAND.getPredicate());
-        untappedLandFilter.add(Predicates.not(TappedPredicate.instance));
+        untappedLandFilter.add(TappedPredicate.UNTAPPED);
     }
 
     private static final FilterEnchantmentPermanent opponentEnchantmentsFilter = new FilterEnchantmentPermanent("enchantments you don't control");

Mage.Sets/src/mage/cards/c/CaptivatingVampire.java

@@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -33,7 +32,7 @@ public final class CaptivatingVampire extends CardImpl {
     static {
         filter1.add(SubType.VAMPIRE.getPredicate());
         filter2.add(SubType.VAMPIRE.getPredicate());
-        filter2.add(Predicates.not(TappedPredicate.instance));
+        filter2.add(TappedPredicate.UNTAPPED);
     }
 
     public CaptivatingVampire(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/c/CatapultMaster.java

@@ -13,7 +13,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetCreaturePermanent;
@@ -27,7 +26,7 @@ public final class CatapultMaster extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Soldiers you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.SOLDIER.getPredicate());
     }
     public CatapultMaster(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/c/CatapultSquad.java

@@ -14,7 +14,6 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterAttackingOrBlockingCreature;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetCreaturePermanent;
@@ -28,7 +27,7 @@ public final class CatapultSquad extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Soldiers you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.SOLDIER.getPredicate());
     }
 

Mage.Sets/src/mage/cards/c/ChickenALaKing.java

@@ -15,7 +15,6 @@ import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
@@ -31,7 +30,7 @@ public final class ChickenALaKing extends CardImpl {
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Bird you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.BIRD.getPredicate());
     }
 

Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java

@@ -16,7 +16,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 
@@ -27,7 +26,7 @@ public final class ChosenOfMarkov extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Vampire you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.VAMPIRE.getPredicate());
     }
 

Mage.Sets/src/mage/cards/c/CitadelOfPain.java

@@ -12,7 +12,6 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledLandPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
@@ -55,7 +54,7 @@ class CitadelOfPainEffect extends OneShotEffect {
     }
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public CitadelOfPainEffect() {

Mage.Sets/src/mage/cards/c/ClockOfOmens.java

@@ -10,7 +10,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.TappedPredicate;
 import mage.target.common.TargetArtifactPermanent;
 import mage.target.common.TargetControlledPermanent;
@@ -25,7 +24,7 @@ public final class ClockOfOmens extends CardImpl {
 
     static {
         filter.add(CardType.ARTIFACT.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public ClockOfOmens(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/c/CloudgoatRanger.java

@@ -17,7 +17,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.permanent.token.KithkinSoldierToken;
 import mage.target.common.TargetControlledPermanent;
@@ -32,7 +31,7 @@ public final class CloudgoatRanger extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Kithkin you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.KITHKIN.getPredicate());
     }
 

Mage.Sets/src/mage/cards/c/CollectiveEffort.java

@@ -19,7 +19,6 @@ import mage.filter.StaticFilters;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.common.FilterEnchantmentPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.PowerPredicate;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
@@ -43,7 +42,7 @@ public final class CollectiveEffort extends CardImpl {
     private static final FilterPlayer filterPlayer = new FilterPlayer("player whose creatures get +1/+1 counters");
 
     static {
-        filterUntapped.add(Predicates.not(TappedPredicate.instance));
+        filterUntapped.add(TappedPredicate.UNTAPPED);
         filterDestroyCreature.add(new PowerPredicate(ComparisonType.MORE_THAN, 3));
     }
 

Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java

@@ -14,7 +14,6 @@ import mage.constants.Duration;
 import mage.constants.TargetController;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 
 /**
@@ -27,7 +26,7 @@ public final class CopperhoofVorrac extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent("untapped permanent your opponents control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(TargetController.OPPONENT.getControllerPredicate());
     }
 

Mage.Sets/src/mage/cards/c/CoralAtoll.java

@@ -15,7 +15,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledLandPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 
@@ -29,7 +28,7 @@ public final class CoralAtoll extends CardImpl {
 
     static {
         filter.add(SubType.ISLAND.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public CoralAtoll(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/c/CoralReef.java

@@ -21,7 +21,6 @@ import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledCreaturePermanent;
@@ -39,7 +38,7 @@ public final class CoralReef extends CardImpl {
     
     static {
         islandFilter.add(SubType.ISLAND.getPredicate());
-        untappedBlueCreatureFilter.add(Predicates.not(TappedPredicate.instance));
+        untappedBlueCreatureFilter.add(TappedPredicate.UNTAPPED);
         untappedBlueCreatureFilter.add(new ColorPredicate(ObjectColor.BLUE));
     }
 

Mage.Sets/src/mage/cards/c/Crackleburr.java

@@ -19,7 +19,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.mageobject.ColorPredicate;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledCreaturePermanent;
@@ -38,10 +37,10 @@ public final class Crackleburr extends CardImpl {
     
     static {
         filter.add(new ColorPredicate(ObjectColor.RED));
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         
         filter2.add(new ColorPredicate(ObjectColor.BLUE));
-        filter2.add(TappedPredicate.instance);
+        filter2.add(TappedPredicate.TAPPED);
     }
 
     public Crackleburr(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/c/CracklingPerimeter.java

@@ -12,7 +12,6 @@ import mage.constants.SubType;
 import mage.constants.TargetController;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 
@@ -26,7 +25,7 @@ public final class CracklingPerimeter extends CardImpl {
 
     static {
         filter.add(SubType.GATE.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public CracklingPerimeter(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/c/CrashingBoars.java

@@ -15,7 +15,6 @@ import mage.constants.SubType;
 import mage.constants.Outcome;
 import mage.constants.SetTargetPointer;
 import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.players.Player;
@@ -53,7 +52,7 @@ class CrashingBoarsEffect extends OneShotEffect {
     
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control");
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
     
     CrashingBoarsEffect() {

Mage.Sets/src/mage/cards/c/CrookclawElder.java

@@ -15,7 +15,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.predicate.Predicate;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledCreaturePermanent;
 import mage.target.common.TargetCreaturePermanent;
@@ -31,7 +30,7 @@ public final class CrookclawElder extends CardImpl {
             = new FilterControlledCreaturePermanent(SubType.BIRD, "untapped Birds you control");
     private static final FilterControlledCreaturePermanent filter2
             = new FilterControlledCreaturePermanent(SubType.WIZARD, "untapped Wizards you control");
-    private static final Predicate pred = Predicates.not(TappedPredicate.instance);
+    private static final Predicate pred = TappedPredicate.UNTAPPED;
 
     static {
         filter.add(pred);

Mage.Sets/src/mage/cards/c/Cryptbreaker.java

@@ -17,7 +17,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.TappedPredicate;
 import mage.game.permanent.token.ZombieToken;
 import mage.target.common.TargetControlledCreaturePermanent;
@@ -32,7 +31,7 @@ public final class Cryptbreaker extends CardImpl {
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Zombies you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.ZOMBIE.getPredicate());
     }
 

Mage.Sets/src/mage/cards/c/CrypticGateway.java

@@ -15,7 +15,6 @@ import mage.filter.FilterCard;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreatureCard;
 import mage.filter.predicate.Predicate;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -53,7 +52,7 @@ class CrypticGatewayCost extends CostImpl {
             = new FilterControlledCreaturePermanent("untapped creatures you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     private final TargetControlledPermanent target = new TargetControlledPermanent(2, filter);

Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java

@@ -27,7 +27,7 @@ public final class DeadeyeHarpooner extends CardImpl {
     private static final FilterOpponentsCreaturePermanent filter = new FilterOpponentsCreaturePermanent("tapped creature an opponent controls");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     public DeadeyeHarpooner(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/d/DeathStroke.java

@@ -19,7 +19,7 @@ public final class DeathStroke extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     public DeathStroke(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/d/DeathlessAncient.java

@@ -13,7 +13,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 
@@ -26,7 +25,7 @@ public final class DeathlessAncient extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Vampires you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.VAMPIRE.getPredicate());
     }
 

Mage.Sets/src/mage/cards/d/DevoutChaplain.java

@@ -14,7 +14,6 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.StaticFilters;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetControlledPermanent;
@@ -29,7 +28,7 @@ public final class DevoutChaplain extends CardImpl {
     private static final FilterControlledPermanent humanFilter = new FilterControlledPermanent("untapped Human you control");
 
     static {
-        humanFilter.add(Predicates.not(TappedPredicate.instance));
+        humanFilter.add(TappedPredicate.UNTAPPED);
         humanFilter.add(SubType.HUMAN.getPredicate());
     }
 

Mage.Sets/src/mage/cards/d/DevoutInvocation.java

@@ -12,7 +12,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.TappedPredicate;
 import mage.game.Game;
 import mage.game.permanent.token.AngelToken;
@@ -48,7 +47,7 @@ class DevoutInvocationEffect extends OneShotEffect {
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public DevoutInvocationEffect() {

Mage.Sets/src/mage/cards/d/Dichotomancy.java

@@ -53,7 +53,7 @@ class DichotomancyEffect extends OneShotEffect {
     private static final FilterNonlandPermanent filter = new FilterNonlandPermanent();
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     DichotomancyEffect() {

Mage.Sets/src/mage/cards/d/DiversionaryTactics.java

@@ -11,7 +11,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.TappedPredicate;
 import mage.target.common.TargetControlledCreaturePermanent;
 import mage.target.common.TargetCreaturePermanent;
@@ -24,7 +23,7 @@ public final class DiversionaryTactics extends CardImpl {
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public DiversionaryTactics(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/d/DormantVolcano.java

@@ -15,7 +15,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledLandPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 
@@ -29,7 +28,7 @@ public final class DormantVolcano extends CardImpl {
 
     static {
         filter.add(SubType.MOUNTAIN.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public DormantVolcano(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/d/DovinsDismissal.java

@@ -24,7 +24,7 @@ public final class DovinsDismissal extends CardImpl {
 
     static {
         filter.add(new NamePredicate("Dovin, Architect of Law"));
-        filter2.add(TappedPredicate.instance);
+        filter2.add(TappedPredicate.TAPPED);
     }
 
     public DovinsDismissal(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java

@@ -23,7 +23,7 @@ public final class DragonscaleGeneral extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creatures you control");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
         filter.add(TargetController.YOU.getControllerPredicate());
     }
 

Mage.Sets/src/mage/cards/d/DranasChosen.java

@@ -15,7 +15,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.permanent.token.ZombieToken;
 import mage.target.common.TargetControlledPermanent;
@@ -30,7 +29,7 @@ public final class DranasChosen extends CardImpl {
     
     static {
         filter.add(SubType.ALLY.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public DranasChosen(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/d/DreamTides.java

@@ -55,7 +55,7 @@ class DreamTidesEffect extends OneShotEffect {
 
     static {
         filter.add(Predicates.not(new ColorPredicate(ObjectColor.GREEN)));
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     DreamTidesEffect() {

Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java

@@ -13,7 +13,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.TargetPlayer;
 import mage.target.common.TargetControlledPermanent;
@@ -28,7 +27,7 @@ public final class DrownerOfSecrets extends CardImpl {
 
     static {
         filter.add(SubType.MERFOLK.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public DrownerOfSecrets(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/d/DuneDiviner.java

@@ -14,7 +14,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 
@@ -28,7 +27,7 @@ public final class DuneDiviner extends CardImpl {
 
     static {
         filter.add(SubType.DESERT.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
     
     public DuneDiviner(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java

@@ -14,7 +14,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetCreaturePermanent;
@@ -28,7 +27,7 @@ public final class DwarvenBloodboiler extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("an untapped Dwarf you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.DWARF.getPredicate());
     }
 

Mage.Sets/src/mage/cards/e/Earthcraft.java

@@ -13,7 +13,6 @@ import mage.constants.SuperType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetControlledCreaturePermanent;
@@ -27,7 +26,7 @@ public final class Earthcraft extends CardImpl {
     private static final FilterControlledPermanent filterLand = new FilterControlledPermanent("basic land");
 
     static {
-        filterCreature.add(Predicates.not(TappedPredicate.instance));
+        filterCreature.add(TappedPredicate.UNTAPPED);
         filterLand.add(CardType.LAND.getPredicate());
         filterLand.add(SuperType.BASIC.getPredicate());
     }

Mage.Sets/src/mage/cards/e/Earthlore.java

@@ -20,7 +20,6 @@ import mage.constants.Zone;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterBlockingCreature;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetControlledPermanent;
@@ -41,7 +40,7 @@ public final class Earthlore extends CardImpl {
     private static final FilterPermanent filterUntapped = new FilterPermanent("enchanted land is untapped");
     
     static {
-        filterUntapped.add(Predicates.not(TappedPredicate.instance));
+        filterUntapped.add(TappedPredicate.UNTAPPED);
     }
 
     public Earthlore(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/e/EmbalmersTools.java

@@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.common.FilterCreatureCard;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.players.Player;
@@ -31,7 +30,7 @@ public final class EmbalmersTools extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Zombie you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.ZOMBIE.getPredicate());
     }
 

Mage.Sets/src/mage/cards/e/EnergyTap.java

@@ -9,7 +9,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.TappedPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -25,7 +24,7 @@ public final class EnergyTap extends CardImpl {
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public EnergyTap(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/e/EntanglingVines.java

@@ -26,7 +26,7 @@ public final class EntanglingVines extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     public EntanglingVines(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/e/Everglades.java

@@ -15,7 +15,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledLandPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 
@@ -29,7 +28,7 @@ public final class Everglades extends CardImpl {
 
     static {
         filter.add(SubType.SWAMP.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public Everglades(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/e/Excoriate.java

@@ -19,7 +19,7 @@ public final class Excoriate extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
     
     public Excoriate(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/e/Expel.java

@@ -19,7 +19,7 @@ public final class Expel extends CardImpl {
     private static final FilterPermanent filter = new FilterCreaturePermanent("tapped creature");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     public Expel(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/f/FenStalker.java

@@ -16,7 +16,6 @@ import mage.constants.SubType;
 import mage.constants.Duration;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledLandPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 
 /**
@@ -28,7 +27,7 @@ public final class FenStalker extends CardImpl {
     private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent();
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public FenStalker(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/f/FieldSurgeon.java

@@ -14,7 +14,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.TappedPredicate;
 import mage.target.common.TargetControlledCreaturePermanent;
 import mage.target.common.TargetCreaturePermanent;
@@ -28,7 +27,7 @@ public final class FieldSurgeon extends CardImpl {
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an untapped creature you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public FieldSurgeon(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/g/GalecasterColossus.java

@@ -15,7 +15,6 @@ import mage.constants.TargetController;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.common.FilterNonlandPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetNonlandPermanent;
@@ -32,7 +31,7 @@ public final class GalecasterColossus extends CardImpl {
     static {
         filter.add(TargetController.NOT_YOU.getControllerPredicate());
         filter2.add(SubType.WIZARD.getPredicate());
-        filter2.add(Predicates.not(TappedPredicate.instance));
+        filter2.add(TappedPredicate.UNTAPPED);
     }
 
     public GalecasterColossus(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/g/Galestrike.java

@@ -20,7 +20,7 @@ public final class Galestrike extends CardImpl {
     private static FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     public Galestrike(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java

@@ -16,7 +16,6 @@ import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -34,7 +33,7 @@ public final class GallowsAtWillowHill extends CardImpl {
     private static final FilterControlledPermanent humanFilter = new FilterControlledPermanent("untapped Human you control");
 
     static {
-        humanFilter.add(Predicates.not(TappedPredicate.instance));
+        humanFilter.add(TappedPredicate.UNTAPPED);
         humanFilter.add(SubType.HUMAN.getPredicate());
     }
 

Mage.Sets/src/mage/cards/g/GatewayShade.java

@@ -14,7 +14,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledLandPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 
@@ -27,7 +26,7 @@ public final class GatewayShade extends CardImpl {
     private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("untapped Gate you control");
     static {
         filter.add(SubType.GATE.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public GatewayShade(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/g/GazeOfJustice.java

@@ -12,7 +12,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.TimingRule;
 import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledCreaturePermanent;
@@ -28,7 +27,7 @@ public final class GazeOfJustice extends CardImpl {
 
     static {
         filter.add(new ColorPredicate(ObjectColor.WHITE));
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public GazeOfJustice(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java

@@ -10,7 +10,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.TappedPredicate;
 import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetAnyTarget;
@@ -25,7 +24,7 @@ public final class GhirapurAetherGrid extends CardImpl {
 
     static {
         filter.add(CardType.ARTIFACT.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public GhirapurAetherGrid(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/g/GiantOyster.java

@@ -37,7 +37,7 @@ public final class GiantOyster extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     public GiantOyster(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/g/GideonJura.java

@@ -31,7 +31,7 @@ public final class GideonJura extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     public GideonJura(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/g/GlacianPowerstoneEngineer.java

@@ -14,7 +14,6 @@ import mage.constants.*;
 import mage.filter.StaticFilters;
 import mage.filter.common.FilterControlledArtifactPermanent;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.players.Player;
@@ -111,7 +110,7 @@ class GlacianPowerstoneEngineerCost extends VariableCostImpl {
             = new FilterControlledArtifactPermanent("untapped artifacts you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     GlacianPowerstoneEngineerCost() {

Mage.Sets/src/mage/cards/g/GlareOfSubdual.java

@@ -27,7 +27,7 @@ public final class GlareOfSubdual extends CardImpl {
     private static final FilterPermanent filterTarget = new FilterPermanent("artifact or creature");
 
     static {
-        filterCost.add(Predicates.not(TappedPredicate.instance));
+        filterCost.add(TappedPredicate.UNTAPPED);
         filterTarget.add(Predicates.or(
                 CardType.ARTIFACT.getPredicate(),
                 CardType.CREATURE.getPredicate()));

Mage.Sets/src/mage/cards/g/GlimmerdustNap.java

@@ -26,7 +26,7 @@ public final class GlimmerdustNap extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     public GlimmerdustNap(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/g/GoblinMutant.java

@@ -30,7 +30,7 @@ public final class GoblinMutant extends CardImpl {
     static final private FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creatures with power 3 or greater");
 
     static {
-        filter.add(Predicates.and(new PowerPredicate(ComparisonType.MORE_THAN, 2), Predicates.not(TappedPredicate.instance)));
+        filter.add(Predicates.and(new PowerPredicate(ComparisonType.MORE_THAN, 2), TappedPredicate.UNTAPPED));
         filter2.add(new PowerPredicate(ComparisonType.MORE_THAN, 2));
     }
 

Mage.Sets/src/mage/cards/g/GrandArchitect.java

@@ -16,7 +16,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
@@ -59,7 +58,7 @@ public final class GrandArchitect extends CardImpl {
         // Tap an untapped blue creature you control: Add {C}{C}. Spend this mana only to cast artifact spells or activate abilities of artifacts.
         FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped blue creature");
         filter.add(new ColorPredicate(ObjectColor.BLUE));
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         this.addAbility(new GrandArchitectManaAbility(filter));
     }
 

Mage.Sets/src/mage/cards/g/GravespawnSovereign.java

@@ -14,7 +14,6 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreatureCard;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetCardInGraveyard;
 import mage.target.common.TargetControlledCreaturePermanent;
@@ -29,7 +28,7 @@ public final class GravespawnSovereign extends CardImpl {
 
     static {
         filter.add(SubType.ZOMBIE.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public GravespawnSovereign(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java

@@ -14,7 +14,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.TappedPredicate;
 import mage.game.permanent.token.GreenAndWhiteElementalToken;
 import mage.target.common.TargetControlledCreaturePermanent;
@@ -29,7 +28,7 @@ public final class GroveOfTheGuardian extends CardImpl {
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public GroveOfTheGuardian(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/g/GuanYus1000LiMarch.java

@@ -18,7 +18,7 @@ public final class GuanYus1000LiMarch extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creatures");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     public GuanYus1000LiMarch(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/g/GuildSummit.java

@@ -12,7 +12,6 @@ import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.constants.TargetController;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -63,7 +62,7 @@ class GuildSummitEffect extends OneShotEffect {
 
     static {
         filter.add(TargetController.YOU.getControllerPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.GATE.getPredicate());
     }
 

Mage.Sets/src/mage/cards/h/HairStrungKoto.java

@@ -38,7 +38,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.TappedPredicate;
 import mage.target.TargetPlayer;
 import mage.target.common.TargetControlledCreaturePermanent;
@@ -52,7 +51,7 @@ public final class HairStrungKoto extends CardImpl {
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control");
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
         public HairStrungKoto (UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/h/HandOfJustice.java

@@ -15,7 +15,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.mageobject.ColorPredicate;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledCreaturePermanent;
@@ -31,7 +30,7 @@ public final class HandOfJustice extends CardImpl {
 
     static {
         filter.add(new ColorPredicate(ObjectColor.WHITE));
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public HandOfJustice(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/h/HarbingerOfTheTides.java

@@ -26,7 +26,7 @@ public final class HarbingerOfTheTides extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature an opponent controls");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
         filter.add(TargetController.OPPONENT.getControllerPredicate());
     }
 

Mage.Sets/src/mage/cards/h/HarmonyOfNature.java

@@ -13,7 +13,6 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.TargetController;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.players.Player;
@@ -48,7 +47,7 @@ class HarmonyOfNatureEffect extends OneShotEffect {
     
     static {
         filter.add(TargetController.YOU.getControllerPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public HarmonyOfNatureEffect() {

Mage.Sets/src/mage/cards/h/HarvestSeason.java

@@ -49,7 +49,7 @@ class HarvestSeasonEffect extends OneShotEffect {
     private static final FilterPermanent filter = new FilterControlledCreaturePermanent("tapped creature you control");
 
     static {
-        filter.add(TappedPredicate.instance);
+        filter.add(TappedPredicate.TAPPED);
     }
 
     HarvestSeasonEffect() {

Mage.Sets/src/mage/cards/h/HazyHomunculus.java

@@ -15,7 +15,6 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterLandPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 
 /**
@@ -27,7 +26,7 @@ public final class HazyHomunculus extends CardImpl {
     private static final FilterPermanent filter = new FilterLandPermanent();
 
     static {
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
 
     public HazyHomunculus(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/h/Hecatomb.java

@@ -15,7 +15,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledLandPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.target.common.TargetControlledCreaturePermanent;
 import mage.target.common.TargetControlledPermanent;
@@ -31,7 +30,7 @@ public final class Hecatomb extends CardImpl {
     
     static {
         filter.add(SubType.SWAMP.getPredicate());
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
     }
     
     public Hecatomb(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/h/HeritageDruid.java

@@ -16,7 +16,6 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.target.common.TargetControlledPermanent;
@@ -36,7 +35,7 @@ public final class HeritageDruid extends CardImpl {
 
         // Tap three untapped Elves you control: Add {G}{G}{G}.
         FilterControlledPermanent filter = new FilterControlledPermanent("untapped Elves you control");
-        filter.add(Predicates.not(TappedPredicate.instance));
+        filter.add(TappedPredicate.UNTAPPED);
         filter.add(SubType.ELF.getPredicate());
         this.addAbility(new SimpleManaAbility(
                 Zone.BATTLEFIELD,