Fix raw use of parameterized class 'ManaCostsImpl' - 'a' cards (#9016)

Co-authored-by: DeepCrimson <deepcrimson@users.noreplyl.github.com>

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

@@ -34,7 +34,7 @@ public final class AAT1 extends CardImpl {
         this.toughness = new MageInt(4);
 
         // Whenever a repair counter is removed from a creature card your graveyard, you may pay {W/B}. If you do, target player loses 1 life and you gain 1 life. 
-        DoIfCostPaid effect = new DoIfCostPaid(new LoseLifeTargetEffect(1), new ManaCostsImpl("{W/B}"));
+        DoIfCostPaid effect = new DoIfCostPaid(new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{W/B}"));
         Effect additionalEffect = new GainLifeEffect(1);
         additionalEffect.setText("and you gain 1 life");
         effect.addEffect(additionalEffect);

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

@@ -29,7 +29,7 @@ public final class AbbeyMatron extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {W}, {tap}: Abbey Matron gets +0/+3 until end of turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0,3,Duration.EndOfTurn), new ManaCostsImpl("{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0,3,Duration.EndOfTurn), new ManaCostsImpl<>("{W}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }

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

@@ -35,7 +35,7 @@ public final class AbominationOfGudul extends CardImpl {
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(effect, true));
         
         // Morph 2BGU
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{B}{G}{U}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{B}{G}{U}")));
     }
 
     private AbominationOfGudul(final AbominationOfGudul card) {

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

@@ -50,7 +50,7 @@ public final class AboshanCephalidEmperor extends CardImpl {
         this.addAbility(ability);
 
         // {U}{U}{U}: Tap all creatures without flying.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapAllEffect(filter2), new ManaCostsImpl("{U}{U}{U}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapAllEffect(filter2), new ManaCostsImpl<>("{U}{U}{U}")));
     }
 
     private AboshanCephalidEmperor(final AboshanCephalidEmperor card) {

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

@@ -23,7 +23,7 @@ public final class AbsorbVis extends CardImpl {
         this.getSpellAbility().addEffect(new LoseLifeTargetEffect(4));
         this.getSpellAbility().addEffect(new GainLifeEffect(4).setText("and you gain 4 life"));
         this.getSpellAbility().addTarget(new TargetPlayer());
-        this.addAbility(new BasicLandcyclingAbility(new ManaCostsImpl("{1}{B}")));
+        this.addAbility(new BasicLandcyclingAbility(new ManaCostsImpl<>("{1}{B}")));
     }
 
     private AbsorbVis(final AbsorbVis card) {

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

@@ -33,7 +33,7 @@ public final class AbyssalHunter extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {B}, {tap}: Tap target creature. Abyssal Hunter deals damage equal to Abyssal Hunter's power to that creature.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{B}"));
         Effect effect = new DamageTargetEffect(new SourcePermanentPowerCount());
         effect.setText("{this} deals damage equal to {this}'s power to that creature.");
         ability.addEffect(effect);

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

@@ -28,7 +28,7 @@ public final class AbzanGuide extends CardImpl {
         // Lifelink
         this.addAbility(LifelinkAbility.getInstance());
         // Morph {2}{W}{B}{G}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{W}{B}{G}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{W}{B}{G}")));
     }
 
     private AbzanGuide(final AbzanGuide card) {

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

@@ -40,7 +40,7 @@ public final class AcademyElite extends CardImpl {
                 "with X +1/+1 counters on it, where X is the number of instant and sorcery cards in all graveyards"));
 
         // {2}{U}, Remove a +1/+1 counter from Academy Elite: Draw a card, then discard a card.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1, 1, false), new ManaCostsImpl("{2}{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1, 1, false), new ManaCostsImpl<>("{2}{U}"));
         ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1)));
         this.addAbility(ability);
     }

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

@@ -28,7 +28,7 @@ public final class AcademyRuins extends CardImpl {
         // {T}: Add {C}.
         this.addAbility(new ColorlessManaAbility());
         // {1}{U}, {T}: Put target artifact card from your graveyard on top of your library.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl("{1}{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{1}{U}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_ARTIFACT_FROM_YOUR_GRAVEYARD));
         this.addAbility(ability);

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

@@ -43,7 +43,7 @@ public final class AcidSpewerDragon extends CardImpl {
         this.addAbility(DeathtouchAbility.getInstance());
         
         // Megamorph {5}{B}{B}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{B}{B}"), true));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{B}{B}"), true));
         
         // When Acid-Spewer Dragon is turned face up, put a +1/+1 counter on each other Dragon creature you control.
         this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), false, false));

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

@@ -29,7 +29,7 @@ public final class AcolyteOfXathrid extends CardImpl {
 
         this.power = new MageInt(0);
         this.toughness = new MageInt(1);
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{1}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{1}{B}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);

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

