Refactor: Fix raw use of parameterized class ManaCostsImpl - 'S' cards (#9084)

Mage.Sets/src/mage/cards/s/SaberclawGolem.java

@@ -26,7 +26,7 @@ public final class SaberclawGolem extends CardImpl {
         this.subtype.add(SubType.GOLEM);
         this.power = new MageInt(4);
         this.toughness = new MageInt(2);
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{R}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")));
     }
 
     public SaberclawGolem (final SaberclawGolem card) {

Mage.Sets/src/mage/cards/s/SabertoothCobra.java

@@ -33,7 +33,7 @@ public final class SabertoothCobra extends CardImpl {
         Ability ability = new DealsDamageToAPlayerTriggeredAbility(effect, false, true);
         effect = new AddPoisonCounterTargetEffect(1);
         effect.setText("That player gets another poison counter.");
-        ability.addEffect(new UnlessPaysDelayedEffect(new ManaCostsImpl("{2}"), effect, PhaseStep.UPKEEP, true,
+        ability.addEffect(new UnlessPaysDelayedEffect(new ManaCostsImpl<>("{2}"), effect, PhaseStep.UPKEEP, true,
             "That player gets another poison counter at the beginning of their next upkeep unless they pay {2} before that turn."));
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/SacellumArchers.java

@@ -30,7 +30,7 @@ public final class SacellumArchers extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {R}{W}, {tap}: Sacellum Archers deals 2 damage to target attacking or blocking creature.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}{W}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetAttackingOrBlockingCreature());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/SacredCat.java

@@ -28,7 +28,7 @@ public final class SacredCat extends CardImpl {
         this.addAbility(LifelinkAbility.getInstance());
 
         // Embalm {W}
-        this.addAbility(new EmbalmAbility(new ManaCostsImpl("{W}"), this));
+        this.addAbility(new EmbalmAbility(new ManaCostsImpl<>("{W}"), this));
     }
 
     private SacredCat(final SacredCat card) {

Mage.Sets/src/mage/cards/s/SacredGuide.java

@@ -38,7 +38,7 @@ public final class SacredGuide extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {1}{W}, Sacrifice Sacred Guide: Reveal cards from the top of your library until you reveal a white card. Put that card into your hand and exile all other cards revealed this way.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RevealCardsFromLibraryUntilEffect(filterCard, Zone.HAND, Zone.EXILED), new ManaCostsImpl("{1}{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RevealCardsFromLibraryUntilEffect(filterCard, Zone.HAND, Zone.EXILED), new ManaCostsImpl<>("{1}{W}"));
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/SacredWhiteDeer.java

@@ -41,7 +41,7 @@ public final class SacredWhiteDeer extends CardImpl {
         Ability ability = new ConditionalActivatedAbility(
                 Zone.BATTLEFIELD,
                 new GainLifeEffect(4),
-                new ManaCostsImpl("{3}{G}"),
+                new ManaCostsImpl<>("{3}{G}"),
                 new PermanentsOnTheBattlefieldCondition(filter)
         );
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/s/SadisticObsession.java

@@ -37,7 +37,7 @@ public final class SadisticObsession extends CardImpl {
 
         // Enchanted creature has "{B}, {T}: Put a -1/-1 counter on target creature."
         ability = new SimpleActivatedAbility(new AddCountersTargetEffect(
-                CounterType.M1M1.createInstance()), new ManaCostsImpl("{B}")
+                CounterType.M1M1.createInstance()), new ManaCostsImpl<>("{B}")
         );
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent());

Mage.Sets/src/mage/cards/s/SafeHaven.java

@@ -27,7 +27,7 @@ public final class SafeHaven extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
 
         // {2}, {tap}: Exile target creature you control.
-        Ability ability = new SimpleActivatedAbility(new ExileTargetForSourceEffect(), new ManaCostsImpl("{2}"));
+        Ability ability = new SimpleActivatedAbility(new ExileTargetForSourceEffect(), new ManaCostsImpl<>("{2}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetControlledCreaturePermanent());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/Safeguard.java

@@ -26,7 +26,7 @@ public final class Safeguard extends CardImpl {
         // {2}{W}: Prevent all combat damage that would be dealt by target creature this turn.
         Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true);
         effect.setText("Prevent all combat damage that would be dealt by target creature this turn.");
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{W}"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/SafeholdSentry.java

@@ -31,7 +31,7 @@ public final class SafeholdSentry extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {2}{W}, {untap}: Safehold Sentry gets +0/+2 until end of turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 2, Duration.EndOfTurn), new ManaCostsImpl("{2}{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}"));
         ability.addCost(new UntapSourceCost());
         this.addAbility(ability);
         

Mage.Sets/src/mage/cards/s/SageEyeHarrier.java

@@ -28,7 +28,7 @@ public final class SageEyeHarrier extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
         // Morph {3}{W}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{W}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{W}")));
     }
 
     private SageEyeHarrier(final SageEyeHarrier card) {

Mage.Sets/src/mage/cards/s/SaguArcher.java

@@ -28,7 +28,7 @@ public final class SaguArcher extends CardImpl {
         // Reach
         this.addAbility(ReachAbility.getInstance());
         // Morph {4}{G}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{G}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{G}")));
     }
 
     private SaguArcher(final SaguArcher card) {

Mage.Sets/src/mage/cards/s/SaguMauler.java

@@ -30,7 +30,7 @@ public final class SaguMauler extends CardImpl {
         // Hexproof
         this.addAbility(HexproofAbility.getInstance());
         // Morph {3}{G}{U}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{G}{U}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{G}{U}")));
     }
 
     private SaguMauler(final SaguMauler card) {

Mage.Sets/src/mage/cards/s/SaiMasterThopterist.java

@@ -49,7 +49,7 @@ public final class SaiMasterThopterist extends CardImpl {
         Ability ability = new SimpleActivatedAbility(
                 Zone.BATTLEFIELD,
                 new DrawCardSourceControllerEffect(1),
-                new ManaCostsImpl("{1}{U}")
+                new ManaCostsImpl<>("{1}{U}")
         );
         ability.addCost(new SacrificeTargetCost(
                 new TargetControlledPermanent(2, 2, filter2, false)

Mage.Sets/src/mage/cards/s/Sailmonger.java

@@ -31,7 +31,7 @@ public final class Sailmonger extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {2}: Target creature gains flying until end of turn. Any player may activate this ability.
-        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}"));
+        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}"));
         ability.addTarget(new TargetCreaturePermanent());
         ability.setMayActivate(TargetController.ANY);
         ability.addEffect(new InfoEffect("Any player may activate this ability"));

Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java

@@ -61,7 +61,7 @@ class SakashimaTheImpostorCopyApplier extends CopyApplier {
         // {2}{U}{U}: Return Sakashima the Impostor to its owner's hand at the beginning of the next end step
         blueprint.getAbilities().add(new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnToHandSourceEffect(true)), false),
-                new ManaCostsImpl("{2}{U}{U}")
+                new ManaCostsImpl<>("{2}{U}{U}")
         ));
         return true;
     }

Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java

@@ -32,7 +32,7 @@ public final class SaltRoadAmbushers extends CardImpl {
         this.addAbility(new SaltRoadAmbushersTriggeredAbility());
         
         // Megamorph {3}{G}{G}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{G}{G}"), true));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{G}{G}"), true));
     }
 
     private SaltRoadAmbushers(final SaltRoadAmbushers card) {

Mage.Sets/src/mage/cards/s/SaltRoadPatrol.java

@@ -25,7 +25,7 @@ public final class SaltRoadPatrol extends CardImpl {
         this.toughness = new MageInt(5);
 
         // Outlast {1}{W}
-        this.addAbility(new OutlastAbility(new ManaCostsImpl("{1}{W}")));
+        this.addAbility(new OutlastAbility(new ManaCostsImpl<>("{1}{W}")));
     }
 
     private SaltRoadPatrol(final SaltRoadPatrol card) {

Mage.Sets/src/mage/cards/s/SaltRoadQuartermasters.java

@@ -36,7 +36,7 @@ public final class SaltRoadQuartermasters extends CardImpl {
                 "with two +1/+1 counters on it"));
 
         // {2}{G}, Remove a +1/+1 counter from Salt Road Quartermasters: Put a +1/+1 counter on target creature.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl("{2}{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{2}{G}"));
         ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1)));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/SamiteAlchemist.java

@@ -33,7 +33,7 @@ public final class SamiteAlchemist extends CardImpl {
         // {W}{W}, {tap}: Prevent the next 4 damage that would be dealt this turn to target creature you control. Tap that creature. It doesn't untap during your next untap step.
         Ability ability = new SimpleActivatedAbility(
                 new PreventDamageToTargetEffect(Duration.EndOfTurn, 4),
-                new ManaCostsImpl("{W}{W}")
+                new ManaCostsImpl<>("{W}{W}")
         );
         ability.addCost(new TapSourceCost());
         ability.addEffect(new TapTargetEffect("Tap that creature"));

Mage.Sets/src/mage/cards/s/SamiteCenserBearer.java

@@ -34,7 +34,7 @@ public final class SamiteCenserBearer extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {W}, Sacrifice Samite Censer-Bearer: Prevent the next 1 damage that would be dealt to each creature you control this turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SamiteCenserBearerEffect(), new ManaCostsImpl("{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SamiteCenserBearerEffect(), new ManaCostsImpl<>("{W}"));
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/SamiteSanctuary.java

@@ -24,7 +24,7 @@ public final class SamiteSanctuary extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}");
 
         // {2}: Prevent the next 1 damage that would be dealt to target creature this turn. Any player may activate this ability.
-        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn ,1), new ManaCostsImpl("{2}"));
+        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn ,1), new ManaCostsImpl<>("{2}"));
         ability.addTarget(new TargetCreaturePermanent());
         ability.setMayActivate(TargetController.ANY);
         ability.addEffect(new InfoEffect("Any player may activate this ability"));

Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java

