refactored all usages of CardTypePredicate to match the new implementation

Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java

@@ -24,7 +24,6 @@ import mage.constants.Rarity;
 import mage.filter.FilterCard;
 import mage.filter.predicate.Predicate;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.filter.predicate.mageobject.ColorlessPredicate;
 import mage.filter.predicate.other.CardTextPredicate;
@@ -253,25 +252,25 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
 
             predicates.clear();
             if (this.tbLand.isSelected()) {
-                predicates.add(new CardTypePredicate(CardType.LAND));
+                predicates.add(CardType.LAND.getPredicate());
             }
             if (this.tbArifiacts.isSelected()) {
-                predicates.add(new CardTypePredicate(CardType.ARTIFACT));
+                predicates.add(CardType.ARTIFACT.getPredicate());
             }
             if (this.tbCreatures.isSelected()) {
-                predicates.add(new CardTypePredicate(CardType.CREATURE));
+                predicates.add(CardType.CREATURE.getPredicate());
             }
             if (this.tbEnchantments.isSelected()) {
-                predicates.add(new CardTypePredicate(CardType.ENCHANTMENT));
+                predicates.add(CardType.ENCHANTMENT.getPredicate());
             }
             if (this.tbInstants.isSelected()) {
-                predicates.add(new CardTypePredicate(CardType.INSTANT));
+                predicates.add(CardType.INSTANT.getPredicate());
             }
             if (this.tbSorceries.isSelected()) {
-                predicates.add(new CardTypePredicate(CardType.SORCERY));
+                predicates.add(CardType.SORCERY.getPredicate());
             }
             if (this.tbPlaneswalkers.isSelected()) {
-                predicates.add(new CardTypePredicate(CardType.PLANESWALKER));
+                predicates.add(CardType.PLANESWALKER.getPredicate());
             }
             filter.add(Predicates.or(predicates));
 

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

@@ -13,7 +13,6 @@ import mage.constants.*;
 import mage.filter.FilterCard;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.AbilityPredicate;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.ZoneChangeEvent;