@@ -28,7 +28,7 @@ public final class AcornCatapult extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
 
         // {1}, {T}: Acorn Catapult deals 1 damage to any target. That creature's controller or that player creates a 1/1 green Squirrel creature token.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}"));
         ability.addCost(new TapSourceCost());
         ability.addEffect(new AcornCatapultEffect());
         ability.addTarget(new TargetAnyTarget());

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

@@ -26,7 +26,7 @@ public final class AcornHarvest extends CardImpl {
         this.getSpellAbility().addEffect(new CreateTokenEffect(new SquirrelToken(), 2));
 
         // Flashback-{1}{G} - Pay 3 life.
-        FlashbackAbility ability = new FlashbackAbility(this, new ManaCostsImpl("{1}{G}"));
+        FlashbackAbility ability = new FlashbackAbility(this, new ManaCostsImpl<>("{1}{G}"));
         ability.addCost(new PayLifeCost(3));
         this.addAbility(ability);
         

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

@@ -32,7 +32,7 @@ public final class AdantoTheFirstFort extends CardImpl {
         this.addAbility(new WhiteManaAbility());
 
         // 2W, T: Create a 1/1 white Vampire creature token with lifelink.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new IxalanVampireToken()), new ManaCostsImpl("{2}{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new IxalanVampireToken()), new ManaCostsImpl<>("{2}{W}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }

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

@@ -27,7 +27,7 @@ public final class AdarkarSentinel extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {1}: Adarkar Sentinel gets +0/+1 until end of turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0,1,Duration.EndOfTurn), new ManaCostsImpl("{1}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0,1,Duration.EndOfTurn), new ManaCostsImpl<>("{1}"));
         this.addAbility(ability);
     }
 

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

@@ -30,7 +30,7 @@ public final class AdarkarWindform extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
         // {1}{S}: Target creature loses flying until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilityTargetEffect(
-            FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{S}"));
+            FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{S}"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }

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

@@ -23,7 +23,7 @@ public final class AdmiralsOrder extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}{U}");
 
         // Raid - If you attacked with a creature this turn, you may pay {U} rather than pay this spell's mana cost.
-        this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{U}"), RaidCondition.instance,
+        this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl<>("{U}"), RaidCondition.instance,
                         "<br/><i>Raid</i> &mdash; If you attacked this turn, you may pay {U} rather than pay this spell's mana cost"),
                 new PlayerAttackedWatcher());
         // Counter target spell. 

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

@@ -25,7 +25,7 @@ public final class AdornedPouncer extends CardImpl {
         addAbility(DoubleStrikeAbility.getInstance());
 
         // Eternalize 3WW
-        addAbility(new EternalizeAbility(new ManaCostsImpl("{3}{W}{W}"), this));
+        addAbility(new EternalizeAbility(new ManaCostsImpl<>("{3}{W}{W}"), this));
     }
 
     private AdornedPouncer(final AdornedPouncer card) {

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

@@ -31,7 +31,7 @@ public final class AdunOakenshield extends CardImpl {
         this.toughness = new MageInt(2);
 
         //{B}{R}{G}, {T}: Return target creature card from your graveyard to your hand.
-        Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl("{B}{R}{G}"));
+        Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{B}{R}{G}"));
         ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);

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

@@ -31,7 +31,7 @@ public final class AdvancedHoverguard extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
         // {U}: Advanced Hoverguard gains shroud until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}")));
     }
 
     private AdvancedHoverguard(final AdvancedHoverguard card) {

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

@@ -33,7 +33,7 @@ public final class AdvancedStitchwing extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
         // {2}{U}, Discard two cards: Return Advanced Stitchwing from your graveyard to the battlefield tapped.
-        Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true), new ManaCostsImpl("{2}{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true), new ManaCostsImpl<>("{2}{U}"));
         ability.addCost(new DiscardTargetCost(new TargetCardInHand(2, new FilterCard("two cards"))));
         this.addAbility(ability);
     }

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

@@ -36,7 +36,7 @@ public final class AegisAutomaton extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {4}{W}: Return another target creature you control to its owner's hand.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{4}{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{4}{W}"));
         ability.addTarget(new TargetControlledCreaturePermanent(filter));
         this.addAbility(ability);
     }

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

@@ -31,7 +31,7 @@ public final class AegisOfHonor extends CardImpl {
 
 	// {1}: The next time an instant or sorcery spell would deal damage to you this
         //turn, that spell deals that damage to its controller instead.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AegisOfHonorEffect(), new ManaCostsImpl("{1}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AegisOfHonorEffect(), new ManaCostsImpl<>("{1}")));
 
     }
 

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

@@ -35,7 +35,7 @@ public final class AegisOfTheMeek extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}");
 
         // {1}, {T}: Target 1/1 creature gets +1/+2 until end of turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);

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