@@ -64,7 +64,7 @@ public final class SamutVoiceOfDissent extends CardImpl {
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter)));
 
         //W, Tap: Untap another target creature.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{W}"));
         ability.addTarget(new TargetCreaturePermanent(filter2));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java

@@ -47,7 +47,7 @@ public final class SanctifierOfSouls extends CardImpl {
         // {2}{W}, Exile a creature card from your graveyard: Create a 1/1 white Spirit creature token with flying.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new CreateTokenEffect(new SpiritWhiteToken()),
-                new ManaCostsImpl("{2}{W}"));
+                new ManaCostsImpl<>("{2}{W}"));
         ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card from your graveyard"))));
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/SanctuarySmasher.java

@@ -33,7 +33,7 @@ public final class SanctuarySmasher extends CardImpl {
         this.addAbility(FirstStrikeAbility.getInstance());
 
         // Cycling {2}{R}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}{R}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}{R}")));
 
         // When you cycle Sanctuary Smasher, put a first strike counter on target creature you control.
         Ability ability = new CycleTriggeredAbility(

Mage.Sets/src/mage/cards/s/SanctumPlowbeast.java

@@ -30,8 +30,8 @@ public final class SanctumPlowbeast extends CardImpl {
         // Defender
         this.addAbility(DefenderAbility.getInstance());
         // Plainscycling {2}, islandcycling {2}
-        this.addAbility(new PlainscyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new PlainscyclingAbility(new ManaCostsImpl<>("{2}")));
-        this.addAbility(new IslandcyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new IslandcyclingAbility(new ManaCostsImpl<>("{2}")));
     }
 
     private SanctumPlowbeast(final SanctumPlowbeast card) {

Mage.Sets/src/mage/cards/s/SandalsOfAbdallah.java

@@ -29,7 +29,7 @@ public final class SandalsOfAbdallah extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}");
 
         // {2}, {tap}: Target creature gains islandwalk until end of turn. When that creature dies this turn, destroy Sandals of Abdallah.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new IslandwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl("{2}"));        
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new IslandwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/SandbarMerfolk.java

@@ -23,7 +23,7 @@ public final class SandbarMerfolk extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}")));
     }
 
     private SandbarMerfolk(final SandbarMerfolk card) {

Mage.Sets/src/mage/cards/s/SandbarSerpent.java

@@ -23,7 +23,7 @@ public final class SandbarSerpent extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(4);
 
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}")));
     }
 
     private SandbarSerpent(final SandbarSerpent card) {

Mage.Sets/src/mage/cards/s/SandstormCharger.java

@@ -23,7 +23,7 @@ public final class SandstormCharger extends CardImpl {
         this.toughness = new MageInt(4);
 
         // Megamorph {4}{W}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{W}"), true));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{W}"), true));
     }
 
     private SandstormCharger(final SandstormCharger card) {

Mage.Sets/src/mage/cards/s/SandstormEidolon.java

@@ -32,7 +32,7 @@ public final class SandstormEidolon extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {R}, Sacrifice Sandstorm Eidolon: Target creature can't block this turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{R}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}"));
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/SanguineGuard.java

@@ -29,7 +29,7 @@ public final class SanguineGuard extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
         this.addAbility(FirstStrikeAbility.getInstance());
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}")));
     }
 
     private SanguineGuard(final SanguineGuard card) {

Mage.Sets/src/mage/cards/s/SanguinePraetor.java

@@ -36,7 +36,7 @@ public final class SanguinePraetor extends CardImpl {
         this.toughness = new MageInt(5);
 
         // {B}, Sacrifice a creature: Destroy each creature with the same converted mana cost as the sacrificed creature.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SanguinePraetorEffect(), new ManaCostsImpl("{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SanguinePraetorEffect(), new ManaCostsImpl<>("{B}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT)));
         this.addAbility(ability);
 

Mage.Sets/src/mage/cards/s/SanitariumSkeleton.java

@@ -25,7 +25,7 @@ public final class SanitariumSkeleton extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {2}{B}: Return Sanitarium Skeleton from your graveyard to your hand.
-        this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{2}{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl<>("{2}{B}")));
     }
 
     private SanitariumSkeleton(final SanitariumSkeleton card) {

Mage.Sets/src/mage/cards/s/SapphireLeech.java

@@ -38,7 +38,7 @@ public final class SapphireLeech extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
         // Blue spells you cast cost {U} more to cast.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
-                new SpellsCostIncreasingAllEffect(new ManaCostsImpl("{U}"), filter, TargetController.YOU)));
+                new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{U}"), filter, TargetController.YOU)));
     }
 
     private SapphireLeech(final SapphireLeech card) {

Mage.Sets/src/mage/cards/s/SaprazzanBreaker.java

@@ -29,7 +29,7 @@ public final class SaprazzanBreaker extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {U}: Put the top card of your library into your graveyard. If that card is a land card, Saprazzan Breaker can't be blocked this turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SaprazzanBreakerEffect(), new ManaCostsImpl("{U}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SaprazzanBreakerEffect(), new ManaCostsImpl<>("{U}")));
     }
 
     private SaprazzanBreaker(final SaprazzanBreaker card) {

Mage.Sets/src/mage/cards/s/SaprolingSymbiosis.java

@@ -25,7 +25,7 @@ public final class SaprolingSymbiosis extends CardImpl {
         Effect effect = new CreateTokenEffect(new SaprolingToken(), new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURE));
 
         // You may cast Saproling Symbiosis as though it had flash if you pay {2} more to cast it. (You may cast it any time you could cast an instant.)
-        Ability ability = new PayMoreToCastAsThoughtItHadFlashAbility(this, new ManaCostsImpl("{2}"));
+        Ability ability = new PayMoreToCastAsThoughtItHadFlashAbility(this, new ManaCostsImpl<>("{2}"));
         ability.addEffect(effect);
         ability.setRuleAtTheTop(true);
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/SapseepForest.java

@@ -45,7 +45,7 @@ public final class SapseepForest extends CardImpl {
         // {G}, {tap}: You gain 1 life. Activate this ability only if you control two or more green permanents.
         Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD,
                 new GainLifeEffect(1),
-                new ManaCostsImpl("{G}"),
+                new ManaCostsImpl<>("{G}"),
                 new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 1));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVII.java