@@ -31,7 +30,7 @@ public final class AbandonedSarcophagus extends CardImpl {
 
         // You may cast nonland cards with cycling from your graveyard.
         FilterCard filter = new FilterCard("nonland cards with cycling");
-        filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
+        filter.add(Predicates.not(CardType.LAND.getPredicate()));
         filter.add(new AbilityPredicate(CyclingAbility.class));
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
                 new PlayFromNotOwnHandZoneAllEffect(filter,

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

@@ -14,7 +14,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetAnyTarget;
 import mage.target.common.TargetCreaturePermanent;
 
@@ -27,7 +26,7 @@ public final class AbunaAcolyte extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("artifact creature");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+        filter.add(CardType.ARTIFACT.getPredicate());
     }
 
     public AbunaAcolyte(UUID ownerId, CardSetInfo setInfo) {

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

@@ -13,7 +13,6 @@ import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.players.Player;
@@ -71,10 +70,10 @@ class AbundanceReplacementEffect extends ReplacementEffectImpl {
             if (controller.chooseUse(Outcome.Detriment, "Choose card type:",
                     source.getSourceObject(game).getLogName(), "land", "nonland", source, game)) {
                 game.informPlayers(controller.getLogName() + "chooses land.");
-                filter.add(new CardTypePredicate(CardType.LAND));
+                filter.add(CardType.LAND.getPredicate());
             } else {
                 game.informPlayers(controller.getLogName() + "chooses nonland.");
-                filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
+                filter.add(Predicates.not(CardType.LAND.getPredicate()));
             }
             Cards toReveal = new CardsImpl();
             Card selectedCard = null;

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

@@ -12,7 +12,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.counters.CounterType;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.filter.predicate.permanent.CounterPredicate;
 
@@ -26,7 +25,7 @@ public final class AbzanBattlePriest extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent();
 
     static {
-        filter.add(new CardTypePredicate(CardType.CREATURE));
+        filter.add(CardType.CREATURE.getPredicate());
         filter.add(new ControllerPredicate(TargetController.YOU));
         filter.add(new CounterPredicate(CounterType.P1P1));
     }

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

@@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.counters.CounterType;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.filter.predicate.permanent.CounterPredicate;
 
@@ -25,7 +24,7 @@ public final class AbzanFalconer extends CardImpl {
     
     private static final FilterPermanent filter = new FilterPermanent();
     static {
-        filter.add(new CardTypePredicate(CardType.CREATURE));
+        filter.add(CardType.CREATURE.getPredicate());
         filter.add(new ControllerPredicate(TargetController.YOU));
         filter.add(new CounterPredicate(CounterType.P1P1));
     }

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

@@ -17,7 +17,6 @@ import mage.filter.FilterCard;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.filter.predicate.mageobject.SupertypePredicate;
 import mage.filter.predicate.permanent.AnotherPredicate;
@@ -41,7 +40,7 @@ public final class AcclaimedContender extends CardImpl {
                 new SubtypePredicate(SubType.EQUIPMENT),
                 Predicates.and(
                         new SupertypePredicate(SuperType.LEGENDARY),
-                        new CardTypePredicate(CardType.ARTIFACT)
+                        CardType.ARTIFACT.getPredicate()
                 )
         ));
     }

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

@@ -14,7 +14,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.Target;
 import mage.target.TargetPermanent;
 
@@ -28,9 +27,9 @@ public final class AcidicSlime extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.ENCHANTMENT),
+                CardType.ENCHANTMENT.getPredicate(),
-                new CardTypePredicate(CardType.LAND)));
+                CardType.LAND.getPredicate()));
     }
 
     public AcidicSlime(UUID ownerId, CardSetInfo setInfo) {

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

@@ -10,7 +10,6 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.common.TargetCardInLibrary;
@@ -45,7 +44,7 @@ class AcquireEffect extends OneShotEffect {
     private static final FilterCard filter = new FilterCard("an artifact card");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+        filter.add(CardType.ARTIFACT.getPredicate());
     }
 
     public AcquireEffect() {

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

@@ -17,7 +17,6 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.permanent.AnotherPredicate;
 import mage.target.TargetPermanent;
 
@@ -31,7 +30,7 @@ public final class AdmonitionAngel extends CardImpl {
 
     static {
         filter.add(AnotherPredicate.instance);
-        filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
+        filter.add(Predicates.not(CardType.LAND.getPredicate()));
     }
 
     public AdmonitionAngel(UUID ownerId, CardSetInfo setInfo) {

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

@@ -9,7 +9,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterCard;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 
 /**
  *
@@ -20,7 +19,7 @@ public final class AdventurousImpulse extends CardImpl {
     private static final FilterCard filter = new FilterCard("a creature or land card");
 
     static {
-        filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.LAND)));
+        filter.add(Predicates.or(CardType.CREATURE.getPredicate(), CardType.LAND.getPredicate()));
     }
 
     public AdventurousImpulse(UUID ownerId, CardSetInfo setInfo) {

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

@@ -16,7 +16,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.target.TargetPermanent;
 
@@ -29,7 +28,7 @@ public final class AerialModification extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent("creature or vehicle");
 
     static {
-        filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE),
+        filter.add(Predicates.or(CardType.CREATURE.getPredicate(),
                 new SubtypePredicate(SubType.VEHICLE)));
     }
 

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

@@ -16,7 +16,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.target.TargetPermanent;
 
@@ -29,7 +28,7 @@ public final class AetherMeltdown extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent("creature or vehicle");
 
     static {
-        filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new SubtypePredicate(SubType.VEHICLE)));
+        filter.add(Predicates.or(CardType.CREATURE.getPredicate(), new SubtypePredicate(SubType.VEHICLE)));
     }
 
     public AetherMeltdown(UUID ownerId, CardSetInfo setInfo) {

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

@@ -14,7 +14,6 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.TargetController;
 import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetControlledCreaturePermanent;
 
 /**
@@ -27,7 +26,7 @@ public final class AethershieldArtificer extends CardImpl {
             = new FilterControlledCreaturePermanent("artifact creature you control");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+        filter.add(CardType.ARTIFACT.getPredicate());
     }
 
     public AethershieldArtificer(UUID ownerId, CardSetInfo setInfo) {

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

@@ -9,7 +9,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 
 /**
@@ -22,9 +21,9 @@ public final class Aftershock extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE),
+                CardType.CREATURE.getPredicate(),
-                new CardTypePredicate(CardType.LAND)));
+                CardType.LAND.getPredicate()));
     }
 
     public Aftershock(UUID ownerId, CardSetInfo setInfo) {

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

@@ -14,7 +14,6 @@ import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -78,7 +77,7 @@ class AgadeemOccultistEffect extends OneShotEffect {
             }
         }
         FilterCard filter = new FilterCard("creature card in an opponent's graveyard");
-        filter.add(new CardTypePredicate(CardType.CREATURE));
+        filter.add(CardType.CREATURE.getPredicate());
         TargetCardInOpponentsGraveyard target = new TargetCardInOpponentsGraveyard(1, 1, filter);
 
         if (controller != null) {

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

@@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.counters.CounterType;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.filter.predicate.permanent.CounterPredicate;
 
@@ -26,7 +25,7 @@ public final class AinokBondKin extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent();
 
     static {
-        filter.add(new CardTypePredicate(CardType.CREATURE));
+        filter.add(CardType.CREATURE.getPredicate());
         filter.add(new ControllerPredicate(TargetController.YOU));
         filter.add(new CounterPredicate(CounterType.P1P1));
     }

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

@@ -19,7 +19,6 @@ import mage.counters.CounterType;
 import mage.filter.FilterCard;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.target.common.TargetCreaturePermanentAmount;
@@ -37,8 +36,8 @@ public final class AjaniMentorOfHeroes extends CardImpl {
         filter.add(new ControllerPredicate(TargetController.YOU));
         filterCard.add(Predicates.or(
                 new SubtypePredicate(SubType.AURA),
-                new CardTypePredicate(CardType.CREATURE),
+                CardType.CREATURE.getPredicate(),
-                new CardTypePredicate(CardType.PLANESWALKER)));
+                CardType.PLANESWALKER.getPredicate()));
     }
 
     public AjaniMentorOfHeroes(UUID ownerId, CardSetInfo setInfo) {

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

@@ -16,7 +16,6 @@ import mage.constants.*;
 import mage.filter.FilterPermanent;
 import mage.filter.StaticFilters;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.game.Game;
 import mage.game.permanent.token.AjanisPridemateToken;
@@ -91,8 +90,8 @@ class AjaniStrengthOfThePrideEffect extends OneShotEffect {
     static {
         filter.add(new ControllerPredicate(TargetController.OPPONENT));
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE)
+                CardType.CREATURE.getPredicate()
         ));
     }
 

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

@@ -19,7 +19,6 @@ import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterPermanentCard;
 import mage.filter.common.FilterPlaneswalkerPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.permanent.AnotherPredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.target.common.TargetCreaturePermanent;
@@ -33,7 +32,7 @@ public final class AjaniUnyielding extends CardImpl {
     private static final FilterPlaneswalkerPermanent planeswalkerFilter = new FilterPlaneswalkerPermanent("other planeswalker you control");
 
     static {
-        nonlandPermanentFilter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
+        nonlandPermanentFilter.add(Predicates.not(CardType.LAND.getPredicate()));
         planeswalkerFilter.add(new ControllerPredicate(TargetController.YOU));
         planeswalkerFilter.add(AnotherPredicate.instance);
     }

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

@@ -15,7 +15,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 import mage.target.TargetPlayer;
 import mage.target.common.TargetAnyTarget;
@@ -29,7 +28,7 @@ public final class AjaniVengeant extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent("lands");
 
     static {
-        filter.add(new CardTypePredicate(CardType.LAND));
+        filter.add(CardType.LAND.getPredicate());
     }
 
     public AjaniVengeant(UUID ownerId, CardSetInfo setInfo) {

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

@@ -15,7 +15,6 @@ import mage.constants.SubType;
 import mage.constants.TargetController;
 import mage.counters.CounterType;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 
 /**
@@ -27,7 +26,7 @@ public final class AjanisComrade extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent();
 
     static {
-        filter.add(new CardTypePredicate(CardType.PLANESWALKER));
+        filter.add(CardType.PLANESWALKER.getPredicate());
         filter.add(new SubtypePredicate(SubType.AJANI));
     }
 

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

@@ -15,7 +15,6 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 
 /**
  *
@@ -26,7 +25,7 @@ public final class AkiriLineSlinger extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("artifact you control");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+        filter.add(CardType.ARTIFACT.getPredicate());
     }
 
     public AkiriLineSlinger(UUID ownerId, CardSetInfo setInfo) {

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

@@ -10,7 +10,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 
 /**
  *
@@ -22,9 +21,9 @@ public final class AkromasVengeance extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE),
+                CardType.CREATURE.getPredicate(),
-                new CardTypePredicate(CardType.ENCHANTMENT)));
+                CardType.ENCHANTMENT.getPredicate()));
     }
 
     public AkromasVengeance(UUID ownerId, CardSetInfo setInfo) {

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

@@ -11,7 +11,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.NamePredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
 
@@ -26,7 +25,7 @@ public final class AkronLegionnaire extends CardImpl {
     static {
         filter.add(new ControllerPredicate(TargetController.YOU));
         filter.add(Predicates.not(new NamePredicate("Akron Legionnaire")));
-        filter.add(Predicates.not(new CardTypePredicate(CardType.ARTIFACT)));
+        filter.add(Predicates.not(CardType.ARTIFACT.getPredicate()));
     }
 
     public AkronLegionnaire(UUID ownerId, CardSetInfo setInfo) {

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

@@ -16,7 +16,6 @@ import mage.constants.Duration;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 
 /**
  *
@@ -28,7 +27,7 @@ public final class AlchemistsRefuge extends CardImpl {
     private static final FilterCard filter = new FilterCard("spells");
 
     static {
-        filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
+        filter.add(Predicates.not(CardType.LAND.getPredicate()));
     }
 
     public AlchemistsRefuge(UUID ownerId, CardSetInfo setInfo) {

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

@@ -15,7 +15,6 @@ import mage.filter.FilterSpell;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.AbilityPredicate;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.game.permanent.token.FaerieToken;
 
@@ -34,8 +33,8 @@ public final class AlelaArtfulProvocateur extends CardImpl {
         filter.add(new AbilityPredicate(FlyingAbility.class));
         filter.add(new ControllerPredicate(TargetController.YOU));
         filter2.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.ENCHANTMENT)
+                CardType.ENCHANTMENT.getPredicate()
         ));
     }
 

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

@@ -15,7 +15,6 @@ import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 
 /**
@@ -28,9 +27,9 @@ public final class AmberPrison extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE),
+                CardType.CREATURE.getPredicate(),
-                new CardTypePredicate(CardType.LAND)));
+                CardType.LAND.getPredicate()));
     }
 
     public AmberPrison(UUID ownerId, CardSetInfo setInfo) {

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

@@ -13,7 +13,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.ColorPredicate;
 
 /**
@@ -27,7 +26,7 @@ public final class AmrouSeekers extends CardImpl {
     static {
         notArtificatOrWhite.add(Predicates.not(
                 Predicates.or(
-                        new CardTypePredicate(CardType.ARTIFACT),
+                        CardType.ARTIFACT.getPredicate(),
                         new ColorPredicate(ObjectColor.WHITE)
                 )
         ));

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

@@ -13,7 +13,6 @@ import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 
 import java.util.UUID;
@@ -27,9 +26,9 @@ public final class AmuletOfUnmaking extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE),
+                CardType.CREATURE.getPredicate(),
-                new CardTypePredicate(CardType.LAND)
+                CardType.LAND.getPredicate()
         ));
     }
 

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

@@ -11,7 +11,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.filter.FilterCard;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -22,7 +21,7 @@ public final class Anarchist extends CardImpl {
 
     private static final FilterCard filter = new FilterCard("sorcery card");
     static {
-        filter.add(new CardTypePredicate(CardType.SORCERY));
+        filter.add(CardType.SORCERY.getPredicate());
     }
 
     public Anarchist(UUID ownerId, CardSetInfo setInfo) {

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

@@ -11,7 +11,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 
 /**
  *
@@ -22,7 +21,7 @@ public final class AncestralStatue extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("nonland permanent you control");
 
     static {
-        filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
+        filter.add(Predicates.not(CardType.LAND.getPredicate()));
     }
 
     public AncestralStatue(UUID ownerId, CardSetInfo setInfo) {

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

@@ -15,7 +15,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.permanent.DefendingPlayerControlsPredicate;
 import mage.target.TargetPermanent;
 
@@ -28,7 +27,7 @@ public final class AncientHellkite extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent("creature defending player controls");
 
     static {
-        filter.add(new CardTypePredicate(CardType.CREATURE));
+        filter.add(CardType.CREATURE.getPredicate());
         filter.add(DefendingPlayerControlsPredicate.instance);
     }
 

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

@@ -18,7 +18,6 @@ import mage.constants.*;
 import mage.filter.Filter;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.game.Game;
 import mage.players.Player;
@@ -105,7 +104,7 @@ class AngelOfJubilationSacrificeFilterEffect extends CostModificationEffectImpl
             if (cost instanceof SacrificeTargetCost) {
                 SacrificeTargetCost sacrificeCost = (SacrificeTargetCost) cost;
                 Filter filter = sacrificeCost.getTargets().get(0).getFilter();
-                filter.add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));
+                filter.add(Predicates.not(CardType.CREATURE.getPredicate()));
             }
         }
         return true;

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

@@ -8,7 +8,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 
 /**
@@ -19,7 +18,7 @@ public final class AngelicEdict extends CardImpl {
 
     private static final FilterPermanent filter = new FilterPermanent("creature or enchantment");
     static {
-        filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.ENCHANTMENT)));
+        filter.add(Predicates.or(CardType.CREATURE.getPredicate(), CardType.ENCHANTMENT.getPredicate()));
     }
 
     public AngelicEdict(UUID ownerId, CardSetInfo setInfo) {

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

@@ -10,7 +10,6 @@ import mage.constants.CardType;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetControlledPermanent;
 
@@ -23,9 +22,9 @@ public final class AngelicPurge extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent("artifact, creature, or enchantment");
 
     static {
-        filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT),
+        filter.add(Predicates.or(CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE),
+                CardType.CREATURE.getPredicate(),
-                new CardTypePredicate(CardType.ENCHANTMENT)));
+                CardType.ENCHANTMENT.getPredicate()));
     }
 
     public AngelicPurge(UUID ownerId, CardSetInfo setInfo) {

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

@@ -15,7 +15,6 @@ import mage.constants.TargetController;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
 
@@ -31,7 +30,7 @@ public final class AngelicVoices extends CardImpl {
     static {
         filter.add(Predicates.not(
                 Predicates.or(
-                        new CardTypePredicate(CardType.ARTIFACT),
+                        CardType.ARTIFACT.getPredicate(),
                         new ColorPredicate(ObjectColor.WHITE)
                 )
         ));

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

@@ -17,7 +17,6 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 
 /**
@@ -31,7 +30,7 @@ public final class Anger extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("Mountain");
 
     static {
-        filter.add(new CardTypePredicate(CardType.LAND));
+        filter.add(CardType.LAND.getPredicate());
         filter.add(new SubtypePredicate(SubType.MOUNTAIN));
     }
 

Mage.Sets/src/mage/cards/a/AngrathsAmbusher.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.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 
 /**
@@ -26,7 +25,7 @@ public final class AngrathsAmbusher extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent();
 
     static {
-        filter.add(new CardTypePredicate(CardType.PLANESWALKER));
+        filter.add(CardType.PLANESWALKER.getPredicate());
         filter.add(new SubtypePredicate(SubType.ANGRATH));
     }
 

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

@@ -13,7 +13,6 @@ import mage.constants.*;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterArtifactPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.target.TargetPermanent;
@@ -28,7 +27,7 @@ public final class AnimateArtifact extends CardImpl {
     private static final FilterPermanent filter = new FilterArtifactPermanent("noncreature artifact");
 
     static {
-        filter.add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));
+        filter.add(Predicates.not(CardType.CREATURE.getPredicate()));
     }
 
     public AnimateArtifact(UUID ownerId, CardSetInfo setInfo) {

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

@@ -14,7 +14,6 @@ import mage.counters.CounterType;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledArtifactPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 
 import java.util.UUID;
@@ -28,7 +27,7 @@ public final class AnimatingFaerie extends AdventureCard {
             = new FilterControlledArtifactPermanent("noncreature artifact you control");
 
     static {
-        filter.add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));
+        filter.add(Predicates.not(CardType.CREATURE.getPredicate()));
     }
 
     public AnimatingFaerie(UUID ownerId, CardSetInfo setInfo) {

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

@@ -8,7 +8,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterSpell;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetSpell;
 
 /**
@@ -21,8 +20,8 @@ public final class Annul extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.ENCHANTMENT)));
+                CardType.ENCHANTMENT.getPredicate()));
     }
 
     public Annul(UUID ownerId, CardSetInfo setInfo) {

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

@@ -16,7 +16,6 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 
 /**
@@ -29,8 +28,8 @@ public final class AphettoAlchemist extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE)));
+                CardType.CREATURE.getPredicate()));
     }
 
     public AphettoAlchemist(UUID ownerId, CardSetInfo setInfo) {

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

@@ -16,7 +16,6 @@ import mage.constants.Outcome;
 import mage.filter.FilterCard;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.game.Game;
 import mage.players.Player;
@@ -31,8 +30,8 @@ public final class ApostlesBlessing extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE)));
+                CardType.CREATURE.getPredicate()));
     }
 
     public ApostlesBlessing(UUID ownerId, CardSetInfo setInfo) {
@@ -79,7 +78,7 @@ class ApostlesBlessingEffect extends OneShotEffect {
             if (controller.choose(outcome, choice, game)) {
                 FilterCard protectionFilter = new FilterCard();
                 if (choice.isArtifactSelected()) {
-                    protectionFilter.add(new CardTypePredicate(CardType.ARTIFACT));
+                    protectionFilter.add(CardType.ARTIFACT.getPredicate());
                 } else {
                     protectionFilter.add(new ColorPredicate(choice.getColor()));
                 }

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

@@ -15,7 +15,6 @@ import mage.constants.*;
 import mage.counters.CounterType;
 import mage.filter.FilterCard;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -57,9 +56,9 @@ class ArbiterOfTheIdealEffect extends OneShotEffect {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE),
+                CardType.CREATURE.getPredicate(),
-                new CardTypePredicate(CardType.LAND)));
+                CardType.LAND.getPredicate()));
     }
 
     public ArbiterOfTheIdealEffect() {

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

@@ -14,7 +14,6 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetControlledPermanent;
 
 /**
@@ -26,7 +25,7 @@ public final class ArcboundRavager extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("an artifact");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+        filter.add(CardType.ARTIFACT.getPredicate());
     }
 
     public ArcboundRavager(UUID ownerId, CardSetInfo setInfo) {

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

@@ -16,7 +16,6 @@ import mage.filter.FilterPermanent;
 import mage.filter.common.FilterArtifactCard;
 import mage.filter.common.FilterArtifactPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -32,7 +31,7 @@ public final class ArcumDagsson extends CardImpl {
     private static final FilterPermanent filter = new FilterArtifactPermanent("artifact creature");
 
     static {
-        filter.add(new CardTypePredicate(CardType.CREATURE));
+        filter.add(CardType.CREATURE.getPredicate());
     }
 
     public ArcumDagsson(UUID ownerId, CardSetInfo setInfo) {
@@ -64,7 +63,7 @@ class ArcumDagssonEffect extends OneShotEffect {
     private static final FilterCard filter = new FilterArtifactCard("noncreature artifact card");
 
     static {
-        filter.add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));
+        filter.add(Predicates.not(CardType.CREATURE.getPredicate()));
     }
 
     ArcumDagssonEffect() {

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

@@ -14,7 +14,6 @@ import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.filter.FilterSpell;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetSpell;
 import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetEnchantmentPermanent;
@@ -30,8 +29,8 @@ public final class ArensonsAura extends CardImpl {
     private static final FilterSpell filter2 = new FilterSpell("enchantment spell");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ENCHANTMENT));
+        filter.add(CardType.ENCHANTMENT.getPredicate());
-        filter2.add(new CardTypePredicate(CardType.ENCHANTMENT));
+        filter2.add(CardType.ENCHANTMENT.getPredicate());
     }
 
     public ArensonsAura(UUID ownerId, CardSetInfo setInfo) {

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

@@ -14,7 +14,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 
 /**
@@ -26,8 +25,8 @@ public final class ArgivianBlacksmith extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent("artifact creature");
     
     static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+        filter.add(CardType.ARTIFACT.getPredicate());
-        filter.add(new CardTypePredicate(CardType.CREATURE));
+        filter.add(CardType.CREATURE.getPredicate());
     }
 
     public ArgivianBlacksmith(UUID ownerId, CardSetInfo setInfo) {

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

@@ -8,7 +8,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterCard;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -19,7 +18,7 @@ public final class ArgivianFind extends CardImpl {
     
     private static final FilterCard filter = new FilterCard("artifact or enchantment card");
     static {
-        filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT), new CardTypePredicate(CardType.ENCHANTMENT)));
+        filter.add(Predicates.or(CardType.ARTIFACT.getPredicate(), CardType.ENCHANTMENT.getPredicate()));
     }
 
     public ArgivianFind(UUID ownerId, CardSetInfo setInfo) {

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

@@ -9,7 +9,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.filter.FilterSpell;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 
 import java.util.UUID;
 
@@ -21,7 +20,7 @@ public final class ArgothianEnchantress extends CardImpl {
     private static final FilterSpell filter = new FilterSpell("an Enchantment spell");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ENCHANTMENT));
+        filter.add(CardType.ENCHANTMENT.getPredicate());
     }
 
     public ArgothianEnchantress(UUID ownerId, CardSetInfo setInfo) {

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

@@ -15,7 +15,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 
@@ -28,7 +27,7 @@ public final class ArgothianPixies extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("artifact creatures");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+        filter.add(CardType.ARTIFACT.getPredicate());
     }
 
     public ArgothianPixies(UUID ownerId, CardSetInfo setInfo) {

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

@@ -19,7 +19,6 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
@@ -32,7 +31,7 @@ public final class ArmamentOfNyx extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("enchantment");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ENCHANTMENT));
+        filter.add(CardType.ENCHANTMENT.getPredicate());
     }
 
     public ArmamentOfNyx(UUID ownerId, CardSetInfo setInfo) {

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

@@ -14,7 +14,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -26,7 +25,7 @@ public final class ArmedProtocolDroid extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonartifact creature");
 
     static {
-        filter.add(Predicates.not(new CardTypePredicate(CardType.ARTIFACT)));
+        filter.add(Predicates.not(CardType.ARTIFACT.getPredicate()));
     }
 
     public ArmedProtocolDroid(UUID ownerId, CardSetInfo setInfo) {

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

@@ -11,7 +11,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.ComparisonType;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 
 /**
  *
@@ -22,7 +21,7 @@ public final class ArtificersEpiphany extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("you control no artifacts");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+        filter.add(CardType.ARTIFACT.getPredicate());
     }
 
     public ArtificersEpiphany(UUID ownerId, CardSetInfo setInfo) {

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

@@ -11,7 +11,6 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -25,7 +24,7 @@ public final class ArtificersHex extends CardImpl {
     
     private static final FilterPermanent filter = new FilterPermanent("Equipment");
     static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+        filter.add(CardType.ARTIFACT.getPredicate());
         filter.add(new SubtypePredicate(SubType.EQUIPMENT));
     }
 

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

@@ -9,7 +9,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetAnyTarget;
 
@@ -23,8 +22,8 @@ public final class Artillerize extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE)));
+                CardType.CREATURE.getPredicate()));
     }
 
     public Artillerize(UUID ownerId, CardSetInfo setInfo) {

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

@@ -11,7 +11,6 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.target.TargetPermanent;
@@ -25,7 +24,7 @@ public final class AshesToAshes extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonartifact creature");
 
     static {
-        filter.add(Predicates.not(new CardTypePredicate(CardType.ARTIFACT)));
+        filter.add(Predicates.not(CardType.ARTIFACT.getPredicate()));
     }
 
     public AshesToAshes(UUID ownerId, CardSetInfo setInfo) {

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

@@ -17,7 +17,6 @@ import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -30,7 +29,7 @@ public final class AshnodsTransmogrant extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonartifact creature");
 
     static {
-        filter.add(Predicates.not(new CardTypePredicate(CardType.ARTIFACT)));
+        filter.add(Predicates.not(CardType.ARTIFACT.getPredicate()));
     }
 
     public AshnodsTransmogrant(UUID ownerId, CardSetInfo setInfo) {

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

@@ -13,7 +13,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetControlledPermanent;
 
 /**
@@ -25,7 +24,7 @@ public final class Atog extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("an artifact");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+        filter.add(CardType.ARTIFACT.getPredicate());
     }
 
     public Atog(UUID ownerId, CardSetInfo setInfo) {

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

@@ -2,7 +2,6 @@ package mage.cards.a;
 
 import java.util.UUID;
 import mage.MageInt;
-import mage.abilities.Ability;
 import mage.abilities.common.DiesTriggeredAbility;
 import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
 import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility;
@@ -14,7 +13,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.TargetController;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
 
@@ -28,7 +26,7 @@ public final class AttendantOfVraska extends CardImpl {
 
     static {
         filter.add(new ControllerPredicate(TargetController.YOU));
-        filter.add(new CardTypePredicate(CardType.PLANESWALKER));
+        filter.add(CardType.PLANESWALKER.getPredicate());
         filter.add(new SubtypePredicate(SubType.VRASKA));
     }
 

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

@@ -15,7 +15,6 @@ import mage.constants.Zone;
 import mage.filter.FilterCard;
 import mage.filter.common.FilterInstantOrSorceryCard;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.TargetCard;
@@ -29,7 +28,7 @@ public final class AugurOfBolas extends CardImpl {
     private static final FilterCard filter = new FilterCard("an instant or sorcery card");
 
     static {
-        filter.add(Predicates.or(new CardTypePredicate(CardType.INSTANT), new CardTypePredicate(CardType.SORCERY)));
+        filter.add(Predicates.or(CardType.INSTANT.getPredicate(), CardType.SORCERY.getPredicate()));
     }
 
     public AugurOfBolas(UUID ownerId, CardSetInfo setInfo) {

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

@@ -10,7 +10,6 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -55,7 +54,7 @@ public final class AuraBarbs extends CardImpl {
         public boolean apply(Game game, Ability source) {
 
             FilterPermanent filterEnchantments = new FilterPermanent();
-            filterEnchantments.add(new CardTypePredicate(CardType.ENCHANTMENT));
+            filterEnchantments.add(CardType.ENCHANTMENT.getPredicate());
 
             for (Permanent permanent : game.getBattlefield().getActivePermanents(filterEnchantments, source.getControllerId(), source.getSourceId(), game)) {
                 Player controller = game.getPlayer(permanent.getControllerId());

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

@@ -12,7 +12,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.filter.FilterCard;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -23,7 +22,7 @@ public final class Auramancer extends CardImpl {
     private static final FilterCard filter = new FilterCard("enchantment card from your graveyard");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ENCHANTMENT));
+        filter.add(CardType.ENCHANTMENT.getPredicate());
     }
 
     public Auramancer(UUID ownerId, CardSetInfo setInfo) {

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

@@ -13,7 +13,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetControlledPermanent;
 
 /**
@@ -25,7 +24,7 @@ public final class Auratog extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("an enchantment");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ENCHANTMENT));
+        filter.add(CardType.ENCHANTMENT.getPredicate());
     }
 
     public Auratog(UUID ownerId, CardSetInfo setInfo) {

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

@@ -15,7 +15,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -27,7 +26,7 @@ public final class AuriokSiegeSled extends CardImpl {
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("artifact creature");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+        filter.add(CardType.ARTIFACT.getPredicate());
     }
 
     public AuriokSiegeSled(UUID ownerId, CardSetInfo setInfo) {

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

@@ -15,7 +15,6 @@ import mage.constants.ColoredManaSymbol;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 
 /**
@@ -26,7 +25,7 @@ public final class AuriokTransfixer extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent("artifact");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+        filter.add(CardType.ARTIFACT.getPredicate());
     }
 
     public AuriokTransfixer(UUID ownerId, CardSetInfo setInfo) {

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

@@ -14,7 +14,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 
 /**
@@ -26,7 +25,7 @@ public final class AvidReclaimer extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent();
 
     static {
-        filter.add(new CardTypePredicate(CardType.PLANESWALKER));
+        filter.add(CardType.PLANESWALKER.getPredicate());
         filter.add(new SubtypePredicate(SubType.NISSA));
     }
 

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

@@ -9,7 +9,6 @@ import mage.constants.SubType;
 import mage.filter.FilterSpell;
 import mage.filter.StaticFilters;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.filter.predicate.other.TargetsPermanentPredicate;
 import mage.target.TargetSpell;
@@ -25,7 +24,7 @@ public final class AvoidFate extends CardImpl {
     private static final FilterSpell filter = new FilterSpell("instant or Aura spell that targets a permanent you control");
 
     static {
-        filter.add(Predicates.or(new CardTypePredicate(CardType.INSTANT), new SubtypePredicate(SubType.AURA)));
+        filter.add(Predicates.or(CardType.INSTANT.getPredicate(), new SubtypePredicate(SubType.AURA)));
         filter.add(new TargetsPermanentPredicate(StaticFilters.FILTER_CONTROLLED_PERMANENT));
     }
 

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

@@ -10,7 +10,6 @@ import mage.constants.CardType;
 import mage.constants.TargetController;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 
 /**
  *
@@ -22,8 +21,8 @@ public final class Awakening extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.CREATURE),
+                CardType.CREATURE.getPredicate(),
-                new CardTypePredicate(CardType.LAND)
+                CardType.LAND.getPredicate()
         ));
     }
 

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

@@ -16,7 +16,6 @@ import mage.constants.SuperType;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 
 /**
  *
@@ -27,8 +26,8 @@ public final class AzcantaTheSunkenRuin extends CardImpl {
     private static final FilterCard filter = new FilterCard("noncreature, nonland card");
 
     static {
-        filter.add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));
+        filter.add(Predicates.not(CardType.CREATURE.getPredicate()));
-        filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
+        filter.add(Predicates.not(CardType.LAND.getPredicate()));
     }
 
     public AzcantaTheSunkenRuin(UUID ownerId, CardSetInfo setInfo) {

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

@@ -15,7 +15,6 @@ import mage.constants.SubType;
 import mage.counters.CounterType;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 
@@ -51,8 +50,8 @@ class BaneOfProgressEffect extends OneShotEffect {
     private static final FilterPermanent filter = new FilterPermanent();
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.ENCHANTMENT)));
+                CardType.ENCHANTMENT.getPredicate()));
     }
     public BaneOfProgressEffect() {
         super(Outcome.DestroyPermanent);

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

@@ -10,7 +10,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 
 /**
@@ -23,9 +22,9 @@ public final class BanishingStroke extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE),
+                CardType.CREATURE.getPredicate(),
-                new CardTypePredicate(CardType.ENCHANTMENT)));
+                CardType.ENCHANTMENT.getPredicate()));
     }
 
     public BanishingStroke(UUID ownerId, CardSetInfo setInfo) {

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

@@ -9,7 +9,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 
 /**
@@ -21,9 +20,9 @@ public final class BanishmentDecree extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE),
+                CardType.CREATURE.getPredicate(),
-                new CardTypePredicate(CardType.ENCHANTMENT)));
+                CardType.ENCHANTMENT.getPredicate()));
     }
 
     public BanishmentDecree (UUID ownerId, CardSetInfo setInfo) {

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

@@ -10,7 +10,6 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterSpell;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetSpell;
 import mage.target.common.TargetArtifactPermanent;
 import mage.target.common.TargetCreaturePermanent;
@@ -24,7 +23,7 @@ public final class BantCharm extends CardImpl {
     private static final FilterSpell filter = new FilterSpell("instant spell");
 
     static {
-        filter.add(new CardTypePredicate(CardType.INSTANT));
+        filter.add(CardType.INSTANT.getPredicate());
     }
 
     public BantCharm(UUID ownerId, CardSetInfo setInfo) {

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

@@ -14,7 +14,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.FilterCard;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.filter.predicate.mageobject.SupertypePredicate;
 import mage.target.common.TargetCardInLibrary;
@@ -27,7 +26,7 @@ public final class BantPanorama extends CardImpl {
     private static final FilterCard filter = new FilterCard("a basic Forest, Plains, or Island card");
 
     static {
-        filter.add(new CardTypePredicate(CardType.LAND));
+        filter.add(CardType.LAND.getPredicate());
         filter.add(new SupertypePredicate(SuperType.BASIC));
         filter.add(Predicates.or(
                 new SubtypePredicate(SubType.FOREST),

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

@@ -14,7 +14,6 @@ import mage.constants.SuperType;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 
 import java.util.UUID;
 
@@ -28,8 +27,8 @@ public final class BaralChiefOfCompliance extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.INSTANT),
+                CardType.INSTANT.getPredicate(),
-                new CardTypePredicate(CardType.SORCERY)
+                CardType.SORCERY.getPredicate()
         ));
     }
 

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

@@ -9,7 +9,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 
 /**
@@ -21,8 +20,8 @@ public final class BaralsExpertise extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent("artifacts and/or creatures");
 
     static {
-        filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT),
+        filter.add(Predicates.or(CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE)));
+                CardType.CREATURE.getPredicate()));
     }
 
     public BaralsExpertise(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/b/BarrageOgre.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.mageobject.CardTypePredicate;
 import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetAnyTarget;
 
@@ -28,7 +27,7 @@ public final class BarrageOgre extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("an artifact");
 
     static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+        filter.add(CardType.ARTIFACT.getPredicate());
     }
 
     public BarrageOgre (UUID ownerId, CardSetInfo setInfo) {

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

@@ -7,7 +7,6 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 
 /**
  *
@@ -18,7 +17,7 @@ public final class BarterInBlood extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("creature");
     
     static {
-        filter.add(new CardTypePredicate(CardType.CREATURE));
+        filter.add(CardType.CREATURE.getPredicate());
     }
 
     public BarterInBlood(UUID ownerId, CardSetInfo setInfo) {

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

@@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -30,9 +29,9 @@ public final class BazaarTrader extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE),
+                CardType.CREATURE.getPredicate(),
-                new CardTypePredicate(CardType.LAND)));
+                CardType.LAND.getPredicate()));
     }
 
     public BazaarTrader(UUID ownerId, CardSetInfo setInfo) {

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

@@ -9,7 +9,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterCard;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.Target;
 import mage.target.common.TargetCardInGraveyard;
 
@@ -22,8 +21,8 @@ public final class BeaconOfUnrest extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE)));
+                CardType.CREATURE.getPredicate()));
     }
 
     public BeaconOfUnrest(UUID ownerId, CardSetInfo setInfo) {

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

@@ -6,7 +6,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 
 import java.util.UUID;
@@ -20,9 +19,9 @@ public final class Bedevil extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.ARTIFACT),
+                CardType.ARTIFACT.getPredicate(),
-                new CardTypePredicate(CardType.CREATURE),
+                CardType.CREATURE.getPredicate(),
-                new CardTypePredicate(CardType.PLANESWALKER)
+                CardType.PLANESWALKER.getPredicate()
         ));
     }
 

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

@@ -37,7 +37,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.target.TargetPermanent;
 
@@ -51,10 +50,10 @@ public final class Befoul extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.LAND),
+                CardType.LAND.getPredicate(),
                 Predicates.and(
                     Predicates.not(new ColorPredicate(ObjectColor.BLACK)),
-                    new CardTypePredicate(CardType.CREATURE))));
+                    CardType.CREATURE.getPredicate())));
     }
     public Befoul (UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}{B}");

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

@@ -15,7 +15,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.ColorPredicate;
 
 /**
@@ -26,7 +25,7 @@ public final class BellowingTanglewurm extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent("green creatures");
 
     static {
-        filter.add(new CardTypePredicate(CardType.CREATURE));
+        filter.add(CardType.CREATURE.getPredicate());
         filter.add(new ColorPredicate(ObjectColor.GREEN));
     }
 

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

@@ -9,7 +9,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.filter.FilterCard;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 
 /**
  *
@@ -20,7 +19,7 @@ public final class BelovedChaplain extends CardImpl {
     static final FilterCard filter = new FilterCard("creatures");
 
     static {
-        filter.add(new CardTypePredicate(CardType.CREATURE));
+        filter.add(CardType.CREATURE.getPredicate());
     }
 
     public BelovedChaplain(UUID ownerId, CardSetInfo setInfo) {

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

@@ -17,7 +17,6 @@ import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
 import mage.filter.StaticFilters;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -89,7 +88,7 @@ class BirthingPodEffect extends OneShotEffect {
         int newConvertedCost = sacrificedPermanent.getConvertedManaCost() + 1;
         FilterCard filter = new FilterCard("creature card with converted mana cost " + newConvertedCost);
         filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, newConvertedCost));
-        filter.add(new CardTypePredicate(CardType.CREATURE));
+        filter.add(CardType.CREATURE.getPredicate());
         TargetCardInLibrary target = new TargetCardInLibrary(filter);
         if (controller.searchLibrary(target, source, game)) {
             Card card = controller.getLibrary().getCard(target.getFirstTarget(), game);

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

@@ -14,7 +14,6 @@ import mage.constants.ComparisonType;
 import mage.constants.SubType;
 import mage.filter.FilterCard;
 import mage.filter.common.FilterCreatureCard;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
 import mage.target.common.TargetCardInYourGraveyard;
 
@@ -28,7 +27,7 @@ public final class BishopOfRebirth extends CardImpl {
 
     static {
         filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
-        filter.add(new CardTypePredicate(CardType.CREATURE));
+        filter.add(CardType.CREATURE.getPredicate());
     }
 
     public BishopOfRebirth(UUID ownerId, CardSetInfo setInfo) {

Mage.Sets/src/mage/cards/b/BladeSplicer.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.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.permanent.token.GolemToken;
 
@@ -28,7 +27,7 @@ public final class BladeSplicer extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent("Golem creatures");
 
     static {
-        filter.add(new CardTypePredicate(CardType.CREATURE));
+        filter.add(CardType.CREATURE.getPredicate());
         filter.add(new SubtypePredicate(SubType.GOLEM));
     }
 

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

@@ -8,7 +8,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 
 /**
@@ -20,7 +19,7 @@ public final class BlessedLight extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent("creature or enchantment");
 
     static {
-        filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.ENCHANTMENT)));
+        filter.add(Predicates.or(CardType.CREATURE.getPredicate(), CardType.ENCHANTMENT.getPredicate()));
     }
 
     public BlessedLight(UUID ownerId, CardSetInfo setInfo) {

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

@@ -12,7 +12,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.counters.CounterType;
 import mage.filter.FilterSpell;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 
 /**
  *
@@ -22,7 +21,7 @@ public final class BlessedSpirits extends CardImpl {
     
     private static final FilterSpell filter = new FilterSpell("an enchantment spell");
     static {
-        filter.add(new CardTypePredicate(CardType.ENCHANTMENT));
+        filter.add(CardType.ENCHANTMENT.getPredicate());
     }
 
     public BlessedSpirits(UUID ownerId, CardSetInfo setInfo) {

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

@@ -13,7 +13,6 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.filter.FilterSpell;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -24,7 +23,7 @@ public final class Blightcaster extends CardImpl {
 
     private static final FilterSpell filter = new FilterSpell("an enchantment spell");
     static {
-        filter.add(new CardTypePredicate(CardType.ENCHANTMENT));
+        filter.add(CardType.ENCHANTMENT.getPredicate());
     }
 
     public Blightcaster(UUID ownerId, CardSetInfo setInfo) {

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

@@ -14,7 +14,6 @@ import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.filter.common.FilterArtifactPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 
 /**
@@ -26,7 +25,7 @@ public final class BlinkmothWell extends CardImpl {
     private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("noncreature artifact");
     
     static {
-        filter.add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));
+        filter.add(Predicates.not(CardType.CREATURE.getPredicate()));
     }
 
     public BlinkmothWell(UUID ownerId, CardSetInfo setInfo) {

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

@@ -19,7 +19,6 @@ import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.target.common.TargetControlledPermanent;
@@ -35,8 +34,8 @@ public final class BloodAspirant extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.CREATURE),
+                CardType.CREATURE.getPredicate(),
-                new CardTypePredicate(CardType.ENCHANTMENT)
+                CardType.ENCHANTMENT.getPredicate()
         ));
     }
 

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

@@ -16,7 +16,6 @@ import mage.filter.FilterCard;
 import mage.filter.FilterSpell;
 import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetControlledCreaturePermanent;
 
 /**
@@ -29,8 +28,8 @@ public final class BloodFunnel extends CardImpl {
     private static final FilterSpell filterNoncreature = new FilterSpell("a noncreature spell");
 
     static {
-        filter.add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));
+        filter.add(Predicates.not(CardType.CREATURE.getPredicate()));
-        filterNoncreature.add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));
+        filterNoncreature.add(Predicates.not(CardType.CREATURE.getPredicate()));
     }
 
     public BloodFunnel(UUID ownerId, CardSetInfo setInfo) {

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

@@ -11,7 +11,6 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.FilterSpell;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -27,7 +26,7 @@ public final class BloodlordOfVaasgoth extends CardImpl {
     private static final FilterSpell filter = new FilterSpell("a Vampire creature spell");
 
     static {
-        filter.add(new CardTypePredicate(CardType.CREATURE));
+        filter.add(CardType.CREATURE.getPredicate());
         filter.add(new SubtypePredicate(SubType.VAMPIRE));
     }
 

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

@@ -14,7 +14,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.filter.FilterCard;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.common.TargetCardInYourGraveyard;
 
 import java.util.UUID;
@@ -29,8 +28,8 @@ public final class BloodwaterEntity extends CardImpl {
 
     static {
         filter.add(Predicates.or(
-                new CardTypePredicate(CardType.INSTANT),
+                CardType.INSTANT.getPredicate(),
-                new CardTypePredicate(CardType.SORCERY)));
+                CardType.SORCERY.getPredicate()));
     }
     
     public BloodwaterEntity(UUID ownerId, CardSetInfo setInfo) {

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

@@ -17,7 +17,6 @@ import mage.cards.CardsImpl;
 import mage.constants.*;
 import mage.filter.common.FilterArtifactPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -80,7 +79,7 @@ class BludgeonBrawlAddSubtypeEffect extends ContinuousEffectImpl {
     @Override
     public boolean apply(Game game, Ability source) {
         FilterArtifactPermanent filter = new FilterArtifactPermanent("noncreature, non-Equipment artifact");
-        filter.add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));
+        filter.add(Predicates.not(CardType.CREATURE.getPredicate()));
         filter.add(Predicates.not(new SubtypePredicate(SubType.EQUIPMENT)));
 
         Cards affectedPermanents = new CardsImpl();

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

@@ -18,7 +18,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.common.TargetControlledPermanent;
@@ -34,7 +33,7 @@ public final class BolassCitadel extends CardImpl {
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("nonland permanents");
 
     static {
-        filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
+        filter.add(Predicates.not(CardType.LAND.getPredicate()));
     }
 
     public BolassCitadel(UUID ownerId, CardSetInfo setInfo) {

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

@@ -14,7 +14,6 @@ import mage.filter.FilterCard;
 import mage.filter.StaticFilters;
 import mage.filter.common.FilterNonlandCard;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.permanent.token.ZombieToken;
 
 import java.util.UUID;
@@ -27,7 +26,7 @@ public final class BoneMiser extends CardImpl {
     private static final FilterCard filter = new FilterNonlandCard("a noncreature, nonland card");
 
     static {
-        filter.add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));
+        filter.add(Predicates.not(CardType.CREATURE.getPredicate()));
     }
 
     public BoneMiser(UUID ownerId, CardSetInfo setInfo) {