@@ -24,7 +24,7 @@ public final class Aeolipile extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}");
 
         // {1}, {tap}, Sacrifice Aeolipile: Aeolipile deals 2 damage to any target.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{1}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetAnyTarget());

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

@@ -39,7 +39,7 @@ public final class AeonChronicler extends CardImpl {
         this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(CardsInControllerHandCount.instance, Duration.EndOfGame)));
         
         // Suspend X-{X}{3}{U}. X can't be 0.
-        this.addAbility(new SuspendAbility(Integer.MAX_VALUE, new ManaCostsImpl("{3}{U}"), this, true));
+        this.addAbility(new SuspendAbility(Integer.MAX_VALUE, new ManaCostsImpl<>("{3}{U}"), this, true));
         
         // Whenever a time counter is removed from Aeon Chronicler while it's exiled, draw a card.
         this.addAbility(new AeonChroniclerTriggeredAbility());

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

@@ -32,7 +32,7 @@ public final class AerialCaravan extends CardImpl {
         this.addAbility(new SimpleActivatedAbility(
                 new ExileTopXMayPlayUntilEndOfTurnEffect(1).setText("Exile the top card of your library. " +
                                 "Until end of turn, you may play that card. <i>(Reveal the card as you exile it.)</i>"),
-                new ManaCostsImpl("{1}{U}{U}")));
+                new ManaCostsImpl<>("{1}{U}{U}")));
     }
 
     private AerialCaravan(final AerialCaravan card) {

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

@@ -28,7 +28,7 @@ public final class AerieBowmasters extends CardImpl {
         this.addAbility(ReachAbility.getInstance());
         
         // Megamorph {5}{G} <i>(You may cast this card face down as a 2/2 creature for {3}. Turn it face up at any time for its megamorph cost and put a +1/+1 counter on it.)</i>)
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{G}"), true));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{G}"), true));
 
 
     }

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

@@ -31,7 +31,7 @@ public final class AerieMystics extends CardImpl {
         this.toughness = new MageInt(3);
         this.addAbility(FlyingAbility.getInstance());
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
-                new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.EndOfTurn, FILTER_PERMANENT_CREATURES), new ManaCostsImpl("{1}{G}{U}")));
+                new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.EndOfTurn, FILTER_PERMANENT_CREATURES), new ManaCostsImpl<>("{1}{G}{U}")));
     }
 
     private AerieMystics(final AerieMystics card) {

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

@@ -28,7 +28,7 @@ public final class AerieWorshippers extends CardImpl {
         this.toughness = new MageInt(4);
 
         // <i>Inspired</i> &mdash; Whenever Aerie Worshipers becomes untapped, you may pay {2}{U}. If you do, create a 2/2 blue Bird enchantment creature token with flying.
-        this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new AerieWorshippersBirdToken()), new ManaCostsImpl("{2}{U}"))));
+        this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new AerieWorshippersBirdToken()), new ManaCostsImpl<>("{2}{U}"))));
     }
 
     private AerieWorshippers(final AerieWorshippers card) {

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

@@ -24,7 +24,7 @@ public final class AetherSpellbomb extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}");
 
         //{U}, Sacrifice Aether Spellbomb: Return target creature to its owner's hand.
-        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{U}"));
+        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U}"));
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);

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

@@ -29,13 +29,13 @@ public final class Aetherling extends CardImpl {
         this.toughness = new MageInt(5);
 
         // {U}: Exile Aetherling. Return it to the battlefield under its owner's control at the beginning of the next end step.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileReturnBattlefieldOwnerNextEndStepSourceEffect(), new ManaCostsImpl("{U}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileReturnBattlefieldOwnerNextEndStepSourceEffect(), new ManaCostsImpl<>("{U}")));
         // {U}: Aetherling can't be blocked this turn
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{U}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{U}")));
         // {1}: Aetherling gets +1/-1 until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl("{1}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")));
         // {1}: Aetherling gets -1/+1 until end of turn
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")));
     }
 
     private Aetherling(final Aetherling card) {

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

@@ -28,7 +28,7 @@ public final class AgentOfHorizons extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {2}{U}: Agent of Horizons can't be blocked this turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{2}{U}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{U}")));
     }
 
     private AgentOfHorizons(final AgentOfHorizons card) {

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

@@ -36,7 +36,7 @@ public final class AgentOfShauku extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {1}{B}, Sacrifice a land: Target creature gets +2/+0 until end of turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter)));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);

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