@@ -35,7 +35,7 @@ public final class SarpadianEmpiresVolVII extends CardImpl {
         // As Sarpadian Empires, Vol. VII enters the battlefield, choose white Citizen, blue Camarid, black Thrull, red Goblin, or green Saproling.
         this.addAbility(new AsEntersBattlefieldAbility(new SarpadianEmpiresChooseTokenEffect()));
         // {3}, {T}: Create a 1/1 creature token of the chosen color and type.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SarpadianEmpiresCreateSelectedTokenEffect(), new ManaCostsImpl("{3}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SarpadianEmpiresCreateSelectedTokenEffect(), new ManaCostsImpl<>("{3}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/SatyrHedonist.java

@@ -27,7 +27,7 @@ public final class SatyrHedonist extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {R}, Sacrifice Satyr Hedonist: Add {R}{R}{R}.
-        SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(3), new ManaCostsImpl("{R}"));
+        SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(3), new ManaCostsImpl<>("{R}"));
         ability .addCost(new SacrificeSourceCost());
         this.addAbility(ability);
 

Mage.Sets/src/mage/cards/s/SatyrNyxSmith.java

@@ -31,7 +31,7 @@ public final class SatyrNyxSmith extends CardImpl {
         // Haste
         this.addAbility(HasteAbility.getInstance());
         // <i>Inspired</i> &mdash; Whenever Satyr Nyx-Smith becomes untapped, you may pay {2}{R}. If you do, create a 3/1 red Elemental enchantment creature token with haste.
-        this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new SatyrNyxSmithElementalToken()), new ManaCostsImpl("{2}{R}"))));
+        this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new SatyrNyxSmithElementalToken()), new ManaCostsImpl<>("{2}{R}"))));
 
     }
 

Mage.Sets/src/mage/cards/s/SatyrPiper.java

@@ -30,7 +30,7 @@ public final class SatyrPiper extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {3}{G}: Target creature must be blocked this turn if able.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{3}{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}{G}"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
 

Mage.Sets/src/mage/cards/s/SavaenElves.java

@@ -43,7 +43,7 @@ public final class SavaenElves extends CardImpl {
         // {G}{G}, {tap}: Destroy target Aura attached to a land.
         Effect effect = new DestroyTargetEffect();
         effect.setText("Destroy target Aura attached to a land");
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{G}{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{G}{G}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/SavageGorilla.java

@@ -30,7 +30,7 @@ public final class SavageGorilla extends CardImpl {
 
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new ManaCostsImpl("{U}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new ManaCostsImpl<>("{U}{B}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         ability.addEffect(new DrawCardSourceControllerEffect(1));

Mage.Sets/src/mage/cards/s/SavageKnuckleblade.java

@@ -32,13 +32,13 @@ public final class SavageKnuckleblade extends CardImpl {
         this.toughness = new MageInt(4);
 
         // {2}{G}: Savage Knuckleblade gets +2/+2 until end of turn.  Activate this ability only once each turn.
-        this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{2}{G}")));
+        this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")));
 
         // {2}{U}: Return Savage Knuckleblade to its owner's hand.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{2}{U}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}")));
         
         // {R}: Savage Knuckleblade gains haste until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{R}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")));
 
 
     }

Mage.Sets/src/mage/cards/s/SavagebornHydra.java

@@ -36,7 +36,7 @@ public final class SavagebornHydra extends CardImpl {
         this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance())));
 
         // {1}{RG}: Put a +1/+1 counter on Savageborn Hydra. Activate this ability only any time you could cast a sorcery.
-        this.addAbility(new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{1}{R/G}")));
+        this.addAbility(new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{1}{R/G}")));
     }
 
     private SavagebornHydra(final SavagebornHydra card) {

Mage.Sets/src/mage/cards/s/SavaiCrystal.java

@@ -25,7 +25,7 @@ public final class SavaiCrystal extends CardImpl {
         this.addAbility(new BlackManaAbility());
 
         // Cycling {2}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}")));
     }
 
     private SavaiCrystal(final SavaiCrystal card) {

Mage.Sets/src/mage/cards/s/ScaldingDevil.java

@@ -28,7 +28,7 @@ public final class ScaldingDevil extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {2}{R}: Scalding Devil deals 1 damage to target player.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{2}{R}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{2}{R}"));
         ability.addTarget(new TargetPlayerOrPlaneswalker());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/Scaldkin.java

@@ -32,7 +32,7 @@ public final class Scaldkin extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
         // {2}{R}, Sacrifice Scaldkin: Scaldkin deals 2 damage to any target.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{R}"));
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetAnyTarget());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/ScaleUp.java

@@ -41,7 +41,7 @@ public final class ScaleUp extends CardImpl {
                 new CreatureToken(6, 4, "green Wurm with base power and toughness 6/4")
                         .withColor("G").withSubType(SubType.WURM),
                 null, filter, Duration.EndOfTurn, true, false, true
-        ), new ManaCostsImpl("{4}{G}{G}")));
+        ), new ManaCostsImpl<>("{4}{G}{G}")));
     }
 
     private ScaleUp(final ScaleUp card) {

Mage.Sets/src/mage/cards/s/Scandalmonger.java

@@ -29,7 +29,7 @@ public final class Scandalmonger extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {2}: Target player discards a card. Any player may activate this ability but only any time they could cast a sorcery.
-        ActivateAsSorceryActivatedAbility ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{2}"));
+        ActivateAsSorceryActivatedAbility ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl<>("{2}"));
         ability.addTarget(new TargetPlayer());
         ability.setMayActivate(TargetController.ANY);
         ability.addEffect(new InfoEffect("Any player may activate this ability"));

Mage.Sets/src/mage/cards/s/ScarabFeast.java

@@ -23,7 +23,7 @@ public final class ScarabFeast extends CardImpl {
         getSpellAbility().addTarget(new TargetCardInASingleGraveyard(0, 3, StaticFilters.FILTER_CARD_CARDS));
 
         // Cycling {B}
-        addAbility(new CyclingAbility(new ManaCostsImpl("{B}")));
+        addAbility(new CyclingAbility(new ManaCostsImpl<>("{B}")));
     }
 
     private ScarabFeast(final ScarabFeast card) {

Mage.Sets/src/mage/cards/s/ScarredVinebreeder.java

@@ -39,7 +39,7 @@ public final class ScarredVinebreeder extends CardImpl {
         // {2}{B}, Exile an Elf card from your graveyard: Scarred Vinebreeder gets +3/+3 until end of turn.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new BoostSourceEffect(3, 3, Duration.EndOfTurn),
-                new ManaCostsImpl("{2}{B}"));
+                new ManaCostsImpl<>("{2}{B}"));
         ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filter)));
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/ScarwoodBandits.java

@@ -50,7 +50,7 @@ public final class ScarwoodBandits extends CardImpl {
                                 new SourceRemainsInZoneCondition(Zone.BATTLEFIELD),
                                 "gain control of target artifact for as long as {this} remains on the battlefield"),
                         new GenericManaCost(2)),
-                new ManaCostsImpl("{2}{G}"));
+                new ManaCostsImpl<>("{2}{G}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetArtifactPermanent());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/ScarwoodHag.java

@@ -34,7 +34,7 @@ public final class ScarwoodHag extends CardImpl {
         // {G}{G}{G}{G}, {tap}: Target creature gains forestwalk until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new GainAbilityTargetEffect(new ForestwalkAbility(false), Duration.EndOfTurn),
-                new ManaCostsImpl("{G}{G}{G}{G}"));
+                new ManaCostsImpl<>("{G}{G}{G}{G}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/ScatteredGroves.java

@@ -32,7 +32,7 @@ public final class ScatteredGroves extends CardImpl {
         this.addAbility(new EntersBattlefieldTappedAbility());
 
         // Cycling {2}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}")));
 
     }
 

Mage.Sets/src/mage/cards/s/ScavengerFolk.java

@@ -30,7 +30,7 @@ public final class ScavengerFolk extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {G}, {T}, Sacrifice Scavenger Folk: Destroy target artifact.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G}"));                                                                                    ability.addCost(new TapSourceCost());
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{G}"));                                                                                    ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetArtifactPermanent());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/ScavengerGrounds.java

@@ -41,7 +41,7 @@ public final class ScavengerGrounds extends CardImpl {
         Ability ability2 = new SimpleActivatedAbility(
                 Zone.BATTLEFIELD,
                 new ExileGraveyardAllPlayersEffect(),
-                new ManaCostsImpl("{2}"));
+                new ManaCostsImpl<>("{2}"));
         ability2.addCost(new TapSourceCost());
         ability2.addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, filter, true)));
         this.addAbility(ability2);

Mage.Sets/src/mage/cards/s/ScavengingOoze.java

@@ -34,7 +34,7 @@ public final class ScavengingOoze extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {G}: Exile target card from a graveyard. If it was a creature card, put a +1/+1 counter on Scavenging Ooze and you gain 1 life.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScavengingOozeEffect(), new ManaCostsImpl("{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScavengingOozeEffect(), new ManaCostsImpl<>("{G}"));
         ability.addTarget(new TargetCardInGraveyard());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/ScepterOfDominance.java

@@ -23,7 +23,7 @@ public final class ScepterOfDominance extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}{W}{W}");
 
 
-        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}"));
+        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPermanent());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/ScepterOfFugue.java

@@ -25,7 +25,7 @@ public final class ScepterOfFugue extends CardImpl {
 
 
         // {1}{B}, {T}: Target player discards a card. Activate this ability only during your turn.
-        Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{1}{B}"), MyTurnCondition.instance);
+        Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl<>("{1}{B}"), MyTurnCondition.instance);
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
         ability.addHint(MyTurnHint.instance);

Mage.Sets/src/mage/cards/s/ScepterOfInsight.java

@@ -22,7 +22,7 @@ public final class ScepterOfInsight extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}{U}{U}");
 
 
-        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{3}{U}"));
+        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{U}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/ScholarOfAthreos.java

