Fix raw use of parameterized class 'ManaCostsImpl' - 'd' cards (#9013)

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

@@ -46,7 +46,7 @@ public final class DaghatarTheAdamant extends CardImpl {
                 "with four +1/+1 counters on it"));
 
         // {1}{B/G}{B/G}: Move a +1/+1 counter from target creature onto a second target creature.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MoveCounterFromTargetToTargetEffect(),new ManaCostsImpl("{1}{B/G}{B/G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MoveCounterFromTargetToTargetEffect(),new ManaCostsImpl<>("{1}{B/G}{B/G}"));
         ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature the +1/+1 counter is moved from")));
         ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature the +1/+1 counter is moved to")));
         this.addAbility(ability);

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

@@ -39,7 +39,7 @@ public final class DailyRegimen extends CardImpl {
         this.addAbility(new SimpleActivatedAbility(
                 Zone.BATTLEFIELD,
                 new AddCountersAttachedEffect(CounterType.P1P1.createInstance(),"enchanted creature"),
-                new ManaCostsImpl("{1}{W}")));
+                new ManaCostsImpl<>("{1}{W}")));
     }
 
     private DailyRegimen(final DailyRegimen card) {

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

@@ -34,7 +34,7 @@ public final class DakraMystic extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {U},{T}:Each player reveals the top card of their library. You may put the revealed cards into their owners graveyard. If you don't, each player draws a card.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DakraMysticEffect(), new ManaCostsImpl("{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DakraMysticEffect(), new ManaCostsImpl<>("{U}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
 

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

@@ -55,7 +55,7 @@ public final class DanceOfMany extends CardImpl {
         this.addAbility(ability2);
 
         // At the beginning of your upkeep, sacrifice Dance of Many unless you pay {U}{U}.
-        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{U}{U}")), TargetController.YOU, false));
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{U}{U}")), TargetController.YOU, false));
 
     }
 

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

@@ -252,7 +252,7 @@ class DanceOfTheDeadChangeAbilityEffect extends ContinuousEffectImpl implements
 class DanceOfTheDeadDoIfCostPaidEffect extends DoIfCostPaid {
 
     public DanceOfTheDeadDoIfCostPaidEffect() {
-        super(new UntapEnchantedEffect(), new ManaCostsImpl("{1}{B}"));
+        super(new UntapEnchantedEffect(), new ManaCostsImpl<>("{1}{B}"));
     }
 
     public DanceOfTheDeadDoIfCostPaidEffect(final DanceOfTheDeadDoIfCostPaidEffect effect) {

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

@@ -26,7 +26,7 @@ public final class Darba extends CardImpl {
         this.toughness = new MageInt(4);
 
         // At the beginning of your upkeep, sacrifice Darba unless you pay {G}{G}.
-        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{G}{G}")), TargetController.YOU, false));
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{G}{G}")), TargetController.YOU, false));
     }
 
     private Darba(final Darba card) {

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

@@ -38,7 +38,7 @@ public final class DarigaazTheIgniter extends CardImpl {
 
         // Whenever Darigaaz, the Igniter deals combat damage to a player, you may pay {2}{R}. If you do, choose a color, then that player reveals their hand and Darigaaz deals damage to the player equal to the number of cards of that color revealed this way.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(
-                new DarigaazTheIgniterEffect(), new ManaCostsImpl("{2}{R}")), false, true));
+                new DarigaazTheIgniterEffect(), new ManaCostsImpl<>("{2}{R}")), false, true));
     }
 
     private DarigaazTheIgniter(final DarigaazTheIgniter card) {

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

@@ -28,7 +28,7 @@ public final class DarigaazsAttendant extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {1}, Sacrifice Darigaaz's Attendant: Add {B}{R}{G}.
-        Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 0, 1, 1, 1, 0, 0, 0), new ManaCostsImpl("{1}"));
+        Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 0, 1, 1, 1, 0, 0, 0), new ManaCostsImpl<>("{1}"));
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
     }

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

@@ -41,7 +41,7 @@ public final class DaringFiendbonder extends CardImpl {
         Ability ability = new ActivateAsSorceryActivatedAbility(
                 Zone.GRAVEYARD,
                 new AddCountersTargetEffect(CounterType.INDESTRUCTIBLE.createInstance()),
-                new ManaCostsImpl("{1}{B}")
+                new ManaCostsImpl<>("{1}{B}")
         );
         ability.addCost(new ExileSourceFromGraveCost());
         ability.addTarget(new TargetCreaturePermanent());

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

@@ -31,7 +31,7 @@ public final class DaringSaboteur extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {2}{U}: Daring Saboteur 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}")));
 
         // Whenever Daring Saboteur deals combat damage to a player, you may draw a card. If you do, discard a card.
         Effect effect = new DrawDiscardControllerEffect(1, 1);

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