@@ -26,7 +26,7 @@ public final class AgentOfStromgald extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {R}: Add {B}.
-        this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new ManaCostsImpl("{R}")));
+        this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new ManaCostsImpl<>("{R}")));
     }
 
     private AgentOfStromgald(final AgentOfStromgald card) {

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

@@ -41,7 +41,7 @@ public final class Agoraphobia extends CardImpl {
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-5, 0)));
         
          // {2}{U}: Return Agoraphobia to its owner's hand.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{2}{U}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}")));
     }
 
     private Agoraphobia(final Agoraphobia card) {

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

@@ -28,7 +28,7 @@ public final class AinokBondKin extends CardImpl {
         this.toughness = new MageInt(1);
 
         // Outlast {1}{W} <em>({1}{W}, {T}: Put a +1/+1 counter on this creature. Outlast only as a sorcery.)</em>
-        this.addAbility(new OutlastAbility(new ManaCostsImpl("{1}{W}")));
+        this.addAbility(new OutlastAbility(new ManaCostsImpl<>("{1}{W}")));
 
         // Each creature you control with a +1/+1 counter on it has first strike.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(

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

@@ -37,7 +37,7 @@ public final class AinokSurvivalist extends CardImpl {
         this.toughness = new MageInt(1);
 
         // Megamorph {1}{G}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{G}"), true));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{G}"), true));
         
         // When Ainok Survivalist is turned face up, destroy target artifact or enchantment an opponent controls.
         Effect effect = new DestroyTargetEffect();

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

@@ -28,7 +28,7 @@ public final class AinokTracker extends CardImpl {
         // First Strike
         this.addAbility(FirstStrikeAbility.getInstance());
         // Morph 4R
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{R}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{R}")));
     }
 
     private AinokTracker(final AinokTracker card) {

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

@@ -37,7 +37,7 @@ public final class AirServant extends CardImpl {
         this.power = new MageInt(4);
         this.toughness = new MageInt(3);
         this.addAbility(FlyingAbility.getInstance());
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{2}{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}{U}"));
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
     }

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

@@ -41,7 +41,7 @@ public final class AirdropCondor extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // {1}{R}, Sacrifice a Goblin creature: Airdrop Condor deals damage equal to the sacrificed creature's power to any target.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(SacrificeCostCreaturesPower.instance), new ManaCostsImpl("{1}{R}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(SacrificeCostCreaturesPower.instance), new ManaCostsImpl<>("{1}{R}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(filter)));
         ability.addTarget(new TargetAnyTarget());
         this.addAbility(ability);

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

@@ -67,7 +67,7 @@ public final class AkimTheSoaringWind extends CardImpl {
                         Duration.EndOfTurn,
                         filter,
                         false),
-                new ManaCostsImpl("{3}{U}{R}{W}"))
+                new ManaCostsImpl<>("{3}{U}{R}{W}"))
         );
     }
 

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

@@ -44,7 +44,7 @@ public final class AkoumFirebird extends CardImpl {
         // <i>Landfall</i>-Whenever a land enters the battlefield under your control, you may pay {4}{R}{R}.
         // If you do, return Akoum Firebird from your graveyard to the battlefield.
         this.addAbility(new AkoumFirebirdLandfallAbility(new DoIfCostPaid(
-                new ReturnSourceFromGraveyardToBattlefieldEffect(false, false), new ManaCostsImpl("{4}{R}{R}")), false));
+                new ReturnSourceFromGraveyardToBattlefieldEffect(false, false), new ManaCostsImpl<>("{4}{R}{R}")), false));
     }
 
     private AkoumFirebird(final AkoumFirebird card) {

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

@@ -32,7 +32,7 @@ public final class AkoumStonewaker extends CardImpl {
 
         // <i>Landfall</i> &mdash; Whenever a land enters the battlefield under your control, you may pay {2}{R}. If you do, create a 3/1 red Elemental creature token with trample and haste.
         // Exile that token at the beginning of the next end step.
-        this.addAbility(new LandfallAbility(new DoIfCostPaid(new AkoumStonewakerEffect(), new ManaCostsImpl("{2}{R}")), false));
+        this.addAbility(new LandfallAbility(new DoIfCostPaid(new AkoumStonewakerEffect(), new ManaCostsImpl<>("{2}{R}")), false));
 
     }
 

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

@@ -29,7 +29,7 @@ public final class AkroanJailer extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {2}{W}, {T}: Tap target creature.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{2}{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}{W}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);        

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

@@ -29,7 +29,7 @@ public final class AkroanMastiff extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {W},{T}: Tap target creature.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);

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