@@ -30,7 +30,7 @@ public final class ScholarOfAthreos extends CardImpl {
         this.toughness = new MageInt(4);
 
         // {2}{B}: Each opponent loses 1 life. You gain life equal to the life lost this way.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScholarOfAthreosEffect(), new ManaCostsImpl("{2}{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScholarOfAthreosEffect(), new ManaCostsImpl<>("{2}{B}")));
     }
 
     private ScholarOfAthreos(final ScholarOfAthreos card) {

Mage.Sets/src/mage/cards/s/SchoolOfPiranha.java

@@ -25,7 +25,7 @@ public final class SchoolOfPiranha extends CardImpl {
         this.toughness = new MageInt(3);
 
         // At the beginning of your upkeep, sacrifice School of Piranha unless you pay {1}{U}.
-        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{1}{U}")), TargetController.YOU, false));
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{1}{U}")), TargetController.YOU, false));
     }
 
     private SchoolOfPiranha(final SchoolOfPiranha card) {

Mage.Sets/src/mage/cards/s/ScionOfDarkness.java

@@ -40,7 +40,7 @@ public final class ScionOfDarkness extends CardImpl {
         this.addAbility(new ScionOfDarknessTriggeredAbility());
 
         // Cycling {3}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{3}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{3}")));
     }
 
     private ScionOfDarkness(final ScionOfDarkness card) {

Mage.Sets/src/mage/cards/s/ScionOfGlaciers.java

@@ -27,7 +27,7 @@ public final class ScionOfGlaciers extends CardImpl {
         this.toughness = new MageInt(5);
 
         // {U}: Scion of Glaciers gets +1/-1 until end of turn
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl("{U}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}")));
     }
 
     private ScionOfGlaciers(final ScionOfGlaciers card) {

Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java

@@ -38,7 +38,7 @@ public final class ScionOfTheUrDragon extends CardImpl {
         // {2}: Search your library for a Dragon permanent card and put it into your graveyard. If you do, Scion of the Ur-Dragon becomes a copy of that card until end of turn. Then shuffle your library.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new ScionOfTheUrDragonEffect(),
-                new ManaCostsImpl("{2}")));
+                new ManaCostsImpl<>("{2}")));
     }
 
     private ScionOfTheUrDragon(final ScionOfTheUrDragon card) {

Mage.Sets/src/mage/cards/s/ScorchingMissile.java

@@ -25,7 +25,7 @@ public final class ScorchingMissile extends CardImpl {
         this.getSpellAbility().addTarget(new TargetPlayerOrPlaneswalker());
 
         // Flashback {9}{R}
-        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{9}{R}")));
+        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{9}{R}")));
 
     }
 

Mage.Sets/src/mage/cards/s/ScornfulEgotist.java

@@ -24,7 +24,7 @@ public final class ScornfulEgotist extends CardImpl {
         this.toughness = new MageInt(1);
 
         // Morph {U}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{U}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}")));
     }
 
     private ScornfulEgotist(final ScornfulEgotist card) {

Mage.Sets/src/mage/cards/s/ScourAllPossibilities.java

@@ -24,7 +24,7 @@ public final class ScourAllPossibilities extends CardImpl {
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy(", then"));
 
         // Flashback {4}{U}
-        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{4}{U}")));
+        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{4}{U}")));
 
     }
 

Mage.Sets/src/mage/cards/s/ScourgeDevil.java

@@ -29,7 +29,7 @@ public final class ScourgeDevil extends CardImpl {
         // When Scourge Devil enters the battlefield, creatures you control get +1/+0 until end of turn.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new BoostControlledEffect(1, 0, Duration.EndOfTurn)));
         // Unearth {2}{R}
-        this.addAbility(new UnearthAbility(new ManaCostsImpl("{2}{R}")));
+        this.addAbility(new UnearthAbility(new ManaCostsImpl<>("{2}{R}")));
     }
 
     private ScourgeDevil(final ScourgeDevil card) {

Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java

@@ -43,11 +43,11 @@ public final class ScourgeOfKherRidges extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
         
         // {1}{R}: Scourge of Kher Ridges deals 2 damage to each creature without flying.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(2, filter), new ManaCostsImpl("{1}{R}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(2, filter), new ManaCostsImpl<>("{1}{R}"));
         this.addAbility(ability);
         
         // {5}{R}: Scourge of Kher Ridges deals 6 damage to each other creature with flying.
-        Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(6, filter2), new ManaCostsImpl("{5}{R}"));
+        Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(6, filter2), new ManaCostsImpl<>("{5}{R}"));
         this.addAbility(ability2);
     }
 

Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java

@@ -41,7 +41,7 @@ public final class ScourgeOfTheNobilis extends CardImpl {
         // As long as enchanted creature is red, it gets +1/+1 and has "{RW}: This creature gets +1/+0 until end of turn."
         SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1"));
         redAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(
-                new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R/W}")), AttachmentType.AURA),
+                new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R/W}")), AttachmentType.AURA),
                 new EnchantedCreatureColorCondition(ObjectColor.RED), "and has \"{R/W}: This creature gets +1/+0 until end of turn.\""));
         this.addAbility(redAbility);
 

Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java

@@ -49,7 +49,7 @@ public final class ScourgeOfValkas extends CardImpl {
         this.addAbility(ability);
 
         // {R}: Scourge of Valkas gets +1/+0 until end of turn.
-        this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")));
+        this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")));
     }
 
     private ScourgeOfValkas(final ScourgeOfValkas card) {

Mage.Sets/src/mage/cards/s/Scrap.java

@@ -21,7 +21,7 @@ public final class Scrap extends CardImpl {
 
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addTarget(new TargetArtifactPermanent());
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}")));
     }
 
     private Scrap(final Scrap card) {

Mage.Sets/src/mage/cards/s/Scrapbasket.java

@@ -32,7 +32,7 @@ public final class Scrapbasket extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {1}: Scrapbasket becomes all colors until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesAllColorsEffect(), new ManaCostsImpl("{1}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesAllColorsEffect(), new ManaCostsImpl<>("{1}")));
         
     }
 

Mage.Sets/src/mage/cards/s/ScreamsOfTheDamned.java

@@ -24,7 +24,7 @@ public final class ScreamsOfTheDamned extends CardImpl {
 
 
         // {1}{B}, Exile a card from your graveyard: Screams of the Damned deals 1 damage to each creature and each player.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl("{1}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl<>("{1}{B}"));
         ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard()));
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/ScreechingGriffin.java

@@ -33,7 +33,7 @@ public final class ScreechingGriffin extends CardImpl {
 
         // {R}: Target creature can't block Screeching Griffin this turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn),
-                new ManaCostsImpl("{R}"));
+                new ManaCostsImpl<>("{R}"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/ScreechingHarpy.java

@@ -27,7 +27,7 @@ public final class ScreechingHarpy extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
         this.addAbility(FlyingAbility.getInstance());
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}")));
     }
 
     private ScreechingHarpy(final ScreechingHarpy card) {

Mage.Sets/src/mage/cards/s/ScreechingPhoenix.java

@@ -33,7 +33,7 @@ public final class ScreechingPhoenix extends CardImpl {
         this.addAbility(new SimpleActivatedAbility(
                 Zone.BATTLEFIELD,
                 new BoostControlledEffect(1, 0, Duration.EndOfTurn),
-                new ManaCostsImpl("{2}{R}")
+                new ManaCostsImpl<>("{2}{R}")
         ));
     }
 

Mage.Sets/src/mage/cards/s/ScrollOfFate.java

@@ -88,7 +88,7 @@ class ScrollOfFateEffect extends OneShotEffect {
             if (card.isCreature(game)) {
                 manaCosts = card.getSpellAbility() != null ? card.getSpellAbility().getManaCosts() : null;
                 if (manaCosts == null) {
-                    manaCosts = new ManaCostsImpl("{0}");
+                    manaCosts = new ManaCostsImpl<>("{0}");
                 }
             }
             MageObjectReference objectReference = new MageObjectReference(card.getId(),

Mage.Sets/src/mage/cards/s/ScrollOfTheMasters.java

@@ -45,7 +45,7 @@ public final class ScrollOfTheMasters extends CardImpl {
         Effect effect = new BoostTargetEffect(xValue, xValue, Duration.EndOfTurn);
         effect.setText("Target creature you control gets +1/+1 until end of turn for each lore counter on {this}");
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD, effect, new ManaCostsImpl("{3}"));
+                Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{3}"));
         ability.addTarget(new TargetControlledCreaturePermanent());
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/ScryingGlass.java

@@ -28,7 +28,7 @@ public final class ScryingGlass extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}");
 
         // {3}, {tap}: Choose a number greater than 0 and a color. Target opponent reveals their hand. If that opponent reveals exactly the chosen number of cards of the chosen color, you draw a card.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryingGlassEffect(), new ManaCostsImpl("{3}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryingGlassEffect(), new ManaCostsImpl<>("{3}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/SeaGateWreckage.java

@@ -28,7 +28,7 @@ public final class SeaGateWreckage extends CardImpl {
         
         // {2}{C}, {T}: Draw a card. Activate this ability only if you have no cards in hand.
         Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1),
-            new ManaCostsImpl("{2}{C}"), HellbentCondition.instance);
+            new ManaCostsImpl<>("{2}{C}"), HellbentCondition.instance);
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/SeaSpirit.java

@@ -28,7 +28,7 @@ public final class SeaSpirit extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {U}: Sea Spirit gets +1/+0 until end of turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(+1, +0, Duration.EndOfTurn), new ManaCostsImpl("{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(+1, +0, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/cards/s/SeaTroll.java

@@ -36,7 +36,7 @@ public final class SeaTroll extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {U}: Regenerate Sea Troll. Activate this ability only if Sea Troll blocked or was blocked by a blue creature this turn.
-        Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{U}"), new SeaTrollCondition());
+        Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{U}"), new SeaTrollCondition());
         ability.addWatcher(new SeaTrollWatcher());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/SearchForTomorrow.java

@@ -28,7 +28,7 @@ public final class SearchForTomorrow extends CardImpl {
         this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(target, false, Outcome.PutLandInPlay));
         
         // Suspend 2-{G}
-        this.addAbility(new SuspendAbility(2, new ManaCostsImpl("{G}"), this));
+        this.addAbility(new SuspendAbility(2, new ManaCostsImpl<>("{G}"), this));
     }
 
     private SearchForTomorrow(final SearchForTomorrow card) {

Mage.Sets/src/mage/cards/s/SearchlightGeist.java

@@ -32,7 +32,7 @@ public final class SearchlightGeist extends CardImpl {
         // {3}{B}: Searchlight Geist gains deathtouch until end of turn.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn),
-                new ManaCostsImpl("{3}{B}")));
+                new ManaCostsImpl<>("{3}{B}")));
     }
 
     private SearchlightGeist(final SearchlightGeist card) {

Mage.Sets/src/mage/cards/s/SearingSpearAskari.java

@@ -33,7 +33,7 @@ public final class SearingSpearAskari extends CardImpl {
         this.addAbility(new FlankingAbility());
         
         // {1}{R}: Searing Spear Askari gains menace until end of turn. (It can't be blocked except by two or more creatures.)
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new MenaceAbility(), Duration.EndOfTurn), new ManaCostsImpl("{1}{R}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new MenaceAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")));
     }
 
     private SearingSpearAskari(final SearingSpearAskari card) {

Mage.Sets/src/mage/cards/s/SeasonedPyromancer.java

@@ -41,7 +41,7 @@ public final class SeasonedPyromancer extends CardImpl {
         Ability ability = new SimpleActivatedAbility(
                 Zone.GRAVEYARD,
                 new CreateTokenEffect(new RedElementalToken(), 2),
-                new ManaCostsImpl("{3}{R}{R}")
+                new ManaCostsImpl<>("{3}{R}{R}")
         );
         ability.addCost(new ExileSourceFromGraveCost());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/SeasonedTactician.java

@@ -31,7 +31,7 @@ public final class SeasonedTactician extends CardImpl {
 
         // {3}, Exile the top four cards of your library: 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("{3}"));
+            new ManaCostsImpl<>("{3}"));
         ability.addCost(new ExileFromTopOfLibraryCost(4));
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/s/SecludedSteppe.java

@@ -24,7 +24,7 @@ public final class SecludedSteppe extends CardImpl {
         // {tap}: Add {W}.
         this.addAbility(new WhiteManaAbility());
         // Cycling {W}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{W}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{W}")));
     }
 
     private SecludedSteppe(final SecludedSteppe card) {

Mage.Sets/src/mage/cards/s/SecurityDetail.java

@@ -26,7 +26,7 @@ public final class SecurityDetail extends CardImpl {
         this.addAbility(new LimitedTimesPerTurnActivatedAbility(
                 Zone.BATTLEFIELD,
                 new CreateTokenEffect(new SoldierToken()),
-                new ManaCostsImpl("{W}{W}"),
+                new ManaCostsImpl<>("{W}{W}"),
                 1,
                 new CreatureCountCondition(0, TargetController.YOU)
         ));

Mage.Sets/src/mage/cards/s/SedgeSliver.java

@@ -43,7 +43,7 @@ public final class SedgeSliver extends CardImpl {
                 new GainAbilityAllEffect(boost, Duration.WhileOnBattlefield,
                         filter, "All Sliver creatures have \"This creature gets +1/+1 as long as you control a Swamp.\"")));
         // All Slivers have "{B}: Regenerate this permanent."
-        Ability regenerate = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"));
+        Ability regenerate = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"));
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
                 new GainAbilityAllEffect(regenerate, Duration.WhileOnBattlefield,
                         filterSlivers, "All Slivers have \"{B}: Regenerate this permanent.\"")));

Mage.Sets/src/mage/cards/s/SedgeTroll.java

@@ -36,7 +36,7 @@ public final class SedgeTroll extends CardImpl {
         // Sedge Troll gets +1/+1 as long as you control a Swamp.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1)));
         // {B}: Regenerate Sedge Troll.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")));
     }
 
     private SedgeTroll(final SedgeTroll card) {

Mage.Sets/src/mage/cards/s/SedraxisSpecter.java

@@ -31,7 +31,7 @@ public final class SedraxisSpecter extends CardImpl {
         // Whenever Sedraxis Specter deals combat damage to a player, that player discards a card.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true));
         // Unearth {1}{B}
-        this.addAbility(new UnearthAbility(new ManaCostsImpl("{1}{B}")));
+        this.addAbility(new UnearthAbility(new ManaCostsImpl<>("{1}{B}")));
     }
 
     private SedraxisSpecter(final SedraxisSpecter card) {

Mage.Sets/src/mage/cards/s/SedrisTheTraitorKing.java

@@ -60,7 +60,7 @@ class SedrisTheTraitorKingEffect extends ContinuousEffectImpl {
             for (UUID cardId : controller.getGraveyard()) {
                 Card card = game.getCard(cardId);
                 if (card != null && card.isCreature(game)) {
-                    UnearthAbility ability = new UnearthAbility(new ManaCostsImpl("{2}{B}"));
+                    UnearthAbility ability = new UnearthAbility(new ManaCostsImpl<>("{2}{B}"));
                     ability.setSourceId(cardId);
                     ability.setControllerId(card.getOwnerId());
                     game.getState().addOtherAbility(card, ability);

Mage.Sets/src/mage/cards/s/SeedcradleWitch.java

@@ -30,7 +30,7 @@ public final class SeedcradleWitch extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {2}{G}{W}: Target creature gets +3/+3 until end of turn. Untap that creature.
-        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl("{2}{G}{W}"));
+        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}{W}"));
         ability.addEffect(new UntapTargetEffect().setText("untap that creature"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java

@@ -31,7 +31,7 @@ public final class SeerOfTheLastTomorrow extends CardImpl {
         this.toughness = new MageInt(4);
 
         // {U}, {T}, Discard a card: Target player puts the top three cards of their library into their graveyard.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new ManaCostsImpl("{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new ManaCostsImpl<>("{U}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new DiscardCardCost());
         ability.addTarget(new TargetPlayer());

Mage.Sets/src/mage/cards/s/SeersSundial.java

@@ -20,7 +20,7 @@ public final class SeersSundial extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}");
 
         // Landfall - Whenever a land enters the battlefield under your control, you may pay {2}. If you do, draw a card.
-        this.addAbility(new LandfallAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{2}")), false)); // optional = false because DoIfCost is already optonal
+        this.addAbility(new LandfallAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")), false)); // optional = false because DoIfCost is already optonal
     }
 
     private SeersSundial(final SeersSundial card) {