@@ -36,7 +36,7 @@ public final class DarkDepths extends CardImpl {
         // Dark Depths enters the battlefield with ten ice counters on it.
         this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.ICE.createInstance(10)), "with ten ice counters on it"));
         // {3}: Remove an ice counter from Dark Depths.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RemoveCounterSourceEffect(CounterType.ICE.createInstance(1)), new ManaCostsImpl("{3}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RemoveCounterSourceEffect(CounterType.ICE.createInstance(1)), new ManaCostsImpl<>("{3}")));
         // When Dark Depths has no ice counters on it, sacrifice it. If you do, create a legendary 20/20 black Avatar creature token with flying and "This creature is indestructible" named Marit Lage.
         this.addAbility(new DarkDepthsAbility());
     }

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

@@ -39,7 +39,7 @@ public final class DarkImpostor extends CardImpl {
 
         // {4}{B}{B}: Exile target creature and put a +1/+1 counter on Dark Impostor.
         Ability ability = new SimpleActivatedAbility(
-                new DarkImpostorExileTargetEffect(), new ManaCostsImpl("{4}{B}{B}")
+                new DarkImpostorExileTargetEffect(), new ManaCostsImpl<>("{4}{B}{B}")
         );
         ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance())
                 .setText("and put a +1/+1 counter on {this}"));

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

@@ -24,7 +24,7 @@ public final class DarkWithering extends CardImpl {
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
 
         // Madness {B}
-        this.addAbility(new MadnessAbility(new ManaCostsImpl("{B}")));
+        this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{B}")));
     }
 
     private DarkWithering(final DarkWithering card) {

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

@@ -28,7 +28,7 @@ public final class DarklitGargoyle extends CardImpl {
     this.power = new MageInt(1);
     this.toughness = new MageInt(2);
         this.addAbility(FlyingAbility.getInstance());
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -1, Duration.EndOfTurn), new ManaCostsImpl(("{B}"))));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -1, Duration.EndOfTurn), new ManaCostsImpl<>(("{B}"))));
     }
 
     private DarklitGargoyle(final DarklitGargoyle card) {

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

@@ -27,7 +27,7 @@ public final class DarkthicketWolf extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {2}{G}: Darkthicket Wolf gets +2/+2 until end of turn. Activate this ability only once each turn.
-        this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{2}{G}")));
+        this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")));
     }
 
     private DarkthicketWolf(final DarkthicketWolf card) {

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

@@ -25,7 +25,7 @@ public final class DarkwatchElves extends CardImpl {
         this.toughness = new MageInt(2);
 
         this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}")));
     }
 
     private DarkwatchElves(final DarkwatchElves card) {

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

@@ -22,7 +22,7 @@ public final class DarkwaterCatacombs extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
 
         // {1}, {tap}: Add {U}{B}.
-        Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 1, 0, 0, 0, 0, 0), new ManaCostsImpl("{1}"));
+        Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 1, 0, 0, 0, 0, 0), new ManaCostsImpl<>("{1}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }

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

@@ -24,7 +24,7 @@ public final class DarkwaterEgg extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}");
 
         // {2}, {tap}, Sacrifice Darkwater Egg: Add {U}{B}. Draw a card.