@@ -31,7 +31,7 @@ public final class AkroanPhalanx extends CardImpl {
         // Vigilance
         this.addAbility(VigilanceAbility.getInstance());
         // {2}{R}: Creatures you control get +1/+0 until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl("{2}{R}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}")));
     }
 
     private AkroanPhalanx(final AkroanPhalanx card) {

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

@@ -39,9 +39,9 @@ public final class AkromaAngelOfFury extends CardImpl {
         // protection from white and from blue
         this.addAbility(ProtectionAbility.from(ObjectColor.WHITE, ObjectColor.BLUE));
         // {R}: Akroma, Angel of Fury gets +1/+0 until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl("{R}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")));
         // Morph {3}{R}{R}{R}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{R}{R}{R}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{R}{R}{R}")));
     }
 
     private AkromaAngelOfFury(final AkromaAngelOfFury card) {

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

@@ -25,7 +25,7 @@ public final class AkromasBlessing extends CardImpl {
         // Choose a color. Creatures you control gain protection from the chosen color until end of turn.
         this.getSpellAbility().addEffect(new GainProtectionFromColorAllEffect(Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURES));
         // Cycling {W}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{W}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{W}")));
     }
 
     private AkromasBlessing(final AkromasBlessing card) {

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

@@ -35,7 +35,7 @@ public final class AlabasterLeech extends CardImpl {
 
         // White spells you cast cost {W} more to cast.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
-                new SpellsCostIncreasingAllEffect(new ManaCostsImpl("{W}"), filter, TargetController.YOU)));
+                new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{W}"), filter, TargetController.YOU)));
     }
 
     private AlabasterLeech(final AlabasterLeech card) {

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

@@ -29,7 +29,7 @@ public final class AlabasterMage extends CardImpl {
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"));
         ability.addTarget(new TargetControlledCreaturePermanent());
         this.addAbility(ability);
     }

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

@@ -28,7 +28,7 @@ public final class AladdinsLamp extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{10}");
 
         // {X}, {T}: The next time you would draw a card this turn, instead look at the top X cards of your library, put all but one of them on the bottom of your library in a random order, then draw a card. X can't be 0.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AladdinsLampEffect(), new ManaCostsImpl("{X}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AladdinsLampEffect(), new ManaCostsImpl<>("{X}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
 

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

@@ -23,7 +23,7 @@ public final class AladdinsRing extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{8}");
 
         // {8}, {tap}: Aladdin's Ring deals 4 damage to any target.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl("{8}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl<>("{8}"));
         ability.addTarget(new TargetAnyTarget());
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);

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

@@ -27,7 +27,7 @@ public final class AlbinoTroll extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
         this.addAbility(new EchoAbility("{1}{G}"));
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}")));
     }
 
     private AlbinoTroll(final AlbinoTroll card) {

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

@@ -24,7 +24,7 @@ public final class AlchemistsGreeting extends CardImpl {
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         
         // Madness {1}{R}
-        this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{R}")));
+        this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{1}{R}")));
     }
 
     private AlchemistsGreeting(final AlchemistsGreeting card) {

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

@@ -39,7 +39,7 @@ public final class AlchemistsRefuge extends CardImpl {
         // {G}{U}, {tap}: You may cast spells this turn as though they had flash.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new AddContinuousEffectToGame(new CastAsThoughItHadFlashAllEffect(Duration.EndOfTurn, filter)),
-                new CompositeCost(new ManaCostsImpl("{G}{U}"), new TapSourceCost(), "{G}{U}, {T}")));
+                new CompositeCost(new ManaCostsImpl<>("{G}{U}"), new TapSourceCost(), "{G}{U}, {T}")));
     }
 
     private AlchemistsRefuge(final AlchemistsRefuge card) {

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

@@ -30,7 +30,7 @@ public final class AlchemistsVial extends CardImpl {
         // When Alchemist's Vial enters the battlefield, draw a card.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1)));
         // {1}, {T}, Sacrifice Alchemist's Vial: Target creature can't attack or block this turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantAttackBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantAttackBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetCreaturePermanent());

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

@@ -38,7 +38,7 @@ public final class AlexiZephyrMage extends CardImpl {
         // {X}{U}, {tap}, Discard two cards: Return X target creatures to their owners' hands.
         Effect effect = new ReturnToHandTargetEffect();
         effect.setText("Return X target creatures to their owner's hands");
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{X}{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}{U}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new DiscardTargetCost(new TargetCardInHand(2, new FilterCard("two cards"))));
         ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_CREATURES));

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

@@ -35,7 +35,7 @@ public final class AliBaba extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {R}: Tap target Wall.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{R}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{R}"));
         ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);
     }

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

@@ -50,7 +50,7 @@ public class AllosaurusShepherd extends CardImpl {
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new SetPowerToughnessAllEffect(5, 5, Duration.EndOfTurn, elvesFilter, true)
                         .setText("Until end of turn, each Elf creature you control has base power and toughness 5/5"),
-                new ManaCostsImpl("{4}{G}{G}"));
+                new ManaCostsImpl<>("{4}{G}{G}"));
         ability.addEffect(new CreaturesBecomeOtherTypeEffect(elvesFilter, SubType.DINOSAUR, Duration.EndOfTurn)
                 .setText("and becomes a Dinosaur in addition to its other creature types"));
         this.addAbility(ability);

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

