diff --git a/Mage.Sets/src/mage/cards/r/RadhaHeartOfKeld.java b/Mage.Sets/src/mage/cards/r/RadhaHeartOfKeld.java index f2e6fb023ff..7c164963151 100644 --- a/Mage.Sets/src/mage/cards/r/RadhaHeartOfKeld.java +++ b/Mage.Sets/src/mage/cards/r/RadhaHeartOfKeld.java @@ -59,7 +59,7 @@ public final class RadhaHeartOfKeld extends CardImpl { DynamicValue controlledLands = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_PERMANENT_LANDS); BoostSourceEffect bse = new BoostSourceEffect(controlledLands, controlledLands, Duration.EndOfTurn, true); bse.setText("Radha gets +X/+X until end of turn, where X is the number of lands you control"); - this.addAbility(new SimpleActivatedAbility(bse, new ManaCostsImpl("{4}{R}{G}"))); + this.addAbility(new SimpleActivatedAbility(bse, new ManaCostsImpl<>("{4}{R}{G}"))); } private RadhaHeartOfKeld(final RadhaHeartOfKeld card) { diff --git a/Mage.Sets/src/mage/cards/r/RadiantKavu.java b/Mage.Sets/src/mage/cards/r/RadiantKavu.java index b2da60dda7d..21707b1cabf 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantKavu.java +++ b/Mage.Sets/src/mage/cards/r/RadiantKavu.java @@ -36,7 +36,7 @@ public final class RadiantKavu extends CardImpl { // {R}{G}{W}: Prevent all combat damage blue creatures and black creatures would deal this turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, (new PreventAllDamageByAllPermanentsEffect(filter, - Duration.EndOfTurn, true)), new ManaCostsImpl("{R}{G}{W}"))); + Duration.EndOfTurn, true)), new ManaCostsImpl<>("{R}{G}{W}"))); } private RadiantKavu(final RadiantKavu card) { diff --git a/Mage.Sets/src/mage/cards/r/RadiantsJudgment.java b/Mage.Sets/src/mage/cards/r/RadiantsJudgment.java index e69b0ad7b1a..8ce18659009 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantsJudgment.java +++ b/Mage.Sets/src/mage/cards/r/RadiantsJudgment.java @@ -31,7 +31,7 @@ public final class RadiantsJudgment extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private RadiantsJudgment(final RadiantsJudgment card) { diff --git a/Mage.Sets/src/mage/cards/r/RafterDemon.java b/Mage.Sets/src/mage/cards/r/RafterDemon.java index c1a738c3f72..1ba33f62616 100644 --- a/Mage.Sets/src/mage/cards/r/RafterDemon.java +++ b/Mage.Sets/src/mage/cards/r/RafterDemon.java @@ -29,7 +29,7 @@ public final class RafterDemon extends CardImpl { this.toughness = new MageInt(2); // Spectacle {3}{B}{R} - this.addAbility(new SpectacleAbility(this, new ManaCostsImpl("{3}{B}{R}"))); + this.addAbility(new SpectacleAbility(this, new ManaCostsImpl<>("{3}{B}{R}"))); // When Rafter Demon enters the battlefield, if its spectacle cost was paid, each opponent discards a card. this.addAbility(new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/r/RagDealer.java b/Mage.Sets/src/mage/cards/r/RagDealer.java index 814845d0c03..fec9163fb01 100644 --- a/Mage.Sets/src/mage/cards/r/RagDealer.java +++ b/Mage.Sets/src/mage/cards/r/RagDealer.java @@ -30,7 +30,7 @@ public final class RagDealer 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/r/RagMan.java b/Mage.Sets/src/mage/cards/r/RagMan.java index e9c2d862c34..039cfe7805c 100644 --- a/Mage.Sets/src/mage/cards/r/RagMan.java +++ b/Mage.Sets/src/mage/cards/r/RagMan.java @@ -35,7 +35,7 @@ public final class RagMan extends CardImpl { this.toughness = new MageInt(1); // {B}{B}{B}, {T}: Target opponent reveals their hand and discards a creature card at random. Activate this ability only during your turn. - Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new RevealHandTargetEffect(), new ManaCostsImpl("{B}{B}{B}"), MyTurnCondition.instance); + Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new RevealHandTargetEffect(), new ManaCostsImpl<>("{B}{B}{B}"), MyTurnCondition.instance); ability.addCost(new TapSourceCost()); ability.addEffect(new RagManDiscardEffect()); ability.addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/cards/r/RageNimbus.java b/Mage.Sets/src/mage/cards/r/RageNimbus.java index 16dbff2a3cb..0943c7ccfcd 100644 --- a/Mage.Sets/src/mage/cards/r/RageNimbus.java +++ b/Mage.Sets/src/mage/cards/r/RageNimbus.java @@ -33,7 +33,7 @@ public final class RageNimbus extends CardImpl { this.addAbility(FlyingAbility.getInstance()); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn), - new ManaCostsImpl("{1}{R}")); + new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RagingRavine.java b/Mage.Sets/src/mage/cards/r/RagingRavine.java index 3216d5fd04e..0ae955d1b88 100644 --- a/Mage.Sets/src/mage/cards/r/RagingRavine.java +++ b/Mage.Sets/src/mage/cards/r/RagingRavine.java @@ -42,7 +42,7 @@ public final class RagingRavine extends CardImpl { "land", Duration.EndOfTurn); effect.setText("Until end of turn, {this} becomes a 3/3 red and green Elemental creature"); // {2}{R}{G}: Until end of turn, Raging Ravine becomes a 3/3 red and green Elemental creature with "Whenever this creature attacks, put a +1/+1 counter on it." It's still a land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{R}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{R}{G}")); effect = new GainAbilitySourceEffect(new AttacksTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false), Duration.EndOfTurn); effect.setText("with \"Whenever this creature attacks, put a +1/+1 counter on it.\" It's still a land"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RagingSpirit.java b/Mage.Sets/src/mage/cards/r/RagingSpirit.java index 281c702bd09..4e8fd9ea11e 100644 --- a/Mage.Sets/src/mage/cards/r/RagingSpirit.java +++ b/Mage.Sets/src/mage/cards/r/RagingSpirit.java @@ -27,7 +27,7 @@ public final class RagingSpirit extends CardImpl { this.toughness = new MageInt(3); // {2}: Raging Spirit becomes colorless until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(new ObjectColor(), Duration.EndOfTurn), new ManaCostsImpl("{2}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(new ObjectColor(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private RagingSpirit(final RagingSpirit card) { diff --git a/Mage.Sets/src/mage/cards/r/Ragnar.java b/Mage.Sets/src/mage/cards/r/Ragnar.java index a3b5a359c87..cd63fe95f4f 100644 --- a/Mage.Sets/src/mage/cards/r/Ragnar.java +++ b/Mage.Sets/src/mage/cards/r/Ragnar.java @@ -31,7 +31,7 @@ public final class Ragnar extends CardImpl { this.toughness = new MageInt(2); // {G}{W}{U}, {tap}: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{G}{W}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}{W}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RainbowCrow.java b/Mage.Sets/src/mage/cards/r/RainbowCrow.java index 633d2ec6640..0de48439e64 100644 --- a/Mage.Sets/src/mage/cards/r/RainbowCrow.java +++ b/Mage.Sets/src/mage/cards/r/RainbowCrow.java @@ -31,7 +31,7 @@ public final class RainbowCrow extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // // {1}: Rainbow Crow becomes the color of your choice until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } private RainbowCrow(final RainbowCrow card) { diff --git a/Mage.Sets/src/mage/cards/r/RainbowEfreet.java b/Mage.Sets/src/mage/cards/r/RainbowEfreet.java index 89b16a816a6..fde2f266746 100644 --- a/Mage.Sets/src/mage/cards/r/RainbowEfreet.java +++ b/Mage.Sets/src/mage/cards/r/RainbowEfreet.java @@ -29,7 +29,7 @@ public final class RainbowEfreet extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}{U}: Rainbow Efreet phases out. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhaseOutSourceEffect(), new ManaCostsImpl("{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhaseOutSourceEffect(), new ManaCostsImpl<>("{U}{U}"))); } private RainbowEfreet(final RainbowEfreet card) { diff --git a/Mage.Sets/src/mage/cards/r/RakdosCluestone.java b/Mage.Sets/src/mage/cards/r/RakdosCluestone.java index fbd4b9dcd05..f0ca410a806 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosCluestone.java +++ b/Mage.Sets/src/mage/cards/r/RakdosCluestone.java @@ -32,7 +32,7 @@ public final class RakdosCluestone extends CardImpl { this.addAbility(new RedManaAbility()); // {B}{R}, {T}, Sacrifice Rakdos Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{B}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java b/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java index 07c166f77c7..f7be44cc9a4 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java +++ b/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java @@ -36,13 +36,13 @@ public final class RakdosGuildmage extends CardImpl { // ({BR} can be paid with either {B} or {R}.) // {3}{B}, Discard a card: Target creature gets -2/-2 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl("{3}{B}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{B}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); // {3}{R}: Create a 2/1 red Goblin creature token with haste. Exile it at the beginning of the next end step. - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RakdosGuildmageEffect(), new ManaCostsImpl("{3}{R}")); + SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RakdosGuildmageEffect(), new ManaCostsImpl<>("{3}{R}")); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java b/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java index a1beb62c799..d06517f0969 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java +++ b/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java @@ -30,7 +30,7 @@ public final class RakdosKeyrune extends CardImpl { this.addAbility(new RedManaAbility()); // {B}{R}: Rakdos Keyrune becomes a 3/1 black and red Devil artifact creature with first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new RakdosKeyruneToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{B}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new RakdosKeyruneToken(), "", Duration.EndOfTurn), new ManaCostsImpl<>("{B}{R}"))); } private RakdosKeyrune(final RakdosKeyrune card) { diff --git a/Mage.Sets/src/mage/cards/r/RakdosRingleader.java b/Mage.Sets/src/mage/cards/r/RakdosRingleader.java index 7bd52e370f4..25d1c1d7a49 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosRingleader.java +++ b/Mage.Sets/src/mage/cards/r/RakdosRingleader.java @@ -36,7 +36,7 @@ public final class RakdosRingleader extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1, true), false, true)); // {B}: Regenerate Rakdos Ringleader. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private RakdosRingleader(final RakdosRingleader card) { diff --git a/Mage.Sets/src/mage/cards/r/RakdosTrumpeter.java b/Mage.Sets/src/mage/cards/r/RakdosTrumpeter.java index a72d29d3255..7c621be58bf 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosTrumpeter.java +++ b/Mage.Sets/src/mage/cards/r/RakdosTrumpeter.java @@ -31,7 +31,7 @@ public final class RakdosTrumpeter extends CardImpl { // {3}{R}: Rakdos Trumpeter gets +2/+0 until end of turn. this.addAbility(new SimpleActivatedAbility( - new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{3}{R}") + new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{R}") )); } diff --git a/Mage.Sets/src/mage/cards/r/RakeclawGargantuan.java b/Mage.Sets/src/mage/cards/r/RakeclawGargantuan.java index c1b554dfd9a..ed13a419cf2 100644 --- a/Mage.Sets/src/mage/cards/r/RakeclawGargantuan.java +++ b/Mage.Sets/src/mage/cards/r/RakeclawGargantuan.java @@ -39,7 +39,7 @@ public final class RakeclawGargantuan extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), - new ManaCostsImpl("{1}")); + new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RakingClaws.java b/Mage.Sets/src/mage/cards/r/RakingClaws.java index 334c12d5714..dcc129e744c 100644 --- a/Mage.Sets/src/mage/cards/r/RakingClaws.java +++ b/Mage.Sets/src/mage/cards/r/RakingClaws.java @@ -27,7 +27,7 @@ public final class RakingClaws extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private RakingClaws(final RakingClaws card) { diff --git a/Mage.Sets/src/mage/cards/r/RakshasaDeathdealer.java b/Mage.Sets/src/mage/cards/r/RakshasaDeathdealer.java index 581f851a081..aa87f6c7d46 100644 --- a/Mage.Sets/src/mage/cards/r/RakshasaDeathdealer.java +++ b/Mage.Sets/src/mage/cards/r/RakshasaDeathdealer.java @@ -29,9 +29,9 @@ public final class RakshasaDeathdealer extends CardImpl { this.toughness = new MageInt(2); // {B}{G}: Rakshasa Deathdealer gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2,2,Duration.EndOfTurn), new ManaCostsImpl("{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2,2,Duration.EndOfTurn), new ManaCostsImpl<>("{B}{G}"))); // {B}{G}: Regenerate Rakshasa Deathdealer. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}{G}"))); } private RakshasaDeathdealer(final RakshasaDeathdealer card) { diff --git a/Mage.Sets/src/mage/cards/r/RallyThePeasants.java b/Mage.Sets/src/mage/cards/r/RallyThePeasants.java index 5f75b77de9c..1a99f4fb0d7 100644 --- a/Mage.Sets/src/mage/cards/r/RallyThePeasants.java +++ b/Mage.Sets/src/mage/cards/r/RallyThePeasants.java @@ -24,7 +24,7 @@ public final class RallyThePeasants extends CardImpl { this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn)); // Flashback {2}{R} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{2}{R}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{2}{R}"))); } private RallyThePeasants(final RallyThePeasants card) { diff --git a/Mage.Sets/src/mage/cards/r/RampagingHippo.java b/Mage.Sets/src/mage/cards/r/RampagingHippo.java index 79cb6329dcd..1475e80564d 100644 --- a/Mage.Sets/src/mage/cards/r/RampagingHippo.java +++ b/Mage.Sets/src/mage/cards/r/RampagingHippo.java @@ -22,7 +22,7 @@ public final class RampagingHippo extends CardImpl { addAbility(TrampleAbility.getInstance()); // Cycling {2} - addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } public RampagingHippo(final RampagingHippo rampagingHippo){ diff --git a/Mage.Sets/src/mage/cards/r/RampantElephant.java b/Mage.Sets/src/mage/cards/r/RampantElephant.java index 267bbef6cbc..f932376d12e 100644 --- a/Mage.Sets/src/mage/cards/r/RampantElephant.java +++ b/Mage.Sets/src/mage/cards/r/RampantElephant.java @@ -27,7 +27,7 @@ public final class RampantElephant extends CardImpl { this.toughness = new MageInt(2); // {G}: Target creature blocks Rampant Elephant this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RamunapRuins.java b/Mage.Sets/src/mage/cards/r/RamunapRuins.java index c951916e69d..1f61ca20306 100644 --- a/Mage.Sets/src/mage/cards/r/RamunapRuins.java +++ b/Mage.Sets/src/mage/cards/r/RamunapRuins.java @@ -49,7 +49,7 @@ public final class RamunapRuins extends CardImpl { // {2}{R}{R}, {t}, Sacrifice a Desert: Ramunap Ruins deals 2 damage to each opponent. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(Outcome.Damage, StaticValue.get(2), TargetController.OPPONENT), - new ManaCostsImpl("{2}{R}{R}")); + new ManaCostsImpl<>("{2}{R}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, filter, true))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RankOfficer.java b/Mage.Sets/src/mage/cards/r/RankOfficer.java index a8fa8964710..5dc86a2f612 100644 --- a/Mage.Sets/src/mage/cards/r/RankOfficer.java +++ b/Mage.Sets/src/mage/cards/r/RankOfficer.java @@ -41,7 +41,7 @@ public final class RankOfficer extends CardImpl { // {1}{B}, {T}, Exile a creature card from your graveyard: Each opponent loses 2 life. Ability ability = new SimpleActivatedAbility( - new LoseLifeOpponentsEffect(2), new ManaCostsImpl("{1}{B}") + new LoseLifeOpponentsEffect(2), new ManaCostsImpl<>("{1}{B}") ); ability.addCost(new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard( diff --git a/Mage.Sets/src/mage/cards/r/RapidDecay.java b/Mage.Sets/src/mage/cards/r/RapidDecay.java index 58d9c221c3e..16f5575e7e0 100644 --- a/Mage.Sets/src/mage/cards/r/RapidDecay.java +++ b/Mage.Sets/src/mage/cards/r/RapidDecay.java @@ -24,7 +24,7 @@ public final class RapidDecay extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInASingleGraveyard(0, 3, StaticFilters.FILTER_CARD_CARDS)); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private RapidDecay(final RapidDecay card) { diff --git a/Mage.Sets/src/mage/cards/r/RappellingScouts.java b/Mage.Sets/src/mage/cards/r/RappellingScouts.java index 73c29310f18..f8aaf6a5432 100644 --- a/Mage.Sets/src/mage/cards/r/RappellingScouts.java +++ b/Mage.Sets/src/mage/cards/r/RappellingScouts.java @@ -31,7 +31,7 @@ public final class RappellingScouts extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}{W}: Rappelling Scouts gains protection from the color of your choice until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{2}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}"))); } private RappellingScouts(final RappellingScouts card) { diff --git a/Mage.Sets/src/mage/cards/r/RathiAssassin.java b/Mage.Sets/src/mage/cards/r/RathiAssassin.java index 59ec3cc4a0e..0b56a1cec60 100644 --- a/Mage.Sets/src/mage/cards/r/RathiAssassin.java +++ b/Mage.Sets/src/mage/cards/r/RathiAssassin.java @@ -53,7 +53,7 @@ public final class RathiAssassin extends CardImpl { this.toughness = new MageInt(2); // {1}{B}{B}, {T}: Destroy target tapped nonblack creature. - Ability destroyAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{B}{B}")); + Ability destroyAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{B}{B}")); destroyAbility.addCost(new TapSourceCost()); destroyAbility.addTarget(new TargetCreaturePermanent(destroyFilter)); this.addAbility(destroyAbility); diff --git a/Mage.Sets/src/mage/cards/r/RathiTrapper.java b/Mage.Sets/src/mage/cards/r/RathiTrapper.java index ee1bf8de541..c4fcd7f8b10 100644 --- a/Mage.Sets/src/mage/cards/r/RathiTrapper.java +++ b/Mage.Sets/src/mage/cards/r/RathiTrapper.java @@ -31,7 +31,7 @@ public final class RathiTrapper extends CardImpl { this.toughness = new MageInt(2); // {B}, {tap}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RattleclawMystic.java b/Mage.Sets/src/mage/cards/r/RattleclawMystic.java index 2a8fc3c49bc..6c33b7ac8b9 100644 --- a/Mage.Sets/src/mage/cards/r/RattleclawMystic.java +++ b/Mage.Sets/src/mage/cards/r/RattleclawMystic.java @@ -36,7 +36,7 @@ public final class RattleclawMystic extends CardImpl { this.addAbility(new RedManaAbility()); // Morph {2} - this.addAbility(new MorphAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}"))); // When Rattleclaw Mystic is turned face up, add {G}{U}{R}. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddManaToManaPoolSourceControllerEffect(new Mana(0, 1, 0, 1,1, 0,0, 0)))); diff --git a/Mage.Sets/src/mage/cards/r/RaugrinCrystal.java b/Mage.Sets/src/mage/cards/r/RaugrinCrystal.java index 0aec12f3edb..61762a434cc 100644 --- a/Mage.Sets/src/mage/cards/r/RaugrinCrystal.java +++ b/Mage.Sets/src/mage/cards/r/RaugrinCrystal.java @@ -25,7 +25,7 @@ public final class RaugrinCrystal extends CardImpl { this.addAbility(new WhiteManaAbility()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private RaugrinCrystal(final RaugrinCrystal card) { diff --git a/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java b/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java index 25d2eae10ef..7789d5eb018 100644 --- a/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java +++ b/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java @@ -30,7 +30,7 @@ public final class RavenGuildMaster extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ExileCardsFromTopOfLibraryTargetEffect(10, "that player"), false, true)); // Morph {2}{U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}{U}"))); } private RavenGuildMaster(final RavenGuildMaster card) { diff --git a/Mage.Sets/src/mage/cards/r/RavenousTrap.java b/Mage.Sets/src/mage/cards/r/RavenousTrap.java index 2ecbd0014c4..150cba260ab 100644 --- a/Mage.Sets/src/mage/cards/r/RavenousTrap.java +++ b/Mage.Sets/src/mage/cards/r/RavenousTrap.java @@ -27,7 +27,7 @@ public final class RavenousTrap extends CardImpl { this.subtype.add(SubType.TRAP); // If an opponent had three or more cards put into their graveyard from anywhere this turn, you may pay {0} rather than pay Ravenous Trap's mana cost. - this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{0}"), RavenousTrapCondition.instance), new CardsPutIntoGraveyardWatcher()); + this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl<>("{0}"), RavenousTrapCondition.instance), new CardsPutIntoGraveyardWatcher()); // Exile all cards from target player's graveyard. this.getSpellAbility().addEffect(new ExileGraveyardAllTargetPlayerEffect()); diff --git a/Mage.Sets/src/mage/cards/r/RayOfDistortion.java b/Mage.Sets/src/mage/cards/r/RayOfDistortion.java index 05d26a65545..3f4b741d97a 100644 --- a/Mage.Sets/src/mage/cards/r/RayOfDistortion.java +++ b/Mage.Sets/src/mage/cards/r/RayOfDistortion.java @@ -26,7 +26,7 @@ public final class RayOfDistortion extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); // Flashback {4}{W}{W} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{4}{W}{W}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{4}{W}{W}"))); } private RayOfDistortion(final RayOfDistortion card) { diff --git a/Mage.Sets/src/mage/cards/r/RayOfRevelation.java b/Mage.Sets/src/mage/cards/r/RayOfRevelation.java index c6747afdf4b..f4d2416f1d5 100644 --- a/Mage.Sets/src/mage/cards/r/RayOfRevelation.java +++ b/Mage.Sets/src/mage/cards/r/RayOfRevelation.java @@ -25,7 +25,7 @@ public final class RayOfRevelation extends CardImpl { this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); // Flashback {G} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{G}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{G}"))); } private RayOfRevelation(final RayOfRevelation card) { diff --git a/Mage.Sets/src/mage/cards/r/RazakethsRite.java b/Mage.Sets/src/mage/cards/r/RazakethsRite.java index dbca2ec74e8..a80620f451f 100644 --- a/Mage.Sets/src/mage/cards/r/RazakethsRite.java +++ b/Mage.Sets/src/mage/cards/r/RazakethsRite.java @@ -21,7 +21,7 @@ public final class RazakethsRite extends CardImpl { // Cycling {B} - addAbility(new CyclingAbility(new ManaCostsImpl("{B}"))); + addAbility(new CyclingAbility(new ManaCostsImpl<>("{B}"))); } public RazakethsRite(final RazakethsRite razakethsRite){ diff --git a/Mage.Sets/src/mage/cards/r/RazorfinAbolisher.java b/Mage.Sets/src/mage/cards/r/RazorfinAbolisher.java index 38e53cd3f31..52d466341f4 100644 --- a/Mage.Sets/src/mage/cards/r/RazorfinAbolisher.java +++ b/Mage.Sets/src/mage/cards/r/RazorfinAbolisher.java @@ -39,7 +39,7 @@ public final class RazorfinAbolisher extends CardImpl { this.toughness = new MageInt(2); // {1}{U}, {tap}: Return target creature with a counter on it 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.addCost(new TapSourceCost()); Target target = new TargetCreaturePermanent(filter); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/r/RazortipWhip.java b/Mage.Sets/src/mage/cards/r/RazortipWhip.java index 4d4cdc24637..2ed2549ece5 100644 --- a/Mage.Sets/src/mage/cards/r/RazortipWhip.java +++ b/Mage.Sets/src/mage/cards/r/RazortipWhip.java @@ -23,7 +23,7 @@ public final class RazortipWhip extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {1}, {tap}: Razortip Whip deals 1 damage to target opponent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponentOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RealityTwist.java b/Mage.Sets/src/mage/cards/r/RealityTwist.java index 4308ac7893b..669cfb695e6 100644 --- a/Mage.Sets/src/mage/cards/r/RealityTwist.java +++ b/Mage.Sets/src/mage/cards/r/RealityTwist.java @@ -31,7 +31,7 @@ public final class RealityTwist extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{U}{U}{U}"); // Cumulative upkeep-Pay {1}{U}{U}. - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}{U}{U}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}{U}{U}"))); // If tapped for mana, Plains produce {R}, Swamps produce {G}, Mountains produce {W}, and Forests produce {B} instead of any other type. this.addAbility(new SimpleStaticAbility(new RealityTwistEffect())); diff --git a/Mage.Sets/src/mage/cards/r/ReapTheSeagraf.java b/Mage.Sets/src/mage/cards/r/ReapTheSeagraf.java index 8cfa7c141a6..5b89062cc1d 100644 --- a/Mage.Sets/src/mage/cards/r/ReapTheSeagraf.java +++ b/Mage.Sets/src/mage/cards/r/ReapTheSeagraf.java @@ -19,7 +19,7 @@ public final class ReapTheSeagraf extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}"); this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken())); - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{4}{U}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{4}{U}"))); } private ReapTheSeagraf(final ReapTheSeagraf card) { diff --git a/Mage.Sets/src/mage/cards/r/ReaperOfTheWilds.java b/Mage.Sets/src/mage/cards/r/ReaperOfTheWilds.java index 6d72051c9af..bb74c64aa27 100644 --- a/Mage.Sets/src/mage/cards/r/ReaperOfTheWilds.java +++ b/Mage.Sets/src/mage/cards/r/ReaperOfTheWilds.java @@ -33,9 +33,9 @@ public final class ReaperOfTheWilds extends CardImpl { // Whenever another creature dies, scry 1. this.addAbility(new DiesCreatureTriggeredAbility(new ScryEffect(1), false, true)); // {B}: Reaper of the Wilds gains deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); // {1}{G}: Reaper of the Wilds gains hexproof until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private ReaperOfTheWilds(final ReaperOfTheWilds card) { diff --git a/Mage.Sets/src/mage/cards/r/ReassemblingSkeleton.java b/Mage.Sets/src/mage/cards/r/ReassemblingSkeleton.java index d6f6fd7107e..9e47f305d6b 100644 --- a/Mage.Sets/src/mage/cards/r/ReassemblingSkeleton.java +++ b/Mage.Sets/src/mage/cards/r/ReassemblingSkeleton.java @@ -27,7 +27,7 @@ public final class ReassemblingSkeleton extends CardImpl { this.toughness = new MageInt(1); // {1}{B}: Return Reassembling Skeleton from your graveyard to the battlefield tapped. - this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true, false), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true, false), new ManaCostsImpl<>("{1}{B}"))); } private ReassemblingSkeleton(final ReassemblingSkeleton card) { diff --git a/Mage.Sets/src/mage/cards/r/RebornHero.java b/Mage.Sets/src/mage/cards/r/RebornHero.java index ec06ada1510..ceaf07f5b33 100644 --- a/Mage.Sets/src/mage/cards/r/RebornHero.java +++ b/Mage.Sets/src/mage/cards/r/RebornHero.java @@ -42,7 +42,7 @@ public final class RebornHero extends CardImpl { Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(new DiesSourceTriggeredAbility(new DoIfCostPaid( - new ReturnSourceFromGraveyardToBattlefieldEffect(), new ManaCostsImpl("{W}{W}") + new ReturnSourceFromGraveyardToBattlefieldEffect(), new ManaCostsImpl<>("{W}{W}") ))), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, " diff --git a/Mage.Sets/src/mage/cards/r/Rebuild.java b/Mage.Sets/src/mage/cards/r/Rebuild.java index fec3791e648..169b472e85b 100644 --- a/Mage.Sets/src/mage/cards/r/Rebuild.java +++ b/Mage.Sets/src/mage/cards/r/Rebuild.java @@ -23,7 +23,7 @@ public final class Rebuild extends CardImpl { // Return all artifacts to their owners' hands. this.getSpellAbility().addEffect(new ReturnToHandFromBattlefieldAllEffect(new FilterArtifactPermanent("artifacts"))); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private Rebuild(final Rebuild card) { diff --git a/Mage.Sets/src/mage/cards/r/Recantation.java b/Mage.Sets/src/mage/cards/r/Recantation.java index 51a3e7bd05a..54bc02834e8 100644 --- a/Mage.Sets/src/mage/cards/r/Recantation.java +++ b/Mage.Sets/src/mage/cards/r/Recantation.java @@ -35,7 +35,7 @@ public final class Recantation extends CardImpl { // {U}, Sacrifice Recantation: Return up to X target permanents to their owners' hands, where X is the number of verse counters on Recantation. Effect effect = new ReturnToHandTargetEffect(true); effect.setText("Return up to X target permanents to their owners' hands, where X is the number of verse counters on {this}."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(0, 0, new FilterPermanent("up to X target permanents, where X is the number of verse counters on {this}."), false)); ability.setTargetAdjuster(VerseCounterAdjuster.instance); diff --git a/Mage.Sets/src/mage/cards/r/RecklessAmplimancer.java b/Mage.Sets/src/mage/cards/r/RecklessAmplimancer.java index 5cc9bf28074..6d30b4aff0f 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessAmplimancer.java +++ b/Mage.Sets/src/mage/cards/r/RecklessAmplimancer.java @@ -33,7 +33,7 @@ public final class RecklessAmplimancer extends CardImpl { // {4}{G}: Double Reckless Amplimancer's power and toughness until end of turn. this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect( sourcePower, SourcePermanentToughnessValue.getInstance(), Duration.EndOfTurn, true - ).setText("double {this}'s power and toughness until end of turn"), new ManaCostsImpl("{4}{G}"))); + ).setText("double {this}'s power and toughness until end of turn"), new ManaCostsImpl<>("{4}{G}"))); } private RecklessAmplimancer(final RecklessAmplimancer card) { diff --git a/Mage.Sets/src/mage/cards/r/RecklessAssault.java b/Mage.Sets/src/mage/cards/r/RecklessAssault.java index 2b84ff1c71c..a84a9b4ead0 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessAssault.java +++ b/Mage.Sets/src/mage/cards/r/RecklessAssault.java @@ -24,7 +24,7 @@ public final class RecklessAssault extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}{R}"); // {1}, Pay 2 life: Reckless Assault deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); ability.addCost(new PayLifeCost(2)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java b/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java index 19b9ce0212f..cbfe2217922 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java +++ b/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java @@ -30,7 +30,7 @@ public final class RecklessEmbermage extends CardImpl { this.toughness = new MageInt(2); // {1}{R}: Reckless Embermage deals 1 damage to any target and 1 damage to itself. - 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.addEffect(new DamageSelfEffect(1)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RecklessReveler.java b/Mage.Sets/src/mage/cards/r/RecklessReveler.java index ca1fcbcc1c9..42864228173 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessReveler.java +++ b/Mage.Sets/src/mage/cards/r/RecklessReveler.java @@ -29,7 +29,7 @@ public final class RecklessReveler extends CardImpl { this.toughness = new MageInt(1); // {R}, Sacrifice Reckless Reveler: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/cards/r/RecklessWurm.java b/Mage.Sets/src/mage/cards/r/RecklessWurm.java index 6c9452912a0..3281beb4616 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessWurm.java +++ b/Mage.Sets/src/mage/cards/r/RecklessWurm.java @@ -28,7 +28,7 @@ public final class RecklessWurm extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Madness {2}{R} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{2}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{2}{R}"))); } private RecklessWurm(final RecklessWurm card) { diff --git a/Mage.Sets/src/mage/cards/r/Reconnaissance.java b/Mage.Sets/src/mage/cards/r/Reconnaissance.java index 617a4f11713..298b8db5a33 100644 --- a/Mage.Sets/src/mage/cards/r/Reconnaissance.java +++ b/Mage.Sets/src/mage/cards/r/Reconnaissance.java @@ -34,7 +34,7 @@ public final class Reconnaissance extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}"); // {0}: Remove target attacking creature you control from combat and untap it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReconnaissanceRemoveFromCombatEffect(), new ManaCostsImpl("{0}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReconnaissanceRemoveFromCombatEffect(), new ManaCostsImpl<>("{0}")); ability.addTarget(new TargetControlledCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/ReconnaissanceMission.java b/Mage.Sets/src/mage/cards/r/ReconnaissanceMission.java index 6ffe195fe0e..d50525f9e13 100644 --- a/Mage.Sets/src/mage/cards/r/ReconnaissanceMission.java +++ b/Mage.Sets/src/mage/cards/r/ReconnaissanceMission.java @@ -28,7 +28,7 @@ public final class ReconnaissanceMission extends CardImpl { )); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private ReconnaissanceMission(final ReconnaissanceMission card) { diff --git a/Mage.Sets/src/mage/cards/r/ReforgeTheSoul.java b/Mage.Sets/src/mage/cards/r/ReforgeTheSoul.java index 74f28df07a2..55025f9f91e 100644 --- a/Mage.Sets/src/mage/cards/r/ReforgeTheSoul.java +++ b/Mage.Sets/src/mage/cards/r/ReforgeTheSoul.java @@ -27,7 +27,7 @@ public final class ReforgeTheSoul extends CardImpl { this.getSpellAbility().addEffect(effect); // Miracle {1}{R} - this.addAbility(new MiracleAbility(this, new ManaCostsImpl("{1}{R}"))); + this.addAbility(new MiracleAbility(this, new ManaCostsImpl<>("{1}{R}"))); } private ReforgeTheSoul(final ReforgeTheSoul card) { diff --git a/Mage.Sets/src/mage/cards/r/RefractionTrap.java b/Mage.Sets/src/mage/cards/r/RefractionTrap.java index f0af5d69b50..defc5833ffb 100644 --- a/Mage.Sets/src/mage/cards/r/RefractionTrap.java +++ b/Mage.Sets/src/mage/cards/r/RefractionTrap.java @@ -36,7 +36,7 @@ public final class RefractionTrap extends CardImpl { this.subtype.add(SubType.TRAP); // If an opponent cast a red instant or sorcery spell this turn, you may pay {W} rather than pay Refraction Trap's mana cost. - this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{W}"), RefractionTrapCondition.instance), new SpellsCastWatcher()); + this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl<>("{W}"), RefractionTrapCondition.instance), new SpellsCastWatcher()); // Prevent the next 3 damage that a source of your choice would deal to you and/or permanents you control this turn. If damage is prevented this way, Refraction Trap deals that much damage to any target. this.getSpellAbility().addEffect(new RefractionTrapPreventDamageEffect(Duration.EndOfTurn, 3)); diff --git a/Mage.Sets/src/mage/cards/r/Regeneration.java b/Mage.Sets/src/mage/cards/r/Regeneration.java index 9865fed1414..366e6f000eb 100644 --- a/Mage.Sets/src/mage/cards/r/Regeneration.java +++ b/Mage.Sets/src/mage/cards/r/Regeneration.java @@ -31,7 +31,7 @@ public final class Regeneration extends CardImpl { this.addAbility(ability); // {G}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl("{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{G}"))); } private Regeneration(final Regeneration card) { diff --git a/Mage.Sets/src/mage/cards/r/Rejuvenate.java b/Mage.Sets/src/mage/cards/r/Rejuvenate.java index c6035974bc4..d0dcc18b83e 100644 --- a/Mage.Sets/src/mage/cards/r/Rejuvenate.java +++ b/Mage.Sets/src/mage/cards/r/Rejuvenate.java @@ -20,7 +20,7 @@ public final class Rejuvenate extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}"); this.getSpellAbility().addEffect(new GainLifeEffect(6)); - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } public Rejuvenate (final Rejuvenate card) { diff --git a/Mage.Sets/src/mage/cards/r/RelentlessDead.java b/Mage.Sets/src/mage/cards/r/RelentlessDead.java index 4a562026809..6df3e635bd0 100644 --- a/Mage.Sets/src/mage/cards/r/RelentlessDead.java +++ b/Mage.Sets/src/mage/cards/r/RelentlessDead.java @@ -37,7 +37,7 @@ public final class RelentlessDead extends CardImpl { this.addAbility(new MenaceAbility()); // When Relentless Dead dies, you may pay {B}. If you do, return it to its owner's hand. - this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(new ReturnToHandSourceEffect().setText("return it to its owner's hand"), new ManaCostsImpl("{B}")))); + this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(new ReturnToHandSourceEffect().setText("return it to its owner's hand"), new ManaCostsImpl<>("{B}")))); // When Relentless Dead dies, you may pay {X}. If you do, return another target Zombie creature card with converted mana cost X from your graveyard to the battlefield. this.addAbility(new DiesSourceTriggeredAbility(new RelentlessDeadEffect())); diff --git a/Mage.Sets/src/mage/cards/r/RelentlessHunter.java b/Mage.Sets/src/mage/cards/r/RelentlessHunter.java index b8bd50fd085..bd20f4310d5 100644 --- a/Mage.Sets/src/mage/cards/r/RelentlessHunter.java +++ b/Mage.Sets/src/mage/cards/r/RelentlessHunter.java @@ -33,7 +33,7 @@ public final class RelentlessHunter extends CardImpl { // {1}{R}{G}: Relentless Hunter gets +1/+1 and gains trample until end of turn. Effect effect1 = new BoostSourceEffect(1, 1, Duration.EndOfTurn); effect1.setText("{this} gets +1/+1"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect1, new ManaCostsImpl("{1}{R}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect1, new ManaCostsImpl<>("{1}{R}{G}")); Effect effect2 = new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect2.setText("and gains trample until end of turn"); ability.addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/r/RemoteIsle.java b/Mage.Sets/src/mage/cards/r/RemoteIsle.java index f805bb4d5d2..ac0a771175f 100644 --- a/Mage.Sets/src/mage/cards/r/RemoteIsle.java +++ b/Mage.Sets/src/mage/cards/r/RemoteIsle.java @@ -22,7 +22,7 @@ public final class RemoteIsle extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new BlueManaAbility()); - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private RemoteIsle(final RemoteIsle card) { diff --git a/Mage.Sets/src/mage/cards/r/RenewedFaith.java b/Mage.Sets/src/mage/cards/r/RenewedFaith.java index 41a6555a1fb..da3a5b9767c 100644 --- a/Mage.Sets/src/mage/cards/r/RenewedFaith.java +++ b/Mage.Sets/src/mage/cards/r/RenewedFaith.java @@ -23,7 +23,7 @@ public final class RenewedFaith extends CardImpl { // You gain 6 life. this.getSpellAbility().addEffect(new GainLifeEffect(6)); // Cycling {1}{W} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{W}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{W}"))); // When you cycle Renewed Faith, you may gain 2 life. this.addAbility(new CycleTriggeredAbility(new GainLifeEffect(2), true)); } diff --git a/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java b/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java index 15d9b60bcba..20378d44614 100644 --- a/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java +++ b/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java @@ -42,7 +42,7 @@ public final class RenownedWeaponsmith extends CardImpl { this.addAbility(new ConditionalColorlessManaAbility(new TapSourceCost(), 2, new RenownedWeaponsmithManaBuilder())); // {U}, {T}: Search your library for a card named Heart-Piercer Bow or Vial of Dragonfire, reveal it, put it into your hand, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RenownedWeaponsmithEffect(), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RenownedWeaponsmithEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RenownedWeaver.java b/Mage.Sets/src/mage/cards/r/RenownedWeaver.java index bc40044498d..6ebc3031b62 100644 --- a/Mage.Sets/src/mage/cards/r/RenownedWeaver.java +++ b/Mage.Sets/src/mage/cards/r/RenownedWeaver.java @@ -30,7 +30,7 @@ public final class RenownedWeaver extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, Sacrifice Renowned Weaver: Create a 1/3 green Spider enchantment creature token with reach. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new RenownedWeaverSpiderToken(), 1), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new RenownedWeaverSpiderToken(), 1), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java b/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java index 3ecbae23a81..52a2eb7e75c 100644 --- a/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java +++ b/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java @@ -32,7 +32,7 @@ public final class RepeatingBarrage extends CardImpl { // Raid — {3}{R}{R}: Return Repeating Barrage from your graveyard to your hand. Activate this ability only if you attacked this turn. Ability ability = new ConditionalActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), - new ManaCostsImpl("{3}{R}{R}"), + new ManaCostsImpl<>("{3}{R}{R}"), RaidCondition.instance); ability.setAbilityWord(AbilityWord.RAID); ability.addHint(RaidHint.instance); diff --git a/Mage.Sets/src/mage/cards/r/Repopulate.java b/Mage.Sets/src/mage/cards/r/Repopulate.java index cad8a276739..c2f2158e751 100644 --- a/Mage.Sets/src/mage/cards/r/Repopulate.java +++ b/Mage.Sets/src/mage/cards/r/Repopulate.java @@ -28,7 +28,7 @@ public final class Repopulate extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new RepopulateEffect()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private Repopulate(final Repopulate card) { diff --git a/Mage.Sets/src/mage/cards/r/Rescind.java b/Mage.Sets/src/mage/cards/r/Rescind.java index c6f4eedacfe..0687d9f2cf5 100644 --- a/Mage.Sets/src/mage/cards/r/Rescind.java +++ b/Mage.Sets/src/mage/cards/r/Rescind.java @@ -21,7 +21,7 @@ public final class Rescind extends CardImpl { this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent()); - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private Rescind(final Rescind card) { diff --git a/Mage.Sets/src/mage/cards/r/ResearchAssistant.java b/Mage.Sets/src/mage/cards/r/ResearchAssistant.java index 37c85b78d95..8b5b9203e4b 100644 --- a/Mage.Sets/src/mage/cards/r/ResearchAssistant.java +++ b/Mage.Sets/src/mage/cards/r/ResearchAssistant.java @@ -29,7 +29,7 @@ public final class ResearchAssistant extends CardImpl { this.toughness = new MageInt(3); // {3}{U}, {T}: Draw a card, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl("{3}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/ResilientKhenra.java b/Mage.Sets/src/mage/cards/r/ResilientKhenra.java index 5ac15d6f359..ee2df1a26e6 100644 --- a/Mage.Sets/src/mage/cards/r/ResilientKhenra.java +++ b/Mage.Sets/src/mage/cards/r/ResilientKhenra.java @@ -38,7 +38,7 @@ public final class ResilientKhenra extends CardImpl { this.addAbility(ability); // Eternalize {4}{G}{G} - this.addAbility(new EternalizeAbility(new ManaCostsImpl("{4}{G}{G}"), this)); + this.addAbility(new EternalizeAbility(new ManaCostsImpl<>("{4}{G}{G}"), this)); } diff --git a/Mage.Sets/src/mage/cards/r/Resistance.java b/Mage.Sets/src/mage/cards/r/Resistance.java index 2ea727107c6..43d9adda5b6 100644 --- a/Mage.Sets/src/mage/cards/r/Resistance.java +++ b/Mage.Sets/src/mage/cards/r/Resistance.java @@ -34,7 +34,7 @@ public final class Resistance extends CardImpl { Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn) .setText("Target creature gains haste until end of turn"), - new ManaCostsImpl("{R}{W}")); + new ManaCostsImpl<>("{R}{W}")); ability.addEffect(new AttacksIfAbleTargetEffect(Duration.EndOfTurn).setText("and must attack")); //ability.addEffect(new GainAbilityTargetEffect(AttacksThisTurnMarkerAbility.getInstance(), Duration.EndOfTurn, "").setText("")); ability.addEffect(new BlocksIfAbleTargetEffect(Duration.EndOfTurn).setText("or block this turn if able")); diff --git a/Mage.Sets/src/mage/cards/r/Resize.java b/Mage.Sets/src/mage/cards/r/Resize.java index 08f4d80315f..f8a9ed29cd2 100644 --- a/Mage.Sets/src/mage/cards/r/Resize.java +++ b/Mage.Sets/src/mage/cards/r/Resize.java @@ -25,7 +25,7 @@ public final class Resize extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); // Recover {1}{G} - this.addAbility(new RecoverAbility(new ManaCostsImpl("{1}{G}"), this)); + this.addAbility(new RecoverAbility(new ManaCostsImpl<>("{1}{G}"), this)); } private Resize(final Resize card) { diff --git a/Mage.Sets/src/mage/cards/r/ResoluteRider.java b/Mage.Sets/src/mage/cards/r/ResoluteRider.java index ed3b33441ed..182e235cc00 100644 --- a/Mage.Sets/src/mage/cards/r/ResoluteRider.java +++ b/Mage.Sets/src/mage/cards/r/ResoluteRider.java @@ -30,12 +30,12 @@ public final class ResoluteRider extends CardImpl { // {W/B}{W/B}: Resolute Rider gains lifelink until end of turn. this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect( LifelinkAbility.getInstance(), Duration.EndOfTurn - ), new ManaCostsImpl("{W/B}{W/B}"))); + ), new ManaCostsImpl<>("{W/B}{W/B}"))); // {W/B}{W/B}{W/B}: Resolute Rider gains indestructible until end of turn. this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect( IndestructibleAbility.getInstance(), Duration.EndOfTurn - ), new ManaCostsImpl("{W/B}{W/B}{W/B}"))); + ), new ManaCostsImpl<>("{W/B}{W/B}{W/B}"))); } private ResoluteRider(final ResoluteRider card) { diff --git a/Mage.Sets/src/mage/cards/r/ResoundingRoar.java b/Mage.Sets/src/mage/cards/r/ResoundingRoar.java index ab11b09d4c3..8d514e25d88 100644 --- a/Mage.Sets/src/mage/cards/r/ResoundingRoar.java +++ b/Mage.Sets/src/mage/cards/r/ResoundingRoar.java @@ -27,7 +27,7 @@ public final class ResoundingRoar extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Cycling {5}{R}{G}{W} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{R}{G}{W}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{5}{R}{G}{W}"))); // When you cycle Resounding Roar, target creature gets +6/+6 until end of turn. Ability ability = new CycleTriggeredAbility(new BoostTargetEffect(6, 6, Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/r/ResoundingScream.java b/Mage.Sets/src/mage/cards/r/ResoundingScream.java index 5a7096af497..64ef89a4591 100644 --- a/Mage.Sets/src/mage/cards/r/ResoundingScream.java +++ b/Mage.Sets/src/mage/cards/r/ResoundingScream.java @@ -26,7 +26,7 @@ public final class ResoundingScream extends CardImpl { this.getSpellAbility().addEffect(new DiscardTargetEffect(1, true)); this.getSpellAbility().addTarget(new TargetPlayer()); // Cycling {5}{U}{B}{R} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{U}{B}{R}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{5}{U}{B}{R}"))); // When you cycle Resounding Scream, target player discards two cards at random. Ability ability = new CycleTriggeredAbility(new DiscardTargetEffect(2, true)); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/r/ResoundingSilence.java b/Mage.Sets/src/mage/cards/r/ResoundingSilence.java index ffab78300fe..a274167cb85 100644 --- a/Mage.Sets/src/mage/cards/r/ResoundingSilence.java +++ b/Mage.Sets/src/mage/cards/r/ResoundingSilence.java @@ -26,7 +26,7 @@ public final class ResoundingSilence extends CardImpl { this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetAttackingCreature()); // Cycling {5}{G}{W}{U} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{G}{W}{U}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{5}{G}{W}{U}"))); // When you cycle Resounding Silence, exile up to two target attacking creatures. Ability ability = new CycleTriggeredAbility(new ExileTargetEffect()); ability.addTarget(new TargetPermanent(0, 2, StaticFilters.FILTER_ATTACKING_CREATURES)); diff --git a/Mage.Sets/src/mage/cards/r/ResoundingThunder.java b/Mage.Sets/src/mage/cards/r/ResoundingThunder.java index 7bb9b7ebc3d..36fb74dd6f4 100644 --- a/Mage.Sets/src/mage/cards/r/ResoundingThunder.java +++ b/Mage.Sets/src/mage/cards/r/ResoundingThunder.java @@ -26,7 +26,7 @@ public final class ResoundingThunder extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Cycling {5}{B}{R}{G} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{B}{R}{G}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{5}{B}{R}{G}"))); // When you cycle Resounding Thunder, it deals 6 damage to any target. Ability ability = new CycleTriggeredAbility(new DamageTargetEffect(6, "it")); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/r/ResoundingWave.java b/Mage.Sets/src/mage/cards/r/ResoundingWave.java index 33c7eef4a0c..26292fe31ae 100644 --- a/Mage.Sets/src/mage/cards/r/ResoundingWave.java +++ b/Mage.Sets/src/mage/cards/r/ResoundingWave.java @@ -26,7 +26,7 @@ public final class ResoundingWave extends CardImpl { this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent()); // Cycling {5}{W}{U}{B} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{W}{U}{B}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{5}{W}{U}{B}"))); // When you cycle Resounding Wave, return two target permanents to their owners' hands. Ability ability = new CycleTriggeredAbility(new ReturnToHandTargetEffect()); TargetPermanent target = new TargetPermanent(2, StaticFilters.FILTER_PERMANENTS); diff --git a/Mage.Sets/src/mage/cards/r/ResplendentAngel.java b/Mage.Sets/src/mage/cards/r/ResplendentAngel.java index eef76d1ec91..04ea0d6e767 100644 --- a/Mage.Sets/src/mage/cards/r/ResplendentAngel.java +++ b/Mage.Sets/src/mage/cards/r/ResplendentAngel.java @@ -44,7 +44,7 @@ public final class ResplendentAngel extends CardImpl { // {3}{W}{W}{W}: Until end of turn, Resplendent Angel gets +2/+2 and gains lifelink. Ability ability = new SimpleActivatedAbility(new BoostSourceEffect( 2, 2, Duration.EndOfTurn - ).setText("until end of turn, {this} gets +2/+2"), new ManaCostsImpl("{3}{W}{W}{W}")); + ).setText("until end of turn, {this} gets +2/+2"), new ManaCostsImpl<>("{3}{W}{W}{W}")); ability.addEffect(new GainAbilitySourceEffect( LifelinkAbility.getInstance(), Duration.EndOfTurn ).setText("and gains lifelink")); diff --git a/Mage.Sets/src/mage/cards/r/RestlessApparition.java b/Mage.Sets/src/mage/cards/r/RestlessApparition.java index c8bf7cffa7c..b4c37445ce1 100644 --- a/Mage.Sets/src/mage/cards/r/RestlessApparition.java +++ b/Mage.Sets/src/mage/cards/r/RestlessApparition.java @@ -28,7 +28,7 @@ public final class RestlessApparition extends CardImpl { this.toughness = new MageInt(2); // {WB}{WB}{WB}: Restless Apparition gets +3/+3 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl("{W/B}{W/B}{W/B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}{W/B}{W/B}"))); // Persist this.addAbility(new PersistAbility()); } diff --git a/Mage.Sets/src/mage/cards/r/RestlessBones.java b/Mage.Sets/src/mage/cards/r/RestlessBones.java index cd8ee8623b9..0d085aae1f3 100644 --- a/Mage.Sets/src/mage/cards/r/RestlessBones.java +++ b/Mage.Sets/src/mage/cards/r/RestlessBones.java @@ -30,11 +30,11 @@ public final class RestlessBones extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl("{3}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - 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 RestlessBones(final RestlessBones card) { diff --git a/Mage.Sets/src/mage/cards/r/RestlessDead.java b/Mage.Sets/src/mage/cards/r/RestlessDead.java index f56d9862a24..9f02b735320 100644 --- a/Mage.Sets/src/mage/cards/r/RestlessDead.java +++ b/Mage.Sets/src/mage/cards/r/RestlessDead.java @@ -26,7 +26,7 @@ public final class RestlessDead extends CardImpl { this.toughness = new MageInt(1); // {B}: Regenerate Restless Dead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private RestlessDead(final RestlessDead card) { diff --git a/Mage.Sets/src/mage/cards/r/RestorationSpecialist.java b/Mage.Sets/src/mage/cards/r/RestorationSpecialist.java index 82f1de4cbb2..f2acabba2a1 100644 --- a/Mage.Sets/src/mage/cards/r/RestorationSpecialist.java +++ b/Mage.Sets/src/mage/cards/r/RestorationSpecialist.java @@ -35,7 +35,7 @@ public final class RestorationSpecialist extends CardImpl { // {W}, Sacrifice Restoration Specialist: Return up to one target artifact card and up to one target enchantment card from your graveyard to your hand. Effect effect = new ReturnToHandTargetEffect(true); effect.setText("Return up to one target artifact card and up to one target enchantment card from your graveyard to your hand"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetCardInGraveyard(0, 1, StaticFilters.FILTER_CARD_ARTIFACT_FROM_YOUR_GRAVEYARD)); ability.addTarget(new TargetCardInGraveyard(0, 1, new FilterEnchantmentCard("enchantment card from your graveyard"))); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/r/RetributionOfTheAncients.java b/Mage.Sets/src/mage/cards/r/RetributionOfTheAncients.java index 998e2336445..c07ea2ee0a8 100644 --- a/Mage.Sets/src/mage/cards/r/RetributionOfTheAncients.java +++ b/Mage.Sets/src/mage/cards/r/RetributionOfTheAncients.java @@ -29,7 +29,7 @@ public final class RetributionOfTheAncients extends CardImpl { // {B}, Remove X +1/+1 counters from among creatures you control: Target creature gets -X/-X until end of turn. DynamicValue xValue = new SignInversionDynamicValue(GetXValue.instance); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(xValue, xValue, Duration.EndOfTurn, true), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(xValue, xValue, Duration.EndOfTurn, true), new ManaCostsImpl<>("{B}")); ability.addCost(new RemoveVariableCountersTargetCost(StaticFilters.FILTER_CONTROLLED_CREATURES, CounterType.P1P1, "X", 0)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/ReturnedPhalanx.java b/Mage.Sets/src/mage/cards/r/ReturnedPhalanx.java index 8d0a35246c6..1e08686c095 100644 --- a/Mage.Sets/src/mage/cards/r/ReturnedPhalanx.java +++ b/Mage.Sets/src/mage/cards/r/ReturnedPhalanx.java @@ -31,7 +31,7 @@ public final class ReturnedPhalanx extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {1}{U}: Returned Phalanx can attack this turn as though it didn't have defender. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } private ReturnedPhalanx(final ReturnedPhalanx card) { diff --git a/Mage.Sets/src/mage/cards/r/RevengeOfTheHunted.java b/Mage.Sets/src/mage/cards/r/RevengeOfTheHunted.java index 2d5682f0b00..51794956737 100644 --- a/Mage.Sets/src/mage/cards/r/RevengeOfTheHunted.java +++ b/Mage.Sets/src/mage/cards/r/RevengeOfTheHunted.java @@ -34,7 +34,7 @@ public final class RevengeOfTheHunted extends CardImpl { this.getSpellAbility().addEffect(effect); // Miracle {G} - this.addAbility(new MiracleAbility(this, new ManaCostsImpl("{G}"))); + this.addAbility(new MiracleAbility(this, new ManaCostsImpl<>("{G}"))); } private RevengeOfTheHunted(final RevengeOfTheHunted card) { diff --git a/Mage.Sets/src/mage/cards/r/ReveredDead.java b/Mage.Sets/src/mage/cards/r/ReveredDead.java index 9f7e08a8199..7fdd4fbfc53 100644 --- a/Mage.Sets/src/mage/cards/r/ReveredDead.java +++ b/Mage.Sets/src/mage/cards/r/ReveredDead.java @@ -26,7 +26,7 @@ public final class ReveredDead extends CardImpl { this.toughness = new MageInt(1); // {W}: Regenerate Revered Dead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{W}"))); } private ReveredDead(final ReveredDead card) { diff --git a/Mage.Sets/src/mage/cards/r/ReveredElder.java b/Mage.Sets/src/mage/cards/r/ReveredElder.java index edfe72872cd..6035b1c447c 100644 --- a/Mage.Sets/src/mage/cards/r/ReveredElder.java +++ b/Mage.Sets/src/mage/cards/r/ReveredElder.java @@ -27,7 +27,7 @@ public final class ReveredElder extends CardImpl { this.toughness = new MageInt(2); // {1}: Prevent the next 1 damage that would be dealt to Revered Elder this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl("{1}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}"))); } private ReveredElder(final ReveredElder card) { diff --git a/Mage.Sets/src/mage/cards/r/ReveredUnicorn.java b/Mage.Sets/src/mage/cards/r/ReveredUnicorn.java index e6d84e627cf..2b2067383ff 100644 --- a/Mage.Sets/src/mage/cards/r/ReveredUnicorn.java +++ b/Mage.Sets/src/mage/cards/r/ReveredUnicorn.java @@ -27,7 +27,7 @@ public final class ReveredUnicorn extends CardImpl { this.toughness = new MageInt(3); // Cumulative upkeep {1} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // When Revered Unicorn leaves the battlefield, you gain life equal to the number of age counters on it. this.addAbility(new LeavesBattlefieldTriggeredAbility(new GainLifeEffect(new CountersSourceCount(CounterType.AGE)), false)); } diff --git a/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java b/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java index de02aa6eab3..02b35549d2a 100644 --- a/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java +++ b/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java @@ -57,7 +57,7 @@ public final class RhonasTheIndomitable extends CardImpl { // {2}{G}: Another target creature gets +2/+0 and gains trample until end of turn. Effect effect = new BoostTargetEffect(2, 0, Duration.EndOfTurn); effect.setText("Another target creature gets +2/+0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{G}")); effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/Rhox.java b/Mage.Sets/src/mage/cards/r/Rhox.java index f4969e313cb..d72e3a7c09a 100644 --- a/Mage.Sets/src/mage/cards/r/Rhox.java +++ b/Mage.Sets/src/mage/cards/r/Rhox.java @@ -30,7 +30,7 @@ public final class Rhox extends CardImpl { // You may have Rhox assign its combat damage as though it weren't blocked. this.addAbility(DamageAsThoughNotBlockedAbility.getInstance()); // {2}{G}: Regenerate Rhox. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); } private Rhox(final Rhox card) { diff --git a/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java b/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java index 8fc6510a2fc..3bff5d18e58 100644 --- a/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java +++ b/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java @@ -41,12 +41,12 @@ public final class RhysTheRedeemed extends CardImpl { this.toughness = new MageInt(1); // {2}{GW}, {tap}: Create a 1/1 green and white Elf Warrior creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GreenWhiteElfWarriorToken()), new ManaCostsImpl("{2}{G/W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GreenWhiteElfWarriorToken()), new ManaCostsImpl<>("{2}{G/W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {4}{GW}{GW}, {tap}: For each creature token you control, create a token that's a copy of that creature. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RhysTheRedeemedEffect(), new ManaCostsImpl("{4}{G/W}{G/W}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RhysTheRedeemedEffect(), new ManaCostsImpl<>("{4}{G/W}{G/W}")); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/r/RhysticCircle.java b/Mage.Sets/src/mage/cards/r/RhysticCircle.java index e127567ea6e..469ae0d6424 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticCircle.java +++ b/Mage.Sets/src/mage/cards/r/RhysticCircle.java @@ -26,7 +26,7 @@ public final class RhysticCircle extends CardImpl { // {1}: Any player may pay {1}. If no one does, the next time a source of your choice would deal damage to you this turn, prevent that damage. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DoUnlessAnyPlayerPaysEffect(new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn),new GenericManaCost(1)), - new ManaCostsImpl("{1}"))); + new ManaCostsImpl<>("{1}"))); } private RhysticCircle(final RhysticCircle card) { diff --git a/Mage.Sets/src/mage/cards/r/RhysticDeluge.java b/Mage.Sets/src/mage/cards/r/RhysticDeluge.java index 6809ceff210..2549700cc7b 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticDeluge.java +++ b/Mage.Sets/src/mage/cards/r/RhysticDeluge.java @@ -23,7 +23,7 @@ public final class RhysticDeluge extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}"); // {U}: Tap target creature unless its controller pays {1}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new TapTargetEffect(), new ManaCostsImpl("{1}")), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new TapTargetEffect(), new ManaCostsImpl<>("{1}")), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RhysticLightning.java b/Mage.Sets/src/mage/cards/r/RhysticLightning.java index bc249d34c6c..7bd790d280e 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticLightning.java +++ b/Mage.Sets/src/mage/cards/r/RhysticLightning.java @@ -21,7 +21,7 @@ public final class RhysticLightning extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); // Rhystic Lightning deals 4 damage to any target unless that creature's controller or that player pays {2}. If they do, Rhystic Lightning deals 2 damage to the creature or player. - Effect effect = new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new DamageTargetEffect(4), new DamageTargetEffect(2), new ManaCostsImpl("{2}"), + Effect effect = new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new DamageTargetEffect(4), new DamageTargetEffect(2), new ManaCostsImpl<>("{2}"), "Pay {2} to have {this} deal 2 damage instead of 4 damage?"); effect.setText("{this} deals 4 damage to any target unless that creature's controller or that player pays {2}. If they do, {this} deals 2 damage to the creature or player"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RhysticShield.java b/Mage.Sets/src/mage/cards/r/RhysticShield.java index 5425e3a8c7d..60b5b6a3580 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticShield.java +++ b/Mage.Sets/src/mage/cards/r/RhysticShield.java @@ -23,7 +23,7 @@ public final class RhysticShield extends CardImpl { // Creatures you control get +0/+1 until end of turn. They get an additional +0/+2 until end of turn unless any player pays {2}. this.getSpellAbility().addEffect(new BoostControlledEffect(0, 1, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, false)); - Effect effect = new DoUnlessAnyPlayerPaysEffect(new BoostControlledEffect(0, 2, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, false), new ManaCostsImpl("{2}")); + Effect effect = new DoUnlessAnyPlayerPaysEffect(new BoostControlledEffect(0, 2, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, false), new ManaCostsImpl<>("{2}")); effect.setText("They get an additional +0/+2 until end of turn unless any player pays {2}"); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/r/RhysticSyphon.java b/Mage.Sets/src/mage/cards/r/RhysticSyphon.java index e3524712aa2..257b96cfede 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticSyphon.java +++ b/Mage.Sets/src/mage/cards/r/RhysticSyphon.java @@ -21,7 +21,7 @@ public final class RhysticSyphon extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}{B}"); // Unless target player pays {3}, they lose 5 life and you gain 5 life. - DoUnlessTargetPlayerOrTargetsControllerPaysEffect effect = new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new LoseLifeTargetEffect(5), new ManaCostsImpl("{3}")); + DoUnlessTargetPlayerOrTargetsControllerPaysEffect effect = new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new LoseLifeTargetEffect(5), new ManaCostsImpl<>("{3}")); effect.addEffect(new GainLifeEffect(5)); effect.setText("Unless target player pays {3}, they lose 5 life and you gain 5 life"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RhysticTutor.java b/Mage.Sets/src/mage/cards/r/RhysticTutor.java index b755fccd3c4..a69c5feacc0 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticTutor.java +++ b/Mage.Sets/src/mage/cards/r/RhysticTutor.java @@ -21,7 +21,7 @@ public final class RhysticTutor extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}"); // Unless any player pays {2}, search your library for a card, put that card into your hand, then shuffle your library. - Effect effect = new DoUnlessAnyPlayerPaysEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary()), new ManaCostsImpl("{2}")); + Effect effect = new DoUnlessAnyPlayerPaysEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary()), new ManaCostsImpl<>("{2}")); effect.setText("Unless any player pays {2}, search your library for a card, put that card into your hand, then shuffle"); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/r/RibbonSnake.java b/Mage.Sets/src/mage/cards/r/RibbonSnake.java index 7e2276693ef..605c60e9729 100644 --- a/Mage.Sets/src/mage/cards/r/RibbonSnake.java +++ b/Mage.Sets/src/mage/cards/r/RibbonSnake.java @@ -32,7 +32,7 @@ public final class RibbonSnake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}: Ribbon Snake loses flying until end of turn. Any player may activate this ability. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilitySourceEffect( - FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}")); + FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RicochetTrap.java b/Mage.Sets/src/mage/cards/r/RicochetTrap.java index 91781688ea2..2741f7df368 100644 --- a/Mage.Sets/src/mage/cards/r/RicochetTrap.java +++ b/Mage.Sets/src/mage/cards/r/RicochetTrap.java @@ -35,7 +35,7 @@ public final class RicochetTrap extends CardImpl { this.subtype.add(SubType.TRAP); // If an opponent cast a blue spell this turn, you may pay {R} rather than pay Ricochet Trap's mana cost. - this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{R}"), RicochetTrapCondition.instance), new SpellsCastWatcher()); + this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl<>("{R}"), RicochetTrapCondition.instance), new SpellsCastWatcher()); // Change the target of target spell with a single target. this.getSpellAbility().addEffect(new ChooseNewTargetsTargetEffect(true, true)); diff --git a/Mage.Sets/src/mage/cards/r/Riddleform.java b/Mage.Sets/src/mage/cards/r/Riddleform.java index 54701ff3cab..e4aa7444baa 100644 --- a/Mage.Sets/src/mage/cards/r/Riddleform.java +++ b/Mage.Sets/src/mage/cards/r/Riddleform.java @@ -42,7 +42,7 @@ public final class Riddleform extends CardImpl { this.addAbility(new SpellCastControllerTriggeredAbility(Zone.BATTLEFIELD, effect, filterNonCreature, true, true)); // {2}{U}: Scry 1. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new ManaCostsImpl<>("{2}{U}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RidgeRannet.java b/Mage.Sets/src/mage/cards/r/RidgeRannet.java index 92188d3a167..be793a95108 100644 --- a/Mage.Sets/src/mage/cards/r/RidgeRannet.java +++ b/Mage.Sets/src/mage/cards/r/RidgeRannet.java @@ -23,7 +23,7 @@ public final class RidgeRannet extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(4); - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private RidgeRannet(final RidgeRannet card) { diff --git a/Mage.Sets/src/mage/cards/r/RidgedKusite.java b/Mage.Sets/src/mage/cards/r/RidgedKusite.java index 19f873ef547..ad27f2ca912 100644 --- a/Mage.Sets/src/mage/cards/r/RidgedKusite.java +++ b/Mage.Sets/src/mage/cards/r/RidgedKusite.java @@ -36,7 +36,7 @@ public final class RidgedKusite extends CardImpl { // {1}{B}, {tap}, Discard a card: Target creature gets +1/+0 and gains first strike until end of turn. Effect effect = new BoostTargetEffect(1, 0, Duration.EndOfTurn); effect.setText("Target creature gets +1/+0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); effect = new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains first strike until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RidgelineRager.java b/Mage.Sets/src/mage/cards/r/RidgelineRager.java index 3b7cd1be117..b5a8d3d2dc7 100644 --- a/Mage.Sets/src/mage/cards/r/RidgelineRager.java +++ b/Mage.Sets/src/mage/cards/r/RidgelineRager.java @@ -27,7 +27,7 @@ public final class RidgelineRager extends CardImpl { this.toughness = new MageInt(2); // {R}: Ridgeline Rager 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 RidgelineRager(final RidgelineRager card) { diff --git a/Mage.Sets/src/mage/cards/r/RiftBolt.java b/Mage.Sets/src/mage/cards/r/RiftBolt.java index 023e0a0d2c4..a58fddaa096 100644 --- a/Mage.Sets/src/mage/cards/r/RiftBolt.java +++ b/Mage.Sets/src/mage/cards/r/RiftBolt.java @@ -25,7 +25,7 @@ public final class RiftBolt extends CardImpl { this.getSpellAbility().addTarget(new TargetAnyTarget()); // Suspend 1-{R} - this.addAbility(new SuspendAbility(1, new ManaCostsImpl("{R}"), this)); + this.addAbility(new SuspendAbility(1, new ManaCostsImpl<>("{R}"), this)); } diff --git a/Mage.Sets/src/mage/cards/r/RiftmarkedKnight.java b/Mage.Sets/src/mage/cards/r/RiftmarkedKnight.java index 9e04de02c83..7f1e47c0c1a 100644 --- a/Mage.Sets/src/mage/cards/r/RiftmarkedKnight.java +++ b/Mage.Sets/src/mage/cards/r/RiftmarkedKnight.java @@ -40,7 +40,7 @@ public final class RiftmarkedKnight extends CardImpl { this.addAbility(new FlankingAbility()); // Suspend 3-{1}{W}{W} - this.addAbility(new SuspendAbility(3, new ManaCostsImpl("{1}{W}{W}"), this)); + this.addAbility(new SuspendAbility(3, new ManaCostsImpl<>("{1}{W}{W}"), this)); // When the last time counter is removed from Riftmarked Knight while it's exiled, put a 2/2 black Knight creature token with flanking, protection from white, and haste onto the battlefield. this.addAbility(new RiftmarkedKnightTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/r/RiftwingCloudskate.java b/Mage.Sets/src/mage/cards/r/RiftwingCloudskate.java index a0d3b7dd485..3adc6068428 100644 --- a/Mage.Sets/src/mage/cards/r/RiftwingCloudskate.java +++ b/Mage.Sets/src/mage/cards/r/RiftwingCloudskate.java @@ -36,7 +36,7 @@ public final class RiftwingCloudskate extends CardImpl { this.addAbility(ability); // Suspend 3-{1}{U} - this.addAbility(new SuspendAbility(3, new ManaCostsImpl("{1}{U}"), this)); + this.addAbility(new SuspendAbility(3, new ManaCostsImpl<>("{1}{U}"), this)); } private RiftwingCloudskate(final RiftwingCloudskate card) { diff --git a/Mage.Sets/src/mage/cards/r/RighteousAura.java b/Mage.Sets/src/mage/cards/r/RighteousAura.java index 39e82f7cc5b..b8ba3ca8faf 100644 --- a/Mage.Sets/src/mage/cards/r/RighteousAura.java +++ b/Mage.Sets/src/mage/cards/r/RighteousAura.java @@ -23,7 +23,7 @@ public final class RighteousAura extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); // {W}, Pay 2 life: The next time a source of your choice would deal damage to you this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new PayLifeCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java b/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java index 402271c808b..3a24e7637cf 100644 --- a/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java +++ b/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java @@ -47,11 +47,11 @@ public final class RikuOfTwoReflections extends CardImpl { // Whenever you cast an instant or sorcery spell, you may pay {U}{R}. If you do, copy that spell. You may choose new targets for the copy. Effect effect = new CopyTargetSpellEffect(true); - this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(effect, new ManaCostsImpl("{U}{R}")), filter, false, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(effect, new ManaCostsImpl<>("{U}{R}")), filter, false, true)); // Whenever another nontoken creature enters the battlefield under your control, you may pay {G}{U}. If you do, create a token that's a copy of that creature. effect = new DoIfCostPaid(new CreateTokenCopyTargetEffect(true), - new ManaCostsImpl("{G}{U}"), "Create a token that's a copy of that creature?"); + new ManaCostsImpl<>("{G}{U}"), "Create a token that's a copy of that creature?"); effect.setText("you may pay {G}{U}. If you do, create a token that's a copy of that creature"); this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, effect, filterPermanent, false, SetTargetPointer.PERMANENT, null)); } diff --git a/Mage.Sets/src/mage/cards/r/RimeTransfusion.java b/Mage.Sets/src/mage/cards/r/RimeTransfusion.java index 3f6428de551..a3b4186e783 100644 --- a/Mage.Sets/src/mage/cards/r/RimeTransfusion.java +++ b/Mage.Sets/src/mage/cards/r/RimeTransfusion.java @@ -49,7 +49,7 @@ public final class RimeTransfusion extends CardImpl { // Enchanted creature gets +2/+1 and has "{S}: This creature can't be blocked this turn except by snow creatures." SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.EndOfTurn))),new ManaCostsImpl("{S}")); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.EndOfTurn))),new ManaCostsImpl<>("{S}")); ability2.addEffect(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/r/RimeboundDead.java b/Mage.Sets/src/mage/cards/r/RimeboundDead.java index 4be59222779..fb692db9a7e 100644 --- a/Mage.Sets/src/mage/cards/r/RimeboundDead.java +++ b/Mage.Sets/src/mage/cards/r/RimeboundDead.java @@ -27,7 +27,7 @@ public final class RimeboundDead extends CardImpl { this.toughness = new MageInt(1); // {S}: Regenerate Rimebound Dead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{S}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{S}"))); } private RimeboundDead(final RimeboundDead card) { diff --git a/Mage.Sets/src/mage/cards/r/RimefeatherOwl.java b/Mage.Sets/src/mage/cards/r/RimefeatherOwl.java index 0f795093590..2ed6b74ee00 100644 --- a/Mage.Sets/src/mage/cards/r/RimefeatherOwl.java +++ b/Mage.Sets/src/mage/cards/r/RimefeatherOwl.java @@ -62,7 +62,7 @@ public final class RimefeatherOwl extends CardImpl { Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.ICE.createInstance()) .setText("Put an ice counter on target permanent."), - new ManaCostsImpl("{1}{S}") + new ManaCostsImpl<>("{1}{S}") ); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RimehornAurochs.java b/Mage.Sets/src/mage/cards/r/RimehornAurochs.java index bef3a9c630e..a7e23d0f36d 100644 --- a/Mage.Sets/src/mage/cards/r/RimehornAurochs.java +++ b/Mage.Sets/src/mage/cards/r/RimehornAurochs.java @@ -52,7 +52,7 @@ public final class RimehornAurochs extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(xValue, StaticValue.get(0), Duration.EndOfTurn, true, "it"), false)); // {2}{S}: Target creature blocks target creature this turn if able. - Ability ability = new SimpleActivatedAbility(new RimehornAurochsEffect(), new ManaCostsImpl("{2}{S}")); + Ability ability = new SimpleActivatedAbility(new RimehornAurochsEffect(), new ManaCostsImpl<>("{2}{S}")); ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature that must block"))); ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature that is to be blocked"))); this.addAbility(ability, new BlockedAttackerWatcher()); diff --git a/Mage.Sets/src/mage/cards/r/RimescaleDragon.java b/Mage.Sets/src/mage/cards/r/RimescaleDragon.java index 6c8a1a20f41..44bc6797e99 100644 --- a/Mage.Sets/src/mage/cards/r/RimescaleDragon.java +++ b/Mage.Sets/src/mage/cards/r/RimescaleDragon.java @@ -46,7 +46,7 @@ public final class RimescaleDragon extends CardImpl { // {2}{snow}: Tap target creature and put an ice counter on it. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect("tap target creature"), - new ManaCostsImpl("{2}{S}") + new ManaCostsImpl<>("{2}{S}") ); Effect effect = new AddCountersTargetEffect(CounterType.ICE.createInstance()); effect.setText("and put an ice counter on it"); diff --git a/Mage.Sets/src/mage/cards/r/RinAndSeriInseparable.java b/Mage.Sets/src/mage/cards/r/RinAndSeriInseparable.java index 547dba0f10c..534df8f6683 100644 --- a/Mage.Sets/src/mage/cards/r/RinAndSeriInseparable.java +++ b/Mage.Sets/src/mage/cards/r/RinAndSeriInseparable.java @@ -72,7 +72,7 @@ public final class RinAndSeriInseparable extends CardImpl { DynamicValue catCount = new PermanentsOnBattlefieldCount(catPermanentFilter); Effect lifeGainEffect = new GainLifeEffect(catCount); lifeGainEffect.setText("You gain life equal to the number of Cats you control"); - Ability ability = new SimpleActivatedAbility(damageEffect, new ManaCostsImpl("{R}{G}{W}")); + Ability ability = new SimpleActivatedAbility(damageEffect, new ManaCostsImpl<>("{R}{G}{W}")); ability.addEffect(lifeGainEffect); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/r/RingOfGix.java b/Mage.Sets/src/mage/cards/r/RingOfGix.java index cabf86c0a8d..06384a75659 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfGix.java +++ b/Mage.Sets/src/mage/cards/r/RingOfGix.java @@ -38,7 +38,7 @@ public final class RingOfGix extends CardImpl { this.addAbility(new EchoAbility("{3}")); // {1}, {tap}: Tap target artifact, creature, or land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RingOfImmortals.java b/Mage.Sets/src/mage/cards/r/RingOfImmortals.java index 4dea052699f..acb4891dc22 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfImmortals.java +++ b/Mage.Sets/src/mage/cards/r/RingOfImmortals.java @@ -35,7 +35,7 @@ public final class RingOfImmortals extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // {3}, {tap}: Counter target instant or Aura spell that targets a permanent you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl("{3}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RingOfMaruf.java b/Mage.Sets/src/mage/cards/r/RingOfMaruf.java index 2abb2ffaa2e..33d13660603 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfMaruf.java +++ b/Mage.Sets/src/mage/cards/r/RingOfMaruf.java @@ -30,7 +30,7 @@ public final class RingOfMaruf extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // {5}, {Tap}, Exile Ring of Maruf: The next time you would draw a card this turn, instead choose a card you own from outside the game and put it into your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RingOfMarufEffect(), new ManaCostsImpl("{5}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RingOfMarufEffect(), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new ExileSourceCost()); ability.addHint(OpenSideboardHint.instance); diff --git a/Mage.Sets/src/mage/cards/r/RingOfRenewal.java b/Mage.Sets/src/mage/cards/r/RingOfRenewal.java index 578ebf83049..a2ce8dd7ad1 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfRenewal.java +++ b/Mage.Sets/src/mage/cards/r/RingOfRenewal.java @@ -24,7 +24,7 @@ public final class RingOfRenewal extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // {5}, {tap}: Discard a card at random, then draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardControllerEffect(1, true), new ManaCostsImpl("{5}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardControllerEffect(1, true), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); Effect effect = new DrawCardSourceControllerEffect(2); effect.setText(", then draw two cards"); diff --git a/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java b/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java index a7bc8b8e193..2356d1fbd8b 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java +++ b/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java @@ -29,7 +29,7 @@ public final class RingOfThreeWishes extends CardImpl { // Ring of Three Wishes enters the battlefield with three wish counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.WISH.createInstance(3)), "with three wish counters on it")); // {5}, {T}, Remove a wish counter from Ring of Three Wishes: Search your library for a card and put that card into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new ManaCostsImpl("{5}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.WISH.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RiptideBiologist.java b/Mage.Sets/src/mage/cards/r/RiptideBiologist.java index 515ac8e8f06..cffcd81a23c 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideBiologist.java +++ b/Mage.Sets/src/mage/cards/r/RiptideBiologist.java @@ -34,7 +34,7 @@ public final class RiptideBiologist extends CardImpl { // Protection from Beasts this.addAbility(new ProtectionAbility(filter)); // Morph {2}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}"))); } private RiptideBiologist(final RiptideBiologist card) { diff --git a/Mage.Sets/src/mage/cards/r/RiptideChronologist.java b/Mage.Sets/src/mage/cards/r/RiptideChronologist.java index e3d73ab0105..4cfcb2007ea 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideChronologist.java +++ b/Mage.Sets/src/mage/cards/r/RiptideChronologist.java @@ -35,7 +35,7 @@ public final class RiptideChronologist extends CardImpl { this.toughness = new MageInt(3); // {U}, Sacrifice Riptide Chronologist: Untap all creatures of the creature type of your choice. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RiptideChronologistEffect(), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RiptideChronologistEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RiptideDirector.java b/Mage.Sets/src/mage/cards/r/RiptideDirector.java index 472195d363a..78d83596bb8 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideDirector.java +++ b/Mage.Sets/src/mage/cards/r/RiptideDirector.java @@ -39,7 +39,7 @@ public final class RiptideDirector extends CardImpl { // {2}{U}{U}, {tap}: Draw a card for each Wizard you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)), - new ManaCostsImpl("{2}{U}{U}")); + new ManaCostsImpl<>("{2}{U}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java b/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java index 674c026fb72..dba624e774f 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java +++ b/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java @@ -39,7 +39,7 @@ public final class RiptideEntrancer extends CardImpl { this.addAbility(new RiptideEntrancerTriggeredAbility()); // Morph {U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}{U}"))); } private RiptideEntrancer(final RiptideEntrancer card) { diff --git a/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java b/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java index f9c15a9e29f..0b0d22cdb67 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java +++ b/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java @@ -35,7 +35,7 @@ public final class RiptideLaboratory extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{U}, {tap}: Return target Wizard you control 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.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RiptideMangler.java b/Mage.Sets/src/mage/cards/r/RiptideMangler.java index 97df125bdb4..9729016aa97 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideMangler.java +++ b/Mage.Sets/src/mage/cards/r/RiptideMangler.java @@ -34,7 +34,7 @@ public final class RiptideMangler extends CardImpl { this.toughness = new MageInt(3); // {1}{U}: Change Riptide Mangler's base power to target creature's power. - Ability ability = new SimpleActivatedAbility(new RiptideManglerEffect(), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new RiptideManglerEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RiptidePilferer.java b/Mage.Sets/src/mage/cards/r/RiptidePilferer.java index 4fd1669cc6d..5b6def861e0 100644 --- a/Mage.Sets/src/mage/cards/r/RiptidePilferer.java +++ b/Mage.Sets/src/mage/cards/r/RiptidePilferer.java @@ -27,7 +27,7 @@ public final class RiptidePilferer extends CardImpl { // Whenever Riptide Pilferer deals combat damage to a player, that player discards a card. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true)); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); } private RiptidePilferer(final RiptidePilferer card) { diff --git a/Mage.Sets/src/mage/cards/r/RiptideSurvivor.java b/Mage.Sets/src/mage/cards/r/RiptideSurvivor.java index b7d8b365f74..2fab17cfd20 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideSurvivor.java +++ b/Mage.Sets/src/mage/cards/r/RiptideSurvivor.java @@ -30,7 +30,7 @@ public final class RiptideSurvivor extends CardImpl { this.toughness = new MageInt(1); // Morph {1}{U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{U}{U}"))); // When Riptide Survivor is turned face up, discard two cards, then draw three cards. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DiscardControllerEffect(2)); Effect effect = new DrawCardSourceControllerEffect(3); diff --git a/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java b/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java index 883a3925f9b..86a39ed317d 100644 --- a/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java +++ b/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java @@ -52,7 +52,7 @@ public final class RiseOfTheHobgoblins extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new RiseOfTheHobgoblinsEffect())); // {RW}: Red creatures and white creatures you control gain first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, filter), new ManaCostsImpl("{R/W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, filter), new ManaCostsImpl<>("{R/W}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java b/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java index 8bb70a06a05..b7886211bcd 100644 --- a/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java +++ b/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java @@ -38,7 +38,7 @@ public final class RishadanPawnshop extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Shuffle target nontoken permanent you control into its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RishadanPawnshopShuffleIntoLibraryEffect(), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RishadanPawnshopShuffleIntoLibraryEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RiteOfHarmony.java b/Mage.Sets/src/mage/cards/r/RiteOfHarmony.java index 94a6543cfe1..537ea8cee5e 100644 --- a/Mage.Sets/src/mage/cards/r/RiteOfHarmony.java +++ b/Mage.Sets/src/mage/cards/r/RiteOfHarmony.java @@ -31,7 +31,7 @@ public final class RiteOfHarmony extends CardImpl { getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new RiteOfHarmonyTriggeredAbility())); // Flashback {2}{G}{W} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{2}{G}{W}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{2}{G}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RithTheAwakener.java b/Mage.Sets/src/mage/cards/r/RithTheAwakener.java index 635069f0016..897a959ce04 100644 --- a/Mage.Sets/src/mage/cards/r/RithTheAwakener.java +++ b/Mage.Sets/src/mage/cards/r/RithTheAwakener.java @@ -41,7 +41,7 @@ public final class RithTheAwakener extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever Rith, the Awakener deals combat damage to a player, you may pay {2}{G}. If you do, choose a color, then create a 1/1 green Saproling creature token for each permanent of that color. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility( - new DoIfCostPaid(new RithTheAwakenerEffect(), new ManaCostsImpl("{2}{G}")), false)); + new DoIfCostPaid(new RithTheAwakenerEffect(), new ManaCostsImpl<>("{2}{G}")), false)); } private RithTheAwakener(final RithTheAwakener card) { diff --git a/Mage.Sets/src/mage/cards/r/RithsAttendant.java b/Mage.Sets/src/mage/cards/r/RithsAttendant.java index e1b7403158b..b8016129af7 100644 --- a/Mage.Sets/src/mage/cards/r/RithsAttendant.java +++ b/Mage.Sets/src/mage/cards/r/RithsAttendant.java @@ -28,7 +28,7 @@ public final class RithsAttendant extends CardImpl { this.toughness = new MageInt(3); // {1}, Sacrifice Rith's Attendant: Add {R}{G}{W}. - Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 0, 0, 1, 1, 0, 0, 0), new ManaCostsImpl("{1}")); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 0, 0, 1, 1, 0, 0, 0), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RitualOfSubdual.java b/Mage.Sets/src/mage/cards/r/RitualOfSubdual.java index 0b81209ec99..0705c24f29a 100644 --- a/Mage.Sets/src/mage/cards/r/RitualOfSubdual.java +++ b/Mage.Sets/src/mage/cards/r/RitualOfSubdual.java @@ -28,7 +28,7 @@ public final class RitualOfSubdual extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}{G}"); // Cumulative upkeep-Pay {2}. - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{2}"))); // If a land is tapped for mana, it produces colorless mana instead of any other type. this.addAbility(new SimpleStaticAbility(new RitualOfSubdualReplacementEffect())); diff --git a/Mage.Sets/src/mage/cards/r/RiverBoa.java b/Mage.Sets/src/mage/cards/r/RiverBoa.java index 79c1bcdd0d2..b3071bf88ea 100644 --- a/Mage.Sets/src/mage/cards/r/RiverBoa.java +++ b/Mage.Sets/src/mage/cards/r/RiverBoa.java @@ -27,7 +27,7 @@ public final class RiverBoa extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new IslandwalkAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private RiverBoa(final RiverBoa card) { diff --git a/Mage.Sets/src/mage/cards/r/RiverMerfolk.java b/Mage.Sets/src/mage/cards/r/RiverMerfolk.java index e643ecd4f25..9f93ae284f7 100644 --- a/Mage.Sets/src/mage/cards/r/RiverMerfolk.java +++ b/Mage.Sets/src/mage/cards/r/RiverMerfolk.java @@ -29,7 +29,7 @@ public final class RiverMerfolk extends CardImpl { // {U}: River Merfolk gains mountainwalk until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new MountainwalkAbility(false), Duration.EndOfTurn), - new ManaCostsImpl("{U}"))); + new ManaCostsImpl<>("{U}"))); } private RiverMerfolk(final RiverMerfolk card) { diff --git a/Mage.Sets/src/mage/cards/r/RiverSerpent.java b/Mage.Sets/src/mage/cards/r/RiverSerpent.java index 235d520137d..1d52dafe498 100644 --- a/Mage.Sets/src/mage/cards/r/RiverSerpent.java +++ b/Mage.Sets/src/mage/cards/r/RiverSerpent.java @@ -34,7 +34,7 @@ public final class RiverSerpent extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RiverSerpentEffect())); // Cycling {U} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{U}"))); } private RiverSerpent(final RiverSerpent card) { diff --git a/Mage.Sets/src/mage/cards/r/RixMaadiDungeonPalace.java b/Mage.Sets/src/mage/cards/r/RixMaadiDungeonPalace.java index 17d128ad88f..67c2c592d05 100644 --- a/Mage.Sets/src/mage/cards/r/RixMaadiDungeonPalace.java +++ b/Mage.Sets/src/mage/cards/r/RixMaadiDungeonPalace.java @@ -26,7 +26,7 @@ public final class RixMaadiDungeonPalace extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{B}{R}, {tap}: Each player discards a card. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardEachPlayerEffect(), new ManaCostsImpl("{1}{B}{R}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardEachPlayerEffect(), new ManaCostsImpl<>("{1}{B}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RixMaadiGuildmage.java b/Mage.Sets/src/mage/cards/r/RixMaadiGuildmage.java index 2c1e1664a20..3547cbf91e4 100644 --- a/Mage.Sets/src/mage/cards/r/RixMaadiGuildmage.java +++ b/Mage.Sets/src/mage/cards/r/RixMaadiGuildmage.java @@ -44,12 +44,12 @@ public final class RixMaadiGuildmage extends CardImpl { this.toughness = new MageInt(2); // {B}{R}: Target blocking creature gets -1/-1 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn),new ManaCostsImpl("{B}{R}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn),new ManaCostsImpl<>("{B}{R}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // {B}{R}: Target player who lost life this turn loses 1 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{B}{R}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}{R}")); ability.addTarget(new TargetPlayer(1,1,false, playerFilter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RixMaadiReveler.java b/Mage.Sets/src/mage/cards/r/RixMaadiReveler.java index 63ed94c4f7d..faa9ceb6cdc 100644 --- a/Mage.Sets/src/mage/cards/r/RixMaadiReveler.java +++ b/Mage.Sets/src/mage/cards/r/RixMaadiReveler.java @@ -31,7 +31,7 @@ public final class RixMaadiReveler extends CardImpl { this.toughness = new MageInt(2); // Spectacle {2}{B}{R} - this.addAbility(new SpectacleAbility(this, new ManaCostsImpl("{2}{B}{R}"))); + this.addAbility(new SpectacleAbility(this, new ManaCostsImpl<>("{2}{B}{R}"))); // When Rix Maadi Reveler enters the battlefield, discard a card, then draw a card. If Rix Maadi Reveler's spectacle cost was paid, instead discard your hand, then draw three cards. this.addAbility(new EntersBattlefieldTriggeredAbility(new RixMaadiRevelerEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/r/RoarOfTheWurm.java b/Mage.Sets/src/mage/cards/r/RoarOfTheWurm.java index 6138c755928..612fe87908f 100644 --- a/Mage.Sets/src/mage/cards/r/RoarOfTheWurm.java +++ b/Mage.Sets/src/mage/cards/r/RoarOfTheWurm.java @@ -25,7 +25,7 @@ public final class RoarOfTheWurm extends CardImpl { this.getSpellAbility().addEffect(new CreateTokenEffect(new WurmToken())); // Flashback {3}{G} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{3}{G}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{3}{G}"))); } private RoarOfTheWurm(final RoarOfTheWurm card) { diff --git a/Mage.Sets/src/mage/cards/r/RockHydra.java b/Mage.Sets/src/mage/cards/r/RockHydra.java index 5feb713e464..3a0597397b7 100644 --- a/Mage.Sets/src/mage/cards/r/RockHydra.java +++ b/Mage.Sets/src/mage/cards/r/RockHydra.java @@ -44,9 +44,9 @@ public final class RockHydra extends CardImpl { // For each 1 damage that would be dealt to Rock Hydra, if it has a +1/+1 counter on it, remove a +1/+1 counter from it and prevent that 1 damage. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RockHydraEffect())); // {R}: Prevent the next 1 damage that would be dealt to Rock Hydra this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{R}"))); // {R}{R}{R}: Put a +1/+1 counter on Rock Hydra. Activate this ability only during your upkeep. - this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl("{R}{R}{R}"), new IsStepCondition(PhaseStep.UPKEEP), null)); + this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{R}{R}{R}"), new IsStepCondition(PhaseStep.UPKEEP), null)); } private RockHydra(final RockHydra card) { diff --git a/Mage.Sets/src/mage/cards/r/RockshardElemental.java b/Mage.Sets/src/mage/cards/r/RockshardElemental.java index 4f9257586f0..e4b52516354 100644 --- a/Mage.Sets/src/mage/cards/r/RockshardElemental.java +++ b/Mage.Sets/src/mage/cards/r/RockshardElemental.java @@ -26,7 +26,7 @@ public final class RockshardElemental extends CardImpl { // Double strike this.addAbility(DoubleStrikeAbility.getInstance()); // Morph {4}{R}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{R}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{R}{R}"))); } private RockshardElemental(final RockshardElemental card) { diff --git a/Mage.Sets/src/mage/cards/r/RoguesPassage.java b/Mage.Sets/src/mage/cards/r/RoguesPassage.java index 3ca7d4f6b42..dbb9ef557e8 100644 --- a/Mage.Sets/src/mage/cards/r/RoguesPassage.java +++ b/Mage.Sets/src/mage/cards/r/RoguesPassage.java @@ -27,7 +27,7 @@ public final class RoguesPassage extends CardImpl { this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(1), new TapSourceCost())); // {4}, {T}: Target creature can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new ManaCostsImpl("{4}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RohgahhOfKherKeep.java b/Mage.Sets/src/mage/cards/r/RohgahhOfKherKeep.java index 498c3a96e93..98c3aaac6e7 100644 --- a/Mage.Sets/src/mage/cards/r/RohgahhOfKherKeep.java +++ b/Mage.Sets/src/mage/cards/r/RohgahhOfKherKeep.java @@ -97,7 +97,7 @@ class RohgahhOfKherKeepEffect extends OneShotEffect { if (player == null) { return false; } - Cost cost = new ManaCostsImpl("{R}{R}{R}"); + Cost cost = new ManaCostsImpl<>("{R}{R}{R}"); if (!cost.canPay(source, source, player.getId(), game) || !player.chooseUse(Outcome.Benefit, "Pay {R}{R}{R}?", source, game) || !cost.pay(source, game, source, player.getId(), false)) { diff --git a/Mage.Sets/src/mage/cards/r/RoilingHorror.java b/Mage.Sets/src/mage/cards/r/RoilingHorror.java index 2b65a3bdaab..4cda2a5438f 100644 --- a/Mage.Sets/src/mage/cards/r/RoilingHorror.java +++ b/Mage.Sets/src/mage/cards/r/RoilingHorror.java @@ -45,7 +45,7 @@ public final class RoilingHorror extends CardImpl { )); // Suspend X-{X}{B}{B}{B}. X can't be 0. - this.addAbility(new SuspendAbility(Integer.MAX_VALUE, new ManaCostsImpl("{B}{B}{B}"), this, true)); + this.addAbility(new SuspendAbility(Integer.MAX_VALUE, new ManaCostsImpl<>("{B}{B}{B}"), this, true)); // Whenever a time counter is removed from Roiling Horror while it's exiled, target player loses 1 life and you gain 1 life. this.addAbility(new RoilingHorrorTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/r/RollingTemblor.java b/Mage.Sets/src/mage/cards/r/RollingTemblor.java index ac06b6b7f29..06e68c25745 100644 --- a/Mage.Sets/src/mage/cards/r/RollingTemblor.java +++ b/Mage.Sets/src/mage/cards/r/RollingTemblor.java @@ -33,7 +33,7 @@ public final class RollingTemblor extends CardImpl { // Rolling Temblor deals 2 damage to each creature without flying. this.getSpellAbility().addEffect(new DamageAllEffect(2, filter)); // Flashback {4}{R}{R} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{4}{R}{R}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{4}{R}{R}"))); } private RollingTemblor(final RollingTemblor card) { diff --git a/Mage.Sets/src/mage/cards/r/RonomHulk.java b/Mage.Sets/src/mage/cards/r/RonomHulk.java index 5f1d70f21ff..e518a041683 100644 --- a/Mage.Sets/src/mage/cards/r/RonomHulk.java +++ b/Mage.Sets/src/mage/cards/r/RonomHulk.java @@ -34,7 +34,7 @@ public final class RonomHulk extends CardImpl { // Protection from snow this.addAbility(new ProtectionAbility(filter)); // Cumulative upkeep {1} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); } private RonomHulk(final RonomHulk card) { diff --git a/Mage.Sets/src/mage/cards/r/RoofstalkerWight.java b/Mage.Sets/src/mage/cards/r/RoofstalkerWight.java index c53a09e6e67..db646c312e0 100644 --- a/Mage.Sets/src/mage/cards/r/RoofstalkerWight.java +++ b/Mage.Sets/src/mage/cards/r/RoofstalkerWight.java @@ -27,7 +27,7 @@ public final class RoofstalkerWight extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - 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}"))); } public RoofstalkerWight (final RoofstalkerWight card) { diff --git a/Mage.Sets/src/mage/cards/r/RooftopStorm.java b/Mage.Sets/src/mage/cards/r/RooftopStorm.java index 02ff5159aa3..09893008f8c 100644 --- a/Mage.Sets/src/mage/cards/r/RooftopStorm.java +++ b/Mage.Sets/src/mage/cards/r/RooftopStorm.java @@ -49,7 +49,7 @@ class RooftopStormRuleEffect extends ContinuousEffectImpl { } private final AlternativeCostSourceAbility alternativeCastingCostAbility - = new AlternativeCostSourceAbility(new ManaCostsImpl("{0}"), SourceIsSpellCondition.instance, null, filter, true); + = new AlternativeCostSourceAbility(new ManaCostsImpl<>("{0}"), SourceIsSpellCondition.instance, null, filter, true); public RooftopStormRuleEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/cards/r/RootElemental.java b/Mage.Sets/src/mage/cards/r/RootElemental.java index fcc12c300aa..6f4af3d31af 100644 --- a/Mage.Sets/src/mage/cards/r/RootElemental.java +++ b/Mage.Sets/src/mage/cards/r/RootElemental.java @@ -26,7 +26,7 @@ public final class RootElemental extends CardImpl { this.toughness = new MageInt(5); // Morph {5}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{G}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{G}{G}"))); // When Root Elemental is turned face up, you may put a creature card from your hand onto the battlefield. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_CREATURE_A))); } diff --git a/Mage.Sets/src/mage/cards/r/RootGreevil.java b/Mage.Sets/src/mage/cards/r/RootGreevil.java index fe43ef2c96f..2a380782418 100644 --- a/Mage.Sets/src/mage/cards/r/RootGreevil.java +++ b/Mage.Sets/src/mage/cards/r/RootGreevil.java @@ -35,7 +35,7 @@ public final class RootGreevil extends CardImpl { this.toughness = new MageInt(3); // {2}{G}, {tap}, Sacrifice Root Greevil: Destroy all enchantments of the color of your choice. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RootGreevilEffect(), new ManaCostsImpl("{2}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RootGreevilEffect(), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RootingMoloch.java b/Mage.Sets/src/mage/cards/r/RootingMoloch.java index 8fb72f250e8..f8d93652a1f 100644 --- a/Mage.Sets/src/mage/cards/r/RootingMoloch.java +++ b/Mage.Sets/src/mage/cards/r/RootingMoloch.java @@ -45,7 +45,7 @@ public final class RootingMoloch extends CardImpl { this.addAbility(ability); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private RootingMoloch(final RootingMoloch card) { diff --git a/Mage.Sets/src/mage/cards/r/Rootrunner.java b/Mage.Sets/src/mage/cards/r/Rootrunner.java index 51d588c6885..ef51c205541 100644 --- a/Mage.Sets/src/mage/cards/r/Rootrunner.java +++ b/Mage.Sets/src/mage/cards/r/Rootrunner.java @@ -30,7 +30,7 @@ public final class Rootrunner extends CardImpl { this.toughness = new MageInt(3); //{G}{G}, Sacrifice Rootrunner: Put target land on top of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl("{G}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{G}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/Rootwalla.java b/Mage.Sets/src/mage/cards/r/Rootwalla.java index 85b8d93eb07..da2dd244c50 100644 --- a/Mage.Sets/src/mage/cards/r/Rootwalla.java +++ b/Mage.Sets/src/mage/cards/r/Rootwalla.java @@ -25,7 +25,7 @@ public final class Rootwalla extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private Rootwalla(final Rootwalla card) { diff --git a/Mage.Sets/src/mage/cards/r/RootwaterMystic.java b/Mage.Sets/src/mage/cards/r/RootwaterMystic.java index 9eaf37dbd07..0a6100f30c5 100644 --- a/Mage.Sets/src/mage/cards/r/RootwaterMystic.java +++ b/Mage.Sets/src/mage/cards/r/RootwaterMystic.java @@ -28,7 +28,7 @@ public final class RootwaterMystic extends CardImpl { this.toughness = new MageInt(1); // {1}{U}: Look at the top card of target player's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryTopCardTargetPlayerEffect(), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryTopCardTargetPlayerEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RotFarmSkeleton.java b/Mage.Sets/src/mage/cards/r/RotFarmSkeleton.java index 07cee3eb976..d60ba926c9b 100644 --- a/Mage.Sets/src/mage/cards/r/RotFarmSkeleton.java +++ b/Mage.Sets/src/mage/cards/r/RotFarmSkeleton.java @@ -35,7 +35,7 @@ public final class RotFarmSkeleton extends CardImpl { this.addAbility(new CantBlockAbility()); // 2{B}{G}, Put the top four cards of your library into your graveyard: Return Rot Farm Skeleton from your graveyard to the battlefield. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(false,false), new ManaCostsImpl("{2}{B}{G}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(false,false), new ManaCostsImpl<>("{2}{B}{G}")); ability.addCost(new MillCardsCost(4)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/Roterothopter.java b/Mage.Sets/src/mage/cards/r/Roterothopter.java index 1b9c4e52868..0f21c543dbf 100644 --- a/Mage.Sets/src/mage/cards/r/Roterothopter.java +++ b/Mage.Sets/src/mage/cards/r/Roterothopter.java @@ -29,7 +29,7 @@ public final class Roterothopter extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}: Roterothopter gets +1/+0 until end of turn. Activate this ability no more than twice each turn. - this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{2}"), 2)); + this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"), 2)); } private Roterothopter(final Roterothopter card) { diff --git a/Mage.Sets/src/mage/cards/r/RottingRats.java b/Mage.Sets/src/mage/cards/r/RottingRats.java index 9785d1614d9..d844245ae74 100644 --- a/Mage.Sets/src/mage/cards/r/RottingRats.java +++ b/Mage.Sets/src/mage/cards/r/RottingRats.java @@ -31,7 +31,7 @@ public final class RottingRats extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DiscardEachPlayerEffect())); // Unearth {1}{B} ({1}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.) - this.addAbility(new UnearthAbility(new ManaCostsImpl("{1}{B}"))); + this.addAbility(new UnearthAbility(new ManaCostsImpl<>("{1}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/r/Rout.java b/Mage.Sets/src/mage/cards/r/Rout.java index fec4a12e343..5b85d76656d 100644 --- a/Mage.Sets/src/mage/cards/r/Rout.java +++ b/Mage.Sets/src/mage/cards/r/Rout.java @@ -24,7 +24,7 @@ public final class Rout extends CardImpl { Effect effect = new DestroyAllEffect(FILTER_PERMANENT_CREATURES, true); // You may cast Rout as though it had flash if you pay {2} more to cast it. - Ability ability = new PayMoreToCastAsThoughtItHadFlashAbility(this, new ManaCostsImpl("{2}")); + Ability ability = new PayMoreToCastAsThoughtItHadFlashAbility(this, new ManaCostsImpl<>("{2}")); ability.addEffect(effect); this.addAbility(ability); // Destroy all creatures. They can't be regenerated. diff --git a/Mage.Sets/src/mage/cards/r/RoyalDecree.java b/Mage.Sets/src/mage/cards/r/RoyalDecree.java index d23feaf24bc..475c04b98d7 100644 --- a/Mage.Sets/src/mage/cards/r/RoyalDecree.java +++ b/Mage.Sets/src/mage/cards/r/RoyalDecree.java @@ -32,7 +32,7 @@ public final class RoyalDecree extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); // Cumulative upkeep-Pay {W}. - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{W}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{W}"))); // Whenever a Swamp, Mountain, black permanent, or red permanent becomes tapped, Royal Decree deals 1 damage to that permanent's controller. this.addAbility(new RoyalDecreeAbility()); diff --git a/Mage.Sets/src/mage/cards/r/RoyalHerbalist.java b/Mage.Sets/src/mage/cards/r/RoyalHerbalist.java index 3cbb37d2e6e..e902d457f42 100644 --- a/Mage.Sets/src/mage/cards/r/RoyalHerbalist.java +++ b/Mage.Sets/src/mage/cards/r/RoyalHerbalist.java @@ -29,7 +29,7 @@ public final class RoyalHerbalist extends CardImpl { this.toughness = new MageInt(1); // {2}, Exile the top card of your library: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new ExileFromTopOfLibraryCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RubyLeech.java b/Mage.Sets/src/mage/cards/r/RubyLeech.java index 9fc624efaf2..868ba44d266 100644 --- a/Mage.Sets/src/mage/cards/r/RubyLeech.java +++ b/Mage.Sets/src/mage/cards/r/RubyLeech.java @@ -38,7 +38,7 @@ public final class RubyLeech extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Red spells you cast cost {R} more to cast. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new SpellsCostIncreasingAllEffect(new ManaCostsImpl("{R}"), filter, TargetController.YOU))); + new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{R}"), filter, TargetController.YOU))); } private RubyLeech(final RubyLeech card) { diff --git a/Mage.Sets/src/mage/cards/r/RuggedPrairie.java b/Mage.Sets/src/mage/cards/r/RuggedPrairie.java index 29be2016e2a..37ed44f28a0 100644 --- a/Mage.Sets/src/mage/cards/r/RuggedPrairie.java +++ b/Mage.Sets/src/mage/cards/r/RuggedPrairie.java @@ -25,15 +25,15 @@ public final class RuggedPrairie extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {R/W}, {tap}: Add {R}{R}, {R}{W}, or {W}{W}. - SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(2), new ManaCostsImpl("{R/W}")); + SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(2), new ManaCostsImpl<>("{R/W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 0, 0, 1, 0, 0, 0, 0), new ManaCostsImpl("{R/W}")); + ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 0, 0, 1, 0, 0, 0, 0), new ManaCostsImpl<>("{R/W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(2), new ManaCostsImpl("{R/W}")); + ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(2), new ManaCostsImpl<>("{R/W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RuinGhost.java b/Mage.Sets/src/mage/cards/r/RuinGhost.java index 2b64d866d96..c940695cb1b 100644 --- a/Mage.Sets/src/mage/cards/r/RuinGhost.java +++ b/Mage.Sets/src/mage/cards/r/RuinGhost.java @@ -30,7 +30,7 @@ public final class RuinGhost extends CardImpl { this.toughness = new MageInt(1); // {W}, {T}: Exile target land you control, then return it to the battlefield under your control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(false)); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND)); diff --git a/Mage.Sets/src/mage/cards/r/RumblingCrescendo.java b/Mage.Sets/src/mage/cards/r/RumblingCrescendo.java index 5ba024968c8..57e5ab12a05 100644 --- a/Mage.Sets/src/mage/cards/r/RumblingCrescendo.java +++ b/Mage.Sets/src/mage/cards/r/RumblingCrescendo.java @@ -42,7 +42,7 @@ public final class RumblingCrescendo extends CardImpl { // {R}, Sacrifice Rumbling Crescendo: Destroy up to X target lands, where X is the number of verse counters on Rumbling Crescendo. Effect effect = new DestroyTargetEffect(true); effect.setText("Destroy up to X target lands, where X is the number of verse counters on {this}."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(0, 0, filter, false)); ability.setTargetAdjuster(VerseCounterAdjuster.instance); diff --git a/Mage.Sets/src/mage/cards/r/RummagingWizard.java b/Mage.Sets/src/mage/cards/r/RummagingWizard.java index 1e5aee50329..c45b4ac15b4 100644 --- a/Mage.Sets/src/mage/cards/r/RummagingWizard.java +++ b/Mage.Sets/src/mage/cards/r/RummagingWizard.java @@ -32,7 +32,7 @@ public final class RummagingWizard extends CardImpl { this.toughness = new MageInt(2); // {2}{U}: Look at the top card of your library. You may put that card into your graveyard. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RummagingWizardLookLibraryEffect(), new ManaCostsImpl("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RummagingWizardLookLibraryEffect(), new ManaCostsImpl<>("{2}{U}"))); } private RummagingWizard(final RummagingWizard card) { diff --git a/Mage.Sets/src/mage/cards/r/RunWild.java b/Mage.Sets/src/mage/cards/r/RunWild.java index 9c62876ecad..8528ed197cc 100644 --- a/Mage.Sets/src/mage/cards/r/RunWild.java +++ b/Mage.Sets/src/mage/cards/r/RunWild.java @@ -30,7 +30,7 @@ public final class RunWild extends CardImpl { effect1.setText("Until end of turn, target creature gains trample"); this.getSpellAbility().addEffect(effect1); - Effect effect2 = new GainAbilityTargetEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{G}")), Duration.EndOfTurn); + Effect effect2 = new GainAbilityTargetEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")), Duration.EndOfTurn); effect2.setText("and \"{G}: Regenerate this creature\""); this.getSpellAbility().addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/r/RuneCervinRider.java b/Mage.Sets/src/mage/cards/r/RuneCervinRider.java index 2eac63573b2..b05f8340c60 100644 --- a/Mage.Sets/src/mage/cards/r/RuneCervinRider.java +++ b/Mage.Sets/src/mage/cards/r/RuneCervinRider.java @@ -29,7 +29,7 @@ public final class RuneCervinRider extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{G/W}{G/W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G/W}{G/W}"))); } private RuneCervinRider(final RuneCervinRider card) { diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionArtifacts.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionArtifacts.java index 2b5a4e4e644..5743d0a33a9 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionArtifacts.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionArtifacts.java @@ -33,7 +33,7 @@ public final class RuneOfProtectionArtifacts extends CardImpl { Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private RuneOfProtectionArtifacts(final RuneOfProtectionArtifacts card) { diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlack.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlack.java index 21f625619a8..29b5c3cf83b 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlack.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlack.java @@ -33,7 +33,7 @@ public final class RuneOfProtectionBlack extends CardImpl { Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private RuneOfProtectionBlack(final RuneOfProtectionBlack card) { diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlue.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlue.java index 27aa0896ae8..52e9aa1fd78 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlue.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlue.java @@ -33,7 +33,7 @@ public final class RuneOfProtectionBlue extends CardImpl { Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private RuneOfProtectionBlue(final RuneOfProtectionBlue card) { diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionGreen.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionGreen.java index 3b56672c40e..6c8f583779b 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionGreen.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionGreen.java @@ -33,7 +33,7 @@ public final class RuneOfProtectionGreen extends CardImpl { Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private RuneOfProtectionGreen(final RuneOfProtectionGreen card) { diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionLands.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionLands.java index 62180f1edb0..e4302456b8f 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionLands.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionLands.java @@ -33,7 +33,7 @@ public final class RuneOfProtectionLands extends CardImpl { Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private RuneOfProtectionLands(final RuneOfProtectionLands card) { diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionRed.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionRed.java index 70ebdcce348..84c22a3deff 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionRed.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionRed.java @@ -33,7 +33,7 @@ public final class RuneOfProtectionRed extends CardImpl { Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private RuneOfProtectionRed(final RuneOfProtectionRed card) { diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionWhite.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionWhite.java index 2b1fc47eb63..5d9d77bd283 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionWhite.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionWhite.java @@ -33,7 +33,7 @@ public final class RuneOfProtectionWhite extends CardImpl { Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private RuneOfProtectionWhite(final RuneOfProtectionWhite card) { diff --git a/Mage.Sets/src/mage/cards/r/RunedArch.java b/Mage.Sets/src/mage/cards/r/RunedArch.java index af573e5632b..114310a6263 100644 --- a/Mage.Sets/src/mage/cards/r/RunedArch.java +++ b/Mage.Sets/src/mage/cards/r/RunedArch.java @@ -41,7 +41,7 @@ public final class RunedArch extends CardImpl { Ability ability = new SimpleActivatedAbility( new CantBeBlockedTargetEffect(Duration.EndOfGame) .setText("X target creatures with power 2 or less can't be blocked this turn."), - new ManaCostsImpl("{X}") + new ManaCostsImpl<>("{X}") ); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/r/RuneflareTrap.java b/Mage.Sets/src/mage/cards/r/RuneflareTrap.java index 6a0f0ee3685..58924058dff 100644 --- a/Mage.Sets/src/mage/cards/r/RuneflareTrap.java +++ b/Mage.Sets/src/mage/cards/r/RuneflareTrap.java @@ -30,7 +30,7 @@ public final class RuneflareTrap extends CardImpl { this.subtype.add(SubType.TRAP); // If an opponent drew three or more cards this turn, you may pay {R} rather than pay Runeflare Trap's mana cost. - this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{R}"), RuneflareTrapCondition.instance), new CardsAmountDrawnThisTurnWatcher()); + this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl<>("{R}"), RuneflareTrapCondition.instance), new CardsAmountDrawnThisTurnWatcher()); // Runeflare Trap deals damage to target player equal to the number of cards in that player's hand. this.getSpellAbility().addEffect(new DamageTargetEffect(new TargetPlayerCardsInHandCount())); diff --git a/Mage.Sets/src/mage/cards/r/RuneforgeChampion.java b/Mage.Sets/src/mage/cards/r/RuneforgeChampion.java index 2886ed94176..609822d9477 100644 --- a/Mage.Sets/src/mage/cards/r/RuneforgeChampion.java +++ b/Mage.Sets/src/mage/cards/r/RuneforgeChampion.java @@ -66,7 +66,7 @@ class RuneforgeChampionEffect extends ContinuousEffectImpl { } private final AlternativeCostSourceAbility alternativeCastingCostAbility = new AlternativeCostSourceAbility( - new ManaCostsImpl("{1}"), SourceIsSpellCondition.instance, null, filter, true + new ManaCostsImpl<>("{1}"), SourceIsSpellCondition.instance, null, filter, true ); RuneforgeChampionEffect() { diff --git a/Mage.Sets/src/mage/cards/r/RunehornHellkite.java b/Mage.Sets/src/mage/cards/r/RunehornHellkite.java index 2faa0926b69..9cfc314ff71 100644 --- a/Mage.Sets/src/mage/cards/r/RunehornHellkite.java +++ b/Mage.Sets/src/mage/cards/r/RunehornHellkite.java @@ -36,7 +36,7 @@ public final class RunehornHellkite extends CardImpl { // {5}{R}, Exile Runehorn Hellkite from your graveyard: Each player discards their hand, then draws seven cards. Effect effect = new DrawCardAllEffect(7); effect.setText(", then draws seven cards"); - Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new DiscardHandAllEffect(), new ManaCostsImpl("{5}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new DiscardHandAllEffect(), new ManaCostsImpl<>("{5}{R}")); ability.addCost(new ExileSourceFromGraveCost()); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RuptureSpire.java b/Mage.Sets/src/mage/cards/r/RuptureSpire.java index cf6606513a7..d35c87ca2ab 100644 --- a/Mage.Sets/src/mage/cards/r/RuptureSpire.java +++ b/Mage.Sets/src/mage/cards/r/RuptureSpire.java @@ -21,7 +21,7 @@ public final class RuptureSpire extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new EntersBattlefieldTriggeredAbility( - new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{1}")).setText("sacrifice it unless you pay {1}") + new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{1}")).setText("sacrifice it unless you pay {1}") )); this.addAbility(new AnyColorManaAbility()); } diff --git a/Mage.Sets/src/mage/cards/r/RushwoodHerbalist.java b/Mage.Sets/src/mage/cards/r/RushwoodHerbalist.java index d6b0ef8e4e3..346ce984782 100644 --- a/Mage.Sets/src/mage/cards/r/RushwoodHerbalist.java +++ b/Mage.Sets/src/mage/cards/r/RushwoodHerbalist.java @@ -30,7 +30,7 @@ public final class RushwoodHerbalist extends CardImpl { this.toughness = new MageInt(2); // {G}, {tap}, Discard a card: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/r/RusticClachan.java b/Mage.Sets/src/mage/cards/r/RusticClachan.java index e1ce5a0c952..5bf7e6bc6cf 100644 --- a/Mage.Sets/src/mage/cards/r/RusticClachan.java +++ b/Mage.Sets/src/mage/cards/r/RusticClachan.java @@ -36,7 +36,7 @@ public final class RusticClachan extends CardImpl { // {tap}: Add {W}. this.addAbility(new WhiteManaAbility()); // Reinforce 1-{1}{W} - this.addAbility(new ReinforceAbility(1, new ManaCostsImpl("{1}{W}"))); + this.addAbility(new ReinforceAbility(1, new ManaCostsImpl<>("{1}{W}"))); } private RusticClachan(final RusticClachan card) { diff --git a/Mage.Sets/src/mage/cards/r/RuthlessKnave.java b/Mage.Sets/src/mage/cards/r/RuthlessKnave.java index 58849b30f43..2ff81613240 100644 --- a/Mage.Sets/src/mage/cards/r/RuthlessKnave.java +++ b/Mage.Sets/src/mage/cards/r/RuthlessKnave.java @@ -41,7 +41,7 @@ public final class RuthlessKnave extends CardImpl { this.toughness = new MageInt(2); // {2}{B}, Sacrifice a creature: Create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TreasureToken(), 2), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TreasureToken(), 2), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RuthlessSniper.java b/Mage.Sets/src/mage/cards/r/RuthlessSniper.java index f96c406b188..a59ac06a5f7 100644 --- a/Mage.Sets/src/mage/cards/r/RuthlessSniper.java +++ b/Mage.Sets/src/mage/cards/r/RuthlessSniper.java @@ -37,7 +37,7 @@ public final class RuthlessSniper extends CardImpl { CounterType.M1M1.createInstance(), StaticValue.get(1), Outcome.Removal), - new ManaCostsImpl("{1}"))); + new ManaCostsImpl<>("{1}"))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); }