From a1bc4630f533cacfc20d02a14167715b51630bba Mon Sep 17 00:00:00 2001 From: DeepCrimson <98864333+DeepCrimson@users.noreply.github.com> Date: Mon, 6 Jun 2022 05:39:54 -0700 Subject: [PATCH] Refactor: Fix raw use of parameterized class 'ManaCostsImpl' - 'i' cards (#9058) --- Mage.Sets/src/mage/cards/i/IcatianCrier.java | 2 +- Mage.Sets/src/mage/cards/i/IcatianInfantry.java | 4 ++-- Mage.Sets/src/mage/cards/i/IcatianLieutenant.java | 2 +- Mage.Sets/src/mage/cards/i/IcatianPriest.java | 2 +- Mage.Sets/src/mage/cards/i/IcatianScout.java | 2 +- Mage.Sets/src/mage/cards/i/IceCauldron.java | 2 +- Mage.Sets/src/mage/cards/i/IceCave.java | 2 +- Mage.Sets/src/mage/cards/i/Iceberg.java | 2 +- Mage.Sets/src/mage/cards/i/IcebindPillar.java | 2 +- Mage.Sets/src/mage/cards/i/Icefall.java | 2 +- Mage.Sets/src/mage/cards/i/IcefeatherAven.java | 2 +- Mage.Sets/src/mage/cards/i/IcehideTroll.java | 2 +- Mage.Sets/src/mage/cards/i/IchorSlick.java | 4 ++-- Mage.Sets/src/mage/cards/i/IdleThoughts.java | 2 +- Mage.Sets/src/mage/cards/i/IfhBiffEfreet.java | 2 +- Mage.Sets/src/mage/cards/i/IfnirDeadlands.java | 2 +- Mage.Sets/src/mage/cards/i/IgneousCur.java | 2 +- Mage.Sets/src/mage/cards/i/IgneousGolem.java | 2 +- Mage.Sets/src/mage/cards/i/IgneousPouncer.java | 4 ++-- Mage.Sets/src/mage/cards/i/IgniteTheFuture.java | 2 +- Mage.Sets/src/mage/cards/i/IgnitionTeam.java | 2 +- Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java | 2 +- Mage.Sets/src/mage/cards/i/IkiralOutrider.java | 2 +- Mage.Sets/src/mage/cards/i/IllGottenInheritance.java | 2 +- Mage.Sets/src/mage/cards/i/IlluminatedWings.java | 2 +- Mage.Sets/src/mage/cards/i/IllusionaryForces.java | 2 +- Mage.Sets/src/mage/cards/i/IllusionaryPresence.java | 2 +- Mage.Sets/src/mage/cards/i/IllusionaryTerrain.java | 2 +- Mage.Sets/src/mage/cards/i/IllusionaryWall.java | 2 +- Mage.Sets/src/mage/cards/i/ImaginaryThreats.java | 2 +- Mage.Sets/src/mage/cards/i/ImmobilizerEldrazi.java | 2 +- Mage.Sets/src/mage/cards/i/ImmobilizingInk.java | 2 +- Mage.Sets/src/mage/cards/i/ImmolationShaman.java | 2 +- Mage.Sets/src/mage/cards/i/ImperialGunner.java | 2 +- Mage.Sets/src/mage/cards/i/ImperialHellkite.java | 2 +- Mage.Sets/src/mage/cards/i/ImplementOfCombustion.java | 2 +- Mage.Sets/src/mage/cards/i/ImplementOfExamination.java | 2 +- Mage.Sets/src/mage/cards/i/ImplementOfFerocity.java | 2 +- Mage.Sets/src/mage/cards/i/ImplementOfImprovement.java | 2 +- Mage.Sets/src/mage/cards/i/ImplementOfMalice.java | 2 +- Mage.Sets/src/mage/cards/i/ImplementsOfSacrifice.java | 2 +- Mage.Sets/src/mage/cards/i/ImposingVantasaur.java | 2 +- Mage.Sets/src/mage/cards/i/ImprobableAlliance.java | 2 +- Mage.Sets/src/mage/cards/i/ImpromptuRaid.java | 2 +- Mage.Sets/src/mage/cards/i/ImprovisedArmor.java | 2 +- Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java | 2 +- Mage.Sets/src/mage/cards/i/IncendiaryOracle.java | 2 +- Mage.Sets/src/mage/cards/i/IncitedRabble.java | 2 +- Mage.Sets/src/mage/cards/i/IncorrigibleYouths.java | 2 +- Mage.Sets/src/mage/cards/i/IncreasingAmbition.java | 2 +- Mage.Sets/src/mage/cards/i/IncreasingConfusion.java | 2 +- Mage.Sets/src/mage/cards/i/IncreasingDevotion.java | 2 +- Mage.Sets/src/mage/cards/i/IncreasingSavagery.java | 2 +- Mage.Sets/src/mage/cards/i/IncreasingVengeance.java | 2 +- Mage.Sets/src/mage/cards/i/IndathaCrystal.java | 2 +- Mage.Sets/src/mage/cards/i/IndigoFaerie.java | 2 +- Mage.Sets/src/mage/cards/i/InfectedVermin.java | 4 ++-- Mage.Sets/src/mage/cards/i/InfernalCaretaker.java | 2 +- Mage.Sets/src/mage/cards/i/InfernalSpawnOfEvil.java | 2 +- Mage.Sets/src/mage/cards/i/InfernoFist.java | 2 +- Mage.Sets/src/mage/cards/i/InfernoJet.java | 2 +- Mage.Sets/src/mage/cards/i/InfernoOfTheStarMounts.java | 2 +- Mage.Sets/src/mage/cards/i/InfernoTrap.java | 2 +- Mage.Sets/src/mage/cards/i/InfiltratorIlKor.java | 2 +- Mage.Sets/src/mage/cards/i/IngeniousSkaab.java | 2 +- Mage.Sets/src/mage/cards/i/Inheritance.java | 2 +- Mage.Sets/src/mage/cards/i/InitiatesOfTheEbonHand.java | 2 +- Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java | 2 +- Mage.Sets/src/mage/cards/i/InkfathomWitch.java | 2 +- Mage.Sets/src/mage/cards/i/InnerFlameIgniter.java | 2 +- Mage.Sets/src/mage/cards/i/InniazTheGaleForce.java | 2 +- Mage.Sets/src/mage/cards/i/InsatiableGorgers.java | 2 +- Mage.Sets/src/mage/cards/i/InsidiousBookworms.java | 2 +- Mage.Sets/src/mage/cards/i/InsidiousMist.java | 2 +- Mage.Sets/src/mage/cards/i/Instigator.java | 2 +- Mage.Sets/src/mage/cards/i/InstrumentOfTheBards.java | 2 +- Mage.Sets/src/mage/cards/i/InterventionPact.java | 2 +- Mage.Sets/src/mage/cards/i/IntetTheDreamer.java | 2 +- Mage.Sets/src/mage/cards/i/IonStorm.java | 2 +- Mage.Sets/src/mage/cards/i/IpnuRivulet.java | 2 +- Mage.Sets/src/mage/cards/i/IreShaman.java | 2 +- Mage.Sets/src/mage/cards/i/IronLance.java | 2 +- Mage.Sets/src/mage/cards/i/IronWill.java | 2 +- Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java | 2 +- Mage.Sets/src/mage/cards/i/IronfistCrusher.java | 2 +- Mage.Sets/src/mage/cards/i/IronrootWarlord.java | 2 +- Mage.Sets/src/mage/cards/i/IrrigatedFarmland.java | 2 +- Mage.Sets/src/mage/cards/i/IsarethTheAwakener.java | 2 +- Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java | 2 +- Mage.Sets/src/mage/cards/i/IslandFishJasconius.java | 2 +- Mage.Sets/src/mage/cards/i/IthHighArcanist.java | 2 +- Mage.Sets/src/mage/cards/i/IthorianInitiate.java | 2 +- Mage.Sets/src/mage/cards/i/IvoryGargoyle.java | 2 +- Mage.Sets/src/mage/cards/i/IvoryGiant.java | 2 +- Mage.Sets/src/mage/cards/i/IvySeer.java | 2 +- Mage.Sets/src/mage/cards/i/IxallisKeeper.java | 2 +- Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java | 2 +- Mage.Sets/src/mage/cards/i/IzoniThousandEyed.java | 2 +- Mage.Sets/src/mage/cards/i/IzzetCluestone.java | 2 +- Mage.Sets/src/mage/cards/i/IzzetGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/i/IzzetKeyrune.java | 2 +- Mage.Sets/src/mage/cards/i/IzzetLocket.java | 2 +- 102 files changed, 107 insertions(+), 107 deletions(-) diff --git a/Mage.Sets/src/mage/cards/i/IcatianCrier.java b/Mage.Sets/src/mage/cards/i/IcatianCrier.java index c64d759bbae..85274ab46d8 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianCrier.java +++ b/Mage.Sets/src/mage/cards/i/IcatianCrier.java @@ -30,7 +30,7 @@ public final class IcatianCrier extends CardImpl { this.toughness = new MageInt(1); // {1}{W}, {tap}, Discard a card: Create two 1/1 white Citizen creature tokens. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CitizenToken(), 2), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CitizenToken(), 2), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IcatianInfantry.java b/Mage.Sets/src/mage/cards/i/IcatianInfantry.java index 2d9ccc70b8f..1ac3ce0a443 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianInfantry.java +++ b/Mage.Sets/src/mage/cards/i/IcatianInfantry.java @@ -31,10 +31,10 @@ public final class IcatianInfantry extends CardImpl { this.toughness = new MageInt(1); // {1}: Icatian Infantry gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); // {1}: Icatian Infantry gains banding until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } private IcatianInfantry(final IcatianInfantry card) { diff --git a/Mage.Sets/src/mage/cards/i/IcatianLieutenant.java b/Mage.Sets/src/mage/cards/i/IcatianLieutenant.java index 04364ff6dc5..637188a4513 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianLieutenant.java +++ b/Mage.Sets/src/mage/cards/i/IcatianLieutenant.java @@ -36,7 +36,7 @@ public final class IcatianLieutenant extends CardImpl { this.toughness = new MageInt(2); // {1}{W}: Target Soldier creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IcatianPriest.java b/Mage.Sets/src/mage/cards/i/IcatianPriest.java index 8cdef482648..96fd7d9237b 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianPriest.java +++ b/Mage.Sets/src/mage/cards/i/IcatianPriest.java @@ -28,7 +28,7 @@ public final class IcatianPriest extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}{W}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IcatianScout.java b/Mage.Sets/src/mage/cards/i/IcatianScout.java index e98f5624669..63c385b5dea 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianScout.java +++ b/Mage.Sets/src/mage/cards/i/IcatianScout.java @@ -33,7 +33,7 @@ public final class IcatianScout extends CardImpl { // {1}, {tap}: Target creature gains first strike until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect( - FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}")); + FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IceCauldron.java b/Mage.Sets/src/mage/cards/i/IceCauldron.java index 7971da9c264..76627f7a39e 100644 --- a/Mage.Sets/src/mage/cards/i/IceCauldron.java +++ b/Mage.Sets/src/mage/cards/i/IceCauldron.java @@ -43,7 +43,7 @@ public final class IceCauldron extends CardImpl { // {X}, {T}: Put a charge counter on Ice Cauldron and exile a nonland card from your hand. You may cast that card for as long as it remains exiled. Note the type and amount of mana spent to pay this activation cost. Activate this ability only if there are no charge counters on Ice Cauldron. ConditionalActivatedAbility ability = new ConditionalActivatedAbility( - Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(), true), new ManaCostsImpl("{X}"), new SourceHasCounterCondition(CounterType.CHARGE, 0, 0)); + Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(), true), new ManaCostsImpl<>("{X}"), new SourceHasCounterCondition(CounterType.CHARGE, 0, 0)); ability.addEffect(new IceCauldronExileEffect()); ability.addEffect(new IceCauldronNoteManaEffect()); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/i/IceCave.java b/Mage.Sets/src/mage/cards/i/IceCave.java index 18c3319f71a..3dcb6501567 100644 --- a/Mage.Sets/src/mage/cards/i/IceCave.java +++ b/Mage.Sets/src/mage/cards/i/IceCave.java @@ -65,7 +65,7 @@ class IceCaveEffect extends OneShotEffect { Spell spell = (Spell) game.getStack().getStackObject(targetPointer.getFirst(game, source)); if (sourcePermanent != null && spell != null && controller != null) { Player spellController = game.getPlayer(spell.getControllerId()); - Cost cost = new ManaCostsImpl(spell.getSpellAbility().getManaCosts().getText()); + Cost cost = new ManaCostsImpl<>(spell.getSpellAbility().getManaCosts().getText()); if (spellController != null) { for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { Player player = game.getPlayer(playerId); diff --git a/Mage.Sets/src/mage/cards/i/Iceberg.java b/Mage.Sets/src/mage/cards/i/Iceberg.java index 6a3f2f27caa..49a724e761d 100644 --- a/Mage.Sets/src/mage/cards/i/Iceberg.java +++ b/Mage.Sets/src/mage/cards/i/Iceberg.java @@ -30,7 +30,7 @@ public final class Iceberg extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.ICE.createInstance()))); // {3}: Put an ice counter on Iceberg. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.ICE.createInstance(1)), new ManaCostsImpl("{3}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.ICE.createInstance(1)), new ManaCostsImpl<>("{3}"))); // Remove an ice counter from Iceberg: Add {C}. this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(1), diff --git a/Mage.Sets/src/mage/cards/i/IcebindPillar.java b/Mage.Sets/src/mage/cards/i/IcebindPillar.java index 1b59dbcc980..e32efdc6677 100644 --- a/Mage.Sets/src/mage/cards/i/IcebindPillar.java +++ b/Mage.Sets/src/mage/cards/i/IcebindPillar.java @@ -25,7 +25,7 @@ public final class IcebindPillar extends CardImpl { this.addSuperType(SuperType.SNOW); // {S}, {T}: Tap target artifact or creature. - Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl("{S}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{S}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/Icefall.java b/Mage.Sets/src/mage/cards/i/Icefall.java index 0a7d5a35554..960b08e9250 100644 --- a/Mage.Sets/src/mage/cards/i/Icefall.java +++ b/Mage.Sets/src/mage/cards/i/Icefall.java @@ -34,7 +34,7 @@ public final class Icefall extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); // Recover {R}{R} - this.addAbility(new RecoverAbility(new ManaCostsImpl("{R}{R}"), this)); + this.addAbility(new RecoverAbility(new ManaCostsImpl<>("{R}{R}"), this)); } private Icefall(final Icefall card) { diff --git a/Mage.Sets/src/mage/cards/i/IcefeatherAven.java b/Mage.Sets/src/mage/cards/i/IcefeatherAven.java index 206169db7a2..99fd716c33b 100644 --- a/Mage.Sets/src/mage/cards/i/IcefeatherAven.java +++ b/Mage.Sets/src/mage/cards/i/IcefeatherAven.java @@ -40,7 +40,7 @@ public final class IcefeatherAven extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {1}{G}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{G}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{G}{U}"))); // When Icefeather Aven is turned face up, you may return another target creature to its owner's hand. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ReturnToHandTargetEffect(), false, true); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/i/IcehideTroll.java b/Mage.Sets/src/mage/cards/i/IcehideTroll.java index bb5af1fe3c5..549230d4bb6 100644 --- a/Mage.Sets/src/mage/cards/i/IcehideTroll.java +++ b/Mage.Sets/src/mage/cards/i/IcehideTroll.java @@ -34,7 +34,7 @@ public final class IcehideTroll extends CardImpl { // {S}{S}: Icehide Troll gets +2/+0 and gains indestructible until end of turn. Tap it. Ability ability = new SimpleActivatedAbility(new BoostSourceEffect( 2, 0, Duration.EndOfTurn - ).setText("{this} gets +2/+0"), new ManaCostsImpl("{S}{S}")); + ).setText("{this} gets +2/+0"), new ManaCostsImpl<>("{S}{S}")); ability.addEffect(new GainAbilitySourceEffect( IndestructibleAbility.getInstance(), Duration.EndOfTurn ).setText("and gains indestructible until end of turn.")); diff --git a/Mage.Sets/src/mage/cards/i/IchorSlick.java b/Mage.Sets/src/mage/cards/i/IchorSlick.java index b5a6a49fafe..19aa08ce252 100644 --- a/Mage.Sets/src/mage/cards/i/IchorSlick.java +++ b/Mage.Sets/src/mage/cards/i/IchorSlick.java @@ -27,10 +27,10 @@ public final class IchorSlick extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); // Madness {3}{B} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{3}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{3}{B}"))); } private IchorSlick(final IchorSlick card) { diff --git a/Mage.Sets/src/mage/cards/i/IdleThoughts.java b/Mage.Sets/src/mage/cards/i/IdleThoughts.java index 93168bc0508..c47ccaa1371 100644 --- a/Mage.Sets/src/mage/cards/i/IdleThoughts.java +++ b/Mage.Sets/src/mage/cards/i/IdleThoughts.java @@ -24,7 +24,7 @@ public final class IdleThoughts extends CardImpl { // {2}: Draw a card if you have no cards in hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalOneShotEffect( - new DrawCardSourceControllerEffect(2), new CardsInHandCondition(), "Draw a card if you have no cards in hand"), new ManaCostsImpl("{2}"))); + new DrawCardSourceControllerEffect(2), new CardsInHandCondition(), "Draw a card if you have no cards in hand"), new ManaCostsImpl<>("{2}"))); } private IdleThoughts(final IdleThoughts card) { diff --git a/Mage.Sets/src/mage/cards/i/IfhBiffEfreet.java b/Mage.Sets/src/mage/cards/i/IfhBiffEfreet.java index 71080fa398f..470912fe537 100644 --- a/Mage.Sets/src/mage/cards/i/IfhBiffEfreet.java +++ b/Mage.Sets/src/mage/cards/i/IfhBiffEfreet.java @@ -41,7 +41,7 @@ public final class IfhBiffEfreet extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {G}: Ifh-Biff Efreet deals 1 damage to each creature with flying and each player. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new ManaCostsImpl("{G}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new ManaCostsImpl<>("{G}")); Effect effect = new DamagePlayersEffect(1); effect.setText("and each player"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/i/IfnirDeadlands.java b/Mage.Sets/src/mage/cards/i/IfnirDeadlands.java index 0ba823798ce..33a72c4b31d 100644 --- a/Mage.Sets/src/mage/cards/i/IfnirDeadlands.java +++ b/Mage.Sets/src/mage/cards/i/IfnirDeadlands.java @@ -47,7 +47,7 @@ public final class IfnirDeadlands extends CardImpl { this.addAbility(manaAbility); // {2}{B}{B}, {t}, Sacrifice a Desert: Put two -1/-1 counters on target creature an opponent controls. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance(2)), new ManaCostsImpl("{2}{B}{B}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance(2)), new ManaCostsImpl<>("{2}{B}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, filter, true))); ability.addTarget(new TargetOpponentsCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/i/IgneousCur.java b/Mage.Sets/src/mage/cards/i/IgneousCur.java index 941413c9c41..873ed4002cc 100644 --- a/Mage.Sets/src/mage/cards/i/IgneousCur.java +++ b/Mage.Sets/src/mage/cards/i/IgneousCur.java @@ -27,7 +27,7 @@ public final class IgneousCur extends CardImpl { // {1}{R}: Igneous Cur gets +2/+0 until end of turn. this.addAbility(new SimpleActivatedAbility( - new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}") + new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}") )); } diff --git a/Mage.Sets/src/mage/cards/i/IgneousGolem.java b/Mage.Sets/src/mage/cards/i/IgneousGolem.java index 2653e07fd75..d19235e9ff9 100644 --- a/Mage.Sets/src/mage/cards/i/IgneousGolem.java +++ b/Mage.Sets/src/mage/cards/i/IgneousGolem.java @@ -27,7 +27,7 @@ public final class IgneousGolem extends CardImpl { this.toughness = new MageInt(4); // {2}: Igneous Golem gains trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private IgneousGolem(final IgneousGolem card) { diff --git a/Mage.Sets/src/mage/cards/i/IgneousPouncer.java b/Mage.Sets/src/mage/cards/i/IgneousPouncer.java index 6752384396c..17854ded729 100644 --- a/Mage.Sets/src/mage/cards/i/IgneousPouncer.java +++ b/Mage.Sets/src/mage/cards/i/IgneousPouncer.java @@ -30,9 +30,9 @@ public final class IgneousPouncer extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // Swampcycling {2} - this.addAbility(new SwampcyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new SwampcyclingAbility(new ManaCostsImpl<>("{2}"))); // Mountaincycling {2} - this.addAbility(new MountaincyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new MountaincyclingAbility(new ManaCostsImpl<>("{2}"))); } private IgneousPouncer(final IgneousPouncer card) { diff --git a/Mage.Sets/src/mage/cards/i/IgniteTheFuture.java b/Mage.Sets/src/mage/cards/i/IgniteTheFuture.java index 4883b16f657..ab331f4b859 100644 --- a/Mage.Sets/src/mage/cards/i/IgniteTheFuture.java +++ b/Mage.Sets/src/mage/cards/i/IgniteTheFuture.java @@ -28,7 +28,7 @@ public final class IgniteTheFuture extends CardImpl { this.getSpellAbility().addEffect(new IgniteTheFutureEffect()); // Flashback {7}{R} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{7}{R}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{7}{R}"))); } private IgniteTheFuture(final IgniteTheFuture card) { diff --git a/Mage.Sets/src/mage/cards/i/IgnitionTeam.java b/Mage.Sets/src/mage/cards/i/IgnitionTeam.java index 9027cf29265..c611f4a922b 100644 --- a/Mage.Sets/src/mage/cards/i/IgnitionTeam.java +++ b/Mage.Sets/src/mage/cards/i/IgnitionTeam.java @@ -48,7 +48,7 @@ public final class IgnitionTeam extends CardImpl { // {2}{R}, Remove a +1/+1 counter from Ignition Team: Target land becomes a 4/4 red Elemental creature until end of turn. It's still a land. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect( new ElementalCreatureToken(4, 4, "4/4 red Elemental creature", new ObjectColor("R")), - false, true, Duration.EndOfTurn), new ManaCostsImpl("{2}{R}")); + false, true, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java b/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java index c70a18a1a8a..836dc774d34 100644 --- a/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java +++ b/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java @@ -38,7 +38,7 @@ public final class IizukaTheRuthless extends CardImpl { this.toughness = new MageInt(3); this.addAbility(new BushidoAbility(2)); // {2}{R}, Sacrifice a Samurai: Samurai creatures you control gain double strike until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, filter, false), new ManaCostsImpl("{2}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IkiralOutrider.java b/Mage.Sets/src/mage/cards/i/IkiralOutrider.java index 9a56760d70c..ddc5ed72dd6 100644 --- a/Mage.Sets/src/mage/cards/i/IkiralOutrider.java +++ b/Mage.Sets/src/mage/cards/i/IkiralOutrider.java @@ -30,7 +30,7 @@ public final class IkiralOutrider extends LevelerCard { this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new LevelUpAbility(new ManaCostsImpl("{4}"))); + this.addAbility(new LevelUpAbility(new ManaCostsImpl<>("{4}"))); Abilities abilities1 = new AbilitiesImpl<>(); abilities1.add(VigilanceAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/i/IllGottenInheritance.java b/Mage.Sets/src/mage/cards/i/IllGottenInheritance.java index 1c01c6a3c74..9d613f0b51c 100644 --- a/Mage.Sets/src/mage/cards/i/IllGottenInheritance.java +++ b/Mage.Sets/src/mage/cards/i/IllGottenInheritance.java @@ -35,7 +35,7 @@ public final class IllGottenInheritance extends CardImpl { // {5}{B}, Sacrifice Ill-Gotten Inheritance: It deals 4 damage to target opponent and you gain 4 life. ability = new SimpleActivatedAbility( new DamageTargetEffect(4, "it"), - new ManaCostsImpl("{5}{B}") + new ManaCostsImpl<>("{5}{B}") ); ability.addEffect(new GainLifeEffect(4).concatBy("and")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/i/IlluminatedWings.java b/Mage.Sets/src/mage/cards/i/IlluminatedWings.java index b3dc936935d..e0f47bfc0e2 100644 --- a/Mage.Sets/src/mage/cards/i/IlluminatedWings.java +++ b/Mage.Sets/src/mage/cards/i/IlluminatedWings.java @@ -41,7 +41,7 @@ public final class IlluminatedWings extends CardImpl { // Enchanted creature has flying. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // {2}, Sacrifice Illuminated Wings: Draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{2}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IllusionaryForces.java b/Mage.Sets/src/mage/cards/i/IllusionaryForces.java index b1e183eec11..5c228813882 100644 --- a/Mage.Sets/src/mage/cards/i/IllusionaryForces.java +++ b/Mage.Sets/src/mage/cards/i/IllusionaryForces.java @@ -26,7 +26,7 @@ public final class IllusionaryForces extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Cumulative upkeep {U} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{U}"))); } private IllusionaryForces(final IllusionaryForces card) { diff --git a/Mage.Sets/src/mage/cards/i/IllusionaryPresence.java b/Mage.Sets/src/mage/cards/i/IllusionaryPresence.java index 6f47376227d..1ee08da5c22 100644 --- a/Mage.Sets/src/mage/cards/i/IllusionaryPresence.java +++ b/Mage.Sets/src/mage/cards/i/IllusionaryPresence.java @@ -39,7 +39,7 @@ public final class IllusionaryPresence extends CardImpl { this.toughness = new MageInt(2); // Cumulative upkeep {U} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{U}"))); // At the beginning of your upkeep, choose a land type. Illusionary Presence gains landwalk of the chosen type until end of turn. Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ChooseBasicLandTypeEffect(Outcome.Neutral), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/cards/i/IllusionaryTerrain.java b/Mage.Sets/src/mage/cards/i/IllusionaryTerrain.java index 88cd2c1d18e..63c9d9319ce 100644 --- a/Mage.Sets/src/mage/cards/i/IllusionaryTerrain.java +++ b/Mage.Sets/src/mage/cards/i/IllusionaryTerrain.java @@ -36,7 +36,7 @@ public final class IllusionaryTerrain extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{U}{U}"); // Cumulative upkeep {2} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{2}"))); // As Illusionary Terrain enters the battlefield, choose two basic land types. this.addAbility(new AsEntersBattlefieldAbility(new ChooseTwoBasicLandTypesEffect(Outcome.Neutral))); diff --git a/Mage.Sets/src/mage/cards/i/IllusionaryWall.java b/Mage.Sets/src/mage/cards/i/IllusionaryWall.java index 74ab21776d4..be339d8dbaf 100644 --- a/Mage.Sets/src/mage/cards/i/IllusionaryWall.java +++ b/Mage.Sets/src/mage/cards/i/IllusionaryWall.java @@ -33,7 +33,7 @@ public final class IllusionaryWall extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Cumulative upkeep {U} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{U}"))); } private IllusionaryWall(final IllusionaryWall card) { diff --git a/Mage.Sets/src/mage/cards/i/ImaginaryThreats.java b/Mage.Sets/src/mage/cards/i/ImaginaryThreats.java index e1bbf2b0296..990993d1cb9 100644 --- a/Mage.Sets/src/mage/cards/i/ImaginaryThreats.java +++ b/Mage.Sets/src/mage/cards/i/ImaginaryThreats.java @@ -37,7 +37,7 @@ public final class ImaginaryThreats extends CardImpl { getSpellAbility().addEffect(new DontUntapInPlayersNextUntapStepAllEffect(new FilterCreaturePermanent()) .setText("During that player's next untap step, creatures they control don't untap")); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/i/ImmobilizerEldrazi.java b/Mage.Sets/src/mage/cards/i/ImmobilizerEldrazi.java index 2c6d5445c50..1ccf402ecf7 100644 --- a/Mage.Sets/src/mage/cards/i/ImmobilizerEldrazi.java +++ b/Mage.Sets/src/mage/cards/i/ImmobilizerEldrazi.java @@ -42,7 +42,7 @@ public final class ImmobilizerEldrazi extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // {2}{C}: Each creature with toughness greater than its power can't block this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockAllEffect(filter, Duration.EndOfTurn), new ManaCostsImpl("{2}{C}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockAllEffect(filter, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{C}")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java b/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java index bebe1ead805..25c42ce6d58 100644 --- a/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java +++ b/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java @@ -49,7 +49,7 @@ public final class ImmobilizingInk extends CardImpl { Duration.WhileOnBattlefield,"Enchanted creature doesn't untap during its controller's untap step."))); // Enchanted creature has "{1}, Discard a card: Untap this creature." - Ability untapAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl("{1}")); + Ability untapAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{1}")); untapAbility.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(untapAbility, diff --git a/Mage.Sets/src/mage/cards/i/ImmolationShaman.java b/Mage.Sets/src/mage/cards/i/ImmolationShaman.java index bfac0a745f9..df0a6f9ca77 100644 --- a/Mage.Sets/src/mage/cards/i/ImmolationShaman.java +++ b/Mage.Sets/src/mage/cards/i/ImmolationShaman.java @@ -48,7 +48,7 @@ public final class ImmolationShaman extends CardImpl { new BoostSourceEffect( 3, 3, Duration.EndOfTurn ).setText("{this} gets +3/+3"), - new ManaCostsImpl("{3}{R}{R}") + new ManaCostsImpl<>("{3}{R}{R}") ); ability.addEffect(new GainAbilitySourceEffect( new MenaceAbility(), Duration.EndOfTurn diff --git a/Mage.Sets/src/mage/cards/i/ImperialGunner.java b/Mage.Sets/src/mage/cards/i/ImperialGunner.java index 3776ddebedf..e0c96dc9e42 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialGunner.java +++ b/Mage.Sets/src/mage/cards/i/ImperialGunner.java @@ -32,7 +32,7 @@ public final class ImperialGunner extends CardImpl { this.toughness = new MageInt(2); // {1},{T}: Imperial Gunner deals 1 damage to target player or Starship creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetAnyTarget(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImperialHellkite.java b/Mage.Sets/src/mage/cards/i/ImperialHellkite.java index 2c634f30835..b4828d0c6e6 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialHellkite.java +++ b/Mage.Sets/src/mage/cards/i/ImperialHellkite.java @@ -32,7 +32,7 @@ public final class ImperialHellkite extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Morph {6}{R}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl("{6}{R}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{6}{R}{R}"))); // When Imperial Hellkite is turned face up, you may search your library for a Dragon card, reveal it, and put it into your hand. If you do, shuffle your library. Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, new FilterBySubtypeCard(SubType.DRAGON)), true, true); diff --git a/Mage.Sets/src/mage/cards/i/ImplementOfCombustion.java b/Mage.Sets/src/mage/cards/i/ImplementOfCombustion.java index 073501142dc..5124d9069c4 100644 --- a/Mage.Sets/src/mage/cards/i/ImplementOfCombustion.java +++ b/Mage.Sets/src/mage/cards/i/ImplementOfCombustion.java @@ -25,7 +25,7 @@ public final class ImplementOfCombustion extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {R}, Sacrifice Implement of Combustion: It deals 1 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImplementOfExamination.java b/Mage.Sets/src/mage/cards/i/ImplementOfExamination.java index 8b53ef79620..f29d615389f 100644 --- a/Mage.Sets/src/mage/cards/i/ImplementOfExamination.java +++ b/Mage.Sets/src/mage/cards/i/ImplementOfExamination.java @@ -23,7 +23,7 @@ public final class ImplementOfExamination extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {U}, Sacrifice Implement of Examination: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImplementOfFerocity.java b/Mage.Sets/src/mage/cards/i/ImplementOfFerocity.java index 59a19b2b1b5..e602748fece 100644 --- a/Mage.Sets/src/mage/cards/i/ImplementOfFerocity.java +++ b/Mage.Sets/src/mage/cards/i/ImplementOfFerocity.java @@ -26,7 +26,7 @@ public final class ImplementOfFerocity extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {G}, Sacrifice Implement of Ferocity: Put a +1/+1 counter on target creature. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{G}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImplementOfImprovement.java b/Mage.Sets/src/mage/cards/i/ImplementOfImprovement.java index d60cdc0802a..9c72077846d 100644 --- a/Mage.Sets/src/mage/cards/i/ImplementOfImprovement.java +++ b/Mage.Sets/src/mage/cards/i/ImplementOfImprovement.java @@ -24,7 +24,7 @@ public final class ImplementOfImprovement extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {W}, Sacrifice Implement of Improvement: You gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImplementOfMalice.java b/Mage.Sets/src/mage/cards/i/ImplementOfMalice.java index adc500e6a9f..d1b86d526ce 100644 --- a/Mage.Sets/src/mage/cards/i/ImplementOfMalice.java +++ b/Mage.Sets/src/mage/cards/i/ImplementOfMalice.java @@ -25,7 +25,7 @@ public final class ImplementOfMalice extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {B}, Sacrifice Implement of Malice: Target player discards a card. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1),new ManaCostsImpl("{B}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1),new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImplementsOfSacrifice.java b/Mage.Sets/src/mage/cards/i/ImplementsOfSacrifice.java index 709ab5b1af4..cbf04305b1e 100644 --- a/Mage.Sets/src/mage/cards/i/ImplementsOfSacrifice.java +++ b/Mage.Sets/src/mage/cards/i/ImplementsOfSacrifice.java @@ -22,7 +22,7 @@ public final class ImplementsOfSacrifice extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {1}, {tap}, Sacrifice Implements of Sacrifice: Add two mana of any one color. - SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new ManaCostsImpl("{1}")); + SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImposingVantasaur.java b/Mage.Sets/src/mage/cards/i/ImposingVantasaur.java index 159d1d31204..ab649c7297c 100644 --- a/Mage.Sets/src/mage/cards/i/ImposingVantasaur.java +++ b/Mage.Sets/src/mage/cards/i/ImposingVantasaur.java @@ -27,7 +27,7 @@ public final class ImposingVantasaur extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Cycling {1} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}"))); } private ImposingVantasaur(final ImposingVantasaur card) { diff --git a/Mage.Sets/src/mage/cards/i/ImprobableAlliance.java b/Mage.Sets/src/mage/cards/i/ImprobableAlliance.java index 85c917a1978..40c680fb5fc 100644 --- a/Mage.Sets/src/mage/cards/i/ImprobableAlliance.java +++ b/Mage.Sets/src/mage/cards/i/ImprobableAlliance.java @@ -25,7 +25,7 @@ public final class ImprobableAlliance extends CardImpl { // {4}{U}{R}: Draw a card, then discard a card. this.addAbility(new SimpleActivatedAbility( - new DrawDiscardControllerEffect(1, 1), new ManaCostsImpl("{4}{U}{R}") + new DrawDiscardControllerEffect(1, 1), new ManaCostsImpl<>("{4}{U}{R}") )); } diff --git a/Mage.Sets/src/mage/cards/i/ImpromptuRaid.java b/Mage.Sets/src/mage/cards/i/ImpromptuRaid.java index f99d57e6bb1..bcb6b98193f 100644 --- a/Mage.Sets/src/mage/cards/i/ImpromptuRaid.java +++ b/Mage.Sets/src/mage/cards/i/ImpromptuRaid.java @@ -39,7 +39,7 @@ public final class ImpromptuRaid extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R/G}"); // {2}{RG}: Reveal the top card of your library. If it isn't a creature card, put it into your graveyard. Otherwise, put that card onto the battlefield. That creature gains haste. Sacrifice it at the beginning of the next end step. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ImpromptuRaidEffect(), new ManaCostsImpl("{2}{R/G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ImpromptuRaidEffect(), new ManaCostsImpl<>("{2}{R/G}"))); } diff --git a/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java b/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java index f103019a5a9..51997516949 100644 --- a/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java +++ b/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java @@ -38,7 +38,7 @@ public final class ImprovisedArmor extends CardImpl { // Enchanted creature gets +2/+5. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 5, Duration.WhileOnBattlefield))); // Cycling {3} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{3}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{3}"))); } private ImprovisedArmor(final ImprovisedArmor card) { diff --git a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java index 3a3e7ec8b21..135b733663a 100644 --- a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java +++ b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java @@ -65,7 +65,7 @@ public final class InallaArchmageRitualist extends CardImpl { // Eminence - Whenever another nontoken Wizard enters the battlefield under your control, if Inalla, Archmage Ritualist is in the command zone or on the battlefield, you may pay {1}. If you do, create a token that's a copy of that Wizard. The token gains haste. Exile it at the beginning of the next end step. Ability ability = new ConditionalInterveningIfTriggeredAbility( new EntersBattlefieldControlledTriggeredAbility(Zone.ALL, new DoIfCostPaid( - new InallaArchmageRitualistEffect(), new ManaCostsImpl("{1}"), "Pay {1} to create a token copy?"), + new InallaArchmageRitualistEffect(), new ManaCostsImpl<>("{1}"), "Pay {1} to create a token copy?"), filter, false, SetTargetPointer.PERMANENT, ""), SourceOnBattlefieldOrCommandZoneCondition.instance, "Whenever another nontoken Wizard enters the battlefield under your control, " diff --git a/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java b/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java index 2ad0be20938..f70fc66c218 100644 --- a/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java +++ b/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java @@ -31,7 +31,7 @@ public final class IncendiaryOracle extends CardImpl { // {1}{R}: Incendiary Oracle gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, - new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); + new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); // If a creature dealt damage by Incendiary Oracle this turn would die, exile it instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/i/IncitedRabble.java b/Mage.Sets/src/mage/cards/i/IncitedRabble.java index bbe4b925bd6..2f0a75f75ca 100644 --- a/Mage.Sets/src/mage/cards/i/IncitedRabble.java +++ b/Mage.Sets/src/mage/cards/i/IncitedRabble.java @@ -34,7 +34,7 @@ public final class IncitedRabble extends CardImpl { this.addAbility(new AttacksEachCombatStaticAbility()); // {2}: Incited Rabble gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{2}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private IncitedRabble(final IncitedRabble card) { diff --git a/Mage.Sets/src/mage/cards/i/IncorrigibleYouths.java b/Mage.Sets/src/mage/cards/i/IncorrigibleYouths.java index 216e55f723c..abdf418111d 100644 --- a/Mage.Sets/src/mage/cards/i/IncorrigibleYouths.java +++ b/Mage.Sets/src/mage/cards/i/IncorrigibleYouths.java @@ -26,7 +26,7 @@ public final class IncorrigibleYouths extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // Madness {2}{R} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{2}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{2}{R}"))); } private IncorrigibleYouths(final IncorrigibleYouths card) { diff --git a/Mage.Sets/src/mage/cards/i/IncreasingAmbition.java b/Mage.Sets/src/mage/cards/i/IncreasingAmbition.java index f32b6cfb445..37c60155d8b 100644 --- a/Mage.Sets/src/mage/cards/i/IncreasingAmbition.java +++ b/Mage.Sets/src/mage/cards/i/IncreasingAmbition.java @@ -37,7 +37,7 @@ public final class IncreasingAmbition extends CardImpl { )); // Flashback {7}{B} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{7}{B}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{7}{B}"))); } private IncreasingAmbition(final IncreasingAmbition card) { diff --git a/Mage.Sets/src/mage/cards/i/IncreasingConfusion.java b/Mage.Sets/src/mage/cards/i/IncreasingConfusion.java index 7e6f63dd965..89cb765a1a6 100644 --- a/Mage.Sets/src/mage/cards/i/IncreasingConfusion.java +++ b/Mage.Sets/src/mage/cards/i/IncreasingConfusion.java @@ -29,7 +29,7 @@ public final class IncreasingConfusion extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // Flashback {X}{U} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{X}{U}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{X}{U}"))); } private IncreasingConfusion(final IncreasingConfusion card) { diff --git a/Mage.Sets/src/mage/cards/i/IncreasingDevotion.java b/Mage.Sets/src/mage/cards/i/IncreasingDevotion.java index fa318c4bddd..2f870cf627d 100644 --- a/Mage.Sets/src/mage/cards/i/IncreasingDevotion.java +++ b/Mage.Sets/src/mage/cards/i/IncreasingDevotion.java @@ -29,7 +29,7 @@ public final class IncreasingDevotion extends CardImpl { this.getSpellAbility().addEffect(new IncreasingDevotionEffect()); // Flashback {7}{W}{W} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{7}{W}{W}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{7}{W}{W}"))); } private IncreasingDevotion(final IncreasingDevotion card) { diff --git a/Mage.Sets/src/mage/cards/i/IncreasingSavagery.java b/Mage.Sets/src/mage/cards/i/IncreasingSavagery.java index 5eddaae8427..5b1cddee2b2 100644 --- a/Mage.Sets/src/mage/cards/i/IncreasingSavagery.java +++ b/Mage.Sets/src/mage/cards/i/IncreasingSavagery.java @@ -30,7 +30,7 @@ public final class IncreasingSavagery extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Flashback {5}{G}{G} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{5}{G}{G}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{5}{G}{G}"))); } private IncreasingSavagery(final IncreasingSavagery card) { diff --git a/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java b/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java index 78b4b1d479a..bd930b2948c 100644 --- a/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java +++ b/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java @@ -41,7 +41,7 @@ public final class IncreasingVengeance extends CardImpl { this.getSpellAbility().addTarget(target); // Flashback {3}{R}{R} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{3}{R}{R}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{3}{R}{R}"))); } private IncreasingVengeance(final IncreasingVengeance card) { diff --git a/Mage.Sets/src/mage/cards/i/IndathaCrystal.java b/Mage.Sets/src/mage/cards/i/IndathaCrystal.java index 7a5857ff159..b05f203056f 100644 --- a/Mage.Sets/src/mage/cards/i/IndathaCrystal.java +++ b/Mage.Sets/src/mage/cards/i/IndathaCrystal.java @@ -25,7 +25,7 @@ public final class IndathaCrystal extends CardImpl { this.addAbility(new GreenManaAbility()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private IndathaCrystal(final IndathaCrystal card) { diff --git a/Mage.Sets/src/mage/cards/i/IndigoFaerie.java b/Mage.Sets/src/mage/cards/i/IndigoFaerie.java index 119af8e1926..986b163c860 100644 --- a/Mage.Sets/src/mage/cards/i/IndigoFaerie.java +++ b/Mage.Sets/src/mage/cards/i/IndigoFaerie.java @@ -39,7 +39,7 @@ public final class IndigoFaerie extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}: Target permanent becomes blue in addition to its other colors until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBlueTargetEffect(), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBlueTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/InfectedVermin.java b/Mage.Sets/src/mage/cards/i/InfectedVermin.java index 1b06cdb6a97..5074c949c2d 100644 --- a/Mage.Sets/src/mage/cards/i/InfectedVermin.java +++ b/Mage.Sets/src/mage/cards/i/InfectedVermin.java @@ -30,11 +30,11 @@ public final class InfectedVermin extends CardImpl { this.toughness = new MageInt(1); // {2}{B}: Infected Vermin deals 1 damage to each creature and each player. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl<>("{2}{B}"))); // Threshold - {3}{B}: Infected Vermin deals 3 damage to each creature and each player. Activate this ability only if seven or more cards are in your graveyard. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(3), - new ManaCostsImpl("{3}{B}"), + new ManaCostsImpl<>("{3}{B}"), new CardsInControllerGraveyardCondition(7)); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/InfernalCaretaker.java b/Mage.Sets/src/mage/cards/i/InfernalCaretaker.java index 12fdda32ad2..80f40d24cc7 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalCaretaker.java +++ b/Mage.Sets/src/mage/cards/i/InfernalCaretaker.java @@ -31,7 +31,7 @@ public final class InfernalCaretaker extends CardImpl { this.toughness = new MageInt(2); // Morph {3}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{B}"))); // When Infernal Caretaker is turned face up, return all Zombie cards from all graveyards to their owners' hands. Effect effect = new ReturnToHandFromGraveyardAllEffect(zombieCard); diff --git a/Mage.Sets/src/mage/cards/i/InfernalSpawnOfEvil.java b/Mage.Sets/src/mage/cards/i/InfernalSpawnOfEvil.java index a9031950ee8..f63b5cc163f 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalSpawnOfEvil.java +++ b/Mage.Sets/src/mage/cards/i/InfernalSpawnOfEvil.java @@ -48,7 +48,7 @@ public final class InfernalSpawnOfEvil extends CardImpl { // Activate this ability only during your upkeep and only once each turn. Ability ability = new LimitedTimesPerTurnActivatedAbility(Zone.HAND, new DamageTargetEffect(1), new CompositeCost( - new ManaCostsImpl("{1}{B}"), + new ManaCostsImpl<>("{1}{B}"), new CompositeCost( new RevealSourceFromYourHandCost(), new SayCost("It's coming!"), diff --git a/Mage.Sets/src/mage/cards/i/InfernoFist.java b/Mage.Sets/src/mage/cards/i/InfernoFist.java index bd33c6a8e5a..3f73456ac4d 100644 --- a/Mage.Sets/src/mage/cards/i/InfernoFist.java +++ b/Mage.Sets/src/mage/cards/i/InfernoFist.java @@ -43,7 +43,7 @@ public final class InfernoFist extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0))); // {R}, Sacrifice Inferno Fist: Inferno Fist deals 2 damage to any target. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/InfernoJet.java b/Mage.Sets/src/mage/cards/i/InfernoJet.java index 00394255bf2..63a1f4988ac 100644 --- a/Mage.Sets/src/mage/cards/i/InfernoJet.java +++ b/Mage.Sets/src/mage/cards/i/InfernoJet.java @@ -24,7 +24,7 @@ public final class InfernoJet extends CardImpl { getSpellAbility().addTarget(new TargetOpponentOrPlaneswalker()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/i/InfernoOfTheStarMounts.java b/Mage.Sets/src/mage/cards/i/InfernoOfTheStarMounts.java index 1b408e79cc4..13198800905 100644 --- a/Mage.Sets/src/mage/cards/i/InfernoOfTheStarMounts.java +++ b/Mage.Sets/src/mage/cards/i/InfernoOfTheStarMounts.java @@ -43,7 +43,7 @@ public final class InfernoOfTheStarMounts extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {R}: Inferno of the Star Mounts gets +1/+0 until end of turn. When its power becomes 20 this way, it deals 20 damage to any target. - Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addEffect(new InfernoOfTheStarMountsEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InfernoTrap.java b/Mage.Sets/src/mage/cards/i/InfernoTrap.java index 16153c7ab56..4a57ffd396f 100644 --- a/Mage.Sets/src/mage/cards/i/InfernoTrap.java +++ b/Mage.Sets/src/mage/cards/i/InfernoTrap.java @@ -30,7 +30,7 @@ public final class InfernoTrap extends CardImpl { this.subtype.add(SubType.TRAP); // If you've been dealt damage by two or more creatures this turn, you may pay {R} rather than pay Inferno Trap's mana cost. - this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{R}"), InfernoTrapCondition.instance), new InfernoTrapWatcher()); + this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl<>("{R}"), InfernoTrapCondition.instance), new InfernoTrapWatcher()); // Inferno Trap deals 4 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); diff --git a/Mage.Sets/src/mage/cards/i/InfiltratorIlKor.java b/Mage.Sets/src/mage/cards/i/InfiltratorIlKor.java index 9f8fcd1cfa1..75e60632f26 100644 --- a/Mage.Sets/src/mage/cards/i/InfiltratorIlKor.java +++ b/Mage.Sets/src/mage/cards/i/InfiltratorIlKor.java @@ -27,7 +27,7 @@ public final class InfiltratorIlKor extends CardImpl { // Shadow this.addAbility(ShadowAbility.getInstance()); // Suspend 2-{1}{U} - this.addAbility(new SuspendAbility(2, new ManaCostsImpl("{1}{U}"), this)); + this.addAbility(new SuspendAbility(2, new ManaCostsImpl<>("{1}{U}"), this)); } private InfiltratorIlKor(final InfiltratorIlKor card) { diff --git a/Mage.Sets/src/mage/cards/i/IngeniousSkaab.java b/Mage.Sets/src/mage/cards/i/IngeniousSkaab.java index 751e4072515..df033da3bc0 100644 --- a/Mage.Sets/src/mage/cards/i/IngeniousSkaab.java +++ b/Mage.Sets/src/mage/cards/i/IngeniousSkaab.java @@ -31,7 +31,7 @@ public final class IngeniousSkaab extends CardImpl { this.addAbility(new ProwessAbility()); // {U}: Ingenius Skaab gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private IngeniousSkaab(final IngeniousSkaab card) { diff --git a/Mage.Sets/src/mage/cards/i/Inheritance.java b/Mage.Sets/src/mage/cards/i/Inheritance.java index e972ca827ec..04c304d9430 100644 --- a/Mage.Sets/src/mage/cards/i/Inheritance.java +++ b/Mage.Sets/src/mage/cards/i/Inheritance.java @@ -21,7 +21,7 @@ public final class Inheritance extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}"); // Whenever a creature dies, you may pay {3}. If you do, draw a card. - Ability ability = new DiesCreatureTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{3}")), false); + Ability ability = new DiesCreatureTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}")), false); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InitiatesOfTheEbonHand.java b/Mage.Sets/src/mage/cards/i/InitiatesOfTheEbonHand.java index 7a6aa056fba..bb69c8b6612 100644 --- a/Mage.Sets/src/mage/cards/i/InitiatesOfTheEbonHand.java +++ b/Mage.Sets/src/mage/cards/i/InitiatesOfTheEbonHand.java @@ -33,7 +33,7 @@ public final class InitiatesOfTheEbonHand extends CardImpl { this.toughness = new MageInt(1); // {1}: Add {B}. If this ability has been activated four or more times this turn, sacrifice Initiates of the Ebon Hand at the beginning of the next end step. - SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, BlackMana(1), new ManaCostsImpl("{1}")); + SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, BlackMana(1), new ManaCostsImpl<>("{1}")); ability.addEffect(new InitiatesOfTheEbonHandEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java b/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java index 975bdf7aad0..e8c53865cd7 100644 --- a/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java +++ b/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java @@ -44,7 +44,7 @@ public final class InkEyesServantOfOni extends CardImpl { this.addAbility(new InkEyesServantOfOniTriggeredAbility()); // {1}{B}: Regenerate Ink-Eyes. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private InkEyesServantOfOni(final InkEyesServantOfOni card) { diff --git a/Mage.Sets/src/mage/cards/i/InkfathomWitch.java b/Mage.Sets/src/mage/cards/i/InkfathomWitch.java index 90a12895866..01bd628b8f6 100644 --- a/Mage.Sets/src/mage/cards/i/InkfathomWitch.java +++ b/Mage.Sets/src/mage/cards/i/InkfathomWitch.java @@ -38,7 +38,7 @@ public final class InkfathomWitch extends CardImpl { // Fear this.addAbility(FearAbility.getInstance()); // {2}{U}{B}: Each unblocked creature has base power and toughness 4/1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetPowerToughnessAllEffect(4, 1, Duration.EndOfTurn, filter, true), new ManaCostsImpl("{2}{U}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetPowerToughnessAllEffect(4, 1, Duration.EndOfTurn, filter, true), new ManaCostsImpl<>("{2}{U}{B}"))); } private InkfathomWitch(final InkfathomWitch card) { diff --git a/Mage.Sets/src/mage/cards/i/InnerFlameIgniter.java b/Mage.Sets/src/mage/cards/i/InnerFlameIgniter.java index 19b6a685f46..1e2e9519bdb 100644 --- a/Mage.Sets/src/mage/cards/i/InnerFlameIgniter.java +++ b/Mage.Sets/src/mage/cards/i/InnerFlameIgniter.java @@ -35,7 +35,7 @@ public final class InnerFlameIgniter extends CardImpl { // {2}{R}: Creatures you control get +1/+0 until end of turn. If this is the third time this ability has resolved this turn, creatures you control gain first strike until end of turn. Ability ability = new SimpleActivatedAbility( - new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{2}{R}") + new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}") ); ContinuousEffect effectIf3rdResolution = new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES); ability.addEffect(new IfAbilityHasResolvedXTimesEffect(Outcome.AddAbility, 3, effectIf3rdResolution)); diff --git a/Mage.Sets/src/mage/cards/i/InniazTheGaleForce.java b/Mage.Sets/src/mage/cards/i/InniazTheGaleForce.java index c4bb03519b6..ce528380c12 100644 --- a/Mage.Sets/src/mage/cards/i/InniazTheGaleForce.java +++ b/Mage.Sets/src/mage/cards/i/InniazTheGaleForce.java @@ -58,7 +58,7 @@ public final class InniazTheGaleForce extends CardImpl { // {2}{W/U}: Attacking creatures with flying get +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(new BoostAllEffect( 1, 1, Duration.EndOfTurn, filter, false - ), new ManaCostsImpl("{2}{W/U}"))); + ), new ManaCostsImpl<>("{2}{W/U}"))); // Whenever three or more creatures you control with flying attack, each player gains control // of a nonland permanent of your choice controlled by the player to their right. diff --git a/Mage.Sets/src/mage/cards/i/InsatiableGorgers.java b/Mage.Sets/src/mage/cards/i/InsatiableGorgers.java index a8af08653c7..b404189c3a4 100644 --- a/Mage.Sets/src/mage/cards/i/InsatiableGorgers.java +++ b/Mage.Sets/src/mage/cards/i/InsatiableGorgers.java @@ -28,7 +28,7 @@ public final class InsatiableGorgers extends CardImpl { this.addAbility(new AttacksEachCombatStaticAbility()); // Madness {3}{R} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{3}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{3}{R}"))); } private InsatiableGorgers(final InsatiableGorgers card) { diff --git a/Mage.Sets/src/mage/cards/i/InsidiousBookworms.java b/Mage.Sets/src/mage/cards/i/InsidiousBookworms.java index cf679805183..f7569d4c21e 100644 --- a/Mage.Sets/src/mage/cards/i/InsidiousBookworms.java +++ b/Mage.Sets/src/mage/cards/i/InsidiousBookworms.java @@ -27,7 +27,7 @@ public final class InsidiousBookworms extends CardImpl { this.toughness = new MageInt(1); // When Insidious Bookworms dies, you may pay {1}{B}. If you do, target player discards a card at random. - Ability ability = new DiesSourceTriggeredAbility(new DoIfCostPaid(new DiscardTargetEffect(1, true), new ManaCostsImpl("{1}{B}"))); + Ability ability = new DiesSourceTriggeredAbility(new DoIfCostPaid(new DiscardTargetEffect(1, true), new ManaCostsImpl<>("{1}{B}"))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InsidiousMist.java b/Mage.Sets/src/mage/cards/i/InsidiousMist.java index f5598c337da..44802b492d6 100644 --- a/Mage.Sets/src/mage/cards/i/InsidiousMist.java +++ b/Mage.Sets/src/mage/cards/i/InsidiousMist.java @@ -52,7 +52,7 @@ public final class InsidiousMist extends CardImpl { // Whenever Insideous Mist attacks and isn't blocked, you may pay {2}{B}. If you do, transform it. this.addAbility(new TransformAbility()); - this.addAbility(new AttacksAndIsNotBlockedTriggeredAbility(new DoIfCostPaid(new TransformSourceEffect(), new ManaCostsImpl("{2}{B}"), "Pay {2}{B} to transform?"))); + this.addAbility(new AttacksAndIsNotBlockedTriggeredAbility(new DoIfCostPaid(new TransformSourceEffect(), new ManaCostsImpl<>("{2}{B}"), "Pay {2}{B} to transform?"))); } private InsidiousMist(final InsidiousMist card) { diff --git a/Mage.Sets/src/mage/cards/i/Instigator.java b/Mage.Sets/src/mage/cards/i/Instigator.java index eb8b91c8341..48e3736fd9a 100644 --- a/Mage.Sets/src/mage/cards/i/Instigator.java +++ b/Mage.Sets/src/mage/cards/i/Instigator.java @@ -39,7 +39,7 @@ public final class Instigator extends CardImpl { this.toughness = new MageInt(1); // {1}{B}{B}, {tap}, Discard a card: Creatures target player controls attack this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new InstigatorEffect(), new ManaCostsImpl("{1}{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new InstigatorEffect(), new ManaCostsImpl<>("{1}{B}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/i/InstrumentOfTheBards.java b/Mage.Sets/src/mage/cards/i/InstrumentOfTheBards.java index 0a5c4382ed8..f1a40bdf144 100644 --- a/Mage.Sets/src/mage/cards/i/InstrumentOfTheBards.java +++ b/Mage.Sets/src/mage/cards/i/InstrumentOfTheBards.java @@ -43,7 +43,7 @@ public final class InstrumentOfTheBards extends CardImpl { // {3}{G}, {T}: Search your library for a creature card with mana value equal to the number of harmony // counters on Instrument of Bards, reveal it, and put it into your hand. // If that card is legendary, create a Treasure token. Then shuffle. - Ability ability = new SimpleActivatedAbility(new InstrumentOfTheBardsEffect(), new ManaCostsImpl("{3}{G}")); + Ability ability = new SimpleActivatedAbility(new InstrumentOfTheBardsEffect(), new ManaCostsImpl<>("{3}{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InterventionPact.java b/Mage.Sets/src/mage/cards/i/InterventionPact.java index e8acc4964bc..0859537e705 100644 --- a/Mage.Sets/src/mage/cards/i/InterventionPact.java +++ b/Mage.Sets/src/mage/cards/i/InterventionPact.java @@ -35,7 +35,7 @@ public final class InterventionPact extends CardImpl { // The next time a source of your choice would deal damage to you this turn, prevent that damage. You gain life equal to the damage prevented this way. this.getSpellAbility().addEffect(new InterventionPactEffect()); // At the beginning of your next upkeep, pay {1}{W}{W}. If you don't, you lose the game. - this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new PactDelayedTriggeredAbility(new ManaCostsImpl("{1}{W}{W}")), false)); + this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new PactDelayedTriggeredAbility(new ManaCostsImpl<>("{1}{W}{W}")), false)); } private InterventionPact(final InterventionPact card) { diff --git a/Mage.Sets/src/mage/cards/i/IntetTheDreamer.java b/Mage.Sets/src/mage/cards/i/IntetTheDreamer.java index 10289acecc4..6e38453985a 100644 --- a/Mage.Sets/src/mage/cards/i/IntetTheDreamer.java +++ b/Mage.Sets/src/mage/cards/i/IntetTheDreamer.java @@ -42,7 +42,7 @@ public final class IntetTheDreamer extends CardImpl { // Whenever Intet, the Dreamer deals combat damage to a player, you may pay {2}{U}. If you do, exile the top card of your library face down. // You may play that card without paying its mana cost for as long as Intet remains on the battlefield. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility( - new DoIfCostPaid(new IntetTheDreamerExileEffect(), new ManaCostsImpl("{2}{U}")), false, true)); + new DoIfCostPaid(new IntetTheDreamerExileEffect(), new ManaCostsImpl<>("{2}{U}")), false, true)); // You may look at that card for as long as it remains exiled. this.addAbility(new SimpleStaticAbility(Zone.ALL, new IntetTheDreamerLookEffect())); diff --git a/Mage.Sets/src/mage/cards/i/IonStorm.java b/Mage.Sets/src/mage/cards/i/IonStorm.java index be134304d2b..9eba2262522 100644 --- a/Mage.Sets/src/mage/cards/i/IonStorm.java +++ b/Mage.Sets/src/mage/cards/i/IonStorm.java @@ -27,7 +27,7 @@ public final class IonStorm extends CardImpl { // {1}{R}, Remove a +1/+1 counter or a charge counter from a permanent you control: Ion Storm deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new OrCost(" Remove a +1/+1 counter or a charge counter from a permanent you control", new RemoveCounterCost(new TargetControlledPermanent(), CounterType.P1P1), new RemoveCounterCost(new TargetControlledPermanent(), CounterType.CHARGE))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IpnuRivulet.java b/Mage.Sets/src/mage/cards/i/IpnuRivulet.java index 02a0d6239db..0909d66eba2 100644 --- a/Mage.Sets/src/mage/cards/i/IpnuRivulet.java +++ b/Mage.Sets/src/mage/cards/i/IpnuRivulet.java @@ -46,7 +46,7 @@ public final class IpnuRivulet extends CardImpl { this.addAbility(manaAbility); // {1}{U}, {t}, Sacrifice a Desert: Target player puts the top four cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(4), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(4), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, filter, true))); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/i/IreShaman.java b/Mage.Sets/src/mage/cards/i/IreShaman.java index 980fc8b7f5c..73cce4c1e3f 100644 --- a/Mage.Sets/src/mage/cards/i/IreShaman.java +++ b/Mage.Sets/src/mage/cards/i/IreShaman.java @@ -30,7 +30,7 @@ public final class IreShaman extends CardImpl { this.addAbility(new MenaceAbility()); // Megamorph {R} - this.addAbility(new MorphAbility(new ManaCostsImpl("{R}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{R}"), true)); // When Ire Shaman is turned face up, exile the top card of your library. Until end of turn, you may play that card. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new ExileTopXMayPlayUntilEndOfTurnEffect(1), false)); diff --git a/Mage.Sets/src/mage/cards/i/IronLance.java b/Mage.Sets/src/mage/cards/i/IronLance.java index 0e4cf766609..77d6d14f912 100644 --- a/Mage.Sets/src/mage/cards/i/IronLance.java +++ b/Mage.Sets/src/mage/cards/i/IronLance.java @@ -25,7 +25,7 @@ public final class IronLance extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {3}, {tap}: Target creature gains first strike until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{3}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IronWill.java b/Mage.Sets/src/mage/cards/i/IronWill.java index e5832f41bb7..1bd279808c4 100644 --- a/Mage.Sets/src/mage/cards/i/IronWill.java +++ b/Mage.Sets/src/mage/cards/i/IronWill.java @@ -25,7 +25,7 @@ public final class IronWill extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(0, 4, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private IronWill(final IronWill card) { diff --git a/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java b/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java index 36fd93f123e..ea7c5b26f76 100644 --- a/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java +++ b/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java @@ -41,7 +41,7 @@ public final class IronclawBuzzardiers extends CardImpl { // Ironclaw Buzzardiers can't block creatures with power 2 or greater. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); // {R}: Ironclaw Buzzardiers gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private IronclawBuzzardiers(final IronclawBuzzardiers card) { diff --git a/Mage.Sets/src/mage/cards/i/IronfistCrusher.java b/Mage.Sets/src/mage/cards/i/IronfistCrusher.java index db6f71dec3d..5a4c2c4f118 100644 --- a/Mage.Sets/src/mage/cards/i/IronfistCrusher.java +++ b/Mage.Sets/src/mage/cards/i/IronfistCrusher.java @@ -30,7 +30,7 @@ public final class IronfistCrusher extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0))); // Morph {3}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{W}"))); } private IronfistCrusher(final IronfistCrusher card) { diff --git a/Mage.Sets/src/mage/cards/i/IronrootWarlord.java b/Mage.Sets/src/mage/cards/i/IronrootWarlord.java index c9f693f7f60..4060bea9815 100644 --- a/Mage.Sets/src/mage/cards/i/IronrootWarlord.java +++ b/Mage.Sets/src/mage/cards/i/IronrootWarlord.java @@ -43,7 +43,7 @@ public final class IronrootWarlord extends CardImpl { // {3}{G}{W}: Create a 1/1 white Soldier creature token. this.addAbility(new SimpleActivatedAbility( - new CreateTokenEffect(new SoldierToken()), new ManaCostsImpl("{3}{G}{W}") + new CreateTokenEffect(new SoldierToken()), new ManaCostsImpl<>("{3}{G}{W}") )); } diff --git a/Mage.Sets/src/mage/cards/i/IrrigatedFarmland.java b/Mage.Sets/src/mage/cards/i/IrrigatedFarmland.java index 64e5324c281..849e219e967 100644 --- a/Mage.Sets/src/mage/cards/i/IrrigatedFarmland.java +++ b/Mage.Sets/src/mage/cards/i/IrrigatedFarmland.java @@ -32,7 +32,7 @@ public final class IrrigatedFarmland extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/i/IsarethTheAwakener.java b/Mage.Sets/src/mage/cards/i/IsarethTheAwakener.java index ba436201bb9..f7875acbc20 100644 --- a/Mage.Sets/src/mage/cards/i/IsarethTheAwakener.java +++ b/Mage.Sets/src/mage/cards/i/IsarethTheAwakener.java @@ -82,7 +82,7 @@ class IsarethTheAwakenerCreateReflexiveTriggerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - ManaCosts cost = new ManaCostsImpl("{X}"); + ManaCosts cost = new ManaCostsImpl<>("{X}"); if (player == null || !player.chooseUse(Outcome.BoostCreature, "Pay " + cost.getText() + "?", source, game)) { return false; diff --git a/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java b/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java index 6647c15dcb2..2966a587cd7 100644 --- a/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java +++ b/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java @@ -58,7 +58,7 @@ public final class IshkanahGrafwidow extends CardImpl { // {5}{B}: Target opponent loses 1 life for each Spider you control. PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(count), new ManaCostsImpl("{6}{B}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(count), new ManaCostsImpl<>("{6}{B}")); ability.addTarget(new TargetOpponent()); ability.addHint(new ValueHint("Spiders you control", count)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java b/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java index 9547e3b7b18..27bb12ea2a8 100644 --- a/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java +++ b/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java @@ -35,7 +35,7 @@ public final class IslandFishJasconius extends CardImpl { // At the beginning of your upkeep, you may pay {U}{U}{U}. If you do, untap Island Fish Jasconius. this.addAbility(new BeginningOfUpkeepTriggeredAbility( Zone.BATTLEFIELD, - new DoIfCostPaid(new UntapSourceEffect(), new ManaCostsImpl("{U}{U}{U}")), + new DoIfCostPaid(new UntapSourceEffect(), new ManaCostsImpl<>("{U}{U}{U}")), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/cards/i/IthHighArcanist.java b/Mage.Sets/src/mage/cards/i/IthHighArcanist.java index ef2b124e32e..d84719fa1b8 100644 --- a/Mage.Sets/src/mage/cards/i/IthHighArcanist.java +++ b/Mage.Sets/src/mage/cards/i/IthHighArcanist.java @@ -48,7 +48,7 @@ public final class IthHighArcanist extends CardImpl { ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); // Suspend 4-{W}{U} - this.addAbility(new SuspendAbility(4, new ManaCostsImpl("{W}{U}"), this)); + this.addAbility(new SuspendAbility(4, new ManaCostsImpl<>("{W}{U}"), this)); } private IthHighArcanist(final IthHighArcanist card) { diff --git a/Mage.Sets/src/mage/cards/i/IthorianInitiate.java b/Mage.Sets/src/mage/cards/i/IthorianInitiate.java index d086d1a9ea8..d8dc6622b19 100644 --- a/Mage.Sets/src/mage/cards/i/IthorianInitiate.java +++ b/Mage.Sets/src/mage/cards/i/IthorianInitiate.java @@ -32,7 +32,7 @@ public final class IthorianInitiate extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), true)); // Meditate {1}{G} - this.addAbility(new MeditateAbility(new ManaCostsImpl("{1}{G}"))); + this.addAbility(new MeditateAbility(new ManaCostsImpl<>("{1}{G}"))); } private IthorianInitiate(final IthorianInitiate card) { diff --git a/Mage.Sets/src/mage/cards/i/IvoryGargoyle.java b/Mage.Sets/src/mage/cards/i/IvoryGargoyle.java index 1ba7a64e2a3..93e6f9bd13c 100644 --- a/Mage.Sets/src/mage/cards/i/IvoryGargoyle.java +++ b/Mage.Sets/src/mage/cards/i/IvoryGargoyle.java @@ -40,7 +40,7 @@ public final class IvoryGargoyle extends CardImpl { this.addAbility(ability); // {4}{W}: Exile Ivory Gargoyle. - this.addAbility(new SimpleActivatedAbility(new ExileSourceEffect(), new ManaCostsImpl("{4}{W}"))); + this.addAbility(new SimpleActivatedAbility(new ExileSourceEffect(), new ManaCostsImpl<>("{4}{W}"))); } private IvoryGargoyle(final IvoryGargoyle card) { diff --git a/Mage.Sets/src/mage/cards/i/IvoryGiant.java b/Mage.Sets/src/mage/cards/i/IvoryGiant.java index e56336a73df..d7db3776bad 100644 --- a/Mage.Sets/src/mage/cards/i/IvoryGiant.java +++ b/Mage.Sets/src/mage/cards/i/IvoryGiant.java @@ -37,7 +37,7 @@ public final class IvoryGiant extends CardImpl { // When Ivory Giant enters the battlefield, tap all nonwhite creatures. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapAllEffect(filter))); // Suspend 5-{W} - this.addAbility(new SuspendAbility(5, new ManaCostsImpl("{W}"), this)); + this.addAbility(new SuspendAbility(5, new ManaCostsImpl<>("{W}"), this)); } private IvoryGiant(final IvoryGiant card) { diff --git a/Mage.Sets/src/mage/cards/i/IvySeer.java b/Mage.Sets/src/mage/cards/i/IvySeer.java index d903acdfafc..216ad5e5e71 100644 --- a/Mage.Sets/src/mage/cards/i/IvySeer.java +++ b/Mage.Sets/src/mage/cards/i/IvySeer.java @@ -37,7 +37,7 @@ public final class IvySeer extends CardImpl { this.toughness = new MageInt(1); // {2}{G}, {tap}: Reveal any number of green cards in your hand. Target creature gets +X/+X until end of turn, where X is the number of cards revealed this way. - Ability ability = new SimpleActivatedAbility(new IvySeerEffect(), new ManaCostsImpl("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new IvySeerEffect(), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IxallisKeeper.java b/Mage.Sets/src/mage/cards/i/IxallisKeeper.java index 58d5ec50fb9..ace1de130da 100644 --- a/Mage.Sets/src/mage/cards/i/IxallisKeeper.java +++ b/Mage.Sets/src/mage/cards/i/IxallisKeeper.java @@ -35,7 +35,7 @@ public final class IxallisKeeper extends CardImpl { // {7}{G}, {T}, Sacrifice Ixalli's Keeper: Target creature gets +5/+5 and gains trample until end of turn. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(5, 5, Duration.EndOfTurn) - .setText("Target creature gets +5/+5"), new ManaCostsImpl("{7}{G}")); + .setText("Target creature gets +5/+5"), new ManaCostsImpl<>("{7}{G}")); ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn) .setText("and gains trample until end of turn")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java b/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java index e86ca1c7632..1f2dd12fe43 100644 --- a/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java +++ b/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java @@ -43,7 +43,7 @@ public final class IxidorRealitySculptor extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // {2}{U}: Turn target face-down creature face up. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TurnFaceUpTargetEffect(), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TurnFaceUpTargetEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetCreaturePermanent(filterTarget)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IzoniThousandEyed.java b/Mage.Sets/src/mage/cards/i/IzoniThousandEyed.java index 507a92a3eb1..23de815a881 100644 --- a/Mage.Sets/src/mage/cards/i/IzoniThousandEyed.java +++ b/Mage.Sets/src/mage/cards/i/IzoniThousandEyed.java @@ -48,7 +48,7 @@ public final class IzoniThousandEyed extends CardImpl { Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, new GainLifeEffect(1), - new ManaCostsImpl("{B}{G}") + new ManaCostsImpl<>("{B}{G}") ); ability.addEffect( new DrawCardSourceControllerEffect(1).setText("and draw a card") diff --git a/Mage.Sets/src/mage/cards/i/IzzetCluestone.java b/Mage.Sets/src/mage/cards/i/IzzetCluestone.java index 5c1bc92d1fe..cb6131694a6 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetCluestone.java +++ b/Mage.Sets/src/mage/cards/i/IzzetCluestone.java @@ -32,7 +32,7 @@ public final class IzzetCluestone extends CardImpl { this.addAbility(new RedManaAbility()); // {U}{R}, {T}, Sacrifice Izzet Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{U}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java b/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java index 93c201ea68e..a807f3f0f58 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java +++ b/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java @@ -46,12 +46,12 @@ public final class IzzetGuildmage extends CardImpl { // ({UR} can be paid with either {U} or {R}.) // {2}{U}: Copy target instant spell you control with converted mana cost 2 or less. You may choose new targets for the copy. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetSpell(filterInstant)); this.addAbility(ability); // {2}{R}: Copy target sorcery spell you control with converted mana cost 2 or less. You may choose new targets for the copy. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new ManaCostsImpl("{2}{R}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetSpell(filterSorcery)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java b/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java index b9776d3fb38..ed238ba18dd 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java +++ b/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java @@ -32,7 +32,7 @@ public final class IzzetKeyrune extends CardImpl { // {U}{R}: Until end of turn, Izzet Keyrune becomes a 2/1 blue and red Elemental artifact creature. this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new IzzetKeyruneToken(), "", Duration.EndOfTurn - ), new ManaCostsImpl("{U}{R}"))); + ), new ManaCostsImpl<>("{U}{R}"))); // Whenever Izzet Keyrune deals combat damage to a player, you may draw a card. If you do, discard a card. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/i/IzzetLocket.java b/Mage.Sets/src/mage/cards/i/IzzetLocket.java index cac5fc4f9f1..faeebf1c7c3 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetLocket.java +++ b/Mage.Sets/src/mage/cards/i/IzzetLocket.java @@ -29,7 +29,7 @@ public final class IzzetLocket extends CardImpl { // {U/R}{U/R}{U/R}{U/R}, {T}, Sacrifice Izzet Locket: Draw two cards. Ability ability = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(2), - new ManaCostsImpl("{U/R}{U/R}{U/R}{U/R}") + new ManaCostsImpl<>("{U/R}{U/R}{U/R}{U/R}") ); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost());