From 7fd5402b03762a080cb50ec20cd012a07add6efd Mon Sep 17 00:00:00 2001 From: DeepCrimson <98864333+DeepCrimson@users.noreply.github.com> Date: Mon, 6 Jun 2022 05:40:02 -0700 Subject: [PATCH] Refactor: Fix raw use of parameterized class 'ManaCostsImpl' - 'j' cards (#9059) --- Mage.Sets/src/mage/cards/j/JabarisBanner.java | 2 +- Mage.Sets/src/mage/cards/j/JacesProjection.java | 2 +- Mage.Sets/src/mage/cards/j/JadeLeech.java | 2 +- Mage.Sets/src/mage/cards/j/JadeMage.java | 2 +- Mage.Sets/src/mage/cards/j/JadeStatue.java | 2 +- Mage.Sets/src/mage/cards/j/JaliraMasterPolymorphist.java | 2 +- Mage.Sets/src/mage/cards/j/JalumGrifter.java | 2 +- Mage.Sets/src/mage/cards/j/JalumTome.java | 2 +- Mage.Sets/src/mage/cards/j/JamuraanLion.java | 2 +- Mage.Sets/src/mage/cards/j/JandorsRing.java | 2 +- Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java | 2 +- Mage.Sets/src/mage/cards/j/JasmineSeer.java | 2 +- Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java | 6 +++--- Mage.Sets/src/mage/cards/j/JazalGoldmane.java | 2 +- Mage.Sets/src/mage/cards/j/JediBattleHealer.java | 2 +- Mage.Sets/src/mage/cards/j/JediBattleMage.java | 2 +- Mage.Sets/src/mage/cards/j/JediBattleSage.java | 2 +- Mage.Sets/src/mage/cards/j/JediInquirer.java | 2 +- Mage.Sets/src/mage/cards/j/JediInstructor.java | 2 +- Mage.Sets/src/mage/cards/j/JediKnight.java | 2 +- Mage.Sets/src/mage/cards/j/JediStarfighter.java | 2 +- Mage.Sets/src/mage/cards/j/JenaraAsuraOfWar.java | 2 +- Mage.Sets/src/mage/cards/j/JeskaiBanner.java | 2 +- Mage.Sets/src/mage/cards/j/JeskaiInfiltrator.java | 2 +- Mage.Sets/src/mage/cards/j/JestersScepter.java | 2 +- Mage.Sets/src/mage/cards/j/JeweledAmulet.java | 2 +- Mage.Sets/src/mage/cards/j/JhessianZombies.java | 4 ++-- Mage.Sets/src/mage/cards/j/JhoirasToolbox.java | 2 +- Mage.Sets/src/mage/cards/j/JinxedChoker.java | 2 +- Mage.Sets/src/mage/cards/j/JiwariTheEarthAflame.java | 2 +- Mage.Sets/src/mage/cards/j/JodahsAvenger.java | 2 +- Mage.Sets/src/mage/cards/j/JohnnyComboPlayer.java | 2 +- Mage.Sets/src/mage/cards/j/JolraelMwonvuliRecluse.java | 2 +- Mage.Sets/src/mage/cards/j/JolraelsFavor.java | 2 +- Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java | 2 +- Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java | 2 +- Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java | 2 +- Mage.Sets/src/mage/cards/j/JotunOwlKeeper.java | 4 ++-- Mage.Sets/src/mage/cards/j/Joven.java | 2 +- Mage.Sets/src/mage/cards/j/JubilantMascot.java | 2 +- Mage.Sets/src/mage/cards/j/JujuBubble.java | 2 +- Mage.Sets/src/mage/cards/j/JundBattlemage.java | 4 ++-- Mage.Sets/src/mage/cards/j/JungleCreeper.java | 2 +- Mage.Sets/src/mage/cards/j/JungleDelver.java | 2 +- Mage.Sets/src/mage/cards/j/JunglePatrol.java | 2 +- Mage.Sets/src/mage/cards/j/JungleTroll.java | 4 ++-- Mage.Sets/src/mage/cards/j/JungleWeaver.java | 2 +- Mage.Sets/src/mage/cards/j/JunkGolem.java | 2 +- Mage.Sets/src/mage/cards/j/JununEfreet.java | 2 +- Mage.Sets/src/mage/cards/j/JushiApprentice.java | 4 ++-- Mage.Sets/src/mage/cards/j/JustTheWind.java | 2 +- Mage.Sets/src/mage/cards/j/Justice.java | 2 +- 52 files changed, 59 insertions(+), 59 deletions(-) diff --git a/Mage.Sets/src/mage/cards/j/JabarisBanner.java b/Mage.Sets/src/mage/cards/j/JabarisBanner.java index d5b8b8ebc33..c5fa549977a 100644 --- a/Mage.Sets/src/mage/cards/j/JabarisBanner.java +++ b/Mage.Sets/src/mage/cards/j/JabarisBanner.java @@ -25,7 +25,7 @@ public final class JabarisBanner extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {1}, {tap}: Target creature gains flanking until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new FlankingAbility(), Duration.EndOfTurn), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new FlankingAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JacesProjection.java b/Mage.Sets/src/mage/cards/j/JacesProjection.java index e81b392100a..9dc16d589fb 100644 --- a/Mage.Sets/src/mage/cards/j/JacesProjection.java +++ b/Mage.Sets/src/mage/cards/j/JacesProjection.java @@ -40,7 +40,7 @@ public final class JacesProjection extends CardImpl { // {3}{U}: Put a loyalty counter on target Jace planeswalker. Ability ability = new SimpleActivatedAbility( - new AddCountersTargetEffect(CounterType.LOYALTY.createInstance()), new ManaCostsImpl("{3}{U}") + new AddCountersTargetEffect(CounterType.LOYALTY.createInstance()), new ManaCostsImpl<>("{3}{U}") ); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JadeLeech.java b/Mage.Sets/src/mage/cards/j/JadeLeech.java index 9d900c2ee81..a9f638b1184 100644 --- a/Mage.Sets/src/mage/cards/j/JadeLeech.java +++ b/Mage.Sets/src/mage/cards/j/JadeLeech.java @@ -35,7 +35,7 @@ public final class JadeLeech extends CardImpl { // Green spells you cast cost {G} more to cast. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new SpellsCostIncreasingAllEffect(new ManaCostsImpl("{G}"), filter, TargetController.YOU))); + new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{G}"), filter, TargetController.YOU))); } private JadeLeech(final JadeLeech card) { diff --git a/Mage.Sets/src/mage/cards/j/JadeMage.java b/Mage.Sets/src/mage/cards/j/JadeMage.java index 0851b3f617c..b8363aa1a0d 100644 --- a/Mage.Sets/src/mage/cards/j/JadeMage.java +++ b/Mage.Sets/src/mage/cards/j/JadeMage.java @@ -26,7 +26,7 @@ public final class JadeMage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{2}{G}"))); } private JadeMage(final JadeMage card) { diff --git a/Mage.Sets/src/mage/cards/j/JadeStatue.java b/Mage.Sets/src/mage/cards/j/JadeStatue.java index 590772a94f6..4d06a699dc1 100644 --- a/Mage.Sets/src/mage/cards/j/JadeStatue.java +++ b/Mage.Sets/src/mage/cards/j/JadeStatue.java @@ -27,7 +27,7 @@ public final class JadeStatue extends CardImpl { // {2}: Jade Statue becomes a 3/6 Golem artifact creature until end of combat. Activate this ability only during combat. - this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect (new JadeStatueToken(), "", Duration.EndOfCombat), new ManaCostsImpl("{2}"), new IsPhaseCondition(TurnPhase.COMBAT), "{2}: {this} becomes a 3/6 Golem artifact creature until end of combat. Activate only during combat.")); + this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect (new JadeStatueToken(), "", Duration.EndOfCombat), new ManaCostsImpl<>("{2}"), new IsPhaseCondition(TurnPhase.COMBAT), "{2}: {this} becomes a 3/6 Golem artifact creature until end of combat. Activate only during combat.")); } private JadeStatue(final JadeStatue card) { diff --git a/Mage.Sets/src/mage/cards/j/JaliraMasterPolymorphist.java b/Mage.Sets/src/mage/cards/j/JaliraMasterPolymorphist.java index 565249d10c2..5e02166c4db 100644 --- a/Mage.Sets/src/mage/cards/j/JaliraMasterPolymorphist.java +++ b/Mage.Sets/src/mage/cards/j/JaliraMasterPolymorphist.java @@ -43,7 +43,7 @@ public final class JaliraMasterPolymorphist extends CardImpl { // {2}{U}, {T}, Sacrifice another creature: Reveal cards from the top of your library until you reveal a nonlegendary creature card. // Put that card onto the battlefield and the rest on the bottom of your library in a random order. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RevealCardsFromLibraryUntilEffect(filterCard, Zone.BATTLEFIELD, Zone.LIBRARY), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RevealCardsFromLibraryUntilEffect(filterCard, Zone.BATTLEFIELD, Zone.LIBRARY), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE, true))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JalumGrifter.java b/Mage.Sets/src/mage/cards/j/JalumGrifter.java index 03fc79a70df..19dff8ee7da 100644 --- a/Mage.Sets/src/mage/cards/j/JalumGrifter.java +++ b/Mage.Sets/src/mage/cards/j/JalumGrifter.java @@ -45,7 +45,7 @@ public final class JalumGrifter extends CardImpl { this.toughness = new MageInt(5); // {1}{R}, {T}: Shuffle Jalum Grifter and two lands you control face down. Target opponent chooses one of those cards. Turn the cards face up. If they chose Jalum Grifter, sacrifice it. Otherwise, destroy target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JalumGrifterEffect(), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JalumGrifterEffect(), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponent()); ability.addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/cards/j/JalumTome.java b/Mage.Sets/src/mage/cards/j/JalumTome.java index 3c3c1639e1d..ff26f144e53 100644 --- a/Mage.Sets/src/mage/cards/j/JalumTome.java +++ b/Mage.Sets/src/mage/cards/j/JalumTome.java @@ -22,7 +22,7 @@ public final class JalumTome extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {2}, {tap}: Draw a card, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JamuraanLion.java b/Mage.Sets/src/mage/cards/j/JamuraanLion.java index 935024b72d0..6e73dc917cd 100644 --- a/Mage.Sets/src/mage/cards/j/JamuraanLion.java +++ b/Mage.Sets/src/mage/cards/j/JamuraanLion.java @@ -29,7 +29,7 @@ public final class JamuraanLion extends CardImpl { this.toughness = new MageInt(1); // {W}, {tap}: Target creature can't block this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JandorsRing.java b/Mage.Sets/src/mage/cards/j/JandorsRing.java index f9d551cbeb3..9401fe61436 100644 --- a/Mage.Sets/src/mage/cards/j/JandorsRing.java +++ b/Mage.Sets/src/mage/cards/j/JandorsRing.java @@ -37,7 +37,7 @@ public final class JandorsRing extends CardImpl { Watcher watcher = new JandorsRingWatcher(); // {2}, {tap}, Discard the last card you drew this turn: Draw a card. // TODO: discard has to be a cost not a payment during resolution - Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new JandorsRingEffect(), new ManaCostsImpl("{2}"), WatchedCardInHandCondition.instance, "{2}, {T}, Discard the last card you drew this turn: Draw a card."); + Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new JandorsRingEffect(), new ManaCostsImpl<>("{2}"), WatchedCardInHandCondition.instance, "{2}, {T}, Discard the last card you drew this turn: Draw a card."); ability.addCost(new TapSourceCost()); this.addAbility(ability, watcher); } diff --git a/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java b/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java index 5e65a10897e..b887920db5c 100644 --- a/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java +++ b/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java @@ -50,7 +50,7 @@ public final class JaradGolgariLichLord extends CardImpl { this.addAbility(ability); // {1}{B}{G}, Sacrifice another creature: Each opponent loses life equal to the sacrificed creature's power. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeOpponentsEffect(SacrificeCostCreaturesPower.instance), new ManaCostsImpl("{1}{B}{G}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeOpponentsEffect(SacrificeCostCreaturesPower.instance), new ManaCostsImpl<>("{1}{B}{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE, false))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JasmineSeer.java b/Mage.Sets/src/mage/cards/j/JasmineSeer.java index a0a90c78fa6..86efb498b77 100644 --- a/Mage.Sets/src/mage/cards/j/JasmineSeer.java +++ b/Mage.Sets/src/mage/cards/j/JasmineSeer.java @@ -35,7 +35,7 @@ public final class JasmineSeer extends CardImpl { this.toughness = new MageInt(1); // {2}{W}, {tap}: Reveal any number of white cards in your hand. You gain 2 life for each card revealed this way. - Ability ability = new SimpleActivatedAbility(new JasmineSeerEffect(), new ManaCostsImpl("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new JasmineSeerEffect(), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java b/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java index f7affa020db..e2cd3aa991b 100644 --- a/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java +++ b/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java @@ -47,14 +47,14 @@ public final class JayaBallardTaskMage extends CardImpl { this.toughness = new MageInt(2); // {R}, {tap}, Discard a card: Destroy target blue permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetPermanent(filter)); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); // {1}{R}, {tap}, Discard a card: Jaya Ballard, Task Mage deals 3 damage to any target. A creature dealt damage this way can't be regenerated this turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{1}{R}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetAnyTarget()); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); @@ -62,7 +62,7 @@ public final class JayaBallardTaskMage extends CardImpl { this.addAbility(ability, new DamagedByWatcher(false)); // {5}{R}{R}, {tap}, Discard a card: Jaya Ballard deals 6 damage to each creature and each player. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(6), new ManaCostsImpl("{5}{R}{R}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(6), new ManaCostsImpl<>("{5}{R}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JazalGoldmane.java b/Mage.Sets/src/mage/cards/j/JazalGoldmane.java index 85cd8dac6fb..8a685aaa6e5 100644 --- a/Mage.Sets/src/mage/cards/j/JazalGoldmane.java +++ b/Mage.Sets/src/mage/cards/j/JazalGoldmane.java @@ -37,7 +37,7 @@ public final class JazalGoldmane extends CardImpl { DynamicValue xValue = new AttackingCreatureCount("the number of attacking creatures"); this.addAbility(new SimpleActivatedAbility( new BoostControlledEffect(xValue, xValue, Duration.EndOfTurn, StaticFilters.FILTER_ATTACKING_CREATURES, false, true), - new ManaCostsImpl("{3}{W}{W}"))); + new ManaCostsImpl<>("{3}{W}{W}"))); } private JazalGoldmane(final JazalGoldmane card) { diff --git a/Mage.Sets/src/mage/cards/j/JediBattleHealer.java b/Mage.Sets/src/mage/cards/j/JediBattleHealer.java index 2e72870ac59..0784fcbcf32 100644 --- a/Mage.Sets/src/mage/cards/j/JediBattleHealer.java +++ b/Mage.Sets/src/mage/cards/j/JediBattleHealer.java @@ -33,7 +33,7 @@ public final class JediBattleHealer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(3))); // Meditate {1}{W} - this.addAbility(new MeditateAbility(new ManaCostsImpl("{1}{W}"))); + this.addAbility(new MeditateAbility(new ManaCostsImpl<>("{1}{W}"))); } private JediBattleHealer(final JediBattleHealer card) { diff --git a/Mage.Sets/src/mage/cards/j/JediBattleMage.java b/Mage.Sets/src/mage/cards/j/JediBattleMage.java index 8b094ea5a2a..b784f8e3ea2 100644 --- a/Mage.Sets/src/mage/cards/j/JediBattleMage.java +++ b/Mage.Sets/src/mage/cards/j/JediBattleMage.java @@ -34,7 +34,7 @@ public final class JediBattleMage extends CardImpl { this.addAbility(ability); // Meditate {1}{U} - this.addAbility(new MeditateAbility(new ManaCostsImpl("{1}{U}"))); + this.addAbility(new MeditateAbility(new ManaCostsImpl<>("{1}{U}"))); } private JediBattleMage(final JediBattleMage card) { diff --git a/Mage.Sets/src/mage/cards/j/JediBattleSage.java b/Mage.Sets/src/mage/cards/j/JediBattleSage.java index fea106ee044..ba94bed8865 100644 --- a/Mage.Sets/src/mage/cards/j/JediBattleSage.java +++ b/Mage.Sets/src/mage/cards/j/JediBattleSage.java @@ -37,7 +37,7 @@ public final class JediBattleSage extends CardImpl { this.addAbility(ability); // Meditate {1}{G} - this.addAbility(new MeditateAbility(new ManaCostsImpl("{1}{G}"))); + this.addAbility(new MeditateAbility(new ManaCostsImpl<>("{1}{G}"))); } private JediBattleSage(final JediBattleSage card) { diff --git a/Mage.Sets/src/mage/cards/j/JediInquirer.java b/Mage.Sets/src/mage/cards/j/JediInquirer.java index c7815b698da..88fa097f0bb 100644 --- a/Mage.Sets/src/mage/cards/j/JediInquirer.java +++ b/Mage.Sets/src/mage/cards/j/JediInquirer.java @@ -32,7 +32,7 @@ public final class JediInquirer extends CardImpl { this.addAbility(ability); // Meditate {1}{W} - this.addAbility(new MeditateAbility(new ManaCostsImpl("{1}{W}"))); + this.addAbility(new MeditateAbility(new ManaCostsImpl<>("{1}{W}"))); } private JediInquirer(final JediInquirer card) { diff --git a/Mage.Sets/src/mage/cards/j/JediInstructor.java b/Mage.Sets/src/mage/cards/j/JediInstructor.java index be0757481b2..ff0cfc7156e 100644 --- a/Mage.Sets/src/mage/cards/j/JediInstructor.java +++ b/Mage.Sets/src/mage/cards/j/JediInstructor.java @@ -41,7 +41,7 @@ public final class JediInstructor extends CardImpl { this.addAbility(ability); // Meditate {1}{W} - this.addAbility(new MeditateAbility(new ManaCostsImpl("{1}{W}"))); + this.addAbility(new MeditateAbility(new ManaCostsImpl<>("{1}{W}"))); } private JediInstructor(final JediInstructor card) { diff --git a/Mage.Sets/src/mage/cards/j/JediKnight.java b/Mage.Sets/src/mage/cards/j/JediKnight.java index 2a69570060d..081ea96e0e0 100644 --- a/Mage.Sets/src/mage/cards/j/JediKnight.java +++ b/Mage.Sets/src/mage/cards/j/JediKnight.java @@ -42,7 +42,7 @@ public final class JediKnight extends CardImpl { this.addAbility(ability); // Meditate {1}{U} - this.addAbility(new MeditateAbility(new ManaCostsImpl("{1}{U}"))); + this.addAbility(new MeditateAbility(new ManaCostsImpl<>("{1}{U}"))); } private JediKnight(final JediKnight card) { diff --git a/Mage.Sets/src/mage/cards/j/JediStarfighter.java b/Mage.Sets/src/mage/cards/j/JediStarfighter.java index 99707f11924..4d2935cbafb 100644 --- a/Mage.Sets/src/mage/cards/j/JediStarfighter.java +++ b/Mage.Sets/src/mage/cards/j/JediStarfighter.java @@ -46,7 +46,7 @@ public final class JediStarfighter extends CardImpl { this.addAbility(ability); // Meditate {1}{W} - this.addAbility(new MeditateAbility(new ManaCostsImpl("{1}{W}"))); + this.addAbility(new MeditateAbility(new ManaCostsImpl<>("{1}{W}"))); } private JediStarfighter(final JediStarfighter card) { diff --git a/Mage.Sets/src/mage/cards/j/JenaraAsuraOfWar.java b/Mage.Sets/src/mage/cards/j/JenaraAsuraOfWar.java index c26f01b64e3..8e30c2b19fa 100644 --- a/Mage.Sets/src/mage/cards/j/JenaraAsuraOfWar.java +++ b/Mage.Sets/src/mage/cards/j/JenaraAsuraOfWar.java @@ -32,7 +32,7 @@ public final class JenaraAsuraOfWar extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{1}{W}"))); } public JenaraAsuraOfWar (final JenaraAsuraOfWar card) { diff --git a/Mage.Sets/src/mage/cards/j/JeskaiBanner.java b/Mage.Sets/src/mage/cards/j/JeskaiBanner.java index fb7e6809635..693729f8b24 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiBanner.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiBanner.java @@ -31,7 +31,7 @@ public final class JeskaiBanner extends CardImpl { this.addAbility(new WhiteManaAbility()); // {U}{R}{W}, {T}, Sacrifice Jeskai Banner: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{U}{R}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{U}{R}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JeskaiInfiltrator.java b/Mage.Sets/src/mage/cards/j/JeskaiInfiltrator.java index e70a5dd390b..45496319145 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiInfiltrator.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiInfiltrator.java @@ -102,7 +102,7 @@ class JeskaiInfiltratorEffect extends OneShotEffect { if (card.isCreature(game)) { manaCosts = card.getSpellAbility().getManaCosts(); if (manaCosts == null) { - manaCosts = new ManaCostsImpl("{0}"); + manaCosts = new ManaCostsImpl<>("{0}"); } } MageObjectReference objectReference = new MageObjectReference(card.getId(), card.getZoneChangeCounter(game) + 1, game); diff --git a/Mage.Sets/src/mage/cards/j/JestersScepter.java b/Mage.Sets/src/mage/cards/j/JestersScepter.java index d56fba15e63..c99529d0226 100644 --- a/Mage.Sets/src/mage/cards/j/JestersScepter.java +++ b/Mage.Sets/src/mage/cards/j/JestersScepter.java @@ -43,7 +43,7 @@ public final class JestersScepter extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new JestersScepterLookAtCardEffect())); // {2}, {tap}, Put a card exiled with Jester's Scepter into its owner's graveyard: Counter target spell if it has the same name as that card. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JestersScepterCounterEffect(), new ManaCostsImpl("{2}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JestersScepterCounterEffect(), new ManaCostsImpl<>("{2}")); ability2.addCost(new TapSourceCost()); ability2.addCost(new JestersScepterCost()); ability2.addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/cards/j/JeweledAmulet.java b/Mage.Sets/src/mage/cards/j/JeweledAmulet.java index 9c879362d78..4f276ce14e7 100644 --- a/Mage.Sets/src/mage/cards/j/JeweledAmulet.java +++ b/Mage.Sets/src/mage/cards/j/JeweledAmulet.java @@ -35,7 +35,7 @@ public final class JeweledAmulet extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{0}"); // {1}, {tap}: Put a charge counter on Jeweled Amulet. Note the type of mana spent to pay this activation cost. Activate this ability only if there are no charge counters on Jeweled Amulet. - ConditionalActivatedAbility ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new JeweledAmuletAddCounterEffect(), new ManaCostsImpl("{1}"), new SourceHasCounterCondition(CounterType.CHARGE, 0, 0), rule); + ConditionalActivatedAbility ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new JeweledAmuletAddCounterEffect(), new ManaCostsImpl<>("{1}"), new SourceHasCounterCondition(CounterType.CHARGE, 0, 0), rule); ability.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(), true)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JhessianZombies.java b/Mage.Sets/src/mage/cards/j/JhessianZombies.java index 43cde7bcab8..83425250b6f 100644 --- a/Mage.Sets/src/mage/cards/j/JhessianZombies.java +++ b/Mage.Sets/src/mage/cards/j/JhessianZombies.java @@ -30,9 +30,9 @@ public final class JhessianZombies extends CardImpl { // Fear this.addAbility(FearAbility.getInstance()); // Islandcycling {2} - this.addAbility(new IslandcyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new IslandcyclingAbility(new ManaCostsImpl<>("{2}"))); // Swampcycling {2} - this.addAbility(new SwampcyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new SwampcyclingAbility(new ManaCostsImpl<>("{2}"))); } private JhessianZombies(final JhessianZombies card) { diff --git a/Mage.Sets/src/mage/cards/j/JhoirasToolbox.java b/Mage.Sets/src/mage/cards/j/JhoirasToolbox.java index fbba29c1ed9..50fffe1cc86 100644 --- a/Mage.Sets/src/mage/cards/j/JhoirasToolbox.java +++ b/Mage.Sets/src/mage/cards/j/JhoirasToolbox.java @@ -35,7 +35,7 @@ public final class JhoirasToolbox extends CardImpl { this.toughness = new MageInt(1); // {2}: Regenerate target artifact creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JinxedChoker.java b/Mage.Sets/src/mage/cards/j/JinxedChoker.java index ffbf11e8107..9dbd749c7b0 100644 --- a/Mage.Sets/src/mage/cards/j/JinxedChoker.java +++ b/Mage.Sets/src/mage/cards/j/JinxedChoker.java @@ -44,7 +44,7 @@ public final class JinxedChoker extends CardImpl { this.addAbility(upkeepAbility); // {3}: Put a charge counter on Jinxed Choker or remove one from it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JinxedChokerCounterEffect(), new ManaCostsImpl("{3}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JinxedChokerCounterEffect(), new ManaCostsImpl<>("{3}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JiwariTheEarthAflame.java b/Mage.Sets/src/mage/cards/j/JiwariTheEarthAflame.java index 6d7b6326c2e..2f9c9c104e8 100644 --- a/Mage.Sets/src/mage/cards/j/JiwariTheEarthAflame.java +++ b/Mage.Sets/src/mage/cards/j/JiwariTheEarthAflame.java @@ -44,7 +44,7 @@ public final class JiwariTheEarthAflame extends CardImpl { this.toughness = new MageInt(3); // {X}{R}, {tap}: Jiwari, the Earth Aflame deals X damage to target creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(ManacostVariableValue.REGULAR), new ManaCostsImpl("{X}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(ManacostVariableValue.REGULAR), new ManaCostsImpl<>("{X}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JodahsAvenger.java b/Mage.Sets/src/mage/cards/j/JodahsAvenger.java index dbb32877b0b..adf56bcc990 100644 --- a/Mage.Sets/src/mage/cards/j/JodahsAvenger.java +++ b/Mage.Sets/src/mage/cards/j/JodahsAvenger.java @@ -38,7 +38,7 @@ public final class JodahsAvenger extends CardImpl { this.toughness = new MageInt(4); // {0}: Until end of turn, Jodah's Avenger gets -1/-1 and gains your choice of double strike, protection from red, vigilance, or shadow. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new JodahsAvengerEffect(), new ManaCostsImpl("{0}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new JodahsAvengerEffect(), new ManaCostsImpl<>("{0}"))); } private JodahsAvenger(final JodahsAvenger card) { diff --git a/Mage.Sets/src/mage/cards/j/JohnnyComboPlayer.java b/Mage.Sets/src/mage/cards/j/JohnnyComboPlayer.java index f59457c3d8d..57bf7947817 100644 --- a/Mage.Sets/src/mage/cards/j/JohnnyComboPlayer.java +++ b/Mage.Sets/src/mage/cards/j/JohnnyComboPlayer.java @@ -30,7 +30,7 @@ public final class JohnnyComboPlayer extends CardImpl { this.toughness = new MageInt(1); // {4}: Search your library for a card, put that card into your hand, then shuffle your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterCard("a card")), false, true), new ManaCostsImpl("{4}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterCard("a card")), false, true), new ManaCostsImpl<>("{4}"))); } private JohnnyComboPlayer(final JohnnyComboPlayer card) { diff --git a/Mage.Sets/src/mage/cards/j/JolraelMwonvuliRecluse.java b/Mage.Sets/src/mage/cards/j/JolraelMwonvuliRecluse.java index deca477cce0..c4b120765b4 100644 --- a/Mage.Sets/src/mage/cards/j/JolraelMwonvuliRecluse.java +++ b/Mage.Sets/src/mage/cards/j/JolraelMwonvuliRecluse.java @@ -40,7 +40,7 @@ public final class JolraelMwonvuliRecluse extends CardImpl { CardsInControllerHandCount.instance, CardsInControllerHandCount.instance, Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURES, true ).setText("until end of turn, creatures you control have base power and toughness X/X, " + - "where X is the number of cards in your hand"), new ManaCostsImpl("{4}{G}{G}"))); + "where X is the number of cards in your hand"), new ManaCostsImpl<>("{4}{G}{G}"))); } private JolraelMwonvuliRecluse(final JolraelMwonvuliRecluse card) { diff --git a/Mage.Sets/src/mage/cards/j/JolraelsFavor.java b/Mage.Sets/src/mage/cards/j/JolraelsFavor.java index 0a227f5af33..349172e7a32 100644 --- a/Mage.Sets/src/mage/cards/j/JolraelsFavor.java +++ b/Mage.Sets/src/mage/cards/j/JolraelsFavor.java @@ -38,7 +38,7 @@ public final class JolraelsFavor extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // {1}{G}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{1}{G}"))); } private JolraelsFavor(final JolraelsFavor card) { diff --git a/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java b/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java index 8ae089d9368..a17769ed55c 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java +++ b/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java @@ -37,7 +37,7 @@ public final class JoragaAuxiliary extends CardImpl { this.toughness = new MageInt(3); // {4}{G}{W}: Support 2. (Put a +1/+1 counter on each of up to two other target creatures.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SupportEffect(this, 2, true), new ManaCostsImpl("{4}{G}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SupportEffect(this, 2, true), new ManaCostsImpl<>("{4}{G}{W}")); ability.addTarget(new TargetCreaturePermanent(0, 2, filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java b/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java index 283fb55864e..b5f8b4d9d8d 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java +++ b/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java @@ -46,7 +46,7 @@ public final class JoragaTreespeaker extends LevelerCard { this.toughness = new MageInt(1); // Level up {1}{G} ({1}{G}: Put a level counter on this. Level up only as a sorcery.) - this.addAbility(new LevelUpAbility(new ManaCostsImpl("{1}{G}"))); + this.addAbility(new LevelUpAbility(new ManaCostsImpl<>("{1}{G}"))); // LEVEL 1-4 // 1/2 diff --git a/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java b/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java index b91469bef8c..539d0cc7f4a 100644 --- a/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java +++ b/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java @@ -49,7 +49,7 @@ public final class JorubaiMurkLurker extends CardImpl { // {1}{B}: Target creature gains lifelink until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{B}")); + new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JotunOwlKeeper.java b/Mage.Sets/src/mage/cards/j/JotunOwlKeeper.java index bf6a7af4807..1167072ebdb 100644 --- a/Mage.Sets/src/mage/cards/j/JotunOwlKeeper.java +++ b/Mage.Sets/src/mage/cards/j/JotunOwlKeeper.java @@ -31,8 +31,8 @@ public final class JotunOwlKeeper extends CardImpl { // Cumulative upkeep {W} or {U} this.addAbility(new CumulativeUpkeepAbility(new OrCost( - "{W} or {U}", new ManaCostsImpl("{W}"), - new ManaCostsImpl("{U}") + "{W} or {U}", new ManaCostsImpl<>("{W}"), + new ManaCostsImpl<>("{U}") ))); // When Jötun Owl Keeper dies, put a 1/1 white Bird creature token with flying onto the battlefield for each age counter on it. diff --git a/Mage.Sets/src/mage/cards/j/Joven.java b/Mage.Sets/src/mage/cards/j/Joven.java index e131b7e97d6..53b33c801af 100644 --- a/Mage.Sets/src/mage/cards/j/Joven.java +++ b/Mage.Sets/src/mage/cards/j/Joven.java @@ -38,7 +38,7 @@ public final class Joven extends CardImpl { this.toughness = new MageInt(3); // {R}{R}{R}, {tap}: Destroy target noncreature artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{R}{R}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{R}{R}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JubilantMascot.java b/Mage.Sets/src/mage/cards/j/JubilantMascot.java index 6cb52caff59..2a21d290693 100644 --- a/Mage.Sets/src/mage/cards/j/JubilantMascot.java +++ b/Mage.Sets/src/mage/cards/j/JubilantMascot.java @@ -42,7 +42,7 @@ public final class JubilantMascot extends CardImpl { new DoIfCostPaid( new AddCountersTargetEffect(CounterType.P1P1.createInstance()) .setText("support 2"), - new ManaCostsImpl("{3}{W}") + new ManaCostsImpl<>("{3}{W}") ), TargetController.YOU, false); ability.addTarget(new TargetCreaturePermanent(0, 2, filter, false)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JujuBubble.java b/Mage.Sets/src/mage/cards/j/JujuBubble.java index fe59d134dd9..6fec374ad9d 100644 --- a/Mage.Sets/src/mage/cards/j/JujuBubble.java +++ b/Mage.Sets/src/mage/cards/j/JujuBubble.java @@ -25,7 +25,7 @@ public final class JujuBubble extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // Cumulative upkeep {1} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // When you play a card, sacrifice Juju Bubble. this.addAbility(new JujuBubbleTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/j/JundBattlemage.java b/Mage.Sets/src/mage/cards/j/JundBattlemage.java index 17eb7918357..ba62969ce9d 100644 --- a/Mage.Sets/src/mage/cards/j/JundBattlemage.java +++ b/Mage.Sets/src/mage/cards/j/JundBattlemage.java @@ -31,11 +31,11 @@ public final class JundBattlemage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{G}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JungleCreeper.java b/Mage.Sets/src/mage/cards/j/JungleCreeper.java index 78169d04d08..332064ed632 100644 --- a/Mage.Sets/src/mage/cards/j/JungleCreeper.java +++ b/Mage.Sets/src/mage/cards/j/JungleCreeper.java @@ -26,7 +26,7 @@ public final class JungleCreeper extends CardImpl { this.toughness = new MageInt(3); // {3}{B}{G}: Return Jungle Creeper from your graveyard to your hand. - this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{3}{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl<>("{3}{B}{G}"))); } private JungleCreeper(final JungleCreeper card) { diff --git a/Mage.Sets/src/mage/cards/j/JungleDelver.java b/Mage.Sets/src/mage/cards/j/JungleDelver.java index 09b05b2ac9b..baa4373b82f 100644 --- a/Mage.Sets/src/mage/cards/j/JungleDelver.java +++ b/Mage.Sets/src/mage/cards/j/JungleDelver.java @@ -29,7 +29,7 @@ public final class JungleDelver extends CardImpl { // {3}{G}: Put a +1/+1 counter on Jungle Delver. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{3}{G}"))); + new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{3}{G}"))); } private JungleDelver(final JungleDelver card) { diff --git a/Mage.Sets/src/mage/cards/j/JunglePatrol.java b/Mage.Sets/src/mage/cards/j/JunglePatrol.java index cff02c48406..05b392c16fb 100644 --- a/Mage.Sets/src/mage/cards/j/JunglePatrol.java +++ b/Mage.Sets/src/mage/cards/j/JunglePatrol.java @@ -45,7 +45,7 @@ public final class JunglePatrol extends CardImpl { this.toughness = new MageInt(2); // {1}{G}, {T}: Create a 0/1 green Wall creature token with defender named Wood. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WoodToken()), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WoodToken()), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JungleTroll.java b/Mage.Sets/src/mage/cards/j/JungleTroll.java index 9e195b4b3ce..3af07477492 100644 --- a/Mage.Sets/src/mage/cards/j/JungleTroll.java +++ b/Mage.Sets/src/mage/cards/j/JungleTroll.java @@ -25,10 +25,10 @@ public final class JungleTroll extends CardImpl { this.toughness = new MageInt(1); // {R}: Regenerate Jungle Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{R}"))); // {G}: Regenerate Jungle Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private JungleTroll(final JungleTroll card) { diff --git a/Mage.Sets/src/mage/cards/j/JungleWeaver.java b/Mage.Sets/src/mage/cards/j/JungleWeaver.java index 043c75c2f98..1a3dc510517 100644 --- a/Mage.Sets/src/mage/cards/j/JungleWeaver.java +++ b/Mage.Sets/src/mage/cards/j/JungleWeaver.java @@ -25,7 +25,7 @@ public final class JungleWeaver extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(6); this.addAbility(ReachAbility.getInstance()); - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } public JungleWeaver (final JungleWeaver card) { diff --git a/Mage.Sets/src/mage/cards/j/JunkGolem.java b/Mage.Sets/src/mage/cards/j/JunkGolem.java index c4b062074d0..49bd9a0e5d3 100644 --- a/Mage.Sets/src/mage/cards/j/JunkGolem.java +++ b/Mage.Sets/src/mage/cards/j/JunkGolem.java @@ -43,7 +43,7 @@ public final class JunkGolem extends CardImpl { )); // {1}, Discard a card: Put a +1/+1 counter on Junk Golem. - Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{1}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JununEfreet.java b/Mage.Sets/src/mage/cards/j/JununEfreet.java index b730654f3eb..9387cc5af44 100644 --- a/Mage.Sets/src/mage/cards/j/JununEfreet.java +++ b/Mage.Sets/src/mage/cards/j/JununEfreet.java @@ -28,7 +28,7 @@ public final class JununEfreet extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // At the beginning of your upkeep, sacrifice Junun Efreet unless you pay {B}{B}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{B}{B}")), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{B}{B}")), TargetController.YOU, false)); } private JununEfreet(final JununEfreet card) { diff --git a/Mage.Sets/src/mage/cards/j/JushiApprentice.java b/Mage.Sets/src/mage/cards/j/JushiApprentice.java index 91a2787988b..d1b89df3ce6 100644 --- a/Mage.Sets/src/mage/cards/j/JushiApprentice.java +++ b/Mage.Sets/src/mage/cards/j/JushiApprentice.java @@ -40,7 +40,7 @@ public final class JushiApprentice extends CardImpl { this.flipCardName = "Tomoya the Revealer"; // {2}{U}, {tap}: Draw a card. If you have nine or more cards in hand, flip Jushi Apprentice. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); ability.addEffect(new ConditionalOneShotEffect(new FlipSourceEffect(new TomoyaTheRevealer()), new CardsInHandCondition(ComparisonType.MORE_THAN, 8), "If you have nine or more cards in hand, flip {this}")); @@ -70,7 +70,7 @@ class TomoyaTheRevealer extends TokenImpl { toughness = new MageInt(3); // {3}{U}{U},{T} : Target player draws X cards, where X is the number of cards in your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(CardsInControllerHandCount.instance), new ManaCostsImpl("{3}{U}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(CardsInControllerHandCount.instance), new ManaCostsImpl<>("{3}{U}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JustTheWind.java b/Mage.Sets/src/mage/cards/j/JustTheWind.java index 5700435a655..2daffefc110 100644 --- a/Mage.Sets/src/mage/cards/j/JustTheWind.java +++ b/Mage.Sets/src/mage/cards/j/JustTheWind.java @@ -24,7 +24,7 @@ public final class JustTheWind extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Madness {U} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{U}"))); } private JustTheWind(final JustTheWind card) { diff --git a/Mage.Sets/src/mage/cards/j/Justice.java b/Mage.Sets/src/mage/cards/j/Justice.java index 0b2dc989fb9..ec0120180fd 100644 --- a/Mage.Sets/src/mage/cards/j/Justice.java +++ b/Mage.Sets/src/mage/cards/j/Justice.java @@ -33,7 +33,7 @@ public final class Justice extends CardImpl { // At the beginning of your upkeep, sacrifice Justice unless you pay {W}{W}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{W}{W}")), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{W}{W}")), TargetController.YOU, false)); // Whenever a red creature or spell deals damage, Justice deals that much damage to that creature's or spell's controller. this.addAbility(new JusticeTriggeredAbility(new JusticeEffect()));