@@ -30,7 +30,7 @@ public final class AlmightyBrushwagg extends CardImpl {
 
         // {3}{G}: Almighty Brushwagg gets +3/+3 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl("{3}{G}")
+                new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{G}")
         ));
     }
 

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

@@ -25,7 +25,7 @@ public final class AlmsOfTheVein extends CardImpl {
         this.getSpellAbility().addTarget(new TargetOpponent());
 
         // Madness {B}
-        this.addAbility(new MadnessAbility(new ManaCostsImpl("{B}")));
+        this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{B}")));
     }
 
     private AlmsOfTheVein(final AlmsOfTheVein card) {

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

@@ -36,7 +36,7 @@ public final class AlphaKavu extends CardImpl {
 
         // {1}{G}: Target Kavu creature gets -1/+1 until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, 1, Duration.EndOfTurn),
-            new ManaCostsImpl("{1}{G}"));
+            new ManaCostsImpl<>("{1}{G}"));
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
     }

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

@@ -29,7 +29,7 @@ public final class AmaranthineWall extends CardImpl {
         this.addAbility(DefenderAbility.getInstance());
         // {2}: Amaranthine Wall gains indestructible until end of turn.
         GainAbilitySourceEffect effect = new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn);
-        SimpleActivatedAbility ability = new SimpleActivatedAbility(effect, new ManaCostsImpl("{2}"));
+        SimpleActivatedAbility ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}"));
         this.addAbility(ability);
     }
 

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

@@ -47,7 +47,7 @@ public final class AmbushCommander extends CardImpl {
 
         // {1}{G}, Sacrifice an Elf: Target creature gets +3/+3 until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn),
-                new ManaCostsImpl("{1}{G}"));
+                new ManaCostsImpl<>("{1}{G}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, filter)));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);

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

@@ -24,7 +24,7 @@ public final class Amok extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}");
 
         // {1}, Discard a card at random: Put a +1/+1 counter on target creature.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{1}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{1}"));
         ability.addCost(new DiscardCardCost(true));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);

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

@@ -30,7 +30,7 @@ public final class AmphinPathmage extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {2}{U}: Target creature can't be blocked this turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{2}{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{U}"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
 

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

@@ -41,7 +41,7 @@ public final class AmrouScout extends CardImpl {
         // {4}, {tap}: Search your library for a Rebel permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false),
-                new ManaCostsImpl("{4}"));
+                new ManaCostsImpl<>("{4}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }

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

@@ -32,7 +32,7 @@ public final class Amugaba extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
         // {2}{U}, Discard a card: Return Amugaba to its owner's hand.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{2}{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}"));
         ability.addCost(new DiscardTargetCost(new TargetCardInHand()));
         this.addAbility(ability);
     }

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

@@ -30,7 +30,7 @@ public final class AnabaShaman extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {R}, {tap}: Anaba Shaman deals 1 damage to any target.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetAnyTarget());
         this.addAbility(ability);

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

@@ -27,7 +27,7 @@ public final class AncestralTribute extends CardImpl {
 	this.getSpellAbility().addEffect(new GainLifeEffect((new CardsInControllerGraveyardCount(new FilterCard(), 2))));
 
 	// Flashback {9}{W}{W}{W}
-	this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{9}{W}{W}{W}")));
+	this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{9}{W}{W}{W}")));
 
         
     }

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

@@ -28,7 +28,7 @@ public final class AncientExcavation extends CardImpl {
         this.getSpellAbility().addEffect(new AncientExcavationEffect());
 
         // Basic landcycling {2}
-        this.addAbility(new BasicLandcyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new BasicLandcyclingAbility(new ManaCostsImpl<>("{2}")));
     }
 
     private AncientExcavation(final AncientExcavation card) {

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

@@ -23,7 +23,7 @@ public final class AncientGrudge extends CardImpl {
         this.getSpellAbility().addTarget(new TargetArtifactPermanent());
 
         // Flashback {G}
-        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{G}")));
+        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{G}")));
     }
 
     private AncientGrudge(final AncientGrudge card) {

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

@@ -42,7 +42,7 @@ public final class AncientHellkite extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // {R}: Ancient Hellkite deals 1 damage to target creature defending player controls. Activate this ability only if Ancient Hellkite is attacking.
-        Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}"), SourceAttackingCondition.instance);
+        Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}"), SourceAttackingCondition.instance);
         ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);
     }

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