-        ActivatedManaAbilityImpl ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 1, 0, 0, 0, 0, 0), new ManaCostsImpl("{2}"));
+        ActivatedManaAbilityImpl ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 1, 0, 0, 0, 0, 0), new ManaCostsImpl<>("{2}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         ability.addEffect(new DrawCardSourceControllerEffect(1));

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

@@ -26,7 +26,7 @@ public final class DartingMerfolk extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {U}: Return Darting Merfolk to its owner's hand.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{U}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}")));
     }
 
     private DartingMerfolk(final DartingMerfolk card) {

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

@@ -35,7 +35,7 @@ public final class DaruEncampment extends CardImpl {
         // {W}, {tap}: Target Soldier creature gets +1/+1 until end of turn.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new BoostTargetEffect(1, 1, Duration.EndOfTurn),
-                new ManaCostsImpl("{W}"));
+                new ManaCostsImpl<>("{W}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);

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

@@ -37,7 +37,7 @@ public final class DaruHealer extends CardImpl {
         this.addAbility(ability);
 
         // Morph {W}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{W}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{W}")));
 
     }
 

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

@@ -27,7 +27,7 @@ public final class DaruLancer extends CardImpl {
         // First strike
         this.addAbility(FirstStrikeAbility.getInstance());
         // Morph {2}{W}{W}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{W}{W}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{W}{W}")));
     }
 
     private DaruLancer(final DaruLancer card) {

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

@@ -28,7 +28,7 @@ public final class DaruMender extends CardImpl {
         this.toughness = new MageInt(1);
 
         // Morph {W}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{W}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{W}")));
         // When Daru Mender is turned face up, regenerate target creature.
         Ability ability = new TurnedFaceUpSourceTriggeredAbility(new RegenerateTargetEffect());
         ability.addTarget(new TargetCreaturePermanent());

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

@@ -28,7 +28,7 @@ public final class DaruSanctifier extends CardImpl {
         this.toughness = new MageInt(4);
 
         // Morph {1}{W}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{W}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{W}")));
         // When Daru Sanctifier is turned face up, destroy target enchantment.
         Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DestroyTargetEffect());
         ability.addTarget(new TargetEnchantmentPermanent());

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

@@ -44,7 +44,7 @@ public final class DaughterOfAutumn extends CardImpl {
         this.toughness = new MageInt(4);
 
         // {W}: The next 1 damage that would be dealt to target white creature this turn is dealt to Daughter of Autumn instead.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DaughterOfAutumnPreventDamageTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl("{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DaughterOfAutumnPreventDamageTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{W}"));
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
     }

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

@@ -29,7 +29,7 @@ public final class DauntlessCathar extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {1}{W}, Exile Dauntless Cathar from your graveyard: Create a 1/1 white Spirit creature token with flying. Activate this ability only any time you could cast a sorcery.
-        Ability ability = new ActivateAsSorceryActivatedAbility(Zone.GRAVEYARD, new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl("{1}{W}"));
+        Ability ability = new ActivateAsSorceryActivatedAbility(Zone.GRAVEYARD, new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl<>("{1}{W}"));
         ability.addCost(new ExileSourceFromGraveCost());
         this.addAbility(ability);
     }

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

@@ -42,7 +42,7 @@ public final class DauntlessRiverMarshal extends CardImpl {
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1)));
         
         // {3}{U}: Tap target creature.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{3}{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{3}{U}"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }

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

@@ -40,7 +40,7 @@ public final class DauthiCutthroat extends CardImpl {
         // Shadow
         this.addAbility(ShadowAbility.getInstance());
         // {1}{B}, {tap}: Destroy target creature with shadow.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{B}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);

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

@@ -25,7 +25,7 @@ public final class DauthiEmbrace extends CardImpl {
 
 
         // {B}{B}: Target creature gains shadow until end of turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{B}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }

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

@@ -34,7 +34,7 @@ public final class DauthiJackal extends CardImpl {
         this.addAbility(ShadowAbility.getInstance());
         
         // {B}{B}, Sacrifice Dauthi Jackal: Destroy target blocking creature.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{B}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{B}{B}"));
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetCreaturePermanent(new FilterBlockingCreature()));
         this.addAbility(ability);

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

@@ -32,7 +32,7 @@ public final class DauthiMercenary extends CardImpl {
         // Shadow
         this.addAbility(ShadowAbility.getInstance());
         // {1}{B}: Dauthi Mercenary gets +1/+0 until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")));
     }
 
     private DauthiMercenary(final DauthiMercenary card) {

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

@@ -34,7 +34,7 @@ public final class DawnOfHope extends CardImpl {
         this.addAbility(new SimpleActivatedAbility(
                 Zone.BATTLEFIELD,
                 new CreateTokenEffect(new SoldierLifelinkToken()),
-                new ManaCostsImpl("{3}{W}")
+                new ManaCostsImpl<>("{3}{W}")
         ));
     }
 

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

@@ -32,7 +32,7 @@ public final class DawnglareInvoker extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new TapAllTargetPlayerControlsEffect(FILTER_PERMANENT_CREATURES),
-                new ManaCostsImpl("{8}"));
+                new ManaCostsImpl<>("{8}"));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
     }

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

@@ -37,7 +37,7 @@ public final class DawningPurist extends CardImpl {
         this.addAbility(new DawningPuristTriggeredAbility());
 
         // Morph {1}{W}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{W}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{W}")));
     }
 
     private DawningPurist(final DawningPurist card) {

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

@@ -33,7 +33,7 @@ public final class DawnrayArcher extends CardImpl {
         // Exalted
         this.addAbility(new ExaltedAbility());
         // {W}, {tap}: Dawnray Archer deals 1 damage to target attacking or blocking creature.
-       Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{W}"));
+       Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{W}"));
        ability.addTarget(new TargetAttackingOrBlockingCreature());
        ability.addCost(new TapSourceCost());
        this.addAbility(ability);

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

@@ -32,7 +32,7 @@ public final class Dawnstrider extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {G}, {tap}, Discard a card: Prevent all combat damage that would be dealt this turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new ManaCostsImpl("{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new ManaCostsImpl<>("{G}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new DiscardTargetCost(new TargetCardInHand()));
         this.addAbility(ability);

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

@@ -45,7 +45,7 @@ public final class DaxosTheReturned extends CardImpl {
 
         // {1}{W}{B}: Create a white and black Spirit enchantment creature token. It has
         // "This creature's power and toughness are each equal to the number of experience counters you have."
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DaxosSpiritToken(), 1), new ManaCostsImpl("{1}{W}{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DaxosSpiritToken(), 1), new ManaCostsImpl<>("{1}{W}{B}")));
     }
 
     private DaxosTheReturned(final DaxosTheReturned card) {

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

@@ -24,7 +24,7 @@ public final class DeadRevels extends CardImpl {
         this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(0, 2, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD));
 
         // Spectacle {1}{B}
-        this.addAbility(new SpectacleAbility(this, new ManaCostsImpl("{1}{B}")));
+        this.addAbility(new SpectacleAbility(this, new ManaCostsImpl<>("{1}{B}")));
     }
 
     private DeadRevels(final DeadRevels card) {

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

@@ -33,7 +33,7 @@ public final class Deadapult extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}");
 
         // {R}, Sacrifice a Zombie: Deadapult deals 2 damage to any target.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(filter)));
         ability.addTarget(new TargetAnyTarget());
         this.addAbility(ability);

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

@@ -24,7 +24,7 @@ public final class DeadbridgeGoliath extends CardImpl {
         this.toughness = new MageInt(5);
 
         // Scavenge {4}{G}{G} ({4}{G}{G} , Exile this card from your graveyard: Put a number of +1/+1 counter's equal to this card's power on target creature. Scavenge only as a sorcery.)
-        this.addAbility(new ScavengeAbility(new ManaCostsImpl("{4}{G}{G}")));
+        this.addAbility(new ScavengeAbility(new ManaCostsImpl<>("{4}{G}{G}")));
     }
 
     private DeadbridgeGoliath(final DeadbridgeGoliath card) {

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

@@ -35,7 +35,7 @@ public final class DeadeyeNavigator extends CardImpl {
         this.addAbility(new SoulbondAbility());
 
         // As long as Deadeye Navigator is paired with another creature, each of those creatures has "{1}{U}: Exile this creature, then return it to the battlefield under your control."
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(true), new ManaCostsImpl("{1}{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(true), new ManaCostsImpl<>("{1}{U}"));
         ability.addEffect(new ReturnToBattlefieldUnderYourControlSourceEffect());
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText)));
     }

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

@@ -37,7 +37,7 @@ public final class DeadeyePlunderers extends CardImpl {
         ).addHint(ArtifactYouControlHint.instance));
 
         // {2}{U}{B}: Create a colorless artifact token named Treasure with "{T}, Sacrifice this artifact: Add one mana of any color."
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TreasureToken()), new ManaCostsImpl("{2}{U}{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TreasureToken()), new ManaCostsImpl<>("{2}{U}{B}")));
     }
 
     private DeadeyePlunderers(final DeadeyePlunderers card) {

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

@@ -34,7 +34,7 @@ public final class DeadeyeTracker extends CardImpl {
 
         // {1}{B}, {T}: Exile two target cards from an opponent's graveyard. Deadeye Tracker explores.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost());
-        ability.addCost(new ManaCostsImpl("{1}{B}"));
+        ability.addCost(new ManaCostsImpl<>("{1}{B}"));
         Effect effect = new ExploreSourceEffect();
         effect.setText("{this} explores");
         ability.addEffect(effect);

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

@@ -33,7 +33,7 @@ public final class DeadlyAllure extends CardImpl {
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
 
         // Flashback {G}
-        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{G}")));
+        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{G}")));
 
     }
 

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

@@ -43,7 +43,7 @@ public final class DeadshotMinotaur extends CardImpl {
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
         // Cycling {RG}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{R/G}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{R/G}")));
     }
 
     private DeadshotMinotaur(final DeadshotMinotaur card) {

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

@@ -26,7 +26,7 @@ public final class DeathCharmer extends CardImpl {
         this.toughness = new MageInt(2);
 
         // Whenever Death Charmer deals combat damage to a creature, that creature's controller loses 2 life unless they pay {2}.
-        this.addAbility(new DealsCombatDamageToACreatureTriggeredAbility(new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new LoseLifeTargetControllerEffect(2), new ManaCostsImpl("{2}")), false, true));
+        this.addAbility(new DealsCombatDamageToACreatureTriggeredAbility(new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new LoseLifeTargetControllerEffect(2), new ManaCostsImpl<>("{2}")), false, true));
     }
 
     private DeathCharmer(final DeathCharmer card) {

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

@@ -29,8 +29,8 @@ public final class DeathHoodCobra extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{G}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}")));
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{G}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}")));
     }
 
     private DeathHoodCobra(final DeathHoodCobra card) {

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

@@ -27,7 +27,7 @@ public final class DeathPulse extends CardImpl {
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
 
         // Cycling {1}{B}{B}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{B}{B}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{B}{B}")));
         // When you cycle Death Pulse, you may have target creature get -1/-1 until end of turn.
         Ability ability = new CycleTriggeredAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), true);
         ability.addTarget(new TargetCreaturePermanent());

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

