diff --git a/Mage.Sets/src/mage/cards/a/AkimTheSoaringWind.java b/Mage.Sets/src/mage/cards/a/AkimTheSoaringWind.java index 9b37a04b4f8..4c1e4740358 100644 --- a/Mage.Sets/src/mage/cards/a/AkimTheSoaringWind.java +++ b/Mage.Sets/src/mage/cards/a/AkimTheSoaringWind.java @@ -2,7 +2,6 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; @@ -100,11 +99,11 @@ enum AkimTheSoaringWindCondition implements Condition { class AkimTheSoaringTokenAbility extends TriggeredAbilityImpl { - public AkimTheSoaringTokenAbility() { + AkimTheSoaringTokenAbility() { super(Zone.BATTLEFIELD, new CreateTokenEffect(new BirdToken(), 1), false); } - public AkimTheSoaringTokenAbility(final AkimTheSoaringTokenAbility ability) { + private AkimTheSoaringTokenAbility(final AkimTheSoaringTokenAbility ability) { super(ability); } @@ -124,7 +123,7 @@ class AkimTheSoaringTokenAbility extends TriggeredAbilityImpl { } @Override - public TriggeredAbility copy() { + public AkimTheSoaringTokenAbility copy() { return new AkimTheSoaringTokenAbility(this); } diff --git a/Mage.Sets/src/mage/cards/c/ChaosLord.java b/Mage.Sets/src/mage/cards/c/ChaosLord.java index d7207e677ad..910976053bc 100644 --- a/Mage.Sets/src/mage/cards/c/ChaosLord.java +++ b/Mage.Sets/src/mage/cards/c/ChaosLord.java @@ -1,6 +1,5 @@ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -9,25 +8,18 @@ import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentsComparedToOpponentsCondition; import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.SubType; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.ComparisonType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -68,19 +60,19 @@ public final class ChaosLord extends CardImpl { class ChaosLordTriggeredAbility extends BeginningOfUpkeepTriggeredAbility { - public ChaosLordTriggeredAbility() { + ChaosLordTriggeredAbility() { super(Zone.BATTLEFIELD, new GainControlSourceEffect(), TargetController.YOU, false); } - public ChaosLordTriggeredAbility(ChaosLordTriggeredAbility ability) { + private ChaosLordTriggeredAbility(final ChaosLordTriggeredAbility ability) { super(ability); } @Override - public BeginningOfUpkeepTriggeredAbility copy() { + public ChaosLordTriggeredAbility copy() { return new ChaosLordTriggeredAbility(this); } diff --git a/Mage.Sets/src/mage/cards/c/CivicSaber.java b/Mage.Sets/src/mage/cards/c/CivicSaber.java index 945cc37eabd..a8c7976c0de 100644 --- a/Mage.Sets/src/mage/cards/c/CivicSaber.java +++ b/Mage.Sets/src/mage/cards/c/CivicSaber.java @@ -1,7 +1,6 @@ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -12,14 +11,12 @@ import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; + +import java.util.UUID; /** * @@ -47,15 +44,15 @@ public final class CivicSaber extends CardImpl { return new CivicSaber(this); } } - + class CivicSaberColorCount implements DynamicValue { - - public CivicSaberColorCount() { + + CivicSaberColorCount() { } - - public CivicSaberColorCount(final CivicSaberColorCount dynamicValue) { + + private CivicSaberColorCount(final CivicSaberColorCount dynamicValue) { } - + @Override public int calculate(Game game, Ability sourceAbility, Effect effect) { int count = 0; @@ -68,9 +65,9 @@ class CivicSaberColorCount implements DynamicValue { } return count; } - + @Override - public DynamicValue copy() { + public CivicSaberColorCount copy() { return new CivicSaberColorCount(this); } diff --git a/Mage.Sets/src/mage/cards/d/DeathsApproach.java b/Mage.Sets/src/mage/cards/d/DeathsApproach.java index 6754b87ffb8..9543a3d5f5d 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsApproach.java +++ b/Mage.Sets/src/mage/cards/d/DeathsApproach.java @@ -1,7 +1,6 @@ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -12,11 +11,7 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.game.Game; @@ -25,6 +20,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -62,13 +59,13 @@ public final class DeathsApproach extends CardImpl { class CardsInEnchantedCreaturesControllerGraveyardCount implements DynamicValue { - private FilterCard filter; + private final FilterCard filter; - public CardsInEnchantedCreaturesControllerGraveyardCount(FilterCard filter) { + CardsInEnchantedCreaturesControllerGraveyardCount(FilterCard filter) { this.filter = filter; } - public CardsInEnchantedCreaturesControllerGraveyardCount(final CardsInEnchantedCreaturesControllerGraveyardCount dynamicValue) { + private CardsInEnchantedCreaturesControllerGraveyardCount(final CardsInEnchantedCreaturesControllerGraveyardCount dynamicValue) { this.filter = dynamicValue.filter; } @@ -89,7 +86,7 @@ class CardsInEnchantedCreaturesControllerGraveyardCount implements DynamicValue } @Override - public DynamicValue copy() { + public CardsInEnchantedCreaturesControllerGraveyardCount copy() { return new CardsInEnchantedCreaturesControllerGraveyardCount(this); } diff --git a/Mage.Sets/src/mage/cards/g/GhastlyRemains.java b/Mage.Sets/src/mage/cards/g/GhastlyRemains.java index ba52266dd9a..37c54ce36b1 100644 --- a/Mage.Sets/src/mage/cards/g/GhastlyRemains.java +++ b/Mage.Sets/src/mage/cards/g/GhastlyRemains.java @@ -1,7 +1,6 @@ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -18,6 +17,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author TheElk801 @@ -51,16 +52,16 @@ public final class GhastlyRemains extends CardImpl { class GhastlyRemainsTriggeredAbility extends BeginningOfUpkeepTriggeredAbility { - public GhastlyRemainsTriggeredAbility() { + GhastlyRemainsTriggeredAbility() { super(Zone.GRAVEYARD, new DoIfCostPaid(new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl<>("{B}{B}{B}")), TargetController.YOU, false); } - public GhastlyRemainsTriggeredAbility(GhastlyRemainsTriggeredAbility ability) { + private GhastlyRemainsTriggeredAbility(final GhastlyRemainsTriggeredAbility ability) { super(ability); } @Override - public BeginningOfUpkeepTriggeredAbility copy() { + public GhastlyRemainsTriggeredAbility copy() { return new GhastlyRemainsTriggeredAbility(this); } diff --git a/Mage.Sets/src/mage/cards/g/Gigapede.java b/Mage.Sets/src/mage/cards/g/Gigapede.java index 1aa4217bb65..c3f916a25cb 100644 --- a/Mage.Sets/src/mage/cards/g/Gigapede.java +++ b/Mage.Sets/src/mage/cards/g/Gigapede.java @@ -1,7 +1,6 @@ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.common.DiscardCardCost; @@ -17,6 +16,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Plopman @@ -47,18 +48,18 @@ public final class Gigapede extends CardImpl { } -class GigapedeTriggerdAbility extends BeginningOfUpkeepTriggeredAbility{ - - public GigapedeTriggerdAbility(){ +class GigapedeTriggerdAbility extends BeginningOfUpkeepTriggeredAbility { + + GigapedeTriggerdAbility() { super(Zone.GRAVEYARD, new DoIfCostPaid(new ReturnSourceFromGraveyardToHandEffect(), new DiscardCardCost()), TargetController.YOU, false); } - public GigapedeTriggerdAbility(GigapedeTriggerdAbility ability) { + private GigapedeTriggerdAbility(final GigapedeTriggerdAbility ability) { super(ability); } @Override - public BeginningOfUpkeepTriggeredAbility copy() { + public GigapedeTriggerdAbility copy() { return new GigapedeTriggerdAbility(this); } diff --git a/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java b/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java index 65693ecd15e..96265eff9e0 100644 --- a/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java +++ b/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java @@ -1,7 +1,6 @@ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -25,6 +24,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -70,10 +71,10 @@ class CountersOnControlledCount implements DynamicValue { static FilterCreaturePermanent filter = new FilterCreaturePermanent(); - public CountersOnControlledCount() { + CountersOnControlledCount() { } - public CountersOnControlledCount(final CountersOnControlledCount dynamicValue) { + private CountersOnControlledCount(final CountersOnControlledCount dynamicValue) { super(); } @@ -90,7 +91,7 @@ class CountersOnControlledCount implements DynamicValue { } @Override - public DynamicValue copy() { + public CountersOnControlledCount copy() { return new CountersOnControlledCount(this); } diff --git a/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java b/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java index c2fbf1b9534..f47d2fc4c78 100644 --- a/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java +++ b/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java @@ -1,8 +1,6 @@ package mage.cards.g; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -13,14 +11,13 @@ import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.List; +import java.util.UUID; + /** * * @author North @@ -51,10 +48,10 @@ public final class GolemSkinGauntlets extends CardImpl { // compare to Goblin Gaveleer class GolemSkinGauntletsAttachedCount implements DynamicValue { - public GolemSkinGauntletsAttachedCount() { + GolemSkinGauntletsAttachedCount() { } - public GolemSkinGauntletsAttachedCount(final GolemSkinGauntletsAttachedCount dynamicValue) { + private GolemSkinGauntletsAttachedCount(final GolemSkinGauntletsAttachedCount dynamicValue) { } @Override @@ -78,7 +75,7 @@ class GolemSkinGauntletsAttachedCount implements DynamicValue { } @Override - public DynamicValue copy() { + public GolemSkinGauntletsAttachedCount copy() { return new GolemSkinGauntletsAttachedCount(this); } diff --git a/Mage.Sets/src/mage/cards/i/Ichorid.java b/Mage.Sets/src/mage/cards/i/Ichorid.java index da61c6ff2f7..32300ca63b1 100644 --- a/Mage.Sets/src/mage/cards/i/Ichorid.java +++ b/Mage.Sets/src/mage/cards/i/Ichorid.java @@ -66,19 +66,19 @@ class IchoridTriggerdAbility extends BeginningOfUpkeepTriggeredAbility { filter.add(new ColorPredicate(ObjectColor.BLACK)); } - public IchoridTriggerdAbility() { + IchoridTriggerdAbility() { super(Zone.GRAVEYARD, new DoIfCostPaid( new ReturnSourceFromGraveyardToBattlefieldEffect(), new ExileFromGraveCost(new TargetCardInYourGraveyard(filter)) ), TargetController.YOU, false); } - public IchoridTriggerdAbility(IchoridTriggerdAbility ability) { + private IchoridTriggerdAbility(IchoridTriggerdAbility ability) { super(ability); } @Override - public BeginningOfUpkeepTriggeredAbility copy() { + public IchoridTriggerdAbility copy() { return new IchoridTriggerdAbility(this); } diff --git a/Mage.Sets/src/mage/cards/j/JumboImp.java b/Mage.Sets/src/mage/cards/j/JumboImp.java index 2cf061d908d..0a6f757cd4f 100644 --- a/Mage.Sets/src/mage/cards/j/JumboImp.java +++ b/Mage.Sets/src/mage/cards/j/JumboImp.java @@ -1,9 +1,6 @@ package mage.cards.j; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -14,17 +11,17 @@ import mage.abilities.effects.common.EntersBattlefieldWithXCountersEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.Counter; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author spjspj @@ -65,11 +62,11 @@ public final class JumboImp extends CardImpl { class JumboImpEffect extends EntersBattlefieldWithXCountersEffect { - public JumboImpEffect(Counter counter) { + JumboImpEffect(Counter counter) { super(counter); } - public JumboImpEffect(EntersBattlefieldWithXCountersEffect effect) { + private JumboImpEffect(JumboImpEffect effect) { super(effect); } @@ -87,7 +84,7 @@ class JumboImpEffect extends EntersBattlefieldWithXCountersEffect { } @Override - public EntersBattlefieldWithXCountersEffect copy() { + public JumboImpEffect copy() { return new JumboImpEffect(this); } diff --git a/Mage.Sets/src/mage/cards/l/LightningStorm.java b/Mage.Sets/src/mage/cards/l/LightningStorm.java index 1693ad4cac5..345cf2d500d 100644 --- a/Mage.Sets/src/mage/cards/l/LightningStorm.java +++ b/Mage.Sets/src/mage/cards/l/LightningStorm.java @@ -61,11 +61,11 @@ class LightningStormCountCondition implements DynamicValue { private final CounterType counter; - public LightningStormCountCondition(CounterType counter) { + LightningStormCountCondition(CounterType counter) { this.counter = counter; } - public LightningStormCountCondition(final LightningStormCountCondition countersCount) { + private LightningStormCountCondition(final LightningStormCountCondition countersCount) { this.counter = countersCount.counter; } @@ -79,7 +79,7 @@ class LightningStormCountCondition implements DynamicValue { } @Override - public DynamicValue copy() { + public LightningStormCountCondition copy() { return new LightningStormCountCondition(this); } diff --git a/Mage.Sets/src/mage/cards/m/MindsDilation.java b/Mage.Sets/src/mage/cards/m/MindsDilation.java index cb5b0b19e63..484beb86636 100644 --- a/Mage.Sets/src/mage/cards/m/MindsDilation.java +++ b/Mage.Sets/src/mage/cards/m/MindsDilation.java @@ -1,7 +1,5 @@ package mage.cards.m; -import java.util.List; -import java.util.UUID; import mage.ApprovingObject; import mage.MageObject; import mage.abilities.Ability; @@ -22,6 +20,9 @@ import mage.players.Player; import mage.target.targetpointer.FixedTarget; import mage.watchers.common.SpellsCastWatcher; +import java.util.List; +import java.util.UUID; + /** * * @author fireshoes @@ -50,16 +51,16 @@ public final class MindsDilation extends CardImpl { class MindsDilationTriggeredAbility extends SpellCastOpponentTriggeredAbility { - public MindsDilationTriggeredAbility(Effect effect, boolean optional) { + MindsDilationTriggeredAbility(Effect effect, boolean optional) { super(Zone.BATTLEFIELD, effect, StaticFilters.FILTER_SPELL, optional); } - public MindsDilationTriggeredAbility(SpellCastOpponentTriggeredAbility ability) { + private MindsDilationTriggeredAbility(MindsDilationTriggeredAbility ability) { super(ability); } @Override - public SpellCastOpponentTriggeredAbility copy() { + public MindsDilationTriggeredAbility copy() { return new MindsDilationTriggeredAbility(this); } diff --git a/Mage.Sets/src/mage/cards/p/ParnesseTheSubtleBrush.java b/Mage.Sets/src/mage/cards/p/ParnesseTheSubtleBrush.java index bd474ecaf48..6e8267d3d5e 100644 --- a/Mage.Sets/src/mage/cards/p/ParnesseTheSubtleBrush.java +++ b/Mage.Sets/src/mage/cards/p/ParnesseTheSubtleBrush.java @@ -2,7 +2,6 @@ package mage.cards.p; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.TargetOfOpponentsSpellOrAbilityTriggeredAbility; import mage.abilities.costs.common.PayLifeCost; @@ -111,7 +110,7 @@ class ParnesseTheSubtleBrushCopySpellTriggeredAbility extends TriggeredAbilityIm } @Override - public TriggeredAbility copy() { + public ParnesseTheSubtleBrushCopySpellTriggeredAbility copy() { return new ParnesseTheSubtleBrushCopySpellTriggeredAbility(this); } } diff --git a/Mage.Sets/src/mage/cards/p/PrizedAmalgam.java b/Mage.Sets/src/mage/cards/p/PrizedAmalgam.java index afddc63413a..22bd5243d42 100644 --- a/Mage.Sets/src/mage/cards/p/PrizedAmalgam.java +++ b/Mage.Sets/src/mage/cards/p/PrizedAmalgam.java @@ -1,7 +1,6 @@ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -22,6 +21,8 @@ import mage.game.events.GameEvent; import mage.target.targetpointer.FixedTarget; import mage.watchers.common.CastFromGraveyardWatcher; +import java.util.UUID; + /** * * @author LevelX2 @@ -60,16 +61,16 @@ public final class PrizedAmalgam extends CardImpl { class PrizedAmalgamTriggerdAbility extends EntersBattlefieldAllTriggeredAbility { - public PrizedAmalgamTriggerdAbility(Effect effect, FilterPermanent filter) { + PrizedAmalgamTriggerdAbility(Effect effect, FilterPermanent filter) { super(Zone.GRAVEYARD, effect, filter, false); } - public PrizedAmalgamTriggerdAbility(EntersBattlefieldAllTriggeredAbility ability) { + private PrizedAmalgamTriggerdAbility(PrizedAmalgamTriggerdAbility ability) { super(ability); } @Override - public EntersBattlefieldAllTriggeredAbility copy() { + public PrizedAmalgamTriggerdAbility copy() { return new PrizedAmalgamTriggerdAbility(this); } diff --git a/Mage.Sets/src/mage/cards/s/ShareTheSpoils.java b/Mage.Sets/src/mage/cards/s/ShareTheSpoils.java index b6dc06542b4..48799a21db0 100644 --- a/Mage.Sets/src/mage/cards/s/ShareTheSpoils.java +++ b/Mage.Sets/src/mage/cards/s/ShareTheSpoils.java @@ -2,11 +2,14 @@ package mage.cards.s; import mage.MageIdentifier; import mage.abilities.Ability; -import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.*; -import mage.cards.*; +import mage.abilities.effects.AsThoughEffectImpl; +import mage.abilities.effects.AsThoughManaEffect; +import mage.abilities.effects.OneShotEffect; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; import mage.constants.*; import mage.game.ExileZone; import mage.game.Game; @@ -18,8 +21,6 @@ import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; import mage.watchers.Watcher; -import java.util.HashSet; -import java.util.Set; import java.util.UUID; /** @@ -85,7 +86,7 @@ class ShareTheSpoilsExileETBAndPlayerLossAbility extends TriggeredAbilityImpl { } @Override - public TriggeredAbility copy() { + public ShareTheSpoilsExileETBAndPlayerLossAbility copy() { return new ShareTheSpoilsExileETBAndPlayerLossAbility(this); } @@ -286,7 +287,7 @@ class ShareTheSpoilsExileCardWhenPlayACardAbility extends TriggeredAbilityImpl { } @Override - public TriggeredAbility copy() { + public ShareTheSpoilsExileCardWhenPlayACardAbility copy() { return new ShareTheSpoilsExileCardWhenPlayACardAbility(this); } diff --git a/Mage.Sets/src/mage/cards/t/TamiyoTheMoonSage.java b/Mage.Sets/src/mage/cards/t/TamiyoTheMoonSage.java index ed9e1242d56..8cccf31da79 100644 --- a/Mage.Sets/src/mage/cards/t/TamiyoTheMoonSage.java +++ b/Mage.Sets/src/mage/cards/t/TamiyoTheMoonSage.java @@ -1,7 +1,6 @@ package mage.cards.t; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -23,6 +22,8 @@ import mage.target.Target; import mage.target.TargetPermanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North, noxx @@ -44,7 +45,7 @@ public final class TamiyoTheMoonSage extends CardImpl { this.addAbility(ability); // -2: Draw a card for each tapped creature target player controls. - ability = new LoyaltyAbility(new DrawCardSourceControllerEffect(new TappedCreaturesControlledByTargetCount()), -2); + ability = new LoyaltyAbility(new DrawCardSourceControllerEffect(TappedCreaturesControlledByTargetCount.instance), -2); ability.addTarget(new TargetPlayer()); this.addAbility(ability); @@ -62,7 +63,8 @@ public final class TamiyoTheMoonSage extends CardImpl { } } -class TappedCreaturesControlledByTargetCount implements DynamicValue { +enum TappedCreaturesControlledByTargetCount implements DynamicValue { + instance; private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); @@ -77,7 +79,7 @@ class TappedCreaturesControlledByTargetCount implements DynamicValue { @Override public TappedCreaturesControlledByTargetCount copy() { - return new TappedCreaturesControlledByTargetCount(); + return this; } @Override diff --git a/Mage.Sets/src/mage/cards/t/Tephraderm.java b/Mage.Sets/src/mage/cards/t/Tephraderm.java index 5c642c96b0a..19cf51a11cf 100644 --- a/Mage.Sets/src/mage/cards/t/Tephraderm.java +++ b/Mage.Sets/src/mage/cards/t/Tephraderm.java @@ -1,8 +1,6 @@ package mage.cards.t; -import java.util.UUID; import mage.MageInt; -import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.Effect; @@ -20,6 +18,8 @@ import mage.game.permanent.Permanent; import mage.game.stack.StackObject; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Quercitron @@ -53,11 +53,11 @@ class TephradermCreatureDamageTriggeredAbility extends TriggeredAbilityImpl { private static final FilterCreaturePermanent FILTER_CREATURE = new FilterCreaturePermanent(); - public TephradermCreatureDamageTriggeredAbility() { + TephradermCreatureDamageTriggeredAbility() { super(Zone.BATTLEFIELD, new DamageTargetEffect(0)); } - public TephradermCreatureDamageTriggeredAbility(final TephradermCreatureDamageTriggeredAbility ability) { + private TephradermCreatureDamageTriggeredAbility(final TephradermCreatureDamageTriggeredAbility ability) { super(ability); } @@ -88,7 +88,7 @@ class TephradermCreatureDamageTriggeredAbility extends TriggeredAbilityImpl { } @Override - public TriggeredAbility copy() { + public TephradermCreatureDamageTriggeredAbility copy() { return new TephradermCreatureDamageTriggeredAbility(this); } @@ -100,11 +100,11 @@ class TephradermCreatureDamageTriggeredAbility extends TriggeredAbilityImpl { class TephradermSpellDamageTriggeredAbility extends TriggeredAbilityImpl { - public TephradermSpellDamageTriggeredAbility() { + TephradermSpellDamageTriggeredAbility() { super(Zone.BATTLEFIELD, new DamageTargetEffect(0)); } - public TephradermSpellDamageTriggeredAbility(final TephradermSpellDamageTriggeredAbility ability) { + private TephradermSpellDamageTriggeredAbility(final TephradermSpellDamageTriggeredAbility ability) { super(ability); } @@ -134,7 +134,7 @@ class TephradermSpellDamageTriggeredAbility extends TriggeredAbilityImpl { } @Override - public TriggeredAbility copy() { + public TephradermSpellDamageTriggeredAbility copy() { return new TephradermSpellDamageTriggeredAbility(this); } diff --git a/Mage.Sets/src/mage/cards/v/VaziKeenNegotiator.java b/Mage.Sets/src/mage/cards/v/VaziKeenNegotiator.java index 626bc166184..b8a478acf98 100644 --- a/Mage.Sets/src/mage/cards/v/VaziKeenNegotiator.java +++ b/Mage.Sets/src/mage/cards/v/VaziKeenNegotiator.java @@ -2,7 +2,6 @@ package mage.cards.v; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.TreasureSpentToCastCondition; @@ -23,13 +22,11 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.token.TreasureToken; -import mage.game.stack.StackObject; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetOpponent; import mage.watchers.common.CreatedTokenWatcher; -import java.util.Optional; import java.util.UUID; /** @@ -106,7 +103,7 @@ class VaziKeenNegotiatorOpponentCastsOrActivatesTriggeredAbility extends Trigger } @Override - public TriggeredAbility copy() { + public VaziKeenNegotiatorOpponentCastsOrActivatesTriggeredAbility copy() { return new VaziKeenNegotiatorOpponentCastsOrActivatesTriggeredAbility(this); } } diff --git a/Mage.Sets/src/mage/cards/v/VivienMonstersAdvocate.java b/Mage.Sets/src/mage/cards/v/VivienMonstersAdvocate.java index 16269fe6e09..164bef33b1b 100644 --- a/Mage.Sets/src/mage/cards/v/VivienMonstersAdvocate.java +++ b/Mage.Sets/src/mage/cards/v/VivienMonstersAdvocate.java @@ -28,7 +28,6 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import java.util.*; -import java.util.stream.Collectors; /** * @author TheElk801 @@ -150,7 +149,7 @@ class VivienMonstersAdvocateTriggeredAbility extends DelayedTriggeredAbility { } @Override - public DelayedTriggeredAbility copy() { + public VivienMonstersAdvocateTriggeredAbility copy() { return new VivienMonstersAdvocateTriggeredAbility(this); } diff --git a/Mage.Sets/src/mage/cards/w/WelcomeToTheFold.java b/Mage.Sets/src/mage/cards/w/WelcomeToTheFold.java index bb6c0ac6be0..2e1ee520630 100644 --- a/Mage.Sets/src/mage/cards/w/WelcomeToTheFold.java +++ b/Mage.Sets/src/mage/cards/w/WelcomeToTheFold.java @@ -1,7 +1,6 @@ package mage.cards.w; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCosts; import mage.abilities.costs.mana.ManaCostsImpl; @@ -16,14 +15,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class WelcomeToTheFold extends CardImpl { public WelcomeToTheFold(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{U}{U}"); // Madness {X}{U}{U} (If you discard this card // discard it into exile. When you do @@ -55,7 +55,7 @@ class WelcomeToTheFoldEffect extends GainControlTargetEffect { staticText = "Gain control of target creature if its toughness is 2 or less. If Welcome to the Fold's madness cost was paid, instead gain control of that creature if its toughness is X or less"; } - public WelcomeToTheFoldEffect(GainControlTargetEffect effect) { + private WelcomeToTheFoldEffect(final WelcomeToTheFoldEffect effect) { super(effect); } @@ -78,7 +78,7 @@ class WelcomeToTheFoldEffect extends GainControlTargetEffect { } @Override - public GainControlTargetEffect copy() { + public WelcomeToTheFoldEffect copy() { return new WelcomeToTheFoldEffect(this); } diff --git a/Mage.Sets/src/mage/cards/z/ZaxaraTheExemplary.java b/Mage.Sets/src/mage/cards/z/ZaxaraTheExemplary.java index bc70d225913..71d03fb769d 100644 --- a/Mage.Sets/src/mage/cards/z/ZaxaraTheExemplary.java +++ b/Mage.Sets/src/mage/cards/z/ZaxaraTheExemplary.java @@ -2,7 +2,6 @@ package mage.cards.z; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; @@ -67,7 +66,7 @@ class ZaxaraTheExemplaryHydraTokenAbility extends TriggeredAbilityImpl { setTriggerPhrase("Whenever you cast a spell with {X} in its mana cost"); } - public ZaxaraTheExemplaryHydraTokenAbility(final ZaxaraTheExemplaryHydraTokenAbility ability) { + private ZaxaraTheExemplaryHydraTokenAbility(final ZaxaraTheExemplaryHydraTokenAbility ability) { super(ability); } @@ -90,7 +89,7 @@ class ZaxaraTheExemplaryHydraTokenAbility extends TriggeredAbilityImpl { } @Override - public TriggeredAbility copy() { + public ZaxaraTheExemplaryHydraTokenAbility copy() { return new ZaxaraTheExemplaryHydraTokenAbility(this); } } diff --git a/Mage/src/main/java/mage/abilities/effects/mana/DoUnlessAnyPlayerPaysManaEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/DoUnlessAnyPlayerPaysManaEffect.java index deb3f3a0a0d..ce20bbc720c 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/DoUnlessAnyPlayerPaysManaEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/DoUnlessAnyPlayerPaysManaEffect.java @@ -74,7 +74,7 @@ public class DoUnlessAnyPlayerPaysManaEffect extends ManaEffect { } @Override - public ManaEffect copy() { + public DoUnlessAnyPlayerPaysManaEffect copy() { return new DoUnlessAnyPlayerPaysManaEffect(this); } diff --git a/Mage/src/main/java/mage/game/permanent/token/OminousRoostBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/OminousRoostBirdToken.java index 73051ea20d0..b9c1ad2b869 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OminousRoostBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OminousRoostBirdToken.java @@ -25,7 +25,7 @@ public class OminousRoostBirdToken extends TokenImpl { } @Override - public Token copy() { + public OminousRoostBirdToken copy() { return new OminousRoostBirdToken(this); } }