@@ -32,7 +32,7 @@ public final class AncientHydra extends CardImpl {
         // Fading 5
         this.addAbility(new FadingAbility(5, this));
         // {1}, Remove a fade counter from Ancient Hydra: Ancient Hydra deals 1 damage to any target.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}"));
         ability.addCost(new RemoveCountersSourceCost(CounterType.FADE.createInstance(1)));
         ability.addTarget(new TargetAnyTarget());
         this.addAbility(ability);

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

@@ -27,7 +27,7 @@ public final class AncientKavu extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {2}: Ancient Kavu becomes colorless until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(new ObjectColor(), Duration.EndOfTurn), new ManaCostsImpl("{2}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(new ObjectColor(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")));
     }
 
     private AncientKavu(final AncientKavu card) {

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

@@ -25,7 +25,7 @@ public final class AncientSilverback extends CardImpl {
         this.power = new MageInt(6);
         this.toughness = new MageInt(5);
 
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{G}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")));
     }
 
     private AncientSilverback(final AncientSilverback card) {

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

@@ -34,10 +34,10 @@ public final class AndraditeLeech extends CardImpl {
 
         // Black spells you cast cost {B} more to cast.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
-                new SpellsCostIncreasingAllEffect(new ManaCostsImpl("{B}"), filter, TargetController.YOU)));
+                new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{B}"), filter, TargetController.YOU)));
         // {B}: Andradite Leech gets +1/+1 until end of turn.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
-                new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{B}")));
+                new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")));
     }
 
     private AndraditeLeech(final AndraditeLeech card) {

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

@@ -42,7 +42,7 @@ public final class AngelOfGrace extends CardImpl {
 
         // {4}{W}{W}, Exile Angel of Grace from your graveyard: Your life total becomes 10.
         Ability ability = new SimpleActivatedAbility(
-                Zone.GRAVEYARD, new SetPlayerLifeSourceEffect(10), new ManaCostsImpl("{4}{W}{W}")
+                Zone.GRAVEYARD, new SetPlayerLifeSourceEffect(10), new ManaCostsImpl<>("{4}{W}{W}")
         );
         ability.addCost(new ExileSourceFromGraveCost());
         this.addAbility(ability);

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

@@ -48,7 +48,7 @@ public final class AngelOfSanctions extends CardImpl {
         this.addAbility(ability);
 
         // Embalm {5}{W}
-        this.addAbility(new EmbalmAbility(new ManaCostsImpl("{5}{W}"), this));
+        this.addAbility(new EmbalmAbility(new ManaCostsImpl<>("{5}{W}"), this));
 
     }
 

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

@@ -28,7 +28,7 @@ public final class AngelOfTheGodPharaoh extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // Cycling {2}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}")));
 
     }
 

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

@@ -21,7 +21,7 @@ public final class Angelsong extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}");
 
         this.getSpellAbility().addEffect(new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true));
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}")));
     }
 
     private Angelsong(final Angelsong card) {

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

@@ -36,7 +36,7 @@ public final class AngusMackenzie extends CardImpl {
         Ability ability = new ActivateIfConditionActivatedAbility(
                 Zone.BATTLEFIELD, 
                 effect,
-                new ManaCostsImpl("{G}{W}{U}"), 
+                new ManaCostsImpl<>("{G}{W}{U}"), 
                 BeforeCombatDamageCondition.getInstance()
         );
         ability.addCost(new TapSourceCost());

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

@@ -39,7 +39,7 @@ public final class AnjesRavager extends CardImpl {
         this.addAbility(ability);
 
         // Madness {1}{R}
-        this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{R}")));
+        this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{1}{R}")));
     }
 
     private AnjesRavager(final AnjesRavager card) {

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

@@ -31,7 +31,7 @@ public final class AnointedChorister extends CardImpl {
 
         // {4}{W}: Anointed Chorister gets +3/+3 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl("{4}{W}")
+                new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{W}")
         ));
     }
 

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

@@ -39,7 +39,7 @@ public final class AnointerPriest extends CardImpl {
         this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new GainLifeEffect(1), filter));
 
         // Embalm {3}{W}