@@ -31,7 +31,7 @@ public final class DeathbellowRaider extends CardImpl {
         this.addAbility(new AttacksEachCombatStaticAbility());
 
         // {2}{B}: Regenerate Deathbellow Raider.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}")));
     }
 
     private DeathbellowRaider(final DeathbellowRaider card) {

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

@@ -29,7 +29,7 @@ public final class Deathgrip extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{B}");
 
         // {B}{B}: Counter target green spell.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl("{B}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{B}{B}"));
         ability.addTarget(new TargetSpell(filter));
         this.addAbility(ability);
     }

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

@@ -37,7 +37,7 @@ public final class DeathlessAngel extends CardImpl {
         // {W}{W}: Target creature is indestructible this turn.
         Effect effect = new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
-                effect, new ManaCostsImpl("{W}{W}"));
+                effect, new ManaCostsImpl<>("{W}{W}"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }

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

@@ -43,7 +43,7 @@ public final class DeathmarkPrelate extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {2}{B}, {tap}, Sacrifice a Zombie: Destroy target non-Zombie creature. It can't be regenerated. Activate this ability only any time you could cast a sorcery.
-        Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new ManaCostsImpl("{2}{B}"));
+        Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new ManaCostsImpl<>("{2}{B}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter1)));
         ability.addTarget(new TargetCreaturePermanent(filter2));

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

@@ -41,7 +41,7 @@ public final class DeathmistRaptor extends CardImpl {
         this.addAbility(new TurnedFaceUpAllTriggeredAbility(Zone.GRAVEYARD, new DeathmistRaptorEffect(), new FilterControlledPermanent("a permanent you control"), false, true));
 
         // Megamorph {4}{G}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{G}"), true));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{G}"), true));
     }
 
     private DeathmistRaptor(final DeathmistRaptor card) {

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

@@ -55,14 +55,14 @@ public final class DeathriteShaman extends CardImpl {
         this.addAbility(ability);
 
         // {B}, {T}: Exile target instant or sorcery card from a graveyard. Each opponent loses 2 life.
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{B}"));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{B}"));
         ability.addCost(new TapSourceCost());
         ability.addEffect(new LoseLifeOpponentsEffect(2));
         ability.addTarget(new TargetCardInGraveyard(filter));
         this.addAbility(ability);
 
         // {G}, {T}: Exile target creature card from a graveyard. You gain 2 life.
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{G}"));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{G}"));
         ability.addCost(new TapSourceCost());
         ability.addEffect(new GainLifeEffect(2));
         ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard")));

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

