diff --git a/Mage.Sets/src/mage/cards/e/EarthRift.java b/Mage.Sets/src/mage/cards/e/EarthRift.java index 812dab060f3..1b15ddeec7e 100644 --- a/Mage.Sets/src/mage/cards/e/EarthRift.java +++ b/Mage.Sets/src/mage/cards/e/EarthRift.java @@ -25,7 +25,7 @@ public final class EarthRift extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetLandPermanent()); // Flashback {5}{R}{R} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{5}{R}{R}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{5}{R}{R}"))); } private EarthRift(final EarthRift card) { diff --git a/Mage.Sets/src/mage/cards/e/Earthblighter.java b/Mage.Sets/src/mage/cards/e/Earthblighter.java index 7a018ca1af5..1ae466c0623 100644 --- a/Mage.Sets/src/mage/cards/e/Earthblighter.java +++ b/Mage.Sets/src/mage/cards/e/Earthblighter.java @@ -37,7 +37,7 @@ public final class Earthblighter extends CardImpl { this.toughness = new MageInt(1); // {2}{B}, {tap}, Sacrifice a Goblin: Destroy target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/cards/e/Earthbrawn.java b/Mage.Sets/src/mage/cards/e/Earthbrawn.java index bb94531c741..d11eb4f9f7d 100644 --- a/Mage.Sets/src/mage/cards/e/Earthbrawn.java +++ b/Mage.Sets/src/mage/cards/e/Earthbrawn.java @@ -22,7 +22,7 @@ public final class Earthbrawn extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.addAbility(new ReinforceAbility(1, new ManaCostsImpl("{1}{G}"))); + this.addAbility(new ReinforceAbility(1, new ManaCostsImpl<>("{1}{G}"))); } private Earthbrawn(final Earthbrawn card) { diff --git a/Mage.Sets/src/mage/cards/e/EarthenGoo.java b/Mage.Sets/src/mage/cards/e/EarthenGoo.java index 2a2d98144af..87405b0d6b4 100644 --- a/Mage.Sets/src/mage/cards/e/EarthenGoo.java +++ b/Mage.Sets/src/mage/cards/e/EarthenGoo.java @@ -37,8 +37,8 @@ public final class EarthenGoo extends CardImpl { // Cumulative upkeep {R} or {G} this.addAbility(new CumulativeUpkeepAbility(new OrCost( - "{R} or {G}", new ManaCostsImpl("{R}"), - new ManaCostsImpl("{G}") + "{R} or {G}", new ManaCostsImpl<>("{R}"), + new ManaCostsImpl<>("{G}") ))); // Earthen Goo gets +1/+1 for each age counter on it. diff --git a/Mage.Sets/src/mage/cards/e/Earthlink.java b/Mage.Sets/src/mage/cards/e/Earthlink.java index 2edf8386b3b..7ede8b130aa 100644 --- a/Mage.Sets/src/mage/cards/e/Earthlink.java +++ b/Mage.Sets/src/mage/cards/e/Earthlink.java @@ -32,7 +32,7 @@ public final class Earthlink extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{R}{G}"); // At the beginning of your upkeep, sacrifice Earthlink unless you pay {2}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{2}")), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{2}")), TargetController.YOU, false)); // Whenever a creature dies, that creature's controller sacrifices a land. this.addAbility(new DiesCreatureTriggeredAbility(new EarthlinkEffect(), false, false, true)); diff --git a/Mage.Sets/src/mage/cards/e/EarthshakerKhenra.java b/Mage.Sets/src/mage/cards/e/EarthshakerKhenra.java index 529169415ec..760114463da 100644 --- a/Mage.Sets/src/mage/cards/e/EarthshakerKhenra.java +++ b/Mage.Sets/src/mage/cards/e/EarthshakerKhenra.java @@ -55,7 +55,7 @@ public final class EarthshakerKhenra extends CardImpl { this.addAbility(ability); // Eternalize {4}{R}{R} - this.addAbility(new EternalizeAbility(new ManaCostsImpl("{4}{R}{R}"), this)); + this.addAbility(new EternalizeAbility(new ManaCostsImpl<>("{4}{R}{R}"), this)); } private EarthshakerKhenra(final EarthshakerKhenra card) { diff --git a/Mage.Sets/src/mage/cards/e/EasternPaladin.java b/Mage.Sets/src/mage/cards/e/EasternPaladin.java index 3175c576afa..083b88df0e9 100644 --- a/Mage.Sets/src/mage/cards/e/EasternPaladin.java +++ b/Mage.Sets/src/mage/cards/e/EasternPaladin.java @@ -40,7 +40,7 @@ public final class EasternPaladin extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - 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.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EasyPrey.java b/Mage.Sets/src/mage/cards/e/EasyPrey.java index a008fe9114b..9a038b77d01 100644 --- a/Mage.Sets/src/mage/cards/e/EasyPrey.java +++ b/Mage.Sets/src/mage/cards/e/EasyPrey.java @@ -34,7 +34,7 @@ public final class EasyPrey extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent(filter)); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private EasyPrey(final EasyPrey card) { diff --git a/Mage.Sets/src/mage/cards/e/EaterOfHope.java b/Mage.Sets/src/mage/cards/e/EaterOfHope.java index 9dc034624d7..f410832f8de 100644 --- a/Mage.Sets/src/mage/cards/e/EaterOfHope.java +++ b/Mage.Sets/src/mage/cards/e/EaterOfHope.java @@ -44,12 +44,12 @@ public final class EaterOfHope extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {B}, Sacrifice another creature: Regenerate Eater of Hope. - Ability regenAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")); + Ability regenAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); regenAbility.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE, true))); this.addAbility(regenAbility); // {2}{B}, Sacrifice two other creatures: Destroy target creature. - Ability destroyAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{B}")); + Ability destroyAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{B}")); destroyAbility.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(2, 2, destroyFilter, true))); destroyAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(destroyAbility); diff --git a/Mage.Sets/src/mage/cards/e/EbonyTreefolk.java b/Mage.Sets/src/mage/cards/e/EbonyTreefolk.java index 8583de01b63..5a4ce7c68fd 100644 --- a/Mage.Sets/src/mage/cards/e/EbonyTreefolk.java +++ b/Mage.Sets/src/mage/cards/e/EbonyTreefolk.java @@ -26,7 +26,7 @@ public final class EbonyTreefolk extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{G}"))); } private EbonyTreefolk(final EbonyTreefolk card) { diff --git a/Mage.Sets/src/mage/cards/e/EchoMage.java b/Mage.Sets/src/mage/cards/e/EchoMage.java index c8ea1342dd3..d2fbef81cb0 100644 --- a/Mage.Sets/src/mage/cards/e/EchoMage.java +++ b/Mage.Sets/src/mage/cards/e/EchoMage.java @@ -40,12 +40,12 @@ public final class EchoMage extends LevelerCard { this.toughness = new MageInt(3); // Level up {1}{U} - this.addAbility(new LevelUpAbility(new ManaCostsImpl("{1}{U}"))); + this.addAbility(new LevelUpAbility(new ManaCostsImpl<>("{1}{U}"))); // LEVEL 2-3 // 2/4 // {U}{U}, {tap}: Copy target instant or sorcery spell. You may choose new targets for the copy. Abilities abilities1 = new AbilitiesImpl<>(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new ManaCostsImpl("{U}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); ability.addCost(new TapSourceCost()); abilities1.add(ability); @@ -53,7 +53,7 @@ public final class EchoMage extends LevelerCard { // 2/5 // {U}{U}, {tap}: Copy target instant or sorcery spell twice. You may choose new targets for the copies. Abilities abilities2 = new AbilitiesImpl<>(); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EchoMageEffect(), new ManaCostsImpl("{U}{U}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EchoMageEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); ability.addCost(new TapSourceCost()); abilities2.add(ability); diff --git a/Mage.Sets/src/mage/cards/e/EchoOfEons.java b/Mage.Sets/src/mage/cards/e/EchoOfEons.java index 742b095f6e8..4c20779ee60 100644 --- a/Mage.Sets/src/mage/cards/e/EchoOfEons.java +++ b/Mage.Sets/src/mage/cards/e/EchoOfEons.java @@ -27,7 +27,7 @@ public final class EchoOfEons extends CardImpl { this.getSpellAbility().addEffect(effect); // Flashback {2}{U} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{2}{U}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{2}{U}"))); } private EchoOfEons(final EchoOfEons card) { diff --git a/Mage.Sets/src/mage/cards/e/EchoTracer.java b/Mage.Sets/src/mage/cards/e/EchoTracer.java index a4cf5c241db..ef459dbb95c 100644 --- a/Mage.Sets/src/mage/cards/e/EchoTracer.java +++ b/Mage.Sets/src/mage/cards/e/EchoTracer.java @@ -28,7 +28,7 @@ public final class EchoTracer extends CardImpl { this.toughness = new MageInt(2); // Morph {2}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}"))); // When Echo Tracer is turned face up, return target creature to its owner's hand. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ReturnToHandTargetEffect()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/e/EchoesOfTheKinTree.java b/Mage.Sets/src/mage/cards/e/EchoesOfTheKinTree.java index 05b586a58ed..732d94f303d 100644 --- a/Mage.Sets/src/mage/cards/e/EchoesOfTheKinTree.java +++ b/Mage.Sets/src/mage/cards/e/EchoesOfTheKinTree.java @@ -20,7 +20,7 @@ public final class EchoesOfTheKinTree extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); // {2}{W}: Bolster 1. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BolsterEffect(1),new ManaCostsImpl("{2}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BolsterEffect(1),new ManaCostsImpl<>("{2}{W}"))); } private EchoesOfTheKinTree(final EchoesOfTheKinTree card) { diff --git a/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java b/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java index b0b8663c710..730604ec83d 100644 --- a/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java +++ b/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java @@ -33,7 +33,7 @@ public final class EdificeOfAuthority extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {1}, {T}: Target creature can't attack this turn. Put a brick counter on Edifice of Authority. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantAttackTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantAttackTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addEffect(new AddCountersSourceEffect(CounterType.BRICK.createInstance())); ability.addTarget(new TargetCreaturePermanent()); @@ -41,7 +41,7 @@ public final class EdificeOfAuthority extends CardImpl { // {1}, {T}: Until your next turn, target creature can't attack or block and its activated abilities can't be activated. Activate this ability only if there are three or more brick counter on Edifice of Authority. Condition condition = new SourceHasCounterCondition(CounterType.BRICK, 3, Integer.MAX_VALUE); - Ability ability2 = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new EdificeOfAuthorityEffect(), new ManaCostsImpl("{1}"), condition, rule); + Ability ability2 = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new EdificeOfAuthorityEffect(), new ManaCostsImpl<>("{1}"), condition, rule); ability2.addCost(new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java b/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java index 853d1be254c..42ac264a918 100644 --- a/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java +++ b/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java @@ -42,7 +42,7 @@ public final class EfreetWeaponmaster extends CardImpl { this.addAbility(new EfreetWeaponmasterAbility()); // Morph {2}{U}{R}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}{R}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}{R}{W}"))); } private EfreetWeaponmaster(final EfreetWeaponmaster card) { diff --git a/Mage.Sets/src/mage/cards/e/EgonGodOfDeath.java b/Mage.Sets/src/mage/cards/e/EgonGodOfDeath.java index b6a69302b74..57a866920c3 100644 --- a/Mage.Sets/src/mage/cards/e/EgonGodOfDeath.java +++ b/Mage.Sets/src/mage/cards/e/EgonGodOfDeath.java @@ -61,7 +61,7 @@ public final class EgonGodOfDeath extends ModalDoubleFacesCard { )); // {2}{B}, {T}, Exile a creature card from your graveyard: Draw a card - Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_A))); this.getRightHalfCard().addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EidolonOfPhilosophy.java b/Mage.Sets/src/mage/cards/e/EidolonOfPhilosophy.java index f054241745a..1dc283ed866 100644 --- a/Mage.Sets/src/mage/cards/e/EidolonOfPhilosophy.java +++ b/Mage.Sets/src/mage/cards/e/EidolonOfPhilosophy.java @@ -29,7 +29,7 @@ public final class EidolonOfPhilosophy extends CardImpl { this.toughness = new MageInt(2); // {6}{U}, Sacrifice Eidolon of Philosophy: Draw three cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(3), new ManaCostsImpl("{6}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(3), new ManaCostsImpl<>("{6}{U}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EightAndAHalfTails.java b/Mage.Sets/src/mage/cards/e/EightAndAHalfTails.java index a6cf4f6590d..7f6b80ab89c 100644 --- a/Mage.Sets/src/mage/cards/e/EightAndAHalfTails.java +++ b/Mage.Sets/src/mage/cards/e/EightAndAHalfTails.java @@ -37,13 +37,13 @@ public final class EightAndAHalfTails extends CardImpl { this.toughness = new MageInt(2); // {1}{W}: Target permanent you control gains protection from white until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.WHITE), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.WHITE), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); Target target = new TargetControlledPermanent(); ability.addTarget(target); this.addAbility(ability); // {1}: Target spell or permanent becomes white until end of turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new BecomesColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn, "Target spell or permanent becomes white until end of turn"), new ManaCostsImpl("{1}")); + new BecomesColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn, "Target spell or permanent becomes white until end of turn"), new ManaCostsImpl<>("{1}")); target = new TargetSpellOrPermanent(); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ElderDruid.java b/Mage.Sets/src/mage/cards/e/ElderDruid.java index 43004723deb..0fe7b39a9d2 100644 --- a/Mage.Sets/src/mage/cards/e/ElderDruid.java +++ b/Mage.Sets/src/mage/cards/e/ElderDruid.java @@ -42,7 +42,7 @@ public final class ElderDruid extends CardImpl { this.toughness = new MageInt(2); // {3}{G}, {tap}: You may tap or untap target artifact, creature, or land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl("{3}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{3}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ElderOfLaurels.java b/Mage.Sets/src/mage/cards/e/ElderOfLaurels.java index 9c4490fd03a..b06166fcf90 100644 --- a/Mage.Sets/src/mage/cards/e/ElderOfLaurels.java +++ b/Mage.Sets/src/mage/cards/e/ElderOfLaurels.java @@ -32,7 +32,7 @@ public final class ElderOfLaurels extends CardImpl { // {3}{G}: Target creature gets +X/+X until end of turn, where X is the number of creatures you control. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(CreaturesYouControlCount.instance, CreaturesYouControlCount.instance, Duration.EndOfTurn, true), - new ManaCostsImpl("{3}{G}")); + new ManaCostsImpl<>("{3}{G}")); ability.addTarget(new TargetCreaturePermanent()); ability.addHint(CreaturesYouControlHint.instance); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EldraziObligator.java b/Mage.Sets/src/mage/cards/e/EldraziObligator.java index bf9dcdfcfc3..0a53ee01637 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziObligator.java +++ b/Mage.Sets/src/mage/cards/e/EldraziObligator.java @@ -40,7 +40,7 @@ public final class EldraziObligator extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); - DoIfCostPaid costPaidEffect = new DoIfCostPaid(new GainControlTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{C}")); + DoIfCostPaid costPaidEffect = new DoIfCostPaid(new GainControlTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{C}")); Effect untapEffect = new UntapTargetEffect(); untapEffect.setText("untap that creature,"); Effect hasteEffect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/e/ElectricEel.java b/Mage.Sets/src/mage/cards/e/ElectricEel.java index 45342aeb65b..f36584ceb10 100644 --- a/Mage.Sets/src/mage/cards/e/ElectricEel.java +++ b/Mage.Sets/src/mage/cards/e/ElectricEel.java @@ -35,7 +35,7 @@ public final class ElectricEel extends CardImpl { // {R}{R}: Electric Eel gets +2/+0 until end of turn and deals 1 damage to you. Effect effect = new DamageControllerEffect(1); effect.setText("and deals 1 damage to you"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}")); ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/Electrickery.java b/Mage.Sets/src/mage/cards/e/Electrickery.java index 7eeb620ea01..06bd5c7d6a6 100644 --- a/Mage.Sets/src/mage/cards/e/Electrickery.java +++ b/Mage.Sets/src/mage/cards/e/Electrickery.java @@ -25,7 +25,7 @@ public final class Electrickery extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(1)); // Overload {1}{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 DamageAllEffect(1, StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL), new ManaCostsImpl("{1}{R}"))); + this.addAbility(new OverloadAbility(this, new DamageAllEffect(1, StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL), new ManaCostsImpl<>("{1}{R}"))); } private Electrickery(final Electrickery card) { diff --git a/Mage.Sets/src/mage/cards/e/Electropotence.java b/Mage.Sets/src/mage/cards/e/Electropotence.java index 35c73df1886..7db1932f389 100644 --- a/Mage.Sets/src/mage/cards/e/Electropotence.java +++ b/Mage.Sets/src/mage/cards/e/Electropotence.java @@ -103,7 +103,7 @@ class ElectropotenceEffect extends OneShotEffect { if (creature != null && controller != null) { if (controller.chooseUse(Outcome.Damage, "Pay {2}{R} to do the damage?", source, game)) { // if (controller.chooseUse(Outcome.Damage, "Pay {2}{R}? If you do, " + creature.getName() + " deals damage equal to its power to any target.", game)) { - ManaCosts manaCosts = new ManaCostsImpl("{2}{R}"); + ManaCosts manaCosts = new ManaCostsImpl<>("{2}{R}"); if (manaCosts.pay(source, game, source, controller.getId(), false, null)) { int amount = creature.getPower().getValue(); UUID target = source.getTargets().getFirstTarget(); diff --git a/Mage.Sets/src/mage/cards/e/ElementalMasterpiece.java b/Mage.Sets/src/mage/cards/e/ElementalMasterpiece.java index a7c25775cab..b91e78b6431 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalMasterpiece.java +++ b/Mage.Sets/src/mage/cards/e/ElementalMasterpiece.java @@ -27,7 +27,7 @@ public final class ElementalMasterpiece extends CardImpl { // {U/R}{U/R}, Discard Elemental Masterpiece: Create a Treasure token. Ability ability = new SimpleActivatedAbility( - Zone.HAND, new CreateTokenEffect(new TreasureToken()), new ManaCostsImpl("{U/R}{U/R}") + Zone.HAND, new CreateTokenEffect(new TreasureToken()), new ManaCostsImpl<>("{U/R}{U/R}") ); ability.addCost(new DiscardSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ElephantAmbush.java b/Mage.Sets/src/mage/cards/e/ElephantAmbush.java index 493271104f8..ddd9ccf501f 100644 --- a/Mage.Sets/src/mage/cards/e/ElephantAmbush.java +++ b/Mage.Sets/src/mage/cards/e/ElephantAmbush.java @@ -24,7 +24,7 @@ public final class ElephantAmbush extends CardImpl { // Create a 3/3 green Elephant creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new ElephantToken())); // Flashback {6}{G}{G} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{6}{G}{G}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{6}{G}{G}"))); } private ElephantAmbush(final ElephantAmbush card) { diff --git a/Mage.Sets/src/mage/cards/e/ElephantGrass.java b/Mage.Sets/src/mage/cards/e/ElephantGrass.java index 5b0af9679b2..3da16aedf12 100644 --- a/Mage.Sets/src/mage/cards/e/ElephantGrass.java +++ b/Mage.Sets/src/mage/cards/e/ElephantGrass.java @@ -35,7 +35,7 @@ public final class ElephantGrass extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}"); // Cumulative upkeep {1} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // Black creatures can't attack you. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouAllEffect(Duration.WhileOnBattlefield, filterBlack))); diff --git a/Mage.Sets/src/mage/cards/e/ElfReplica.java b/Mage.Sets/src/mage/cards/e/ElfReplica.java index f7ac8123688..797c49e994f 100644 --- a/Mage.Sets/src/mage/cards/e/ElfReplica.java +++ b/Mage.Sets/src/mage/cards/e/ElfReplica.java @@ -26,7 +26,7 @@ public final class ElfReplica extends CardImpl { this.subtype.add(SubType.ELF); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EliteArcanist.java b/Mage.Sets/src/mage/cards/e/EliteArcanist.java index 1fc5c6999e6..0920407de73 100644 --- a/Mage.Sets/src/mage/cards/e/EliteArcanist.java +++ b/Mage.Sets/src/mage/cards/e/EliteArcanist.java @@ -42,7 +42,7 @@ public final class EliteArcanist extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new EliteArcanistImprintEffect(), true)); // {X}, {T}: Copy the exiled card. You may cast the copy without paying its mana cost. X is the converted mana cost of the exiled card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EliteArcanistCopyEffect(), new ManaCostsImpl("{X}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EliteArcanistCopyEffect(), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); ability.setCostAdjuster(EliteArcanistAdjuster.instance); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EliteArrester.java b/Mage.Sets/src/mage/cards/e/EliteArrester.java index 570589d44e1..08bf2e62229 100644 --- a/Mage.Sets/src/mage/cards/e/EliteArrester.java +++ b/Mage.Sets/src/mage/cards/e/EliteArrester.java @@ -29,7 +29,7 @@ public final class EliteArrester extends CardImpl { // {1}{U}, {T}: Tap target creature. Ability ability = new SimpleActivatedAbility( - new TapTargetEffect(), new ManaCostsImpl("{1}{U}") + new TapTargetEffect(), new ManaCostsImpl<>("{1}{U}") ); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/e/ElixirOfVitality.java b/Mage.Sets/src/mage/cards/e/ElixirOfVitality.java index 6ddb14b6a74..d28183a2530 100644 --- a/Mage.Sets/src/mage/cards/e/ElixirOfVitality.java +++ b/Mage.Sets/src/mage/cards/e/ElixirOfVitality.java @@ -30,7 +30,7 @@ public final class ElixirOfVitality extends CardImpl { ability1.addCost(new SacrificeSourceCost()); this.addAbility(ability1); // {8}, {tap}, Sacrifice Elixir of Vitality: You gain 8 life. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(8), new ManaCostsImpl("{8}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(8), new ManaCostsImpl<>("{8}")); ability2.addCost(new TapSourceCost()); ability2.addCost(new SacrificeSourceCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/e/ElvenFortress.java b/Mage.Sets/src/mage/cards/e/ElvenFortress.java index 1d1d081cca5..a9bf200ccc9 100644 --- a/Mage.Sets/src/mage/cards/e/ElvenFortress.java +++ b/Mage.Sets/src/mage/cards/e/ElvenFortress.java @@ -24,7 +24,7 @@ public final class ElvenFortress extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}"); // {1}{G}: Target blocking creature gets +0/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}")); ability.addTarget(new TargetCreaturePermanent(new FilterBlockingCreature())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElvenLyre.java b/Mage.Sets/src/mage/cards/e/ElvenLyre.java index 1c3acb6c65c..49d98192c56 100644 --- a/Mage.Sets/src/mage/cards/e/ElvenLyre.java +++ b/Mage.Sets/src/mage/cards/e/ElvenLyre.java @@ -25,7 +25,7 @@ public final class ElvenLyre extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {1}, {tap}, Sacrifice Elven Lyre: Target creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/e/ElvishAberration.java b/Mage.Sets/src/mage/cards/e/ElvishAberration.java index f90f5914744..9eec6d86dd3 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishAberration.java +++ b/Mage.Sets/src/mage/cards/e/ElvishAberration.java @@ -31,7 +31,7 @@ public final class ElvishAberration extends CardImpl { // {tap}: Add {G}{G}{G}. this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(3), new TapSourceCost())); // Forestcycling {2} - this.addAbility(new ForestcyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new ForestcyclingAbility(new ManaCostsImpl<>("{2}"))); } private ElvishAberration(final ElvishAberration card) { diff --git a/Mage.Sets/src/mage/cards/e/ElvishClancaller.java b/Mage.Sets/src/mage/cards/e/ElvishClancaller.java index 6ed823b65a2..fb0b200c467 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishClancaller.java +++ b/Mage.Sets/src/mage/cards/e/ElvishClancaller.java @@ -58,7 +58,7 @@ public final class ElvishClancaller extends CardImpl { new TargetCardInLibrary(filter2), false ), - new ManaCostsImpl("{4}{G}{G}")); + new ManaCostsImpl<>("{4}{G}{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishHerder.java b/Mage.Sets/src/mage/cards/e/ElvishHerder.java index e3ffeabcf97..ff98511b1c0 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHerder.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHerder.java @@ -30,7 +30,7 @@ public final class ElvishHerder extends CardImpl { // {G}: Target creature gains trample until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect( - TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{G}")); + TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java b/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java index cb742bb3e64..80c8ad17a3a 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java @@ -31,7 +31,7 @@ public final class ElvishHexhunter extends CardImpl { this.toughness = new MageInt(1); // {GW}, {tap}, Sacrifice Elvish Hexhunter: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G/W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{G/W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); diff --git a/Mage.Sets/src/mage/cards/e/ElvishHunter.java b/Mage.Sets/src/mage/cards/e/ElvishHunter.java index 7986309621a..a064432f466 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHunter.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHunter.java @@ -31,7 +31,7 @@ public final class ElvishHunter extends CardImpl { // {1}{G}, {tap}: Target creature doesn't untap during its controller's next untap step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DontUntapInControllersNextUntapStepTargetEffect("Target creature"), - new ManaCostsImpl("{1}{G}")); + new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ElvishLyrist.java b/Mage.Sets/src/mage/cards/e/ElvishLyrist.java index a8f227f81c8..65d003e479d 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishLyrist.java +++ b/Mage.Sets/src/mage/cards/e/ElvishLyrist.java @@ -30,7 +30,7 @@ public final class ElvishLyrist extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}, Sacrifice Elvish 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/e/ElvishPathcutter.java b/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java index 87740e97163..c0633aa9062 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java +++ b/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java @@ -37,7 +37,7 @@ public final class ElvishPathcutter extends CardImpl { this.toughness = new MageInt(2); // {2}{G}: Target Elf creature gains forestwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ForestwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl("{2}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ForestwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishPiper.java b/Mage.Sets/src/mage/cards/e/ElvishPiper.java index 320e547af29..230961e4947 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishPiper.java +++ b/Mage.Sets/src/mage/cards/e/ElvishPiper.java @@ -31,7 +31,7 @@ public final class ElvishPiper extends CardImpl { // {G}, {tap}: You may put a creature card from your hand onto the battlefield. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_CREATURE_A), - new ManaCostsImpl("{G}")); + new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishScout.java b/Mage.Sets/src/mage/cards/e/ElvishScout.java index 4ccad16a385..7cf37d30d05 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishScout.java +++ b/Mage.Sets/src/mage/cards/e/ElvishScout.java @@ -41,7 +41,7 @@ public final class ElvishScout extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}: Untap target attacking creature you control. Prevent all combat damage that would be dealt to and dealt by it this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt to"); diff --git a/Mage.Sets/src/mage/cards/e/ElvishScrapper.java b/Mage.Sets/src/mage/cards/e/ElvishScrapper.java index dde0a44cce8..9d5023ed681 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishScrapper.java +++ b/Mage.Sets/src/mage/cards/e/ElvishScrapper.java @@ -30,7 +30,7 @@ public final class ElvishScrapper extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}, Sacrifice Elvish Scrapper: Destroy target artifact. - 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 TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/cards/e/ElvishSkysweeper.java b/Mage.Sets/src/mage/cards/e/ElvishSkysweeper.java index d80238800ae..172b14731a6 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishSkysweeper.java +++ b/Mage.Sets/src/mage/cards/e/ElvishSkysweeper.java @@ -41,7 +41,7 @@ public final class ElvishSkysweeper extends CardImpl { this.toughness = new MageInt(1); // {4}{G}, Sacrifice a creature: Destroy target creature with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{4}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{4}{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ElvishWarmaster.java b/Mage.Sets/src/mage/cards/e/ElvishWarmaster.java index 547a38b6747..37d1c5f6446 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishWarmaster.java +++ b/Mage.Sets/src/mage/cards/e/ElvishWarmaster.java @@ -48,7 +48,7 @@ public final class ElvishWarmaster extends CardImpl { // {5}{G}{G}: Elves you control get +2/+2 and gain deathtouch until end of turn. Ability ability = new SimpleActivatedAbility(new BoostControlledEffect( - 2, 2, Duration.EndOfTurn, filter2).setText("Elves you control get +2/+2"), new ManaCostsImpl("{5}{G}{G}") + 2, 2, Duration.EndOfTurn, filter2).setText("Elves you control get +2/+2"), new ManaCostsImpl<>("{5}{G}{G}") ); ability.addEffect(new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn, filter2 ).setText("and gain deathtouch until end of turn") diff --git a/Mage.Sets/src/mage/cards/e/EmberEyeWolf.java b/Mage.Sets/src/mage/cards/e/EmberEyeWolf.java index 71d40ecfa60..878077df8bb 100644 --- a/Mage.Sets/src/mage/cards/e/EmberEyeWolf.java +++ b/Mage.Sets/src/mage/cards/e/EmberEyeWolf.java @@ -30,7 +30,7 @@ public final class EmberEyeWolf extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {1}{R}: Ember-Eye Wolf gets +2/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private EmberEyeWolf(final EmberEyeWolf card) { diff --git a/Mage.Sets/src/mage/cards/e/EmberethSkyblazer.java b/Mage.Sets/src/mage/cards/e/EmberethSkyblazer.java index 88a59a17536..1bb9c90e6d9 100644 --- a/Mage.Sets/src/mage/cards/e/EmberethSkyblazer.java +++ b/Mage.Sets/src/mage/cards/e/EmberethSkyblazer.java @@ -47,7 +47,7 @@ public final class EmberethSkyblazer extends CardImpl { OpponentsCount.instance, StaticValue.get(0), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, false, true ).setText("creatures you control get +X/+0 until end of turn, where X is the number of opponents you have"), - new ManaCostsImpl("{2}{R}") + new ManaCostsImpl<>("{2}{R}") ), false)); } diff --git a/Mage.Sets/src/mage/cards/e/EmberwildeDjinn.java b/Mage.Sets/src/mage/cards/e/EmberwildeDjinn.java index 033ca35f546..e778825d771 100644 --- a/Mage.Sets/src/mage/cards/e/EmberwildeDjinn.java +++ b/Mage.Sets/src/mage/cards/e/EmberwildeDjinn.java @@ -78,7 +78,7 @@ class EmberwildeDjinnEffect extends OneShotEffect { if (player == null || sourceObject == null) { return false; } - Cost cost = new OrCost("{R}{R} or 2 life", new ManaCostsImpl("{R}{R}"), new PayLifeCost(2)); + Cost cost = new OrCost("{R}{R} or 2 life", new ManaCostsImpl<>("{R}{R}"), new PayLifeCost(2)); if (player.chooseUse(Outcome.GainControl, "Gain control of " + sourceObject.getLogName() + "?", source, game)) { if (cost.pay(source, game, source, player.getId(), false)) { ContinuousEffect effect = new GainControlTargetEffect(Duration.Custom, false, player.getId()); diff --git a/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java b/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java index 294109f2b0f..195c0cfca16 100644 --- a/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java +++ b/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java @@ -33,7 +33,7 @@ public final class EmbodimentOfSpring extends CardImpl { // {1}{G}, {T}, Sacrifice Embodiment of Spring: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), - new ManaCostsImpl("{1}{G}")); + new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/Embolden.java b/Mage.Sets/src/mage/cards/e/Embolden.java index ab93ab68df4..92fbf5a8b0d 100644 --- a/Mage.Sets/src/mage/cards/e/Embolden.java +++ b/Mage.Sets/src/mage/cards/e/Embolden.java @@ -26,7 +26,7 @@ public final class Embolden extends CardImpl { this.getSpellAbility().addTarget(new TargetAnyTargetAmount(4)); // Flashback {1}{W} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{1}{W}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{1}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/e/EmeraldDragonfly.java b/Mage.Sets/src/mage/cards/e/EmeraldDragonfly.java index 02bf5023007..3ab1ef169ca 100644 --- a/Mage.Sets/src/mage/cards/e/EmeraldDragonfly.java +++ b/Mage.Sets/src/mage/cards/e/EmeraldDragonfly.java @@ -32,7 +32,7 @@ public final class EmeraldDragonfly extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {G}{G}: Emerald Dragonfly gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}"))); } private EmeraldDragonfly(final EmeraldDragonfly card) { diff --git a/Mage.Sets/src/mage/cards/e/EmmessiTome.java b/Mage.Sets/src/mage/cards/e/EmmessiTome.java index 18633271d7c..8f1547776fb 100644 --- a/Mage.Sets/src/mage/cards/e/EmmessiTome.java +++ b/Mage.Sets/src/mage/cards/e/EmmessiTome.java @@ -22,7 +22,7 @@ public final class EmmessiTome extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {5}, {tap}: Draw two cards, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(2,1), new ManaCostsImpl("{5}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(2,1), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EmpressGalina.java b/Mage.Sets/src/mage/cards/e/EmpressGalina.java index 6d7ee30c6b4..2e64e78291b 100644 --- a/Mage.Sets/src/mage/cards/e/EmpressGalina.java +++ b/Mage.Sets/src/mage/cards/e/EmpressGalina.java @@ -33,7 +33,7 @@ public final class EmpressGalina extends CardImpl { this.toughness = new MageInt(3); // {U}{U}, {tap}: Gain control of target legendary permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.Custom), new ManaCostsImpl("{U}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.Custom), new ManaCostsImpl<>("{U}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EncampmentKeeper.java b/Mage.Sets/src/mage/cards/e/EncampmentKeeper.java index a26bc8ad1b6..928d92dd982 100644 --- a/Mage.Sets/src/mage/cards/e/EncampmentKeeper.java +++ b/Mage.Sets/src/mage/cards/e/EncampmentKeeper.java @@ -34,7 +34,7 @@ public final class EncampmentKeeper extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {7}{W}, Sacrifice Encampment Keeper: Creatures you control get +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{7}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{7}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EnclaveCryptologist.java b/Mage.Sets/src/mage/cards/e/EnclaveCryptologist.java index ed7f68d4ce0..9c4c120088c 100644 --- a/Mage.Sets/src/mage/cards/e/EnclaveCryptologist.java +++ b/Mage.Sets/src/mage/cards/e/EnclaveCryptologist.java @@ -34,7 +34,7 @@ public final class EnclaveCryptologist extends LevelerCard { this.power = new MageInt(0); this.toughness = new MageInt(1); - this.addAbility(new LevelUpAbility(new ManaCostsImpl("{1}{U}"))); + this.addAbility(new LevelUpAbility(new ManaCostsImpl<>("{1}{U}"))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost()); Abilities abilities1 = new AbilitiesImpl<>(ability); diff --git a/Mage.Sets/src/mage/cards/e/Endbringer.java b/Mage.Sets/src/mage/cards/e/Endbringer.java index 607fa73ce6f..6063b189670 100644 --- a/Mage.Sets/src/mage/cards/e/Endbringer.java +++ b/Mage.Sets/src/mage/cards/e/Endbringer.java @@ -42,13 +42,13 @@ public final class Endbringer extends CardImpl { this.addAbility(ability); // {C}, {T}: Target creature can't attack or block this turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantAttackBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{C}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantAttackBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{C}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {C}{C}, {T}: Draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{C}{C}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{C}{C}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EndbringersRevel.java b/Mage.Sets/src/mage/cards/e/EndbringersRevel.java index b9fa7526017..7dec2ec891a 100644 --- a/Mage.Sets/src/mage/cards/e/EndbringersRevel.java +++ b/Mage.Sets/src/mage/cards/e/EndbringersRevel.java @@ -24,7 +24,7 @@ public final class EndbringersRevel extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}"); // {4}: Return target creature card from a graveyard to its owner's hand. Any player may activate this ability but only any time they could cast a sorcery. - ActivateAsSorceryActivatedAbility ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{4}")); + ActivateAsSorceryActivatedAbility ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{4}")); ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard"))); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/e/Endoskeleton.java b/Mage.Sets/src/mage/cards/e/Endoskeleton.java index 8651036f3ff..394645981c8 100644 --- a/Mage.Sets/src/mage/cards/e/Endoskeleton.java +++ b/Mage.Sets/src/mage/cards/e/Endoskeleton.java @@ -31,7 +31,7 @@ public final class Endoskeleton extends CardImpl { // {2}, {tap}: Target creature gets +0/+3 for as long as Endoskeleton remains tapped. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostTargetEffect(0, 3, Duration.Custom), SourceTappedCondition.TAPPED, - "target creature gets +0/+3 for as long as {this} remains tapped"), new ManaCostsImpl("{2}")); + "target creature gets +0/+3 for as long as {this} remains tapped"), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EnergyStorm.java b/Mage.Sets/src/mage/cards/e/EnergyStorm.java index d62770ac074..e17ccdd1159 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyStorm.java +++ b/Mage.Sets/src/mage/cards/e/EnergyStorm.java @@ -34,7 +34,7 @@ public final class EnergyStorm extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); // Cumulative upkeep {1} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // Prevent all damage that would be dealt by instant and sorcery spells. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/e/EnergyVortex.java b/Mage.Sets/src/mage/cards/e/EnergyVortex.java index e18e704d1cd..e3eaa828ad2 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyVortex.java +++ b/Mage.Sets/src/mage/cards/e/EnergyVortex.java @@ -57,7 +57,7 @@ public final class EnergyVortex extends CardImpl { new AddCountersSourceEffect( CounterType.VORTEX.createInstance(), ManacostVariableValue.REGULAR, true - ), new ManaCostsImpl("{X}"), + ), new ManaCostsImpl<>("{X}"), new IsStepCondition(PhaseStep.UPKEEP) )); } diff --git a/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java b/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java index 16c1575cbc9..579d4646d98 100644 --- a/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java +++ b/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java @@ -32,7 +32,7 @@ public final class EngineeredExplosives extends CardImpl { // Sunburst this.addAbility(new SunburstAbility(this)); // {2}, Sacrifice Engineered Explosives: Destroy each nonland permanent with converted mana cost equal to the number of charge counters on Engineered Explosives. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EngineeredExplosivesEffect(), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EngineeredExplosivesEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EngulfingFlames.java b/Mage.Sets/src/mage/cards/e/EngulfingFlames.java index 7f81b63295d..0d9572383cf 100644 --- a/Mage.Sets/src/mage/cards/e/EngulfingFlames.java +++ b/Mage.Sets/src/mage/cards/e/EngulfingFlames.java @@ -28,7 +28,7 @@ public final class EngulfingFlames extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new CantRegenerateTargetEffect(Duration.EndOfTurn, "It")); // Flashback {3}{R} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{3}{R}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{3}{R}"))); } private EngulfingFlames(final EngulfingFlames card) { diff --git a/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java b/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java index 8d3bb970cbe..4d1c59ecffa 100644 --- a/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java +++ b/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java @@ -31,7 +31,7 @@ public final class EnigmaEidolon extends CardImpl { this.toughness = new MageInt(2); // {U}, Sacrifice Enigma Eidolon: Target player puts the top three cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java index 6d0eda2dae6..7fbe80baf97 100644 --- a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java +++ b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java @@ -30,11 +30,11 @@ public final class EnsouledScimitar extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // {3}: Ensouled Scimitar becomes a 1/5 Spirit artifact creature with flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new EnsouledScimitarToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{3}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new EnsouledScimitarToken(), "", Duration.EndOfTurn), new ManaCostsImpl<>("{3}"))); // Equipped creature gets +1/+5. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 5))); // Equip {2} - this.addAbility(new EquipAbility(Outcome.BoostCreature, new ManaCostsImpl("{2}"))); + this.addAbility(new EquipAbility(Outcome.BoostCreature, new ManaCostsImpl<>("{2}"))); } private EnsouledScimitar(final EnsouledScimitar card) { diff --git a/Mage.Sets/src/mage/cards/e/EntrancingLyre.java b/Mage.Sets/src/mage/cards/e/EntrancingLyre.java index 2aa1717c1a3..793d29e54b0 100644 --- a/Mage.Sets/src/mage/cards/e/EntrancingLyre.java +++ b/Mage.Sets/src/mage/cards/e/EntrancingLyre.java @@ -33,7 +33,7 @@ public final class EntrancingLyre extends CardImpl { // {X}, {T}: Tap target creature with power X or less. It doesn't untap during its controller's untap step for as long as Entrancing Lyre remains tapped. Ability ability = new SimpleActivatedAbility( - new TapTargetEffect("tap target creature with power X or less"), new ManaCostsImpl("{X}") + new TapTargetEffect("tap target creature with power X or less"), new ManaCostsImpl<>("{X}") ); ability.addCost(new TapSourceCost()); ability.addEffect(new DontUntapAsLongAsSourceTappedEffect()); diff --git a/Mage.Sets/src/mage/cards/e/EntreatTheAngels.java b/Mage.Sets/src/mage/cards/e/EntreatTheAngels.java index 719f833f991..7555e381028 100644 --- a/Mage.Sets/src/mage/cards/e/EntreatTheAngels.java +++ b/Mage.Sets/src/mage/cards/e/EntreatTheAngels.java @@ -25,7 +25,7 @@ public final class EntreatTheAngels extends CardImpl { this.getSpellAbility().addEffect(new CreateTokenEffect(new AngelToken(), ManacostVariableValue.REGULAR)); // Miracle {X}{W}{W} - this.addAbility(new MiracleAbility(this, new ManaCostsImpl("{X}{W}{W}"))); + this.addAbility(new MiracleAbility(this, new ManaCostsImpl<>("{X}{W}{W}"))); } private EntreatTheAngels(final EntreatTheAngels card) { diff --git a/Mage.Sets/src/mage/cards/e/EntropicEidolon.java b/Mage.Sets/src/mage/cards/e/EntropicEidolon.java index fa6dd7462a1..86458dbf6a7 100644 --- a/Mage.Sets/src/mage/cards/e/EntropicEidolon.java +++ b/Mage.Sets/src/mage/cards/e/EntropicEidolon.java @@ -33,7 +33,7 @@ public final class EntropicEidolon extends CardImpl { this.toughness = new MageInt(2); // {B}, Sacrifice Entropic Eidolon: Target player loses 1 life and you gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}")); Effect effect = new GainLifeEffect(1); effect.setText("and you gain 1 life"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/e/EpharasRadiance.java b/Mage.Sets/src/mage/cards/e/EpharasRadiance.java index 2f56d72d045..9578d46b640 100644 --- a/Mage.Sets/src/mage/cards/e/EpharasRadiance.java +++ b/Mage.Sets/src/mage/cards/e/EpharasRadiance.java @@ -35,7 +35,7 @@ public final class EpharasRadiance extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature has "{1}{W}, {T}: You gain 3 life." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new ManaCostsImpl("{1}{W}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java b/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java index de080e55076..2cf6a33efb0 100644 --- a/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java +++ b/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java @@ -41,7 +41,7 @@ public final class EpiphanyStorm extends CardImpl { this.addAbility(ability); // Enchanted creature has "{R}, {T}, Discard a card: Draw a card." - Ability drawAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{R}")); + Ability drawAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{R}")); drawAbility.addCost(new TapSourceCost()); drawAbility.addCost(new DiscardCardCost()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(drawAbility, AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/e/EpitaphGolem.java b/Mage.Sets/src/mage/cards/e/EpitaphGolem.java index 96f6c307d01..d6635144ef5 100644 --- a/Mage.Sets/src/mage/cards/e/EpitaphGolem.java +++ b/Mage.Sets/src/mage/cards/e/EpitaphGolem.java @@ -30,7 +30,7 @@ public final class EpitaphGolem extends CardImpl { Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false), - new ManaCostsImpl("{2}")); + new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCardInYourGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ErebosBleakHearted.java b/Mage.Sets/src/mage/cards/e/ErebosBleakHearted.java index abf4a2fa75a..5bb02358ee2 100644 --- a/Mage.Sets/src/mage/cards/e/ErebosBleakHearted.java +++ b/Mage.Sets/src/mage/cards/e/ErebosBleakHearted.java @@ -62,7 +62,7 @@ public final class ErebosBleakHearted extends CardImpl { // {1}{B}, Sacrifice another creature: Target creature gets -2/-1 until end of turn. Ability ability = new SimpleActivatedAbility( - new BoostTargetEffect(-2, -1), new ManaCostsImpl("{1}{B}") + new BoostTargetEffect(-2, -1), new ManaCostsImpl<>("{1}{B}") ); ability.addCost(new SacrificeTargetCost( new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE) diff --git a/Mage.Sets/src/mage/cards/e/ErebosGodOfTheDead.java b/Mage.Sets/src/mage/cards/e/ErebosGodOfTheDead.java index dde3940d613..ce31e238ce4 100644 --- a/Mage.Sets/src/mage/cards/e/ErebosGodOfTheDead.java +++ b/Mage.Sets/src/mage/cards/e/ErebosGodOfTheDead.java @@ -44,7 +44,7 @@ public final class ErebosGodOfTheDead extends CardImpl { // {1}{B}, Pay 2 life: Draw a card. Ability ability = new SimpleActivatedAbility( - new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{1}{B}") + new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{B}") ); ability.addCost(new PayLifeCost(2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EronTheRelentless.java b/Mage.Sets/src/mage/cards/e/EronTheRelentless.java index 87e45e704d9..b39ee0cba53 100644 --- a/Mage.Sets/src/mage/cards/e/EronTheRelentless.java +++ b/Mage.Sets/src/mage/cards/e/EronTheRelentless.java @@ -33,7 +33,7 @@ public final class EronTheRelentless extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // {R}{R}{R}: Regenerate Eron the Relentless. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{R}{R}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{R}{R}{R}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/Erosion.java b/Mage.Sets/src/mage/cards/e/Erosion.java index a7052b3ca46..1ef4413f597 100644 --- a/Mage.Sets/src/mage/cards/e/Erosion.java +++ b/Mage.Sets/src/mage/cards/e/Erosion.java @@ -38,7 +38,7 @@ public final class Erosion extends CardImpl { this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // At the beginning of the upkeep of enchanted land's controller, destroy that land unless that player pays {1} or 1 life. - Effect effect = new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new DestroyAttachedToEffect("enchanted land"), new OrCost("{1} or 1 life", new ManaCostsImpl("{1}"), new PayLifeCost(1))); + Effect effect = new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new DestroyAttachedToEffect("enchanted land"), new OrCost("{1} or 1 life", new ManaCostsImpl<>("{1}"), new PayLifeCost(1))); effect.setText("destroy that land unless that player pays {1} or 1 life"); this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.CONTROLLER_ATTACHED_TO, false, true, "At the beginning of the upkeep of enchanted land's controller, ")); } diff --git a/Mage.Sets/src/mage/cards/e/ErrantEphemeron.java b/Mage.Sets/src/mage/cards/e/ErrantEphemeron.java index 415ad0202e6..29c86d8281a 100644 --- a/Mage.Sets/src/mage/cards/e/ErrantEphemeron.java +++ b/Mage.Sets/src/mage/cards/e/ErrantEphemeron.java @@ -27,7 +27,7 @@ public final class ErrantEphemeron extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Suspend 4-{1}{U} - this.addAbility(new SuspendAbility(4, new ManaCostsImpl("{1}{U}"), this)); + this.addAbility(new SuspendAbility(4, new ManaCostsImpl<>("{1}{U}"), this)); } private ErrantEphemeron(final ErrantEphemeron card) { diff --git a/Mage.Sets/src/mage/cards/e/ErraticPortal.java b/Mage.Sets/src/mage/cards/e/ErraticPortal.java index adb5c0dc385..86c9c562839 100644 --- a/Mage.Sets/src/mage/cards/e/ErraticPortal.java +++ b/Mage.Sets/src/mage/cards/e/ErraticPortal.java @@ -29,7 +29,7 @@ public final class ErraticPortal extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {1}, {tap}: Return target creature to its owner's hand unless its controller pays {1}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ErraticPortalEffect(new GenericManaCost(1)), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ErraticPortalEffect(new GenericManaCost(1)), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ErraticVisionary.java b/Mage.Sets/src/mage/cards/e/ErraticVisionary.java index 8ae0c49a799..4e42922c271 100644 --- a/Mage.Sets/src/mage/cards/e/ErraticVisionary.java +++ b/Mage.Sets/src/mage/cards/e/ErraticVisionary.java @@ -28,7 +28,7 @@ public final class ErraticVisionary extends CardImpl { // {1}{U}, {T}: Draw a card, then discard a card. Ability ability = new SimpleActivatedAbility( - new DrawDiscardControllerEffect(), new ManaCostsImpl("{1}{U}") + new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{1}{U}") ); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java b/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java index 6dbcf1eb89a..358cb16350a 100644 --- a/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java +++ b/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java @@ -42,7 +42,7 @@ public final class ErtaiTheCorrupted extends CardImpl { this.toughness = new MageInt(4); // {U}, {tap}, Sacrifice a creature or enchantment: Counter target spell. - 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 SacrificeTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/cards/e/ErtaiWizardAdept.java b/Mage.Sets/src/mage/cards/e/ErtaiWizardAdept.java index 984e82df2d6..631989af72f 100644 --- a/Mage.Sets/src/mage/cards/e/ErtaiWizardAdept.java +++ b/Mage.Sets/src/mage/cards/e/ErtaiWizardAdept.java @@ -32,7 +32,7 @@ public final class ErtaiWizardAdept extends CardImpl { this.toughness = new MageInt(1); // {2}{U}{U}, {tap}: Counter target spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl("{2}{U}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{2}{U}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EscapeArtist.java b/Mage.Sets/src/mage/cards/e/EscapeArtist.java index aa8b893cfb1..a9c4db0f83c 100644 --- a/Mage.Sets/src/mage/cards/e/EscapeArtist.java +++ b/Mage.Sets/src/mage/cards/e/EscapeArtist.java @@ -33,7 +33,7 @@ public final class EscapeArtist extends CardImpl { // Escape Artist can't be blocked. this.addAbility(new CantBeBlockedSourceAbility()); // {U}, Discard a card: Return Escape Artist to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}")); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EscapeRoutes.java b/Mage.Sets/src/mage/cards/e/EscapeRoutes.java index 87ce9894b30..fb06079763b 100644 --- a/Mage.Sets/src/mage/cards/e/EscapeRoutes.java +++ b/Mage.Sets/src/mage/cards/e/EscapeRoutes.java @@ -34,7 +34,7 @@ public final class EscapeRoutes extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}"); // {2}{U}: Return target white or black creature you control to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EssenceDepleter.java b/Mage.Sets/src/mage/cards/e/EssenceDepleter.java index 27d1340fe4d..b052c19fe64 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceDepleter.java +++ b/Mage.Sets/src/mage/cards/e/EssenceDepleter.java @@ -32,7 +32,7 @@ public final class EssenceDepleter extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // {1}{C}: Target opponent loses 1 life and you gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{1}{C}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{1}{C}")); ability.addEffect(new GainLifeEffect(1).concatBy("and")); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EssenceFracture.java b/Mage.Sets/src/mage/cards/e/EssenceFracture.java index 8c4e5b389a0..520d5342653 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceFracture.java +++ b/Mage.Sets/src/mage/cards/e/EssenceFracture.java @@ -27,7 +27,7 @@ public final class EssenceFracture extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(2)); // Cycling {2}{U} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}{U}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}{U}"))); } private EssenceFracture(final EssenceFracture card) { diff --git a/Mage.Sets/src/mage/cards/e/EtchedMonstrosity.java b/Mage.Sets/src/mage/cards/e/EtchedMonstrosity.java index d3fd98c5434..3f4cd76efc0 100644 --- a/Mage.Sets/src/mage/cards/e/EtchedMonstrosity.java +++ b/Mage.Sets/src/mage/cards/e/EtchedMonstrosity.java @@ -31,7 +31,7 @@ public final class EtchedMonstrosity extends CardImpl { this.power = new MageInt(10); this.toughness = new MageInt(10); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(5)), " with five -1/-1 counters on it")); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(3), new ManaCostsImpl("{W}{U}{B}{R}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(3), new ManaCostsImpl<>("{W}{U}{B}{R}{G}")); ability.addCost(new RemoveCountersSourceCost(CounterType.M1M1.createInstance(5))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EtchedOracle.java b/Mage.Sets/src/mage/cards/e/EtchedOracle.java index d9903ce57df..e9383989b54 100644 --- a/Mage.Sets/src/mage/cards/e/EtchedOracle.java +++ b/Mage.Sets/src/mage/cards/e/EtchedOracle.java @@ -32,7 +32,7 @@ public final class EtchedOracle extends CardImpl { // Sunburst (This enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.) this.addAbility(new SunburstAbility(this)); // {1}, Remove four +1/+1 counters from Etched Oracle: Target player draws three cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(3), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(3), new ManaCostsImpl<>("{1}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(4))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EternalDragon.java b/Mage.Sets/src/mage/cards/e/EternalDragon.java index a2d68b9d610..8ff895e6631 100644 --- a/Mage.Sets/src/mage/cards/e/EternalDragon.java +++ b/Mage.Sets/src/mage/cards/e/EternalDragon.java @@ -38,13 +38,13 @@ public final class EternalDragon extends CardImpl { // {3}{W}{W}: Return Eternal Dragon from your graveyard to your hand. Activate this ability only during your upkeep. Ability ability = new ConditionalActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), - new ManaCostsImpl("{3}{W}{W}"), + new ManaCostsImpl<>("{3}{W}{W}"), new IsStepCondition(PhaseStep.UPKEEP), null ); this.addAbility(ability); // PlainscyclingAbility {2} - this.addAbility(new PlainscyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new PlainscyclingAbility(new ManaCostsImpl<>("{2}"))); } private EternalDragon(final EternalDragon card) { diff --git a/Mage.Sets/src/mage/cards/e/EternalTaskmaster.java b/Mage.Sets/src/mage/cards/e/EternalTaskmaster.java index 919dd61f1d3..16b2b38cea0 100644 --- a/Mage.Sets/src/mage/cards/e/EternalTaskmaster.java +++ b/Mage.Sets/src/mage/cards/e/EternalTaskmaster.java @@ -33,7 +33,7 @@ public final class EternalTaskmaster extends CardImpl { // Whenever Eternal Taskmaster attacks, you may pay {2}{B}. If you do, return target creature card from your graveyard to your hand. Ability ability = new AttacksTriggeredAbility(new DoIfCostPaid( - new ReturnToHandTargetEffect(), new ManaCostsImpl("{2}{B}") + new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{2}{B}") ), false); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EtherealAbsolution.java b/Mage.Sets/src/mage/cards/e/EtherealAbsolution.java index 45cb967fb4a..deab6ed9f3c 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealAbsolution.java +++ b/Mage.Sets/src/mage/cards/e/EtherealAbsolution.java @@ -43,7 +43,7 @@ public final class EtherealAbsolution extends CardImpl { // {2}{W}{B}: Exile target card from an opponent's graveyard. If it was a creature card, you create a 1/1 white and black Spirit creature token with flying. Ability ability = new SimpleActivatedAbility( - new EtherealAbsolutionEffect(), new ManaCostsImpl("{2}{W}{B}") + new EtherealAbsolutionEffect(), new ManaCostsImpl<>("{2}{W}{B}") ); ability.addTarget(new TargetCardInOpponentsGraveyard(StaticFilters.FILTER_CARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EtherealUsher.java b/Mage.Sets/src/mage/cards/e/EtherealUsher.java index fdb038cc2ec..41b2ac0645a 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealUsher.java +++ b/Mage.Sets/src/mage/cards/e/EtherealUsher.java @@ -32,7 +32,7 @@ public final class EtherealUsher extends CardImpl { // {U}, {tap}: Target creature can't be blocked this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), - new ManaCostsImpl("{U}")); + new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EtheriumAbomination.java b/Mage.Sets/src/mage/cards/e/EtheriumAbomination.java index abd68a96582..0b7efacea57 100644 --- a/Mage.Sets/src/mage/cards/e/EtheriumAbomination.java +++ b/Mage.Sets/src/mage/cards/e/EtheriumAbomination.java @@ -24,7 +24,7 @@ public final class EtheriumAbomination extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(3); - this.addAbility(new UnearthAbility(new ManaCostsImpl("{1}{U}{B}"))); + this.addAbility(new UnearthAbility(new ManaCostsImpl<>("{1}{U}{B}"))); } public EtheriumAbomination (final EtheriumAbomination card) { diff --git a/Mage.Sets/src/mage/cards/e/EtheriumAstrolabe.java b/Mage.Sets/src/mage/cards/e/EtheriumAstrolabe.java index 40e21c4195d..57445e0cfd6 100644 --- a/Mage.Sets/src/mage/cards/e/EtheriumAstrolabe.java +++ b/Mage.Sets/src/mage/cards/e/EtheriumAstrolabe.java @@ -34,7 +34,7 @@ public final class EtheriumAstrolabe extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // {B}, {tap}, Sacrifice an artifact: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EtheriumHornSorcerer.java b/Mage.Sets/src/mage/cards/e/EtheriumHornSorcerer.java index ad59711900b..937a026afe1 100644 --- a/Mage.Sets/src/mage/cards/e/EtheriumHornSorcerer.java +++ b/Mage.Sets/src/mage/cards/e/EtheriumHornSorcerer.java @@ -29,7 +29,7 @@ public final class EtheriumHornSorcerer extends CardImpl { this.toughness = new MageInt(6); // {1}{U}{R}: Return Etherium-Horn Sorcerer to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{1}{U}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}{R}"))); // Cascade this.addAbility(new CascadeAbility()); diff --git a/Mage.Sets/src/mage/cards/e/EtherswornAdjudicator.java b/Mage.Sets/src/mage/cards/e/EtherswornAdjudicator.java index e292362a450..2d4825f6191 100644 --- a/Mage.Sets/src/mage/cards/e/EtherswornAdjudicator.java +++ b/Mage.Sets/src/mage/cards/e/EtherswornAdjudicator.java @@ -45,13 +45,13 @@ public final class EtherswornAdjudicator extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{W}{B}, {T}: Destroy target creature or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{W}{B}")); ability.addCost(new TapSourceCost()); Target target = new TargetPermanent(filter); ability.addTarget(target); this.addAbility(ability); // {2}{U}: Untap Ethersworn Adjudicator. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{2}{U}"))); } private EtherswornAdjudicator(final EtherswornAdjudicator card) { diff --git a/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java b/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java index 85ec2c702e5..c35b8c2222f 100644 --- a/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java +++ b/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java @@ -36,7 +36,7 @@ public final class EvanescentIntellect extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature has "{1}{U}, {T}: Target player puts the top three cards of their library into their graveyard." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(3), new ManaCostsImpl("{1}{U}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(3), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/e/EverflameEidolon.java b/Mage.Sets/src/mage/cards/e/EverflameEidolon.java index d19a26764b4..239c35695b5 100644 --- a/Mage.Sets/src/mage/cards/e/EverflameEidolon.java +++ b/Mage.Sets/src/mage/cards/e/EverflameEidolon.java @@ -34,7 +34,7 @@ public final class EverflameEidolon extends CardImpl { // Bestow {2}{R} this.addAbility(new BestowAbility(this, "{2}{R}")); // {R}: Everflame Eidolon gets +1/+0 until end of turn. If it's an Aura, enchanted creature gets +1/+0 until end of turn instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new EverflameEidolonEffect(), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new EverflameEidolonEffect(), new ManaCostsImpl<>("{R}"))); // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/e/EvergloveCourier.java b/Mage.Sets/src/mage/cards/e/EvergloveCourier.java index 2e2138b2fa3..4b8ea2fa0ae 100644 --- a/Mage.Sets/src/mage/cards/e/EvergloveCourier.java +++ b/Mage.Sets/src/mage/cards/e/EvergloveCourier.java @@ -45,7 +45,7 @@ public final class EvergloveCourier extends CardImpl { // {2}{G}, {tap}: Target Elf creature gets +2/+2 and has trample for as long as Everglove Courier remains tapped. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostTargetEffect(2, 2, Duration.Custom), SourceTappedCondition.TAPPED, - "target Elf creature gets +2/+2"), new ManaCostsImpl("{2}{G}")); + "target Elf creature gets +2/+2"), new ManaCostsImpl<>("{2}{G}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.Custom), SourceTappedCondition.TAPPED,"and has trample for as long as {this} remains tapped")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/EvernightShade.java b/Mage.Sets/src/mage/cards/e/EvernightShade.java index 0c05ae69d79..f5398ddf95e 100644 --- a/Mage.Sets/src/mage/cards/e/EvernightShade.java +++ b/Mage.Sets/src/mage/cards/e/EvernightShade.java @@ -27,7 +27,7 @@ public final class EvernightShade extends CardImpl { this.toughness = new MageInt(1); // {B}: Evernight 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}"))); this.addAbility(new UndyingAbility()); } diff --git a/Mage.Sets/src/mage/cards/e/Evershrike.java b/Mage.Sets/src/mage/cards/e/Evershrike.java index 2040992da91..d0779b42ed2 100644 --- a/Mage.Sets/src/mage/cards/e/Evershrike.java +++ b/Mage.Sets/src/mage/cards/e/Evershrike.java @@ -46,7 +46,7 @@ public final class Evershrike extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); // {X}{WB}{WB}: Return Evershrike from your graveyard to the battlefield. You may put an Aura card with converted mana cost X or less from your hand onto the battlefield attached to it. If you don't, exile Evershrike. - this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new EvershrikeEffect(), new ManaCostsImpl("{X}{W/B}{W/B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new EvershrikeEffect(), new ManaCostsImpl<>("{X}{W/B}{W/B}"))); } private Evershrike(final Evershrike card) { diff --git a/Mage.Sets/src/mage/cards/e/EvilTwin.java b/Mage.Sets/src/mage/cards/e/EvilTwin.java index 058ce6f2afb..038f3c91587 100644 --- a/Mage.Sets/src/mage/cards/e/EvilTwin.java +++ b/Mage.Sets/src/mage/cards/e/EvilTwin.java @@ -66,7 +66,7 @@ class EvilTwinCopyApplier extends CopyApplier { @Override public boolean apply(Game game, MageObject blueprint, Ability source, UUID copyToObjectId) { - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{U}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{U}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); blueprint.getAbilities().add(ability); diff --git a/Mage.Sets/src/mage/cards/e/EvolutionVat.java b/Mage.Sets/src/mage/cards/e/EvolutionVat.java index 5947a8a90be..2c427997af0 100644 --- a/Mage.Sets/src/mage/cards/e/EvolutionVat.java +++ b/Mage.Sets/src/mage/cards/e/EvolutionVat.java @@ -30,14 +30,14 @@ public final class EvolutionVat extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {3}, {tap}: Tap target creature and put a +1/+1 counter on it. Until end of turn, that creature gains "{2}{G}{U}: Double the number of +1/+1 counters on this creature." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{3}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); Effect effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance()); effect.setText("and put a +1/+1 counter on it"); ability.addEffect(effect); effect = new AddCountersSourceEffect(CounterType.P1P1.createInstance(), new CountersSourceCount(CounterType.P1P1), false); effect.setText("Double the number of +1/+1 counters on this creature"); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{G}{U}")); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{G}{U}")); ability.addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn, "Until end of turn, that creature gains \"{2}{G}{U}: Double the number of +1/+1 counters on this creature.\"")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/e/EvolutionaryLeap.java b/Mage.Sets/src/mage/cards/e/EvolutionaryLeap.java index 83f81690a68..5bf31d26da8 100644 --- a/Mage.Sets/src/mage/cards/e/EvolutionaryLeap.java +++ b/Mage.Sets/src/mage/cards/e/EvolutionaryLeap.java @@ -24,7 +24,7 @@ public final class EvolutionaryLeap extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); // {G}, Sacrifice a creature: Reveal cards from the top of your library until you reveal a creature card. Put that card into your hand and the rest on the bottom of your library in a random order. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RevealCardsFromLibraryUntilEffect(StaticFilters.FILTER_CARD_CREATURE, Zone.HAND, Zone.LIBRARY), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RevealCardsFromLibraryUntilEffect(StaticFilters.FILTER_CARD_CREATURE, Zone.HAND, Zone.LIBRARY), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EvraHalcyonWitness.java b/Mage.Sets/src/mage/cards/e/EvraHalcyonWitness.java index 9d216e41e93..af3aa1334bf 100644 --- a/Mage.Sets/src/mage/cards/e/EvraHalcyonWitness.java +++ b/Mage.Sets/src/mage/cards/e/EvraHalcyonWitness.java @@ -40,7 +40,7 @@ public final class EvraHalcyonWitness extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // {4}: Exchange your life total with Evra, Halcyon Witness's power. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new EvraHalcyonWitnessEffect(), new ManaCostsImpl("{4}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new EvraHalcyonWitnessEffect(), new ManaCostsImpl<>("{4}"))); } private EvraHalcyonWitness(final EvraHalcyonWitness card) { diff --git a/Mage.Sets/src/mage/cards/e/EwokFiredancers.java b/Mage.Sets/src/mage/cards/e/EwokFiredancers.java index de3dcab8aba..a2102e4ab4b 100644 --- a/Mage.Sets/src/mage/cards/e/EwokFiredancers.java +++ b/Mage.Sets/src/mage/cards/e/EwokFiredancers.java @@ -31,7 +31,7 @@ public final class EwokFiredancers extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {1}{R}: Ewok Firedancers gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private EwokFiredancers(final EwokFiredancers card) { diff --git a/Mage.Sets/src/mage/cards/e/ExaltedAngel.java b/Mage.Sets/src/mage/cards/e/ExaltedAngel.java index 8c22fc6483f..7361dd70a11 100644 --- a/Mage.Sets/src/mage/cards/e/ExaltedAngel.java +++ b/Mage.Sets/src/mage/cards/e/ExaltedAngel.java @@ -30,7 +30,7 @@ public final class ExaltedAngel extends CardImpl { // Whenever Exalted Angel deals damage, you gain that much life. this.addAbility(new DealsDamageGainLifeSourceTriggeredAbility()); // Morph {2}{W}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{W}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{W}{W}"))); } private ExaltedAngel(final ExaltedAngel card) { diff --git a/Mage.Sets/src/mage/cards/e/Excavation.java b/Mage.Sets/src/mage/cards/e/Excavation.java index 82e343390f6..6d22aec3d73 100644 --- a/Mage.Sets/src/mage/cards/e/Excavation.java +++ b/Mage.Sets/src/mage/cards/e/Excavation.java @@ -30,7 +30,7 @@ public final class Excavation extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); // {1}, Sacrifice a land: Draw a card. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{1}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent("a land")))); ability.setMayActivate(TargetController.ANY); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ExecutionersCapsule.java b/Mage.Sets/src/mage/cards/e/ExecutionersCapsule.java index a8ef97782e3..044c796c9f3 100644 --- a/Mage.Sets/src/mage/cards/e/ExecutionersCapsule.java +++ b/Mage.Sets/src/mage/cards/e/ExecutionersCapsule.java @@ -22,7 +22,7 @@ public final class ExecutionersCapsule extends CardImpl { public ExecutionersCapsule(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{B}"); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{B}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK)); diff --git a/Mage.Sets/src/mage/cards/e/Exorcist.java b/Mage.Sets/src/mage/cards/e/Exorcist.java index 98a0dfcceb3..3ba9d2b61ce 100644 --- a/Mage.Sets/src/mage/cards/e/Exorcist.java +++ b/Mage.Sets/src/mage/cards/e/Exorcist.java @@ -39,7 +39,7 @@ public final class Exorcist extends CardImpl { // {1}{W}, {tap}: Destroy target black creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), - new ManaCostsImpl("{1}{W}")); + new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ExperimentalFrenzy.java b/Mage.Sets/src/mage/cards/e/ExperimentalFrenzy.java index c376398c33f..feb44754499 100644 --- a/Mage.Sets/src/mage/cards/e/ExperimentalFrenzy.java +++ b/Mage.Sets/src/mage/cards/e/ExperimentalFrenzy.java @@ -37,7 +37,7 @@ public final class ExperimentalFrenzy extends CardImpl { this.addAbility(new SimpleStaticAbility(new ExperimentalFrenzyRestrictionEffect())); // {3}{R}: Destroy Experimental Frenzy. - this.addAbility(new SimpleActivatedAbility(new DestroySourceEffect(), new ManaCostsImpl("{3}{R}"))); + this.addAbility(new SimpleActivatedAbility(new DestroySourceEffect(), new ManaCostsImpl<>("{3}{R}"))); } private ExperimentalFrenzy(final ExperimentalFrenzy card) { diff --git a/Mage.Sets/src/mage/cards/e/Expunge.java b/Mage.Sets/src/mage/cards/e/Expunge.java index 8e1d3b946d4..eb89c44253f 100644 --- a/Mage.Sets/src/mage/cards/e/Expunge.java +++ b/Mage.Sets/src/mage/cards/e/Expunge.java @@ -36,7 +36,7 @@ public final class Expunge extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); // Cycling {2} ({2}, Discard this card: Draw a card.) - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java index f59cead2806..c1fd4658197 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java @@ -45,7 +45,7 @@ public final class EyeOfUgin extends CardImpl { Ability searchAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), new TapSourceCost()); - searchAbility.addCost(new ManaCostsImpl("{7}")); + searchAbility.addCost(new ManaCostsImpl<>("{7}")); this.addAbility(searchAbility); } diff --git a/Mage.Sets/src/mage/cards/e/EyesEverywhere.java b/Mage.Sets/src/mage/cards/e/EyesEverywhere.java index 8407fa700ed..6f840d3b253 100644 --- a/Mage.Sets/src/mage/cards/e/EyesEverywhere.java +++ b/Mage.Sets/src/mage/cards/e/EyesEverywhere.java @@ -36,7 +36,7 @@ public final class EyesEverywhere extends CardImpl { new ExchangeControlTargetEffect( Duration.EndOfGame, "Exchange control of {this} " + "and target nonland permanent", true - ), new ManaCostsImpl("{5}{U}") + ), new ManaCostsImpl<>("{5}{U}") ); ability.addTarget(new TargetNonlandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EyesOfTheWatcher.java b/Mage.Sets/src/mage/cards/e/EyesOfTheWatcher.java index 09814ac2859..583c89a863c 100644 --- a/Mage.Sets/src/mage/cards/e/EyesOfTheWatcher.java +++ b/Mage.Sets/src/mage/cards/e/EyesOfTheWatcher.java @@ -27,7 +27,7 @@ public final class EyesOfTheWatcher extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); // Whenever you cast an instant or sorcery spell, you may pay {1}. If you do, scry 2. - this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(new ScryEffect(2), new ManaCostsImpl("{1}")), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(new ScryEffect(2), new ManaCostsImpl<>("{1}")), filter, false)); } private EyesOfTheWatcher(final EyesOfTheWatcher card) { diff --git a/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java b/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java index a7a960981ae..217df9fc4e6 100644 --- a/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java +++ b/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java @@ -44,7 +44,7 @@ public final class EzuriRenegadeLeader extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ezuriRegen = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{G}")); + Ability ezuriRegen = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}")); TargetControlledCreaturePermanent regenTarget = new TargetControlledCreaturePermanent(1, 1, notEzuri, false); regenTarget.setTargetName("another target Elf"); ezuriRegen.addTarget(regenTarget); @@ -52,7 +52,7 @@ public final class EzuriRenegadeLeader extends CardImpl { Ability ezuriBoost = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(3, 3, Duration.EndOfTurn, elfFilter, false), - new ManaCostsImpl("{2}{G}{G}{G}")); + new ManaCostsImpl<>("{2}{G}{G}{G}")); ezuriBoost.addEffect(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, elfFilter)); this.addAbility(ezuriBoost); }