-        this.addAbility(new EmbalmAbility(new ManaCostsImpl("{3}{W}"), this));
+        this.addAbility(new EmbalmAbility(new ManaCostsImpl<>("{3}{W}"), this));
     }
 
     private AnointerPriest(final AnointerPriest card) {

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

@@ -30,7 +30,7 @@ public final class AntQueen extends CardImpl {
         this.power = new MageInt(5);
         this.toughness = new MageInt(5);
 
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(insectToken), new ManaCostsImpl("{1}{G}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(insectToken), new ManaCostsImpl<>("{1}{G}")));
     }
 
     private AntQueen(final AntQueen card) {

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

@@ -36,7 +36,7 @@ public final class Anthroplasm extends CardImpl {
         // Anthroplasm enters the battlefield with two +1/+1 counters on it.
         this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it"));
         // {X}, {tap}: Remove all +1/+1 counters from Anthroplasm and put X +1/+1 counters on it.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AnthroplasmEffect(), new ManaCostsImpl("{X}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AnthroplasmEffect(), new ManaCostsImpl<>("{X}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
 

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

@@ -40,7 +40,7 @@ public final class AntlerSkulkin extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {2}: Target white creature gains persist until end of turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new PersistAbility(), Duration.EndOfTurn), new ManaCostsImpl("{2}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new PersistAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}"));
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
         

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

@@ -30,7 +30,7 @@ public final class AnuridSwarmsnapper extends CardImpl {
         // Reach
         this.addAbility(ReachAbility.getInstance());
         // {1}{G}: Anurid Swarmsnapper can block an additional creature this turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.EndOfTurn, 1), new ManaCostsImpl("{1}{G}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{G}")));
     }
 
     private AnuridSwarmsnapper(final AnuridSwarmsnapper card) {

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

@@ -45,7 +45,7 @@ public final class AphettoAlchemist extends CardImpl {
         this.addAbility(ability);
         
         // Morph {U}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{U}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}")));
     }
 
     private AphettoAlchemist(final AphettoAlchemist card) {

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

@@ -30,7 +30,7 @@ public final class AphettoExterminator extends CardImpl {
         this.toughness = new MageInt(1);
 
         // Morph {3}{B}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{B}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{B}")));
 
         // When Aphetto Exterminator is turned face up, target creature gets -3/-3 until end of turn.
         Ability ability = new TurnedFaceUpSourceTriggeredAbility(new BoostTargetEffect(-3,-3,Duration.EndOfTurn));

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

@@ -36,7 +36,7 @@ public final class ApocalypseChime extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}");
 
         // {2}, {T}, Sacrifice Apocalypse Chime: Destroy all nontoken permanents with a name originally printed in the Homelands expansion. They can't be regenerated.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter, true), new ManaCostsImpl("{2}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter, true), new ManaCostsImpl<>("{2}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);

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

@@ -37,7 +37,7 @@ public final class ApothecaryInitiate extends CardImpl {
         this.toughness = new MageInt(1);
 
         // Whenever a player casts a white spell, you may pay {1}. If you do, you gain 1 life.
-        this.addAbility(new SpellCastAllTriggeredAbility(new DoIfCostPaid(new GainLifeEffect(1), new ManaCostsImpl("{1}")), filter, false));
+        this.addAbility(new SpellCastAllTriggeredAbility(new DoIfCostPaid(new GainLifeEffect(1), new ManaCostsImpl<>("{1}")), filter, false));
 
     }
 

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

@@ -28,7 +28,7 @@ public final class ApprenticeWizard extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {U}, {tap}: Add {C}{C}{C}.
-        Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(3), new ManaCostsImpl("{U}"));
+        Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(3), new ManaCostsImpl<>("{U}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }

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

@@ -38,7 +38,7 @@ public final class AquamorphEntity extends CardImpl {
         this.addAbility(ability);
 
         // Morph {2}{U}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}")));
     }
 
     private AquamorphEntity(final AquamorphEntity card) {

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

@@ -37,7 +37,7 @@ public final class AquastrandSpider extends CardImpl {
         // {G}: Target creature with a +1/+1 counter on it gains reach until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new GainAbilityTargetEffect(ReachAbility.getInstance(),
-                        Duration.EndOfTurn), new ManaCostsImpl("{G}"));
+                        Duration.EndOfTurn), new ManaCostsImpl<>("{G}"));
         ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1));
         this.addAbility(ability.addCustomOutcome(Outcome.Benefit));        
     }

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

@@ -37,7 +37,7 @@ public final class AquaticIncursion extends CardImpl {
         this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new MerfolkHexproofToken(), 2), false));
         
         // {3}{U}: Target Merfolk can't be blocked this turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{3}{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}{U}"));
         ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);
     }

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

@@ -30,7 +30,7 @@ public final class AquusSteed extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {2}{U}, {T}: Target creature gets -2/-0 until end of turn.
-        Ability secondAbility  = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl("{2}{U}"));
+        Ability secondAbility  = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{U}"));
         secondAbility.addCost(new TapSourceCost());
         secondAbility.addTarget(new TargetCreaturePermanent());
         this.addAbility(secondAbility);

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

@@ -63,9 +63,9 @@ public final class ArahboRoarOfTheWorld extends CardImpl {
         this.addAbility(ability);
 
         // Whenever another Cat you control attacks, you may pay {1}{G}{W}. If you do, it gains trample and gets +X/+X until end of turn, where X is its power.
-//        Effect effect = new DoIfCostPaid(new ArahboEffect(), new ManaCostsImpl("{1}{G}{W}"));
+//        Effect effect = new DoIfCostPaid(new ArahboEffect(), new ManaCostsImpl<>("{1}{G}{W}"));
         ability = new AttacksCreatureYouControlTriggeredAbility(
-                new DoIfCostPaid(new ArahboEffect(), new ManaCostsImpl("{1}{G}{W}")), false, filter2, true);
+                new DoIfCostPaid(new ArahboEffect(), new ManaCostsImpl<>("{1}{G}{W}")), false, filter2, true);
         this.addAbility(ability);
     }