@@ -25,7 +25,7 @@ public final class DecimatorWeb extends CardImpl {
 
     public DecimatorWeb (UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}");
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl("{4}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{4}"));
         ability.addCost(new TapSourceCost());
         ability.addEffect(new AddCountersTargetEffect(CounterType.POISON.createInstance()));
         ability.addEffect(new PutLibraryIntoGraveTargetEffect(6));

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

@@ -32,7 +32,7 @@ public final class DeclarationOfNaught extends CardImpl {
         this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.ALL)));
 
         // {U}: Counter target spell with the chosen name.
-        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl("{U}"));
+        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{U}"));
         ability.setTargetAdjuster(DeclarationOfNaughtAdjuster.instance);
         ability.addTarget(new TargetSpell(filter));
         this.addAbility(ability);

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

@@ -30,7 +30,7 @@ public final class DecoratedGriffin extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
         // {1}{W}: Prevent the next 1 combat damage that would be dealt to you this turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.EndOfTurn, true, true, 1), new ManaCostsImpl("{1}{W}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.EndOfTurn, true, true, 1), new ManaCostsImpl<>("{1}{W}")));
     }
 
     private DecoratedGriffin(final DecoratedGriffin card) {

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

@@ -34,7 +34,7 @@ public final class DecreeOfAnnihilation extends CardImpl {
         this.getSpellAbility().addEffect(new DecreeOfAnnihilationEffect());
 
         // Cycling {5}{R}{R}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{R}{R}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{5}{R}{R}")));
 
         // When you cycle Decree of Annihilation, destroy all lands.
         this.addAbility(new CycleTriggeredAbility(new DestroyAllEffect(StaticFilters.FILTER_LANDS), false));

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

@@ -30,7 +30,7 @@ public final class DecreeOfPain extends CardImpl {
         // Destroy all creatures. They can't be regenerated. Draw a card for each creature destroyed this way.
         this.getSpellAbility().addEffect(new DecreeOfPainEffect());
         // Cycling {3}{B}{B}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{3}{B}{B}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{3}{B}{B}")));
         // When you cycle Decree of Pain, all creatures get -2/-2 until end of turn.
         Ability ability = new CycleTriggeredAbility(new BoostAllEffect(-2, -2, Duration.EndOfTurn));
         this.addAbility(ability);

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

@@ -28,7 +28,7 @@ public final class DecreeOfSavagery extends CardImpl {
         // Put four +1/+1 counters on each creature you control.
         this.getSpellAbility().addEffect(new AddCountersAllEffect(CounterType.P1P1.createInstance(4), new FilterControlledCreaturePermanent()));
         // Cycling {4}{G}{G}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{4}{G}{G}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{4}{G}{G}")));
         // When you cycle Decree of Savagery, you may put four +1/+1 counters on target creature.
         Ability ability = new CycleTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance(4)), true);
         ability.addTarget(new TargetCreaturePermanent());

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

@@ -45,7 +45,7 @@ public final class DecreeOfSilence extends CardImpl {
                 " If there are three or more depletion counters on {this}, sacrifice it"));
         this.addAbility(ability);
         // Cycling {4}{U}{U}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{4}{U}{U}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{4}{U}{U}")));
         // When you cycle Decree of Silence, you may counter target spell.
         ability = new CycleTriggeredAbility(new CounterTargetEffect(), true);
         ability.addTarget(new TargetSpell());

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

@@ -44,7 +44,7 @@ public final class DeekahFractalTheorist extends CardImpl {
 
         // {3}{U}: Target creature token can't be blocked this turn.
         Ability ability = new SimpleActivatedAbility(
-                new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{3}{U}")
+                new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}{U}")
         );
         ability.addTarget(new TargetPermanent(StaticFilters.FILTER_CREATURE_TOKEN));
         this.addAbility(ability);

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

@@ -29,7 +29,7 @@ public final class DeemWorthy extends CardImpl {
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         
         //Cycling {3}{R}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{3}{R}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{3}{R}")));
         // When you cycle Deem Worthy, you may have it deal 2 damage to target creature.
         Ability ability = new CycleTriggeredAbility(new DamageTargetEffect(2),true);
         ability.addTarget(new TargetCreaturePermanent());

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

@@ -26,7 +26,7 @@ public final class DeepAnalysis extends CardImpl {
         this.getSpellAbility().addTarget(new TargetPlayer());
 
         // Flashback-{1}{U}, Pay 3 life.
-        FlashbackAbility ability = new FlashbackAbility(this, new ManaCostsImpl("{1}{U}"));
+        FlashbackAbility ability = new FlashbackAbility(this, new ManaCostsImpl<>("{1}{U}"));
         ability.addCost(new PayLifeCost(3));
         this.addAbility(ability);
     }

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

@@ -26,7 +26,7 @@ public final class DeepReconnaissance extends CardImpl {
         // Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library.
         this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true));
         // Flashback {4}{G}
-        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{4}{G}")));
+        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{4}{G}")));
     }
 
     private DeepReconnaissance(final DeepReconnaissance card) {

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

@@ -42,7 +42,7 @@ public final class DeepSeaKraken extends CardImpl {
         // Deep-Sea Kraken can't be blocked.
         this.addAbility(new CantBeBlockedSourceAbility());
         // Suspend 9-{2}{U}
-        this.addAbility(new SuspendAbility(9, new ManaCostsImpl("{2}{U}"), this));
+        this.addAbility(new SuspendAbility(9, new ManaCostsImpl<>("{2}{U}"), this));
         // Whenever an opponent casts a spell, if Deep-Sea Kraken is suspended, remove a time counter from it.
         this.addAbility(new ConditionalInterveningIfTriggeredAbility(
                 new SpellCastAllTriggeredAbility(Zone.EXILED, new RemoveCounterSourceEffect(CounterType.TIME.createInstance()), filter, false, SetTargetPointer.NONE), SuspendedCondition.instance,

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

@@ -43,7 +43,7 @@ public final class DeepSpawn extends CardImpl {
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(effect, TargetController.YOU, false));
         // {U}: Deep Spawn gains shroud until end of turn and doesn't untap during your next untap step. Tap Deep Spawn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(
-            ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U}"));
+            ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"));
         effect = new DontUntapInControllersNextUntapStepSourceEffect();
         effect.setText("and doesn't untap during your next untap step");
         ability.addEffect(effect);

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

@@ -27,7 +27,7 @@ public final class DeepWater extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{U}{U}");
 
         // {U}: Until end of turn, if you tap a land you control for mana, it produces {U} instead of any other type.
-        this.addAbility(new SimpleActivatedAbility(new DeepWaterReplacementEffect(), new ManaCostsImpl("{U}")));
+        this.addAbility(new SimpleActivatedAbility(new DeepWaterReplacementEffect(), new ManaCostsImpl<>("{U}")));
     }
 
     private DeepWater(final DeepWater card) {

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

@@ -41,7 +41,7 @@ public final class DeepfathomSkulker extends CardImpl {
         this.addAbility(new DeepfathomSkulkerTriggeredAbility());
         
         // {3}{C}: Target creature can't be blocked this turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new ManaCostsImpl("{3}{C}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{3}{C}"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }

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

@@ -39,7 +39,7 @@ public final class DeepfireElemental extends CardImpl {
         this.toughness = new MageInt(4);
 
         // {X}{X}{1}: Destroy target artifact or creature with converted mana cost X.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{X}{X}{1}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{X}{X}{1}"));
         ability.addTarget(new TargetPermanent(filter));
         ability.setTargetAdjuster(XCMCPermanentAdjuster.instance);
         this.addAbility(ability);

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

@@ -31,7 +31,7 @@ public final class DeepwoodDrummer extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {G}, {tap}, Discard a card: Target creature gets +2/+2 until end of turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new DiscardCardCost());
         ability.addTarget(new TargetCreaturePermanent());

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

@@ -39,7 +39,7 @@ public final class DeepwoodElder extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {X}{G}{G}, {tap}, Discard a card: X target lands become Forests until end of turn.
-        Ability ability = new SimpleActivatedAbility(new DeepwoodElderEffect(), new ManaCostsImpl("{X}{G}{G}"));
+        Ability ability = new SimpleActivatedAbility(new DeepwoodElderEffect(), new ManaCostsImpl<>("{X}{G}{G}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new DiscardCardCost());
         ability.addTarget(new TargetPermanent(StaticFilters.FILTER_LANDS));

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

@@ -46,7 +46,7 @@ public final class DeepwoodLegate extends CardImpl {
         this.addAbility(new AlternativeCostSourceAbility(null, condition));
 
         // {B}: Deepwood Legate gets +1/+1 until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")));
     }
 
     private DeepwoodLegate(final DeepwoodLegate card) {

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

@@ -27,7 +27,7 @@ public final class DefenderOfTheOrder extends CardImpl {
         this.toughness = new MageInt(4);
 
         // Morph {W}{W}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{W}{W}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{W}{W}")));
         // When Defender of the Order is turned face up, creatures you control get +0/+2 until end of turn.
         this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BoostControlledEffect(0, 2, Duration.EndOfTurn)));
     }

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

@@ -44,7 +44,7 @@ public final class DefiantFalcon 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/d/DefiantVanguard.java

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

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

@@ -37,7 +37,7 @@ public final class DefilingTears extends CardImpl {
         effect.setText(", gets +1/-1");
         this.getSpellAbility().addEffect(effect);
 
-        effect = new GainAbilityTargetEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")), Duration.EndOfTurn);
+        effect = new GainAbilityTargetEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")), Duration.EndOfTurn);
         effect.setText(", and gains \"{B}: Regenerate this creature.\"");
         this.getSpellAbility().addEffect(effect);
     }

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

@@ -36,7 +36,7 @@ public final class DeftbladeElite extends CardImpl {
         // {1}{W}: Prevent all combat damage that would be dealt to and dealt by Deftblade Elite this turn.
         Effect effect = new PreventCombatDamageToSourceEffect(Duration.EndOfTurn);
         effect.setText("Prevent all combat damage that would be dealt to");
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{W}"));
         effect = new PreventCombatDamageBySourceEffect(Duration.EndOfTurn);
         effect.setText("and dealt by {this} this turn");
         ability.addEffect(effect);

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

@@ -26,7 +26,7 @@ public final class DefyGravity extends CardImpl {
         this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn));
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         // Flashback {U}
-        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{U}")));
+        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{U}")));
     }
 
     private DefyGravity(final DefyGravity card) {

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

@@ -38,7 +38,7 @@ public final class DeityOfScars extends CardImpl {
         this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(2)), "with two -1/-1 counters on it"));
 
         // {B/G}, Remove a -1/-1 counter from Deity of Scars: Regenerate Deity of Scars.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B/G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B/G}"));
         ability.addCost(new RemoveCountersSourceCost(CounterType.M1M1.createInstance()));
         this.addAbility(ability);
     }

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

@@ -25,7 +25,7 @@ public final class Dematerialize extends CardImpl {
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
         this.getSpellAbility().addTarget(new TargetPermanent());
         // Flashback {5}{U}{U}
-        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{5}{U}{U}")));
+        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{5}{U}{U}")));
     }
 
     private Dematerialize(final Dematerialize card) {

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

@@ -30,7 +30,7 @@ public final class DementiaBat extends CardImpl {
         this.toughness = new MageInt(2);
 
         this.addAbility(FlyingAbility.getInstance());
-        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(2), new ManaCostsImpl("{4}{B}"));
+        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(2), new ManaCostsImpl<>("{4}{B}"));
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);

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

@@ -49,7 +49,7 @@ public final class DemonOfDarkSchemes extends CardImpl {
         // {2}{B}, Pay {E}{E}{E}{E}: Put target creature card from a graveyard onto the battlefield under your control tapped.
         effect = new ReturnFromGraveyardToBattlefieldTargetEffect(true);
         effect.setText("Put target creature card from a graveyard onto the battlefield under your control tapped");
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{B}"));
         ability.addCost(new PayEnergyCost(4));
         ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard")));
         this.addAbility(ability);

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

@@ -47,7 +47,7 @@ public final class DemonicHordes extends CardImpl {
         this.addAbility(ability);
 
         // At the beginning of your upkeep, unless you pay {B}{B}{B}, tap Demonic Hordes and sacrifice a land of an opponent's choice.
-        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DemonicHordesEffect(new ManaCostsImpl("{B}{B}{B}")), TargetController.YOU, false));
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DemonicHordesEffect(new ManaCostsImpl<>("{B}{B}{B}")), TargetController.YOU, false));
     }
 
     private DemonicHordes(final DemonicHordes card) {

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

@@ -31,7 +31,7 @@ public final class DemonspineWhip extends CardImpl {
         this.subtype.add(SubType.EQUIPMENT);
 
         // {X}: Equipped creature gets +X/+0 until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(new XPaid(), StaticValue.get(0), Duration.EndOfTurn), new ManaCostsImpl("{X}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(new XPaid(), StaticValue.get(0), Duration.EndOfTurn), new ManaCostsImpl<>("{X}")));
 
         // Equip {1}
         this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1), false));

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

@@ -57,7 +57,7 @@ public final class DenOfTheBugbear extends CardImpl {
                         .withColor("R")
                         .withSubType(SubType.GOBLIN)
                         .withAbility(ability),
-                "land", Duration.EndOfTurn), new ManaCostsImpl("{3}{R}")));
+                "land", Duration.EndOfTurn), new ManaCostsImpl<>("{3}{R}")));
     }
 
     private DenOfTheBugbear(final DenOfTheBugbear card) {

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

@@ -34,7 +34,7 @@ public final class DenProtector extends CardImpl {
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect()));
 
         // Megamorph {1}{G}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{G}"), true));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{G}"), true));
 
         // When Den Protector is turned face up, return target card from your graveyard to your hand.
         Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect());

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

@@ -62,7 +62,7 @@ public final class DepartedDeckhand extends CardImpl {
                 new CantBeBlockedTargetEffect(
                         filter, Duration.EndOfTurn
                 ).setText("Another target creature you control can't be blocked this turn except by Spirits"),
-                new ManaCostsImpl("{3}{U}")
+                new ManaCostsImpl<>("{3}{U}")
         );
         ability.addTarget(new TargetControlledCreaturePermanent(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE));
         this.addAbility(ability);

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

@@ -38,7 +38,7 @@ public final class DerangedOutcast extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {1}{G}, Sacrifice a Human: Put two +1/+1 counters on target creature.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl("{1}{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl<>("{1}{G}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter)));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);

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

