diff --git a/Mage.Sets/src/mage/cards/d/DaghatarTheAdamant.java b/Mage.Sets/src/mage/cards/d/DaghatarTheAdamant.java index 88312e02a3..dc908bc51f 100644 --- a/Mage.Sets/src/mage/cards/d/DaghatarTheAdamant.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DailyRegimen.java b/Mage.Sets/src/mage/cards/d/DailyRegimen.java index 843fef3d08..ee08faf8b3 100644 --- a/Mage.Sets/src/mage/cards/d/DailyRegimen.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DakraMystic.java b/Mage.Sets/src/mage/cards/d/DakraMystic.java index cccc09ee6b..7dda0134be 100644 --- a/Mage.Sets/src/mage/cards/d/DakraMystic.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DanceOfMany.java b/Mage.Sets/src/mage/cards/d/DanceOfMany.java index a6c2cf634e..85fc871a28 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfMany.java +++ b/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)); } diff --git a/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java b/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java index 7b7e056735..c0885008ec 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/Darba.java b/Mage.Sets/src/mage/cards/d/Darba.java index 225b5ca09f..ff97c4e924 100644 --- a/Mage.Sets/src/mage/cards/d/Darba.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java b/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java index 72f7d56531..0f828dfeb4 100644 --- a/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DarigaazsAttendant.java b/Mage.Sets/src/mage/cards/d/DarigaazsAttendant.java index 683396b576..af39460139 100644 --- a/Mage.Sets/src/mage/cards/d/DarigaazsAttendant.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DaringFiendbonder.java b/Mage.Sets/src/mage/cards/d/DaringFiendbonder.java index 4c1682ae17..b3650a9e12 100644 --- a/Mage.Sets/src/mage/cards/d/DaringFiendbonder.java +++ b/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()); diff --git a/Mage.Sets/src/mage/cards/d/DaringSaboteur.java b/Mage.Sets/src/mage/cards/d/DaringSaboteur.java index 5290f6c7a5..2d717cb4fd 100644 --- a/Mage.Sets/src/mage/cards/d/DaringSaboteur.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DarkDepths.java b/Mage.Sets/src/mage/cards/d/DarkDepths.java index 9a55394a95..228ad270d3 100644 --- a/Mage.Sets/src/mage/cards/d/DarkDepths.java +++ b/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()); } diff --git a/Mage.Sets/src/mage/cards/d/DarkImpostor.java b/Mage.Sets/src/mage/cards/d/DarkImpostor.java index 31397b6dfd..d4bcdcb049 100644 --- a/Mage.Sets/src/mage/cards/d/DarkImpostor.java +++ b/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}")); diff --git a/Mage.Sets/src/mage/cards/d/DarkWithering.java b/Mage.Sets/src/mage/cards/d/DarkWithering.java index be1052fd64..9d2cdb6eae 100644 --- a/Mage.Sets/src/mage/cards/d/DarkWithering.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DarklitGargoyle.java b/Mage.Sets/src/mage/cards/d/DarklitGargoyle.java index d9180b1f5c..fabc0e95f2 100644 --- a/Mage.Sets/src/mage/cards/d/DarklitGargoyle.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DarkthicketWolf.java b/Mage.Sets/src/mage/cards/d/DarkthicketWolf.java index c9c923a03b..3d7ff3c187 100644 --- a/Mage.Sets/src/mage/cards/d/DarkthicketWolf.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DarkwatchElves.java b/Mage.Sets/src/mage/cards/d/DarkwatchElves.java index 4da3fff6f9..e648099508 100644 --- a/Mage.Sets/src/mage/cards/d/DarkwatchElves.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DarkwaterCatacombs.java b/Mage.Sets/src/mage/cards/d/DarkwaterCatacombs.java index 546bd24859..7c30915e92 100644 --- a/Mage.Sets/src/mage/cards/d/DarkwaterCatacombs.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DarkwaterEgg.java b/Mage.Sets/src/mage/cards/d/DarkwaterEgg.java index 5601606b72..19401298b9 100644 --- a/Mage.Sets/src/mage/cards/d/DarkwaterEgg.java +++ b/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)); diff --git a/Mage.Sets/src/mage/cards/d/DartingMerfolk.java b/Mage.Sets/src/mage/cards/d/DartingMerfolk.java index a4239655a1..f50a284df1 100644 --- a/Mage.Sets/src/mage/cards/d/DartingMerfolk.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DaruEncampment.java b/Mage.Sets/src/mage/cards/d/DaruEncampment.java index 4ad5c3af0c..1c795b3ebc 100644 --- a/Mage.Sets/src/mage/cards/d/DaruEncampment.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DaruHealer.java b/Mage.Sets/src/mage/cards/d/DaruHealer.java index 644e2a33b7..3a33215431 100644 --- a/Mage.Sets/src/mage/cards/d/DaruHealer.java +++ b/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}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DaruLancer.java b/Mage.Sets/src/mage/cards/d/DaruLancer.java index 05c43badef..aa9019e52b 100644 --- a/Mage.Sets/src/mage/cards/d/DaruLancer.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DaruMender.java b/Mage.Sets/src/mage/cards/d/DaruMender.java index fd6c180f3d..f2b1cc6b19 100644 --- a/Mage.Sets/src/mage/cards/d/DaruMender.java +++ b/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()); diff --git a/Mage.Sets/src/mage/cards/d/DaruSanctifier.java b/Mage.Sets/src/mage/cards/d/DaruSanctifier.java index eb8323dbfb..ced12ea8c3 100644 --- a/Mage.Sets/src/mage/cards/d/DaruSanctifier.java +++ b/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()); diff --git a/Mage.Sets/src/mage/cards/d/DaughterOfAutumn.java b/Mage.Sets/src/mage/cards/d/DaughterOfAutumn.java index 5fe6e3339b..b6c2039476 100644 --- a/Mage.Sets/src/mage/cards/d/DaughterOfAutumn.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DauntlessCathar.java b/Mage.Sets/src/mage/cards/d/DauntlessCathar.java index 70e1dd77c0..b68356d235 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessCathar.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java b/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java index 8c14b9d786..07fe1b4bc5 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DauthiCutthroat.java b/Mage.Sets/src/mage/cards/d/DauthiCutthroat.java index 4f3eb53ce8..0b74f4e61a 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiCutthroat.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DauthiEmbrace.java b/Mage.Sets/src/mage/cards/d/DauthiEmbrace.java index ded477b5e2..342d3bdab0 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiEmbrace.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DauthiJackal.java b/Mage.Sets/src/mage/cards/d/DauthiJackal.java index 33e6c4360a..aac279376c 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiJackal.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DauthiMercenary.java b/Mage.Sets/src/mage/cards/d/DauthiMercenary.java index d25236f291..dc1658928b 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiMercenary.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DawnOfHope.java b/Mage.Sets/src/mage/cards/d/DawnOfHope.java index e702ca5765..7f9bd2358e 100644 --- a/Mage.Sets/src/mage/cards/d/DawnOfHope.java +++ b/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}") )); } diff --git a/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java b/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java index 2eb6cf7688..bf0df0e9c0 100644 --- a/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DawningPurist.java b/Mage.Sets/src/mage/cards/d/DawningPurist.java index 26f96bafd3..26880c6813 100644 --- a/Mage.Sets/src/mage/cards/d/DawningPurist.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DawnrayArcher.java b/Mage.Sets/src/mage/cards/d/DawnrayArcher.java index fdc1e06a18..32cb1dfb6a 100644 --- a/Mage.Sets/src/mage/cards/d/DawnrayArcher.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/Dawnstrider.java b/Mage.Sets/src/mage/cards/d/Dawnstrider.java index e032f2fd47..532a6d6f61 100644 --- a/Mage.Sets/src/mage/cards/d/Dawnstrider.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java b/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java index b186084942..abb525d1bd 100644 --- a/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DeadRevels.java b/Mage.Sets/src/mage/cards/d/DeadRevels.java index 87422d8776..7cc2d361ff 100644 --- a/Mage.Sets/src/mage/cards/d/DeadRevels.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/Deadapult.java b/Mage.Sets/src/mage/cards/d/Deadapult.java index 839a40fe19..4ab59f4537 100644 --- a/Mage.Sets/src/mage/cards/d/Deadapult.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DeadbridgeGoliath.java b/Mage.Sets/src/mage/cards/d/DeadbridgeGoliath.java index 02a8e2946a..3bd8c97384 100644 --- a/Mage.Sets/src/mage/cards/d/DeadbridgeGoliath.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java b/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java index f48b4eb8ac..89794e6940 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java +++ b/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))); } diff --git a/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java b/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java index d2d9dd66e6..d8d088ed81 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeTracker.java b/Mage.Sets/src/mage/cards/d/DeadeyeTracker.java index 2be4ad4c84..c9175b6764 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeTracker.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DeadlyAllure.java b/Mage.Sets/src/mage/cards/d/DeadlyAllure.java index a7550779d9..9a5c565db0 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyAllure.java +++ b/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}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DeadshotMinotaur.java b/Mage.Sets/src/mage/cards/d/DeadshotMinotaur.java index 89a2be1a00..54a594fe08 100644 --- a/Mage.Sets/src/mage/cards/d/DeadshotMinotaur.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DeathCharmer.java b/Mage.Sets/src/mage/cards/d/DeathCharmer.java index 79ed846b5d..844a440b79 100644 --- a/Mage.Sets/src/mage/cards/d/DeathCharmer.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DeathHoodCobra.java b/Mage.Sets/src/mage/cards/d/DeathHoodCobra.java index 20cb20fc81..71f1aba129 100644 --- a/Mage.Sets/src/mage/cards/d/DeathHoodCobra.java +++ b/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(DeathtouchAbility.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}"))); } private DeathHoodCobra(final DeathHoodCobra card) { diff --git a/Mage.Sets/src/mage/cards/d/DeathPulse.java b/Mage.Sets/src/mage/cards/d/DeathPulse.java index 56126649b0..bc9ef23b07 100644 --- a/Mage.Sets/src/mage/cards/d/DeathPulse.java +++ b/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()); diff --git a/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java b/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java index 375f2c447a..04f7e7b102 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/Deathgrip.java b/Mage.Sets/src/mage/cards/d/Deathgrip.java index fd1c853569..c8bfcbe441 100644 --- a/Mage.Sets/src/mage/cards/d/Deathgrip.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DeathlessAngel.java b/Mage.Sets/src/mage/cards/d/DeathlessAngel.java index e4c85490ed..cd7dfbf9d5 100644 --- a/Mage.Sets/src/mage/cards/d/DeathlessAngel.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DeathmarkPrelate.java b/Mage.Sets/src/mage/cards/d/DeathmarkPrelate.java index a1e6ee17e7..e05531bfe8 100644 --- a/Mage.Sets/src/mage/cards/d/DeathmarkPrelate.java +++ b/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)); diff --git a/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java b/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java index 30673de865..508e519c02 100644 --- a/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DeathriteShaman.java b/Mage.Sets/src/mage/cards/d/DeathriteShaman.java index d07ca657f8..10c13c0086 100644 --- a/Mage.Sets/src/mage/cards/d/DeathriteShaman.java +++ b/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"))); diff --git a/Mage.Sets/src/mage/cards/d/DecimatorWeb.java b/Mage.Sets/src/mage/cards/d/DecimatorWeb.java index 364058ed4e..80e1060a02 100644 --- a/Mage.Sets/src/mage/cards/d/DecimatorWeb.java +++ b/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)); diff --git a/Mage.Sets/src/mage/cards/d/DeclarationOfNaught.java b/Mage.Sets/src/mage/cards/d/DeclarationOfNaught.java index 59c1ec2561..96ef8e8db2 100644 --- a/Mage.Sets/src/mage/cards/d/DeclarationOfNaught.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DecoratedGriffin.java b/Mage.Sets/src/mage/cards/d/DecoratedGriffin.java index e97fd5a714..f713527bbc 100644 --- a/Mage.Sets/src/mage/cards/d/DecoratedGriffin.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DecreeOfAnnihilation.java b/Mage.Sets/src/mage/cards/d/DecreeOfAnnihilation.java index 025cbae0ef..09c5349be1 100644 --- a/Mage.Sets/src/mage/cards/d/DecreeOfAnnihilation.java +++ b/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)); diff --git a/Mage.Sets/src/mage/cards/d/DecreeOfPain.java b/Mage.Sets/src/mage/cards/d/DecreeOfPain.java index 75432317d0..95aac9954d 100644 --- a/Mage.Sets/src/mage/cards/d/DecreeOfPain.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DecreeOfSavagery.java b/Mage.Sets/src/mage/cards/d/DecreeOfSavagery.java index a322f63b7a..a6b79eb4a8 100644 --- a/Mage.Sets/src/mage/cards/d/DecreeOfSavagery.java +++ b/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()); diff --git a/Mage.Sets/src/mage/cards/d/DecreeOfSilence.java b/Mage.Sets/src/mage/cards/d/DecreeOfSilence.java index 01d06dc957..f0a6185f0b 100644 --- a/Mage.Sets/src/mage/cards/d/DecreeOfSilence.java +++ b/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()); diff --git a/Mage.Sets/src/mage/cards/d/DeekahFractalTheorist.java b/Mage.Sets/src/mage/cards/d/DeekahFractalTheorist.java index 24c3387956..9b4f62d7e3 100644 --- a/Mage.Sets/src/mage/cards/d/DeekahFractalTheorist.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DeemWorthy.java b/Mage.Sets/src/mage/cards/d/DeemWorthy.java index c11cdcd33c..17b1a80cf4 100644 --- a/Mage.Sets/src/mage/cards/d/DeemWorthy.java +++ b/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()); diff --git a/Mage.Sets/src/mage/cards/d/DeepAnalysis.java b/Mage.Sets/src/mage/cards/d/DeepAnalysis.java index b9b51f2bd2..3b039ba444 100644 --- a/Mage.Sets/src/mage/cards/d/DeepAnalysis.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DeepReconnaissance.java b/Mage.Sets/src/mage/cards/d/DeepReconnaissance.java index 14c9c7c6ce..8a8dda76cd 100644 --- a/Mage.Sets/src/mage/cards/d/DeepReconnaissance.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DeepSeaKraken.java b/Mage.Sets/src/mage/cards/d/DeepSeaKraken.java index 7376bba690..50209dae29 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSeaKraken.java +++ b/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, diff --git a/Mage.Sets/src/mage/cards/d/DeepSpawn.java b/Mage.Sets/src/mage/cards/d/DeepSpawn.java index da379ba4ab..53085285a8 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSpawn.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DeepWater.java b/Mage.Sets/src/mage/cards/d/DeepWater.java index 4bff927cf3..4a60cf789d 100644 --- a/Mage.Sets/src/mage/cards/d/DeepWater.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DeepfathomSkulker.java b/Mage.Sets/src/mage/cards/d/DeepfathomSkulker.java index 733544304b..e7b8372e06 100644 --- a/Mage.Sets/src/mage/cards/d/DeepfathomSkulker.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DeepfireElemental.java b/Mage.Sets/src/mage/cards/d/DeepfireElemental.java index fcf49f719e..7434abbf56 100644 --- a/Mage.Sets/src/mage/cards/d/DeepfireElemental.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DeepwoodDrummer.java b/Mage.Sets/src/mage/cards/d/DeepwoodDrummer.java index 649b6dda03..a3c3a1bff5 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwoodDrummer.java +++ b/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()); diff --git a/Mage.Sets/src/mage/cards/d/DeepwoodElder.java b/Mage.Sets/src/mage/cards/d/DeepwoodElder.java index 78e14d60f6..696355573a 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwoodElder.java +++ b/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)); diff --git a/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java b/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java index 907230e27f..8bed44af19 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java b/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java index 84da3f6e2d..e71bd86a12 100644 --- a/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java +++ b/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))); } diff --git a/Mage.Sets/src/mage/cards/d/DefiantFalcon.java b/Mage.Sets/src/mage/cards/d/DefiantFalcon.java index 471afb147a..5e429047a2 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantFalcon.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DefiantVanguard.java b/Mage.Sets/src/mage/cards/d/DefiantVanguard.java index 380b596fb2..784d4cbfbe 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantVanguard.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DefilingTears.java b/Mage.Sets/src/mage/cards/d/DefilingTears.java index ff51ae96df..a36172f4bc 100644 --- a/Mage.Sets/src/mage/cards/d/DefilingTears.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DeftbladeElite.java b/Mage.Sets/src/mage/cards/d/DeftbladeElite.java index c820be15f5..94416a016c 100644 --- a/Mage.Sets/src/mage/cards/d/DeftbladeElite.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DefyGravity.java b/Mage.Sets/src/mage/cards/d/DefyGravity.java index 7c94505a3d..655ee1e4ee 100644 --- a/Mage.Sets/src/mage/cards/d/DefyGravity.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DeityOfScars.java b/Mage.Sets/src/mage/cards/d/DeityOfScars.java index c65aed8f49..7e474c8917 100644 --- a/Mage.Sets/src/mage/cards/d/DeityOfScars.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/Dematerialize.java b/Mage.Sets/src/mage/cards/d/Dematerialize.java index 8a42a17c84..f193d5cdaa 100644 --- a/Mage.Sets/src/mage/cards/d/Dematerialize.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DementiaBat.java b/Mage.Sets/src/mage/cards/d/DementiaBat.java index 1c5e09a9ff..5d837c6f66 100644 --- a/Mage.Sets/src/mage/cards/d/DementiaBat.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DemonOfDarkSchemes.java b/Mage.Sets/src/mage/cards/d/DemonOfDarkSchemes.java index 241a961f7e..d614a12523 100644 --- a/Mage.Sets/src/mage/cards/d/DemonOfDarkSchemes.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DemonicHordes.java b/Mage.Sets/src/mage/cards/d/DemonicHordes.java index 671d3e4cbe..1501e53464 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicHordes.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DemonspineWhip.java b/Mage.Sets/src/mage/cards/d/DemonspineWhip.java index ab9d739b9c..62441f4e9d 100644 --- a/Mage.Sets/src/mage/cards/d/DemonspineWhip.java +++ b/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)); diff --git a/Mage.Sets/src/mage/cards/d/DenOfTheBugbear.java b/Mage.Sets/src/mage/cards/d/DenOfTheBugbear.java index dbd3d42248..b30cda1d7d 100644 --- a/Mage.Sets/src/mage/cards/d/DenOfTheBugbear.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DenProtector.java b/Mage.Sets/src/mage/cards/d/DenProtector.java index 2992d44ee3..33c9a8ac8b 100644 --- a/Mage.Sets/src/mage/cards/d/DenProtector.java +++ b/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()); diff --git a/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java b/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java index b71b3ed882..e640492092 100644 --- a/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DerangedOutcast.java b/Mage.Sets/src/mage/cards/d/DerangedOutcast.java index b86d7b900a..fe540f0e6f 100644 --- a/Mage.Sets/src/mage/cards/d/DerangedOutcast.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DereviEmpyrialTactician.java b/Mage.Sets/src/mage/cards/d/DereviEmpyrialTactician.java index 525bd894a5..685e5f46ff 100644 --- a/Mage.Sets/src/mage/cards/d/DereviEmpyrialTactician.java +++ b/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 diff --git a/Mage.Sets/src/mage/cards/d/Dermoplasm.java b/Mage.Sets/src/mage/cards/d/Dermoplasm.java index 43a4dc73f5..56f81e96d2 100644 --- a/Mage.Sets/src/mage/cards/d/Dermoplasm.java +++ b/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())); diff --git a/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java b/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java index d907dc94c7..94524962e6 100644 --- a/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DesertCerodon.java b/Mage.Sets/src/mage/cards/d/DesertCerodon.java index 5adafe2017..fa5db7487b 100644 --- a/Mage.Sets/src/mage/cards/d/DesertCerodon.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DesertOfTheFervent.java b/Mage.Sets/src/mage/cards/d/DesertOfTheFervent.java index 5e2fbcd59c..c5eb6ee126 100644 --- a/Mage.Sets/src/mage/cards/d/DesertOfTheFervent.java +++ b/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}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DesertOfTheGlorified.java b/Mage.Sets/src/mage/cards/d/DesertOfTheGlorified.java index b213ab0f0a..ac86b330d5 100644 --- a/Mage.Sets/src/mage/cards/d/DesertOfTheGlorified.java +++ b/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}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DesertOfTheIndomitable.java b/Mage.Sets/src/mage/cards/d/DesertOfTheIndomitable.java index d519069c6f..8c46baf82e 100644 --- a/Mage.Sets/src/mage/cards/d/DesertOfTheIndomitable.java +++ 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}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DesertOfTheMindful.java b/Mage.Sets/src/mage/cards/d/DesertOfTheMindful.java index b42557a8eb..2c2052e83f 100644 --- a/Mage.Sets/src/mage/cards/d/DesertOfTheMindful.java +++ b/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}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DesertOfTheTrue.java b/Mage.Sets/src/mage/cards/d/DesertOfTheTrue.java index 0187b8b8ee..69c20d4ed7 100644 --- a/Mage.Sets/src/mage/cards/d/DesertOfTheTrue.java +++ b/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}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DesertedTemple.java b/Mage.Sets/src/mage/cards/d/DesertedTemple.java index ad19619563..0c716417af 100644 --- a/Mage.Sets/src/mage/cards/d/DesertedTemple.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/d/DesiccatedNaga.java b/Mage.Sets/src/mage/cards/d/DesiccatedNaga.java index bc33a5a36b..6584ac0e78 100644 --- a/Mage.Sets/src/mage/cards/d/DesiccatedNaga.java +++ b/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()); diff --git a/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java b/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java index 7340ec9877..e56a4cdea9 100644 --- a/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java +++ b/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java @@ -26,7 +26,7 @@ public final class DesolateLighthouse extends CardImpl { // {1}{U}{R}, {tap}: Draw a card, then discard a card. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), - new ManaCostsImpl("{1}{U}{R}")); + new ManaCostsImpl<>("{1}{U}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DesperateRavings.java b/Mage.Sets/src/mage/cards/d/DesperateRavings.java index 868562aad8..eff7170a7b 100644 --- a/Mage.Sets/src/mage/cards/d/DesperateRavings.java +++ b/Mage.Sets/src/mage/cards/d/DesperateRavings.java @@ -29,7 +29,7 @@ public final class DesperateRavings extends CardImpl { // Draw two cards, then discard a card at random. this.getSpellAbility().addEffect(new DesperateRavingsEffect()); // Flashback {2}{U} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{2}{U}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{2}{U}"))); } private DesperateRavings(final DesperateRavings card) { diff --git a/Mage.Sets/src/mage/cards/d/DestinySpinner.java b/Mage.Sets/src/mage/cards/d/DestinySpinner.java index b6097bff20..b520c321f5 100644 --- a/Mage.Sets/src/mage/cards/d/DestinySpinner.java +++ b/Mage.Sets/src/mage/cards/d/DestinySpinner.java @@ -55,7 +55,7 @@ public final class DestinySpinner extends CardImpl { ))); // {3}{G}: Target land you control becomes an X/X Elemental creature with trample and haste until end of turn, where X is the number of enchantments you control. It's still a land. - Ability ability = new SimpleActivatedAbility(new DestinySpinnerEffect(), new ManaCostsImpl("{3}{G}")); + Ability ability = new SimpleActivatedAbility(new DestinySpinnerEffect(), new ManaCostsImpl<>("{3}{G}")); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND)); ability.addHint(new ValueHint("Enchantments you control", DestinySpinnerCount.instance)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DetainmentSpell.java b/Mage.Sets/src/mage/cards/d/DetainmentSpell.java index 41e15edeed..21845e373f 100644 --- a/Mage.Sets/src/mage/cards/d/DetainmentSpell.java +++ b/Mage.Sets/src/mage/cards/d/DetainmentSpell.java @@ -40,7 +40,7 @@ public final class DetainmentSpell extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantActivateAbilitiesAttachedEffect())); // {1}{W}: Attach Detainment Spell to target creature. - ability = new SimpleActivatedAbility(new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature"), new ManaCostsImpl("{1}{W}")); + ability = new SimpleActivatedAbility(new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature"), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/Detritivore.java b/Mage.Sets/src/mage/cards/d/Detritivore.java index ed04f93a18..26494838a1 100644 --- a/Mage.Sets/src/mage/cards/d/Detritivore.java +++ b/Mage.Sets/src/mage/cards/d/Detritivore.java @@ -44,7 +44,7 @@ public final class Detritivore extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new NonBasicLandsInOpponentsGraveyards(), Duration.EndOfGame))); // Suspend X-{X}{3}{R}. X can't be 0. - this.addAbility(new SuspendAbility(Integer.MAX_VALUE, new ManaCostsImpl("{3}{R}"), this, true)); + this.addAbility(new SuspendAbility(Integer.MAX_VALUE, new ManaCostsImpl<>("{3}{R}"), this, true)); // Whenever a time counter is removed from Detritivore while it's exiled, destroy target nonbasic land. this.addAbility(new DetritivoreTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/d/DevastationTide.java b/Mage.Sets/src/mage/cards/d/DevastationTide.java index 97cb2d559d..9c5a969fbd 100644 --- a/Mage.Sets/src/mage/cards/d/DevastationTide.java +++ b/Mage.Sets/src/mage/cards/d/DevastationTide.java @@ -23,7 +23,7 @@ public final class DevastationTide extends CardImpl { this.getSpellAbility().addEffect(new ReturnToHandFromBattlefieldAllEffect(new FilterNonlandPermanent("nonland permanents"))); // Miracle {1}{U} - this.addAbility(new MiracleAbility(this, new ManaCostsImpl("{1}{U}"))); + this.addAbility(new MiracleAbility(this, new ManaCostsImpl<>("{1}{U}"))); } private DevastationTide(final DevastationTide card) { diff --git a/Mage.Sets/src/mage/cards/d/DeviantGlee.java b/Mage.Sets/src/mage/cards/d/DeviantGlee.java index c9bc62b3f6..8613c42bb1 100644 --- a/Mage.Sets/src/mage/cards/d/DeviantGlee.java +++ b/Mage.Sets/src/mage/cards/d/DeviantGlee.java @@ -41,7 +41,7 @@ public final class DeviantGlee extends CardImpl { // Enchanted creature gets +2/+1 and has "{R}: This creature gains trample until end of turn." SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(),Duration.EndOfTurn),new ManaCostsImpl("{R}")); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(),Duration.EndOfTurn),new ManaCostsImpl<>("{R}")); ability2.addEffect(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/d/DevilsPlay.java b/Mage.Sets/src/mage/cards/d/DevilsPlay.java index 15b3150a29..b25a36186e 100644 --- a/Mage.Sets/src/mage/cards/d/DevilsPlay.java +++ b/Mage.Sets/src/mage/cards/d/DevilsPlay.java @@ -26,7 +26,7 @@ public final class DevilsPlay extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(ManacostVariableValue.REGULAR)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Flashback {X}{R}{R}{R} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{X}{R}{R}{R}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{X}{R}{R}{R}"))); } private DevilsPlay(final DevilsPlay card) { diff --git a/Mage.Sets/src/mage/cards/d/DevkarinDissident.java b/Mage.Sets/src/mage/cards/d/DevkarinDissident.java index e9870b554a..36fc25a538 100644 --- a/Mage.Sets/src/mage/cards/d/DevkarinDissident.java +++ b/Mage.Sets/src/mage/cards/d/DevkarinDissident.java @@ -30,7 +30,7 @@ public final class DevkarinDissident extends CardImpl { this.addAbility(new SimpleActivatedAbility( Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), - new ManaCostsImpl("{4}{G}") + new ManaCostsImpl<>("{4}{G}") )); } diff --git a/Mage.Sets/src/mage/cards/d/DevotedCaretaker.java b/Mage.Sets/src/mage/cards/d/DevotedCaretaker.java index 671e94d3c1..91fd0ca7f2 100644 --- a/Mage.Sets/src/mage/cards/d/DevotedCaretaker.java +++ b/Mage.Sets/src/mage/cards/d/DevotedCaretaker.java @@ -41,7 +41,7 @@ public final class DevotedCaretaker extends CardImpl { this.toughness = new MageInt(2); // {W}, {tap}: Target permanent you control gains protection from instant spells and from sorcery spells until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ProtectionAbility(filter), Duration.EndOfTurn), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ProtectionAbility(filter), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); Target target = new TargetControlledPermanent(); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/d/DevoteeOfStrength.java b/Mage.Sets/src/mage/cards/d/DevoteeOfStrength.java index fd5db12ff2..6df53cc15a 100644 --- a/Mage.Sets/src/mage/cards/d/DevoteeOfStrength.java +++ b/Mage.Sets/src/mage/cards/d/DevoteeOfStrength.java @@ -29,7 +29,7 @@ public final class DevoteeOfStrength extends CardImpl { this.toughness = new MageInt(2); // {4}{G}: Target creature gets +2/+2 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2,2,Duration.EndOfTurn), new ManaCostsImpl("{4}{G}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2,2,Duration.EndOfTurn), new ManaCostsImpl<>("{4}{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DevourerOfMemory.java b/Mage.Sets/src/mage/cards/d/DevourerOfMemory.java index b5ef315d69..23cd7db72f 100644 --- a/Mage.Sets/src/mage/cards/d/DevourerOfMemory.java +++ b/Mage.Sets/src/mage/cards/d/DevourerOfMemory.java @@ -37,7 +37,7 @@ public final class DevourerOfMemory extends CardImpl { // {1}{U}{B}: Put the top card of your library into your graveyard. this.addAbility(new SimpleActivatedAbility( - new MillCardsControllerEffect(1), new ManaCostsImpl("{1}{U}{B}") + new MillCardsControllerEffect(1), new ManaCostsImpl<>("{1}{U}{B}") )); } diff --git a/Mage.Sets/src/mage/cards/d/DevoutWitness.java b/Mage.Sets/src/mage/cards/d/DevoutWitness.java index 743a395f36..61a46a0288 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutWitness.java +++ b/Mage.Sets/src/mage/cards/d/DevoutWitness.java @@ -33,7 +33,7 @@ public final class DevoutWitness extends CardImpl { this.toughness = new MageInt(2); // {1}{W}, {tap}, Discard a card: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/cards/d/DiamondFaerie.java b/Mage.Sets/src/mage/cards/d/DiamondFaerie.java index e623df3714..a06930521a 100644 --- a/Mage.Sets/src/mage/cards/d/DiamondFaerie.java +++ b/Mage.Sets/src/mage/cards/d/DiamondFaerie.java @@ -39,7 +39,7 @@ public final class DiamondFaerie extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{S}: Snow creatures you control get +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, - Duration.EndOfTurn, filter), new ManaCostsImpl("{1}{S}"))); + Duration.EndOfTurn, filter), new ManaCostsImpl<>("{1}{S}"))); } private DiamondFaerie(final DiamondFaerie card) { diff --git a/Mage.Sets/src/mage/cards/d/Dichotomancy.java b/Mage.Sets/src/mage/cards/d/Dichotomancy.java index b1f8556a55..4f492ff0b1 100644 --- a/Mage.Sets/src/mage/cards/d/Dichotomancy.java +++ b/Mage.Sets/src/mage/cards/d/Dichotomancy.java @@ -35,7 +35,7 @@ public final class Dichotomancy extends CardImpl { this.getSpellAbility().addTarget(new TargetOpponent()); // Suspend 3-{1}{U}{U} - this.addAbility(new SuspendAbility(3, new ManaCostsImpl("{1}{U}{U}"), this)); + this.addAbility(new SuspendAbility(3, new ManaCostsImpl<>("{1}{U}{U}"), this)); } private Dichotomancy(final Dichotomancy card) { diff --git a/Mage.Sets/src/mage/cards/d/Didgeridoo.java b/Mage.Sets/src/mage/cards/d/Didgeridoo.java index 7ca992d40d..e03be87bd8 100644 --- a/Mage.Sets/src/mage/cards/d/Didgeridoo.java +++ b/Mage.Sets/src/mage/cards/d/Didgeridoo.java @@ -28,7 +28,7 @@ public final class Didgeridoo extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {3}: You may put a Minotaur permanent card from your hand onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl("{3}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{3}"))); } private Didgeridoo(final Didgeridoo card) { diff --git a/Mage.Sets/src/mage/cards/d/DiligentFarmhand.java b/Mage.Sets/src/mage/cards/d/DiligentFarmhand.java index 5e835e0ed6..14fc56a0f4 100644 --- a/Mage.Sets/src/mage/cards/d/DiligentFarmhand.java +++ b/Mage.Sets/src/mage/cards/d/DiligentFarmhand.java @@ -31,7 +31,7 @@ public final class DiligentFarmhand extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, Sacrifice Diligent Farmhand: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); // If Diligent Farmhand is in a graveyard, effects from spells named Muscle Burst count it as a card named Muscle Burst. diff --git a/Mage.Sets/src/mage/cards/d/DimensionalInfiltrator.java b/Mage.Sets/src/mage/cards/d/DimensionalInfiltrator.java index a2da9b106a..9e8d6d07fa 100644 --- a/Mage.Sets/src/mage/cards/d/DimensionalInfiltrator.java +++ b/Mage.Sets/src/mage/cards/d/DimensionalInfiltrator.java @@ -43,7 +43,7 @@ public final class DimensionalInfiltrator extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{C}: Exile the top card of target opponent's library. If it's a land card, you may return Dimensional Infiltrator to its owner's hand. - Ability ability = new SimpleActivatedAbility(new DimensionalInfiltratorEffect(), new ManaCostsImpl("{1}{C}")); + Ability ability = new SimpleActivatedAbility(new DimensionalInfiltratorEffect(), new ManaCostsImpl<>("{1}{C}")); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DimirCluestone.java b/Mage.Sets/src/mage/cards/d/DimirCluestone.java index 77ad0e6a59..22ae90229f 100644 --- a/Mage.Sets/src/mage/cards/d/DimirCluestone.java +++ b/Mage.Sets/src/mage/cards/d/DimirCluestone.java @@ -32,7 +32,7 @@ public final class DimirCluestone extends CardImpl { this.addAbility(new BlackManaAbility()); // {U}{B}, {T}, Sacrifice Dimir Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{U}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DimirDoppelganger.java b/Mage.Sets/src/mage/cards/d/DimirDoppelganger.java index 6895c475f8..b6ae6b14dc 100644 --- a/Mage.Sets/src/mage/cards/d/DimirDoppelganger.java +++ b/Mage.Sets/src/mage/cards/d/DimirDoppelganger.java @@ -37,7 +37,7 @@ public final class DimirDoppelganger extends CardImpl { this.toughness = new MageInt(2); // {1}{U}{B}: Exile target creature card from a graveyard. Dimir Doppelganger becomes a copy of that card, except it has this ability. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DimirDoppelgangerEffect(), new ManaCostsImpl("{1}{U}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DimirDoppelgangerEffect(), new ManaCostsImpl<>("{1}{U}{B}")); ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard"))); this.addAbility(ability); @@ -102,7 +102,7 @@ class DimirDoppelgangerCopyApplier extends CopyApplier { @Override public boolean apply(Game game, MageObject blueprint, Ability source, UUID copyToObjectId) { - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DimirDoppelgangerEffect(), new ManaCostsImpl("{1}{U}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DimirDoppelgangerEffect(), new ManaCostsImpl<>("{1}{U}{B}")); ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard"))); blueprint.getAbilities().add(ability); return true; diff --git a/Mage.Sets/src/mage/cards/d/DimirGuildmage.java b/Mage.Sets/src/mage/cards/d/DimirGuildmage.java index d18972024c..77dee0a147 100644 --- a/Mage.Sets/src/mage/cards/d/DimirGuildmage.java +++ b/Mage.Sets/src/mage/cards/d/DimirGuildmage.java @@ -30,11 +30,11 @@ public final class DimirGuildmage extends CardImpl { this.toughness = new MageInt(2); // {3}{U}: Target player draws a card. Activate this ability only any time you could cast a sorcery. - Ability firstAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(1), new ManaCostsImpl("{3}{U}")); + Ability firstAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(1), new ManaCostsImpl<>("{3}{U}")); firstAbility.addTarget(new TargetPlayer()); this.addAbility(firstAbility); // {3}{B}: Target player discards a card. Activate this ability only any time you could cast a sorcery. - Ability secondAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{3}{B}")); + Ability secondAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl<>("{3}{B}")); secondAbility.addTarget(new TargetPlayer()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/cards/d/DimirKeyrune.java b/Mage.Sets/src/mage/cards/d/DimirKeyrune.java index 975268f3fb..1493e2e4a3 100644 --- a/Mage.Sets/src/mage/cards/d/DimirKeyrune.java +++ b/Mage.Sets/src/mage/cards/d/DimirKeyrune.java @@ -35,7 +35,7 @@ public final class DimirKeyrune extends CardImpl { .withColor("UB") .withSubType(SubType.HORROR) .withAbility(new CantBeBlockedSourceAbility()), - "", Duration.EndOfTurn), new ManaCostsImpl("{U}{B}"))); + "", Duration.EndOfTurn), new ManaCostsImpl<>("{U}{B}"))); } private DimirKeyrune(final DimirKeyrune card) { diff --git a/Mage.Sets/src/mage/cards/d/DimirLocket.java b/Mage.Sets/src/mage/cards/d/DimirLocket.java index 792f179c4d..24a34b0d90 100644 --- a/Mage.Sets/src/mage/cards/d/DimirLocket.java +++ b/Mage.Sets/src/mage/cards/d/DimirLocket.java @@ -29,7 +29,7 @@ public final class DimirLocket extends CardImpl { // {U/B}{U/B}{U/B}{U/B}, {T}, Sacrifice Dimir Locket: Draw two cards. Ability ability = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(2), - new ManaCostsImpl("{U/B}{U/B}{U/B}{U/B}") + new ManaCostsImpl<>("{U/B}{U/B}{U/B}{U/B}") ); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java b/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java index 2b4a67ffa6..5e8d1d1178 100644 --- a/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java +++ b/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java @@ -39,7 +39,7 @@ public final class DiplomaticEscort extends CardImpl { this.toughness = new MageInt(1); // {U}, {tap}, Discard a card: Counter target spell or ability that targets a creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetStackObject(filter)); diff --git a/Mage.Sets/src/mage/cards/d/DireWolfProwler.java b/Mage.Sets/src/mage/cards/d/DireWolfProwler.java index c721e60a4e..54b7602017 100644 --- a/Mage.Sets/src/mage/cards/d/DireWolfProwler.java +++ b/Mage.Sets/src/mage/cards/d/DireWolfProwler.java @@ -32,7 +32,7 @@ public final class DireWolfProwler extends CardImpl { Ability ability = new LimitedTimesPerTurnActivatedAbility( Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn).setText("{this} gets +2/+2"), - new ManaCostsImpl("{1}{G}") + new ManaCostsImpl<>("{1}{G}") ); ability.addEffect(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn) .setText("and gains haste until end of turn") diff --git a/Mage.Sets/src/mage/cards/d/DirgeOfDread.java b/Mage.Sets/src/mage/cards/d/DirgeOfDread.java index 7e763e2f75..61bb2992a7 100644 --- a/Mage.Sets/src/mage/cards/d/DirgeOfDread.java +++ b/Mage.Sets/src/mage/cards/d/DirgeOfDread.java @@ -28,7 +28,7 @@ public final class DirgeOfDread extends CardImpl { // All creatures gain fear until end of turn. this.getSpellAbility().addEffect(new GainAbilityAllEffect(FearAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_ALL_CREATURES)); // Cycling {1}{B} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{B}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{B}"))); // When you cycle Dirge of Dread, you may have target creature gain fear until end of turn. Ability ability = new CycleTriggeredAbility(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), true); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/d/DirgurNemesis.java b/Mage.Sets/src/mage/cards/d/DirgurNemesis.java index 5d4abc3ec8..d6c0be9558 100644 --- a/Mage.Sets/src/mage/cards/d/DirgurNemesis.java +++ b/Mage.Sets/src/mage/cards/d/DirgurNemesis.java @@ -26,7 +26,7 @@ public final class DirgurNemesis extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // Megamorph {6}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{6}{U}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{6}{U}"), true)); } private DirgurNemesis(final DirgurNemesis card) { diff --git a/Mage.Sets/src/mage/cards/d/DirtwaterWraith.java b/Mage.Sets/src/mage/cards/d/DirtwaterWraith.java index 40c5a3c1e3..f866461f07 100644 --- a/Mage.Sets/src/mage/cards/d/DirtwaterWraith.java +++ b/Mage.Sets/src/mage/cards/d/DirtwaterWraith.java @@ -30,7 +30,7 @@ public final class DirtwaterWraith extends CardImpl { this.addAbility(new SwampwalkAbility()); // {B}: Dirtwater Wraith gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private DirtwaterWraith(final DirtwaterWraith card) { diff --git a/Mage.Sets/src/mage/cards/d/DirtyWererat.java b/Mage.Sets/src/mage/cards/d/DirtyWererat.java index 10974461a1..7714173236 100644 --- a/Mage.Sets/src/mage/cards/d/DirtyWererat.java +++ b/Mage.Sets/src/mage/cards/d/DirtyWererat.java @@ -39,7 +39,7 @@ public final class DirtyWererat extends CardImpl { this.toughness = new MageInt(3); // {B}, Discard a card: Regenerate Dirty Wererat. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/Disappear.java b/Mage.Sets/src/mage/cards/d/Disappear.java index e0af242b0b..fbfca8f0aa 100644 --- a/Mage.Sets/src/mage/cards/d/Disappear.java +++ b/Mage.Sets/src/mage/cards/d/Disappear.java @@ -38,7 +38,7 @@ public final class Disappear extends CardImpl { this.addAbility(ability); // {U}: Return enchanted creature and Disappear to their owners' hands. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DisappearEffect(), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DisappearEffect(), new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfGrace.java b/Mage.Sets/src/mage/cards/d/DiscipleOfGrace.java index 58b2ecd0d0..d0a671dc2d 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfGrace.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfGrace.java @@ -30,7 +30,7 @@ public final class DiscipleOfGrace extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.BLACK)); // Cycling {2} ({2}, Discard this card: Draw a card.) - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private DiscipleOfGrace(final DiscipleOfGrace card) { diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfKangee.java b/Mage.Sets/src/mage/cards/d/DiscipleOfKangee.java index 4c3eaf5a45..a6d157aada 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfKangee.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfKangee.java @@ -36,7 +36,7 @@ public final class DiscipleOfKangee extends CardImpl { // {U}, {T}: Target creature gains flying and becomes blue until end of turn. Effect effect = new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("Target creature gains flying"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{U}")); effect = new BecomesColorTargetEffect(ObjectColor.BLUE, Duration.EndOfTurn); effect.setText("and becomes blue until end of turn."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfLaw.java b/Mage.Sets/src/mage/cards/d/DiscipleOfLaw.java index 52f3c5a625..470e17345a 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfLaw.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfLaw.java @@ -27,7 +27,7 @@ public final class DiscipleOfLaw extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); this.addAbility(ProtectionAbility.from(ObjectColor.RED)); - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private DiscipleOfLaw(final DiscipleOfLaw card) { diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfMalice.java b/Mage.Sets/src/mage/cards/d/DiscipleOfMalice.java index b297e999a5..e6a99d8b57 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfMalice.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfMalice.java @@ -28,7 +28,7 @@ public final class DiscipleOfMalice extends CardImpl { // Protection from white this.addAbility(ProtectionAbility.from(ObjectColor.WHITE)); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private DiscipleOfMalice(final DiscipleOfMalice card) { diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfTeveshSzat.java b/Mage.Sets/src/mage/cards/d/DiscipleOfTeveshSzat.java index cbd8160224..c928697d6c 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfTeveshSzat.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfTeveshSzat.java @@ -35,7 +35,7 @@ public final class DiscipleOfTeveshSzat extends CardImpl { ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {4}{B}{B}, {tap}, Sacrifice Disciple of Tevesh Szat: Target creature gets -6/-6 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-6, -6, Duration.EndOfTurn), new ManaCostsImpl("{4}{B}{B}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-6, -6, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{B}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfTheOldWays.java b/Mage.Sets/src/mage/cards/d/DiscipleOfTheOldWays.java index 9d42ea53bd..fb2e1e61b8 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfTheOldWays.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfTheOldWays.java @@ -29,7 +29,7 @@ public final class DiscipleOfTheOldWays extends CardImpl { this.toughness = new MageInt(2); // {R}: Disciple of the Old Ways gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private DiscipleOfTheOldWays(final DiscipleOfTheOldWays card) { diff --git a/Mage.Sets/src/mage/cards/d/Discontinuity.java b/Mage.Sets/src/mage/cards/d/Discontinuity.java index 3f3a039594..23fcadd095 100644 --- a/Mage.Sets/src/mage/cards/d/Discontinuity.java +++ b/Mage.Sets/src/mage/cards/d/Discontinuity.java @@ -23,7 +23,7 @@ public final class Discontinuity extends CardImpl { // As long as it's your turn, this spell costs {2}{U}{U} less to cast. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SpellCostReductionSourceEffect( - new ManaCostsImpl("{2}{U}{U}"), MyTurnCondition.instance + new ManaCostsImpl<>("{2}{U}{U}"), MyTurnCondition.instance ).setText("as long as it's your turn, this spell costs {2}{U}{U} less to cast")) .setRuleAtTheTop(true) .addHint(MyTurnHint.instance)); diff --git a/Mage.Sets/src/mage/cards/d/DiscordantDirge.java b/Mage.Sets/src/mage/cards/d/DiscordantDirge.java index e9a8f6928d..908df03e1d 100644 --- a/Mage.Sets/src/mage/cards/d/DiscordantDirge.java +++ b/Mage.Sets/src/mage/cards/d/DiscordantDirge.java @@ -39,7 +39,7 @@ public final class DiscordantDirge extends CardImpl { // {B}, Sacrifice Discordant Dirge: Look at target opponent's hand and choose up to X cards from it, where X is the number of verse counters on Discordant Dirge. That player discards those cards. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscordantDirgeEffect(), - new ManaCostsImpl("{B}")); + new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DismantlingWave.java b/Mage.Sets/src/mage/cards/d/DismantlingWave.java index f38f154db1..1f3b0c05ad 100644 --- a/Mage.Sets/src/mage/cards/d/DismantlingWave.java +++ b/Mage.Sets/src/mage/cards/d/DismantlingWave.java @@ -36,7 +36,7 @@ public final class DismantlingWave extends CardImpl { this.getSpellAbility().setTargetAdjuster(DismantlingWaveAdjuster.instance); // Cycling {6}{W}{W} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{6}{W}{W}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{6}{W}{W}"))); // When you cycle Dismantling Wave, destroy all artifacts and enchantments. this.addAbility(new CycleTriggeredAbility(new DestroyAllEffect(filter))); diff --git a/Mage.Sets/src/mage/cards/d/DismissivePyromancer.java b/Mage.Sets/src/mage/cards/d/DismissivePyromancer.java index d6edecfaf5..5d3897d938 100644 --- a/Mage.Sets/src/mage/cards/d/DismissivePyromancer.java +++ b/Mage.Sets/src/mage/cards/d/DismissivePyromancer.java @@ -35,7 +35,7 @@ public final class DismissivePyromancer extends CardImpl { Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), - new ManaCostsImpl("{R}") + new ManaCostsImpl<>("{R}") ); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); @@ -45,7 +45,7 @@ public final class DismissivePyromancer extends CardImpl { ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, new DamageTargetEffect(4, "it"), - new ManaCostsImpl("{2}{R}") + new ManaCostsImpl<>("{2}{R}") ); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DisownedAncestor.java b/Mage.Sets/src/mage/cards/d/DisownedAncestor.java index d5f2c56bae..6e1179cf49 100644 --- a/Mage.Sets/src/mage/cards/d/DisownedAncestor.java +++ b/Mage.Sets/src/mage/cards/d/DisownedAncestor.java @@ -25,7 +25,7 @@ public final class DisownedAncestor extends CardImpl { this.toughness = new MageInt(4); // Outlast {1}{B} - this.addAbility(new OutlastAbility(new ManaCostsImpl("{1}{B}"))); + this.addAbility(new OutlastAbility(new ManaCostsImpl<>("{1}{B}"))); } private DisownedAncestor(final DisownedAncestor card) { diff --git a/Mage.Sets/src/mage/cards/d/DispellersCapsule.java b/Mage.Sets/src/mage/cards/d/DispellersCapsule.java index 0aa5903158..fe1f7c3260 100644 --- a/Mage.Sets/src/mage/cards/d/DispellersCapsule.java +++ b/Mage.Sets/src/mage/cards/d/DispellersCapsule.java @@ -26,7 +26,7 @@ public final class DispellersCapsule extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{W}"); // {2}{W}, {T}, Sacrifice Dispeller's Capsule: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/cards/d/DispersingOrb.java b/Mage.Sets/src/mage/cards/d/DispersingOrb.java index 321ca4d353..2a7688dba1 100644 --- a/Mage.Sets/src/mage/cards/d/DispersingOrb.java +++ b/Mage.Sets/src/mage/cards/d/DispersingOrb.java @@ -24,7 +24,7 @@ public final class DispersingOrb extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{U}{U}"); // {3}{U}, Sacrifice a permanent: Return target permanent to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{3}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent())); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DisruptingScepter.java b/Mage.Sets/src/mage/cards/d/DisruptingScepter.java index a212062348..c454377209 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptingScepter.java +++ b/Mage.Sets/src/mage/cards/d/DisruptingScepter.java @@ -24,7 +24,7 @@ public final class DisruptingScepter extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {3}, {T}: Target player discards a card. Activate this ability only during your turn. - Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{3}"), MyTurnCondition.instance); + Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl<>("{3}"), MyTurnCondition.instance); ability.addTarget(new TargetPlayer()); ability.addCost(new TapSourceCost()); ability.addHint(MyTurnHint.instance); diff --git a/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java b/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java index 3f08e35f64..cd3bcf9082 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java +++ b/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java @@ -36,7 +36,7 @@ public final class DisruptivePitmage extends CardImpl { this.addAbility(ability); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); } private DisruptivePitmage(final DisruptivePitmage card) { diff --git a/Mage.Sets/src/mage/cards/d/DissentersDeliverance.java b/Mage.Sets/src/mage/cards/d/DissentersDeliverance.java index f138147abf..27cd7f75a1 100644 --- a/Mage.Sets/src/mage/cards/d/DissentersDeliverance.java +++ b/Mage.Sets/src/mage/cards/d/DissentersDeliverance.java @@ -25,7 +25,7 @@ public final class DissentersDeliverance extends CardImpl { getSpellAbility().addTarget(new TargetArtifactPermanent()); // Cycling {G} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{G}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{G}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DistemperOfTheBlood.java b/Mage.Sets/src/mage/cards/d/DistemperOfTheBlood.java index 170a724cdd..d6f91e9083 100644 --- a/Mage.Sets/src/mage/cards/d/DistemperOfTheBlood.java +++ b/Mage.Sets/src/mage/cards/d/DistemperOfTheBlood.java @@ -33,7 +33,7 @@ public final class DistemperOfTheBlood extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Madness {R} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{R}"))); } private DistemperOfTheBlood(final DistemperOfTheBlood card) { diff --git a/Mage.Sets/src/mage/cards/d/DivineCongregation.java b/Mage.Sets/src/mage/cards/d/DivineCongregation.java index 2d60861dc1..6c37ab5ef3 100644 --- a/Mage.Sets/src/mage/cards/d/DivineCongregation.java +++ b/Mage.Sets/src/mage/cards/d/DivineCongregation.java @@ -29,7 +29,7 @@ public final class DivineCongregation extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // Suspend 5-{1}{W} - this.addAbility(new SuspendAbility(5, new ManaCostsImpl("{1}{W}"), this)); + this.addAbility(new SuspendAbility(5, new ManaCostsImpl<>("{1}{W}"), this)); } private DivineCongregation(final DivineCongregation card) { diff --git a/Mage.Sets/src/mage/cards/d/DivineReckoning.java b/Mage.Sets/src/mage/cards/d/DivineReckoning.java index 5155dac6d9..5d27de17c7 100644 --- a/Mage.Sets/src/mage/cards/d/DivineReckoning.java +++ b/Mage.Sets/src/mage/cards/d/DivineReckoning.java @@ -34,7 +34,7 @@ public final class DivineReckoning extends CardImpl { this.getSpellAbility().addEffect(new DivineReckoningEffect()); // Flashback {5}{W}{W} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{5}{W}{W}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{5}{W}{W}"))); } private DivineReckoning(final DivineReckoning card) { diff --git a/Mage.Sets/src/mage/cards/d/DiviningWitch.java b/Mage.Sets/src/mage/cards/d/DiviningWitch.java index 2d2e6ceb1c..a57843f4dd 100644 --- a/Mage.Sets/src/mage/cards/d/DiviningWitch.java +++ b/Mage.Sets/src/mage/cards/d/DiviningWitch.java @@ -35,7 +35,7 @@ public final class DiviningWitch extends CardImpl { this.toughness = new MageInt(1); // {1}{B}, {tap}, Discard a card: Name a card. Exile the top six cards of your library. Reveal cards from the top of your library until you reveal the named card, then put that card into your hand. Exile all other cards revealed this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiviningWitchEffect(), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiviningWitchEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DizzyingGaze.java b/Mage.Sets/src/mage/cards/d/DizzyingGaze.java index 3076c79081..34d46e4a60 100644 --- a/Mage.Sets/src/mage/cards/d/DizzyingGaze.java +++ b/Mage.Sets/src/mage/cards/d/DizzyingGaze.java @@ -49,7 +49,7 @@ public final class DizzyingGaze extends CardImpl { this.addAbility(ability); // {R}: Enchanted creature deals 1 damage to target creature with flying. - Ability ability2 = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl("{R}")); + Ability ability2 = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability2.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(new SimpleStaticAbility( Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/d/DjerusRenunciation.java b/Mage.Sets/src/mage/cards/d/DjerusRenunciation.java index 7241cf666b..9417c9daf2 100644 --- a/Mage.Sets/src/mage/cards/d/DjerusRenunciation.java +++ b/Mage.Sets/src/mage/cards/d/DjerusRenunciation.java @@ -24,7 +24,7 @@ public final class DjerusRenunciation extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2)); // Cycling {W} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{W}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{W}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DjerusResolve.java b/Mage.Sets/src/mage/cards/d/DjerusResolve.java index 0ad7a36a09..2c85e78e50 100644 --- a/Mage.Sets/src/mage/cards/d/DjerusResolve.java +++ b/Mage.Sets/src/mage/cards/d/DjerusResolve.java @@ -34,7 +34,7 @@ public final class DjerusResolve extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DjinnOfWishes.java b/Mage.Sets/src/mage/cards/d/DjinnOfWishes.java index 18ca612249..0844d9c203 100644 --- a/Mage.Sets/src/mage/cards/d/DjinnOfWishes.java +++ b/Mage.Sets/src/mage/cards/d/DjinnOfWishes.java @@ -41,7 +41,7 @@ public final class DjinnOfWishes extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.WISH.createInstance(3)), "with three wish counters on it")); // {2}{U}{U}, Remove a wish counter from Djinn of Wishes: Reveal the top card of your library. You may play that card without paying its mana cost. If you don't, exile it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DjinnOfWishesEffect(), new ManaCostsImpl("{2}{U}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DjinnOfWishesEffect(), new ManaCostsImpl<>("{2}{U}{U}")); ability.addCost(new RemoveCountersSourceCost(CounterType.WISH.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DoorToNothingness.java b/Mage.Sets/src/mage/cards/d/DoorToNothingness.java index 694ed0cbe9..37e5ab54aa 100644 --- a/Mage.Sets/src/mage/cards/d/DoorToNothingness.java +++ b/Mage.Sets/src/mage/cards/d/DoorToNothingness.java @@ -31,7 +31,7 @@ public final class DoorToNothingness extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // {W}{W}{U}{U}{B}{B}{R}{R}{G}{G}, {tap}, Sacrifice Door to Nothingness: Target player loses the game. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DoorToNothingnessEffect(), new ManaCostsImpl("{W}{W}{U}{U}{B}{B}{R}{R}{G}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DoorToNothingnessEffect(), new ManaCostsImpl<>("{W}{W}{U}{U}{B}{B}{R}{R}{G}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/d/Doorkeeper.java b/Mage.Sets/src/mage/cards/d/Doorkeeper.java index cb4ceaa015..b1e233cc0b 100644 --- a/Mage.Sets/src/mage/cards/d/Doorkeeper.java +++ b/Mage.Sets/src/mage/cards/d/Doorkeeper.java @@ -42,7 +42,7 @@ public final class Doorkeeper extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {2}{U}, {T}: Target player puts the top X cards of their library into their graveyard, where X is the number of creatures with defender you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DoublingCube.java b/Mage.Sets/src/mage/cards/d/DoublingCube.java index 3cb7bcb850..f908bf645a 100644 --- a/Mage.Sets/src/mage/cards/d/DoublingCube.java +++ b/Mage.Sets/src/mage/cards/d/DoublingCube.java @@ -27,7 +27,7 @@ public final class DoublingCube extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {3}, {T}: Double the amount of each type of mana in your mana pool. - Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new DoublingCubeEffect(), new ManaCostsImpl("{3}")) + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new DoublingCubeEffect(), new ManaCostsImpl<>("{3}")) .setPoolDependant(true); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/Douse.java b/Mage.Sets/src/mage/cards/d/Douse.java index 93e0e990f4..a5cf85e45d 100644 --- a/Mage.Sets/src/mage/cards/d/Douse.java +++ b/Mage.Sets/src/mage/cards/d/Douse.java @@ -30,7 +30,7 @@ public final class Douse extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}"); // {1}{U}: Counter target red spell. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl("{1}{U}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/Downdraft.java b/Mage.Sets/src/mage/cards/d/Downdraft.java index 9067f89fb7..0dca305e0a 100644 --- a/Mage.Sets/src/mage/cards/d/Downdraft.java +++ b/Mage.Sets/src/mage/cards/d/Downdraft.java @@ -36,7 +36,7 @@ public final class Downdraft extends CardImpl { // {G}: Target creature loses flying until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), - new ManaCostsImpl("{G}")); + new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/Downsize.java b/Mage.Sets/src/mage/cards/d/Downsize.java index e91c97ca90..197021b820 100644 --- a/Mage.Sets/src/mage/cards/d/Downsize.java +++ b/Mage.Sets/src/mage/cards/d/Downsize.java @@ -26,7 +26,7 @@ public final class Downsize extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(-4, 0, Duration.EndOfTurn)); // Overload {2}{U} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.") - this.addAbility(new OverloadAbility(this, new BoostAllEffect(-4, 0, Duration.EndOfTurn, StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL, false), new ManaCostsImpl("{2}{U}"))); + this.addAbility(new OverloadAbility(this, new BoostAllEffect(-4, 0, Duration.EndOfTurn, StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL, false), new ManaCostsImpl<>("{2}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DragonArch.java b/Mage.Sets/src/mage/cards/d/DragonArch.java index 42d315b4d9..72d0df30bd 100644 --- a/Mage.Sets/src/mage/cards/d/DragonArch.java +++ b/Mage.Sets/src/mage/cards/d/DragonArch.java @@ -32,7 +32,7 @@ public final class DragonArch extends CardImpl { // {2}, {T}: You may put a multicolored creature card from your hand onto the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter), - new ManaCostsImpl("{2}")); + new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DragonEngine.java b/Mage.Sets/src/mage/cards/d/DragonEngine.java index 83b1b64aa4..9e0dba783d 100644 --- a/Mage.Sets/src/mage/cards/d/DragonEngine.java +++ b/Mage.Sets/src/mage/cards/d/DragonEngine.java @@ -27,7 +27,7 @@ public final class DragonEngine extends CardImpl { this.toughness = new MageInt(3); // {2}: Dragon Engine gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{2}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private DragonEngine(final DragonEngine card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonHatchling.java b/Mage.Sets/src/mage/cards/d/DragonHatchling.java index 14a95a3a4e..cf8422a6ff 100644 --- a/Mage.Sets/src/mage/cards/d/DragonHatchling.java +++ b/Mage.Sets/src/mage/cards/d/DragonHatchling.java @@ -32,7 +32,7 @@ public final class DragonHatchling extends CardImpl { // {R}: Dragon Hatchling gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), - new ManaCostsImpl("{R}"))); + new ManaCostsImpl<>("{R}"))); } private DragonHatchling(final DragonHatchling card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonMantle.java b/Mage.Sets/src/mage/cards/d/DragonMantle.java index 88b4e7d111..132e6770cf 100644 --- a/Mage.Sets/src/mage/cards/d/DragonMantle.java +++ b/Mage.Sets/src/mage/cards/d/DragonMantle.java @@ -38,7 +38,7 @@ public final class DragonMantle extends CardImpl { // When Dragon Mantle enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Enchanted creature has "{R}: This creature gets +1/+0 until end of turn." - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability2, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{R}: This creature gets +1/+0 until end of turn.\""))); } diff --git a/Mage.Sets/src/mage/cards/d/DragonRoost.java b/Mage.Sets/src/mage/cards/d/DragonRoost.java index 512b70dea1..f23f06b8bc 100644 --- a/Mage.Sets/src/mage/cards/d/DragonRoost.java +++ b/Mage.Sets/src/mage/cards/d/DragonRoost.java @@ -20,7 +20,7 @@ public final class DragonRoost extends CardImpl { public DragonRoost(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{R}{R}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DragonToken2(), 1), new ManaCostsImpl("{5}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DragonToken2(), 1), new ManaCostsImpl<>("{5}{R}{R}"))); } private DragonRoost(final DragonRoost card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonScarredBear.java b/Mage.Sets/src/mage/cards/d/DragonScarredBear.java index 8c58cd2cb3..116d6ad24d 100644 --- a/Mage.Sets/src/mage/cards/d/DragonScarredBear.java +++ b/Mage.Sets/src/mage/cards/d/DragonScarredBear.java @@ -31,7 +31,7 @@ public final class DragonScarredBear extends CardImpl { Ability ability = new ActivateIfConditionActivatedAbility( Zone.BATTLEFIELD, new RegenerateSourceEffect(), - new ManaCostsImpl("{1}{G}"), + new ManaCostsImpl<>("{1}{G}"), FormidableCondition.instance); ability.setAbilityWord(AbilityWord.FORMIDABLE); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DragonTyrant.java b/Mage.Sets/src/mage/cards/d/DragonTyrant.java index 80ab2002c1..921ef0426c 100644 --- a/Mage.Sets/src/mage/cards/d/DragonTyrant.java +++ b/Mage.Sets/src/mage/cards/d/DragonTyrant.java @@ -38,9 +38,9 @@ public final class DragonTyrant extends CardImpl { // Double strike this.addAbility(DoubleStrikeAbility.getInstance()); // At the beginning of your upkeep, sacrifice Dragon Tyrant unless you pay {R}{R}{R}{R}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{R}{R}{R}{R}")), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{R}{R}{R}{R}")), TargetController.YOU, false)); // {R}: Dragon Tyrant 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}"))); } private DragonTyrant(final DragonTyrant card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonWhelp.java b/Mage.Sets/src/mage/cards/d/DragonWhelp.java index 43de37f089..3fd49a51ac 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWhelp.java +++ b/Mage.Sets/src/mage/cards/d/DragonWhelp.java @@ -41,7 +41,7 @@ public final class DragonWhelp extends CardImpl { // {R}: Dragon Whelp gets +1/+0 until end of turn. If this ability has been activated four or more times this turn, sacrifice Dragon Whelp at the beginning of the next end step. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), - new ManaCostsImpl("{R}")); + new ManaCostsImpl<>("{R}")); ability.addEffect(new DragonWhelpEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DragonWhisperer.java b/Mage.Sets/src/mage/cards/d/DragonWhisperer.java index 359fee1fc3..5d3f8ed580 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWhisperer.java +++ b/Mage.Sets/src/mage/cards/d/DragonWhisperer.java @@ -37,18 +37,18 @@ public final class DragonWhisperer extends CardImpl { // {R}: Dragon Whisperer gains flying until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), - Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); // {1}{R}: Dragon Whisperer get +1/+0 until end of turn this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), - new ManaCostsImpl("{1}{R}"))); + new ManaCostsImpl<>("{1}{R}"))); // — {4}{R}{R}: Create a 4/4 red Dragon creature token with flying. Activate this ability only if creatures you control have total power 8 or greater. Ability ability = new ActivateIfConditionActivatedAbility( Zone.BATTLEFIELD, new CreateTokenEffect(new DragonToken()), - new ManaCostsImpl("{4}{R}{R}"), + new ManaCostsImpl<>("{4}{R}{R}"), FormidableCondition.instance); ability.setAbilityWord(AbilityWord.FORMIDABLE); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DragonWings.java b/Mage.Sets/src/mage/cards/d/DragonWings.java index a5d4cd6071..d9b0aeebce 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWings.java +++ b/Mage.Sets/src/mage/cards/d/DragonWings.java @@ -49,7 +49,7 @@ public final class DragonWings extends CardImpl { // Enchanted creature has flying. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // Cycling {1}{U} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{U}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{U}"))); // When a creature with converted mana cost 6 or greater enters the battlefield, you may return Dragon Breath from your graveyard to the battlefield attached to that creature. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.GRAVEYARD, new DragonWingsEffect(), filter, true, SetTargetPointer.PERMANENT, null)); diff --git a/Mage.Sets/src/mage/cards/d/Dragonrage.java b/Mage.Sets/src/mage/cards/d/Dragonrage.java index 0b88782a75..9d0018696f 100644 --- a/Mage.Sets/src/mage/cards/d/Dragonrage.java +++ b/Mage.Sets/src/mage/cards/d/Dragonrage.java @@ -40,7 +40,7 @@ public final class Dragonrage extends CardImpl { new PermanentsOnBattlefieldCount(filter))); // Until end of turn, attacking creatures you control gain "{R}: This creature gets +1/+0 until end of turn." - Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl("{R}")); + Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); Effect effect = new GainAbilityAllEffect(abilityToGain, Duration.EndOfTurn, filter); effect.setText("Until end of turn, attacking creatures you control gain \"{R}: This creature gets +1/+0 until end of turn.\""); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/Dragonshift.java b/Mage.Sets/src/mage/cards/d/Dragonshift.java index 2968b97d66..9c1f7c2aa4 100644 --- a/Mage.Sets/src/mage/cards/d/Dragonshift.java +++ b/Mage.Sets/src/mage/cards/d/Dragonshift.java @@ -42,7 +42,7 @@ public final class Dragonshift extends CardImpl { this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); // Overload {3}{U}{U}{R}{R} - Ability ability = new OverloadAbility(this, new LoseAllAbilitiesAllEffect(new FilterControlledCreaturePermanent(""), Duration.EndOfTurn), new ManaCostsImpl("{3}{U}{U}{R}{R}")); + Ability ability = new OverloadAbility(this, new LoseAllAbilitiesAllEffect(new FilterControlledCreaturePermanent(""), Duration.EndOfTurn), new ManaCostsImpl<>("{3}{U}{U}{R}{R}")); ability.addEffect(new BecomesCreatureAllEffect( new CreatureToken(4, 4, "blue and red Dragon with base power and toughness 4/4 and with flying") .withColor("UR") diff --git a/Mage.Sets/src/mage/cards/d/DragonsoulKnight.java b/Mage.Sets/src/mage/cards/d/DragonsoulKnight.java index da3aab523b..362077e91c 100644 --- a/Mage.Sets/src/mage/cards/d/DragonsoulKnight.java +++ b/Mage.Sets/src/mage/cards/d/DragonsoulKnight.java @@ -37,7 +37,7 @@ public final class DragonsoulKnight extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {W}{U}{B}{R}{G}: Until end of turn, Dragonsoul Knight becomes a Dragon, gets +5/+3, and gains flying and trample. - Ability ability = new SimpleActivatedAbility(new DragonsoulKnightEffect(), new ManaCostsImpl("{W}{U}{B}{R}{G}")); + Ability ability = new SimpleActivatedAbility(new DragonsoulKnightEffect(), new ManaCostsImpl<>("{W}{U}{B}{R}{G}")); Effect effect = new BoostSourceEffect(5, 3, Duration.EndOfTurn); effect.setText(", gets +5/+3"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/DrakeHatchling.java b/Mage.Sets/src/mage/cards/d/DrakeHatchling.java index 548ef1e959..ca3dcd63fb 100644 --- a/Mage.Sets/src/mage/cards/d/DrakeHatchling.java +++ b/Mage.Sets/src/mage/cards/d/DrakeHatchling.java @@ -29,7 +29,7 @@ public final class DrakeHatchling extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}: Drake Hatchling gets +1/+0 until end of turn. Activate this ability only once each turn. - this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{U}"))); + this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private DrakeHatchling(final DrakeHatchling card) { diff --git a/Mage.Sets/src/mage/cards/d/DranaKalastriaBloodchief.java b/Mage.Sets/src/mage/cards/d/DranaKalastriaBloodchief.java index 1b42a54141..94025a4b34 100644 --- a/Mage.Sets/src/mage/cards/d/DranaKalastriaBloodchief.java +++ b/Mage.Sets/src/mage/cards/d/DranaKalastriaBloodchief.java @@ -37,7 +37,7 @@ public final class DranaKalastriaBloodchief extends CardImpl { this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(StaticValue.get(0), new SignInversionDynamicValue(ManacostVariableValue.REGULAR), Duration.EndOfTurn), new ManaCostsImpl("{X}{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(StaticValue.get(0), new SignInversionDynamicValue(ManacostVariableValue.REGULAR), Duration.EndOfTurn), new ManaCostsImpl<>("{X}{B}{B}")); ability.addEffect(new BoostSourceEffect(ManacostVariableValue.REGULAR, StaticValue.get(0), Duration.EndOfTurn).concatBy("and")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DrannithHealer.java b/Mage.Sets/src/mage/cards/d/DrannithHealer.java index a1bbe65de5..f03739d841 100644 --- a/Mage.Sets/src/mage/cards/d/DrannithHealer.java +++ b/Mage.Sets/src/mage/cards/d/DrannithHealer.java @@ -29,7 +29,7 @@ public final class DrannithHealer extends CardImpl { this.addAbility(new CycleControllerTriggeredAbility(new GainLifeEffect(1), false, true)); // Cycling {1} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}"))); } private DrannithHealer(final DrannithHealer card) { diff --git a/Mage.Sets/src/mage/cards/d/DrannithStinger.java b/Mage.Sets/src/mage/cards/d/DrannithStinger.java index 03c72c6350..f6e02edfa7 100644 --- a/Mage.Sets/src/mage/cards/d/DrannithStinger.java +++ b/Mage.Sets/src/mage/cards/d/DrannithStinger.java @@ -32,7 +32,7 @@ public final class DrannithStinger extends CardImpl { )); // Cycling {1} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}"))); } private DrannithStinger(final DrannithStinger card) { diff --git a/Mage.Sets/src/mage/cards/d/DreadDefiler.java b/Mage.Sets/src/mage/cards/d/DreadDefiler.java index 1a2774a774..bc5e1172bc 100644 --- a/Mage.Sets/src/mage/cards/d/DreadDefiler.java +++ b/Mage.Sets/src/mage/cards/d/DreadDefiler.java @@ -39,7 +39,7 @@ public final class DreadDefiler extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // {3}{C}, Exile a creature card from your graveyard: Target opponent loses life equal to the exiled card's power. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DreadDefilerEffect(), new ManaCostsImpl("{3}{C}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DreadDefilerEffect(), new ManaCostsImpl<>("{3}{C}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD))); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DreadRider.java b/Mage.Sets/src/mage/cards/d/DreadRider.java index 8e5338aa92..5747ae2b9c 100644 --- a/Mage.Sets/src/mage/cards/d/DreadRider.java +++ b/Mage.Sets/src/mage/cards/d/DreadRider.java @@ -31,7 +31,7 @@ public final class DreadRider extends CardImpl { this.toughness = new MageInt(7); // {1}{B}, {T}, Exile a creature card from your graveyard: Target opponent loses 3 life. - Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(3), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(3), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_A))); ability.addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/cards/d/DreadShade.java b/Mage.Sets/src/mage/cards/d/DreadShade.java index 0b53d5625b..8e47a8fb48 100644 --- a/Mage.Sets/src/mage/cards/d/DreadShade.java +++ b/Mage.Sets/src/mage/cards/d/DreadShade.java @@ -27,7 +27,7 @@ public final class DreadShade extends CardImpl { this.toughness = new MageInt(3); // {B}: Dread Shade 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 DreadShade(final DreadShade card) { diff --git a/Mage.Sets/src/mage/cards/d/DreadStatuary.java b/Mage.Sets/src/mage/cards/d/DreadStatuary.java index bb63242377..0cca17916f 100644 --- a/Mage.Sets/src/mage/cards/d/DreadStatuary.java +++ b/Mage.Sets/src/mage/cards/d/DreadStatuary.java @@ -25,7 +25,7 @@ public final class DreadStatuary extends CardImpl { public DreadStatuary(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); this.addAbility(new ColorlessManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new DreadStatuaryToken(), "land", Duration.EndOfTurn), new ManaCostsImpl("{4}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new DreadStatuaryToken(), "land", Duration.EndOfTurn), new ManaCostsImpl<>("{4}"))); } private DreadStatuary(final DreadStatuary card) { diff --git a/Mage.Sets/src/mage/cards/d/DreadWanderer.java b/Mage.Sets/src/mage/cards/d/DreadWanderer.java index c23799d484..892f355ce9 100644 --- a/Mage.Sets/src/mage/cards/d/DreadWanderer.java +++ b/Mage.Sets/src/mage/cards/d/DreadWanderer.java @@ -36,7 +36,7 @@ public final class DreadWanderer extends CardImpl { ConditionalActivatedAbility ability = new ConditionalActivatedAbility( Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), - new ManaCostsImpl("{2}{B}"), + new ManaCostsImpl<>("{2}{B}"), HeckbentCondition.instance, "{2}{B}: Return {this} from your graveyard to the battlefield. " + "Activate only as a sorcery " diff --git a/Mage.Sets/src/mage/cards/d/DreadWight.java b/Mage.Sets/src/mage/cards/d/DreadWight.java index 9c2d509f31..58cc215e8d 100644 --- a/Mage.Sets/src/mage/cards/d/DreadWight.java +++ b/Mage.Sets/src/mage/cards/d/DreadWight.java @@ -151,7 +151,7 @@ class DreadWightEffect extends OneShotEffect { Ability activatedAbility = new SimpleActivatedAbility( Zone.BATTLEFIELD, new RemoveCounterSourceEffect(CounterType.PARALYZATION.createInstance()), - new ManaCostsImpl("{4}")); + new ManaCostsImpl<>("{4}")); ContinuousEffect effect4 = new GainAbilityTargetEffect( activatedAbility, Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/cards/d/DreadfulApathy.java b/Mage.Sets/src/mage/cards/d/DreadfulApathy.java index e536eceaa1..55529c3acf 100644 --- a/Mage.Sets/src/mage/cards/d/DreadfulApathy.java +++ b/Mage.Sets/src/mage/cards/d/DreadfulApathy.java @@ -40,7 +40,7 @@ public final class DreadfulApathy extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); // {2}{W}: Exile enchanted creature. - this.addAbility(new SimpleActivatedAbility(new ExileAttachedEffect(), new ManaCostsImpl("{2}{W}"))); + this.addAbility(new SimpleActivatedAbility(new ExileAttachedEffect(), new ManaCostsImpl<>("{2}{W}"))); } private DreadfulApathy(final DreadfulApathy card) { diff --git a/Mage.Sets/src/mage/cards/d/Dreadmalkin.java b/Mage.Sets/src/mage/cards/d/Dreadmalkin.java index cdf6f361a9..4045a1e34c 100644 --- a/Mage.Sets/src/mage/cards/d/Dreadmalkin.java +++ b/Mage.Sets/src/mage/cards/d/Dreadmalkin.java @@ -48,7 +48,7 @@ public final class Dreadmalkin extends CardImpl { // {2}{B}, Sacrifice another creature or planeswalker: Put two +1/+1 counters on Dreadmalkin. Ability ability = new SimpleActivatedAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl("{2}{B}") + new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl<>("{2}{B}") ); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/Dreadwing.java b/Mage.Sets/src/mage/cards/d/Dreadwing.java index 862294a1ca..3014ab01f1 100644 --- a/Mage.Sets/src/mage/cards/d/Dreadwing.java +++ b/Mage.Sets/src/mage/cards/d/Dreadwing.java @@ -32,7 +32,7 @@ public final class Dreadwing extends CardImpl { // {1}{U}{R}: Dreadwing gets +3/+0 and gains flying until end of turn. Effect effect = new BoostSourceEffect(3, 0, Duration.EndOfTurn); effect.setText("{this} gets +3/+0"); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl(("{1}{U}{R}"))); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>(("{1}{U}{R}"))); effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains flying until end of turn"); ability.getEffects().add(effect); diff --git a/Mage.Sets/src/mage/cards/d/DreamTwist.java b/Mage.Sets/src/mage/cards/d/DreamTwist.java index 5aadffe592..ee0c78b061 100644 --- a/Mage.Sets/src/mage/cards/d/DreamTwist.java +++ b/Mage.Sets/src/mage/cards/d/DreamTwist.java @@ -25,7 +25,7 @@ public final class DreamTwist extends CardImpl { this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(3)); // Flashback {1}{U} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{1}{U}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{1}{U}"))); } private DreamTwist(final DreamTwist card) { diff --git a/Mage.Sets/src/mage/cards/d/DreamsOfTheDead.java b/Mage.Sets/src/mage/cards/d/DreamsOfTheDead.java index 9a49fabff8..0f989aff5a 100644 --- a/Mage.Sets/src/mage/cards/d/DreamsOfTheDead.java +++ b/Mage.Sets/src/mage/cards/d/DreamsOfTheDead.java @@ -47,7 +47,7 @@ public final class DreamsOfTheDead extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); // {1}{U}: Return target white or black creature card from your graveyard to the battlefield. That creature gains "Cumulative upkeep {2}." If the creature would leave the battlefield, exile it instead of putting it anywhere else. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DreamsOfTheDeadEffect(), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DreamsOfTheDeadEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetCardInYourGraveyard(filter)); ability.addEffect(new DreamsOfTheDeadReplacementEffect()); this.addAbility(ability); @@ -87,7 +87,7 @@ class DreamsOfTheDeadEffect extends OneShotEffect { if (controller.moveCards(card, Zone.BATTLEFIELD, source, game)) { Permanent creature = game.getPermanent(card.getId()); if (creature != null) { - ContinuousEffect effect = new GainAbilityTargetEffect(new CumulativeUpkeepAbility(new ManaCostsImpl("{2}")), Duration.Custom); + ContinuousEffect effect = new GainAbilityTargetEffect(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{2}")), Duration.Custom); effect.setTargetPointer(new FixedTarget(creature, game)); game.addEffect(effect, source); } diff --git a/Mage.Sets/src/mage/cards/d/DreamscapeArtist.java b/Mage.Sets/src/mage/cards/d/DreamscapeArtist.java index ac2d6b15a7..71651a26ad 100644 --- a/Mage.Sets/src/mage/cards/d/DreamscapeArtist.java +++ b/Mage.Sets/src/mage/cards/d/DreamscapeArtist.java @@ -40,7 +40,7 @@ public final class DreamscapeArtist extends CardImpl { Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, false, Outcome.PutLandInPlay), - new ManaCostsImpl("{2}{U}")); + new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent("a land")))); diff --git a/Mage.Sets/src/mage/cards/d/DreamshaperShaman.java b/Mage.Sets/src/mage/cards/d/DreamshaperShaman.java index e842ce5f62..c963e575a5 100644 --- a/Mage.Sets/src/mage/cards/d/DreamshaperShaman.java +++ b/Mage.Sets/src/mage/cards/d/DreamshaperShaman.java @@ -44,7 +44,7 @@ public final class DreamshaperShaman extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(new DoIfCostPaid( new RevealCardsFromLibraryUntilEffect(filter, Zone.BATTLEFIELD, Zone.LIBRARY), new CompositeCost( - new ManaCostsImpl("{2}{R}"), + new ManaCostsImpl<>("{2}{R}"), new SacrificeTargetCost(new TargetControlledPermanent( StaticFilters.FILTER_CONTROLLED_PERMANENT_NON_LAND )), "pay {2}{R} and sacrifice a nonland permanent" diff --git a/Mage.Sets/src/mage/cards/d/Dreamstealer.java b/Mage.Sets/src/mage/cards/d/Dreamstealer.java index 858a16f237..a9132ea42c 100644 --- a/Mage.Sets/src/mage/cards/d/Dreamstealer.java +++ b/Mage.Sets/src/mage/cards/d/Dreamstealer.java @@ -36,7 +36,7 @@ public final class Dreamstealer extends CardImpl { false, true)); // Eternalize {4}{B}{B} - this.addAbility(new EternalizeAbility(new ManaCostsImpl("{4}{B}{B}"), this)); + this.addAbility(new EternalizeAbility(new ManaCostsImpl<>("{4}{B}{B}"), this)); } private Dreamstealer(final Dreamstealer card) { diff --git a/Mage.Sets/src/mage/cards/d/Dreamwinder.java b/Mage.Sets/src/mage/cards/d/Dreamwinder.java index 5b8bd85611..825abec679 100644 --- a/Mage.Sets/src/mage/cards/d/Dreamwinder.java +++ b/Mage.Sets/src/mage/cards/d/Dreamwinder.java @@ -39,7 +39,7 @@ public final class Dreamwinder extends CardImpl { // Dreamwinder can't attack unless defending player controls an Island. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); // {U}, Sacrifice an Island: Target land becomes an Island until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new ManaCostsImpl<>("{U}")); Target target = new TargetLandPermanent(); ability.addTarget(target); FilterControlledLandPermanent filter = new FilterControlledLandPermanent("an Island"); diff --git a/Mage.Sets/src/mage/cards/d/DregMangler.java b/Mage.Sets/src/mage/cards/d/DregMangler.java index 83c1d277da..0753f0cd28 100644 --- a/Mage.Sets/src/mage/cards/d/DregMangler.java +++ b/Mage.Sets/src/mage/cards/d/DregMangler.java @@ -28,7 +28,7 @@ public final class DregMangler extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // Scavenge {3}{B}{G} - this.addAbility(new ScavengeAbility(new ManaCostsImpl("{3}{B}{G}"))); + this.addAbility(new ScavengeAbility(new ManaCostsImpl<>("{3}{B}{G}"))); } private DregMangler(final DregMangler card) { diff --git a/Mage.Sets/src/mage/cards/d/DregscapeSliver.java b/Mage.Sets/src/mage/cards/d/DregscapeSliver.java index f70883ad58..bcb5fba0a7 100644 --- a/Mage.Sets/src/mage/cards/d/DregscapeSliver.java +++ b/Mage.Sets/src/mage/cards/d/DregscapeSliver.java @@ -31,7 +31,7 @@ public final class DregscapeSliver extends CardImpl { this.addAbility(new SimpleStaticAbility(new DregscapeSliverEffect())); // Unearth {2} - this.addAbility(new UnearthAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new UnearthAbility(new ManaCostsImpl<>("{2}"))); } private DregscapeSliver(final DregscapeSliver card) { @@ -65,7 +65,7 @@ class DregscapeSliverEffect extends ContinuousEffectImpl { if (card == null || !card.isCreature(game) || !card.hasSubtype(SubType.SLIVER, game)) { continue; } - UnearthAbility ability = new UnearthAbility(new ManaCostsImpl("{2}")); + UnearthAbility ability = new UnearthAbility(new ManaCostsImpl<>("{2}")); ability.setSourceId(cardId); ability.setControllerId(card.getOwnerId()); game.getState().addOtherAbility(card, ability); diff --git a/Mage.Sets/src/mage/cards/d/DregscapeZombie.java b/Mage.Sets/src/mage/cards/d/DregscapeZombie.java index 36fd9686be..532b629695 100644 --- a/Mage.Sets/src/mage/cards/d/DregscapeZombie.java +++ b/Mage.Sets/src/mage/cards/d/DregscapeZombie.java @@ -23,7 +23,7 @@ public final class DregscapeZombie extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); // Unearth {B} ({B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.) - this.addAbility(new UnearthAbility(new ManaCostsImpl("{B}"))); + this.addAbility(new UnearthAbility(new ManaCostsImpl<>("{B}"))); } private DregscapeZombie(final DregscapeZombie card) { diff --git a/Mage.Sets/src/mage/cards/d/DrifterIlDal.java b/Mage.Sets/src/mage/cards/d/DrifterIlDal.java index 8aae08b9bf..b323330fd9 100644 --- a/Mage.Sets/src/mage/cards/d/DrifterIlDal.java +++ b/Mage.Sets/src/mage/cards/d/DrifterIlDal.java @@ -29,7 +29,7 @@ public final class DrifterIlDal extends CardImpl { // Shadow this.addAbility(ShadowAbility.getInstance()); // At the beginning of your upkeep, sacrifice Drifter il-Dal unless you pay {U}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{U}")), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{U}")), TargetController.YOU, false)); } private DrifterIlDal(final DrifterIlDal card) { diff --git a/Mage.Sets/src/mage/cards/d/DriftingDjinn.java b/Mage.Sets/src/mage/cards/d/DriftingDjinn.java index db4754e394..2d2bc89523 100644 --- a/Mage.Sets/src/mage/cards/d/DriftingDjinn.java +++ b/Mage.Sets/src/mage/cards/d/DriftingDjinn.java @@ -28,8 +28,8 @@ public final class DriftingDjinn extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{1}{U}")), TargetController.YOU, false)); - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{1}{U}")), TargetController.YOU, false)); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private DriftingDjinn(final DriftingDjinn card) { diff --git a/Mage.Sets/src/mage/cards/d/DriftingMeadow.java b/Mage.Sets/src/mage/cards/d/DriftingMeadow.java index 8ff18b2d84..f2bc608a66 100644 --- a/Mage.Sets/src/mage/cards/d/DriftingMeadow.java +++ b/Mage.Sets/src/mage/cards/d/DriftingMeadow.java @@ -23,7 +23,7 @@ public final class DriftingMeadow extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new WhiteManaAbility()); - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private DriftingMeadow(final DriftingMeadow card) { diff --git a/Mage.Sets/src/mage/cards/d/DrillBit.java b/Mage.Sets/src/mage/cards/d/DrillBit.java index d229ba4d02..f33065fee4 100644 --- a/Mage.Sets/src/mage/cards/d/DrillBit.java +++ b/Mage.Sets/src/mage/cards/d/DrillBit.java @@ -27,7 +27,7 @@ public final class DrillBit extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // Spectacle {B} - this.addAbility(new SpectacleAbility(this, new ManaCostsImpl("{B}"))); + this.addAbility(new SpectacleAbility(this, new ManaCostsImpl<>("{B}"))); } private DrillBit(final DrillBit card) { diff --git a/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java b/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java index 5b999319a7..70a5b87af2 100644 --- a/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java +++ b/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java @@ -45,7 +45,7 @@ public final class DrogskolCavalry extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new GainLifeEffect(2), filter)); // {3}{W}: Create a 1/1 white Spirit creature token with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl("{3}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl<>("{3}{W}"))); } private DrogskolCavalry(final DrogskolCavalry card) { diff --git a/Mage.Sets/src/mage/cards/d/Droideka.java b/Mage.Sets/src/mage/cards/d/Droideka.java index d7ae660071..bb3a40b354 100644 --- a/Mage.Sets/src/mage/cards/d/Droideka.java +++ b/Mage.Sets/src/mage/cards/d/Droideka.java @@ -28,7 +28,7 @@ public final class Droideka extends CardImpl { this.toughness = new MageInt(6); // {2}{U}: Change a target of target spell or ability to Droideka. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChangeATargetOfTargetSpellAbilityToSourceEffect(), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChangeATargetOfTargetSpellAbilityToSourceEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetStackObject()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DromarTheBanisher.java b/Mage.Sets/src/mage/cards/d/DromarTheBanisher.java index 61dc1e4357..66534284c1 100644 --- a/Mage.Sets/src/mage/cards/d/DromarTheBanisher.java +++ b/Mage.Sets/src/mage/cards/d/DromarTheBanisher.java @@ -40,7 +40,7 @@ public final class DromarTheBanisher extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever Dromar, the Banisher deals combat damage to a player, you may pay {2}{U}. If you do, choose a color, then return all creatures of that color to their owners' hands. - this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(new DromarTheBanisherEffect(), new ManaCostsImpl("{2}{U}")), false)); + this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(new DromarTheBanisherEffect(), new ManaCostsImpl<>("{2}{U}")), false)); } private DromarTheBanisher(final DromarTheBanisher card) { diff --git a/Mage.Sets/src/mage/cards/d/DromarsAttendant.java b/Mage.Sets/src/mage/cards/d/DromarsAttendant.java index b67499e093..73f9d2a249 100644 --- a/Mage.Sets/src/mage/cards/d/DromarsAttendant.java +++ b/Mage.Sets/src/mage/cards/d/DromarsAttendant.java @@ -28,7 +28,7 @@ public final class DromarsAttendant extends CardImpl { this.toughness = new MageInt(3); // {1}, Sacrifice Dromar's Attendant: Add {W}{U}{B}. - Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 1, 1, 0, 0, 0, 0, 0), new ManaCostsImpl("{1}")); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 1, 1, 0, 0, 0, 0, 0), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DromokaDunecaster.java b/Mage.Sets/src/mage/cards/d/DromokaDunecaster.java index 805f661d75..0b5ec485ba 100644 --- a/Mage.Sets/src/mage/cards/d/DromokaDunecaster.java +++ b/Mage.Sets/src/mage/cards/d/DromokaDunecaster.java @@ -38,7 +38,7 @@ public final class DromokaDunecaster extends CardImpl { this.toughness = new MageInt(2); // {1}{W}, {T}: Tap target creature without flying. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{1}{W}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DromokaMonument.java b/Mage.Sets/src/mage/cards/d/DromokaMonument.java index 23dc127074..39b2e7ca41 100644 --- a/Mage.Sets/src/mage/cards/d/DromokaMonument.java +++ b/Mage.Sets/src/mage/cards/d/DromokaMonument.java @@ -32,7 +32,7 @@ public final class DromokaMonument extends CardImpl { // {4}{G}{W}: Dromoka Monument becomes a 4/4 green and white Dragon artifact creature with flying until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect - (new DromokaMonumentToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{4}{G}{W}"))); + (new DromokaMonumentToken(), "", Duration.EndOfTurn), new ManaCostsImpl<>("{4}{G}{W}"))); } private DromokaMonument(final DromokaMonument card) { diff --git a/Mage.Sets/src/mage/cards/d/DroningBureaucrats.java b/Mage.Sets/src/mage/cards/d/DroningBureaucrats.java index bc16f08bd0..88ead2c345 100644 --- a/Mage.Sets/src/mage/cards/d/DroningBureaucrats.java +++ b/Mage.Sets/src/mage/cards/d/DroningBureaucrats.java @@ -35,7 +35,7 @@ public final class DroningBureaucrats extends CardImpl { this.toughness = new MageInt(4); // {X}, {tap}: Each creature with converted mana cost X can't attack or block this turn. - Ability ability = new SimpleActivatedAbility(new DroningBureaucratsEffect(), new ManaCostsImpl("{X}")); + Ability ability = new SimpleActivatedAbility(new DroningBureaucratsEffect(), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DroolingGroodion.java b/Mage.Sets/src/mage/cards/d/DroolingGroodion.java index 555e22a377..0a92c9ca5f 100644 --- a/Mage.Sets/src/mage/cards/d/DroolingGroodion.java +++ b/Mage.Sets/src/mage/cards/d/DroolingGroodion.java @@ -33,7 +33,7 @@ public final class DroolingGroodion extends CardImpl { this.toughness = new MageInt(3); // {2}{B}{G}, Sacrifice a creature: Target creature gets +2/+2 until end of turn. Another target creature gets -2/-2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DroolingGroodionEffect(), new ManaCostsImpl("{2}{B}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DroolingGroodionEffect(), new ManaCostsImpl<>("{2}{B}{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); TargetCreaturePermanent target = new TargetCreaturePermanent(new FilterCreaturePermanent("creature (first target)")); diff --git a/Mage.Sets/src/mage/cards/d/DrossRipper.java b/Mage.Sets/src/mage/cards/d/DrossRipper.java index 76108b2e64..9efa0a7d1b 100644 --- a/Mage.Sets/src/mage/cards/d/DrossRipper.java +++ b/Mage.Sets/src/mage/cards/d/DrossRipper.java @@ -26,7 +26,7 @@ public final class DrossRipper extends CardImpl { this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"))); } public DrossRipper (final DrossRipper card) { diff --git a/Mage.Sets/src/mage/cards/d/Drought.java b/Mage.Sets/src/mage/cards/d/Drought.java index 5fbaa6d7fe..48633bde06 100644 --- a/Mage.Sets/src/mage/cards/d/Drought.java +++ b/Mage.Sets/src/mage/cards/d/Drought.java @@ -32,7 +32,7 @@ public final class Drought extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); // At the beginning of your upkeep, sacrifice Drought unless you pay {W}{W}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{W}{W}")), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{W}{W}")), TargetController.YOU, false)); // Spells cost an additional "Sacrifice a Swamp" to cast for each black mana symbol in their mana costs. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DroughtAdditionalCostEffect(true))); diff --git a/Mage.Sets/src/mage/cards/d/Drowned.java b/Mage.Sets/src/mage/cards/d/Drowned.java index 687684ed51..e9ed570851 100644 --- a/Mage.Sets/src/mage/cards/d/Drowned.java +++ b/Mage.Sets/src/mage/cards/d/Drowned.java @@ -25,7 +25,7 @@ public final class Drowned extends CardImpl { this.toughness = new MageInt(1); // {B}: Regenerate Drowned. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private Drowned(final Drowned card) { diff --git a/Mage.Sets/src/mage/cards/d/DrownedRusalka.java b/Mage.Sets/src/mage/cards/d/DrownedRusalka.java index fdfaaaf69a..bd74f5214c 100644 --- a/Mage.Sets/src/mage/cards/d/DrownedRusalka.java +++ b/Mage.Sets/src/mage/cards/d/DrownedRusalka.java @@ -31,7 +31,7 @@ public final class DrownedRusalka extends CardImpl { this.toughness = new MageInt(1); // {U}, Sacrifice a creature: Discard a card, then draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardControllerEffect(1), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardControllerEffect(1), new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); ability.addEffect(new DrawCardSourceControllerEffect(1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DrownerInitiate.java b/Mage.Sets/src/mage/cards/d/DrownerInitiate.java index 702b34d87d..03d68c0f31 100644 --- a/Mage.Sets/src/mage/cards/d/DrownerInitiate.java +++ b/Mage.Sets/src/mage/cards/d/DrownerInitiate.java @@ -39,7 +39,7 @@ public final class DrownerInitiate extends CardImpl { this.toughness = new MageInt(1); // Whenever a player casts a blue spell, you may pay {1}. If you do, target player puts the top two cards of their library into their graveyard. - Ability ability = new SpellCastAllTriggeredAbility(new DoIfCostPaid(new PutLibraryIntoGraveTargetEffect(2), new ManaCostsImpl("{1}")), filter, false); + Ability ability = new SpellCastAllTriggeredAbility(new DoIfCostPaid(new PutLibraryIntoGraveTargetEffect(2), new ManaCostsImpl<>("{1}")), filter, false); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DrudgeBeetle.java b/Mage.Sets/src/mage/cards/d/DrudgeBeetle.java index 75d4cbc7b7..8be9d41188 100644 --- a/Mage.Sets/src/mage/cards/d/DrudgeBeetle.java +++ b/Mage.Sets/src/mage/cards/d/DrudgeBeetle.java @@ -24,7 +24,7 @@ public final class DrudgeBeetle extends CardImpl { this.toughness = new MageInt(2); // Scavenge {5}{G} ({5}{G}, Exile this card from your graveyard: Put a number of +1/+1 counters equal to this card's power on target creature. Scavenge only as a sorcery.) - this.addAbility(new ScavengeAbility(new ManaCostsImpl("{5}{G}"))); + this.addAbility(new ScavengeAbility(new ManaCostsImpl<>("{5}{G}"))); } private DrudgeBeetle(final DrudgeBeetle card) { diff --git a/Mage.Sets/src/mage/cards/d/DrudgeReavers.java b/Mage.Sets/src/mage/cards/d/DrudgeReavers.java index 781dd54753..a0e9fbaf92 100644 --- a/Mage.Sets/src/mage/cards/d/DrudgeReavers.java +++ b/Mage.Sets/src/mage/cards/d/DrudgeReavers.java @@ -28,7 +28,7 @@ public final class DrudgeReavers extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // {B}: Regenerate Drudge Reavers. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private DrudgeReavers(final DrudgeReavers card) { diff --git a/Mage.Sets/src/mage/cards/d/DrudgeSentinel.java b/Mage.Sets/src/mage/cards/d/DrudgeSentinel.java index e6a4d5d368..9686d86d23 100644 --- a/Mage.Sets/src/mage/cards/d/DrudgeSentinel.java +++ b/Mage.Sets/src/mage/cards/d/DrudgeSentinel.java @@ -27,7 +27,7 @@ public final class DrudgeSentinel extends CardImpl { this.toughness = new MageInt(1); // {3}: Tap Drudge Sentinel. It gains indestructible until end of turn. - Ability ability = new SimpleActivatedAbility(new TapSourceEffect(), new ManaCostsImpl("{3}")); + Ability ability = new SimpleActivatedAbility(new TapSourceEffect(), new ManaCostsImpl<>("{3}")); ability.addEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn) .setText("It gains indestructible until end of turn")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DrudgeSkeletons.java b/Mage.Sets/src/mage/cards/d/DrudgeSkeletons.java index 795a46a88a..03b0ec2cc2 100644 --- a/Mage.Sets/src/mage/cards/d/DrudgeSkeletons.java +++ b/Mage.Sets/src/mage/cards/d/DrudgeSkeletons.java @@ -25,7 +25,7 @@ public final class DrudgeSkeletons extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private DrudgeSkeletons(final DrudgeSkeletons card) { diff --git a/Mage.Sets/src/mage/cards/d/DruidLyrist.java b/Mage.Sets/src/mage/cards/d/DruidLyrist.java index b50930ac86..d6e296ec70 100644 --- a/Mage.Sets/src/mage/cards/d/DruidLyrist.java +++ b/Mage.Sets/src/mage/cards/d/DruidLyrist.java @@ -31,7 +31,7 @@ public final class DruidLyrist extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}, Sacrifice Druid Lyrist: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); diff --git a/Mage.Sets/src/mage/cards/d/DruidicSatchel.java b/Mage.Sets/src/mage/cards/d/DruidicSatchel.java index 8c7d2c425e..8ea272cd58 100644 --- a/Mage.Sets/src/mage/cards/d/DruidicSatchel.java +++ b/Mage.Sets/src/mage/cards/d/DruidicSatchel.java @@ -27,7 +27,7 @@ public final class DruidicSatchel extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {2}, {T}: Reveal the top card of your library. If it’s a creature card, create a 1/1 green Saproling creature token. If it’s a land card, put that card onto the battlefield under your control. If it’s a noncreature, nonland card, you gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DruidicSatchelEffect(), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DruidicSatchelEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DuctCrawler.java b/Mage.Sets/src/mage/cards/d/DuctCrawler.java index 3aac67db81..4e00ba1176 100644 --- a/Mage.Sets/src/mage/cards/d/DuctCrawler.java +++ b/Mage.Sets/src/mage/cards/d/DuctCrawler.java @@ -29,7 +29,7 @@ public final class DuctCrawler extends CardImpl { // {1}{R}: Target creature can't block Duct Crawler this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), - new ManaCostsImpl("{1}{R}")); + new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DuelingCoach.java b/Mage.Sets/src/mage/cards/d/DuelingCoach.java index 1ebf027d3c..fe63568635 100644 --- a/Mage.Sets/src/mage/cards/d/DuelingCoach.java +++ b/Mage.Sets/src/mage/cards/d/DuelingCoach.java @@ -43,7 +43,7 @@ public final class DuelingCoach extends CardImpl { new AddCountersAllEffect( CounterType.P1P1.createInstance(), StaticFilters.FILTER_CONTROLLED_CREATURE_P1P1), - new ManaCostsImpl("{4}{W}") + new ManaCostsImpl<>("{4}{W}") ); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DuergarCaveGuard.java b/Mage.Sets/src/mage/cards/d/DuergarCaveGuard.java index 3ca2e285e9..970dec10f7 100644 --- a/Mage.Sets/src/mage/cards/d/DuergarCaveGuard.java +++ b/Mage.Sets/src/mage/cards/d/DuergarCaveGuard.java @@ -28,7 +28,7 @@ public final class DuergarCaveGuard extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(WitherAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R/W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R/W}"))); } private DuergarCaveGuard(final DuergarCaveGuard card) { diff --git a/Mage.Sets/src/mage/cards/d/DuergarMineCaptain.java b/Mage.Sets/src/mage/cards/d/DuergarMineCaptain.java index 5b2f3ae823..9697b422ed 100644 --- a/Mage.Sets/src/mage/cards/d/DuergarMineCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DuergarMineCaptain.java @@ -32,7 +32,7 @@ public final class DuergarMineCaptain extends CardImpl { // {1}{RW}, {untap}: Attacking creatures get +1/+0 until end of turn. Ability ability = new SimpleActivatedAbility( new BoostAllEffect(1, 0, Duration.EndOfTurn, StaticFilters.FILTER_ATTACKING_CREATURES, false), - new ManaCostsImpl("{1}{R/W}") + new ManaCostsImpl<>("{1}{R/W}") ); ability.addCost(new UntapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DukharaPeafowl.java b/Mage.Sets/src/mage/cards/d/DukharaPeafowl.java index 88ee0c63b6..3d5207f7be 100644 --- a/Mage.Sets/src/mage/cards/d/DukharaPeafowl.java +++ b/Mage.Sets/src/mage/cards/d/DukharaPeafowl.java @@ -27,7 +27,7 @@ public final class DukharaPeafowl extends CardImpl { this.toughness = new MageInt(4); // {U}: Dukhara Peafowl gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DulcetSirens.java b/Mage.Sets/src/mage/cards/d/DulcetSirens.java index 5f2d7dbb68..9e05e50512 100644 --- a/Mage.Sets/src/mage/cards/d/DulcetSirens.java +++ b/Mage.Sets/src/mage/cards/d/DulcetSirens.java @@ -35,7 +35,7 @@ public final class DulcetSirens extends CardImpl { this.toughness = new MageInt(3); // {U}, {T}: Target creature attacks target opponent this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DulcetSirensForceAttackEffect(Duration.EndOfTurn), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DulcetSirensForceAttackEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.addTarget(new TargetOpponent()); @@ -43,7 +43,7 @@ public final class DulcetSirens extends CardImpl { // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); } private DulcetSirens(final DulcetSirens card) { diff --git a/Mage.Sets/src/mage/cards/d/DurableCoilbug.java b/Mage.Sets/src/mage/cards/d/DurableCoilbug.java index 135c5b7437..8d68bb14ff 100644 --- a/Mage.Sets/src/mage/cards/d/DurableCoilbug.java +++ b/Mage.Sets/src/mage/cards/d/DurableCoilbug.java @@ -26,7 +26,7 @@ public final class DurableCoilbug extends CardImpl { // {4}{B}: Return Durable Coilbug from your graveyard to your hand. this.addAbility(new SimpleActivatedAbility( - Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{4}{B}") + Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl<>("{4}{B}") )); } diff --git a/Mage.Sets/src/mage/cards/d/DurkwoodBaloth.java b/Mage.Sets/src/mage/cards/d/DurkwoodBaloth.java index 487ad3f2bd..970b477445 100644 --- a/Mage.Sets/src/mage/cards/d/DurkwoodBaloth.java +++ b/Mage.Sets/src/mage/cards/d/DurkwoodBaloth.java @@ -24,7 +24,7 @@ public final class DurkwoodBaloth extends CardImpl { this.toughness = new MageInt(5); // Suspend 5-{G} - this.addAbility(new SuspendAbility(5, new ManaCostsImpl("{G}"), this)); + this.addAbility(new SuspendAbility(5, new ManaCostsImpl<>("{G}"), this)); } private DurkwoodBaloth(final DurkwoodBaloth card) { diff --git a/Mage.Sets/src/mage/cards/d/DurkwoodTracker.java b/Mage.Sets/src/mage/cards/d/DurkwoodTracker.java index e5d0f3791c..881baed799 100644 --- a/Mage.Sets/src/mage/cards/d/DurkwoodTracker.java +++ b/Mage.Sets/src/mage/cards/d/DurkwoodTracker.java @@ -31,7 +31,7 @@ public final class DurkwoodTracker extends CardImpl { this.toughness = new MageInt(3); // {1}{G}, {tap}: If Durkwood Tracker is on the battlefield, it deals damage equal to its power to target attacking creature. That creature deals damage equal to its power to Durkwood Tracker. - Ability ability = new SimpleActivatedAbility(new DurkwoodTrackerEffect(), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new DurkwoodTrackerEffect(), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DuskborneSkymarcher.java b/Mage.Sets/src/mage/cards/d/DuskborneSkymarcher.java index 14970993d1..bebd481b8e 100644 --- a/Mage.Sets/src/mage/cards/d/DuskborneSkymarcher.java +++ b/Mage.Sets/src/mage/cards/d/DuskborneSkymarcher.java @@ -43,7 +43,7 @@ public final class DuskborneSkymarcher extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {W}, {T}: Target attacking vampire gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DuskfangMentor.java b/Mage.Sets/src/mage/cards/d/DuskfangMentor.java index cc4f35141c..3952bacf24 100644 --- a/Mage.Sets/src/mage/cards/d/DuskfangMentor.java +++ b/Mage.Sets/src/mage/cards/d/DuskfangMentor.java @@ -54,7 +54,7 @@ public final class DuskfangMentor extends CardImpl { // {1}{B}, {T}: Put a +1/+1 counter on each creature you control with lifelink. ability = new SimpleActivatedAbility( - new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter2), new ManaCostsImpl("{1}{B}") + new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter2), new ManaCostsImpl<>("{1}{B}") ); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java b/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java index 471ceaec36..19ea409200 100644 --- a/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java +++ b/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java @@ -40,10 +40,10 @@ public final class DuskmantleGuildmage extends CardImpl { this.toughness = new MageInt(2); // {1}{U}{B}: Whenever a card is put into an opponent's graveyard from anywhere this turn, that player loses 1 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateDelayedTriggeredAbilityEffect(new CardPutIntoOpponentGraveThisTurn()), new ManaCostsImpl("{1}{U}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateDelayedTriggeredAbilityEffect(new CardPutIntoOpponentGraveThisTurn()), new ManaCostsImpl<>("{1}{U}{B}"))); // {2}{U}{B}: Target player puts the top two cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new ManaCostsImpl("{2}{U}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new ManaCostsImpl<>("{2}{U}{B}")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java b/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java index 05b310057d..0544f2e578 100644 --- a/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java +++ b/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java @@ -26,7 +26,7 @@ public final class DuskmantleHouseOfShadow extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {U}{B}, {tap}: Target player puts the top card of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new ManaCostsImpl("{U}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new ManaCostsImpl<>("{U}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DuskriderPeregrine.java b/Mage.Sets/src/mage/cards/d/DuskriderPeregrine.java index 61e8b7c7b9..216c588cef 100644 --- a/Mage.Sets/src/mage/cards/d/DuskriderPeregrine.java +++ b/Mage.Sets/src/mage/cards/d/DuskriderPeregrine.java @@ -32,7 +32,7 @@ public final class DuskriderPeregrine extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.BLACK)); // Suspend 3-{1}{W} - this.addAbility(new SuspendAbility(3, new ManaCostsImpl("{1}{W}"), this)); + this.addAbility(new SuspendAbility(3, new ManaCostsImpl<>("{1}{W}"), this)); } private DuskriderPeregrine(final DuskriderPeregrine card) { diff --git a/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java b/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java index 7844b2006e..4fe12c18a9 100644 --- a/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java +++ b/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java @@ -35,7 +35,7 @@ public final class DuskwatchRecruiter extends CardImpl { // Put the rest on the bottom of your library in any order. this.addAbility(new SimpleActivatedAbility( new LookLibraryAndPickControllerEffect(3, 1, StaticFilters.FILTER_CARD_CREATURE_A, PutCards.HAND, PutCards.BOTTOM_ANY), - new ManaCostsImpl("{2}{G}"))); + new ManaCostsImpl<>("{2}{G}"))); // At the beginning of each upkeep, if no spells were cast last turn, transform Duskwatch Recruiter. this.addAbility(new TransformAbility()); diff --git a/Mage.Sets/src/mage/cards/d/DutyBoundDead.java b/Mage.Sets/src/mage/cards/d/DutyBoundDead.java index 83421377c4..d391222f6a 100644 --- a/Mage.Sets/src/mage/cards/d/DutyBoundDead.java +++ b/Mage.Sets/src/mage/cards/d/DutyBoundDead.java @@ -29,7 +29,7 @@ public final class DutyBoundDead extends CardImpl { // Exalted this.addAbility(new ExaltedAbility()); // {3}{B}: Regenerate Duty-Bound Dead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{3}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{3}{B}"))); } private DutyBoundDead(final DutyBoundDead card) { diff --git a/Mage.Sets/src/mage/cards/d/DwarvenArmorer.java b/Mage.Sets/src/mage/cards/d/DwarvenArmorer.java index 804dc67357..3412b2f44e 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenArmorer.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenArmorer.java @@ -41,7 +41,7 @@ public final class DwarvenArmorer extends CardImpl { this.toughness = new MageInt(2); // {R}, {tap}, Discard a card: Put a +0/+1 counter or a +1/+0 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DwarvenArmorerEffect(), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DwarvenArmorerEffect(), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/d/DwarvenArmory.java b/Mage.Sets/src/mage/cards/d/DwarvenArmory.java index becd893c0d..1bba750ede 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenArmory.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenArmory.java @@ -30,7 +30,7 @@ public final class DwarvenArmory extends CardImpl { // {2}, Sacrifice a land: Put a +2/+2 counter on target creature. Activate this ability only during any upkeep step. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P2P2.createInstance()), - new ManaCostsImpl("{2}"), + new ManaCostsImpl<>("{2}"), new IsStepCondition(PhaseStep.UPKEEP, false), null); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_LAND_SHORT_TEXT))); diff --git a/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java b/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java index 28905a5616..96378d4592 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java @@ -28,13 +28,13 @@ public final class DwarvenBlastminer extends CardImpl { this.toughness = new MageInt(1); // {2}{R}, {tap}: Destroy target nonbasic land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetNonBasicLandPermanent()); this.addAbility(ability); // Morph {R} - this.addAbility(new MorphAbility(new ManaCostsImpl("{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{R}"))); } private DwarvenBlastminer(final DwarvenBlastminer card) { diff --git a/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java b/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java index a769eff86c..daeb0df5cf 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java @@ -36,7 +36,7 @@ public final class DwarvenLieutenant extends CardImpl { this.toughness = new MageInt(2); // {1}{R}: Target Dwarf creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DwarvenMiner.java b/Mage.Sets/src/mage/cards/d/DwarvenMiner.java index 7803e8120d..50e30f2978 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenMiner.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenMiner.java @@ -28,7 +28,7 @@ public final class DwarvenMiner extends CardImpl { this.toughness = new MageInt(2); // {2}{R}, {tap}: Destroy target nonbasic land - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetNonBasicLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DwarvenPony.java b/Mage.Sets/src/mage/cards/d/DwarvenPony.java index b8e7dab133..f282c52f2a 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenPony.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenPony.java @@ -38,7 +38,7 @@ public final class DwarvenPony extends CardImpl { // {1}{R}, {tap}: Target Dwarf creature gains mountainwalk until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new GainAbilityTargetEffect(new MountainwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl("{1}{R}")); + new GainAbilityTargetEffect(new MountainwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/Dynacharge.java b/Mage.Sets/src/mage/cards/d/Dynacharge.java index 0a3f5a907d..4541d62a80 100644 --- a/Mage.Sets/src/mage/cards/d/Dynacharge.java +++ b/Mage.Sets/src/mage/cards/d/Dynacharge.java @@ -27,7 +27,7 @@ public final class Dynacharge extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(2,0, Duration.EndOfTurn)); // Overload {2}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.") - this.addAbility(new OverloadAbility(this, new BoostControlledEffect(2,0, Duration.EndOfTurn), new ManaCostsImpl("{2}{R}"))); + this.addAbility(new OverloadAbility(this, new BoostControlledEffect(2,0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}"))); } private Dynacharge(final Dynacharge card) {