From 43a27dfa0c85ad609d20e273b42ca1b1413d8db6 Mon Sep 17 00:00:00 2001 From: DeepCrimson <98864333+DeepCrimson@users.noreply.github.com> Date: Mon, 30 May 2022 08:03:27 -0700 Subject: [PATCH] Fix raw use of parameterized class 'ManaCostsImpl' - 'f' cards (#9036) --- Mage.Sets/src/mage/cards/f/FaceOfFear.java | 2 +- Mage.Sets/src/mage/cards/f/FacelessHaven.java | 2 +- Mage.Sets/src/mage/cards/f/FadeAway.java | 2 +- Mage.Sets/src/mage/cards/f/FadeFromMemory.java | 2 +- Mage.Sets/src/mage/cards/f/FaeOfWishes.java | 2 +- Mage.Sets/src/mage/cards/f/FaerieConclave.java | 2 +- Mage.Sets/src/mage/cards/f/FaerieFormation.java | 2 +- Mage.Sets/src/mage/cards/f/FainTheBroker.java | 2 +- Mage.Sets/src/mage/cards/f/FaithlessLooting.java | 2 +- Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java | 2 +- Mage.Sets/src/mage/cards/f/FallenCleric.java | 2 +- Mage.Sets/src/mage/cards/f/FallenFerromancer.java | 2 +- Mage.Sets/src/mage/cards/f/FamishedGhoul.java | 2 +- Mage.Sets/src/mage/cards/f/Farmstead.java | 2 +- Mage.Sets/src/mage/cards/f/FarrelitePriest.java | 2 +- Mage.Sets/src/mage/cards/f/Fatestitcher.java | 2 +- Mage.Sets/src/mage/cards/f/FathomFeeder.java | 2 +- Mage.Sets/src/mage/cards/f/FathomFleetFirebrand.java | 2 +- Mage.Sets/src/mage/cards/f/FearsomeTemper.java | 2 +- Mage.Sets/src/mage/cards/f/FeelingOfDread.java | 2 +- Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java | 2 +- Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java | 2 +- Mage.Sets/src/mage/cards/f/FelidarUmbra.java | 2 +- Mage.Sets/src/mage/cards/f/FellShepherd.java | 2 +- Mage.Sets/src/mage/cards/f/FemerefKnight.java | 2 +- Mage.Sets/src/mage/cards/f/FencerClique.java | 2 +- Mage.Sets/src/mage/cards/f/FendOff.java | 2 +- Mage.Sets/src/mage/cards/f/FeralDeceiver.java | 2 +- Mage.Sets/src/mage/cards/f/FeralHydra.java | 2 +- Mage.Sets/src/mage/cards/f/FeralRidgewolf.java | 2 +- Mage.Sets/src/mage/cards/f/Ferrovore.java | 2 +- Mage.Sets/src/mage/cards/f/Fertilid.java | 2 +- Mage.Sets/src/mage/cards/f/FerventDenial.java | 2 +- Mage.Sets/src/mage/cards/f/FesteringEvil.java | 2 +- Mage.Sets/src/mage/cards/f/FetidHeath.java | 6 +++--- Mage.Sets/src/mage/cards/f/FetidImp.java | 2 +- Mage.Sets/src/mage/cards/f/FetidPools.java | 2 +- Mage.Sets/src/mage/cards/f/FeveredConvulsions.java | 2 +- Mage.Sets/src/mage/cards/f/FieldOfReality.java | 2 +- Mage.Sets/src/mage/cards/f/FieldOfRuin.java | 2 +- Mage.Sets/src/mage/cards/f/FiendArtisan.java | 2 +- Mage.Sets/src/mage/cards/f/FieryBombardment.java | 2 +- Mage.Sets/src/mage/cards/f/FieryFall.java | 2 +- Mage.Sets/src/mage/cards/f/FieryHellhound.java | 2 +- Mage.Sets/src/mage/cards/f/FieryTemper.java | 2 +- Mage.Sets/src/mage/cards/f/FiftyFeetOfRope.java | 4 ++-- Mage.Sets/src/mage/cards/f/FigureOfDestiny.java | 6 +++--- Mage.Sets/src/mage/cards/f/FiligreeSages.java | 2 +- Mage.Sets/src/mage/cards/f/FireBellyChangeling.java | 2 +- Mage.Sets/src/mage/cards/f/FireDrake.java | 2 +- Mage.Sets/src/mage/cards/f/FireFieldOgre.java | 2 +- Mage.Sets/src/mage/cards/f/FireLitThicket.java | 6 +++--- Mage.Sets/src/mage/cards/f/FireSprites.java | 2 +- Mage.Sets/src/mage/cards/f/Firebolt.java | 2 +- Mage.Sets/src/mage/cards/f/FirebornKnight.java | 2 +- Mage.Sets/src/mage/cards/f/FirebrandRanger.java | 2 +- Mage.Sets/src/mage/cards/f/FirecatBlitz.java | 2 +- Mage.Sets/src/mage/cards/f/FirefrightMage.java | 2 +- Mage.Sets/src/mage/cards/f/FiremaneAngel.java | 2 +- Mage.Sets/src/mage/cards/f/FiremindsResearch.java | 4 ++-- Mage.Sets/src/mage/cards/f/FiresOfUndeath.java | 2 +- Mage.Sets/src/mage/cards/f/Firescreamer.java | 2 +- Mage.Sets/src/mage/cards/f/Fireshrieker.java | 2 +- Mage.Sets/src/mage/cards/f/FirestormHellkite.java | 2 +- Mage.Sets/src/mage/cards/f/FirewingPhoenix.java | 2 +- Mage.Sets/src/mage/cards/f/FirstOrderDreadnought.java | 2 +- Mage.Sets/src/mage/cards/f/FirstSphereGargantua.java | 2 +- Mage.Sets/src/mage/cards/f/FlailingManticore.java | 4 ++-- Mage.Sets/src/mage/cards/f/FlailingOgre.java | 4 ++-- Mage.Sets/src/mage/cards/f/FlailingSoldier.java | 4 ++-- Mage.Sets/src/mage/cards/f/FlameElemental.java | 2 +- Mage.Sets/src/mage/cards/f/FlameJet.java | 2 +- Mage.Sets/src/mage/cards/f/FlameSpirit.java | 2 +- Mage.Sets/src/mage/cards/f/FlameblastDragon.java | 2 +- Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java | 2 +- Mage.Sets/src/mage/cards/f/FlamekinVillage.java | 2 +- Mage.Sets/src/mage/cards/f/FlamescrollCelebrant.java | 2 +- Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java | 2 +- Mage.Sets/src/mage/cards/f/FlamestickCourier.java | 2 +- Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java | 2 +- Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java | 2 +- Mage.Sets/src/mage/cards/f/Flamewright.java | 2 +- Mage.Sets/src/mage/cards/f/FlaringFlameKin.java | 2 +- Mage.Sets/src/mage/cards/f/FlaringPain.java | 2 +- Mage.Sets/src/mage/cards/f/FlashOfDefiance.java | 2 +- Mage.Sets/src/mage/cards/f/Flay.java | 2 +- Mage.Sets/src/mage/cards/f/FlayedNim.java | 2 +- Mage.Sets/src/mage/cards/f/FledglingDragon.java | 2 +- Mage.Sets/src/mage/cards/f/FledglingImp.java | 2 +- Mage.Sets/src/mage/cards/f/FledglingMawcor.java | 2 +- Mage.Sets/src/mage/cards/f/FleetingImage.java | 2 +- Mage.Sets/src/mage/cards/f/FleshCarver.java | 2 +- Mage.Sets/src/mage/cards/f/Fleshformer.java | 2 +- Mage.Sets/src/mage/cards/f/Flickerform.java | 2 +- Mage.Sets/src/mage/cards/f/FlickeringSpirit.java | 2 +- Mage.Sets/src/mage/cards/f/FlickeringWard.java | 2 +- Mage.Sets/src/mage/cards/f/FlightSpellbomb.java | 2 +- Mage.Sets/src/mage/cards/f/FlinthoofBoar.java | 2 +- Mage.Sets/src/mage/cards/f/Flood.java | 2 +- Mage.Sets/src/mage/cards/f/Floodchaser.java | 2 +- Mage.Sets/src/mage/cards/f/FloodedGrove.java | 6 +++--- Mage.Sets/src/mage/cards/f/FloodedShoreline.java | 2 +- Mage.Sets/src/mage/cards/f/FloodwaterDam.java | 2 +- Mage.Sets/src/mage/cards/f/Floodwaters.java | 2 +- Mage.Sets/src/mage/cards/f/FlourishingFox.java | 2 +- Mage.Sets/src/mage/cards/f/FlowOfMaggots.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneArmor.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneChanneler.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneMauler.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneShambler.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneThopter.java | 2 +- Mage.Sets/src/mage/cards/f/FlowstoneWall.java | 2 +- Mage.Sets/src/mage/cards/f/Flusterstorm.java | 2 +- Mage.Sets/src/mage/cards/f/FlyingCarpet.java | 2 +- Mage.Sets/src/mage/cards/f/FodderCannon.java | 2 +- Mage.Sets/src/mage/cards/f/FogOfGnats.java | 2 +- Mage.Sets/src/mage/cards/f/FolioOfFancies.java | 4 ++-- Mage.Sets/src/mage/cards/f/FolkMedicine.java | 2 +- Mage.Sets/src/mage/cards/f/FolkOfThePines.java | 2 +- Mage.Sets/src/mage/cards/f/FontOfAgonies.java | 2 +- Mage.Sets/src/mage/cards/f/FontOfFertility.java | 2 +- Mage.Sets/src/mage/cards/f/FontOfFortunes.java | 2 +- Mage.Sets/src/mage/cards/f/FontOfIre.java | 2 +- Mage.Sets/src/mage/cards/f/FontOfReturn.java | 2 +- Mage.Sets/src/mage/cards/f/FontOfVigor.java | 2 +- Mage.Sets/src/mage/cards/f/FoolsTome.java | 2 +- Mage.Sets/src/mage/cards/f/FootfallCrater.java | 2 +- Mage.Sets/src/mage/cards/f/FoothillGuide.java | 2 +- Mage.Sets/src/mage/cards/f/Foratog.java | 2 +- Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java | 2 +- Mage.Sets/src/mage/cards/f/ForbiddingSpirit.java | 2 +- Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java | 2 +- Mage.Sets/src/mage/cards/f/ForceOfNature.java | 2 +- Mage.Sets/src/mage/cards/f/ForcedWorship.java | 2 +- Mage.Sets/src/mage/cards/f/ForgestokerDragon.java | 2 +- Mage.Sets/src/mage/cards/f/ForgottenCave.java | 2 +- Mage.Sets/src/mage/cards/f/ForgottenLore.java | 2 +- Mage.Sets/src/mage/cards/f/ForlornPseudamma.java | 2 +- Mage.Sets/src/mage/cards/f/ForsakeTheWorldly.java | 2 +- Mage.Sets/src/mage/cards/f/FortuneThief.java | 2 +- Mage.Sets/src/mage/cards/f/FoulFamiliar.java | 2 +- Mage.Sets/src/mage/cards/f/FoundryChampion.java | 4 ++-- Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java | 2 +- Mage.Sets/src/mage/cards/f/FoxfireOak.java | 2 +- Mage.Sets/src/mage/cards/f/FranticPurification.java | 2 +- Mage.Sets/src/mage/cards/f/FreeRangeChicken.java | 2 +- Mage.Sets/src/mage/cards/f/FreedFromTheReal.java | 4 ++-- Mage.Sets/src/mage/cards/f/FreejamRegent.java | 2 +- Mage.Sets/src/mage/cards/f/FreneticOgre.java | 2 +- Mage.Sets/src/mage/cards/f/FreneticSliver.java | 2 +- Mage.Sets/src/mage/cards/f/FrenziedArynx.java | 2 +- Mage.Sets/src/mage/cards/f/FrenziedGoblin.java | 2 +- Mage.Sets/src/mage/cards/f/FreyalisesCharm.java | 4 ++-- Mage.Sets/src/mage/cards/f/FreyalisesRadiance.java | 2 +- Mage.Sets/src/mage/cards/f/FrightshroudCourier.java | 2 +- Mage.Sets/src/mage/cards/f/FrilledOculus.java | 2 +- Mage.Sets/src/mage/cards/f/FrilledSandwalla.java | 2 +- Mage.Sets/src/mage/cards/f/FrilledSeaSerpent.java | 2 +- Mage.Sets/src/mage/cards/f/FrillscareMentor.java | 2 +- Mage.Sets/src/mage/cards/f/FromBeyond.java | 2 +- Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java | 2 +- Mage.Sets/src/mage/cards/f/FrontierGuide.java | 2 +- Mage.Sets/src/mage/cards/f/FrontlineDevastator.java | 2 +- Mage.Sets/src/mage/cards/f/FrontlineSage.java | 2 +- Mage.Sets/src/mage/cards/f/FrontlineStrategist.java | 2 +- Mage.Sets/src/mage/cards/f/FrostAugur.java | 2 +- Mage.Sets/src/mage/cards/f/FrostRaptor.java | 2 +- Mage.Sets/src/mage/cards/f/FrostburnWeird.java | 2 +- Mage.Sets/src/mage/cards/f/FrostpeakYeti.java | 2 +- Mage.Sets/src/mage/cards/f/FrostveilAmbush.java | 2 +- Mage.Sets/src/mage/cards/f/Frostwalla.java | 2 +- Mage.Sets/src/mage/cards/f/FrozenShade.java | 2 +- Mage.Sets/src/mage/cards/f/FruitcakeElemental.java | 2 +- Mage.Sets/src/mage/cards/f/FungalBehemoth.java | 2 +- Mage.Sets/src/mage/cards/f/FungalBloom.java | 2 +- Mage.Sets/src/mage/cards/f/FungalPlots.java | 2 +- Mage.Sets/src/mage/cards/f/FungusElemental.java | 2 +- Mage.Sets/src/mage/cards/f/FurnaceBrood.java | 2 +- Mage.Sets/src/mage/cards/f/FurnaceCelebration.java | 2 +- Mage.Sets/src/mage/cards/f/FurnaceSpirit.java | 2 +- Mage.Sets/src/mage/cards/f/Fylamarid.java | 2 +- Mage.Sets/src/mage/cards/f/Fylgja.java | 2 +- Mage.Sets/src/mage/cards/f/FyndhornBow.java | 2 +- Mage.Sets/src/mage/cards/f/FyndhornBrownie.java | 2 +- Mage.Sets/src/mage/cards/f/FyndhornPollen.java | 4 ++-- 188 files changed, 206 insertions(+), 206 deletions(-) diff --git a/Mage.Sets/src/mage/cards/f/FaceOfFear.java b/Mage.Sets/src/mage/cards/f/FaceOfFear.java index 4dbf5db6392..ba0e571bf8c 100644 --- a/Mage.Sets/src/mage/cards/f/FaceOfFear.java +++ b/Mage.Sets/src/mage/cards/f/FaceOfFear.java @@ -30,7 +30,7 @@ public final class FaceOfFear extends CardImpl { this.toughness = new MageInt(4); // {2}{B}, Discard a card: Face of Fear gains fear until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new DiscardCardCost(false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FacelessHaven.java b/Mage.Sets/src/mage/cards/f/FacelessHaven.java index 9364592a254..fc97260bd87 100644 --- a/Mage.Sets/src/mage/cards/f/FacelessHaven.java +++ b/Mage.Sets/src/mage/cards/f/FacelessHaven.java @@ -31,7 +31,7 @@ public final class FacelessHaven extends CardImpl { // {S}{S}{S}: Faceless Haven becomes a 4/3 creature with vigilance and all creature types until end of turn. It's still a land. this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new FacelessHavenToken(), "land", Duration.EndOfTurn - ).setText("{this} becomes a 4/3 creature with vigilance and all creature types until end of turn. It's still a land"), new ManaCostsImpl("{S}{S}{S}"))); + ).setText("{this} becomes a 4/3 creature with vigilance and all creature types until end of turn. It's still a land"), new ManaCostsImpl<>("{S}{S}{S}"))); } private FacelessHaven(final FacelessHaven card) { diff --git a/Mage.Sets/src/mage/cards/f/FadeAway.java b/Mage.Sets/src/mage/cards/f/FadeAway.java index 94b255845ed..1f851973cfd 100644 --- a/Mage.Sets/src/mage/cards/f/FadeAway.java +++ b/Mage.Sets/src/mage/cards/f/FadeAway.java @@ -65,7 +65,7 @@ class FadeAwayEffect extends OneShotEffect { boolean paid = false; while (player.canRespond() && !paid) { payAmount = player.getAmount(0, creaturesNumber, message, game); - ManaCostsImpl cost = new ManaCostsImpl(); + ManaCostsImpl cost = new ManaCostsImpl<>(); cost.add(new GenericManaCost(payAmount)); cost.clearPaid(); if (cost.payOrRollback(source, game, source, playerId)) { diff --git a/Mage.Sets/src/mage/cards/f/FadeFromMemory.java b/Mage.Sets/src/mage/cards/f/FadeFromMemory.java index 3d25ad74c6c..454f3c3a4bc 100644 --- a/Mage.Sets/src/mage/cards/f/FadeFromMemory.java +++ b/Mage.Sets/src/mage/cards/f/FadeFromMemory.java @@ -23,7 +23,7 @@ public final class FadeFromMemory extends CardImpl { this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetCardInGraveyard()); // Cycling {B} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{B}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{B}"))); } private FadeFromMemory(final FadeFromMemory card) { diff --git a/Mage.Sets/src/mage/cards/f/FaeOfWishes.java b/Mage.Sets/src/mage/cards/f/FaeOfWishes.java index 2dac6ad521f..b2425218b11 100644 --- a/Mage.Sets/src/mage/cards/f/FaeOfWishes.java +++ b/Mage.Sets/src/mage/cards/f/FaeOfWishes.java @@ -39,7 +39,7 @@ public final class FaeOfWishes extends AdventureCard { // {1}{U}, Discard two cards: Return Fae of Wishes to its owner's hand. Ability ability = new SimpleActivatedAbility( - new ReturnToHandSourceEffect(true), new ManaCostsImpl("{1}{U}") + new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}") ); ability.addCost(new DiscardTargetCost(new TargetCardInHand(2, filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FaerieConclave.java b/Mage.Sets/src/mage/cards/f/FaerieConclave.java index ff55907b7ed..053d0fb3083 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieConclave.java +++ b/Mage.Sets/src/mage/cards/f/FaerieConclave.java @@ -27,7 +27,7 @@ public final class FaerieConclave extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new BlueManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new FaerieConclaveToken(), "land", Duration.EndOfTurn), new ManaCostsImpl("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new FaerieConclaveToken(), "land", Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } private FaerieConclave(final FaerieConclave card) { diff --git a/Mage.Sets/src/mage/cards/f/FaerieFormation.java b/Mage.Sets/src/mage/cards/f/FaerieFormation.java index 770fbef75c9..6235c6c9450 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieFormation.java +++ b/Mage.Sets/src/mage/cards/f/FaerieFormation.java @@ -31,7 +31,7 @@ public final class FaerieFormation extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}{U}: Create a 1/1 blue Faerie creature token with flying. Draw a card. - Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new FaerieToken()), new ManaCostsImpl("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new FaerieToken()), new ManaCostsImpl<>("{3}{U}")); ability.addEffect(new DrawCardSourceControllerEffect(1).setText("Draw a card")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FainTheBroker.java b/Mage.Sets/src/mage/cards/f/FainTheBroker.java index d08e4dc2a25..21203910dd9 100644 --- a/Mage.Sets/src/mage/cards/f/FainTheBroker.java +++ b/Mage.Sets/src/mage/cards/f/FainTheBroker.java @@ -62,7 +62,7 @@ public final class FainTheBroker extends CardImpl { this.addAbility(ability); // {3}{B}: Untap Fain, the Broker. - this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl("{3}{B}"))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{3}{B}"))); } private FainTheBroker(final FainTheBroker card) { diff --git a/Mage.Sets/src/mage/cards/f/FaithlessLooting.java b/Mage.Sets/src/mage/cards/f/FaithlessLooting.java index c2c63fd555c..140af6ac2ab 100644 --- a/Mage.Sets/src/mage/cards/f/FaithlessLooting.java +++ b/Mage.Sets/src/mage/cards/f/FaithlessLooting.java @@ -23,7 +23,7 @@ public final class FaithlessLooting extends CardImpl { // Draw two cards, then discard two cards. this.getSpellAbility().addEffect(new DrawDiscardControllerEffect(2,2)); // Flashback {2}{R} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{2}{R}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{2}{R}"))); } private FaithlessLooting(final FaithlessLooting card) { diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java b/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java index 88b937e1268..ddfdbfe9eec 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java @@ -35,7 +35,7 @@ public final class FalkenrathExterminator extends CardImpl { // Whenever Falkenrath Exterminator deals combat damage to a player, put a +1/+1 counter on it. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); // {2}{R}: Falkenrath Exterminator deals damage to target creature equal to the number of +1/+1 counters on Falkenrath Exterminator. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)), new ManaCostsImpl("{2}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FallenCleric.java b/Mage.Sets/src/mage/cards/f/FallenCleric.java index dbd92a28b83..c8016792426 100644 --- a/Mage.Sets/src/mage/cards/f/FallenCleric.java +++ b/Mage.Sets/src/mage/cards/f/FallenCleric.java @@ -34,7 +34,7 @@ public final class FallenCleric extends CardImpl { // Protection from Clerics this.addAbility(new ProtectionAbility(filter)); // Morph {4}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{B}"))); } private FallenCleric(final FallenCleric card) { diff --git a/Mage.Sets/src/mage/cards/f/FallenFerromancer.java b/Mage.Sets/src/mage/cards/f/FallenFerromancer.java index c60a8807ae1..30cad617ff5 100644 --- a/Mage.Sets/src/mage/cards/f/FallenFerromancer.java +++ b/Mage.Sets/src/mage/cards/f/FallenFerromancer.java @@ -35,7 +35,7 @@ public final class FallenFerromancer extends CardImpl { // {1}{R}, {T}: Fallen Ferromancer deals 1 damage to any target. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addCost(new ManaCostsImpl("{1}{R}")); + ability.addCost(new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FamishedGhoul.java b/Mage.Sets/src/mage/cards/f/FamishedGhoul.java index 3dc64b14c69..34ff9563da7 100644 --- a/Mage.Sets/src/mage/cards/f/FamishedGhoul.java +++ b/Mage.Sets/src/mage/cards/f/FamishedGhoul.java @@ -29,7 +29,7 @@ public final class FamishedGhoul extends CardImpl { this.toughness = new MageInt(2); // {1}{B}, Sacrifice Famished Ghoul: Exile up to two target cards from a single graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInASingleGraveyard(0, 2, StaticFilters.FILTER_CARD_CARDS)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/Farmstead.java b/Mage.Sets/src/mage/cards/f/Farmstead.java index 85c06775117..70856563750 100644 --- a/Mage.Sets/src/mage/cards/f/Farmstead.java +++ b/Mage.Sets/src/mage/cards/f/Farmstead.java @@ -36,7 +36,7 @@ public final class Farmstead extends CardImpl { // Enchanted land has "At the beginning of your upkeep, you may pay {W}{W}. If you do, you gain 1 life." ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, - new DoIfCostPaid(new GainLifeEffect(1), new ManaCostsImpl("{W}{W}")), + new DoIfCostPaid(new GainLifeEffect(1), new ManaCostsImpl<>("{W}{W}")), TargetController.YOU, false); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"At the beginning of your upkeep, you may pay {W}{W}. If you do, you gain 1 life.\""); diff --git a/Mage.Sets/src/mage/cards/f/FarrelitePriest.java b/Mage.Sets/src/mage/cards/f/FarrelitePriest.java index cbba2dc2402..2f490db68ce 100644 --- a/Mage.Sets/src/mage/cards/f/FarrelitePriest.java +++ b/Mage.Sets/src/mage/cards/f/FarrelitePriest.java @@ -34,7 +34,7 @@ public final class FarrelitePriest extends CardImpl { this.toughness = new MageInt(3); // {1}: Add {W}. If this ability has been activated four or more times this turn, sacrifice Farrelite Priest at the beginning of the next end step. - SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new ManaCostsImpl("{1}")); + SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new ManaCostsImpl<>("{1}")); ability.addEffect(new FarrelitePriestEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Fatestitcher.java b/Mage.Sets/src/mage/cards/f/Fatestitcher.java index 3019602378e..1b3bc383b6f 100644 --- a/Mage.Sets/src/mage/cards/f/Fatestitcher.java +++ b/Mage.Sets/src/mage/cards/f/Fatestitcher.java @@ -42,7 +42,7 @@ public final class Fatestitcher extends CardImpl { ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Unearth {U} - this.addAbility(new UnearthAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new UnearthAbility(new ManaCostsImpl<>("{U}"))); } private Fatestitcher(final Fatestitcher card) { diff --git a/Mage.Sets/src/mage/cards/f/FathomFeeder.java b/Mage.Sets/src/mage/cards/f/FathomFeeder.java index 4c2852ddb53..9cd8ca17674 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFeeder.java +++ b/Mage.Sets/src/mage/cards/f/FathomFeeder.java @@ -46,7 +46,7 @@ public final class FathomFeeder extends CardImpl { // {3}{U}{B}: Draw a card. Each opponent exiles the top card of their library. Effect effect = new FathomFeederEffect(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{3}{U}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{U}{B}")); ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FathomFleetFirebrand.java b/Mage.Sets/src/mage/cards/f/FathomFleetFirebrand.java index 3734873ac91..c6431fdf1ba 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFleetFirebrand.java +++ b/Mage.Sets/src/mage/cards/f/FathomFleetFirebrand.java @@ -28,7 +28,7 @@ public final class FathomFleetFirebrand extends CardImpl { this.toughness = new MageInt(2); // {1}{r}: Fathom Fleet Firebrand 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 FathomFleetFirebrand(final FathomFleetFirebrand card) { diff --git a/Mage.Sets/src/mage/cards/f/FearsomeTemper.java b/Mage.Sets/src/mage/cards/f/FearsomeTemper.java index 3f97fae3355..5c7fc8f3997 100644 --- a/Mage.Sets/src/mage/cards/f/FearsomeTemper.java +++ b/Mage.Sets/src/mage/cards/f/FearsomeTemper.java @@ -40,7 +40,7 @@ public final class FearsomeTemper extends CardImpl { Effect effect = new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2"); ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); - Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{2}{R}")); + Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}")); grantedAbility.addTarget(new TargetCreaturePermanent()); effect = new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has \"{2}{R}: Target creature can't block this creature this turn"); diff --git a/Mage.Sets/src/mage/cards/f/FeelingOfDread.java b/Mage.Sets/src/mage/cards/f/FeelingOfDread.java index a47b8bf95b5..b980a0bb196 100644 --- a/Mage.Sets/src/mage/cards/f/FeelingOfDread.java +++ b/Mage.Sets/src/mage/cards/f/FeelingOfDread.java @@ -26,7 +26,7 @@ public final class FeelingOfDread extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2)); // Flashback {1}{U} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{1}{U}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{1}{U}"))); } private FeelingOfDread(final FeelingOfDread card) { diff --git a/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java b/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java index 71c460928f0..051cd803278 100644 --- a/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java +++ b/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java @@ -42,7 +42,7 @@ public final class FeldonOfTheThirdPath extends CardImpl { this.toughness = new MageInt(3); // {2}{R}, {T}: Create a token that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FeldonOfTheThirdPathEffect(), new ManaCostsImpl("{2}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FeldonOfTheThirdPathEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(1, 1, new FilterCreatureCard("creature card in your graveyard"))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java b/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java index 2d3263c107e..294a3bd7a9a 100644 --- a/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java +++ b/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java @@ -45,7 +45,7 @@ public final class FelhideSpiritbinder extends CardImpl { this.toughness = new MageInt(4); // Inspired — Whenever Felhide Spiritbinder becomes untapped, you may pay {1}{R}. If you do, create a token that's a copy of another target creature except it's an enchantment in addition to its other types. It gains haste. Exile it at the beginning of the next end step. - Ability ability = new InspiredAbility(new DoIfCostPaid(new FelhideSpiritbinderEffect(), new ManaCostsImpl("{1}{R}"), "Use effect of {this}?")); + Ability ability = new InspiredAbility(new DoIfCostPaid(new FelhideSpiritbinderEffect(), new ManaCostsImpl<>("{1}{R}"), "Use effect of {this}?")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FelidarUmbra.java b/Mage.Sets/src/mage/cards/f/FelidarUmbra.java index 9f29a79cb67..4220d09b071 100644 --- a/Mage.Sets/src/mage/cards/f/FelidarUmbra.java +++ b/Mage.Sets/src/mage/cards/f/FelidarUmbra.java @@ -44,7 +44,7 @@ public final class FelidarUmbra extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); // {1}{W}: Attach Felidar Umbra to target creature you control. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "Attach {this} to target creature you control"), new ManaCostsImpl("{1}{W}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FellShepherd.java b/Mage.Sets/src/mage/cards/f/FellShepherd.java index f0e3e7f0453..05e8b7bb600 100644 --- a/Mage.Sets/src/mage/cards/f/FellShepherd.java +++ b/Mage.Sets/src/mage/cards/f/FellShepherd.java @@ -52,7 +52,7 @@ public final class FellShepherd extends CardImpl { // {B}, Sacrifice another creature: Target creature gets -2/-2 until end of turn. Ability ability = new SimpleActivatedAbility( - new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl("{B}") + new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{B}") ); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE))); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/f/FemerefKnight.java b/Mage.Sets/src/mage/cards/f/FemerefKnight.java index 798944a1107..ecba4613c4f 100644 --- a/Mage.Sets/src/mage/cards/f/FemerefKnight.java +++ b/Mage.Sets/src/mage/cards/f/FemerefKnight.java @@ -32,7 +32,7 @@ public final class FemerefKnight extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {W}: Femeref Knight gains vigilance until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private FemerefKnight(final FemerefKnight card) { diff --git a/Mage.Sets/src/mage/cards/f/FencerClique.java b/Mage.Sets/src/mage/cards/f/FencerClique.java index 5b197f89db0..3ba7c4e1936 100644 --- a/Mage.Sets/src/mage/cards/f/FencerClique.java +++ b/Mage.Sets/src/mage/cards/f/FencerClique.java @@ -29,7 +29,7 @@ public final class FencerClique extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}: Put Fencer Clique on top of its owner's library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibrarySourceEffect(true), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{U}"))); } private FencerClique(final FencerClique card) { diff --git a/Mage.Sets/src/mage/cards/f/FendOff.java b/Mage.Sets/src/mage/cards/f/FendOff.java index 6205da00336..be89cbcf35e 100644 --- a/Mage.Sets/src/mage/cards/f/FendOff.java +++ b/Mage.Sets/src/mage/cards/f/FendOff.java @@ -26,7 +26,7 @@ public final class FendOff extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FeralDeceiver.java b/Mage.Sets/src/mage/cards/f/FeralDeceiver.java index ffaff745b6c..64753c03310 100644 --- a/Mage.Sets/src/mage/cards/f/FeralDeceiver.java +++ b/Mage.Sets/src/mage/cards/f/FeralDeceiver.java @@ -44,7 +44,7 @@ public final class FeralDeceiver extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryControllerEffect(), new GenericManaCost(1))); // {2}: Reveal the top card of your library. If it's a land card, {this} gets +2/+2 and gains trample until end of turn. - this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new FeralDeceiverEffect(), new ManaCostsImpl("{2}"))); + this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new FeralDeceiverEffect(), new ManaCostsImpl<>("{2}"))); } private FeralDeceiver(final FeralDeceiver card) { diff --git a/Mage.Sets/src/mage/cards/f/FeralHydra.java b/Mage.Sets/src/mage/cards/f/FeralHydra.java index 1f22daed006..88d7dea25ac 100644 --- a/Mage.Sets/src/mage/cards/f/FeralHydra.java +++ b/Mage.Sets/src/mage/cards/f/FeralHydra.java @@ -35,7 +35,7 @@ public final class FeralHydra extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); // {3}: Put a +1/+1 counter on Feral Hydra. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{3}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{3}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java b/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java index d4c6f2c42a3..c5142576208 100644 --- a/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java +++ b/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java @@ -29,7 +29,7 @@ public final class FeralRidgewolf extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {1}{R}: Feral Ridgewolf 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 FeralRidgewolf(final FeralRidgewolf card) { diff --git a/Mage.Sets/src/mage/cards/f/Ferrovore.java b/Mage.Sets/src/mage/cards/f/Ferrovore.java index fe985d0960d..681d876fc24 100644 --- a/Mage.Sets/src/mage/cards/f/Ferrovore.java +++ b/Mage.Sets/src/mage/cards/f/Ferrovore.java @@ -35,7 +35,7 @@ public final class Ferrovore extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Fertilid.java b/Mage.Sets/src/mage/cards/f/Fertilid.java index fd5a7801f61..c559174d17f 100644 --- a/Mage.Sets/src/mage/cards/f/Fertilid.java +++ b/Mage.Sets/src/mage/cards/f/Fertilid.java @@ -38,7 +38,7 @@ public final class Fertilid extends CardImpl { // {1}{G}, Remove a +1/+1 counter from Fertilid: Target player searches their library for a basic land card and puts it onto the battlefield tapped. Then that player shuffles their library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new SearchLibraryPutInPlayTargetPlayerEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new ManaCostsImpl("{1}{G}")); + new SearchLibraryPutInPlayTargetPlayerEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FerventDenial.java b/Mage.Sets/src/mage/cards/f/FerventDenial.java index d7c4fc8f218..d2946dc648d 100644 --- a/Mage.Sets/src/mage/cards/f/FerventDenial.java +++ b/Mage.Sets/src/mage/cards/f/FerventDenial.java @@ -25,7 +25,7 @@ public final class FerventDenial extends CardImpl { this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell()); // Flashback {5}{U}{U} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{5}{U}{U}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{5}{U}{U}"))); } private FerventDenial(final FerventDenial card) { diff --git a/Mage.Sets/src/mage/cards/f/FesteringEvil.java b/Mage.Sets/src/mage/cards/f/FesteringEvil.java index d701eba0b15..1dc1add7282 100644 --- a/Mage.Sets/src/mage/cards/f/FesteringEvil.java +++ b/Mage.Sets/src/mage/cards/f/FesteringEvil.java @@ -27,7 +27,7 @@ public final class FesteringEvil extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DamageEverythingEffect(1), TargetController.YOU, false)); // {B}{B}, Sacrifice Festering Evil: Festering Evil deals 3 damage to each creature and each player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(3), new ManaCostsImpl("{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(3), new ManaCostsImpl<>("{B}{B}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FetidHeath.java b/Mage.Sets/src/mage/cards/f/FetidHeath.java index 9bbbd9f0fbf..56042347b27 100644 --- a/Mage.Sets/src/mage/cards/f/FetidHeath.java +++ b/Mage.Sets/src/mage/cards/f/FetidHeath.java @@ -26,15 +26,15 @@ public final class FetidHeath extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {W/B}, {T}: Add {W}{W}, {W}{B}, or {B}{B}. - SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(2), new ManaCostsImpl("{W/B}")); + SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(2), new ManaCostsImpl<>("{W/B}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 0, 1, 0, 0, 0, 0, 0), new ManaCostsImpl("{W/B}")); + ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 0, 1, 0, 0, 0, 0, 0), new ManaCostsImpl<>("{W/B}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(2), new ManaCostsImpl("{W/B}")); + ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(2), new ManaCostsImpl<>("{W/B}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FetidImp.java b/Mage.Sets/src/mage/cards/f/FetidImp.java index 7295d474856..0a84cd56619 100644 --- a/Mage.Sets/src/mage/cards/f/FetidImp.java +++ b/Mage.Sets/src/mage/cards/f/FetidImp.java @@ -31,7 +31,7 @@ public final class FetidImp extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {B}: Fetid Imp gains deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private FetidImp(final FetidImp card) { diff --git a/Mage.Sets/src/mage/cards/f/FetidPools.java b/Mage.Sets/src/mage/cards/f/FetidPools.java index acb76f4c8d2..f7df512a5aa 100644 --- a/Mage.Sets/src/mage/cards/f/FetidPools.java +++ b/Mage.Sets/src/mage/cards/f/FetidPools.java @@ -32,7 +32,7 @@ public final class FetidPools 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/f/FeveredConvulsions.java b/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java index c053ea780f8..65e8a82fe88 100644 --- a/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java +++ b/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java @@ -22,7 +22,7 @@ public final class FeveredConvulsions extends CardImpl { public FeveredConvulsions(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{B}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance(1)), new ManaCostsImpl("{2}{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance(1)), new ManaCostsImpl<>("{2}{B}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FieldOfReality.java b/Mage.Sets/src/mage/cards/f/FieldOfReality.java index a70296bf449..c7175ec4e89 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfReality.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfReality.java @@ -35,7 +35,7 @@ public final class FieldOfReality extends CardImpl { this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesAttachedEffect( Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.SPIRIT, "Spirits"), AttachmentType.AURA))); // {1}{U}: Return Field of Reality to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}"))); } private FieldOfReality(final FieldOfReality card) { diff --git a/Mage.Sets/src/mage/cards/f/FieldOfRuin.java b/Mage.Sets/src/mage/cards/f/FieldOfRuin.java index 4ae3757f4d3..4ef4eb6a7bc 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfRuin.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfRuin.java @@ -47,7 +47,7 @@ public final class FieldOfRuin extends CardImpl { // {2}, {T}, Sacrifice Field of Ruin: Destroy target nonbasic land an opponent controls. Each player searches their library for a basic land card, puts it onto the battlefield, then shuffles their library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); - ability.addCost(new ManaCostsImpl("{2}")); + ability.addCost(new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new FieldOfRuinEffect()); ability.addTarget(new TargetLandPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/f/FiendArtisan.java b/Mage.Sets/src/mage/cards/f/FiendArtisan.java index d2100c76857..b148f328a2e 100644 --- a/Mage.Sets/src/mage/cards/f/FiendArtisan.java +++ b/Mage.Sets/src/mage/cards/f/FiendArtisan.java @@ -56,7 +56,7 @@ public final class FiendArtisan extends CardImpl { // {X}{B/G}, {T}, Sacrifice another creature: Search your library for a creature card with converted mana cost X or less, put it onto the battlefield, then shuffle your library. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility( - Zone.BATTLEFIELD, new FiendArtisanEffect(), new ManaCostsImpl("{X}{B/G}") + Zone.BATTLEFIELD, new FiendArtisanEffect(), new ManaCostsImpl<>("{X}{B/G}") ); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/cards/f/FieryBombardment.java b/Mage.Sets/src/mage/cards/f/FieryBombardment.java index cbfb9f9387b..42264514afd 100644 --- a/Mage.Sets/src/mage/cards/f/FieryBombardment.java +++ b/Mage.Sets/src/mage/cards/f/FieryBombardment.java @@ -33,7 +33,7 @@ public final class FieryBombardment extends CardImpl { // Chroma - {2}, Sacrifice a creature: Fiery Bombardment deals damage to any target equal to the number of red mana symbols in the sacrificed creature's mana cost. Effect effect = new FieryBombardmentEffect(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); ability.addTarget(new TargetAnyTarget()); ability.setAbilityWord(AbilityWord.CHROMA); diff --git a/Mage.Sets/src/mage/cards/f/FieryFall.java b/Mage.Sets/src/mage/cards/f/FieryFall.java index 7a41c125b7f..9f2572131d3 100644 --- a/Mage.Sets/src/mage/cards/f/FieryFall.java +++ b/Mage.Sets/src/mage/cards/f/FieryFall.java @@ -26,7 +26,7 @@ public final class FieryFall extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Basic landcycling {1}{R} ({1}{R}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.) - this.addAbility(new BasicLandcyclingAbility(new ManaCostsImpl("{1}{R}"))); + this.addAbility(new BasicLandcyclingAbility(new ManaCostsImpl<>("{1}{R}"))); } public FieryFall (final FieryFall card) { diff --git a/Mage.Sets/src/mage/cards/f/FieryHellhound.java b/Mage.Sets/src/mage/cards/f/FieryHellhound.java index a78661688b1..67e1da2a70b 100644 --- a/Mage.Sets/src/mage/cards/f/FieryHellhound.java +++ b/Mage.Sets/src/mage/cards/f/FieryHellhound.java @@ -28,7 +28,7 @@ public final class FieryHellhound extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private FieryHellhound(final FieryHellhound card) { diff --git a/Mage.Sets/src/mage/cards/f/FieryTemper.java b/Mage.Sets/src/mage/cards/f/FieryTemper.java index 69ba396b442..19dc553b1ab 100644 --- a/Mage.Sets/src/mage/cards/f/FieryTemper.java +++ b/Mage.Sets/src/mage/cards/f/FieryTemper.java @@ -25,7 +25,7 @@ public final class FieryTemper extends CardImpl { this.getSpellAbility().addTarget(new TargetAnyTarget()); // Madness {R} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{R}"))); } private FieryTemper(final FieryTemper card) { diff --git a/Mage.Sets/src/mage/cards/f/FiftyFeetOfRope.java b/Mage.Sets/src/mage/cards/f/FiftyFeetOfRope.java index 1a77e996c86..3145447945a 100644 --- a/Mage.Sets/src/mage/cards/f/FiftyFeetOfRope.java +++ b/Mage.Sets/src/mage/cards/f/FiftyFeetOfRope.java @@ -36,13 +36,13 @@ public final class FiftyFeetOfRope extends CardImpl { this.addAbility(ability.withFlavorWord("Climb Over")); // Tie Up — {3}, {T}: Target creature doesn't untap during its controller's next untap step. - ability = new SimpleActivatedAbility(new DontUntapInControllersNextUntapStepTargetEffect(), new ManaCostsImpl("{3}")); + ability = new SimpleActivatedAbility(new DontUntapInControllersNextUntapStepTargetEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability.withFlavorWord("Tie Up")); // Rappel Down — {4}, {T}: Venture into the dungeon. Activate only as a sorcery. - ability = new ActivateAsSorceryActivatedAbility(new VentureIntoTheDungeonEffect(), new ManaCostsImpl("{4}")); + ability = new ActivateAsSorceryActivatedAbility(new VentureIntoTheDungeonEffect(), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); this.addAbility(ability.withFlavorWord("Rappel Down")); } diff --git a/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java b/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java index 1b03d4810cc..0ce9ea9d0bf 100644 --- a/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java +++ b/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java @@ -33,7 +33,7 @@ public final class FigureOfDestiny extends CardImpl { // {RW}: Figure of Destiny becomes a Kithkin Spirit with base power and toughness 2/2. Ability ability = new SimpleActivatedAbility(new AddCardSubTypeSourceEffect( Duration.Custom, SubType.KITHKIN, SubType.SPIRIT - ).setText("{this} becomes a Kithkin Spirit"), new ManaCostsImpl("{R/W}")); + ).setText("{this} becomes a Kithkin Spirit"), new ManaCostsImpl<>("{R/W}")); ability.addEffect(new SetPowerToughnessSourceEffect( 2, 2, Duration.Custom, SubLayer.SetPT_7b ).setText("with base power and toughness 2/2")); @@ -41,12 +41,12 @@ public final class FigureOfDestiny extends CardImpl { // {RW}{RW}{RW}: If Figure of Destiny is a Spirit, it becomes a Kithkin Spirit Warrior with base power and toughness 4/4. this.addAbility(new SimpleActivatedAbility( - new FigureOfDestinySpiritEffect(), new ManaCostsImpl("{R/W}{R/W}{R/W}") + new FigureOfDestinySpiritEffect(), new ManaCostsImpl<>("{R/W}{R/W}{R/W}") )); // {RW}{RW}{RW}{RW}{RW}{RW}: If Figure of Destiny is a Warrior, it becomes a Kithkin Spirit Warrior Avatar with base power and toughness 8/8, flying, and first strike. this.addAbility(new SimpleActivatedAbility( - new FigureOfDestinyWarriorEffect(), new ManaCostsImpl("{R/W}{R/W}{R/W}{R/W}{R/W}{R/W}") + new FigureOfDestinyWarriorEffect(), new ManaCostsImpl<>("{R/W}{R/W}{R/W}{R/W}{R/W}{R/W}") )); } diff --git a/Mage.Sets/src/mage/cards/f/FiligreeSages.java b/Mage.Sets/src/mage/cards/f/FiligreeSages.java index 8a4626cfa02..575fbe8529d 100644 --- a/Mage.Sets/src/mage/cards/f/FiligreeSages.java +++ b/Mage.Sets/src/mage/cards/f/FiligreeSages.java @@ -34,7 +34,7 @@ public final class FiligreeSages extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FireBellyChangeling.java b/Mage.Sets/src/mage/cards/f/FireBellyChangeling.java index d0e38f1af60..fea42fb7bbd 100644 --- a/Mage.Sets/src/mage/cards/f/FireBellyChangeling.java +++ b/Mage.Sets/src/mage/cards/f/FireBellyChangeling.java @@ -31,7 +31,7 @@ public final class FireBellyChangeling extends CardImpl { // {R}: Fire-Belly Changeling gets +1/+0 until end of turn. Activate this ability no more than twice each turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, - new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"), 2)); + new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"), 2)); } private FireBellyChangeling(final FireBellyChangeling card) { diff --git a/Mage.Sets/src/mage/cards/f/FireDrake.java b/Mage.Sets/src/mage/cards/f/FireDrake.java index e9c8f411d48..db38f7eae5f 100644 --- a/Mage.Sets/src/mage/cards/f/FireDrake.java +++ b/Mage.Sets/src/mage/cards/f/FireDrake.java @@ -30,7 +30,7 @@ public final class FireDrake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {R}: Fire Drake gets +1/+0 until end of turn. Activate this ability only once each turn. - this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FireFieldOgre.java b/Mage.Sets/src/mage/cards/f/FireFieldOgre.java index 025f83f0a5a..08f2710812b 100644 --- a/Mage.Sets/src/mage/cards/f/FireFieldOgre.java +++ b/Mage.Sets/src/mage/cards/f/FireFieldOgre.java @@ -26,7 +26,7 @@ public final class FireFieldOgre extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FirstStrikeAbility.getInstance()); - this.addAbility(new UnearthAbility(new ManaCostsImpl("{U}{B}{R}"))); + this.addAbility(new UnearthAbility(new ManaCostsImpl<>("{U}{B}{R}"))); } private FireFieldOgre(final FireFieldOgre card) { diff --git a/Mage.Sets/src/mage/cards/f/FireLitThicket.java b/Mage.Sets/src/mage/cards/f/FireLitThicket.java index 59ce1466b0d..250614ed5d8 100644 --- a/Mage.Sets/src/mage/cards/f/FireLitThicket.java +++ b/Mage.Sets/src/mage/cards/f/FireLitThicket.java @@ -24,15 +24,15 @@ public final class FireLitThicket extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {RG}, {tap}: Add {R}{R}, {R}{G}, or {G}{G}. - SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(2), new ManaCostsImpl("{R/G}")); + SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(2), new ManaCostsImpl<>("{R/G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 0, 0, 1, 1, 0, 0, 0), new ManaCostsImpl("{R/G}")); + ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 0, 0, 1, 1, 0, 0, 0), new ManaCostsImpl<>("{R/G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(2), new ManaCostsImpl("{R/G}")); + ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(2), new ManaCostsImpl<>("{R/G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FireSprites.java b/Mage.Sets/src/mage/cards/f/FireSprites.java index fc5a074bfb7..56eb2cd98c0 100644 --- a/Mage.Sets/src/mage/cards/f/FireSprites.java +++ b/Mage.Sets/src/mage/cards/f/FireSprites.java @@ -30,7 +30,7 @@ public final class FireSprites extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {G}, {tap}: Add {R}. - Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new ManaCostsImpl("{G}")); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Firebolt.java b/Mage.Sets/src/mage/cards/f/Firebolt.java index a012d1cd264..f53d1272ab4 100644 --- a/Mage.Sets/src/mage/cards/f/Firebolt.java +++ b/Mage.Sets/src/mage/cards/f/Firebolt.java @@ -25,7 +25,7 @@ public final class Firebolt extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Flashback {4}{R} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{4}{R}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{4}{R}"))); } private Firebolt(final Firebolt card) { diff --git a/Mage.Sets/src/mage/cards/f/FirebornKnight.java b/Mage.Sets/src/mage/cards/f/FirebornKnight.java index d36f8a22b49..9dbef06dfb3 100644 --- a/Mage.Sets/src/mage/cards/f/FirebornKnight.java +++ b/Mage.Sets/src/mage/cards/f/FirebornKnight.java @@ -33,7 +33,7 @@ public final class FirebornKnight extends CardImpl { // {R/W}{R/W}{R/W}{R/W}: Fireborn Knight gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), - new ManaCostsImpl("{R/W}{R/W}{R/W}{R/W}"))); + new ManaCostsImpl<>("{R/W}{R/W}{R/W}{R/W}"))); } private FirebornKnight(final FirebornKnight card) { diff --git a/Mage.Sets/src/mage/cards/f/FirebrandRanger.java b/Mage.Sets/src/mage/cards/f/FirebrandRanger.java index b401bf5fcef..e9047aa9d3d 100644 --- a/Mage.Sets/src/mage/cards/f/FirebrandRanger.java +++ b/Mage.Sets/src/mage/cards/f/FirebrandRanger.java @@ -31,7 +31,7 @@ public final class FirebrandRanger extends CardImpl { // {G}, {T}: You may put a basic land card from your hand onto the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_BASIC_LAND_A), new ManaCostsImpl("{G}")); + new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_BASIC_LAND_A), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FirecatBlitz.java b/Mage.Sets/src/mage/cards/f/FirecatBlitz.java index c6527f4225f..0b40fd33389 100644 --- a/Mage.Sets/src/mage/cards/f/FirecatBlitz.java +++ b/Mage.Sets/src/mage/cards/f/FirecatBlitz.java @@ -42,7 +42,7 @@ public final class FirecatBlitz extends CardImpl { // Flashback-{R}{R}, Sacrifice X Mountains. Ability ability = new FlashbackAbility(this, new SacrificeXTargetCost(filter)); - ability.addManaCost(new ManaCostsImpl("{R}{R}")); + ability.addManaCost(new ManaCostsImpl<>("{R}{R}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FirefrightMage.java b/Mage.Sets/src/mage/cards/f/FirefrightMage.java index 11f01754b7b..288fe8181c6 100644 --- a/Mage.Sets/src/mage/cards/f/FirefrightMage.java +++ b/Mage.Sets/src/mage/cards/f/FirefrightMage.java @@ -46,7 +46,7 @@ public final class FirefrightMage extends CardImpl { this.toughness = new MageInt(1); //{1}{R}, {T}, Discard a card: Target creature can't be blocked this turn except by artifact creatures and/or red creatures. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByAllTargetEffect(filter, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByAllTargetEffect(filter, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/f/FiremaneAngel.java b/Mage.Sets/src/mage/cards/f/FiremaneAngel.java index 5fb3cc2cc29..7c5c426768c 100644 --- a/Mage.Sets/src/mage/cards/f/FiremaneAngel.java +++ b/Mage.Sets/src/mage/cards/f/FiremaneAngel.java @@ -48,7 +48,7 @@ public final class FiremaneAngel extends CardImpl { this.addAbility(ability); // {6}{R}{R}{W}{W}: Return Firemane Angel from your graveyard to the battlefield. Activate this ability only during your upkeep. this.addAbility(new ConditionalActivatedAbility(Zone.GRAVEYARD, - new ReturnSourceFromGraveyardToBattlefieldEffect(false, false), new ManaCostsImpl("{6}{R}{R}{W}{W}"), new IsStepCondition(PhaseStep.UPKEEP), null)); + new ReturnSourceFromGraveyardToBattlefieldEffect(false, false), new ManaCostsImpl<>("{6}{R}{R}{W}{W}"), new IsStepCondition(PhaseStep.UPKEEP), null)); } private FiremaneAngel(final FiremaneAngel card) { diff --git a/Mage.Sets/src/mage/cards/f/FiremindsResearch.java b/Mage.Sets/src/mage/cards/f/FiremindsResearch.java index 37280801d43..d66c8a0b101 100644 --- a/Mage.Sets/src/mage/cards/f/FiremindsResearch.java +++ b/Mage.Sets/src/mage/cards/f/FiremindsResearch.java @@ -34,7 +34,7 @@ public final class FiremindsResearch extends CardImpl { // {1}{U}, Remove two charge counters from Firemind's Research: Draw a card. Ability ability = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(1), - new ManaCostsImpl("{1}{U}") + new ManaCostsImpl<>("{1}{U}") ); ability.addCost(new RemoveCountersSourceCost( CounterType.CHARGE.createInstance(2) @@ -44,7 +44,7 @@ public final class FiremindsResearch extends CardImpl { // {1}{R}, Remove five charge counters from Firemind's Research: It deals 5 damage to any target. ability = new SimpleActivatedAbility( new DamageTargetEffect(5, "it"), - new ManaCostsImpl("{1}{R}") + new ManaCostsImpl<>("{1}{R}") ); ability.addCost(new RemoveCountersSourceCost( CounterType.CHARGE.createInstance(5) diff --git a/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java b/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java index 7d8ceb162ab..be5da97d1f9 100644 --- a/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java +++ b/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java @@ -25,7 +25,7 @@ public final class FiresOfUndeath extends CardImpl { this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(2)); // Flashback {5}{B} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{5}{B}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{5}{B}"))); } private FiresOfUndeath(final FiresOfUndeath card) { diff --git a/Mage.Sets/src/mage/cards/f/Firescreamer.java b/Mage.Sets/src/mage/cards/f/Firescreamer.java index 673c25f0e1b..3f7915cf74a 100644 --- a/Mage.Sets/src/mage/cards/f/Firescreamer.java +++ b/Mage.Sets/src/mage/cards/f/Firescreamer.java @@ -26,7 +26,7 @@ public final class Firescreamer extends CardImpl { this.toughness = new MageInt(2); // {R}: Firescreamer gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private Firescreamer(final Firescreamer card) { diff --git a/Mage.Sets/src/mage/cards/f/Fireshrieker.java b/Mage.Sets/src/mage/cards/f/Fireshrieker.java index bd6d129b279..af034ef564d 100644 --- a/Mage.Sets/src/mage/cards/f/Fireshrieker.java +++ b/Mage.Sets/src/mage/cards/f/Fireshrieker.java @@ -29,7 +29,7 @@ public final class Fireshrieker extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // Equip {2} - this.addAbility(new EquipAbility(Outcome.AddAbility, new ManaCostsImpl("{2}"))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new ManaCostsImpl<>("{2}"))); } private Fireshrieker(final Fireshrieker card) { diff --git a/Mage.Sets/src/mage/cards/f/FirestormHellkite.java b/Mage.Sets/src/mage/cards/f/FirestormHellkite.java index 44f2b344621..ba7cd968bd8 100644 --- a/Mage.Sets/src/mage/cards/f/FirestormHellkite.java +++ b/Mage.Sets/src/mage/cards/f/FirestormHellkite.java @@ -29,7 +29,7 @@ public final class FirestormHellkite extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Cumulative upkeep {U}{R} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{U}{R}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{U}{R}"))); } private FirestormHellkite(final FirestormHellkite card) { diff --git a/Mage.Sets/src/mage/cards/f/FirewingPhoenix.java b/Mage.Sets/src/mage/cards/f/FirewingPhoenix.java index 67e041bfc10..d3964611768 100644 --- a/Mage.Sets/src/mage/cards/f/FirewingPhoenix.java +++ b/Mage.Sets/src/mage/cards/f/FirewingPhoenix.java @@ -29,7 +29,7 @@ public final class FirewingPhoenix extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{R}{R}{R}: Return Firewing Phoenix from your graveyard to your hand. - this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{1}{R}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl<>("{1}{R}{R}{R}"))); } private FirewingPhoenix(final FirewingPhoenix card) { diff --git a/Mage.Sets/src/mage/cards/f/FirstOrderDreadnought.java b/Mage.Sets/src/mage/cards/f/FirstOrderDreadnought.java index 78ecece5c56..df521df56c4 100644 --- a/Mage.Sets/src/mage/cards/f/FirstOrderDreadnought.java +++ b/Mage.Sets/src/mage/cards/f/FirstOrderDreadnought.java @@ -31,7 +31,7 @@ public final class FirstOrderDreadnought extends CardImpl { this.addAbility(SpaceflightAbility.getInstance()); // {2}{B}, {T}: Destroy target creature. - Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FirstSphereGargantua.java b/Mage.Sets/src/mage/cards/f/FirstSphereGargantua.java index efb039fc008..a58301d0172 100644 --- a/Mage.Sets/src/mage/cards/f/FirstSphereGargantua.java +++ b/Mage.Sets/src/mage/cards/f/FirstSphereGargantua.java @@ -35,7 +35,7 @@ public final class FirstSphereGargantua extends CardImpl { this.addAbility(ability); // Unearth {2}{B} - this.addAbility(new UnearthAbility(new ManaCostsImpl("{2}{B}"))); + this.addAbility(new UnearthAbility(new ManaCostsImpl<>("{2}{B}"))); } private FirstSphereGargantua(final FirstSphereGargantua card) { diff --git a/Mage.Sets/src/mage/cards/f/FlailingManticore.java b/Mage.Sets/src/mage/cards/f/FlailingManticore.java index b8e0e13ad54..17270aed090 100644 --- a/Mage.Sets/src/mage/cards/f/FlailingManticore.java +++ b/Mage.Sets/src/mage/cards/f/FlailingManticore.java @@ -34,12 +34,12 @@ public final class FlailingManticore extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // {1}: Flailing Manticore gets +1/+1 until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl("{1}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); // {1}: Flailing Manticore gets -1/-1 until end of turn. Any player may activate this ability. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl("{1}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlailingOgre.java b/Mage.Sets/src/mage/cards/f/FlailingOgre.java index 8bc64e1bdb9..9ce47e645bb 100644 --- a/Mage.Sets/src/mage/cards/f/FlailingOgre.java +++ b/Mage.Sets/src/mage/cards/f/FlailingOgre.java @@ -28,12 +28,12 @@ public final class FlailingOgre extends CardImpl { this.toughness = new MageInt(3); // {1}: Flailing Ogre gets +1/+1 until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl("{1}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); // {1}: Flailing Ogre gets -1/-1 until end of turn. Any player may activate this ability. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl("{1}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlailingSoldier.java b/Mage.Sets/src/mage/cards/f/FlailingSoldier.java index ebb7d89c2ba..253b89d8016 100644 --- a/Mage.Sets/src/mage/cards/f/FlailingSoldier.java +++ b/Mage.Sets/src/mage/cards/f/FlailingSoldier.java @@ -29,12 +29,12 @@ public final class FlailingSoldier extends CardImpl { this.toughness = new MageInt(2); // {1}: Flailing Soldier gets +1/+1 until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl("{1}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); // {1}: Flailing Soldier gets -1/-1 until end of turn. Any player may activate this ability. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl("{1}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlameElemental.java b/Mage.Sets/src/mage/cards/f/FlameElemental.java index 8c5cfcc9fde..d31525ed2e2 100644 --- a/Mage.Sets/src/mage/cards/f/FlameElemental.java +++ b/Mage.Sets/src/mage/cards/f/FlameElemental.java @@ -30,7 +30,7 @@ public final class FlameElemental extends CardImpl { this.toughness = new MageInt(2); // {R}, {tap}, Sacrifice Flame Elemental: Flame Elemental deals damage equal to its power to target creature. - Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new SourcePermanentPowerCount(false)), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new SourcePermanentPowerCount(false)), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/f/FlameJet.java b/Mage.Sets/src/mage/cards/f/FlameJet.java index ecea4c918a6..68c3b9de3ee 100644 --- a/Mage.Sets/src/mage/cards/f/FlameJet.java +++ b/Mage.Sets/src/mage/cards/f/FlameJet.java @@ -23,7 +23,7 @@ public final class FlameJet extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetPlayerOrPlaneswalker()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private FlameJet(final FlameJet card) { diff --git a/Mage.Sets/src/mage/cards/f/FlameSpirit.java b/Mage.Sets/src/mage/cards/f/FlameSpirit.java index e4b2325af8d..171e66e6bfd 100644 --- a/Mage.Sets/src/mage/cards/f/FlameSpirit.java +++ b/Mage.Sets/src/mage/cards/f/FlameSpirit.java @@ -28,7 +28,7 @@ public final class FlameSpirit extends CardImpl { this.toughness = new MageInt(3); // {R}: Flame Spirit gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private FlameSpirit(final FlameSpirit card) { diff --git a/Mage.Sets/src/mage/cards/f/FlameblastDragon.java b/Mage.Sets/src/mage/cards/f/FlameblastDragon.java index 55d3eded6ab..afb9678762b 100644 --- a/Mage.Sets/src/mage/cards/f/FlameblastDragon.java +++ b/Mage.Sets/src/mage/cards/f/FlameblastDragon.java @@ -65,7 +65,7 @@ class FlameblastDragonEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - ManaCosts cost = new ManaCostsImpl("{X}{R}"); + ManaCosts cost = new ManaCostsImpl<>("{X}{R}"); if (player != null) { if (player.chooseUse(Outcome.Damage, "Pay " + cost.getText() + "? If you do, Flameblast Dragon deals X damage to any target", source, game)) { int costX = player.announceXMana(0, Integer.MAX_VALUE, "Announce the value for {X}", game, source); diff --git a/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java b/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java index 7967cf3d498..d9abae55f51 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java @@ -27,7 +27,7 @@ public final class FlamekinSpitfire extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{3}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{3}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FlamekinVillage.java b/Mage.Sets/src/mage/cards/f/FlamekinVillage.java index e34fbfd1c87..0e88ee2e731 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinVillage.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinVillage.java @@ -45,7 +45,7 @@ public final class FlamekinVillage extends CardImpl { // {R}, {tap}: Target creature gains haste until end of turn. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), - new ManaCostsImpl("{R}")); + new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlamescrollCelebrant.java b/Mage.Sets/src/mage/cards/f/FlamescrollCelebrant.java index 003a0c07ccb..824d3e87627 100644 --- a/Mage.Sets/src/mage/cards/f/FlamescrollCelebrant.java +++ b/Mage.Sets/src/mage/cards/f/FlamescrollCelebrant.java @@ -48,7 +48,7 @@ public final class FlamescrollCelebrant extends ModalDoubleFacesCard { // {1}{R}: Flamescroll Celebrant gets +2/+0 until end of turn. this.getLeftHalfCard().addAbility(new SimpleActivatedAbility( - new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}") + new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}") )); // 2. diff --git a/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java b/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java index fb7eca29d64..79469960696 100644 --- a/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java +++ b/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java @@ -40,7 +40,7 @@ public final class FlameshadowConjuring extends CardImpl { // Whenever a nontoken creature enters the battlefield under your control, you may pay {R}. If you do, create a token that's a copy of that creature. That token gains haste. Exile it at the beginning of the next end step. Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DoIfCostPaid( - new FlameshadowConjuringEffect(), new ManaCostsImpl("{R}"), "Pay {R} to create a token that's a copy of that creature that entered the battlefield?"), + new FlameshadowConjuringEffect(), new ManaCostsImpl<>("{R}"), "Pay {R} to create a token that's a copy of that creature that entered the battlefield?"), filterNontoken, false, SetTargetPointer.PERMANENT, "Whenever a nontoken creature enters the battlefield under your control, " + "you may pay {R}. If you do, create a token that's a copy of that creature. " diff --git a/Mage.Sets/src/mage/cards/f/FlamestickCourier.java b/Mage.Sets/src/mage/cards/f/FlamestickCourier.java index 3e0876f3f25..a8bd1977db9 100644 --- a/Mage.Sets/src/mage/cards/f/FlamestickCourier.java +++ b/Mage.Sets/src/mage/cards/f/FlamestickCourier.java @@ -45,7 +45,7 @@ public final class FlamestickCourier extends CardImpl { // {2}{R}, {tap}: Target Goblin creature gets +2/+2 and has haste for as long as Flamestick Courier remains tapped. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostTargetEffect(2, 2, Duration.Custom), SourceTappedCondition.TAPPED, - "target Goblin creature gets +2/+2"), new ManaCostsImpl("{2}{R}")); + "target Goblin creature gets +2/+2"), new ManaCostsImpl<>("{2}{R}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.Custom), SourceTappedCondition.TAPPED,"and has haste for as long as {this} remains tapped")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java b/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java index 222092f6a0f..a635555fe0f 100644 --- a/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java +++ b/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java @@ -42,7 +42,7 @@ public final class FlamewakePhoenix extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( Zone.GRAVEYARD, - new DoIfCostPaid(new ReturnToBattlefieldUnderOwnerControlSourceEffect(), new ManaCostsImpl("{R}")), + new DoIfCostPaid(new ReturnToBattlefieldUnderOwnerControlSourceEffect(), new ManaCostsImpl<>("{R}")), TargetController.YOU, false, false), FerociousCondition.instance, "Ferocious — At the beginning of combat on your turn, if you control a creature with power 4 or greater, you may pay {R}. If you do, return {this} from your graveyard to the battlefield." diff --git a/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java b/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java index 3a50c009f7b..233a20c5f0a 100644 --- a/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java +++ b/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java @@ -27,7 +27,7 @@ public final class FlamewaveInvoker extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl("{7}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl<>("{7}{R}")); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Flamewright.java b/Mage.Sets/src/mage/cards/f/Flamewright.java index b79b4e151c3..7053998e8e9 100644 --- a/Mage.Sets/src/mage/cards/f/Flamewright.java +++ b/Mage.Sets/src/mage/cards/f/Flamewright.java @@ -42,7 +42,7 @@ public final class Flamewright extends CardImpl { this.toughness = new MageInt(1); // {1}, {tap}: Create a 1/1 colorless Construct artifact creature token with defender. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DarettiConstructToken()), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DarettiConstructToken()), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java b/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java index 7316a4c19bd..21a215d38c9 100644 --- a/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java +++ b/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java @@ -42,7 +42,7 @@ public final class FlaringFlameKin extends CardImpl { new GainAbilitySourceEffect(TrampleAbility.getInstance()), enchanted, ", has trample")); Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); + new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(grantedAbility), enchanted, ", and has \"{R}: {this} gets +1/+0 until end of turn.\"")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlaringPain.java b/Mage.Sets/src/mage/cards/f/FlaringPain.java index 4c80330baa0..4e75a1d14b3 100644 --- a/Mage.Sets/src/mage/cards/f/FlaringPain.java +++ b/Mage.Sets/src/mage/cards/f/FlaringPain.java @@ -24,7 +24,7 @@ public final class FlaringPain extends CardImpl { // Damage can't be prevented this turn. this.getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn, "Damage can't be prevented this turn", false, false)); // Flashback {R} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{R}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{R}"))); } private FlaringPain(final FlaringPain card) { diff --git a/Mage.Sets/src/mage/cards/f/FlashOfDefiance.java b/Mage.Sets/src/mage/cards/f/FlashOfDefiance.java index 8635f90a1dc..85ea18d112a 100644 --- a/Mage.Sets/src/mage/cards/f/FlashOfDefiance.java +++ b/Mage.Sets/src/mage/cards/f/FlashOfDefiance.java @@ -38,7 +38,7 @@ public final class FlashOfDefiance extends CardImpl { this.getSpellAbility().addEffect(new CantBlockAllEffect(filter, Duration.EndOfTurn)); // Flashback-{1}{R}, Pay 3 life. - Ability ability = new FlashbackAbility(this, new ManaCostsImpl("{1}{R}")); + Ability ability = new FlashbackAbility(this, new ManaCostsImpl<>("{1}{R}")); ability.addCost(new PayLifeCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Flay.java b/Mage.Sets/src/mage/cards/f/Flay.java index ff793b7cdb2..b17b842d7cf 100644 --- a/Mage.Sets/src/mage/cards/f/Flay.java +++ b/Mage.Sets/src/mage/cards/f/Flay.java @@ -22,7 +22,7 @@ public final class Flay extends CardImpl { // Target player discards a card at random. Then that player discards another card at random unless they pay {1}. this.getSpellAbility().addEffect(new DiscardTargetEffect(1, true)); - Effect effect = new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new DiscardTargetEffect(1, true), new ManaCostsImpl("{1}")); + Effect effect = new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new DiscardTargetEffect(1, true), new ManaCostsImpl<>("{1}")); effect.setText("Then that player discards another card at random unless they pay {1}"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/f/FlayedNim.java b/Mage.Sets/src/mage/cards/f/FlayedNim.java index ea2df4f1ff0..8383a24af0d 100644 --- a/Mage.Sets/src/mage/cards/f/FlayedNim.java +++ b/Mage.Sets/src/mage/cards/f/FlayedNim.java @@ -34,7 +34,7 @@ public final class FlayedNim extends CardImpl { false, true)); // {2}{B}: Regenerate Flayed Nim. - this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); } private FlayedNim(final FlayedNim card) { diff --git a/Mage.Sets/src/mage/cards/f/FledglingDragon.java b/Mage.Sets/src/mage/cards/f/FledglingDragon.java index feadee793c6..c57a0aff05a 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingDragon.java +++ b/Mage.Sets/src/mage/cards/f/FledglingDragon.java @@ -38,7 +38,7 @@ public final class FledglingDragon extends CardImpl { Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +3/+3")); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(gainedAbility), new CardsInControllerGraveyardCondition(7), "and has \"{R}: {this} gets +1/+0 until end of turn.\"")); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/f/FledglingImp.java b/Mage.Sets/src/mage/cards/f/FledglingImp.java index 51973421d96..1ea7f7251b9 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingImp.java +++ b/Mage.Sets/src/mage/cards/f/FledglingImp.java @@ -30,7 +30,7 @@ public final class FledglingImp extends CardImpl { this.toughness = new MageInt(2); // {B}, Discard a card: Fledgling Imp gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java index ab24f735900..d7163898667 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java +++ b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java @@ -38,7 +38,7 @@ public final class FledglingMawcor extends CardImpl { this.addAbility(ability); // Morph {U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}{U}"))); } private FledglingMawcor(final FledglingMawcor card) { diff --git a/Mage.Sets/src/mage/cards/f/FleetingImage.java b/Mage.Sets/src/mage/cards/f/FleetingImage.java index 9f03b31a813..09bee488b83 100644 --- a/Mage.Sets/src/mage/cards/f/FleetingImage.java +++ b/Mage.Sets/src/mage/cards/f/FleetingImage.java @@ -29,7 +29,7 @@ public final class FleetingImage extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{U}: Return Fleeting Image to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}"))); } private FleetingImage(final FleetingImage card) { diff --git a/Mage.Sets/src/mage/cards/f/FleshCarver.java b/Mage.Sets/src/mage/cards/f/FleshCarver.java index c78a7f5a95b..7cf035dfe73 100644 --- a/Mage.Sets/src/mage/cards/f/FleshCarver.java +++ b/Mage.Sets/src/mage/cards/f/FleshCarver.java @@ -45,7 +45,7 @@ public final class FleshCarver extends CardImpl { // Intimidate this.addAbility(IntimidateAbility.getInstance()); // {1}{B}, Sacrifice another creature: Put two +1/+1 counters on Flesh Carver. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/Fleshformer.java b/Mage.Sets/src/mage/cards/f/Fleshformer.java index 16c0312418c..0f3ec0e2994 100644 --- a/Mage.Sets/src/mage/cards/f/Fleshformer.java +++ b/Mage.Sets/src/mage/cards/f/Fleshformer.java @@ -37,7 +37,7 @@ public final class Fleshformer extends CardImpl { // {W}{U}{B}{R}{G}: Fleshformer gets +2/+2 and gains fear until end of turn. Target creature gets -2/-2 until end of turn. Activate this ability only during your turn. Effect effect = new BoostSourceEffect(2, 2, Duration.EndOfTurn); effect.setText("{this} gets +2/+2"); - Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{W}{U}{B}{R}{G}"), MyTurnCondition.instance); + Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}{U}{B}{R}{G}"), MyTurnCondition.instance); effect = new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains fear until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/Flickerform.java b/Mage.Sets/src/mage/cards/f/Flickerform.java index 5ea190209b6..5fd27597742 100644 --- a/Mage.Sets/src/mage/cards/f/Flickerform.java +++ b/Mage.Sets/src/mage/cards/f/Flickerform.java @@ -48,7 +48,7 @@ public final class Flickerform extends CardImpl { this.addAbility(ability); // {2}{W}{W}: Exile enchanted creature and all Auras attached to it. At the beginning of the next end step, return that card to the battlefield under its owner's control. If you do, return the other cards exiled this way to the battlefield under their owners' control attached to that creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FlickerformEffect(), new ManaCostsImpl("{2}{W}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FlickerformEffect(), new ManaCostsImpl<>("{2}{W}{W}"))); } private Flickerform(final Flickerform card) { diff --git a/Mage.Sets/src/mage/cards/f/FlickeringSpirit.java b/Mage.Sets/src/mage/cards/f/FlickeringSpirit.java index c9d073e4720..7b9dfefd6d5 100644 --- a/Mage.Sets/src/mage/cards/f/FlickeringSpirit.java +++ b/Mage.Sets/src/mage/cards/f/FlickeringSpirit.java @@ -34,7 +34,7 @@ public final class FlickeringSpirit extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}{W}: Exile Flickering Spirit, then return it to the battlefield under its owner's control. - this.addAbility(new SimpleActivatedAbility(new FlickeringSpiritEffect(), new ManaCostsImpl("{3}{W}"))); + this.addAbility(new SimpleActivatedAbility(new FlickeringSpiritEffect(), new ManaCostsImpl<>("{3}{W}"))); } private FlickeringSpirit(final FlickeringSpirit card) { diff --git a/Mage.Sets/src/mage/cards/f/FlickeringWard.java b/Mage.Sets/src/mage/cards/f/FlickeringWard.java index 0f55e952747..b47af5c62df 100644 --- a/Mage.Sets/src/mage/cards/f/FlickeringWard.java +++ b/Mage.Sets/src/mage/cards/f/FlickeringWard.java @@ -43,7 +43,7 @@ public final class FlickeringWard extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionChosenColorAttachedEffect(true))); // {W}: Return Flickering Ward to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl<>("{W}"))); } private FlickeringWard(final FlickeringWard card) { diff --git a/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java b/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java index 35162b4f3a0..965611d86c8 100644 --- a/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java +++ b/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java @@ -32,7 +32,7 @@ public final class FlightSpellbomb extends CardImpl { ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{U}")), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}")), false)); } public FlightSpellbomb (final FlightSpellbomb card) { diff --git a/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java b/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java index d9380deab03..89f35e8d400 100644 --- a/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java +++ b/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java @@ -42,7 +42,7 @@ public final class FlinthoofBoar extends CardImpl { // {R}: Flinthoof Boar gains haste until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), - new ManaCostsImpl("{R}"))); + new ManaCostsImpl<>("{R}"))); } private FlinthoofBoar(final FlinthoofBoar card) { diff --git a/Mage.Sets/src/mage/cards/f/Flood.java b/Mage.Sets/src/mage/cards/f/Flood.java index 6b2101ea3d4..5cc5e63b6fd 100644 --- a/Mage.Sets/src/mage/cards/f/Flood.java +++ b/Mage.Sets/src/mage/cards/f/Flood.java @@ -32,7 +32,7 @@ public final class Flood extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}"); // {U}{U}: Tap target creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{U}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Floodchaser.java b/Mage.Sets/src/mage/cards/f/Floodchaser.java index 7155cc4dd5b..4be23201afe 100644 --- a/Mage.Sets/src/mage/cards/f/Floodchaser.java +++ b/Mage.Sets/src/mage/cards/f/Floodchaser.java @@ -42,7 +42,7 @@ public final class Floodchaser extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); // {U}, Remove a +1/+1 counter from Floodchaser: Target land becomes an Island until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new ManaCostsImpl<>("{U}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FloodedGrove.java b/Mage.Sets/src/mage/cards/f/FloodedGrove.java index 4f188f34188..879dbf7e08c 100644 --- a/Mage.Sets/src/mage/cards/f/FloodedGrove.java +++ b/Mage.Sets/src/mage/cards/f/FloodedGrove.java @@ -26,15 +26,15 @@ public final class FloodedGrove extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {(G/U)}, {T}: Add {G}{G}, {G}{U}, or {U}{U}. - SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(2), new ManaCostsImpl("{G/U}")); + SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(2), new ManaCostsImpl<>("{G/U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 0, 0, 1, 0, 0, 0), new ManaCostsImpl("{G/U}")); + ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 0, 0, 1, 0, 0, 0), new ManaCostsImpl<>("{G/U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(2), new ManaCostsImpl("{G/U}")); + ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(2), new ManaCostsImpl<>("{G/U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FloodedShoreline.java b/Mage.Sets/src/mage/cards/f/FloodedShoreline.java index 6eb90a4e3ba..5fac46920c3 100644 --- a/Mage.Sets/src/mage/cards/f/FloodedShoreline.java +++ b/Mage.Sets/src/mage/cards/f/FloodedShoreline.java @@ -32,7 +32,7 @@ public final class FloodedShoreline extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}{U}"); // {U}{U}, Return two Islands you control to their owner's hand: Return target creature to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{U}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(2,2, filter, true))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FloodwaterDam.java b/Mage.Sets/src/mage/cards/f/FloodwaterDam.java index 37082ff59bc..5cccc6ace27 100644 --- a/Mage.Sets/src/mage/cards/f/FloodwaterDam.java +++ b/Mage.Sets/src/mage/cards/f/FloodwaterDam.java @@ -27,7 +27,7 @@ public final class FloodwaterDam extends CardImpl { // {X}{X}{1}, {tap}: Tap X target lands. Effect effect = new TapTargetEffect(); effect.setText("tap X target lands"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{X}{X}{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}{X}{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_LANDS)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/Floodwaters.java b/Mage.Sets/src/mage/cards/f/Floodwaters.java index e2c7d362983..7beebeeb95b 100644 --- a/Mage.Sets/src/mage/cards/f/Floodwaters.java +++ b/Mage.Sets/src/mage/cards/f/Floodwaters.java @@ -27,7 +27,7 @@ public final class Floodwaters extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2)); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FlourishingFox.java b/Mage.Sets/src/mage/cards/f/FlourishingFox.java index 11b3a45addf..9c9d1400c4c 100644 --- a/Mage.Sets/src/mage/cards/f/FlourishingFox.java +++ b/Mage.Sets/src/mage/cards/f/FlourishingFox.java @@ -31,7 +31,7 @@ public final class FlourishingFox extends CardImpl { )); // Cycling {1} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}"))); } private FlourishingFox(final FlourishingFox card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowOfMaggots.java b/Mage.Sets/src/mage/cards/f/FlowOfMaggots.java index cdc1ddf50d7..90a8c2daeab 100644 --- a/Mage.Sets/src/mage/cards/f/FlowOfMaggots.java +++ b/Mage.Sets/src/mage/cards/f/FlowOfMaggots.java @@ -34,7 +34,7 @@ public final class FlowOfMaggots extends CardImpl { this.toughness = new MageInt(2); // Cumulative upkeep {1} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // Flow of Maggots can't be blocked by non-Wall creatures. this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java b/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java index ab06e308a4b..7ab6d085439 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java @@ -31,7 +31,7 @@ public final class FlowstoneArmor extends CardImpl { // {3}, {tap}: Target creature gets +1/-1 for as long as Flowstone Armor remains tapped. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostTargetEffect(1, -1, Duration.Custom), SourceTappedCondition.TAPPED, - "target creature gets +1/-1 for as long as {this} remains tapped"), new ManaCostsImpl("{3}")); + "target creature gets +1/-1 for as long as {this} remains tapped"), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneChanneler.java b/Mage.Sets/src/mage/cards/f/FlowstoneChanneler.java index 6c33337f621..95267004e04 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneChanneler.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneChanneler.java @@ -36,7 +36,7 @@ public final class FlowstoneChanneler extends CardImpl { // {1}{R}, {tap}, Discard a card: Target creature gets +1/-1 and gains haste until end of turn. Effect effect = new BoostTargetEffect(1, -1, Duration.EndOfTurn); effect.setText("Target creature gets +1/-1"); - Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{R}")); effect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains haste until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java b/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java index e0090391e53..8779224c6df 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java @@ -27,7 +27,7 @@ public final class FlowstoneCrusher extends CardImpl { // {R}: Flowstone Crusher gets +1/-1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, - new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private FlowstoneCrusher(final FlowstoneCrusher card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java b/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java index 5e7b04c28d0..653adb57c35 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java @@ -32,7 +32,7 @@ public final class FlowstoneMauler extends CardImpl { // {R}: Flowstone Mauler gets +1/-1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), - new ManaCostsImpl("{R}"))); + new ManaCostsImpl<>("{R}"))); } private FlowstoneMauler(final FlowstoneMauler card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java b/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java index dac26e8f23e..07bc833de06 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java @@ -29,7 +29,7 @@ public final class FlowstoneOverseer extends CardImpl { this.toughness = new MageInt(4); // {R}{R}: Target creature gets +1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl("{R}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java b/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java index 11519e23b35..08ca8fbcde9 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java @@ -41,7 +41,7 @@ public final class FlowstoneSculpture extends CardImpl { this.toughness = new MageInt(4); // {2}, Discard a card: Put a +1/+1 counter on Flowstone Sculpture or Flowstone Sculpture gains flying, first strike, or trample. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FlowstoneSculptureEffect(), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FlowstoneSculptureEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java b/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java index 84db0946b17..bf15e5e82a9 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java @@ -27,7 +27,7 @@ public final class FlowstoneShambler extends CardImpl { // {R}: Flowstone Shambler gets +1/-1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, - new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private FlowstoneShambler(final FlowstoneShambler card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java b/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java index 35723610b06..08178fc821e 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java @@ -33,7 +33,7 @@ public final class FlowstoneThopter extends CardImpl { // {1}: Flowstone Thopter gets +1/-1 and gains flying until end of turn. Effect effect = new BoostSourceEffect(1, -1, Duration.EndOfTurn); effect.setText("{this} gets +1/-1"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}")); effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains flying until end of turn."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneWall.java b/Mage.Sets/src/mage/cards/f/FlowstoneWall.java index c9cd3657360..ac9b1245f74 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneWall.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneWall.java @@ -29,7 +29,7 @@ public final class FlowstoneWall extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {R}: Flowstone Wall gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private FlowstoneWall(final FlowstoneWall card) { diff --git a/Mage.Sets/src/mage/cards/f/Flusterstorm.java b/Mage.Sets/src/mage/cards/f/Flusterstorm.java index a67b9a44991..2223362e04f 100644 --- a/Mage.Sets/src/mage/cards/f/Flusterstorm.java +++ b/Mage.Sets/src/mage/cards/f/Flusterstorm.java @@ -21,7 +21,7 @@ public final class Flusterstorm extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}"); // Counter target instant or sorcery spell unless its controller pays {1}. - this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new ManaCostsImpl("{1}"))); + this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new ManaCostsImpl<>("{1}"))); this.getSpellAbility().addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); // Storm this.addAbility(new StormAbility()); diff --git a/Mage.Sets/src/mage/cards/f/FlyingCarpet.java b/Mage.Sets/src/mage/cards/f/FlyingCarpet.java index 534692769ff..46090bde601 100644 --- a/Mage.Sets/src/mage/cards/f/FlyingCarpet.java +++ b/Mage.Sets/src/mage/cards/f/FlyingCarpet.java @@ -25,7 +25,7 @@ public final class FlyingCarpet extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {2}, {tap}: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FodderCannon.java b/Mage.Sets/src/mage/cards/f/FodderCannon.java index b6fb74aba5d..5e6d7c3c860 100644 --- a/Mage.Sets/src/mage/cards/f/FodderCannon.java +++ b/Mage.Sets/src/mage/cards/f/FodderCannon.java @@ -26,7 +26,7 @@ public final class FodderCannon extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {4}, {tap}, Sacrifice a creature: Fodder Cannon deals 4 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl("{4}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl<>("{4}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); diff --git a/Mage.Sets/src/mage/cards/f/FogOfGnats.java b/Mage.Sets/src/mage/cards/f/FogOfGnats.java index ba3f2b7cb43..01486d56abc 100644 --- a/Mage.Sets/src/mage/cards/f/FogOfGnats.java +++ b/Mage.Sets/src/mage/cards/f/FogOfGnats.java @@ -29,7 +29,7 @@ public final class FogOfGnats extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {B}: Regenerate Fog of Gnats. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private FogOfGnats(final FogOfGnats card) { diff --git a/Mage.Sets/src/mage/cards/f/FolioOfFancies.java b/Mage.Sets/src/mage/cards/f/FolioOfFancies.java index aba604bb267..24763f5cc76 100644 --- a/Mage.Sets/src/mage/cards/f/FolioOfFancies.java +++ b/Mage.Sets/src/mage/cards/f/FolioOfFancies.java @@ -36,13 +36,13 @@ public final class FolioOfFancies extends CardImpl { // {X}{X}, {T}: Each player draws X cards. Ability ability = new SimpleActivatedAbility( - new DrawCardAllEffect(ManacostVariableValue.REGULAR), new ManaCostsImpl("{X}{X}") + new DrawCardAllEffect(ManacostVariableValue.REGULAR), new ManaCostsImpl<>("{X}{X}") ); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {2}{U}, {T}: Each opponent puts a number of cards equal to the number of cards in their hand from the top of their library into their graveyard. - ability = new SimpleActivatedAbility(new FolioOfFanciesEffect(), new ManaCostsImpl("{2}{U}")); + ability = new SimpleActivatedAbility(new FolioOfFanciesEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FolkMedicine.java b/Mage.Sets/src/mage/cards/f/FolkMedicine.java index aead1d97917..d362afdad3a 100644 --- a/Mage.Sets/src/mage/cards/f/FolkMedicine.java +++ b/Mage.Sets/src/mage/cards/f/FolkMedicine.java @@ -25,7 +25,7 @@ public final class FolkMedicine extends CardImpl { DynamicValue amount = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURE); this.getSpellAbility().addEffect(new GainLifeEffect(amount)); // Flashback {1}{W} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{1}{W}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{1}{W}"))); } private FolkMedicine(final FolkMedicine card) { diff --git a/Mage.Sets/src/mage/cards/f/FolkOfThePines.java b/Mage.Sets/src/mage/cards/f/FolkOfThePines.java index 2fa4cfe47ca..56647b41be2 100644 --- a/Mage.Sets/src/mage/cards/f/FolkOfThePines.java +++ b/Mage.Sets/src/mage/cards/f/FolkOfThePines.java @@ -26,7 +26,7 @@ public final class FolkOfThePines extends CardImpl { this.toughness = new MageInt(5); // {1}{G}: Folk of the Pines gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private FolkOfThePines(final FolkOfThePines card) { diff --git a/Mage.Sets/src/mage/cards/f/FontOfAgonies.java b/Mage.Sets/src/mage/cards/f/FontOfAgonies.java index 3bcc74095fd..680e2235786 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfAgonies.java +++ b/Mage.Sets/src/mage/cards/f/FontOfAgonies.java @@ -30,7 +30,7 @@ public final class FontOfAgonies extends CardImpl { this.addAbility(new FontOfAgoniesTriggeredAbility()); // {1}{B}, Remove four blood counters from Font of Agonies: Destroy target creature. - Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new RemoveCountersSourceCost(CounterType.BLOOD.createInstance(4))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FontOfFertility.java b/Mage.Sets/src/mage/cards/f/FontOfFertility.java index aa77eafddd2..8ad2d008d8c 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfFertility.java +++ b/Mage.Sets/src/mage/cards/f/FontOfFertility.java @@ -28,7 +28,7 @@ public final class FontOfFertility extends CardImpl { // {1}{G}, Sacrifice Font of Fertility: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FontOfFortunes.java b/Mage.Sets/src/mage/cards/f/FontOfFortunes.java index 6a4edb806a3..d9f6daad87b 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfFortunes.java +++ b/Mage.Sets/src/mage/cards/f/FontOfFortunes.java @@ -23,7 +23,7 @@ public final class FontOfFortunes extends CardImpl { // {1}{U}, Sacrifice Font of Fortunes: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FontOfIre.java b/Mage.Sets/src/mage/cards/f/FontOfIre.java index 48e5e0f4bc7..8a012a878fe 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfIre.java +++ b/Mage.Sets/src/mage/cards/f/FontOfIre.java @@ -23,7 +23,7 @@ public final class FontOfIre extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); // {3}{R}, Sacrifice Font of Ire: Font of Ire deals 5 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl("{3}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl<>("{3}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FontOfReturn.java b/Mage.Sets/src/mage/cards/f/FontOfReturn.java index 1491cd26268..525b2413464 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfReturn.java +++ b/Mage.Sets/src/mage/cards/f/FontOfReturn.java @@ -23,7 +23,7 @@ public final class FontOfReturn extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}"); // {3}{B}, Sacrifice Font of Return: Return up to three target creature cards from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl("{3}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(0, 3, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FontOfVigor.java b/Mage.Sets/src/mage/cards/f/FontOfVigor.java index 4d5a60a1f58..06c2f50d38b 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfVigor.java +++ b/Mage.Sets/src/mage/cards/f/FontOfVigor.java @@ -23,7 +23,7 @@ public final class FontOfVigor extends CardImpl { // {2}{W}, Sacrifice Font of Vigor: You gain 7 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(7), new ManaCostsImpl("{2}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(7), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FoolsTome.java b/Mage.Sets/src/mage/cards/f/FoolsTome.java index 82c6be9f4c8..f0af4a58904 100644 --- a/Mage.Sets/src/mage/cards/f/FoolsTome.java +++ b/Mage.Sets/src/mage/cards/f/FoolsTome.java @@ -24,7 +24,7 @@ public final class FoolsTome extends CardImpl { // {2}, {tap}: Draw a card. Activate this ability only if you have no cards in hand. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), - new ManaCostsImpl("{2}"), HellbentCondition.instance); + new ManaCostsImpl<>("{2}"), HellbentCondition.instance); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FootfallCrater.java b/Mage.Sets/src/mage/cards/f/FootfallCrater.java index 1c82ac48fdb..54d642fc12a 100644 --- a/Mage.Sets/src/mage/cards/f/FootfallCrater.java +++ b/Mage.Sets/src/mage/cards/f/FootfallCrater.java @@ -52,7 +52,7 @@ public final class FootfallCrater extends CardImpl { ))); // Cycling {1} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}"))); } private FootfallCrater(final FootfallCrater card) { diff --git a/Mage.Sets/src/mage/cards/f/FoothillGuide.java b/Mage.Sets/src/mage/cards/f/FoothillGuide.java index 631bdfd0340..efc97cc25fe 100644 --- a/Mage.Sets/src/mage/cards/f/FoothillGuide.java +++ b/Mage.Sets/src/mage/cards/f/FoothillGuide.java @@ -34,7 +34,7 @@ public final class FoothillGuide extends CardImpl { // Protection from Goblins this.addAbility(new ProtectionAbility(filter)); // Morph {W} - this.addAbility(new MorphAbility(new ManaCostsImpl("{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{W}"))); } private FoothillGuide(final FoothillGuide card) { diff --git a/Mage.Sets/src/mage/cards/f/Foratog.java b/Mage.Sets/src/mage/cards/f/Foratog.java index 06397c18be3..0405e5be84a 100644 --- a/Mage.Sets/src/mage/cards/f/Foratog.java +++ b/Mage.Sets/src/mage/cards/f/Foratog.java @@ -35,7 +35,7 @@ public final class Foratog extends CardImpl { this.toughness = new MageInt(2); // {G}, Sacrifice a Forest: Foratog gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java b/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java index f8af6bdc37d..1e518ad9ef2 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java @@ -22,7 +22,7 @@ public final class ForbiddenAlchemy extends CardImpl { this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect(4, 1, PutCards.HAND, PutCards.GRAVEYARD)); // Flashback {6}{B} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{6}{B}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{6}{B}"))); } private ForbiddenAlchemy(final ForbiddenAlchemy card) { diff --git a/Mage.Sets/src/mage/cards/f/ForbiddingSpirit.java b/Mage.Sets/src/mage/cards/f/ForbiddingSpirit.java index 7757037dc9e..29b9c4b8faa 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddingSpirit.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddingSpirit.java @@ -28,7 +28,7 @@ public final class ForbiddingSpirit extends CardImpl { // When Forbidding Spirit enters the battlefield, until your next turn, creatures can't attack you or a planeswalker you control unless their controller pays {2} for each of those creatures. ContinuousEffect effect = new CantAttackYouUnlessPayManaAllEffect( - new ManaCostsImpl("{2}"), true + new ManaCostsImpl<>("{2}"), true ); effect.setDuration(Duration.UntilYourNextTurn); effect.setText("until your next turn, creatures can't attack you or planeswalkers you control " + diff --git a/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java b/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java index 04f0ec64e36..72d45bf67b3 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java @@ -32,7 +32,7 @@ public final class ForbiddingWatchtower extends CardImpl { this.addAbility(new WhiteManaAbility()); // {1}{W}: Forbidding Watchtower becomes a 1/5 white Soldier creature until end of turn. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ForbiddingWatchtowerToken(), "land", Duration.EndOfTurn), new ManaCostsImpl("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ForbiddingWatchtowerToken(), "land", Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private ForbiddingWatchtower(final ForbiddingWatchtower card) { diff --git a/Mage.Sets/src/mage/cards/f/ForceOfNature.java b/Mage.Sets/src/mage/cards/f/ForceOfNature.java index a9f48d6bab3..dad32a59f2c 100644 --- a/Mage.Sets/src/mage/cards/f/ForceOfNature.java +++ b/Mage.Sets/src/mage/cards/f/ForceOfNature.java @@ -67,7 +67,7 @@ class ForceOfNatureEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - Cost cost = new ManaCostsImpl("{G}{G}{G}{G}"); + Cost cost = new ManaCostsImpl<>("{G}{G}{G}{G}"); if (!(controller.chooseUse(Outcome.Benefit, "Pay {G}{G}{G}{G}?", source, game) && cost.pay(source, game, source, controller.getId(), false, null))) { controller.damage(8, source.getSourceId(), source, game); diff --git a/Mage.Sets/src/mage/cards/f/ForcedWorship.java b/Mage.Sets/src/mage/cards/f/ForcedWorship.java index 63765772964..ce2b0b1632a 100644 --- a/Mage.Sets/src/mage/cards/f/ForcedWorship.java +++ b/Mage.Sets/src/mage/cards/f/ForcedWorship.java @@ -41,7 +41,7 @@ public final class ForcedWorship extends CardImpl { // Enchanted creature can't attack. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); // {2}{W}: Return Forced Worship to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{2}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{W}"))); } public ForcedWorship (final ForcedWorship card) { diff --git a/Mage.Sets/src/mage/cards/f/ForgestokerDragon.java b/Mage.Sets/src/mage/cards/f/ForgestokerDragon.java index b9b4e5ee70f..a9250517cca 100644 --- a/Mage.Sets/src/mage/cards/f/ForgestokerDragon.java +++ b/Mage.Sets/src/mage/cards/f/ForgestokerDragon.java @@ -35,7 +35,7 @@ public final class ForgestokerDragon extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{R}: Forgestoker Dragon deals 1 damage to target creature. That creature can't block this combat. Activate this ability only if Forgestoker Dragon is attacking. - Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}"), SourceAttackingCondition.instance); + Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}"), SourceAttackingCondition.instance); ability.addTarget(new TargetCreaturePermanent()); Effect effect = new CantBlockTargetEffect(Duration.EndOfCombat); effect.setText("That creature can't block this combat"); diff --git a/Mage.Sets/src/mage/cards/f/ForgottenCave.java b/Mage.Sets/src/mage/cards/f/ForgottenCave.java index 74ec7ed82de..0e161c9bfe2 100644 --- a/Mage.Sets/src/mage/cards/f/ForgottenCave.java +++ b/Mage.Sets/src/mage/cards/f/ForgottenCave.java @@ -24,7 +24,7 @@ public final class ForgottenCave extends CardImpl { // {tap}: Add {R}. this.addAbility(new RedManaAbility()); // Cycling {R} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{R}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{R}"))); } private ForgottenCave(final ForgottenCave card) { diff --git a/Mage.Sets/src/mage/cards/f/ForgottenLore.java b/Mage.Sets/src/mage/cards/f/ForgottenLore.java index fb29ad8060a..f1802d60489 100644 --- a/Mage.Sets/src/mage/cards/f/ForgottenLore.java +++ b/Mage.Sets/src/mage/cards/f/ForgottenLore.java @@ -65,7 +65,7 @@ class ForgottenLoreEffect extends OneShotEffect { if (you != null && opponent != null) { FilterCard filter = new FilterCard(); filter.add(new OwnerIdPredicate(you.getId())); - Cost cost = new ManaCostsImpl("{G}"); + Cost cost = new ManaCostsImpl<>("{G}"); TargetCardInGraveyard chosenCard; Card card = null; boolean done = false; diff --git a/Mage.Sets/src/mage/cards/f/ForlornPseudamma.java b/Mage.Sets/src/mage/cards/f/ForlornPseudamma.java index c2de531f523..9a0f0322145 100644 --- a/Mage.Sets/src/mage/cards/f/ForlornPseudamma.java +++ b/Mage.Sets/src/mage/cards/f/ForlornPseudamma.java @@ -30,7 +30,7 @@ public final class ForlornPseudamma extends CardImpl { // Intimidate this.addAbility(IntimidateAbility.getInstance()); // Inspired — Whenever Forlorn Pseudamma becomes untapped, you may pay {2}{B}. If you do, create a 2/2 black Zombie enchantment creature token. - this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new ForlornPseudammaZombieToken()), new ManaCostsImpl("{2}{B}")))); + this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new ForlornPseudammaZombieToken()), new ManaCostsImpl<>("{2}{B}")))); } private ForlornPseudamma(final ForlornPseudamma card) { diff --git a/Mage.Sets/src/mage/cards/f/ForsakeTheWorldly.java b/Mage.Sets/src/mage/cards/f/ForsakeTheWorldly.java index 903a5d211fb..845c3bb5f00 100644 --- a/Mage.Sets/src/mage/cards/f/ForsakeTheWorldly.java +++ b/Mage.Sets/src/mage/cards/f/ForsakeTheWorldly.java @@ -26,7 +26,7 @@ public final class ForsakeTheWorldly extends CardImpl { getSpellAbility().addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FortuneThief.java b/Mage.Sets/src/mage/cards/f/FortuneThief.java index bae21315e06..f59f6e9a069 100644 --- a/Mage.Sets/src/mage/cards/f/FortuneThief.java +++ b/Mage.Sets/src/mage/cards/f/FortuneThief.java @@ -37,7 +37,7 @@ public final class FortuneThief extends CardImpl { // Damage that would reduce your life total to less than 1 reduces it to 1 instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FortuneThiefReplacementEffect())); // Morph {R}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl("{R}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{R}{R}"))); } private FortuneThief(final FortuneThief card) { diff --git a/Mage.Sets/src/mage/cards/f/FoulFamiliar.java b/Mage.Sets/src/mage/cards/f/FoulFamiliar.java index 43638f6a6ee..5e3ea05f981 100644 --- a/Mage.Sets/src/mage/cards/f/FoulFamiliar.java +++ b/Mage.Sets/src/mage/cards/f/FoulFamiliar.java @@ -30,7 +30,7 @@ public final class FoulFamiliar extends CardImpl { // Foul Familiar can't block. this.addAbility(new CantBlockAbility()); // {B}, Pay 1 life: Return Foul Familiar to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{B}")); ability.addCost(new PayLifeCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FoundryChampion.java b/Mage.Sets/src/mage/cards/f/FoundryChampion.java index c01fbfbe8c8..656c824df3c 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryChampion.java +++ b/Mage.Sets/src/mage/cards/f/FoundryChampion.java @@ -39,10 +39,10 @@ public final class FoundryChampion extends CardImpl { this.addAbility(ability); //{R}: Foundry Champion gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); //{W}: Foundry Champion gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl("{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private FoundryChampion(final FoundryChampion card) { diff --git a/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java b/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java index 39ce981c103..d4dfb6bcedb 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java +++ b/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java @@ -29,7 +29,7 @@ public final class FoundryOfTheConsuls extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {5}, {T}, Sacrifice Foundry of the Consuls: Create two 1/1 colorless Thopter artifact creature tokens with flying. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ThopterColorlessToken(), 2), - new ManaCostsImpl("{5}")); + new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FoxfireOak.java b/Mage.Sets/src/mage/cards/f/FoxfireOak.java index b20002fe6c5..4aff5ec9ec3 100644 --- a/Mage.Sets/src/mage/cards/f/FoxfireOak.java +++ b/Mage.Sets/src/mage/cards/f/FoxfireOak.java @@ -27,7 +27,7 @@ public final class FoxfireOak extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(6); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl("{R/G}{R/G}{R/G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R/G}{R/G}{R/G}"))); } private FoxfireOak(final FoxfireOak card) { diff --git a/Mage.Sets/src/mage/cards/f/FranticPurification.java b/Mage.Sets/src/mage/cards/f/FranticPurification.java index e7f53c1e4de..e72efb229e4 100644 --- a/Mage.Sets/src/mage/cards/f/FranticPurification.java +++ b/Mage.Sets/src/mage/cards/f/FranticPurification.java @@ -25,7 +25,7 @@ public final class FranticPurification extends CardImpl { this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); // Madness {W} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{W}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{W}"))); } private FranticPurification(final FranticPurification card) { diff --git a/Mage.Sets/src/mage/cards/f/FreeRangeChicken.java b/Mage.Sets/src/mage/cards/f/FreeRangeChicken.java index 1335a3090ab..1c2d3b84c70 100644 --- a/Mage.Sets/src/mage/cards/f/FreeRangeChicken.java +++ b/Mage.Sets/src/mage/cards/f/FreeRangeChicken.java @@ -32,7 +32,7 @@ public final class FreeRangeChicken extends CardImpl { this.toughness = new MageInt(3); // {1}{G}: Roll two six-sided dice. If both results are the same, Free-Range Chicken gets +X/+X until end of turn, where X is that result. If the total of those results is equal to any other total you have rolled this turn for Free-Range Chicken, sacrifice it. (For example, if you roll two 3s, Free-Range Chicken gets +3/+3. If you roll a total of 6 for Free-Range Chicken later that turn, sacrifice it.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FreeRangeChickenEffect(), new ManaCostsImpl("{1}{G}")), new FreeRangeChickenWatcher()); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FreeRangeChickenEffect(), new ManaCostsImpl<>("{1}{G}")), new FreeRangeChickenWatcher()); } private FreeRangeChicken(final FreeRangeChicken card) { diff --git a/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java b/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java index b840eb17407..1d2cd16cf2b 100644 --- a/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java +++ b/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java @@ -33,9 +33,9 @@ public final class FreedFromTheReal extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Untap)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // {U}: Tap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapEnchantedEffect(), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapEnchantedEffect(), new ManaCostsImpl<>("{U}"))); // {U}: Untap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapEnchantedEffect(), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapEnchantedEffect(), new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FreejamRegent.java b/Mage.Sets/src/mage/cards/f/FreejamRegent.java index 62bb24825cb..3f2fb0e2036 100644 --- a/Mage.Sets/src/mage/cards/f/FreejamRegent.java +++ b/Mage.Sets/src/mage/cards/f/FreejamRegent.java @@ -35,7 +35,7 @@ public final class FreejamRegent extends CardImpl { // {1}{R}: Freejam Regent gets +2/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, - new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); + new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private FreejamRegent(final FreejamRegent card) { diff --git a/Mage.Sets/src/mage/cards/f/FreneticOgre.java b/Mage.Sets/src/mage/cards/f/FreneticOgre.java index f7efe18746c..7f068199586 100644 --- a/Mage.Sets/src/mage/cards/f/FreneticOgre.java +++ b/Mage.Sets/src/mage/cards/f/FreneticOgre.java @@ -29,7 +29,7 @@ public final class FreneticOgre extends CardImpl { this.toughness = new MageInt(3); // {R}, Discard a card at random: Frenetic Ogre gets +3/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new DiscardCardCost(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FreneticSliver.java b/Mage.Sets/src/mage/cards/f/FreneticSliver.java index 8c33b99f5f8..5b3f1ab2de0 100644 --- a/Mage.Sets/src/mage/cards/f/FreneticSliver.java +++ b/Mage.Sets/src/mage/cards/f/FreneticSliver.java @@ -40,7 +40,7 @@ public final class FreneticSliver extends CardImpl { new SimpleActivatedAbility( Zone.BATTLEFIELD, new FreneticSliverEffect(), - new ManaCostsImpl("{0}") + new ManaCostsImpl<>("{0}") ), Duration.WhileOnBattlefield, filter, rule ) )); diff --git a/Mage.Sets/src/mage/cards/f/FrenziedArynx.java b/Mage.Sets/src/mage/cards/f/FrenziedArynx.java index ad01231c1f1..37d0371b6f7 100644 --- a/Mage.Sets/src/mage/cards/f/FrenziedArynx.java +++ b/Mage.Sets/src/mage/cards/f/FrenziedArynx.java @@ -36,7 +36,7 @@ public final class FrenziedArynx extends CardImpl { // {4}{R}{G}: Frenzied Arynx gets +3/+0 until end of turn. this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(3, 0, Duration.EndOfTurn), - new ManaCostsImpl("{4}{R}{G}") + new ManaCostsImpl<>("{4}{R}{G}") )); } diff --git a/Mage.Sets/src/mage/cards/f/FrenziedGoblin.java b/Mage.Sets/src/mage/cards/f/FrenziedGoblin.java index e0675d60223..8b03d511fb4 100644 --- a/Mage.Sets/src/mage/cards/f/FrenziedGoblin.java +++ b/Mage.Sets/src/mage/cards/f/FrenziedGoblin.java @@ -32,7 +32,7 @@ public final class FrenziedGoblin extends CardImpl { this.toughness = new MageInt(1); // Whenever Frenzied Goblin attacks, you may pay {R}. If you do, target creature can't block this turn. - Ability ability = new AttacksTriggeredAbility(new DoIfCostPaid(new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{R}")),false, + Ability ability = new AttacksTriggeredAbility(new DoIfCostPaid(new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")),false, "Whenever {this} attacks you, may pay {R}. If you do, target creature can't block this turn."); Target target = new TargetCreaturePermanent(); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/f/FreyalisesCharm.java b/Mage.Sets/src/mage/cards/f/FreyalisesCharm.java index 48ef2edbdbc..e0a9d236cd3 100644 --- a/Mage.Sets/src/mage/cards/f/FreyalisesCharm.java +++ b/Mage.Sets/src/mage/cards/f/FreyalisesCharm.java @@ -33,12 +33,12 @@ public final class FreyalisesCharm extends CardImpl { this.addAbility(new SpellCastOpponentTriggeredAbility( new DoIfCostPaid( new DrawCardSourceControllerEffect(1, "you"), - new ManaCostsImpl("{G}{G}") + new ManaCostsImpl<>("{G}{G}") ), filter, false )); // {G}{G}: Return Freyalise's Charm to its owner's hand. - this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl("{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{G}{G}"))); } private FreyalisesCharm(final FreyalisesCharm card) { diff --git a/Mage.Sets/src/mage/cards/f/FreyalisesRadiance.java b/Mage.Sets/src/mage/cards/f/FreyalisesRadiance.java index 66cdcf4e68e..457634525de 100644 --- a/Mage.Sets/src/mage/cards/f/FreyalisesRadiance.java +++ b/Mage.Sets/src/mage/cards/f/FreyalisesRadiance.java @@ -31,7 +31,7 @@ public final class FreyalisesRadiance extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); // Cumulative upkeep {2} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{2}"))); // Snow permanents don't untap during their controllers' untap steps. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepAllEffect(Duration.WhileOnBattlefield, TargetController.ANY, filter))); diff --git a/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java b/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java index ad7f2697762..39ba836d832 100644 --- a/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java +++ b/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java @@ -45,7 +45,7 @@ public final class FrightshroudCourier extends CardImpl { // {2}{B}, {tap}: Target Zombie creature gets +2/+2 and has fear for as long as Frightshroud Courier remains tapped. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostTargetEffect(2, 2, Duration.Custom), SourceTappedCondition.TAPPED, - "target Zombie creature gets +2/+2"), new ManaCostsImpl("{2}{B}")); + "target Zombie creature gets +2/+2"), new ManaCostsImpl<>("{2}{B}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.Custom), SourceTappedCondition.TAPPED,"and has fear for as long as {this} remains tapped")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FrilledOculus.java b/Mage.Sets/src/mage/cards/f/FrilledOculus.java index 0f612012146..36223d7b832 100644 --- a/Mage.Sets/src/mage/cards/f/FrilledOculus.java +++ b/Mage.Sets/src/mage/cards/f/FrilledOculus.java @@ -27,7 +27,7 @@ public final class FrilledOculus extends CardImpl { this.toughness = new MageInt(3); // {1}{G}: Frilled Oculus gets +2/+2 until end of turn. Activate this ability only once each turn. - this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private FrilledOculus(final FrilledOculus card) { diff --git a/Mage.Sets/src/mage/cards/f/FrilledSandwalla.java b/Mage.Sets/src/mage/cards/f/FrilledSandwalla.java index 5afd686be7d..aa21480f29f 100644 --- a/Mage.Sets/src/mage/cards/f/FrilledSandwalla.java +++ b/Mage.Sets/src/mage/cards/f/FrilledSandwalla.java @@ -28,7 +28,7 @@ public final class FrilledSandwalla extends CardImpl { // {1}{G}: Frilled Sandwalla gets +2/+2 until end of turn. Activate this ability only once each turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, - new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); + new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private FrilledSandwalla(final FrilledSandwalla card) { diff --git a/Mage.Sets/src/mage/cards/f/FrilledSeaSerpent.java b/Mage.Sets/src/mage/cards/f/FrilledSeaSerpent.java index 9b3e9fd8db6..2af1687cca1 100644 --- a/Mage.Sets/src/mage/cards/f/FrilledSeaSerpent.java +++ b/Mage.Sets/src/mage/cards/f/FrilledSeaSerpent.java @@ -30,7 +30,7 @@ public final class FrilledSeaSerpent extends CardImpl { this.addAbility(new SimpleActivatedAbility( Zone.BATTLEFIELD, new CantBeBlockedSourceEffect(Duration.EndOfTurn), - new ManaCostsImpl("{5}{U}{U}") + new ManaCostsImpl<>("{5}{U}{U}") )); } diff --git a/Mage.Sets/src/mage/cards/f/FrillscareMentor.java b/Mage.Sets/src/mage/cards/f/FrillscareMentor.java index 919a18f74df..10d4a966baf 100644 --- a/Mage.Sets/src/mage/cards/f/FrillscareMentor.java +++ b/Mage.Sets/src/mage/cards/f/FrillscareMentor.java @@ -56,7 +56,7 @@ public final class FrillscareMentor extends CardImpl { // {2}{R}, {T}: Put a +1/+1 counter on each creature you control with menace. ability = new SimpleActivatedAbility( - new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter2), new ManaCostsImpl("{2}{R}") + new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter2), new ManaCostsImpl<>("{2}{R}") ); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FromBeyond.java b/Mage.Sets/src/mage/cards/f/FromBeyond.java index dd38a1d9148..986433be3ba 100644 --- a/Mage.Sets/src/mage/cards/f/FromBeyond.java +++ b/Mage.Sets/src/mage/cards/f/FromBeyond.java @@ -44,7 +44,7 @@ public final class FromBeyond extends CardImpl { // {1}{G}, Sacrifice From Beyond: Search your library for an Eldrazi card, reveal it, put it into your hand, then shuffle your library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), - new ManaCostsImpl("{1}{G}")); + new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java b/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java index 396409c86ab..27ab9e75b2d 100644 --- a/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java +++ b/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java @@ -26,7 +26,7 @@ public final class FromUnderTheFloorboards extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}{B}"); // Madness {X}{B}{B} (If you discard this card discard it into exile. When you do cast it for its madness cost or put it into your graveyard. - Ability ability = (new MadnessAbility(new ManaCostsImpl("{X}{B}{B}"))); + Ability ability = (new MadnessAbility(new ManaCostsImpl<>("{X}{B}{B}"))); ability.setRuleAtTheTop(true); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FrontierGuide.java b/Mage.Sets/src/mage/cards/f/FrontierGuide.java index 21d7f0ffc03..af52ba1e875 100644 --- a/Mage.Sets/src/mage/cards/f/FrontierGuide.java +++ b/Mage.Sets/src/mage/cards/f/FrontierGuide.java @@ -32,7 +32,7 @@ public final class FrontierGuide extends CardImpl { //{3}{G}, {T}: Search your library for a basic land card and 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("{3}{G}")); + new ManaCostsImpl<>("{3}{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FrontlineDevastator.java b/Mage.Sets/src/mage/cards/f/FrontlineDevastator.java index 641d5370fb1..8f405dc0b9a 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineDevastator.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineDevastator.java @@ -32,7 +32,7 @@ public final class FrontlineDevastator extends CardImpl { // Afflict 2 addAbility(new AfflictAbility(2)); // {1}{R}: Frontline Devastator gets +1/+0 until end of turn. - addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); + addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private FrontlineDevastator(final FrontlineDevastator card) { diff --git a/Mage.Sets/src/mage/cards/f/FrontlineSage.java b/Mage.Sets/src/mage/cards/f/FrontlineSage.java index 1272e58ab7f..ed3385cdf8b 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineSage.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineSage.java @@ -30,7 +30,7 @@ public final class FrontlineSage extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); this.addAbility(new ExaltedAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java b/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java index 37f6112f9ba..ed852f8cd61 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java @@ -35,7 +35,7 @@ public final class FrontlineStrategist extends CardImpl { this.toughness = new MageInt(1); // Morph {W} - this.addAbility(new MorphAbility(new ManaCostsImpl("{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{W}"))); // When Frontline Strategist is turned face up, prevent all combat damage non-Soldier creatures would deal this turn. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new PreventAllDamageByAllPermanentsEffect(filter, Duration.EndOfTurn, true).setText("prevent all combat damage non-Soldier creatures would deal this turn"))); } diff --git a/Mage.Sets/src/mage/cards/f/FrostAugur.java b/Mage.Sets/src/mage/cards/f/FrostAugur.java index 6d35551cef0..ded3250991b 100644 --- a/Mage.Sets/src/mage/cards/f/FrostAugur.java +++ b/Mage.Sets/src/mage/cards/f/FrostAugur.java @@ -31,7 +31,7 @@ public final class FrostAugur extends CardImpl { this.toughness = new MageInt(2); // {S}, {T}: Look at the top card of your library. If it's a snow card, you may reveal it and put it into your hand. - Ability ability = new SimpleActivatedAbility(new FrostAugurEffect(), new ManaCostsImpl("{S}")); + Ability ability = new SimpleActivatedAbility(new FrostAugurEffect(), new ManaCostsImpl<>("{S}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FrostRaptor.java b/Mage.Sets/src/mage/cards/f/FrostRaptor.java index 149a991c5c8..2ebe55c316a 100644 --- a/Mage.Sets/src/mage/cards/f/FrostRaptor.java +++ b/Mage.Sets/src/mage/cards/f/FrostRaptor.java @@ -33,7 +33,7 @@ public final class FrostRaptor extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {S}{S}: Frost Raptor gains shroud until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect( - ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{S}{S}"))); + ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{S}{S}"))); } private FrostRaptor(final FrostRaptor card) { diff --git a/Mage.Sets/src/mage/cards/f/FrostburnWeird.java b/Mage.Sets/src/mage/cards/f/FrostburnWeird.java index 78d2c85c052..e2e07dc0827 100644 --- a/Mage.Sets/src/mage/cards/f/FrostburnWeird.java +++ b/Mage.Sets/src/mage/cards/f/FrostburnWeird.java @@ -27,7 +27,7 @@ public final class FrostburnWeird extends CardImpl { this.toughness = new MageInt(4); // {U/R}: Frostburn Weird gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl("{U/R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); } private FrostburnWeird(final FrostburnWeird card) { diff --git a/Mage.Sets/src/mage/cards/f/FrostpeakYeti.java b/Mage.Sets/src/mage/cards/f/FrostpeakYeti.java index a77c396ae16..38a3f2a9055 100644 --- a/Mage.Sets/src/mage/cards/f/FrostpeakYeti.java +++ b/Mage.Sets/src/mage/cards/f/FrostpeakYeti.java @@ -28,7 +28,7 @@ public final class FrostpeakYeti extends CardImpl { // {1}{S}: Frostpeak Yeti can't be blocked this turn. this.addAbility(new SimpleActivatedAbility( - new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{S}") + new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{S}") )); } diff --git a/Mage.Sets/src/mage/cards/f/FrostveilAmbush.java b/Mage.Sets/src/mage/cards/f/FrostveilAmbush.java index 3bf757d753a..56212d574fe 100644 --- a/Mage.Sets/src/mage/cards/f/FrostveilAmbush.java +++ b/Mage.Sets/src/mage/cards/f/FrostveilAmbush.java @@ -25,7 +25,7 @@ public final class FrostveilAmbush extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2)); // Cycling {1} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}"))); } private FrostveilAmbush(final FrostveilAmbush card) { diff --git a/Mage.Sets/src/mage/cards/f/Frostwalla.java b/Mage.Sets/src/mage/cards/f/Frostwalla.java index 49398f8c6d3..49367d4139a 100644 --- a/Mage.Sets/src/mage/cards/f/Frostwalla.java +++ b/Mage.Sets/src/mage/cards/f/Frostwalla.java @@ -28,7 +28,7 @@ public final class Frostwalla extends CardImpl { Zone.BATTLEFIELD, new BoostSourceEffect( 2, 2, Duration.EndOfTurn - ), new ManaCostsImpl("{S}") + ), new ManaCostsImpl<>("{S}") )); } diff --git a/Mage.Sets/src/mage/cards/f/FrozenShade.java b/Mage.Sets/src/mage/cards/f/FrozenShade.java index e288d5ed9f6..cec029d35ca 100644 --- a/Mage.Sets/src/mage/cards/f/FrozenShade.java +++ b/Mage.Sets/src/mage/cards/f/FrozenShade.java @@ -28,7 +28,7 @@ public final class FrozenShade extends CardImpl { this.toughness = new MageInt(1); // {B}: Frozen Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private FrozenShade(final FrozenShade card) { diff --git a/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java b/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java index eb91ea4f4f2..251b9263265 100644 --- a/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java +++ b/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java @@ -47,7 +47,7 @@ public final class FruitcakeElemental extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(new DamageControllerEffect(7), TargetController.YOU, false)); // {3}: Target player gains control of Fruitcake Elemental. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FruitcakeElementalEffect(), new ManaCostsImpl("{3}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FruitcakeElementalEffect(), new ManaCostsImpl<>("{3}")); ability.addTarget(new TargetPlayer(1, 1, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FungalBehemoth.java b/Mage.Sets/src/mage/cards/f/FungalBehemoth.java index 67548726576..35d0d957581 100644 --- a/Mage.Sets/src/mage/cards/f/FungalBehemoth.java +++ b/Mage.Sets/src/mage/cards/f/FungalBehemoth.java @@ -43,7 +43,7 @@ public final class FungalBehemoth extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new P1P1CountersOnControlledCreaturesCount(), Duration.EndOfGame))); // Suspend X-{X}{G}{G}. X can't be 0. - this.addAbility(new SuspendAbility(Integer.MAX_VALUE, new ManaCostsImpl("{G}{G}"), this, true)); + this.addAbility(new SuspendAbility(Integer.MAX_VALUE, new ManaCostsImpl<>("{G}{G}"), this, true)); // Whenever a time counter is removed from Fungal Behemoth while it's exiled, you may put a +1/+1 counter on target creature. this.addAbility(new FungalBehemothTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/f/FungalBloom.java b/Mage.Sets/src/mage/cards/f/FungalBloom.java index 4937df00f0f..def6c4fb7cd 100644 --- a/Mage.Sets/src/mage/cards/f/FungalBloom.java +++ b/Mage.Sets/src/mage/cards/f/FungalBloom.java @@ -33,7 +33,7 @@ public final class FungalBloom extends CardImpl { // {G}{G}: Put a spore counter on target Fungus. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.SPORE.createInstance()), - new ManaCostsImpl("{G}{G}")); + new ManaCostsImpl<>("{G}{G}")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FungalPlots.java b/Mage.Sets/src/mage/cards/f/FungalPlots.java index c60a8d4a859..375f5268df3 100644 --- a/Mage.Sets/src/mage/cards/f/FungalPlots.java +++ b/Mage.Sets/src/mage/cards/f/FungalPlots.java @@ -39,7 +39,7 @@ public final class FungalPlots extends CardImpl { // {1}{G}, Exile a creature card from your graveyard: Create a 1/1 green Saproling creature token. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), - new ManaCostsImpl("{1}{G}")); + new ManaCostsImpl<>("{1}{G}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FungusElemental.java b/Mage.Sets/src/mage/cards/f/FungusElemental.java index ae7c9ce4d07..9a9ba8c729e 100644 --- a/Mage.Sets/src/mage/cards/f/FungusElemental.java +++ b/Mage.Sets/src/mage/cards/f/FungusElemental.java @@ -43,7 +43,7 @@ public final class FungusElemental extends CardImpl { Ability ability = new ConditionalActivatedAbility( Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P2P2.createInstance()), - new ManaCostsImpl("{G}"), + new ManaCostsImpl<>("{G}"), FungusElementalCondition.instance ); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/cards/f/FurnaceBrood.java b/Mage.Sets/src/mage/cards/f/FurnaceBrood.java index 5785cc94b08..3737444ab03 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceBrood.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceBrood.java @@ -28,7 +28,7 @@ public final class FurnaceBrood extends CardImpl { this.toughness = new MageInt(3); // {R}: Target creature can't be regenerated this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeRegeneratedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeRegeneratedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FurnaceCelebration.java b/Mage.Sets/src/mage/cards/f/FurnaceCelebration.java index 16aefe17513..82f5bed98f4 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceCelebration.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceCelebration.java @@ -41,7 +41,7 @@ public final class FurnaceCelebration extends CardImpl { class FurnaceCelebrationAbility extends TriggeredAbilityImpl { public FurnaceCelebrationAbility() { - super(Zone.BATTLEFIELD, new DoIfCostPaid(new DamageTargetEffect(2), new ManaCostsImpl("{2}"))); + super(Zone.BATTLEFIELD, new DoIfCostPaid(new DamageTargetEffect(2), new ManaCostsImpl<>("{2}"))); this.addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java b/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java index 716cc0c2b68..de158251d56 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java @@ -29,7 +29,7 @@ public final class FurnaceSpirit extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // {R}: Furnace Spirit gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private FurnaceSpirit(final FurnaceSpirit card) { diff --git a/Mage.Sets/src/mage/cards/f/Fylamarid.java b/Mage.Sets/src/mage/cards/f/Fylamarid.java index 3987b67746a..7da338ff78f 100644 --- a/Mage.Sets/src/mage/cards/f/Fylamarid.java +++ b/Mage.Sets/src/mage/cards/f/Fylamarid.java @@ -46,7 +46,7 @@ public final class Fylamarid extends CardImpl { this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield))); // {U}: Target creature becomes blue until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(ObjectColor.BLUE, - Duration.EndOfTurn), new ManaCostsImpl("{U}")); + Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Fylgja.java b/Mage.Sets/src/mage/cards/f/Fylgja.java index 49df5677476..9e35a75c7f4 100644 --- a/Mage.Sets/src/mage/cards/f/Fylgja.java +++ b/Mage.Sets/src/mage/cards/f/Fylgja.java @@ -52,7 +52,7 @@ public final class Fylgja extends CardImpl { // {2}{W}: Put a healing counter on Fylgja. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.HEALING.createInstance(1)), - new ManaCostsImpl("{2}{W}"))); + new ManaCostsImpl<>("{2}{W}"))); } private Fylgja(final Fylgja card) { diff --git a/Mage.Sets/src/mage/cards/f/FyndhornBow.java b/Mage.Sets/src/mage/cards/f/FyndhornBow.java index 7e83293fb02..b5c82742cfc 100644 --- a/Mage.Sets/src/mage/cards/f/FyndhornBow.java +++ b/Mage.Sets/src/mage/cards/f/FyndhornBow.java @@ -26,7 +26,7 @@ public final class FyndhornBow extends CardImpl { // {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}")); + Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java b/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java index 712cd1999b5..b5630dfe2ed 100644 --- a/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java +++ b/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java @@ -29,7 +29,7 @@ public final class FyndhornBrownie extends CardImpl { this.toughness = new MageInt(1); // {2}{G}, {tap}: Untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{2}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FyndhornPollen.java b/Mage.Sets/src/mage/cards/f/FyndhornPollen.java index a6eda41ac77..7bb4a5f19a5 100644 --- a/Mage.Sets/src/mage/cards/f/FyndhornPollen.java +++ b/Mage.Sets/src/mage/cards/f/FyndhornPollen.java @@ -22,13 +22,13 @@ public final class FyndhornPollen extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); // Cumulative upkeep {1} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // All creatures get -1/-0. this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-1, 0, Duration.WhileOnBattlefield))); // {1}{G}: All creatures get -1/-0 until end of turn. - this.addAbility(new SimpleActivatedAbility(new BoostAllEffect(-1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostAllEffect(-1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private FyndhornPollen(final FyndhornPollen card) {