@@ -111,7 +111,7 @@ class DereviEmpyrialTacticianTriggeredAbility extends TriggeredAbilityImpl {
 class DereviEmpyrialTacticianAbility extends ActivatedAbilityImpl {
 
     public DereviEmpyrialTacticianAbility() {
-        super(Zone.COMMAND, new PutCommanderOnBattlefieldEffect(), new ManaCostsImpl("{1}{G}{W}{U}"));
+        super(Zone.COMMAND, new PutCommanderOnBattlefieldEffect(), new ManaCostsImpl<>("{1}{G}{W}{U}"));
     }
 
     @Override

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

@@ -39,7 +39,7 @@ public final class Dermoplasm extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // Morph {2}{U}{U}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}{U}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}{U}")));
 
         // When Dermoplasm is turned face up, you may put a creature card with a morph ability from your hand onto the battlefield face up. If you do, return Dermoplasm to its owner's hand.
         this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new DermoplasmEffect()));

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

@@ -31,7 +31,7 @@ public final class DescendantOfSoramaro extends CardImpl {
         Effect effect = new LookLibraryControllerEffect(CardsInControllerHandCount.instance);
         effect.setText("Look at the top X cards of your library, where X is the number of cards in your hand, then put them back in any order");
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
-                effect, new ManaCostsImpl("{1}{U}")));
+                effect, new ManaCostsImpl<>("{1}{U}")));
     }
 
     private DescendantOfSoramaro(final DescendantOfSoramaro card) {

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

@@ -24,7 +24,7 @@ public final class DesertCerodon extends CardImpl {
         this.toughness = new MageInt(4);
 
         // Cycling {R}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{R}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{R}")));
     }
 
     private DesertCerodon(final DesertCerodon card) {

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

@@ -29,7 +29,7 @@ public final class DesertOfTheFervent extends CardImpl {
         this.addAbility(new RedManaAbility());
 
         // Cycling {1}{R}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{R}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{R}")));
 
     }
 

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

@@ -29,7 +29,7 @@ public final class DesertOfTheGlorified extends CardImpl {
         this.addAbility(new BlackManaAbility());
 
         // Cycling {1}{B}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{B}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{B}")));
 
     }
 

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

@@ -29,7 +29,7 @@ public final class DesertOfTheIndomitable extends CardImpl {
         this.addAbility(new GreenManaAbility());
 
         // Cycling {1}{G}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{G}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{G}")));
 
     }
 

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

@@ -29,7 +29,7 @@ public final class DesertOfTheMindful extends CardImpl {
         this.addAbility(new BlueManaAbility());
 
         // Cycling {1}{U}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{U}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{U}")));
 
     }
 

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

@@ -29,7 +29,7 @@ public final class DesertOfTheTrue extends CardImpl {
         this.addAbility(new WhiteManaAbility());
 
         // Cycling {1}{W}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{W}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{W}")));
 
     }
 

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

@@ -26,7 +26,7 @@ public final class DesertedTemple extends CardImpl {
         // {tap}: Add {C}.
         this.addAbility(new ColorlessManaAbility());
         // {1}, {tap}: Untap target land.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{1}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{1}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetLandPermanent());
         this.addAbility(ability);

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

@@ -39,7 +39,7 @@ public final class DesiccatedNaga extends CardImpl {
         // {3}{B}: Target opponent loses 2 life and you gain 2 life. Activate this ability only if you control a Liliana planeswalker.
         Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD,
                 new LoseLifeTargetEffect(2),
-                new ManaCostsImpl("{3}{B}"),
+                new ManaCostsImpl<>("{3}{B}"),
                 new PermanentsOnTheBattlefieldCondition(filter));
         ability.addEffect(new GainLifeEffect(2).concatBy("and"));
         ability.addTarget(new TargetOpponent());