From 4af07b957dfb04b7582cc8fc2e84f823b16aff6a Mon Sep 17 00:00:00 2001 From: DeepCrimson <98864333+DeepCrimson@users.noreply.github.com> Date: Sun, 29 May 2022 10:26:40 -0700 Subject: [PATCH] Fix raw use of parameterized class 'ManaCostsImpl' - 'c' cards (#9012) --- Mage.Sets/src/mage/cards/c/CabalArchon.java | 2 +- Mage.Sets/src/mage/cards/c/CabalExecutioner.java | 2 +- Mage.Sets/src/mage/cards/c/CabalInquisitor.java | 2 +- Mage.Sets/src/mage/cards/c/CabalInterrogator.java | 2 +- Mage.Sets/src/mage/cards/c/CabalPatriarch.java | 4 ++-- Mage.Sets/src/mage/cards/c/CabalPit.java | 2 +- Mage.Sets/src/mage/cards/c/CabalTorturer.java | 4 ++-- Mage.Sets/src/mage/cards/c/CacklingCounterpart.java | 2 +- Mage.Sets/src/mage/cards/c/CacklingWitch.java | 2 +- Mage.Sets/src/mage/cards/c/CadaverousKnight.java | 2 +- Mage.Sets/src/mage/cards/c/CageOfHands.java | 2 +- Mage.Sets/src/mage/cards/c/CagedZombie.java | 2 +- Mage.Sets/src/mage/cards/c/CalderaKavu.java | 4 ++-- Mage.Sets/src/mage/cards/c/CallOfTheHerd.java | 2 +- Mage.Sets/src/mage/cards/c/CallOfTheWild.java | 2 +- Mage.Sets/src/mage/cards/c/CallerOfGales.java | 2 +- Mage.Sets/src/mage/cards/c/CallousDeceiver.java | 2 +- Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java | 2 +- Mage.Sets/src/mage/cards/c/CanopyClaws.java | 2 +- Mage.Sets/src/mage/cards/c/CanopyDragon.java | 2 +- Mage.Sets/src/mage/cards/c/CanyonDrake.java | 2 +- Mage.Sets/src/mage/cards/c/CanyonLurkers.java | 2 +- Mage.Sets/src/mage/cards/c/CanyonSlough.java | 2 +- Mage.Sets/src/mage/cards/c/CapashenKnight.java | 2 +- Mage.Sets/src/mage/cards/c/CapashenStandard.java | 2 +- Mage.Sets/src/mage/cards/c/CapashenTemplar.java | 2 +- Mage.Sets/src/mage/cards/c/CapashenUnicorn.java | 2 +- Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java | 2 +- Mage.Sets/src/mage/cards/c/CaptainPhasma.java | 2 +- Mage.Sets/src/mage/cards/c/CaptivatingCrew.java | 2 +- Mage.Sets/src/mage/cards/c/CaravanEscort.java | 2 +- Mage.Sets/src/mage/cards/c/CaribouRange.java | 2 +- Mage.Sets/src/mage/cards/c/CarnageGladiator.java | 2 +- Mage.Sets/src/mage/cards/c/Carnassid.java | 2 +- Mage.Sets/src/mage/cards/c/CarnifexDemon.java | 2 +- Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java | 2 +- Mage.Sets/src/mage/cards/c/CarrionAnts.java | 2 +- Mage.Sets/src/mage/cards/c/CarrionBeetles.java | 2 +- Mage.Sets/src/mage/cards/c/CarrionWall.java | 2 +- Mage.Sets/src/mage/cards/c/Carrionette.java | 4 ++-- Mage.Sets/src/mage/cards/c/CascadeBluffs.java | 6 +++--- Mage.Sets/src/mage/cards/c/CastOut.java | 2 +- Mage.Sets/src/mage/cards/c/CastleArdenvale.java | 2 +- Mage.Sets/src/mage/cards/c/CastleEmbereth.java | 2 +- Mage.Sets/src/mage/cards/c/CastleGarenbrig.java | 2 +- Mage.Sets/src/mage/cards/c/CastleLocthwain.java | 2 +- Mage.Sets/src/mage/cards/c/CastleVantress.java | 2 +- Mage.Sets/src/mage/cards/c/CatBurglar.java | 2 +- Mage.Sets/src/mage/cards/c/CatharCommando.java | 2 +- Mage.Sets/src/mage/cards/c/CattiBrieOfMithralHall.java | 2 +- Mage.Sets/src/mage/cards/c/CausticCaterpillar.java | 2 +- Mage.Sets/src/mage/cards/c/CavalierOfFlame.java | 2 +- Mage.Sets/src/mage/cards/c/CaveOfTheFrostDragon.java | 2 +- Mage.Sets/src/mage/cards/c/CavePeople.java | 2 +- Mage.Sets/src/mage/cards/c/CavernCrawler.java | 2 +- Mage.Sets/src/mage/cards/c/CavernThoctar.java | 2 +- Mage.Sets/src/mage/cards/c/CelestialColonnade.java | 2 +- Mage.Sets/src/mage/cards/c/CelestialEnforcer.java | 2 +- Mage.Sets/src/mage/cards/c/CemeteryPuca.java | 4 ++-- Mage.Sets/src/mage/cards/c/CemeteryReaper.java | 2 +- Mage.Sets/src/mage/cards/c/Censor.java | 2 +- Mage.Sets/src/mage/cards/c/CentaurGarden.java | 2 +- Mage.Sets/src/mage/cards/c/CentaurGlade.java | 2 +- Mage.Sets/src/mage/cards/c/CentaurVeteran.java | 2 +- Mage.Sets/src/mage/cards/c/CentaursHerald.java | 2 +- Mage.Sets/src/mage/cards/c/CephalidColiseum.java | 2 +- Mage.Sets/src/mage/cards/c/CephalidIllusionist.java | 2 +- Mage.Sets/src/mage/cards/c/CephalidRetainer.java | 2 +- Mage.Sets/src/mage/cards/c/CephalidScout.java | 2 +- Mage.Sets/src/mage/cards/c/CeruleanSphinx.java | 2 +- Mage.Sets/src/mage/cards/c/ChainLightning.java | 2 +- Mage.Sets/src/mage/cards/c/ChainStasis.java | 2 +- Mage.Sets/src/mage/cards/c/ChainersEdict.java | 2 +- Mage.Sets/src/mage/cards/c/Chainflinger.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChainwhipCyclops.java | 2 +- Mage.Sets/src/mage/cards/c/ChakramSlinger.java | 2 +- Mage.Sets/src/mage/cards/c/ChamberSentry.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java | 2 +- Mage.Sets/src/mage/cards/c/ChampionOfWits.java | 2 +- Mage.Sets/src/mage/cards/c/Chandler.java | 2 +- Mage.Sets/src/mage/cards/c/ChandrasRegulator.java | 2 +- Mage.Sets/src/mage/cards/c/CharRumbler.java | 2 +- Mage.Sets/src/mage/cards/c/ChargingSlateback.java | 2 +- Mage.Sets/src/mage/cards/c/ChargingTroll.java | 2 +- Mage.Sets/src/mage/cards/c/CharmPeddler.java | 2 +- Mage.Sets/src/mage/cards/c/CharnelTroll.java | 2 +- Mage.Sets/src/mage/cards/c/ChartoothCougar.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChatterOfTheSquirrel.java | 2 +- Mage.Sets/src/mage/cards/c/CheckpointOfficer.java | 2 +- Mage.Sets/src/mage/cards/c/ChemistersTrick.java | 2 +- Mage.Sets/src/mage/cards/c/ChildOfGaea.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChillOfForeboding.java | 2 +- Mage.Sets/src/mage/cards/c/ChillingApparition.java | 2 +- Mage.Sets/src/mage/cards/c/ChillingGrasp.java | 2 +- Mage.Sets/src/mage/cards/c/ChillingShade.java | 2 +- Mage.Sets/src/mage/cards/c/ChimericCoils.java | 2 +- Mage.Sets/src/mage/cards/c/ChimericIdol.java | 2 +- Mage.Sets/src/mage/cards/c/ChimericSphere.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChimericStaff.java | 2 +- Mage.Sets/src/mage/cards/c/ChirrutImwe.java | 2 +- Mage.Sets/src/mage/cards/c/ChitteringWitch.java | 2 +- Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java | 2 +- Mage.Sets/src/mage/cards/c/ChokingTethers.java | 2 +- Mage.Sets/src/mage/cards/c/ChromeshellCrab.java | 2 +- Mage.Sets/src/mage/cards/c/Chromium.java | 2 +- Mage.Sets/src/mage/cards/c/ChronomanticEscape.java | 2 +- Mage.Sets/src/mage/cards/c/Chronosavant.java | 2 +- Mage.Sets/src/mage/cards/c/CinderCrawler.java | 2 +- Mage.Sets/src/mage/cards/c/CinderElemental.java | 2 +- Mage.Sets/src/mage/cards/c/CinderSeer.java | 2 +- Mage.Sets/src/mage/cards/c/CinderShade.java | 4 ++-- Mage.Sets/src/mage/cards/c/Cinderbones.java | 2 +- Mage.Sets/src/mage/cards/c/CitanulFlute.java | 2 +- Mage.Sets/src/mage/cards/c/CivicGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/c/ClaimOfErebos.java | 2 +- Mage.Sets/src/mage/cards/c/ClanGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/c/ClatteringAugur.java | 2 +- Mage.Sets/src/mage/cards/c/ClawsOfWirewood.java | 2 +- Mage.Sets/src/mage/cards/c/ClayStatue.java | 2 +- Mage.Sets/src/mage/cards/c/Clear.java | 2 +- Mage.Sets/src/mage/cards/c/ClergyOfTheHolyNimbus.java | 2 +- Mage.Sets/src/mage/cards/c/ClockworkGnomes.java | 2 +- Mage.Sets/src/mage/cards/c/CloudOfFaeries.java | 2 +- Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java | 2 +- Mage.Sets/src/mage/cards/c/CloudheathDrake.java | 2 +- Mage.Sets/src/mage/cards/c/Cloudseeder.java | 2 +- Mage.Sets/src/mage/cards/c/CoastalDrake.java | 2 +- Mage.Sets/src/mage/cards/c/CoastlineChimera.java | 2 +- Mage.Sets/src/mage/cards/c/CobaltGolem.java | 2 +- Mage.Sets/src/mage/cards/c/CobraTrap.java | 2 +- Mage.Sets/src/mage/cards/c/CoffinPurge.java | 2 +- Mage.Sets/src/mage/cards/c/CoffinQueen.java | 2 +- Mage.Sets/src/mage/cards/c/ColdSnap.java | 2 +- Mage.Sets/src/mage/cards/c/ColosYearling.java | 2 +- Mage.Sets/src/mage/cards/c/ColossusOfSardia.java | 2 +- Mage.Sets/src/mage/cards/c/CombatMedic.java | 2 +- Mage.Sets/src/mage/cards/c/CombineGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/c/CompanionOfTheTrials.java | 2 +- Mage.Sets/src/mage/cards/c/CompellingArgument.java | 2 +- Mage.Sets/src/mage/cards/c/Compulsion.java | 4 ++-- Mage.Sets/src/mage/cards/c/ConclaveGuildmage.java | 2 +- Mage.Sets/src/mage/cards/c/ConduitOfStorms.java | 2 +- Mage.Sets/src/mage/cards/c/Conflagrate.java | 2 +- Mage.Sets/src/mage/cards/c/ConquerorsFoothold.java | 6 +++--- Mage.Sets/src/mage/cards/c/ConstrictingTendrils.java | 2 +- Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java | 2 +- Mage.Sets/src/mage/cards/c/ContestedCliffs.java | 2 +- Mage.Sets/src/mage/cards/c/Controvert.java | 2 +- Mage.Sets/src/mage/cards/c/Conversion.java | 2 +- Mage.Sets/src/mage/cards/c/CoordinatedCharge.java | 2 +- Mage.Sets/src/mage/cards/c/CopperGnomes.java | 2 +- Mage.Sets/src/mage/cards/c/CoralReef.java | 2 +- Mage.Sets/src/mage/cards/c/CoralTrickster.java | 2 +- Mage.Sets/src/mage/cards/c/CoralhelmCommander.java | 2 +- Mage.Sets/src/mage/cards/c/CorpseConnoisseur.java | 2 +- Mage.Sets/src/mage/cards/c/CorpseHarvester.java | 2 +- Mage.Sets/src/mage/cards/c/CorpseHauler.java | 2 +- Mage.Sets/src/mage/cards/c/CorpseTraders.java | 2 +- Mage.Sets/src/mage/cards/c/Corpseweft.java | 2 +- Mage.Sets/src/mage/cards/c/CorpulentCorpse.java | 2 +- Mage.Sets/src/mage/cards/c/CorruptOfficial.java | 2 +- Mage.Sets/src/mage/cards/c/CorruptedHarvester.java | 2 +- Mage.Sets/src/mage/cards/c/CosmicHorror.java | 2 +- Mage.Sets/src/mage/cards/c/Counterflux.java | 2 +- Mage.Sets/src/mage/cards/c/CouriersCapsule.java | 2 +- Mage.Sets/src/mage/cards/c/CoverOfWinter.java | 4 ++-- Mage.Sets/src/mage/cards/c/CowedByWisdom.java | 2 +- Mage.Sets/src/mage/cards/c/CrabUmbra.java | 2 +- Mage.Sets/src/mage/cards/c/Crackleburr.java | 4 ++-- Mage.Sets/src/mage/cards/c/CracklingTriton.java | 2 +- Mage.Sets/src/mage/cards/c/CradleOfTheAccursed.java | 2 +- Mage.Sets/src/mage/cards/c/CradleOfVitality.java | 2 +- Mage.Sets/src/mage/cards/c/CragPuca.java | 2 +- Mage.Sets/src/mage/cards/c/CranialPlating.java | 2 +- Mage.Sets/src/mage/cards/c/CrashingCentaur.java | 2 +- Mage.Sets/src/mage/cards/c/CrashingFootfalls.java | 2 +- Mage.Sets/src/mage/cards/c/CrazedArmodon.java | 2 +- Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java | 2 +- Mage.Sets/src/mage/cards/c/CreativeOutburst.java | 2 +- Mage.Sets/src/mage/cards/c/Creeperhulk.java | 2 +- Mage.Sets/src/mage/cards/c/CreepingRenaissance.java | 2 +- Mage.Sets/src/mage/cards/c/CreepingTarPit.java | 2 +- Mage.Sets/src/mage/cards/c/CreepingTrailblazer.java | 2 +- Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java | 2 +- Mage.Sets/src/mage/cards/c/CrimsonHellkite.java | 2 +- Mage.Sets/src/mage/cards/c/CrimsonManticore.java | 2 +- Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java | 2 +- Mage.Sets/src/mage/cards/c/CripplingFatigue.java | 2 +- Mage.Sets/src/mage/cards/c/CrookOfCondemnation.java | 4 ++-- Mage.Sets/src/mage/cards/c/CrosisThePurger.java | 2 +- Mage.Sets/src/mage/cards/c/CrosissAttendant.java | 2 +- Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java | 2 +- Mage.Sets/src/mage/cards/c/CrowdFavorites.java | 4 ++-- Mage.Sets/src/mage/cards/c/CrownOfConvergence.java | 2 +- Mage.Sets/src/mage/cards/c/CrownOfSkemfar.java | 2 +- Mage.Sets/src/mage/cards/c/CrudeRampart.java | 2 +- Mage.Sets/src/mage/cards/c/CruelDeceiver.java | 2 +- Mage.Sets/src/mage/cards/c/CruelSadist.java | 2 +- Mage.Sets/src/mage/cards/c/CrushOfWurms.java | 2 +- Mage.Sets/src/mage/cards/c/CryptOfTheEternals.java | 2 +- Mage.Sets/src/mage/cards/c/CryptRats.java | 2 +- Mage.Sets/src/mage/cards/c/CryptRipper.java | 2 +- Mage.Sets/src/mage/cards/c/Cryptbreaker.java | 2 +- Mage.Sets/src/mage/cards/c/CrystalQuarry.java | 2 +- Mage.Sets/src/mage/cards/c/CrystalSeer.java | 2 +- Mage.Sets/src/mage/cards/c/CudgelTroll.java | 2 +- Mage.Sets/src/mage/cards/c/CultGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/c/CuratorOfMysteries.java | 2 +- Mage.Sets/src/mage/cards/c/CurseOfFoolsWisdom.java | 2 +- Mage.Sets/src/mage/cards/c/CurseOfTheCabal.java | 2 +- Mage.Sets/src/mage/cards/c/CursedScroll.java | 2 +- Mage.Sets/src/mage/cards/c/Cyclone.java | 2 +- Mage.Sets/src/mage/cards/c/CyclonicRift.java | 2 +- Mage.Sets/src/mage/cards/c/CytoplastManipulator.java | 2 +- Mage.Sets/src/mage/cards/c/CytospawnShambler.java | 2 +- 215 files changed, 239 insertions(+), 239 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/CabalArchon.java b/Mage.Sets/src/mage/cards/c/CabalArchon.java index b263025c5de..f07a2ef18ba 100644 --- a/Mage.Sets/src/mage/cards/c/CabalArchon.java +++ b/Mage.Sets/src/mage/cards/c/CabalArchon.java @@ -39,7 +39,7 @@ public final class CabalArchon extends CardImpl { this.toughness = new MageInt(2); // {B}, Sacrifice a Cleric: Target player loses 2 life and you gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{B}")); Effect effect = new GainLifeEffect(2); effect.setText("and you gain 2 life"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CabalExecutioner.java b/Mage.Sets/src/mage/cards/c/CabalExecutioner.java index 901009bd167..c69bb249895 100644 --- a/Mage.Sets/src/mage/cards/c/CabalExecutioner.java +++ b/Mage.Sets/src/mage/cards/c/CabalExecutioner.java @@ -36,7 +36,7 @@ public final class CabalExecutioner extends CardImpl { this.addAbility(new CabalExecutionerAbility()); // Morph {3}{B}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{B}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{B}{B}"))); } private CabalExecutioner(final CabalExecutioner card) { diff --git a/Mage.Sets/src/mage/cards/c/CabalInquisitor.java b/Mage.Sets/src/mage/cards/c/CabalInquisitor.java index 92beb901840..1955a0da286 100644 --- a/Mage.Sets/src/mage/cards/c/CabalInquisitor.java +++ b/Mage.Sets/src/mage/cards/c/CabalInquisitor.java @@ -37,7 +37,7 @@ public final class CabalInquisitor extends CardImpl { this.toughness = new MageInt(1); // Threshold - {1}{B}, {T}, Exile two cards from your graveyard: Target player discards a card. Activate this ability only any time you could cast a sorcery, and only if seven or more cards are in your graveyard. - Ability ability = new ActivateAsSorceryConditionalActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{1}{B}"), new CardsInControllerGraveyardCondition(7)); + Ability ability = new ActivateAsSorceryConditionalActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl<>("{1}{B}"), new CardsInControllerGraveyardCondition(7)); ability.addTarget(new TargetPlayer()); ability.addCost(new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2, StaticFilters.FILTER_CARDS_FROM_YOUR_GRAVEYARD))); diff --git a/Mage.Sets/src/mage/cards/c/CabalInterrogator.java b/Mage.Sets/src/mage/cards/c/CabalInterrogator.java index fb4ab265faf..546f10d889b 100644 --- a/Mage.Sets/src/mage/cards/c/CabalInterrogator.java +++ b/Mage.Sets/src/mage/cards/c/CabalInterrogator.java @@ -33,7 +33,7 @@ public final class CabalInterrogator extends CardImpl { // Activate only as a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility( new DiscardCardYouChooseTargetEffect(TargetController.ANY, ManacostVariableValue.REGULAR), - new ManaCostsImpl("{X}{B}")); + new ManaCostsImpl<>("{X}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CabalPatriarch.java b/Mage.Sets/src/mage/cards/c/CabalPatriarch.java index 89aec1aa8f5..5ea5e13e2a1 100644 --- a/Mage.Sets/src/mage/cards/c/CabalPatriarch.java +++ b/Mage.Sets/src/mage/cards/c/CabalPatriarch.java @@ -38,14 +38,14 @@ public final class CabalPatriarch extends CardImpl { this.toughness = new MageInt(5); // {2}{B}, Sacrifice a creature: Target creature gets -2/-2 until end of turn. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl("{2}{B}")); + Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); TargetControlledPermanent target = new TargetControlledPermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT); ability1.addCost(new SacrificeTargetCost(target)); ability1.addTarget(new TargetCreaturePermanent()); this.addAbility(ability1); // {2}{B}, Exile a creature card from your graveyard: Target creature gets -2/-2 until end of turn. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl("{2}{B}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); ability2.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card")))); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/c/CabalPit.java b/Mage.Sets/src/mage/cards/c/CabalPit.java index 2a3e2c01d4f..7cdd3e1ea0f 100644 --- a/Mage.Sets/src/mage/cards/c/CabalPit.java +++ b/Mage.Sets/src/mage/cards/c/CabalPit.java @@ -36,7 +36,7 @@ public final class CabalPit extends CardImpl { // Threshold - {B}, {T}, Sacrifice Cabal Pit: Target creature gets -2/-2 until end of turn. Activate this ability only if seven or more cards are in your graveyard. Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2,-2, Duration.EndOfTurn), - new ManaCostsImpl("{B}"), + new ManaCostsImpl<>("{B}"), new CardsInControllerGraveyardCondition(7)); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/c/CabalTorturer.java b/Mage.Sets/src/mage/cards/c/CabalTorturer.java index 5ddc6b3fc26..71f43fedea7 100644 --- a/Mage.Sets/src/mage/cards/c/CabalTorturer.java +++ b/Mage.Sets/src/mage/cards/c/CabalTorturer.java @@ -33,13 +33,13 @@ public final class CabalTorturer extends CardImpl { this.toughness = new MageInt(1); // {B}, {tap}: Target creature gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Threshold - {3}{B}{B}, {tap}: Target creature gets -2/-2 until end of turn. Activate this ability only if seven or more cards are in your graveyard. ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), - new ManaCostsImpl("{3}{B}{B}"), new CardsInControllerGraveyardCondition(7)); + new ManaCostsImpl<>("{3}{B}{B}"), new CardsInControllerGraveyardCondition(7)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/c/CacklingCounterpart.java b/Mage.Sets/src/mage/cards/c/CacklingCounterpart.java index 290d6ae92c4..b104d2ceb3d 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingCounterpart.java +++ b/Mage.Sets/src/mage/cards/c/CacklingCounterpart.java @@ -24,7 +24,7 @@ public final class CacklingCounterpart extends CardImpl { this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); // 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 CacklingCounterpart(final CacklingCounterpart card) { diff --git a/Mage.Sets/src/mage/cards/c/CacklingWitch.java b/Mage.Sets/src/mage/cards/c/CacklingWitch.java index f3e8de91f41..dc565ca83ab 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingWitch.java +++ b/Mage.Sets/src/mage/cards/c/CacklingWitch.java @@ -36,7 +36,7 @@ public final class CacklingWitch extends CardImpl { ManacostVariableValue manaX = ManacostVariableValue.REGULAR; Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(manaX, StaticValue.get(0), Duration.EndOfTurn), - new ManaCostsImpl("{X}{B}")); + new ManaCostsImpl<>("{X}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CadaverousKnight.java b/Mage.Sets/src/mage/cards/c/CadaverousKnight.java index 040f165eb08..0b892ed6521 100644 --- a/Mage.Sets/src/mage/cards/c/CadaverousKnight.java +++ b/Mage.Sets/src/mage/cards/c/CadaverousKnight.java @@ -30,7 +30,7 @@ public final class CadaverousKnight extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {1}{B}{B}: Regenerate Cadaverous Knight. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}{B}"))); } private CadaverousKnight(final CadaverousKnight card) { diff --git a/Mage.Sets/src/mage/cards/c/CageOfHands.java b/Mage.Sets/src/mage/cards/c/CageOfHands.java index 7ef466527e2..7e6bc90d06e 100644 --- a/Mage.Sets/src/mage/cards/c/CageOfHands.java +++ b/Mage.Sets/src/mage/cards/c/CageOfHands.java @@ -39,7 +39,7 @@ public final class CageOfHands extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CageOfHandsEffect())); // {1}{W}: Return Cage of Hands to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{W}"))); } private CageOfHands(final CageOfHands card) { diff --git a/Mage.Sets/src/mage/cards/c/CagedZombie.java b/Mage.Sets/src/mage/cards/c/CagedZombie.java index 675a0a4c196..2625767f96d 100644 --- a/Mage.Sets/src/mage/cards/c/CagedZombie.java +++ b/Mage.Sets/src/mage/cards/c/CagedZombie.java @@ -31,7 +31,7 @@ public final class CagedZombie extends CardImpl { // {1}{B}, {T}: Each opponent loses 2 life. Activate this ability only if a creature died this turn. Ability ability = new ActivateIfConditionActivatedAbility( Zone.BATTLEFIELD, new LoseLifeOpponentsEffect(2), - new ManaCostsImpl("{1}{B}"), MorbidCondition.instance + new ManaCostsImpl<>("{1}{B}"), MorbidCondition.instance ); ability.addCost(new TapSourceCost()); this.addAbility(ability.addHint(MorbidHint.instance)); diff --git a/Mage.Sets/src/mage/cards/c/CalderaKavu.java b/Mage.Sets/src/mage/cards/c/CalderaKavu.java index 982fff71155..d7cb8e0150e 100644 --- a/Mage.Sets/src/mage/cards/c/CalderaKavu.java +++ b/Mage.Sets/src/mage/cards/c/CalderaKavu.java @@ -28,9 +28,9 @@ public final class CalderaKavu extends CardImpl { this.toughness = new MageInt(2); // {1}{B}: Caldera Kavu gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); // {G}: Caldera Kavu becomes the color of your choice until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } private CalderaKavu(final CalderaKavu card) { diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheHerd.java b/Mage.Sets/src/mage/cards/c/CallOfTheHerd.java index f5973d64a60..7c3f72e9b67 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheHerd.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheHerd.java @@ -24,7 +24,7 @@ public final class CallOfTheHerd extends CardImpl { // Create a 3/3 green Elephant creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new ElephantToken())); // Flashback {3}{G} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{3}{G}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{3}{G}"))); } private CallOfTheHerd(final CallOfTheHerd card) { diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheWild.java b/Mage.Sets/src/mage/cards/c/CallOfTheWild.java index 0d0b40fc031..01de57eb8e1 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheWild.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheWild.java @@ -24,7 +24,7 @@ public final class CallOfTheWild extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}{G}"); // {2}{G}{G}: Reveal the top card of your library. If it's a creature card, put it onto the battlefield. Otherwise, put it into your graveyard. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CallOfTheWildEffect(), new ManaCostsImpl("{2}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CallOfTheWildEffect(), new ManaCostsImpl<>("{2}{G}{G}"))); } private CallOfTheWild(final CallOfTheWild card) { diff --git a/Mage.Sets/src/mage/cards/c/CallerOfGales.java b/Mage.Sets/src/mage/cards/c/CallerOfGales.java index d42270952c5..8e078bdbf30 100644 --- a/Mage.Sets/src/mage/cards/c/CallerOfGales.java +++ b/Mage.Sets/src/mage/cards/c/CallerOfGales.java @@ -33,7 +33,7 @@ public final class CallerOfGales extends CardImpl { this.toughness = new MageInt(1); // {1}{U}, {T}: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CallousDeceiver.java b/Mage.Sets/src/mage/cards/c/CallousDeceiver.java index abd4a174e0d..a47b06b0001 100644 --- a/Mage.Sets/src/mage/cards/c/CallousDeceiver.java +++ b/Mage.Sets/src/mage/cards/c/CallousDeceiver.java @@ -39,7 +39,7 @@ public final class CallousDeceiver 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 +1/+0 and gains flying until end of turn. Activate this ability only once each turn. - this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new CallousDeceiverEffect(), new ManaCostsImpl("{2}"))); + this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new CallousDeceiverEffect(), new ManaCostsImpl<>("{2}"))); } private CallousDeceiver(final CallousDeceiver card) { diff --git a/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java b/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java index 107f66aa354..c613eb20e3a 100644 --- a/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java +++ b/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java @@ -27,7 +27,7 @@ public final class CandelabraOfTawnos extends CardImpl { // {X}, {T}: Untap X target lands. Effect effect = new UntapTargetEffect(); effect.setText("untap X target lands"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{X}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_LANDS)); ability.setTargetAdjuster(XTargetsAdjuster.instance); diff --git a/Mage.Sets/src/mage/cards/c/CanopyClaws.java b/Mage.Sets/src/mage/cards/c/CanopyClaws.java index 5fe1dae8e80..0f49098e9df 100644 --- a/Mage.Sets/src/mage/cards/c/CanopyClaws.java +++ b/Mage.Sets/src/mage/cards/c/CanopyClaws.java @@ -26,7 +26,7 @@ public final class CanopyClaws extends CardImpl { this.getSpellAbility().addEffect(new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Flashback {G} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{G}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{G}"))); } private CanopyClaws(final CanopyClaws card) { diff --git a/Mage.Sets/src/mage/cards/c/CanopyDragon.java b/Mage.Sets/src/mage/cards/c/CanopyDragon.java index d87f2efd030..2a14fcfc206 100644 --- a/Mage.Sets/src/mage/cards/c/CanopyDragon.java +++ b/Mage.Sets/src/mage/cards/c/CanopyDragon.java @@ -35,7 +35,7 @@ public final class CanopyDragon extends CardImpl { // {1}{G}: Canopy Dragon gains flying and loses trample until end of turn. Effect effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("{this} gains flying"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{G}")); effect = new LoseAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and loses trample until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CanyonDrake.java b/Mage.Sets/src/mage/cards/c/CanyonDrake.java index ef90487118d..9c103e72d9a 100644 --- a/Mage.Sets/src/mage/cards/c/CanyonDrake.java +++ b/Mage.Sets/src/mage/cards/c/CanyonDrake.java @@ -31,7 +31,7 @@ public final class CanyonDrake extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}, Discard a card at random: Canyon Drake gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new DiscardCardCost(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CanyonLurkers.java b/Mage.Sets/src/mage/cards/c/CanyonLurkers.java index 7bfeb186bac..e9cc2c3b097 100644 --- a/Mage.Sets/src/mage/cards/c/CanyonLurkers.java +++ b/Mage.Sets/src/mage/cards/c/CanyonLurkers.java @@ -25,7 +25,7 @@ public final class CanyonLurkers extends CardImpl { this.toughness = new MageInt(2); // Morph 3R - this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{R}"))); } private CanyonLurkers(final CanyonLurkers card) { diff --git a/Mage.Sets/src/mage/cards/c/CanyonSlough.java b/Mage.Sets/src/mage/cards/c/CanyonSlough.java index 08f14252c76..28091338912 100644 --- a/Mage.Sets/src/mage/cards/c/CanyonSlough.java +++ b/Mage.Sets/src/mage/cards/c/CanyonSlough.java @@ -32,7 +32,7 @@ public final class CanyonSlough 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/c/CapashenKnight.java b/Mage.Sets/src/mage/cards/c/CapashenKnight.java index cac812993dc..b91fa037bca 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenKnight.java +++ b/Mage.Sets/src/mage/cards/c/CapashenKnight.java @@ -30,7 +30,7 @@ public final class CapashenKnight extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {1}{W}: Capashen Knight gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private CapashenKnight(final CapashenKnight card) { diff --git a/Mage.Sets/src/mage/cards/c/CapashenStandard.java b/Mage.Sets/src/mage/cards/c/CapashenStandard.java index ecc6e18913c..634e26eec14 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenStandard.java +++ b/Mage.Sets/src/mage/cards/c/CapashenStandard.java @@ -40,7 +40,7 @@ public final class CapashenStandard extends CardImpl { // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // {2}, Sacrifice Capashen Standard: Draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{2}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CapashenTemplar.java b/Mage.Sets/src/mage/cards/c/CapashenTemplar.java index dc1001cffdd..55a4e92b63c 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenTemplar.java +++ b/Mage.Sets/src/mage/cards/c/CapashenTemplar.java @@ -28,7 +28,7 @@ public final class CapashenTemplar extends CardImpl { this.toughness = new MageInt(2); // {W}: Capashen Templar 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 CapashenTemplar(final CapashenTemplar card) { diff --git a/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java b/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java index 24d178a10b2..a080d12ba83 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java +++ b/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java @@ -31,7 +31,7 @@ public final class CapashenUnicorn extends CardImpl { this.toughness = new MageInt(2); // {1}{W}, {tap}, Sacrifice Capashen Unicorn: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java b/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java index 31273351d96..f36c76f7e41 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java +++ b/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java @@ -46,7 +46,7 @@ public final class CaptainOfTheMists extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new UntapSourceEffect(), filter)); // {1}{U}, {tap}: You may tap or untap target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CaptainPhasma.java b/Mage.Sets/src/mage/cards/c/CaptainPhasma.java index 93feb899758..e6d5736bc0d 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainPhasma.java +++ b/Mage.Sets/src/mage/cards/c/CaptainPhasma.java @@ -51,7 +51,7 @@ public final class CaptainPhasma extends CardImpl { new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, filter, false))); // {W}{U}{B}{R}{G}: Search your library for a Trooper creature card, reveal it, put it into your hand, then shuffle your library. - this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterCard), true, true), new ManaCostsImpl("{W}{U}{B}{R}{G}"))); + this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterCard), true, true), new ManaCostsImpl<>("{W}{U}{B}{R}{G}"))); } private CaptainPhasma(final CaptainPhasma card) { diff --git a/Mage.Sets/src/mage/cards/c/CaptivatingCrew.java b/Mage.Sets/src/mage/cards/c/CaptivatingCrew.java index 83e2fb1fc58..ec304038f23 100644 --- a/Mage.Sets/src/mage/cards/c/CaptivatingCrew.java +++ b/Mage.Sets/src/mage/cards/c/CaptivatingCrew.java @@ -35,7 +35,7 @@ public final class CaptivatingCrew extends CardImpl { this.toughness = new MageInt(3); // {3}{R}: Gain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.EndOfTurn, true), new ManaCostsImpl("{3}{R}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.EndOfTurn, true), new ManaCostsImpl<>("{3}{R}")); Effect effect = new UntapTargetEffect(); effect.setText("Untap that creature"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CaravanEscort.java b/Mage.Sets/src/mage/cards/c/CaravanEscort.java index ce6b20bc3c0..77be9939520 100644 --- a/Mage.Sets/src/mage/cards/c/CaravanEscort.java +++ b/Mage.Sets/src/mage/cards/c/CaravanEscort.java @@ -29,7 +29,7 @@ public final class CaravanEscort extends LevelerCard { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new LevelUpAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new LevelUpAbility(new ManaCostsImpl<>("{2}"))); AbilitiesImpl levelAbilities = new AbilitiesImpl<>(FirstStrikeAbility.getInstance()); this.addAbilities(LevelerCardBuilder.construct( diff --git a/Mage.Sets/src/mage/cards/c/CaribouRange.java b/Mage.Sets/src/mage/cards/c/CaribouRange.java index d311af7d64d..a1beb5890e9 100644 --- a/Mage.Sets/src/mage/cards/c/CaribouRange.java +++ b/Mage.Sets/src/mage/cards/c/CaribouRange.java @@ -48,7 +48,7 @@ public final class CaribouRange extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted land has "{W}{W}, {T}: Create a 0/1 white Caribou creature token." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CaribouToken()), new ManaCostsImpl("{W}{W}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CaribouToken()), new ManaCostsImpl<>("{W}{W}")); ability.addCost(new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{W}{W}, {T}: Create a 0/1 white Caribou creature token.\""); diff --git a/Mage.Sets/src/mage/cards/c/CarnageGladiator.java b/Mage.Sets/src/mage/cards/c/CarnageGladiator.java index 7db3205d883..faf2008fa50 100644 --- a/Mage.Sets/src/mage/cards/c/CarnageGladiator.java +++ b/Mage.Sets/src/mage/cards/c/CarnageGladiator.java @@ -36,7 +36,7 @@ public final class CarnageGladiator extends CardImpl { this.addAbility(new CarnageGladiatorTriggeredAbility()); // {1}{B}{R}: Renegerate Carnage Gladiator. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(),new ManaCostsImpl("{1}{B}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(),new ManaCostsImpl<>("{1}{B}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/c/Carnassid.java b/Mage.Sets/src/mage/cards/c/Carnassid.java index c570ade8e83..9826e6092bf 100644 --- a/Mage.Sets/src/mage/cards/c/Carnassid.java +++ b/Mage.Sets/src/mage/cards/c/Carnassid.java @@ -29,7 +29,7 @@ public final class Carnassid extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {1}{G}: Regenerate Carnassid. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private Carnassid(final Carnassid card) { diff --git a/Mage.Sets/src/mage/cards/c/CarnifexDemon.java b/Mage.Sets/src/mage/cards/c/CarnifexDemon.java index e060e6fb8b4..94e5e417fd9 100644 --- a/Mage.Sets/src/mage/cards/c/CarnifexDemon.java +++ b/Mage.Sets/src/mage/cards/c/CarnifexDemon.java @@ -51,7 +51,7 @@ public final class CarnifexDemon extends CardImpl { new AddCountersAllEffect( CounterType.M1M1.createInstance(), filter - ), new ManaCostsImpl("{B}") + ), new ManaCostsImpl<>("{B}") ); ability.addCost(new RemoveCountersSourceCost(CounterType.M1M1.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java b/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java index f8bf2eba3c6..670356a0ab7 100644 --- a/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java +++ b/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java @@ -29,7 +29,7 @@ public final class CarnivorousMossBeast extends CardImpl { this.toughness = new MageInt(5); // {5}{G}{G}: Put a +1/+1 counter on Carnivorous Moss-Beast. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{5}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{5}{G}{G}"))); } private CarnivorousMossBeast(final CarnivorousMossBeast card) { diff --git a/Mage.Sets/src/mage/cards/c/CarrionAnts.java b/Mage.Sets/src/mage/cards/c/CarrionAnts.java index f1adac8ffd7..ac7d277b66f 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionAnts.java +++ b/Mage.Sets/src/mage/cards/c/CarrionAnts.java @@ -26,7 +26,7 @@ public final class CarrionAnts extends CardImpl { this.toughness = new MageInt(1); // {1}: Carrion Ants gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } diff --git a/Mage.Sets/src/mage/cards/c/CarrionBeetles.java b/Mage.Sets/src/mage/cards/c/CarrionBeetles.java index 50de88b65c9..b4beb79ff3c 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionBeetles.java +++ b/Mage.Sets/src/mage/cards/c/CarrionBeetles.java @@ -28,7 +28,7 @@ public final class CarrionBeetles extends CardImpl { this.toughness = new MageInt(1); // {2}{B}, {T}: Exile up to three target cards from a single graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInASingleGraveyard(0, 3, StaticFilters.FILTER_CARD_CARDS)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CarrionWall.java b/Mage.Sets/src/mage/cards/c/CarrionWall.java index 125625194a5..a85aa5682ec 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionWall.java +++ b/Mage.Sets/src/mage/cards/c/CarrionWall.java @@ -29,7 +29,7 @@ public final class CarrionWall extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {1}{B}: Regenerate Carrion Wall. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private CarrionWall(final CarrionWall card) { diff --git a/Mage.Sets/src/mage/cards/c/Carrionette.java b/Mage.Sets/src/mage/cards/c/Carrionette.java index b9ce4c55d26..6bc790fae7e 100644 --- a/Mage.Sets/src/mage/cards/c/Carrionette.java +++ b/Mage.Sets/src/mage/cards/c/Carrionette.java @@ -29,10 +29,10 @@ public final class Carrionette extends CardImpl { this.toughness = new MageInt(1); // {2}{B}{B}: Exile Carrionette and target creature unless that creature's controller pays {2}. Activate this ability only if Carrionette is in your graveyard. - DoUnlessTargetPlayerOrTargetsControllerPaysEffect effect = new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new ExileTargetEffect(), new ManaCostsImpl("{2}")); + DoUnlessTargetPlayerOrTargetsControllerPaysEffect effect = new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new ExileTargetEffect(), new ManaCostsImpl<>("{2}")); effect.addEffect(new ExileSourceEffect()); effect.setText("Exile {this} and target creature unless that creature's controller pays {2}. Activate only if {this} is in your graveyard"); - Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, effect, new ManaCostsImpl("{2}{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, effect, new ManaCostsImpl<>("{2}{B}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CascadeBluffs.java b/Mage.Sets/src/mage/cards/c/CascadeBluffs.java index 1032eaf5288..97894c4a00a 100644 --- a/Mage.Sets/src/mage/cards/c/CascadeBluffs.java +++ b/Mage.Sets/src/mage/cards/c/CascadeBluffs.java @@ -25,15 +25,15 @@ public final class CascadeBluffs extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {U/R}, {tap}: Add {U}{U}, {U}{R}, or {R}{R}. - SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(2), new ManaCostsImpl("{U/R}")); + SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(2), new ManaCostsImpl<>("{U/R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 0, 1, 0, 0, 0, 0), new ManaCostsImpl("{U/R}")); + ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 0, 1, 0, 0, 0, 0), new ManaCostsImpl<>("{U/R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(2), new ManaCostsImpl("{U/R}")); + ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(2), new ManaCostsImpl<>("{U/R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CastOut.java b/Mage.Sets/src/mage/cards/c/CastOut.java index bd0e5a442e4..1a8d465b1c2 100644 --- a/Mage.Sets/src/mage/cards/c/CastOut.java +++ b/Mage.Sets/src/mage/cards/c/CastOut.java @@ -42,7 +42,7 @@ public final class CastOut extends CardImpl { this.addAbility(ability); // Cycling {W} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{W}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{W}"))); } diff --git a/Mage.Sets/src/mage/cards/c/CastleArdenvale.java b/Mage.Sets/src/mage/cards/c/CastleArdenvale.java index 6e15956b763..54359630fba 100644 --- a/Mage.Sets/src/mage/cards/c/CastleArdenvale.java +++ b/Mage.Sets/src/mage/cards/c/CastleArdenvale.java @@ -44,7 +44,7 @@ public final class CastleArdenvale extends CardImpl { // {2}{W}{W}, {T}: Create a 1/1 white Human creature token. Ability ability = new SimpleActivatedAbility( - new CreateTokenEffect(new HumanToken()), new ManaCostsImpl("{2}{W}{W}") + new CreateTokenEffect(new HumanToken()), new ManaCostsImpl<>("{2}{W}{W}") ); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CastleEmbereth.java b/Mage.Sets/src/mage/cards/c/CastleEmbereth.java index 2b4f10aea81..d7e927ee716 100644 --- a/Mage.Sets/src/mage/cards/c/CastleEmbereth.java +++ b/Mage.Sets/src/mage/cards/c/CastleEmbereth.java @@ -44,7 +44,7 @@ public final class CastleEmbereth extends CardImpl { // {1}{R}{R}, {T}: Creatures you control get +1/+0 until end of turn. Ability ability = new SimpleActivatedAbility( - new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}{R}") + new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{R}") ); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CastleGarenbrig.java b/Mage.Sets/src/mage/cards/c/CastleGarenbrig.java index e2ebf923851..958eacacfce 100644 --- a/Mage.Sets/src/mage/cards/c/CastleGarenbrig.java +++ b/Mage.Sets/src/mage/cards/c/CastleGarenbrig.java @@ -47,7 +47,7 @@ public final class CastleGarenbrig extends CardImpl { // {2}{G}{G}, {T}: Add six {G}. Spend this mana only to cast creature spells or activate abilities of creatures. Ability ability = new ConditionalColoredManaAbility( - new ManaCostsImpl("{2}{G}{G}"), Mana.GreenMana(6), new CastleGarenbrigManaBuilder() + new ManaCostsImpl<>("{2}{G}{G}"), Mana.GreenMana(6), new CastleGarenbrigManaBuilder() ); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CastleLocthwain.java b/Mage.Sets/src/mage/cards/c/CastleLocthwain.java index 06aa17106c1..2ad1959b854 100644 --- a/Mage.Sets/src/mage/cards/c/CastleLocthwain.java +++ b/Mage.Sets/src/mage/cards/c/CastleLocthwain.java @@ -45,7 +45,7 @@ public final class CastleLocthwain extends CardImpl { // {1}{B}{B}, {T}: Draw a card, then you lose life equal to the number of cards in your hand. Ability ability = new SimpleActivatedAbility( - new DrawCardSourceControllerEffect(1).setText("draw a card,"), new ManaCostsImpl("{1}{B}{B}") + new DrawCardSourceControllerEffect(1).setText("draw a card,"), new ManaCostsImpl<>("{1}{B}{B}") ); ability.addEffect(new LoseLifeSourceControllerEffect(CardsInControllerHandCount.instance) .setText("then you lose life equal to the number of cards in your hand")); diff --git a/Mage.Sets/src/mage/cards/c/CastleVantress.java b/Mage.Sets/src/mage/cards/c/CastleVantress.java index 9e73d7a217a..fd28dfb896c 100644 --- a/Mage.Sets/src/mage/cards/c/CastleVantress.java +++ b/Mage.Sets/src/mage/cards/c/CastleVantress.java @@ -42,7 +42,7 @@ public final class CastleVantress extends CardImpl { this.addAbility(new BlueManaAbility()); // {2}{U}{U}, {T}: Scry 2. - Ability ability = new SimpleActivatedAbility(new ScryEffect(2), new ManaCostsImpl("{2}{U}{U}")); + Ability ability = new SimpleActivatedAbility(new ScryEffect(2), new ManaCostsImpl<>("{2}{U}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CatBurglar.java b/Mage.Sets/src/mage/cards/c/CatBurglar.java index 646f4fac272..3678abafa39 100644 --- a/Mage.Sets/src/mage/cards/c/CatBurglar.java +++ b/Mage.Sets/src/mage/cards/c/CatBurglar.java @@ -31,7 +31,7 @@ public final class CatBurglar extends CardImpl { this.toughness = new MageInt(2); // {2}{B}, {tap}: Target player discards a card. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{2}{B}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CatharCommando.java b/Mage.Sets/src/mage/cards/c/CatharCommando.java index 72cb8a11621..395e4626132 100644 --- a/Mage.Sets/src/mage/cards/c/CatharCommando.java +++ b/Mage.Sets/src/mage/cards/c/CatharCommando.java @@ -30,7 +30,7 @@ public final class CatharCommando extends CardImpl { this.addAbility(FlashAbility.getInstance()); // {1}, Sacrifice Cathar Commando: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CattiBrieOfMithralHall.java b/Mage.Sets/src/mage/cards/c/CattiBrieOfMithralHall.java index 8f7f644c4f1..7344d249d69 100644 --- a/Mage.Sets/src/mage/cards/c/CattiBrieOfMithralHall.java +++ b/Mage.Sets/src/mage/cards/c/CattiBrieOfMithralHall.java @@ -66,7 +66,7 @@ public final class CattiBrieOfMithralHall extends CardImpl { // attacking or blocking creature an opponent controls, where X is the number of // counters removed this way. Ability damageAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new DamageTargetEffect(CattiBrieRemovedCounterValue.instance).setText("it deals X damage to target attacking or blocking creature an opponent controls, where X is the number of counters removed this way"), new ManaCostsImpl("{1}")); + new DamageTargetEffect(CattiBrieRemovedCounterValue.instance).setText("it deals X damage to target attacking or blocking creature an opponent controls, where X is the number of counters removed this way"), new ManaCostsImpl<>("{1}")); damageAbility.addTarget(new TargetCreaturePermanent(filter)); damageAbility.addCost(new RemoveAllCountersSourceCost(CounterType.P1P1)); diff --git a/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java b/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java index 5bb9c0f5e3c..ea55883c59e 100644 --- a/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java +++ b/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java @@ -30,7 +30,7 @@ public final class CausticCaterpillar extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, Sacrifice Caustic Caterpillar: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CavalierOfFlame.java b/Mage.Sets/src/mage/cards/c/CavalierOfFlame.java index 995f91e5d69..39975cb45d7 100644 --- a/Mage.Sets/src/mage/cards/c/CavalierOfFlame.java +++ b/Mage.Sets/src/mage/cards/c/CavalierOfFlame.java @@ -46,7 +46,7 @@ public final class CavalierOfFlame extends CardImpl { // {1}{R}: Creatures you control get +1/+0 and gain haste until end of turn. Ability ability = new SimpleActivatedAbility(new BoostControlledEffect( 1, 0, Duration.EndOfTurn - ).setText("Creatures you control get +1/+0"), new ManaCostsImpl("{1}{R}")); + ).setText("Creatures you control get +1/+0"), new ManaCostsImpl<>("{1}{R}")); ability.addEffect(new GainAbilityControlledEffect( HasteAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE diff --git a/Mage.Sets/src/mage/cards/c/CaveOfTheFrostDragon.java b/Mage.Sets/src/mage/cards/c/CaveOfTheFrostDragon.java index 4d921684fc5..0fad44c724f 100644 --- a/Mage.Sets/src/mage/cards/c/CaveOfTheFrostDragon.java +++ b/Mage.Sets/src/mage/cards/c/CaveOfTheFrostDragon.java @@ -49,7 +49,7 @@ public final class CaveOfTheFrostDragon extends CardImpl { .withColor("W") .withSubType(SubType.DRAGON) .withAbility(FlyingAbility.getInstance()), - "land", Duration.EndOfTurn), new ManaCostsImpl("{4}{W}"))); + "land", Duration.EndOfTurn), new ManaCostsImpl<>("{4}{W}"))); } private CaveOfTheFrostDragon(final CaveOfTheFrostDragon card) { diff --git a/Mage.Sets/src/mage/cards/c/CavePeople.java b/Mage.Sets/src/mage/cards/c/CavePeople.java index 2c00973a2ba..cf326643e0f 100644 --- a/Mage.Sets/src/mage/cards/c/CavePeople.java +++ b/Mage.Sets/src/mage/cards/c/CavePeople.java @@ -35,7 +35,7 @@ public final class CavePeople extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(1, -2, Duration.EndOfTurn), false)); // {1}{R}{R}, {tap}: Target creature gains mountainwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new MountainwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl("{1}{R}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new MountainwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CavernCrawler.java b/Mage.Sets/src/mage/cards/c/CavernCrawler.java index 013dfd682ce..860671b51fe 100644 --- a/Mage.Sets/src/mage/cards/c/CavernCrawler.java +++ b/Mage.Sets/src/mage/cards/c/CavernCrawler.java @@ -30,7 +30,7 @@ public final class CavernCrawler extends CardImpl { this.addAbility(new MountainwalkAbility()); // {R}: Cavern Crawler 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 CavernCrawler(final CavernCrawler card) { diff --git a/Mage.Sets/src/mage/cards/c/CavernThoctar.java b/Mage.Sets/src/mage/cards/c/CavernThoctar.java index 31f8c9ff53e..66ebc95d514 100644 --- a/Mage.Sets/src/mage/cards/c/CavernThoctar.java +++ b/Mage.Sets/src/mage/cards/c/CavernThoctar.java @@ -26,7 +26,7 @@ public final class CavernThoctar extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); - 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}"))); } public CavernThoctar (final CavernThoctar card) { diff --git a/Mage.Sets/src/mage/cards/c/CelestialColonnade.java b/Mage.Sets/src/mage/cards/c/CelestialColonnade.java index 22ace4d71b5..597fc275c81 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialColonnade.java +++ b/Mage.Sets/src/mage/cards/c/CelestialColonnade.java @@ -41,7 +41,7 @@ public final class CelestialColonnade extends CardImpl { .withSubType(SubType.ELEMENTAL) .withAbility(FlyingAbility.getInstance()) .withAbility(VigilanceAbility.getInstance()), - "land", Duration.EndOfTurn), new ManaCostsImpl("{3}{W}{U}"))); + "land", Duration.EndOfTurn), new ManaCostsImpl<>("{3}{W}{U}"))); } private CelestialColonnade(final CelestialColonnade card) { diff --git a/Mage.Sets/src/mage/cards/c/CelestialEnforcer.java b/Mage.Sets/src/mage/cards/c/CelestialEnforcer.java index 5bf8ffdea17..ef5772bcd21 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialEnforcer.java +++ b/Mage.Sets/src/mage/cards/c/CelestialEnforcer.java @@ -45,7 +45,7 @@ public final class CelestialEnforcer extends CardImpl { // {1}{W}, {T}: Tap target creature. Activate this ability only if you control a creature with flying. Ability ability = new ActivateIfConditionActivatedAbility( - Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{1}{W}"), condition + Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{1}{W}"), condition ); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CemeteryPuca.java b/Mage.Sets/src/mage/cards/c/CemeteryPuca.java index cc4a08d17b5..0f92b741d69 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryPuca.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryPuca.java @@ -37,7 +37,7 @@ public final class CemeteryPuca extends CardImpl { // Whenever a creature dies, you may pay {1}. If you do, Cemetery Puca becomes a copy of that creature, except it has this ability. this.addAbility(new DiesCreatureTriggeredAbility( - new DoIfCostPaid(new CemeteryPucaEffect(), new ManaCostsImpl("{1}")), + new DoIfCostPaid(new CemeteryPucaEffect(), new ManaCostsImpl<>("{1}")), false, StaticFilters.FILTER_PERMANENT_A_CREATURE, true)); @@ -76,7 +76,7 @@ class CemeteryPucaEffect extends OneShotEffect { Permanent copyFromCreature = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if (copyFromCreature != null) { game.copyPermanent(Duration.WhileOnBattlefield, copyFromCreature, copyToCreature.getId(), source, new EmptyCopyApplier()); - ContinuousEffect effect = new GainAbilityTargetEffect(new DiesCreatureTriggeredAbility(new DoIfCostPaid(new CemeteryPucaEffect(), new ManaCostsImpl("{1}")), false, StaticFilters.FILTER_PERMANENT_A_CREATURE, true), Duration.WhileOnBattlefield); + ContinuousEffect effect = new GainAbilityTargetEffect(new DiesCreatureTriggeredAbility(new DoIfCostPaid(new CemeteryPucaEffect(), new ManaCostsImpl<>("{1}")), false, StaticFilters.FILTER_PERMANENT_A_CREATURE, true), Duration.WhileOnBattlefield); effect.setTargetPointer(new FixedTarget(copyToCreature.getId(), game)); game.addEffect(effect, source); return true; diff --git a/Mage.Sets/src/mage/cards/c/CemeteryReaper.java b/Mage.Sets/src/mage/cards/c/CemeteryReaper.java index 9fb1a5ca1eb..b60ea4218be 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryReaper.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryReaper.java @@ -43,7 +43,7 @@ public final class CemeteryReaper extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // {2}{B}, {T} : Exile target creature card from a graveyard. Create a 2/2 black Zombie creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addEffect(new CreateTokenEffect(new ZombieToken())); ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard"))); diff --git a/Mage.Sets/src/mage/cards/c/Censor.java b/Mage.Sets/src/mage/cards/c/Censor.java index 307ad0cab10..ccd07ce6355 100644 --- a/Mage.Sets/src/mage/cards/c/Censor.java +++ b/Mage.Sets/src/mage/cards/c/Censor.java @@ -25,7 +25,7 @@ public final class Censor extends CardImpl { this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new GenericManaCost(1))); // Cycling {U} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/c/CentaurGarden.java b/Mage.Sets/src/mage/cards/c/CentaurGarden.java index 6b35c1aa758..461559ac78d 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurGarden.java +++ b/Mage.Sets/src/mage/cards/c/CentaurGarden.java @@ -36,7 +36,7 @@ public final class CentaurGarden extends CardImpl { // Threshold - {G}, {tap}, Sacrifice Centaur Garden: Target creature gets +3/+3 until end of turn. Activate this ability only if seven or more cards are in your graveyard. Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(+3,+3, Duration.EndOfTurn), - new ManaCostsImpl("{G}"), + new ManaCostsImpl<>("{G}"), new CardsInControllerGraveyardCondition(7)); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/c/CentaurGlade.java b/Mage.Sets/src/mage/cards/c/CentaurGlade.java index f34cfc6fad9..2036da19bf0 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurGlade.java +++ b/Mage.Sets/src/mage/cards/c/CentaurGlade.java @@ -21,7 +21,7 @@ public final class CentaurGlade extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}{G}"); // {2}{G}{G}: Create a 3/3 green Centaur creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CentaurToken(), 1), new ManaCostsImpl("{2}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CentaurToken(), 1), new ManaCostsImpl<>("{2}{G}{G}"))); } private CentaurGlade(final CentaurGlade card) { diff --git a/Mage.Sets/src/mage/cards/c/CentaurVeteran.java b/Mage.Sets/src/mage/cards/c/CentaurVeteran.java index 2c27ce917d4..1a653f4c9e0 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurVeteran.java +++ b/Mage.Sets/src/mage/cards/c/CentaurVeteran.java @@ -30,7 +30,7 @@ public final class CentaurVeteran extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {G}, Discard a card: Regenerate Centaur Veteran. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CentaursHerald.java b/Mage.Sets/src/mage/cards/c/CentaursHerald.java index 62bbaf36d4e..b0df14fc535 100644 --- a/Mage.Sets/src/mage/cards/c/CentaursHerald.java +++ b/Mage.Sets/src/mage/cards/c/CentaursHerald.java @@ -30,7 +30,7 @@ public final class CentaursHerald extends CardImpl { this.toughness = new MageInt(1); // {2}{G}, Sacrifice Centaur's Herald: Create a 3/3 green Centaur creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CentaurToken()), new ManaCostsImpl("{2}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CentaurToken()), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CephalidColiseum.java b/Mage.Sets/src/mage/cards/c/CephalidColiseum.java index 9a472a98f16..f79a2e14581 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidColiseum.java +++ b/Mage.Sets/src/mage/cards/c/CephalidColiseum.java @@ -35,7 +35,7 @@ public final class CephalidColiseum extends CardImpl { // Threshold - {U}, {tap}, Sacrifice Cephalid Coliseum: Target player draws three cards, then discards three cards. Activate this ability only if seven or more cards are in your graveyard. Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardTargetEffect(3, 3), - new ManaCostsImpl("{U}"), + new ManaCostsImpl<>("{U}"), new CardsInControllerGraveyardCondition(7)); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java b/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java index 60a2929aaad..d17bdb96998 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java +++ b/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java @@ -41,7 +41,7 @@ public final class CephalidIllusionist extends CardImpl { Effect effect = new PreventDamageToTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt to"); // and dealt by target creature you control this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{U}")); effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("and dealt by target creature you control this turn."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CephalidRetainer.java b/Mage.Sets/src/mage/cards/c/CephalidRetainer.java index 5e575028872..11331f7b845 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidRetainer.java +++ b/Mage.Sets/src/mage/cards/c/CephalidRetainer.java @@ -38,7 +38,7 @@ public final class CephalidRetainer extends CardImpl { this.toughness = new MageInt(3); // {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/c/CephalidScout.java b/Mage.Sets/src/mage/cards/c/CephalidScout.java index d502b6a4ad4..2b4223caf76 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidScout.java +++ b/Mage.Sets/src/mage/cards/c/CephalidScout.java @@ -35,7 +35,7 @@ public final class CephalidScout extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}{U}, Sacrifice a land: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_LAND_SHORT_TEXT))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java b/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java index 23fd7034e82..40c6d7b76b5 100644 --- a/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java +++ b/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java @@ -32,7 +32,7 @@ public final class CeruleanSphinx extends CardImpl { // {U}: Cerulean Sphinx's owner shuffles it into their library. Effect effect = new ShuffleIntoLibrarySourceEffect(); effect.setText("{this}'s owner shuffles it into their library."); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{U}"))); } private CeruleanSphinx(final CeruleanSphinx card) { diff --git a/Mage.Sets/src/mage/cards/c/ChainLightning.java b/Mage.Sets/src/mage/cards/c/ChainLightning.java index 9bfc6111a6e..5da3ea0ff7e 100644 --- a/Mage.Sets/src/mage/cards/c/ChainLightning.java +++ b/Mage.Sets/src/mage/cards/c/ChainLightning.java @@ -74,7 +74,7 @@ class ChainLightningEffect extends OneShotEffect { } if (affectedPlayer != null) { if (affectedPlayer.chooseUse(Outcome.Copy, "Pay {R}{R} to copy the spell?", source, game)) { - Cost cost = new ManaCostsImpl("{R}{R}"); + Cost cost = new ManaCostsImpl<>("{R}{R}"); if (cost.pay(source, game, source, affectedPlayer.getId(), false, null)) { Spell spell = game.getStack().getSpell(source.getSourceId()); if (spell != null) { diff --git a/Mage.Sets/src/mage/cards/c/ChainStasis.java b/Mage.Sets/src/mage/cards/c/ChainStasis.java index baeceb3c13b..b6267743afa 100644 --- a/Mage.Sets/src/mage/cards/c/ChainStasis.java +++ b/Mage.Sets/src/mage/cards/c/ChainStasis.java @@ -76,7 +76,7 @@ class ChainStasisEffect extends OneShotEffect { if (player == null) { return false; } - Cost cost = new ManaCostsImpl("{2}{U}"); + Cost cost = new ManaCostsImpl<>("{2}{U}"); if (cost.pay(source, game, source, controller.getId(), false)) { if (player.chooseUse(outcome, "Copy the spell?", source, game)) { Spell spell = game.getStack().getSpell(source.getSourceId()); diff --git a/Mage.Sets/src/mage/cards/c/ChainersEdict.java b/Mage.Sets/src/mage/cards/c/ChainersEdict.java index c9b34236619..b37a2f3369b 100644 --- a/Mage.Sets/src/mage/cards/c/ChainersEdict.java +++ b/Mage.Sets/src/mage/cards/c/ChainersEdict.java @@ -26,7 +26,7 @@ public final class ChainersEdict extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // Flashback {5}{B}{B} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{5}{B}{B}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{5}{B}{B}"))); } private ChainersEdict(final ChainersEdict card) { diff --git a/Mage.Sets/src/mage/cards/c/Chainflinger.java b/Mage.Sets/src/mage/cards/c/Chainflinger.java index b11c7796f76..639db719a61 100644 --- a/Mage.Sets/src/mage/cards/c/Chainflinger.java +++ b/Mage.Sets/src/mage/cards/c/Chainflinger.java @@ -32,14 +32,14 @@ public final class Chainflinger extends CardImpl { this.toughness = new MageInt(2); // {1}{R}, {tap}: Chainflinger deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1),new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1),new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Threshold - {2}{R}, {tap}: Chainflinger deals 2 damage to any target. Activate this ability only if seven or more cards are in your graveyard. Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), - new ManaCostsImpl("{2}{R}"), + new ManaCostsImpl<>("{2}{R}"), new CardsInControllerGraveyardCondition(7)); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/c/ChainwhipCyclops.java b/Mage.Sets/src/mage/cards/c/ChainwhipCyclops.java index 28551b88609..78389a803de 100644 --- a/Mage.Sets/src/mage/cards/c/ChainwhipCyclops.java +++ b/Mage.Sets/src/mage/cards/c/ChainwhipCyclops.java @@ -29,7 +29,7 @@ public final class ChainwhipCyclops extends CardImpl { // {3}{R}: Target creature can't block this turn. Ability ability = new SimpleActivatedAbility( - new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{3}{R}") + new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}{R}") ); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChakramSlinger.java b/Mage.Sets/src/mage/cards/c/ChakramSlinger.java index 61cd86de6ef..4f9aa53f415 100644 --- a/Mage.Sets/src/mage/cards/c/ChakramSlinger.java +++ b/Mage.Sets/src/mage/cards/c/ChakramSlinger.java @@ -33,7 +33,7 @@ public final class ChakramSlinger extends CardImpl { this.addAbility(new PartnerWithAbility("Chakram Retriever")); // {R}, {T}: Chakram Slinger deals 2 damage to target player or planeswalker. - Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChamberSentry.java b/Mage.Sets/src/mage/cards/c/ChamberSentry.java index 02efeee2f82..49a687b1a54 100644 --- a/Mage.Sets/src/mage/cards/c/ChamberSentry.java +++ b/Mage.Sets/src/mage/cards/c/ChamberSentry.java @@ -47,14 +47,14 @@ public final class ChamberSentry extends CardImpl { // {X}, {T}, Remove X +1/+1 counters from Chamber Sentry: It deals X damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(ManacostVariableValue.REGULAR) .setText("It deals X damage to any target"), - new ManaCostsImpl("{X}")); + new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); ability.addCost(new ChamberSentryRemoveVariableCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {W}{U}{B}{R}{G}: Return Chamber Sentry from your graveyard to your hand. - this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{W}{U}{B}{R}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl<>("{W}{U}{B}{R}{G}"))); } private ChamberSentry(final ChamberSentry card) { diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java b/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java index e6a66d2b748..a4c6a7b8ca1 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java @@ -61,7 +61,7 @@ public final class ChampionOfStraySouls extends CardImpl { // {5}{B}{B}: Put Champion of Stray Souls on top of your library from your graveyard. this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new PutOnLibrarySourceEffect(true, "Put {this} on top of your library from your graveyard"), - new ManaCostsImpl("{5}{B}{B}"))); + new ManaCostsImpl<>("{5}{B}{B}"))); } private ChampionOfStraySouls(final ChampionOfStraySouls card) { diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfWits.java b/Mage.Sets/src/mage/cards/c/ChampionOfWits.java index 975224af709..c6ea120461e 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfWits.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfWits.java @@ -42,7 +42,7 @@ public final class ChampionOfWits extends CardImpl { this.addAbility(ability); // Eternalize {5}{U}{U} - this.addAbility(new EternalizeAbility(new ManaCostsImpl("{5}{U}{U}"), this)); + this.addAbility(new EternalizeAbility(new ManaCostsImpl<>("{5}{U}{U}"), this)); } private ChampionOfWits(final ChampionOfWits card) { diff --git a/Mage.Sets/src/mage/cards/c/Chandler.java b/Mage.Sets/src/mage/cards/c/Chandler.java index b21f64bce1f..7d2f315d930 100644 --- a/Mage.Sets/src/mage/cards/c/Chandler.java +++ b/Mage.Sets/src/mage/cards/c/Chandler.java @@ -38,7 +38,7 @@ public final class Chandler extends CardImpl { this.toughness = new MageInt(3); // {R}{R}{R}, {tap}: Destroy target artifact creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{R}{R}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{R}{R}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChandrasRegulator.java b/Mage.Sets/src/mage/cards/c/ChandrasRegulator.java index 418bf743b26..31f5678b205 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasRegulator.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasRegulator.java @@ -84,7 +84,7 @@ class ChandrasRegulatorEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - ManaCostsImpl cost = new ManaCostsImpl("{1}"); + ManaCostsImpl cost = new ManaCostsImpl<>("{1}"); if (player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/c/CharRumbler.java b/Mage.Sets/src/mage/cards/c/CharRumbler.java index 974613292ad..3c4c44a02f8 100644 --- a/Mage.Sets/src/mage/cards/c/CharRumbler.java +++ b/Mage.Sets/src/mage/cards/c/CharRumbler.java @@ -29,7 +29,7 @@ public final class CharRumbler extends CardImpl { // Double strike this.addAbility(DoubleStrikeAbility.getInstance()); // {R}: Char-Rumbler 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 CharRumbler(final CharRumbler card) { diff --git a/Mage.Sets/src/mage/cards/c/ChargingSlateback.java b/Mage.Sets/src/mage/cards/c/ChargingSlateback.java index af0cfb5bb5a..1b047d14eae 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingSlateback.java +++ b/Mage.Sets/src/mage/cards/c/ChargingSlateback.java @@ -26,7 +26,7 @@ public final class ChargingSlateback extends CardImpl { // Charging Slateback can't block. this.addAbility(new CantBlockAbility()); // Morph {4}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{R}"))); } private ChargingSlateback(final ChargingSlateback card) { diff --git a/Mage.Sets/src/mage/cards/c/ChargingTroll.java b/Mage.Sets/src/mage/cards/c/ChargingTroll.java index ceec9d72ce0..9e12cea803c 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingTroll.java +++ b/Mage.Sets/src/mage/cards/c/ChargingTroll.java @@ -30,7 +30,7 @@ public final class ChargingTroll extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {G}: Regenerate Charging Troll. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CharmPeddler.java b/Mage.Sets/src/mage/cards/c/CharmPeddler.java index f26209ba424..c0a8df8f1bc 100644 --- a/Mage.Sets/src/mage/cards/c/CharmPeddler.java +++ b/Mage.Sets/src/mage/cards/c/CharmPeddler.java @@ -31,7 +31,7 @@ public final class CharmPeddler extends CardImpl { this.toughness = new MageInt(1); // {W}, {T}, Discard a card: The next time a source of your choice would deal damage to target creature this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CharnelTroll.java b/Mage.Sets/src/mage/cards/c/CharnelTroll.java index 0405b460c97..ae8cb70363f 100644 --- a/Mage.Sets/src/mage/cards/c/CharnelTroll.java +++ b/Mage.Sets/src/mage/cards/c/CharnelTroll.java @@ -57,7 +57,7 @@ public final class CharnelTroll extends CardImpl { Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - new ManaCostsImpl("{B}{G}") + new ManaCostsImpl<>("{B}{G}") ); ability.addCost(new DiscardTargetCost( new TargetCardInHand(StaticFilters.FILTER_CARD_CREATURE_A) diff --git a/Mage.Sets/src/mage/cards/c/ChartoothCougar.java b/Mage.Sets/src/mage/cards/c/ChartoothCougar.java index 29290e36e42..ea894945ab8 100644 --- a/Mage.Sets/src/mage/cards/c/ChartoothCougar.java +++ b/Mage.Sets/src/mage/cards/c/ChartoothCougar.java @@ -29,9 +29,9 @@ public final class ChartoothCougar extends CardImpl { this.toughness = new MageInt(4); // {R}: Chartooth Cougar 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}"))); // Mountaincycling {2} - this.addAbility(new MountaincyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new MountaincyclingAbility(new ManaCostsImpl<>("{2}"))); } private ChartoothCougar(final ChartoothCougar card) { diff --git a/Mage.Sets/src/mage/cards/c/ChatterOfTheSquirrel.java b/Mage.Sets/src/mage/cards/c/ChatterOfTheSquirrel.java index f0ab9129de7..6afea83b019 100644 --- a/Mage.Sets/src/mage/cards/c/ChatterOfTheSquirrel.java +++ b/Mage.Sets/src/mage/cards/c/ChatterOfTheSquirrel.java @@ -25,7 +25,7 @@ public final class ChatterOfTheSquirrel extends CardImpl { this.getSpellAbility().addEffect(new CreateTokenEffect(new SquirrelToken())); // Flashback {1}{G} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{1}{G}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{1}{G}"))); } private ChatterOfTheSquirrel(final ChatterOfTheSquirrel card) { diff --git a/Mage.Sets/src/mage/cards/c/CheckpointOfficer.java b/Mage.Sets/src/mage/cards/c/CheckpointOfficer.java index c80db69705e..369bd6bfcfa 100644 --- a/Mage.Sets/src/mage/cards/c/CheckpointOfficer.java +++ b/Mage.Sets/src/mage/cards/c/CheckpointOfficer.java @@ -28,7 +28,7 @@ public final class CheckpointOfficer extends CardImpl { this.toughness = new MageInt(2); // {1}{W}, {T}: Tap target creature. - Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChemistersTrick.java b/Mage.Sets/src/mage/cards/c/ChemistersTrick.java index a8d4b4527b4..f3212010f31 100644 --- a/Mage.Sets/src/mage/cards/c/ChemistersTrick.java +++ b/Mage.Sets/src/mage/cards/c/ChemistersTrick.java @@ -35,7 +35,7 @@ public final class ChemistersTrick extends CardImpl { this.getSpellAbility().addEffect(new AttacksIfAbleTargetEffect(Duration.EndOfTurn)); // Overload {3}{U}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.") - OverloadAbility ability = new OverloadAbility(this, new BoostAllEffect(-2, 0, Duration.EndOfTurn, StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL, false), new ManaCostsImpl("{3}{U}{R}")); + OverloadAbility ability = new OverloadAbility(this, new BoostAllEffect(-2, 0, Duration.EndOfTurn, StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL, false), new ManaCostsImpl<>("{3}{U}{R}")); ability.addEffect(new ChemistersTrickEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ChildOfGaea.java b/Mage.Sets/src/mage/cards/c/ChildOfGaea.java index 604c4c76d5e..d8d9affbfaa 100644 --- a/Mage.Sets/src/mage/cards/c/ChildOfGaea.java +++ b/Mage.Sets/src/mage/cards/c/ChildOfGaea.java @@ -31,8 +31,8 @@ public final class ChildOfGaea extends CardImpl { this.toughness = new MageInt(7); this.addAbility(TrampleAbility.getInstance()); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{G}{G}")), TargetController.YOU, false)); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{G}{G}")), TargetController.YOU, false)); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private ChildOfGaea(final ChildOfGaea card) { diff --git a/Mage.Sets/src/mage/cards/c/ChillOfForeboding.java b/Mage.Sets/src/mage/cards/c/ChillOfForeboding.java index ed7c2f47ebc..b937a474d77 100644 --- a/Mage.Sets/src/mage/cards/c/ChillOfForeboding.java +++ b/Mage.Sets/src/mage/cards/c/ChillOfForeboding.java @@ -23,7 +23,7 @@ public final class ChillOfForeboding extends CardImpl { this.getSpellAbility().addEffect(new MillCardsEachPlayerEffect(5, TargetController.ANY)); // Flashback {7}{U} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{7}{U}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{7}{U}"))); } private ChillOfForeboding(final ChillOfForeboding card) { diff --git a/Mage.Sets/src/mage/cards/c/ChillingApparition.java b/Mage.Sets/src/mage/cards/c/ChillingApparition.java index 93cb80d522a..79285022287 100644 --- a/Mage.Sets/src/mage/cards/c/ChillingApparition.java +++ b/Mage.Sets/src/mage/cards/c/ChillingApparition.java @@ -27,7 +27,7 @@ public final class ChillingApparition extends CardImpl { this.toughness = new MageInt(1); // {B}: Regenerate Chilling Apparition. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); // Whenever Chilling Apparition deals combat damage to a player, that player discards a card. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true)); } diff --git a/Mage.Sets/src/mage/cards/c/ChillingGrasp.java b/Mage.Sets/src/mage/cards/c/ChillingGrasp.java index 8e8c8fad06c..f2b97233762 100644 --- a/Mage.Sets/src/mage/cards/c/ChillingGrasp.java +++ b/Mage.Sets/src/mage/cards/c/ChillingGrasp.java @@ -26,7 +26,7 @@ public final class ChillingGrasp extends CardImpl { this.getSpellAbility().addEffect(new DontUntapInControllersNextUntapStepTargetEffect("Those creatures")); // Madness {3}{U} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{3}{U}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{3}{U}"))); } private ChillingGrasp(final ChillingGrasp card) { diff --git a/Mage.Sets/src/mage/cards/c/ChillingShade.java b/Mage.Sets/src/mage/cards/c/ChillingShade.java index 31d153a2df6..4f41cb8db68 100644 --- a/Mage.Sets/src/mage/cards/c/ChillingShade.java +++ b/Mage.Sets/src/mage/cards/c/ChillingShade.java @@ -31,7 +31,7 @@ public final class ChillingShade extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {S}: Chilling Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{S}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{S}"))); } private ChillingShade(final ChillingShade card) { diff --git a/Mage.Sets/src/mage/cards/c/ChimericCoils.java b/Mage.Sets/src/mage/cards/c/ChimericCoils.java index fa4d47d0cd6..f50faf15cee 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericCoils.java +++ b/Mage.Sets/src/mage/cards/c/ChimericCoils.java @@ -24,7 +24,7 @@ public final class ChimericCoils extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {X}{1}: Chimeric Coils becomes an X/X Construct artifact creature. Sacrifice it at the beginning of thhe next end step. - Ability ability = new SimpleActivatedAbility(new ChimericCoilsEffect(), new ManaCostsImpl("{X}{1}")); + Ability ability = new SimpleActivatedAbility(new ChimericCoilsEffect(), new ManaCostsImpl<>("{X}{1}")); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new SacrificeSourceEffect()))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ChimericIdol.java b/Mage.Sets/src/mage/cards/c/ChimericIdol.java index bd198601518..a57181ab97d 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericIdol.java +++ b/Mage.Sets/src/mage/cards/c/ChimericIdol.java @@ -26,7 +26,7 @@ public final class ChimericIdol extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {0}: Tap all lands you control. Chimeric Idol becomes a 3/3 Turtle artifact creature until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapAllEffect(new FilterControlledLandPermanent("lands you control")), new ManaCostsImpl("{0}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapAllEffect(new FilterControlledLandPermanent("lands you control")), new ManaCostsImpl<>("{0}")); ability.addEffect(new BecomesCreatureSourceEffect( new CreatureToken(3, 3, "3/3 Turtle artifact creature") .withSubType(SubType.TURTLE) diff --git a/Mage.Sets/src/mage/cards/c/ChimericSphere.java b/Mage.Sets/src/mage/cards/c/ChimericSphere.java index cd867279685..757febf98d9 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericSphere.java +++ b/Mage.Sets/src/mage/cards/c/ChimericSphere.java @@ -29,14 +29,14 @@ public final class ChimericSphere extends CardImpl { .withSubType(SubType.CONSTRUCT) .withType(CardType.ARTIFACT) .withAbility(FlyingAbility.getInstance()), - "", Duration.EndOfTurn), new ManaCostsImpl("{2}"))); + "", Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); // {2}: Until end of turn, Chimeric Sphere becomes a 3/2 Construct artifact creature without flying. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( new CreatureToken(3, 2, "3/2 Construct artifact creature without flying") .withSubType(SubType.CONSTRUCT) .withType(CardType.ARTIFACT), - "", Duration.EndOfTurn), new ManaCostsImpl("{2}"))); + "", Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private ChimericSphere(final ChimericSphere card) { diff --git a/Mage.Sets/src/mage/cards/c/ChimericStaff.java b/Mage.Sets/src/mage/cards/c/ChimericStaff.java index 53fc70e2671..16c7d1cec6e 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericStaff.java +++ b/Mage.Sets/src/mage/cards/c/ChimericStaff.java @@ -21,7 +21,7 @@ public final class ChimericStaff extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {X}: Chimeric Staff becomes an X/X Construct artifact creature until end of turn. - this.addAbility(new SimpleActivatedAbility(new ChimericStaffEffect(), new ManaCostsImpl("{X}"))); + this.addAbility(new SimpleActivatedAbility(new ChimericStaffEffect(), new ManaCostsImpl<>("{X}"))); } private ChimericStaff(final ChimericStaff card) { diff --git a/Mage.Sets/src/mage/cards/c/ChirrutImwe.java b/Mage.Sets/src/mage/cards/c/ChirrutImwe.java index 30e9301c047..669790d6161 100644 --- a/Mage.Sets/src/mage/cards/c/ChirrutImwe.java +++ b/Mage.Sets/src/mage/cards/c/ChirrutImwe.java @@ -43,7 +43,7 @@ public final class ChirrutImwe extends CardImpl { // {1}{W}: Prevent all combat damage that would be dealt to Chirrut Imwe until end of turn. Effect effect = new PreventCombatDamageToSourceEffect(Duration.EndOfTurn); effect.setText("Prevent all combat damage that would be dealt to {this} until end of turn"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{W}"))); } private ChirrutImwe(final ChirrutImwe card) { diff --git a/Mage.Sets/src/mage/cards/c/ChitteringWitch.java b/Mage.Sets/src/mage/cards/c/ChitteringWitch.java index e3acad96fb2..b81bce12520 100644 --- a/Mage.Sets/src/mage/cards/c/ChitteringWitch.java +++ b/Mage.Sets/src/mage/cards/c/ChitteringWitch.java @@ -43,7 +43,7 @@ public final class ChitteringWitch extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); // {1}{B}, Sacrifice a creature: Target creature gets -2/-2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java b/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java index 867c5d4b3a3..bfe25020146 100644 --- a/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java +++ b/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java @@ -36,7 +36,7 @@ public final class ChoArrimAlchemist extends CardImpl { this.toughness = new MageInt(1); // {1}{W}{W}, {tap}, Discard a card: The next time a source of your choice would deal damage to you this turn, prevent that damage. You gain life equal to the damage prevented this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChoArrimAlchemistEffect(), new ManaCostsImpl("{1}{W}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChoArrimAlchemistEffect(), new ManaCostsImpl<>("{1}{W}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChokingTethers.java b/Mage.Sets/src/mage/cards/c/ChokingTethers.java index 33429392fa0..2a0531b447c 100644 --- a/Mage.Sets/src/mage/cards/c/ChokingTethers.java +++ b/Mage.Sets/src/mage/cards/c/ChokingTethers.java @@ -26,7 +26,7 @@ public final class ChokingTethers extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 4)); // Cycling {1}{U} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{U}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{U}"))); // When you cycle Choking Tethers, you may tap target creature. Ability ability = new CycleTriggeredAbility(new TapTargetEffect(), true); diff --git a/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java b/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java index 2f3fc4ab1eb..1670257145d 100644 --- a/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java +++ b/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java @@ -34,7 +34,7 @@ public final class ChromeshellCrab extends CardImpl { this.toughness = new MageInt(3); // Morph {4}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{U}"))); // When Chromeshell Crab is turned face up, you may exchange control of target creature you control and target creature an opponent controls. Effect effect = new ExchangeControlTargetEffect(Duration.EndOfGame, rule, false, true); diff --git a/Mage.Sets/src/mage/cards/c/Chromium.java b/Mage.Sets/src/mage/cards/c/Chromium.java index 189b288339a..6f50800c305 100644 --- a/Mage.Sets/src/mage/cards/c/Chromium.java +++ b/Mage.Sets/src/mage/cards/c/Chromium.java @@ -35,7 +35,7 @@ public final class Chromium extends CardImpl { this.addAbility(new RampageAbility(2)); // At the beginning of your upkeep, sacrifice Chromium unless you pay {W}{U}{B}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect( - new ManaCostsImpl("{W}{U}{B}")), TargetController.YOU, false)); + new ManaCostsImpl<>("{W}{U}{B}")), TargetController.YOU, false)); } private Chromium(final Chromium card) { diff --git a/Mage.Sets/src/mage/cards/c/ChronomanticEscape.java b/Mage.Sets/src/mage/cards/c/ChronomanticEscape.java index 955d974369c..efbc5e9d664 100644 --- a/Mage.Sets/src/mage/cards/c/ChronomanticEscape.java +++ b/Mage.Sets/src/mage/cards/c/ChronomanticEscape.java @@ -34,7 +34,7 @@ public final class ChronomanticEscape extends CardImpl { getSpellAbility().addEffect(effect); // Suspend 3-{2}{W} - this.addAbility(new SuspendAbility(3, new ManaCostsImpl("{2}{W}"), this)); + this.addAbility(new SuspendAbility(3, new ManaCostsImpl<>("{2}{W}"), this)); } private ChronomanticEscape(final ChronomanticEscape card) { diff --git a/Mage.Sets/src/mage/cards/c/Chronosavant.java b/Mage.Sets/src/mage/cards/c/Chronosavant.java index 05a6d5ca55d..60eacba1b75 100644 --- a/Mage.Sets/src/mage/cards/c/Chronosavant.java +++ b/Mage.Sets/src/mage/cards/c/Chronosavant.java @@ -27,7 +27,7 @@ public final class Chronosavant extends CardImpl { this.toughness = new MageInt(5); // {1}{W}: Return Chronosavant from your graveyard to the battlefield tapped. You skip your next turn. - Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true), new ManaCostsImpl<>("{1}{W}")); ability.addEffect(new SkipNextTurnSourceEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CinderCrawler.java b/Mage.Sets/src/mage/cards/c/CinderCrawler.java index 13823b20c04..4862ecc686e 100644 --- a/Mage.Sets/src/mage/cards/c/CinderCrawler.java +++ b/Mage.Sets/src/mage/cards/c/CinderCrawler.java @@ -30,7 +30,7 @@ public final class CinderCrawler extends CardImpl { this.addAbility(new ConditionalActivatedAbility( Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), - new ManaCostsImpl("{R}"), + new ManaCostsImpl<>("{R}"), SourceBlockedCondition.instance )); } diff --git a/Mage.Sets/src/mage/cards/c/CinderElemental.java b/Mage.Sets/src/mage/cards/c/CinderElemental.java index 3df2891dd65..ca6e6a7ccff 100644 --- a/Mage.Sets/src/mage/cards/c/CinderElemental.java +++ b/Mage.Sets/src/mage/cards/c/CinderElemental.java @@ -31,7 +31,7 @@ public final class CinderElemental extends CardImpl { this.toughness = new MageInt(2); // {X}{R}, {tap}, Sacrifice Cinder Elemental: Cinder Elemental deals X damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(ManacostVariableValue.REGULAR), new ManaCostsImpl("{X}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(ManacostVariableValue.REGULAR), new ManaCostsImpl<>("{X}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/c/CinderSeer.java b/Mage.Sets/src/mage/cards/c/CinderSeer.java index 578094206a3..0401920bc51 100644 --- a/Mage.Sets/src/mage/cards/c/CinderSeer.java +++ b/Mage.Sets/src/mage/cards/c/CinderSeer.java @@ -36,7 +36,7 @@ public final class CinderSeer extends CardImpl { this.toughness = new MageInt(1); // {2}{R}, {tap}: Reveal any number of red cards in your hand. Cinder Seer deals X damage to any target, where X is the number of cards revealed this way. - Ability ability = new SimpleActivatedAbility(new CinderSeerEffect(), new ManaCostsImpl("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new CinderSeerEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CinderShade.java b/Mage.Sets/src/mage/cards/c/CinderShade.java index e3c2bddc35b..aa91ee23e59 100644 --- a/Mage.Sets/src/mage/cards/c/CinderShade.java +++ b/Mage.Sets/src/mage/cards/c/CinderShade.java @@ -31,10 +31,10 @@ public final class CinderShade extends CardImpl { this.toughness = new MageInt(1); // {B}: Cinder 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}"))); // {R}, Sacrifice Cinder Shade: Cinder Shade deals damage equal to its power to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SourcePermanentPowerCount()), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SourcePermanentPowerCount()), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/Cinderbones.java b/Mage.Sets/src/mage/cards/c/Cinderbones.java index 95e221f147b..fdc43b569ba 100644 --- a/Mage.Sets/src/mage/cards/c/Cinderbones.java +++ b/Mage.Sets/src/mage/cards/c/Cinderbones.java @@ -28,7 +28,7 @@ public final class Cinderbones extends CardImpl { this.toughness = new MageInt(1); this.addAbility(WitherAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private Cinderbones(final Cinderbones card) { diff --git a/Mage.Sets/src/mage/cards/c/CitanulFlute.java b/Mage.Sets/src/mage/cards/c/CitanulFlute.java index fe4fa883753..4095397529f 100644 --- a/Mage.Sets/src/mage/cards/c/CitanulFlute.java +++ b/Mage.Sets/src/mage/cards/c/CitanulFlute.java @@ -32,7 +32,7 @@ public final class CitanulFlute extends CardImpl { // {X}, {T}: Search your library for a creature card with converted mana cost X or less, reveal it, // and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(new CitanulFluteSearchEffect(), new ManaCostsImpl("{X}")); + Ability ability = new SimpleActivatedAbility(new CitanulFluteSearchEffect(), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CivicGuildmage.java b/Mage.Sets/src/mage/cards/c/CivicGuildmage.java index 0e342c8724d..51c905b5b96 100644 --- a/Mage.Sets/src/mage/cards/c/CivicGuildmage.java +++ b/Mage.Sets/src/mage/cards/c/CivicGuildmage.java @@ -32,13 +32,13 @@ public final class CivicGuildmage extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}: Target creature gets +0/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {U}, {tap}: Put target creature you control on top of its owner's library. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl("{U}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java b/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java index 47267aad8fd..45b4452a8f5 100644 --- a/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java +++ b/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java @@ -36,7 +36,7 @@ public final class ClaimOfErebos extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // Enchanted creature has "{1}{B}, {T}: Target player loses 2 life." - Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl("{1}{B}")); + Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{1}{B}")); grantedAbility.addCost(new TapSourceCost()); grantedAbility.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/c/ClanGuildmage.java b/Mage.Sets/src/mage/cards/c/ClanGuildmage.java index 85ba5ee568d..897c6026edb 100644 --- a/Mage.Sets/src/mage/cards/c/ClanGuildmage.java +++ b/Mage.Sets/src/mage/cards/c/ClanGuildmage.java @@ -38,7 +38,7 @@ public final class ClanGuildmage extends CardImpl { // {1}{R}, {T}: Target creature can't block this turn. Ability ability = new SimpleActivatedAbility( - new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{R}") + new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}") ); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); @@ -47,7 +47,7 @@ public final class ClanGuildmage extends CardImpl { // {2}{G}, {T}: Target land you control becomes a 4/4 Elemental creature with haste until end of turn. It's still a land. ability = new SimpleActivatedAbility(new BecomesCreatureTargetEffect( new ClanGuildmageToken(), false, true, Duration.EndOfTurn - ), new ManaCostsImpl("{2}{G}")); + ), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ClatteringAugur.java b/Mage.Sets/src/mage/cards/c/ClatteringAugur.java index ad6b155172e..12787851d58 100644 --- a/Mage.Sets/src/mage/cards/c/ClatteringAugur.java +++ b/Mage.Sets/src/mage/cards/c/ClatteringAugur.java @@ -43,7 +43,7 @@ public final class ClatteringAugur extends CardImpl { this.addAbility(ability); // {2}{B}{B}: Return Clattering Augur from your graveyard to your hand. - this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{2}{B}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl<>("{2}{B}{B}"))); } private ClatteringAugur(final ClatteringAugur card) { diff --git a/Mage.Sets/src/mage/cards/c/ClawsOfWirewood.java b/Mage.Sets/src/mage/cards/c/ClawsOfWirewood.java index 87571262916..fb6c2330ab6 100644 --- a/Mage.Sets/src/mage/cards/c/ClawsOfWirewood.java +++ b/Mage.Sets/src/mage/cards/c/ClawsOfWirewood.java @@ -36,7 +36,7 @@ public final class ClawsOfWirewood extends CardImpl { effect.setText("and each player"); this.getSpellAbility().addEffect(effect); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private ClawsOfWirewood(final ClawsOfWirewood card) { diff --git a/Mage.Sets/src/mage/cards/c/ClayStatue.java b/Mage.Sets/src/mage/cards/c/ClayStatue.java index eae7f33da44..f5dfd151f3f 100644 --- a/Mage.Sets/src/mage/cards/c/ClayStatue.java +++ b/Mage.Sets/src/mage/cards/c/ClayStatue.java @@ -24,7 +24,7 @@ public final class ClayStatue extends CardImpl { this.toughness = new MageInt(1); // {2}: Regenerate Clay Statue. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}"))); } private ClayStatue(final ClayStatue card) { diff --git a/Mage.Sets/src/mage/cards/c/Clear.java b/Mage.Sets/src/mage/cards/c/Clear.java index f0383480642..0fe4dca6749 100644 --- a/Mage.Sets/src/mage/cards/c/Clear.java +++ b/Mage.Sets/src/mage/cards/c/Clear.java @@ -22,7 +22,7 @@ public final class Clear extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private Clear(final Clear card) { diff --git a/Mage.Sets/src/mage/cards/c/ClergyOfTheHolyNimbus.java b/Mage.Sets/src/mage/cards/c/ClergyOfTheHolyNimbus.java index bb8cf3d70f8..34721f84c42 100644 --- a/Mage.Sets/src/mage/cards/c/ClergyOfTheHolyNimbus.java +++ b/Mage.Sets/src/mage/cards/c/ClergyOfTheHolyNimbus.java @@ -32,7 +32,7 @@ public final class ClergyOfTheHolyNimbus extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new ClergyOfTheHolyNimbusReplacementEffect())); // {1}: Clergy of the Holy Nimbus can't be regenerated this turn. Only any opponent may activate this ability. - this.addAbility(new ActivateOnlyByOpponentActivatedAbility(Zone.BATTLEFIELD, new CantBeRegeneratedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}"))); + this.addAbility(new ActivateOnlyByOpponentActivatedAbility(Zone.BATTLEFIELD, new CantBeRegeneratedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } private ClergyOfTheHolyNimbus(final ClergyOfTheHolyNimbus card) { diff --git a/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java b/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java index 2fa30ee4d2b..c6cf072221b 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java @@ -35,7 +35,7 @@ public final class ClockworkGnomes extends CardImpl { this.toughness = new MageInt(2); // {3}, {tap}: Regenerate target artifact creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{3}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CloudOfFaeries.java b/Mage.Sets/src/mage/cards/c/CloudOfFaeries.java index d8fd028dba1..ae984c202a4 100644 --- a/Mage.Sets/src/mage/cards/c/CloudOfFaeries.java +++ b/Mage.Sets/src/mage/cards/c/CloudOfFaeries.java @@ -31,7 +31,7 @@ public final class CloudOfFaeries extends CardImpl { // When Cloud of Faeries enters the battlefield, untap up to two lands. this.addAbility(new EntersBattlefieldTriggeredAbility(new UntapLandsEffect(2))); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private CloudOfFaeries(final CloudOfFaeries card) { diff --git a/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java b/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java index 6fa8edaa1dd..8a603ccc80d 100644 --- a/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java +++ b/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java @@ -39,7 +39,7 @@ public final class CloudchaserKestrel extends CardImpl { ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); // {W}: Target permanent becomes white until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn), new ManaCostsImpl("{W}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CloudheathDrake.java b/Mage.Sets/src/mage/cards/c/CloudheathDrake.java index 468ea6b5519..f3ffea456b6 100644 --- a/Mage.Sets/src/mage/cards/c/CloudheathDrake.java +++ b/Mage.Sets/src/mage/cards/c/CloudheathDrake.java @@ -29,7 +29,7 @@ public final class CloudheathDrake extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } public CloudheathDrake (final CloudheathDrake card) { diff --git a/Mage.Sets/src/mage/cards/c/Cloudseeder.java b/Mage.Sets/src/mage/cards/c/Cloudseeder.java index 57c98dd7bcb..2b5e8300809 100644 --- a/Mage.Sets/src/mage/cards/c/Cloudseeder.java +++ b/Mage.Sets/src/mage/cards/c/Cloudseeder.java @@ -33,7 +33,7 @@ public final class Cloudseeder extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}, {tap}, Discard a card: Create a 1/1 blue Faerie creature token named Cloud Sprite. It has flying and "Cloud Sprite can block only creatures with flying." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CloudSpriteToken()), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CloudSpriteToken()), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CoastalDrake.java b/Mage.Sets/src/mage/cards/c/CoastalDrake.java index 6a20d6b7d0c..b17155e5289 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalDrake.java +++ b/Mage.Sets/src/mage/cards/c/CoastalDrake.java @@ -34,7 +34,7 @@ public final class CoastalDrake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{U}, {T} : Return target Kavu to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent(SubType.KAVU, "Kavu"))); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CoastlineChimera.java b/Mage.Sets/src/mage/cards/c/CoastlineChimera.java index 2df3afac447..d0723428644 100644 --- a/Mage.Sets/src/mage/cards/c/CoastlineChimera.java +++ b/Mage.Sets/src/mage/cards/c/CoastlineChimera.java @@ -30,7 +30,7 @@ public final class CoastlineChimera extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{W}: Coastline Chimera can block an additional creature this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.EndOfTurn, 1), new ManaCostsImpl("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{W}"))); } private CoastlineChimera(final CoastlineChimera card) { diff --git a/Mage.Sets/src/mage/cards/c/CobaltGolem.java b/Mage.Sets/src/mage/cards/c/CobaltGolem.java index fb298f4a368..66c77d396cf 100644 --- a/Mage.Sets/src/mage/cards/c/CobaltGolem.java +++ b/Mage.Sets/src/mage/cards/c/CobaltGolem.java @@ -25,7 +25,7 @@ public final class CobaltGolem extends CardImpl { this.subtype.add(SubType.GOLEM); this.power = new MageInt(2); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } private CobaltGolem(final CobaltGolem card) { diff --git a/Mage.Sets/src/mage/cards/c/CobraTrap.java b/Mage.Sets/src/mage/cards/c/CobraTrap.java index 8466634fb31..90ec0240ab8 100644 --- a/Mage.Sets/src/mage/cards/c/CobraTrap.java +++ b/Mage.Sets/src/mage/cards/c/CobraTrap.java @@ -32,7 +32,7 @@ public final class CobraTrap extends CardImpl { this.subtype.add(SubType.TRAP); // If a noncreature permanent under your control was destroyed this turn by a spell or ability an opponent controlled, you may pay {G} rather than pay Cobra Trap's mana cost. - this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{G}"), CobraTrapCondition.instance), new CobraTrapWatcher()); + this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl<>("{G}"), CobraTrapCondition.instance), new CobraTrapWatcher()); // Create four 1/1 green Snake creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new SnakeToken(), 4)); diff --git a/Mage.Sets/src/mage/cards/c/CoffinPurge.java b/Mage.Sets/src/mage/cards/c/CoffinPurge.java index 60cd3162de0..be14ee2cac0 100644 --- a/Mage.Sets/src/mage/cards/c/CoffinPurge.java +++ b/Mage.Sets/src/mage/cards/c/CoffinPurge.java @@ -26,7 +26,7 @@ public final class CoffinPurge extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInGraveyard()); // Flashback {B} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{B}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{B}"))); } private CoffinPurge(final CoffinPurge card) { diff --git a/Mage.Sets/src/mage/cards/c/CoffinQueen.java b/Mage.Sets/src/mage/cards/c/CoffinQueen.java index 5d206a40679..309a48d2346 100644 --- a/Mage.Sets/src/mage/cards/c/CoffinQueen.java +++ b/Mage.Sets/src/mage/cards/c/CoffinQueen.java @@ -43,7 +43,7 @@ public final class CoffinQueen extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {2}{B}, {tap}: Put target creature card from a graveyard onto the battlefield under your control. When Coffin Queen becomes untapped or you lose control of Coffin Queen, exile that creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard"))); ability.addEffect(new CoffinQueenCreateDelayedTriggerEffect()); diff --git a/Mage.Sets/src/mage/cards/c/ColdSnap.java b/Mage.Sets/src/mage/cards/c/ColdSnap.java index dfdc07c8477..102cc5a0cc4 100644 --- a/Mage.Sets/src/mage/cards/c/ColdSnap.java +++ b/Mage.Sets/src/mage/cards/c/ColdSnap.java @@ -24,7 +24,7 @@ public final class ColdSnap extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Cumulative upkeep {2} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{2}"))); // At the beginning of each player's upkeep, Cold Snap deals damage to that player equal to the number of snow lands they control. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ColdSnapDamageTargetEffect(), TargetController.ANY, false, true)); diff --git a/Mage.Sets/src/mage/cards/c/ColosYearling.java b/Mage.Sets/src/mage/cards/c/ColosYearling.java index 79baff404b2..06a25f6b9b7 100644 --- a/Mage.Sets/src/mage/cards/c/ColosYearling.java +++ b/Mage.Sets/src/mage/cards/c/ColosYearling.java @@ -31,7 +31,7 @@ public final class ColosYearling extends CardImpl { this.addAbility(new MountainwalkAbility()); // {R}: Colos Yearling 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 ColosYearling(final ColosYearling card) { diff --git a/Mage.Sets/src/mage/cards/c/ColossusOfSardia.java b/Mage.Sets/src/mage/cards/c/ColossusOfSardia.java index 0d34fa41571..c022af26dc6 100644 --- a/Mage.Sets/src/mage/cards/c/ColossusOfSardia.java +++ b/Mage.Sets/src/mage/cards/c/ColossusOfSardia.java @@ -38,7 +38,7 @@ public final class ColossusOfSardia extends CardImpl { // {9}: Untap Colossus of Sardia. Activate this ability only during your upkeep. this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, - new UntapSourceEffect(), new ManaCostsImpl("{9}"), new IsStepCondition(PhaseStep.UPKEEP), null)); + new UntapSourceEffect(), new ManaCostsImpl<>("{9}"), new IsStepCondition(PhaseStep.UPKEEP), null)); } private ColossusOfSardia(final ColossusOfSardia card) { diff --git a/Mage.Sets/src/mage/cards/c/CombatMedic.java b/Mage.Sets/src/mage/cards/c/CombatMedic.java index df32d794778..6f3b4cb1a84 100644 --- a/Mage.Sets/src/mage/cards/c/CombatMedic.java +++ b/Mage.Sets/src/mage/cards/c/CombatMedic.java @@ -30,7 +30,7 @@ public final class CombatMedic extends CardImpl { this.toughness = new MageInt(2); // {1}{W}: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CombineGuildmage.java b/Mage.Sets/src/mage/cards/c/CombineGuildmage.java index a1792bb6953..bb5d99473cb 100644 --- a/Mage.Sets/src/mage/cards/c/CombineGuildmage.java +++ b/Mage.Sets/src/mage/cards/c/CombineGuildmage.java @@ -44,14 +44,14 @@ public final class CombineGuildmage extends CardImpl { // {1}{G}, {T}: This turn, each creature you control enters the battlefield with an additional +1/+1 counter on it. Ability ability = new SimpleActivatedAbility( - new CombineGuildmageReplacementEffect(), new ManaCostsImpl("{1}{G}") + new CombineGuildmageReplacementEffect(), new ManaCostsImpl<>("{1}{G}") ); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}{U}, {T}: Move a +1/+1 counter from target creature you control onto another target creature you control. ability = new SimpleActivatedAbility( - new CombineGuildmageCounterEffect(), new ManaCostsImpl("{1}{U}") + new CombineGuildmageCounterEffect(), new ManaCostsImpl<>("{1}{U}") ); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter1)); diff --git a/Mage.Sets/src/mage/cards/c/CompanionOfTheTrials.java b/Mage.Sets/src/mage/cards/c/CompanionOfTheTrials.java index 5394d8bcaad..fdd89ef531f 100644 --- a/Mage.Sets/src/mage/cards/c/CompanionOfTheTrials.java +++ b/Mage.Sets/src/mage/cards/c/CompanionOfTheTrials.java @@ -43,7 +43,7 @@ public final class CompanionOfTheTrials extends CardImpl { // {1}{W}: Untap target creature. Activate this ability only if you control a Gideon planeswalker. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), - new ManaCostsImpl("{1}{W}"), + new ManaCostsImpl<>("{1}{W}"), new PermanentsOnTheBattlefieldCondition(filter)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CompellingArgument.java b/Mage.Sets/src/mage/cards/c/CompellingArgument.java index dbf17267c99..240033a968e 100644 --- a/Mage.Sets/src/mage/cards/c/CompellingArgument.java +++ b/Mage.Sets/src/mage/cards/c/CompellingArgument.java @@ -24,7 +24,7 @@ public final class CompellingArgument extends CardImpl { this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(5)); // Cycling {U} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/c/Compulsion.java b/Mage.Sets/src/mage/cards/c/Compulsion.java index 3585400a3d0..e2432f91090 100644 --- a/Mage.Sets/src/mage/cards/c/Compulsion.java +++ b/Mage.Sets/src/mage/cards/c/Compulsion.java @@ -25,12 +25,12 @@ public final class Compulsion extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); // {1}{U}, Discard a card: Draw a card. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{1}{U}")); + Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{U}")); ability1.addCost(new DiscardTargetCost(new TargetCardInHand(1, new FilterCard("a card")))); this.addAbility(ability1); // {1}{U}, Sacrifice Compulsion: Draw a card. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{1}{U}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{U}")); ability2.addCost(new SacrificeSourceCost()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/c/ConclaveGuildmage.java b/Mage.Sets/src/mage/cards/c/ConclaveGuildmage.java index 31e8e6561ef..7169d07a5ab 100644 --- a/Mage.Sets/src/mage/cards/c/ConclaveGuildmage.java +++ b/Mage.Sets/src/mage/cards/c/ConclaveGuildmage.java @@ -45,7 +45,7 @@ public final class ConclaveGuildmage extends CardImpl { // {5}{W}, {T}: Create a 2/2 green and white Elf Knight creature token with vigilance. ability = new SimpleActivatedAbility( new CreateTokenEffect(new ElfKnightToken()), - new ManaCostsImpl("{5}{W}") + new ManaCostsImpl<>("{5}{W}") ); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java b/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java index caa54922039..cee6be928c8 100644 --- a/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java +++ b/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java @@ -43,7 +43,7 @@ public final class ConduitOfStorms extends CardImpl { this.addAbility(new AttacksTriggeredAbility(effect, false)); // {3}{R}{R}: Transform Conduit of Storms. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl("{3}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{3}{R}{R}"))); } private ConduitOfStorms(final ConduitOfStorms card) { diff --git a/Mage.Sets/src/mage/cards/c/Conflagrate.java b/Mage.Sets/src/mage/cards/c/Conflagrate.java index 305c4e49bb4..7309e60ae93 100644 --- a/Mage.Sets/src/mage/cards/c/Conflagrate.java +++ b/Mage.Sets/src/mage/cards/c/Conflagrate.java @@ -31,7 +31,7 @@ public final class Conflagrate extends CardImpl { this.getSpellAbility().addTarget(new TargetAnyTargetAmount(xValue)); // Flashback-{R}{R}, Discard X cards. - Ability ability = new FlashbackAbility(this, new ManaCostsImpl("{R}{R}")); + Ability ability = new FlashbackAbility(this, new ManaCostsImpl<>("{R}{R}")); ability.addCost(new DiscardXTargetCost(StaticFilters.FILTER_CARD_CARDS)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ConquerorsFoothold.java b/Mage.Sets/src/mage/cards/c/ConquerorsFoothold.java index 4981e554b9f..bbca31d498d 100644 --- a/Mage.Sets/src/mage/cards/c/ConquerorsFoothold.java +++ b/Mage.Sets/src/mage/cards/c/ConquerorsFoothold.java @@ -32,21 +32,21 @@ public final class ConquerorsFoothold extends CardImpl { // {2}, {T}: Draw a card, then discard a card. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), - new ManaCostsImpl("{2}")); + new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {4}, {T}: Draw a card. SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), - new ManaCostsImpl("{4}")); + new ManaCostsImpl<>("{4}")); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); // {6}, {T}: Return target card from your graveyard to your hand. SimpleActivatedAbility ability3 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), - new ManaCostsImpl("{6}")); + new ManaCostsImpl<>("{6}")); ability3.addCost(new TapSourceCost()); ability3.addTarget(new TargetCardInYourGraveyard()); this.addAbility(ability3); diff --git a/Mage.Sets/src/mage/cards/c/ConstrictingTendrils.java b/Mage.Sets/src/mage/cards/c/ConstrictingTendrils.java index 98729d43ab9..acc18907fb0 100644 --- a/Mage.Sets/src/mage/cards/c/ConstrictingTendrils.java +++ b/Mage.Sets/src/mage/cards/c/ConstrictingTendrils.java @@ -23,7 +23,7 @@ public final class ConstrictingTendrils extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(-3, 0, Duration.EndOfTurn)); - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private ConstrictingTendrils(final ConstrictingTendrils card) { diff --git a/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java b/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java index 574136c7ccc..0d607e5babb 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java +++ b/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java @@ -30,7 +30,7 @@ public final class ConsumptiveGoo extends CardImpl { this.toughness = new MageInt(1); // {2}{B}{B}: Target creature gets -1/-1 until end of turn. Put a +1/+1 counter on Consumptive Goo. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl("{2}{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}{B}")); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ContestedCliffs.java b/Mage.Sets/src/mage/cards/c/ContestedCliffs.java index a9b29635f42..dffd816cbf2 100644 --- a/Mage.Sets/src/mage/cards/c/ContestedCliffs.java +++ b/Mage.Sets/src/mage/cards/c/ContestedCliffs.java @@ -40,7 +40,7 @@ public final class ContestedCliffs extends CardImpl { // {R}{G}, {tap}: Choose target Beast creature you control and target creature an opponent controls. Those creatures fight each other. Effect effect = new FightTargetsEffect(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{R}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{R}{G}")); ability.addCost(new TapSourceCost()); Target target1 = new TargetCreaturePermanent(filter1); ability.addTarget(target1); diff --git a/Mage.Sets/src/mage/cards/c/Controvert.java b/Mage.Sets/src/mage/cards/c/Controvert.java index 272668d7c6a..f27f3c32069 100644 --- a/Mage.Sets/src/mage/cards/c/Controvert.java +++ b/Mage.Sets/src/mage/cards/c/Controvert.java @@ -24,7 +24,7 @@ public final class Controvert extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell()); // Recover {2}{U}{U} - this.addAbility(new RecoverAbility(new ManaCostsImpl("{2}{U}{U}"), this)); + this.addAbility(new RecoverAbility(new ManaCostsImpl<>("{2}{U}{U}"), this)); } private Controvert(final Controvert card) { diff --git a/Mage.Sets/src/mage/cards/c/Conversion.java b/Mage.Sets/src/mage/cards/c/Conversion.java index 97ee2e392fa..d7e6be37f89 100644 --- a/Mage.Sets/src/mage/cards/c/Conversion.java +++ b/Mage.Sets/src/mage/cards/c/Conversion.java @@ -31,7 +31,7 @@ public final class Conversion extends CardImpl { // At the beginning of your upkeep, sacrifice Conversion unless you pay {W}{W}. this.addAbility(new BeginningOfUpkeepTriggeredAbility( new SacrificeSourceUnlessPaysEffect( - new ManaCostsImpl("{W}{W}")), + new ManaCostsImpl<>("{W}{W}")), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/cards/c/CoordinatedCharge.java b/Mage.Sets/src/mage/cards/c/CoordinatedCharge.java index e87486c55b8..c2514405dc2 100644 --- a/Mage.Sets/src/mage/cards/c/CoordinatedCharge.java +++ b/Mage.Sets/src/mage/cards/c/CoordinatedCharge.java @@ -22,7 +22,7 @@ public final class CoordinatedCharge extends CardImpl { this.getSpellAbility().addEffect(new BoostControlledEffect(2, 1, Duration.EndOfTurn)); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private CoordinatedCharge(final CoordinatedCharge card) { diff --git a/Mage.Sets/src/mage/cards/c/CopperGnomes.java b/Mage.Sets/src/mage/cards/c/CopperGnomes.java index 7f49338421d..c4a5402858f 100644 --- a/Mage.Sets/src/mage/cards/c/CopperGnomes.java +++ b/Mage.Sets/src/mage/cards/c/CopperGnomes.java @@ -31,7 +31,7 @@ public final class CopperGnomes extends CardImpl { Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_ARTIFACT_AN), - new ManaCostsImpl("{4}") + new ManaCostsImpl<>("{4}") ); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CoralReef.java b/Mage.Sets/src/mage/cards/c/CoralReef.java index 556b1b99e98..4a0d1b0b704 100644 --- a/Mage.Sets/src/mage/cards/c/CoralReef.java +++ b/Mage.Sets/src/mage/cards/c/CoralReef.java @@ -57,7 +57,7 @@ public final class CoralReef extends CardImpl { new SacrificeTargetCost(new TargetControlledPermanent(islandFilter)))); // {U}, Tap an untapped blue creature you control, Remove a polyp counter from Coral Reef: Put a +0/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P0P1.createInstance()), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P0P1.createInstance()), new ManaCostsImpl<>("{U}")); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(untappedBlueCreatureFilter))); ability.addCost(new RemoveCountersSourceCost(CounterType.POLYP.createInstance())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CoralTrickster.java b/Mage.Sets/src/mage/cards/c/CoralTrickster.java index d329e648b35..f6b755b0a91 100644 --- a/Mage.Sets/src/mage/cards/c/CoralTrickster.java +++ b/Mage.Sets/src/mage/cards/c/CoralTrickster.java @@ -28,7 +28,7 @@ public final class CoralTrickster extends CardImpl { this.toughness = new MageInt(1); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); // When Coral Trickster is turned face up, you may tap or untap target permanent. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new MayTapOrUntapTargetEffect()); ability.addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CoralhelmCommander.java b/Mage.Sets/src/mage/cards/c/CoralhelmCommander.java index fdb48a33c71..e148b1ae94a 100644 --- a/Mage.Sets/src/mage/cards/c/CoralhelmCommander.java +++ b/Mage.Sets/src/mage/cards/c/CoralhelmCommander.java @@ -41,7 +41,7 @@ public final class CoralhelmCommander extends LevelerCard { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new LevelUpAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new LevelUpAbility(new ManaCostsImpl<>("{1}"))); Abilities abilities1 = new AbilitiesImpl<>(); abilities1.add(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/c/CorpseConnoisseur.java b/Mage.Sets/src/mage/cards/c/CorpseConnoisseur.java index 37c87af0b2d..f6f7f9c5355 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseConnoisseur.java +++ b/Mage.Sets/src/mage/cards/c/CorpseConnoisseur.java @@ -36,7 +36,7 @@ public final class CorpseConnoisseur extends CardImpl { // When Corpse Connoisseur enters the battlefield, you may search your library for a creature card and put that card into your graveyard. If you do, shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInGraveyard(), true)); // Unearth {3}{B} - this.addAbility(new UnearthAbility(new ManaCostsImpl("{3}{B}"))); + this.addAbility(new UnearthAbility(new ManaCostsImpl<>("{3}{B}"))); } private CorpseConnoisseur(final CorpseConnoisseur card) { diff --git a/Mage.Sets/src/mage/cards/c/CorpseHarvester.java b/Mage.Sets/src/mage/cards/c/CorpseHarvester.java index 27729b8ef17..31ed6ac0813 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseHarvester.java +++ b/Mage.Sets/src/mage/cards/c/CorpseHarvester.java @@ -37,7 +37,7 @@ public final class CorpseHarvester extends CardImpl { // {1}{B}, {tap}, Sacrifice a creature: Search your library for a Zombie card and a Swamp card, reveal them, and put them into your hand. Then shuffle your library. Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect( new CorpseHarvesterTarget(), true - ), new ManaCostsImpl("{1}{B}")); + ), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CorpseHauler.java b/Mage.Sets/src/mage/cards/c/CorpseHauler.java index 7f98451e9ed..a0940b85c58 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseHauler.java +++ b/Mage.Sets/src/mage/cards/c/CorpseHauler.java @@ -38,7 +38,7 @@ public final class CorpseHauler extends CardImpl { this.toughness = new MageInt(1); // {2}{B}, Sacrifice Corpse Hauler: Return another target creature card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addTarget(new TargetCardInYourGraveyard(filter)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CorpseTraders.java b/Mage.Sets/src/mage/cards/c/CorpseTraders.java index 1cc088afee9..f6d66debc8e 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseTraders.java +++ b/Mage.Sets/src/mage/cards/c/CorpseTraders.java @@ -31,7 +31,7 @@ public final class CorpseTraders extends CardImpl { this.toughness = new MageInt(3); // {2}{B}, Sacrifice a creature: Target opponent reveals their hand. You choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardCardYouChooseTargetEffect(), new ManaCostsImpl("{2}{B}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardCardYouChooseTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addTarget(new TargetOpponent()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/Corpseweft.java b/Mage.Sets/src/mage/cards/c/Corpseweft.java index d5037d2e3cf..69f982a96b9 100644 --- a/Mage.Sets/src/mage/cards/c/Corpseweft.java +++ b/Mage.Sets/src/mage/cards/c/Corpseweft.java @@ -29,7 +29,7 @@ public final class Corpseweft extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); // {1}{B}, Exile one or more creature cards from your graveyard: Create a tapped X/X black Zombie Horror creature token, where X is twice the number of cards exiled this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CorpseweftEffect(), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CorpseweftEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(1, Integer.MAX_VALUE, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CorpulentCorpse.java b/Mage.Sets/src/mage/cards/c/CorpulentCorpse.java index cef1d62d6de..27a37046ad0 100644 --- a/Mage.Sets/src/mage/cards/c/CorpulentCorpse.java +++ b/Mage.Sets/src/mage/cards/c/CorpulentCorpse.java @@ -26,7 +26,7 @@ public final class CorpulentCorpse extends CardImpl { // Fear this.addAbility(FearAbility.getInstance()); // Suspend 5-{B} - this.addAbility(new SuspendAbility(5, new ManaCostsImpl("{B}"), this)); + this.addAbility(new SuspendAbility(5, new ManaCostsImpl<>("{B}"), this)); } private CorpulentCorpse(final CorpulentCorpse card) { diff --git a/Mage.Sets/src/mage/cards/c/CorruptOfficial.java b/Mage.Sets/src/mage/cards/c/CorruptOfficial.java index fb5618523a1..ce60b5577bd 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptOfficial.java +++ b/Mage.Sets/src/mage/cards/c/CorruptOfficial.java @@ -27,7 +27,7 @@ public final class CorruptOfficial extends CardImpl { this.toughness = new MageInt(1); // {2}{B}: Regenerate Corrupt Official. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); // Whenever Corrupt Official becomes blocked, defending player discards a card at random. this.addAbility(new BecomesBlockedSourceTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java b/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java index 41051ae17a3..3b190689edc 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java @@ -29,7 +29,7 @@ public final class CorruptedHarvester extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CosmicHorror.java b/Mage.Sets/src/mage/cards/c/CosmicHorror.java index d606773ad64..231d60f2e2a 100644 --- a/Mage.Sets/src/mage/cards/c/CosmicHorror.java +++ b/Mage.Sets/src/mage/cards/c/CosmicHorror.java @@ -35,7 +35,7 @@ public final class CosmicHorror extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // At the beginning of your upkeep, destroy Cosmic Horror unless you pay {3}{B}{B}{B}. If Cosmic Horror is destroyed this way, it deals 7 damage to you. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CosmicHorrorEffect(new ManaCostsImpl("{3}{B}{B}{B}")), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CosmicHorrorEffect(new ManaCostsImpl<>("{3}{B}{B}{B}")), TargetController.YOU, false)); } private CosmicHorror(final CosmicHorror card) { diff --git a/Mage.Sets/src/mage/cards/c/Counterflux.java b/Mage.Sets/src/mage/cards/c/Counterflux.java index 79e0bcb459c..36a6344acae 100644 --- a/Mage.Sets/src/mage/cards/c/Counterflux.java +++ b/Mage.Sets/src/mage/cards/c/Counterflux.java @@ -53,7 +53,7 @@ public final class Counterflux extends CardImpl { this.getSpellAbility().addEffect(new CounterTargetEffect()); // Overload {1}{U}{U}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.") - this.addAbility(new OverloadAbility(this, new CounterfluxEffect(), new ManaCostsImpl("{1}{U}{U}{R}"))); + this.addAbility(new OverloadAbility(this, new CounterfluxEffect(), new ManaCostsImpl<>("{1}{U}{U}{R}"))); } private Counterflux(final Counterflux card) { diff --git a/Mage.Sets/src/mage/cards/c/CouriersCapsule.java b/Mage.Sets/src/mage/cards/c/CouriersCapsule.java index 0d1913db539..91eabca994a 100644 --- a/Mage.Sets/src/mage/cards/c/CouriersCapsule.java +++ b/Mage.Sets/src/mage/cards/c/CouriersCapsule.java @@ -24,7 +24,7 @@ public final class CouriersCapsule extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}{U}"); - 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 TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CoverOfWinter.java b/Mage.Sets/src/mage/cards/c/CoverOfWinter.java index 7948dc86947..ff8a9e0e870 100644 --- a/Mage.Sets/src/mage/cards/c/CoverOfWinter.java +++ b/Mage.Sets/src/mage/cards/c/CoverOfWinter.java @@ -33,13 +33,13 @@ public final class CoverOfWinter extends CardImpl { this.addSuperType(SuperType.SNOW); // Cumulative upkeep {S} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{S}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{S}"))); // If a creature would deal combat damage to you and/or one or more creatures you control, prevent X of that damage, where X is the number of age counters on Cover of Winter. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CoverOfWinterEffect())); // {S}: Put an age counter on Cover of Winter. - this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.AGE.createInstance()), new ManaCostsImpl("{S}"))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.AGE.createInstance()), new ManaCostsImpl<>("{S}"))); } private CoverOfWinter(final CoverOfWinter card) { diff --git a/Mage.Sets/src/mage/cards/c/CowedByWisdom.java b/Mage.Sets/src/mage/cards/c/CowedByWisdom.java index fc2990b6a82..e8db622c4f1 100644 --- a/Mage.Sets/src/mage/cards/c/CowedByWisdom.java +++ b/Mage.Sets/src/mage/cards/c/CowedByWisdom.java @@ -70,7 +70,7 @@ class CowedByWisdomayCostToAttackBlockEffect extends PayCostToAttackBlockEffectI public ManaCosts getManaCostToPay(GameEvent event, Ability source, Game game) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null && !controller.getHand().isEmpty()) { - ManaCosts manaCosts = new ManaCostsImpl(); + ManaCosts manaCosts = new ManaCostsImpl<>(); manaCosts.add(new GenericManaCost(controller.getHand().size())); return manaCosts; } diff --git a/Mage.Sets/src/mage/cards/c/CrabUmbra.java b/Mage.Sets/src/mage/cards/c/CrabUmbra.java index dac1697f741..a20c166dc1d 100644 --- a/Mage.Sets/src/mage/cards/c/CrabUmbra.java +++ b/Mage.Sets/src/mage/cards/c/CrabUmbra.java @@ -37,7 +37,7 @@ public final class CrabUmbra extends CardImpl { this.addAbility(ability); // {2}{U}: Untap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapEnchantedEffect(), new ManaCostsImpl("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapEnchantedEffect(), new ManaCostsImpl<>("{2}{U}"))); // Totem armor this.addAbility(new TotemArmorAbility()); diff --git a/Mage.Sets/src/mage/cards/c/Crackleburr.java b/Mage.Sets/src/mage/cards/c/Crackleburr.java index f3a6900fbd1..bae011bb75d 100644 --- a/Mage.Sets/src/mage/cards/c/Crackleburr.java +++ b/Mage.Sets/src/mage/cards/c/Crackleburr.java @@ -51,14 +51,14 @@ public final class Crackleburr extends CardImpl { this.toughness = new MageInt(2); // {UR}{UR}, {tap}, Tap two untapped red creatures you control: Crackleburr deals 3 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{U/R}{U/R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl<>("{U/R}{U/R}")); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, true))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {UR}{UR}, {untap}, Untap two tapped blue creatures you control: Return target creature to its owner's hand. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{U/R}{U/R}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U/R}{U/R}")); ability2.addCost(new UntapSourceCost()); ability2.addCost(new UntapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter2, true))); ability2.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CracklingTriton.java b/Mage.Sets/src/mage/cards/c/CracklingTriton.java index 241a0e52c45..0f4fec2ab91 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingTriton.java +++ b/Mage.Sets/src/mage/cards/c/CracklingTriton.java @@ -30,7 +30,7 @@ public final class CracklingTriton extends CardImpl { this.toughness = new MageInt(3); // {2}{R}, Sacrifice Crackling Triton: Crackling Triton deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CradleOfTheAccursed.java b/Mage.Sets/src/mage/cards/c/CradleOfTheAccursed.java index 2afb68630f4..d37cd0d6c46 100644 --- a/Mage.Sets/src/mage/cards/c/CradleOfTheAccursed.java +++ b/Mage.Sets/src/mage/cards/c/CradleOfTheAccursed.java @@ -31,7 +31,7 @@ public final class CradleOfTheAccursed extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {3}, {T}, Sacrifice Cradle of the Accursed: Create a 2/2 black Zombie creature token. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken(), 1), new ManaCostsImpl("{3}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken(), 1), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CradleOfVitality.java b/Mage.Sets/src/mage/cards/c/CradleOfVitality.java index 9d1325088f2..fb56be6951c 100644 --- a/Mage.Sets/src/mage/cards/c/CradleOfVitality.java +++ b/Mage.Sets/src/mage/cards/c/CradleOfVitality.java @@ -26,7 +26,7 @@ public final class CradleOfVitality extends CardImpl { // Whenever you gain life, you may pay {1}{W}. If you do, put a +1/+1 counter on target creature for each 1 life you gained. Ability ability = new GainLifeControllerTriggeredAbility(new DoIfCostPaid( - new CradleOfVitalityEffect(), new ManaCostsImpl("{1}{W}") + new CradleOfVitalityEffect(), new ManaCostsImpl<>("{1}{W}") ), false, true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CragPuca.java b/Mage.Sets/src/mage/cards/c/CragPuca.java index b5668bb328c..e1da4680ada 100644 --- a/Mage.Sets/src/mage/cards/c/CragPuca.java +++ b/Mage.Sets/src/mage/cards/c/CragPuca.java @@ -28,7 +28,7 @@ public final class CragPuca extends CardImpl { this.toughness = new MageInt(4); // {UR}: Switch Crag Puca's power and toughness until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{U/R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); } diff --git a/Mage.Sets/src/mage/cards/c/CranialPlating.java b/Mage.Sets/src/mage/cards/c/CranialPlating.java index 9d09150f566..ae44e5e70c1 100644 --- a/Mage.Sets/src/mage/cards/c/CranialPlating.java +++ b/Mage.Sets/src/mage/cards/c/CranialPlating.java @@ -35,7 +35,7 @@ public final class CranialPlating extends CardImpl { .addHint(ArtifactYouControlHint.instance)); // {B}{B}: Attach Cranial Plating to target creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl("{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{B}{B}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrashingCentaur.java b/Mage.Sets/src/mage/cards/c/CrashingCentaur.java index 438157bad2c..36c6e693e59 100644 --- a/Mage.Sets/src/mage/cards/c/CrashingCentaur.java +++ b/Mage.Sets/src/mage/cards/c/CrashingCentaur.java @@ -37,7 +37,7 @@ public final class CrashingCentaur extends CardImpl { this.toughness = new MageInt(4); // {G}, Discard a card: Crashing Centaur gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(),Duration.EndOfTurn), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(),Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrashingFootfalls.java b/Mage.Sets/src/mage/cards/c/CrashingFootfalls.java index d520e84462c..ea44eeac0d2 100644 --- a/Mage.Sets/src/mage/cards/c/CrashingFootfalls.java +++ b/Mage.Sets/src/mage/cards/c/CrashingFootfalls.java @@ -20,7 +20,7 @@ public final class CrashingFootfalls extends CardImpl { this.color.setGreen(true); // Suspend 4—{G} - this.addAbility(new SuspendAbility(4, new ManaCostsImpl("{G}"), this)); + this.addAbility(new SuspendAbility(4, new ManaCostsImpl<>("{G}"), this)); // Create two 4/4 green Rhino creature tokens with trample. this.getSpellAbility().addEffect(new CreateTokenEffect(new RhinoToken(), 2)); diff --git a/Mage.Sets/src/mage/cards/c/CrazedArmodon.java b/Mage.Sets/src/mage/cards/c/CrazedArmodon.java index 28de9e16164..abfcc13c254 100644 --- a/Mage.Sets/src/mage/cards/c/CrazedArmodon.java +++ b/Mage.Sets/src/mage/cards/c/CrazedArmodon.java @@ -38,7 +38,7 @@ public final class CrazedArmodon extends CardImpl { // {G}: Crazed Armodon gets +3/+0 and gains trample until end of turn. Destroy Crazed Armodon at the beginning of the next end step. Activate this ability only once each turn. Effect effect = new BoostSourceEffect(3, 0, Duration.EndOfTurn); effect.setText("{this} gets +3/+0"); - Ability ability = new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{G}")); + Ability ability = new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{G}")); effect= new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java b/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java index 7e280418029..cfe0b0f4ad3 100644 --- a/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java +++ b/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java @@ -29,7 +29,7 @@ public final class CreakwoodGhoul extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{B/G}{B/G}")) ; + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{B/G}{B/G}")) ; ability.addTarget(new TargetCardInGraveyard()); ability.addEffect(new GainLifeEffect(1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CreativeOutburst.java b/Mage.Sets/src/mage/cards/c/CreativeOutburst.java index 9dbe0bb2675..eeb5fe7a5c5 100644 --- a/Mage.Sets/src/mage/cards/c/CreativeOutburst.java +++ b/Mage.Sets/src/mage/cards/c/CreativeOutburst.java @@ -32,7 +32,7 @@ public final class CreativeOutburst extends CardImpl { // {U/R}{U/R}, Discard Creative Outburst: Create a Treasure token. Ability ability = new SimpleActivatedAbility( - Zone.HAND, new CreateTokenEffect(new TreasureToken()), new ManaCostsImpl("{U/R}{U/R}") + Zone.HAND, new CreateTokenEffect(new TreasureToken()), new ManaCostsImpl<>("{U/R}{U/R}") ); ability.addCost(new DiscardSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/Creeperhulk.java b/Mage.Sets/src/mage/cards/c/Creeperhulk.java index d14bb941156..0a1cf2c8bb6 100644 --- a/Mage.Sets/src/mage/cards/c/Creeperhulk.java +++ b/Mage.Sets/src/mage/cards/c/Creeperhulk.java @@ -37,7 +37,7 @@ public final class Creeperhulk extends CardImpl { // {1}{G}: Until end of turn, target creature you control has base power and toughness 5/5 and gains trample. Effect effect = new SetPowerToughnessTargetEffect(5,5, Duration.EndOfTurn); effect.setText("Until end of turn, target creature you control has base power and toughness 5/5"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{G}")); ability.addTarget(new TargetControlledCreaturePermanent()); ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, "and gains Trample")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CreepingRenaissance.java b/Mage.Sets/src/mage/cards/c/CreepingRenaissance.java index 23cbf17c3ae..c0a70a8f064 100644 --- a/Mage.Sets/src/mage/cards/c/CreepingRenaissance.java +++ b/Mage.Sets/src/mage/cards/c/CreepingRenaissance.java @@ -32,7 +32,7 @@ public final class CreepingRenaissance extends CardImpl { this.getSpellAbility().addEffect(new CreepingRenaissanceEffect()); // Flashback {5}{G}{G} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{5}{G}{G}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{5}{G}{G}"))); } private CreepingRenaissance(final CreepingRenaissance card) { diff --git a/Mage.Sets/src/mage/cards/c/CreepingTarPit.java b/Mage.Sets/src/mage/cards/c/CreepingTarPit.java index 1f4d645fa39..40e1a60cdaa 100644 --- a/Mage.Sets/src/mage/cards/c/CreepingTarPit.java +++ b/Mage.Sets/src/mage/cards/c/CreepingTarPit.java @@ -40,7 +40,7 @@ public final class CreepingTarPit extends CardImpl { .withColor("BU") .withSubType(SubType.ELEMENTAL) .withAbility(new CantBeBlockedSourceAbility()), - "land", Duration.EndOfTurn), new ManaCostsImpl("{1}{U}{B}"))); + "land", Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}{B}"))); } private CreepingTarPit(final CreepingTarPit card) { diff --git a/Mage.Sets/src/mage/cards/c/CreepingTrailblazer.java b/Mage.Sets/src/mage/cards/c/CreepingTrailblazer.java index fe81608b05c..e790c9d32fe 100644 --- a/Mage.Sets/src/mage/cards/c/CreepingTrailblazer.java +++ b/Mage.Sets/src/mage/cards/c/CreepingTrailblazer.java @@ -46,7 +46,7 @@ public final class CreepingTrailblazer extends CardImpl { this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(xValue, xValue, Duration.EndOfTurn, true) .setText("{this} gets +1/+1 until end of turn for each Elemental you control."), - new ManaCostsImpl("{2}{R}{G}") + new ManaCostsImpl<>("{2}{R}{G}") )); } diff --git a/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java b/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java index 5c327e247b3..d9eb2c30534 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java @@ -36,7 +36,7 @@ public final class CrimsonAcolyte extends CardImpl { // {W}: Target creature gains protection from red until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.RED), Duration.EndOfTurn), - new ManaCostsImpl("{W}")); + new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java b/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java index a75cb259097..e1593cc6330 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java @@ -45,7 +45,7 @@ public final class CrimsonHellkite extends CardImpl { // {X}, {tap}: Crimson Hellkite deals X damage to target creature. Spend only red mana on X. Effect effect = new DamageTargetEffect(ManacostVariableValue.REGULAR); effect.setText("{this} deals X damage to target creature. Spend only red mana on X"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{X}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); VariableCost variableCost = ability.getManaCostsToPay().getVariableCosts().get(0); if (variableCost instanceof VariableManaCost) { diff --git a/Mage.Sets/src/mage/cards/c/CrimsonManticore.java b/Mage.Sets/src/mage/cards/c/CrimsonManticore.java index 5280ac7c639..84a30b10914 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonManticore.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonManticore.java @@ -32,7 +32,7 @@ public final class CrimsonManticore extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {R}, {tap}: Crimson Manticore deals 1 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java b/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java index c0dd9cf99df..6e2a1ca22cb 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java @@ -37,7 +37,7 @@ public final class CrimsonMuckwader extends CardImpl { // Crimson Muckwader gets +1/+1 as long as you control a Swamp. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1))); // {2}{B}: Regenerate Crimson Muckwader. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); } private CrimsonMuckwader(final CrimsonMuckwader card) { diff --git a/Mage.Sets/src/mage/cards/c/CripplingFatigue.java b/Mage.Sets/src/mage/cards/c/CripplingFatigue.java index 5a8a8e0b1ca..682017a7c5e 100644 --- a/Mage.Sets/src/mage/cards/c/CripplingFatigue.java +++ b/Mage.Sets/src/mage/cards/c/CripplingFatigue.java @@ -28,7 +28,7 @@ public final class CripplingFatigue extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(-2, -2, Duration.EndOfTurn)); // Flashback-{1}{B}, Pay 3 life - Ability ability = new FlashbackAbility(this, new ManaCostsImpl("{1}{B}")); + Ability ability = new FlashbackAbility(this, new ManaCostsImpl<>("{1}{B}")); ability.addCost(new PayLifeCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CrookOfCondemnation.java b/Mage.Sets/src/mage/cards/c/CrookOfCondemnation.java index ddc583be65e..07a101111b8 100644 --- a/Mage.Sets/src/mage/cards/c/CrookOfCondemnation.java +++ b/Mage.Sets/src/mage/cards/c/CrookOfCondemnation.java @@ -26,13 +26,13 @@ public final class CrookOfCondemnation extends CardImpl { // {1}, {t}: Exile target card from a graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); // {1}, Exile Crook of Condemnation: Exile all cards from all graveyards. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllPlayersEffect(), new ManaCostsImpl("{1}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllPlayersEffect(), new ManaCostsImpl<>("{1}")); ability2.addCost(new ExileSourceCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/c/CrosisThePurger.java b/Mage.Sets/src/mage/cards/c/CrosisThePurger.java index 0082903a381..060dbf6531d 100644 --- a/Mage.Sets/src/mage/cards/c/CrosisThePurger.java +++ b/Mage.Sets/src/mage/cards/c/CrosisThePurger.java @@ -38,7 +38,7 @@ public final class CrosisThePurger extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever Crosis, the Purger deals combat damage to a player, you may pay {2}{B}. If you do, choose a color, then that player reveals their hand and discards all cards of that color. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(new CrosisThePurgerEffect(), - new ManaCostsImpl("{2}{B}")), false, true)); + new ManaCostsImpl<>("{2}{B}")), false, true)); } private CrosisThePurger(final CrosisThePurger card) { diff --git a/Mage.Sets/src/mage/cards/c/CrosissAttendant.java b/Mage.Sets/src/mage/cards/c/CrosissAttendant.java index 839c75372af..be231b53701 100644 --- a/Mage.Sets/src/mage/cards/c/CrosissAttendant.java +++ b/Mage.Sets/src/mage/cards/c/CrosissAttendant.java @@ -28,7 +28,7 @@ public final class CrosissAttendant extends CardImpl { this.toughness = new MageInt(3); // {1}, Sacrifice Crosis's Attendant: Add {U}{B}{R}. - Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 1, 1, 0, 0, 0, 0), new ManaCostsImpl("{1}")); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 1, 1, 0, 0, 0, 0), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java b/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java index b02a22d011e..4b325c0d0dc 100644 --- a/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java +++ b/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java @@ -43,7 +43,7 @@ public final class CrovaxTheCursed extends CardImpl { this.addAbility(ability); // {B}: Crovax gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } diff --git a/Mage.Sets/src/mage/cards/c/CrowdFavorites.java b/Mage.Sets/src/mage/cards/c/CrowdFavorites.java index 1c8da8bcb86..580f6b1042e 100644 --- a/Mage.Sets/src/mage/cards/c/CrowdFavorites.java +++ b/Mage.Sets/src/mage/cards/c/CrowdFavorites.java @@ -30,11 +30,11 @@ public final class CrowdFavorites extends CardImpl { this.toughness = new MageInt(4); // {3}{W}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{3}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{3}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {3}{W}: Crowd Favorites gets +0/+5 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 5, Duration.EndOfTurn), new ManaCostsImpl("{3}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 5, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{W}"))); } private CrowdFavorites(final CrowdFavorites card) { diff --git a/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java b/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java index d344968c4b6..8260b90ffef 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java @@ -43,7 +43,7 @@ public final class CrownOfConvergence extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // {G}{W}: Put the top card of your library on the bottom of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrownOfConvergenceEffect(), new ManaCostsImpl("{G}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrownOfConvergenceEffect(), new ManaCostsImpl<>("{G}{W}"))); } private CrownOfConvergence(final CrownOfConvergence card) { diff --git a/Mage.Sets/src/mage/cards/c/CrownOfSkemfar.java b/Mage.Sets/src/mage/cards/c/CrownOfSkemfar.java index 25bc53a31c6..9c85341254d 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfSkemfar.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfSkemfar.java @@ -56,7 +56,7 @@ public final class CrownOfSkemfar extends CardImpl { // {2}{G}: Return Bounty of Skemfar from your graveyard to your hand. this.addAbility(new SimpleActivatedAbility( - Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{2}{G}") + Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl<>("{2}{G}") )); } diff --git a/Mage.Sets/src/mage/cards/c/CrudeRampart.java b/Mage.Sets/src/mage/cards/c/CrudeRampart.java index 31fc79d5f8f..49a2a970f36 100644 --- a/Mage.Sets/src/mage/cards/c/CrudeRampart.java +++ b/Mage.Sets/src/mage/cards/c/CrudeRampart.java @@ -26,7 +26,7 @@ public final class CrudeRampart extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // Morph {4}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{W}"))); } private CrudeRampart(final CrudeRampart card) { diff --git a/Mage.Sets/src/mage/cards/c/CruelDeceiver.java b/Mage.Sets/src/mage/cards/c/CruelDeceiver.java index 6a0ecde5bc5..88e948f6b40 100644 --- a/Mage.Sets/src/mage/cards/c/CruelDeceiver.java +++ b/Mage.Sets/src/mage/cards/c/CruelDeceiver.java @@ -40,7 +40,7 @@ public final class CruelDeceiver 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, Cruel Deceiver gains "Whenever Cruel Deceiver deals damage to a creature, destroy that creature" until end of turn. Activate this ability only once each turn. - this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new CruelDeceiverEffect(), new ManaCostsImpl("{2}"))); + this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new CruelDeceiverEffect(), new ManaCostsImpl<>("{2}"))); } private CruelDeceiver(final CruelDeceiver card) { diff --git a/Mage.Sets/src/mage/cards/c/CruelSadist.java b/Mage.Sets/src/mage/cards/c/CruelSadist.java index a85b1951a7f..8bdc715edac 100644 --- a/Mage.Sets/src/mage/cards/c/CruelSadist.java +++ b/Mage.Sets/src/mage/cards/c/CruelSadist.java @@ -46,7 +46,7 @@ public final class CruelSadist extends CardImpl { // {2}{B}, {T}, Remove X +1/+1 counters from Cruel Sadist: Cruel Sadist deals X damage to target creature. Effect effect = new DamageTargetEffect(RemovedCountersForCostValue.instance); effect.setText("{this} deals X damage to target creature"); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{B}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveVariableCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CrushOfWurms.java b/Mage.Sets/src/mage/cards/c/CrushOfWurms.java index 68b48a02f94..194bcf258c1 100644 --- a/Mage.Sets/src/mage/cards/c/CrushOfWurms.java +++ b/Mage.Sets/src/mage/cards/c/CrushOfWurms.java @@ -23,7 +23,7 @@ public final class CrushOfWurms extends CardImpl { // Put three 6/6 green Wurm creature tokens onto the battlefield. this.getSpellAbility().addEffect(new CreateTokenEffect(new WurmToken(), 3)); // Flashback {9}{G}{G}{G} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{9}{G}{G}{G}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{9}{G}{G}{G}"))); } private CrushOfWurms(final CrushOfWurms card) { diff --git a/Mage.Sets/src/mage/cards/c/CryptOfTheEternals.java b/Mage.Sets/src/mage/cards/c/CryptOfTheEternals.java index 0521c7b62a9..2f1fb5451d4 100644 --- a/Mage.Sets/src/mage/cards/c/CryptOfTheEternals.java +++ b/Mage.Sets/src/mage/cards/c/CryptOfTheEternals.java @@ -33,7 +33,7 @@ public final class CryptOfTheEternals extends CardImpl { for (Mana m : list) { - SimpleManaAbility uAbility = new SimpleManaAbility(Zone.BATTLEFIELD, m, new ManaCostsImpl("{1}")); + SimpleManaAbility uAbility = new SimpleManaAbility(Zone.BATTLEFIELD, m, new ManaCostsImpl<>("{1}")); uAbility.addCost(new TapSourceCost()); this.addAbility(uAbility); } diff --git a/Mage.Sets/src/mage/cards/c/CryptRats.java b/Mage.Sets/src/mage/cards/c/CryptRats.java index 26ebcdba4fd..84fbd6e9aa1 100644 --- a/Mage.Sets/src/mage/cards/c/CryptRats.java +++ b/Mage.Sets/src/mage/cards/c/CryptRats.java @@ -40,7 +40,7 @@ public final class CryptRats extends CardImpl { // {X}: Crypt Rats deals X damage to each creature and each player. Spend only black mana on X. Effect effect = new DamageEverythingEffect(ManacostVariableValue.REGULAR); effect.setText("{this} deals X damage to each creature and each player. Spend only black mana on X"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect,new ManaCostsImpl("{X}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect,new ManaCostsImpl<>("{X}")); VariableCost variableCost = ability.getManaCostsToPay().getVariableCosts().get(0); if (variableCost instanceof VariableManaCost) { ((VariableManaCost) variableCost).setFilter(filterBlack); diff --git a/Mage.Sets/src/mage/cards/c/CryptRipper.java b/Mage.Sets/src/mage/cards/c/CryptRipper.java index a8e13533bf5..5ff537f90fa 100644 --- a/Mage.Sets/src/mage/cards/c/CryptRipper.java +++ b/Mage.Sets/src/mage/cards/c/CryptRipper.java @@ -28,7 +28,7 @@ public final class CryptRipper extends CardImpl { this.toughness = new MageInt(2); this.addAbility(HasteAbility.getInstance()); - 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 CryptRipper(final CryptRipper card) { diff --git a/Mage.Sets/src/mage/cards/c/Cryptbreaker.java b/Mage.Sets/src/mage/cards/c/Cryptbreaker.java index df72726b7ab..528a3d6923f 100644 --- a/Mage.Sets/src/mage/cards/c/Cryptbreaker.java +++ b/Mage.Sets/src/mage/cards/c/Cryptbreaker.java @@ -42,7 +42,7 @@ public final class Cryptbreaker extends CardImpl { this.toughness = new MageInt(1); // {1}{B}, {T}, Discard a card: Create a 2/2 black Zombie creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrystalQuarry.java b/Mage.Sets/src/mage/cards/c/CrystalQuarry.java index 4111bc6e16e..cc26817dab6 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalQuarry.java +++ b/Mage.Sets/src/mage/cards/c/CrystalQuarry.java @@ -25,7 +25,7 @@ public final class CrystalQuarry extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {5}, {tap}: Add {W}{U}{B}{R}{G}. - Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 1, 1, 1, 1, 0, 0, 0), new ManaCostsImpl("{5}")); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 1, 1, 1, 1, 0, 0, 0), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CrystalSeer.java b/Mage.Sets/src/mage/cards/c/CrystalSeer.java index 83eb3c5140b..4c47ec26dbf 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalSeer.java +++ b/Mage.Sets/src/mage/cards/c/CrystalSeer.java @@ -34,7 +34,7 @@ public final class CrystalSeer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryControllerEffect(4))); // {4}{U}: Return Crystal Seer to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{4}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{4}{U}"))); } public CrystalSeer (final CrystalSeer card) { diff --git a/Mage.Sets/src/mage/cards/c/CudgelTroll.java b/Mage.Sets/src/mage/cards/c/CudgelTroll.java index 022469c9519..8a103ab4e7b 100644 --- a/Mage.Sets/src/mage/cards/c/CudgelTroll.java +++ b/Mage.Sets/src/mage/cards/c/CudgelTroll.java @@ -26,7 +26,7 @@ public final class CudgelTroll extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private CudgelTroll(final CudgelTroll card) { diff --git a/Mage.Sets/src/mage/cards/c/CultGuildmage.java b/Mage.Sets/src/mage/cards/c/CultGuildmage.java index 6c422f64f63..1b121527451 100644 --- a/Mage.Sets/src/mage/cards/c/CultGuildmage.java +++ b/Mage.Sets/src/mage/cards/c/CultGuildmage.java @@ -31,13 +31,13 @@ public final class CultGuildmage extends CardImpl { this.toughness = new MageInt(2); // {3}{B}, {T}: Target player discards a card. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{3}{B}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {R}, {T}: Cult Guildmage deals 1 damage to target opponent or planeswalker. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponentOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CuratorOfMysteries.java b/Mage.Sets/src/mage/cards/c/CuratorOfMysteries.java index 7254784abb6..763ec4d0fd7 100644 --- a/Mage.Sets/src/mage/cards/c/CuratorOfMysteries.java +++ b/Mage.Sets/src/mage/cards/c/CuratorOfMysteries.java @@ -33,7 +33,7 @@ public final class CuratorOfMysteries extends CardImpl { this.addAbility(new CycleOrDiscardControllerTriggeredAbility(new ScryEffect(1, false)).setTriggerPhrase("Whenever you cycle or discard another card, ")); // Cycling {U} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/c/CurseOfFoolsWisdom.java b/Mage.Sets/src/mage/cards/c/CurseOfFoolsWisdom.java index ebc0e55e591..565f18e5bcb 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfFoolsWisdom.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfFoolsWisdom.java @@ -45,7 +45,7 @@ public final class CurseOfFoolsWisdom extends CardImpl { this.addAbility(new CurseOfFoolsWisdomTriggeredAbility()); // Madness {3}{B} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{3}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{3}{B}"))); } private CurseOfFoolsWisdom(final CurseOfFoolsWisdom card) { diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheCabal.java b/Mage.Sets/src/mage/cards/c/CurseOfTheCabal.java index 2f12b0b3d5e..9d8e0924d12 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfTheCabal.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfTheCabal.java @@ -43,7 +43,7 @@ public final class CurseOfTheCabal extends CardImpl { this.getSpellAbility().addEffect(new CurseOfTheCabalSacrificeEffect()); // Suspend 2-{2}{B}{B} - this.addAbility(new SuspendAbility(2, new ManaCostsImpl("{2}{B}{B}"), this)); + this.addAbility(new SuspendAbility(2, new ManaCostsImpl<>("{2}{B}{B}"), this)); // At the beginning of each player's upkeep, if Curse of the Cabal is suspended, that player may sacrifice a permanent. If they do, put two time counters on Curse of the Cabal. this.addAbility(new CurseOfTheCabalInterveningIfTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/c/CursedScroll.java b/Mage.Sets/src/mage/cards/c/CursedScroll.java index 07347ac7d4c..3f4fc42e037 100644 --- a/Mage.Sets/src/mage/cards/c/CursedScroll.java +++ b/Mage.Sets/src/mage/cards/c/CursedScroll.java @@ -28,7 +28,7 @@ public final class CursedScroll extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {3}, {T}: Name a card. Reveal a card at random from your hand. If it's the named card, Cursed Scroll deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.ALL), new ManaCostsImpl("{3}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.ALL), new ManaCostsImpl<>("{3}")); ability.addEffect(new CursedScrollEffect()); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/c/Cyclone.java b/Mage.Sets/src/mage/cards/c/Cyclone.java index a3cfee74879..cf4fb5f586e 100644 --- a/Mage.Sets/src/mage/cards/c/Cyclone.java +++ b/Mage.Sets/src/mage/cards/c/Cyclone.java @@ -71,7 +71,7 @@ class CycloneEffect extends OneShotEffect { greens.append("{G}"); } - if(this.choice(game, source, player, new ManaCostsImpl(greens.toString()))){ + if(this.choice(game, source, player, new ManaCostsImpl<>(greens.toString()))){ DamageEverythingEffect dmg = new DamageEverythingEffect(total); dmg.apply(game, source); } else { diff --git a/Mage.Sets/src/mage/cards/c/CyclonicRift.java b/Mage.Sets/src/mage/cards/c/CyclonicRift.java index e07b91024a6..8777b1ce291 100644 --- a/Mage.Sets/src/mage/cards/c/CyclonicRift.java +++ b/Mage.Sets/src/mage/cards/c/CyclonicRift.java @@ -36,7 +36,7 @@ public final class CyclonicRift extends CardImpl { // Overload {6}{U} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.") Effect effect = new ReturnToHandFromBattlefieldAllEffect(filter); effect.setText("Return each nonland permanent you don't control to its owner's hand"); - this.addAbility(new OverloadAbility(this, effect, new ManaCostsImpl("{6}{U}"))); + this.addAbility(new OverloadAbility(this, effect, new ManaCostsImpl<>("{6}{U}"))); } private CyclonicRift(final CyclonicRift card) { diff --git a/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java b/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java index f3a670722fb..d5228930c80 100644 --- a/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java +++ b/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java @@ -42,7 +42,7 @@ public final class CytoplastManipulator extends CardImpl { new GainControlTargetEffect(Duration.Custom, true), new SourceRemainsInZoneCondition(Zone.BATTLEFIELD), "gain control of target creature with a +1/+1 counter on it for as long as {this} remains on the battlefield"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CytospawnShambler.java b/Mage.Sets/src/mage/cards/c/CytospawnShambler.java index 7f6d1d0f13a..e1fd6c175d9 100644 --- a/Mage.Sets/src/mage/cards/c/CytospawnShambler.java +++ b/Mage.Sets/src/mage/cards/c/CytospawnShambler.java @@ -35,7 +35,7 @@ public final class CytospawnShambler extends CardImpl { this.addAbility(new GraftAbility(this, 6)); // {G}: Target creature with a +1/+1 counter on it gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1)); this.addAbility(ability); }